Drop Qt3 support, bug 283429. Use app-text/djview4 instead of old bundled djview, bug 298293.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 32 insertions, 69 deletions

diff --git a/app-text/djvu/ChangeLog b/app-text/djvu/ChangeLog
index 56565df8582b..f20ba8964f30 100644
--- a/app-text/djvu/ChangeLog
+++ b/app-text/djvu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/djvu
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.97 2009/10/28 09:50:48 pva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.98 2010/01/05 03:08:54 yngwin Exp $
+
+  05 Jan 2010; Ben de Groot <yngwin@gentoo.org>
+  djvu-3.5.21_p20090103.ebuild, djvu-3.5.22.ebuild:
+  Drop Qt3 support, bug 283429. Use app-text/djview4 instead of old bundled
+  djview, bug 298293.
 
   28 Oct 2009; Peter Volkov <pva@gentoo.org> -djvu-3.5.19.ebuild,
   -djvu-3.5.20-r1.ebuild, -djvu-3.5.21.ebuild, djvu-3.5.21_p20090103.ebuild,
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index 039f4c077bde..c112a1eed4be 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -2,7 +2,7 @@ AUX djvu-3.5.21-parallel-build.patch 2664 RMD160 82b42bc660a02f15f8f71e8ccb164fc
 AUX djvulibre-3.5.17-pthread-flag.patch 2419 RMD160 35f4c484e567ed7a7dcfb51559925ed49ad5db26 SHA1 2c028fd4bff1316a9278bc9047f6595ea3fc1e64 SHA256 e5bd52eba105c7792866f13f5abccf07daca220dc68ac045a4abc431c329805f
 DIST djvulibre-20090103.tar.gz 3043215 RMD160 b639067ac8c1a2b9c7860fef9b75c093bd60a437 SHA1 56f37aac149320df11fa54e2236a68921f06ada3 SHA256 178e50202f086f52a44f6a3ba0e550e4c882d59e1961587e5e2ff62dc270e079
 DIST djvulibre-3.5.22.tar.gz 3027985 RMD160 f74cec88c5fbda28976e64669d3e48833b4dfdcd SHA1 f869d4114052a7df7b8da2d334d124934f1293a6 SHA256 3d9242f98db8f5fc8ca239ccaa91e70c20451fe3b3fa8de6f133e0888f89f0be
-EBUILD djvu-3.5.21_p20090103.ebuild 2956 RMD160 305deedfef798f6d17614b5195285dfd7019b2ed SHA1 e92b7534030b2db6eb805dfa42ea8f818884fc9e SHA256 e55fac86ed2b650acad774809d28346014240c685ba0c8b8f153a3aa3d0ff7a6
-EBUILD djvu-3.5.22.ebuild 2957 RMD160 080772b1f0a65f4709fccd232648b1d1421d7f95 SHA1 c99253cc83fd638c9feff3420c5cec436cdba5d7 SHA256 a8aa836c80c22fba63ad2de5384c122f8aa13aa2dae86abc77715a48baf1ad32
-MISC ChangeLog 12678 RMD160 4ca68e8ac3c672adfa9873e5042be7ab3abcf7d2 SHA1 6ca5f934182b1cba4be38b3c14e9755d20ca6b72 SHA256 9e7b985bea5bba7cf7fd2f47bc9cfa802eb565154891005c8c1136d1daa45c57
+EBUILD djvu-3.5.21_p20090103.ebuild 2410 RMD160 01b8c3d2a7a13f91693b351e4372df970b42a3a1 SHA1 87b6027017b2c3f040b774ec7302c4a8fcc85ee0 SHA256 e46ed9fa61883e5d113fcd644bdf52d4bebb3cd480166822c682dad1d34eb4fe
+EBUILD djvu-3.5.22.ebuild 2411 RMD160 f9df3b9b3a1f84f3abfe3fe516da3953528ab539 SHA1 bde2d1a4b5236a381c6eabe786d24f26161f6121 SHA256 17f090bdb410c1422c68a9fef6b369761b0450eeadf77885c7a19e3b0335359e
+MISC ChangeLog 12880 RMD160 f65dfa316e501d0b5bb580c22c05d7936312f9dc SHA1 a233f3cb15997b9681e32a2df97e966a49223070 SHA256 eabdee578e0bc58b15a3a7c369abbc45879a4a1b4ed8dad1351b8c1f233331f5
 MISC metadata.xml 865 RMD160 09cb90b4680856217c680e395e15957263c01472 SHA1 35e8a38a7dbed0d7f547cf21fa5bbb0133591e3d SHA256 13f4ad340f245deb6b5ba0d5ecfd5fe5aa408ff8ef9b2fe37a2f63ffc793c672
diff --git a/app-text/djvu/djvu-3.5.21_p20090103.ebuild b/app-text/djvu/djvu-3.5.21_p20090103.ebuild
index 83372ee5915a..104941bb59b3 100644
--- a/app-text/djvu/djvu-3.5.21_p20090103.ebuild
+++ b/app-text/djvu/djvu-3.5.21_p20090103.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.21_p20090103.ebuild,v 1.9 2009/10/28 09:50:48 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.21_p20090103.ebuild,v 1.10 2010/01/05 03:08:54 yngwin Exp $
 
 EAPI=1
-inherit fdo-mime nsplugins flag-o-matic eutils multilib toolchain-funcs confutils
+inherit fdo-mime flag-o-matic eutils multilib toolchain-funcs
 
 MY_P="${PN}libre-${PV#*_p}"
 
-DESCRIPTION="DjVu viewers, encoders and utilities."
+DESCRIPTION="DjVu viewers, encoders and utilities"
 HOMEPAGE="http://djvu.sourceforge.net"
 SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="xml qt3 jpeg tiff debug nls nsplugin kde doc"
