Remove unnecessary djview4 blockers wrt updates/2Q-2012. Fix building with Qt 4.8 (upstream patch) wrt #401517 by Rafał Mużyło.

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

4 files changed, 78 insertions, 11 deletions

diff --git a/app-text/djview/ChangeLog b/app-text/djview/ChangeLog
index 93fb8c84f98a..fd09c2289e7d 100644
--- a/app-text/djview/ChangeLog
+++ b/app-text/djview/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/djview
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djview/ChangeLog,v 1.8 2012/01/16 18:42:15 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djview/ChangeLog,v 1.9 2012/04/21 17:09:49 ssuominen Exp $
+
+  21 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> djview-4.7.ebuild,
+  djview-4.8.ebuild, +files/djview-4.8-qt48.patch:
+  Remove unnecessary djview4 blockers wrt updates/2Q-2012. Fix building with Qt
+  4.8 (upstream patch) wrt #401517 by Rafał Mużyło.
 
   16 Jan 2012; Tobias Klausmann <klausman@gentoo.org> djview-4.7.ebuild:
   Stable on alpha, bug #372589
diff --git a/app-text/djview/djview-4.7.ebuild b/app-text/djview/djview-4.7.ebuild
index a701504251b3..c7adb56db1b2 100644
--- a/app-text/djview/djview-4.7.ebuild
+++ b/app-text/djview/djview-4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djview/djview-4.7.ebuild,v 1.7 2012/01/16 18:42:15 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djview/djview-4.7.ebuild,v 1.8 2012/04/21 17:09:49 ssuominen Exp $
 
 EAPI="4"
 
@@ -19,8 +19,7 @@ IUSE="debug nsplugin"
 
 RDEPEND="
 	>=app-text/djvu-3.5.22-r1
-	x11-libs/qt-gui:4
-	!!app-text/djview4"
+	x11-libs/qt-gui:4"
 DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.67
 	dev-util/pkgconfig
diff --git a/app-text/djview/djview-4.8.ebuild b/app-text/djview/djview-4.8.ebuild
index 4b859efec67c..fd6ed5acf0ba 100644
--- a/app-text/djview/djview-4.8.ebuild
+++ b/app-text/djview/djview-4.8.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djview/djview-4.8.ebuild,v 1.1 2011/12/12 07:50:36 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djview/djview-4.8.ebuild,v 1.2 2012/04/21 17:09:49 ssuominen Exp $
 
-EAPI="4"
+EAPI=4
 
-inherit eutils autotools versionator toolchain-funcs multilib nsplugins fdo-mime flag-o-matic
+inherit autotools eutils gnome2-utils fdo-mime flag-o-matic versionator toolchain-funcs multilib nsplugins
 
 MY_P=${PN}-$(replace_version_separator 2 '-')
 
@@ -19,8 +19,7 @@ IUSE="debug nsplugin"
 
 RDEPEND="
 	>=app-text/djvu-3.5.22-r1
-	x11-libs/qt-gui:4
-	!!app-text/djview4"
+	x11-libs/qt-gui:4"
 DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.67
 	dev-util/pkgconfig
@@ -29,6 +28,8 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-qt48.patch
+
 	# Force XEmbed instead of Xt-based mainloop (disable Xt autodep)
 	sed -e 's:\(ac_xt=\)yes:\1no:' -i configure* || die
 	sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688
@@ -49,7 +50,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) CXX=$(tc-getCXX)
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
 }
 
 src_install() {
@@ -69,10 +70,16 @@ src_install() {
 	domenu djvulibre-djview4.desktop
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
 	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
 	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
 }
diff --git a/app-text/djview/files/djview-4.8-qt48.patch b/app-text/djview/files/djview-4.8-qt48.patch
new file mode 100644
index 000000000000..4db289291ede
--- /dev/null
+++ b/app-text/djview/files/djview-4.8-qt48.patch
@@ -0,0 +1,56 @@
+From: Leon Bottou <leon@bottou.org>
+Date: Mon, 2 Apr 2012 14:11:36 +0000 (-0700)
+Subject: removed swap (use qSwap instead).
+X-Git-Tag: release.4.9~5
+X-Git-Url: http://djvu.git.sourceforge.net/git/gitweb.cgi?p=djvu%2Fdjview.git;a=commitdiff_plain;h=7d4802964b9e74506c63f43505b632f6e7b5db3c;hp=6389dcba572c6439acd226d27872c2f0db583875
+
+removed swap (use qSwap instead).
+
+Fixes Gentoo bug 401517, compilation problems with qt-4.8.
+Unclear why is namespace std in scope at this point when using qt-4.8...
+---
+
+diff --git a/src/qdjvuwidget.cpp b/src/qdjvuwidget.cpp
+index 52ac366..8136d07 100644
+--- a/src/qdjvuwidget.cpp
++++ b/src/qdjvuwidget.cpp
+@@ -152,15 +152,6 @@ all_numbers(const char *s)
+   return true;
+ }
+ 
+-template<class T> static inline void 
+-swap(T& x, T& y)
+-{
+-  T tmp;
+-  tmp = x;
+-  x = y;
+-  y = tmp;
+-}
+-
+ template<class T> static inline int
+ ksmallest(T *v, int n, int k)
+ {
+@@ -173,11 +164,11 @@ ksmallest(T *v, int n, int k)
+       /* Sort v[lo], v[m], v[hi] by insertion */
+       m = (lo+hi)/2;
+       if (v[lo]>v[m])
+-        swap(v[lo],v[m]);
++        qSwap(v[lo],v[m]);
+       if (v[m]>v[hi]) {
+-        swap(v[m],v[hi]);
++        qSwap(v[m],v[hi]);
+         if (v[lo]>v[m])
+-          swap(v[lo],v[m]);
++          qSwap(v[lo],v[m]);
+       }
+       /* Extract pivot, place sentinel */
+       pivot = v[m];
+@@ -191,7 +182,7 @@ ksmallest(T *v, int n, int k)
+       do ++l; while (v[l]<pivot);
+       do --h; while (v[h]>pivot);
+       if (l < h) { 
+-        swap(v[l],v[h]); 
++        qSwap(v[l],v[h]); 
+         goto loop; 
+       }
+       /* Finish up */