+IUSE="xml jpeg tiff debug nls kde doc"
 
 RDEPEND="jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( media-libs/tiff )
-	qt3? ( x11-libs/qt:3 )"
-DEPEND="${RDEPEND}
-	qt3? ( nsplugin? ( x11-libs/libXt ) )"
+	tiff? ( media-libs/tiff )"
+DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
@@ -29,17 +27,6 @@ for X in ${LANGS}; do
 	IUSE="${IUSE} linguas_${X}"
 done
 
-pkg_setup() {
-	if ! use qt3; then
-		ewarn
-		ewarn "The standalone djvu viewer, djview, will not be compiled."
-		ewarn "Add \"qt3\" to your USE flags if you want it."
-		ewarn
-	fi
-
-	confutils_use_depend_all nsplugin qt3
-}
-
 src_compile() {
 	local I18N
 	if use nls; then
@@ -58,19 +45,16 @@ src_compile() {
 		I18N="--disable-i18n"
 	fi
 
-	# We install all desktop files by hand.
+	# We install all desktop files by hand and Qt3 is deprecated
 	econf --disable-desktopfiles \
-		$(use_with qt3 qt) \
+		--without-qt \
 		$(use_enable xml xmltools) \
 		$(use_with jpeg) \
 		$(use_with tiff) \
 		"${I18N}" \
-		$(use_enable debug) \
-		${QTCONF}
+		$(use_enable debug)
 
-	if ! use nsplugin; then
-		sed -e 's:nsdejavu::' -i "${S}"/gui/Makefile || die
-	fi
+	sed -e 's:nsdejavu::' -i "${S}"/gui/Makefile || die
 
 	emake || die "emake failed"
 }
@@ -93,11 +77,6 @@ src_install() {
 		cp "${D}"/usr/share/mimelnk/image/{vnd.djvu.desktop,x-djvu.desktop}
 		sed -i -e 's:image/vnd.djvu:image/x-djvu:' "${D}"/usr/share/mimelnk/image/x-djvu.desktop
 	fi
-
-	if use qt3 ; then
-		insinto /usr/share/icons/hicolor/32x32/apps && newins hi32-djview3.png djvulibre-djview3.png || die
-		insinto /usr/share/applications/ && doins djvulibre-djview3.desktop || die
-	fi
 }
 
 pkg_postinst() {
diff --git a/app-text/djvu/djvu-3.5.22.ebuild b/app-text/djvu/djvu-3.5.22.ebuild
index a6215e2e5fc5..04b122d35e58 100644
--- a/app-text/djvu/djvu-3.5.22.ebuild
+++ b/app-text/djvu/djvu-3.5.22.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.22.ebuild,v 1.2 2009/10/28 09:50:48 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.22.ebuild,v 1.3 2010/01/05 03:08:54 yngwin Exp $
 
 EAPI=1
-inherit fdo-mime nsplugins flag-o-matic eutils multilib toolchain-funcs confutils
+inherit fdo-mime flag-o-matic eutils multilib toolchain-funcs
 
 MY_P="${PN}libre-${PV#*_p}"
 
-DESCRIPTION="DjVu viewers, encoders and utilities."
+DESCRIPTION="DjVu viewers, encoders and utilities"
 HOMEPAGE="http://djvu.sourceforge.net"
 SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="xml qt3 jpeg tiff debug nls nsplugin kde doc"
+IUSE="xml jpeg tiff debug nls kde doc"
 
 RDEPEND="jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( media-libs/tiff )
-	qt3? ( x11-libs/qt:3 )"
-DEPEND="${RDEPEND}
-	qt3? ( nsplugin? ( x11-libs/libXt ) )"
+	tiff? ( media-libs/tiff )"
+DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
@@ -29,17 +27,6 @@ for X in ${LANGS}; do
 	IUSE="${IUSE} linguas_${X}"
 done
 
-pkg_setup() {
-	if ! use qt3; then
-		ewarn
-		ewarn "The standalone djvu viewer, djview, will not be compiled."
-		ewarn "Add \"qt3\" to your USE flags if you want it."
-		ewarn
-	fi
-
-	confutils_use_depend_all nsplugin qt3
-}
-
 src_compile() {
 	local I18N
 	if use nls; then
@@ -58,19 +45,16 @@ src_compile() {
 		I18N="--disable-i18n"
 	fi
 
-	# We install all desktop files by hand.
+	# We install all desktop files by hand and Qt3 is deprecated
 	econf --disable-desktopfiles \
-		$(use_with qt3 qt) \
+		--without- qt \
 		$(use_enable xml xmltools) \
 		$(use_with jpeg) \
 		$(use_with tiff) \
 		"${I18N}" \
-		$(use_enable debug) \
-		${QTCONF}
+		$(use_enable debug)
 
-	if ! use nsplugin; then
-		sed -e 's:nsdejavu::' -i "${S}"/gui/Makefile || die
-	fi
+	sed -e 's:nsdejavu::' -i "${S}"/gui/Makefile || die
 
 	emake || die "emake failed"
 }
@@ -93,11 +77,6 @@ src_install() {
 		cp "${D}"/usr/share/mimelnk/image/{vnd.djvu.desktop,x-djvu.desktop}
 		sed -i -e 's:image/vnd.djvu:image/x-djvu:' "${D}"/usr/share/mimelnk/image/x-djvu.desktop
 	fi
-
-	if use qt3 ; then
-		insinto /usr/share/icons/hicolor/32x32/apps && newins hi32-djview3.png djvulibre-djview3.png || die
-		insinto /usr/share/applications/ && doins djvulibre-djview3.desktop || die
-	fi
 }
 
 pkg_postinst() {