Die if nsplugin is asked to be built but qt3 is not in USE, bug #196209 reported by Miron <prince.jah AT gmail.com>, fixed by Jakub <jakub AT gentoo.org>. Remove unused.

Package-Manager: portage-2.1.3.19

7 files changed, 20 insertions, 254 deletions

diff --git a/app-text/djvu/ChangeLog b/app-text/djvu/ChangeLog
index cf58c93a9d5b..d229edc7a5d6 100644
--- a/app-text/djvu/ChangeLog
+++ b/app-text/djvu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/djvu
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.69 2007/12/13 09:52:52 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.70 2007/12/24 06:48:10 pva Exp $
+
+  24 Dec 2007; <pva@gentoo.org> -djvu-3.5.19-r1.ebuild, -djvu-3.5.20.ebuild,
+  djvu-3.5.20-r1.ebuild:
+  Die if nsplugin is asked to be built but qt3 is not in USE, bug #196209
+  reported by Miron <prince.jah AT gmail.com>, fixed by Jakub <jakub AT
+  gentoo.org>. Remove unused.
 
 *djvu-3.5.20-r1 (13 Dec 2007)
 
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index 2b267a3eb937..9fb7c972fc9a 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -4,26 +4,18 @@ RMD160 35f4c484e567ed7a7dcfb51559925ed49ad5db26 files/djvulibre-3.5.17-pthread-f
 SHA256 e5bd52eba105c7792866f13f5abccf07daca220dc68ac045a4abc431c329805f files/djvulibre-3.5.17-pthread-flag.patch 2419
 DIST djvulibre-3.5.19.tar.gz 2380092 RMD160 2eb9b5df021bb7121a051d3256999da27dd3b682 SHA1 439977e03c8c35ca74eb5887993edb317923133f SHA256 57ffa154f45de309b352ce53aa6618af2f8639d1e330470c3c955241d44ccd78
 DIST djvulibre-3.5.20.tar.gz 2416958 RMD160 fb755064912586585656b9701b7d98bd3019c67b SHA1 88ec94512f3f7845b42c2585f75e07a9cf147380 SHA256 d937528e10c16831d8df31893ee24da8ec2bfd9e9170671c482a1b1abfc5efc3
-EBUILD djvu-3.5.19-r1.ebuild 3330 RMD160 8fd501cb427f80d6613afd4eb1cb848cb974dd14 SHA1 3b28dad56efa6f30788adbd821c5df190c15c59e SHA256 b55cd69af5c0209ae892642609ea9ef8281dd1e0e2383dc1bb0067d30b9ba0e4
-MD5 b8750824009c88be8146f25747e19efb djvu-3.5.19-r1.ebuild 3330
-RMD160 8fd501cb427f80d6613afd4eb1cb848cb974dd14 djvu-3.5.19-r1.ebuild 3330
-SHA256 b55cd69af5c0209ae892642609ea9ef8281dd1e0e2383dc1bb0067d30b9ba0e4 djvu-3.5.19-r1.ebuild 3330
 EBUILD djvu-3.5.19.ebuild 3295 RMD160 85ad554d5a7c8dd8990f8f8408c3b3953eba8704 SHA1 965f1fc093303026bba9eaf4829e1438ed84f898 SHA256 8c50ba5e182e3ecd34ec9a002159c8365f1a9e4c4b9af3be3ffd58734f60f9ce
 MD5 a61cb04829515ab5d96cb5b56a4adfe1 djvu-3.5.19.ebuild 3295
 RMD160 85ad554d5a7c8dd8990f8f8408c3b3953eba8704 djvu-3.5.19.ebuild 3295
 SHA256 8c50ba5e182e3ecd34ec9a002159c8365f1a9e4c4b9af3be3ffd58734f60f9ce djvu-3.5.19.ebuild 3295
-EBUILD djvu-3.5.20-r1.ebuild 3481 RMD160 c96edaf41b0f370b836ac32a507adc38cf2a5a9a SHA1 be93834d77864f9806c4d86e99fd1a037c90e47a SHA256 8bd58745bc41e8d2f40021b396c5e39fed893fb546eff0ac07797281bd0c2eec
-MD5 3302b6489ac314c6ad251e82db9ef55a djvu-3.5.20-r1.ebuild 3481
-RMD160 c96edaf41b0f370b836ac32a507adc38cf2a5a9a djvu-3.5.20-r1.ebuild 3481
-SHA256 8bd58745bc41e8d2f40021b396c5e39fed893fb546eff0ac07797281bd0c2eec djvu-3.5.20-r1.ebuild 3481
-EBUILD djvu-3.5.20.ebuild 3167 RMD160 a8cae0ea70aa1fa6a4f4cc8caa3dfdd80acb1695 SHA1 232c6b546cbb7034e81c3f15c25ba0d4971c2b34 SHA256 0f2521ad9bf2b21617b470adefe2913108c1e26759a2d9aa0378ce322729e9cb
-MD5 a544e2735c79bd931a91a4a71858e78d djvu-3.5.20.ebuild 3167
-RMD160 a8cae0ea70aa1fa6a4f4cc8caa3dfdd80acb1695 djvu-3.5.20.ebuild 3167
-SHA256 0f2521ad9bf2b21617b470adefe2913108c1e26759a2d9aa0378ce322729e9cb djvu-3.5.20.ebuild 3167
-MISC ChangeLog 9057 RMD160 c15bba13fb96d0dfbe4b1186bc6077150dfffbd9 SHA1 58e3601802c7e5316dadc94574c16cf78a9ddcd1 SHA256 2458053af51d329089831781437bf1383bd55bb5283480f2186c7c9c5da3142d
-MD5 4e6972e7e030cc297ac00dcd3e339466 ChangeLog 9057
-RMD160 c15bba13fb96d0dfbe4b1186bc6077150dfffbd9 ChangeLog 9057
-SHA256 2458053af51d329089831781437bf1383bd55bb5283480f2186c7c9c5da3142d ChangeLog 9057
+EBUILD djvu-3.5.20-r1.ebuild 3532 RMD160 89d958c97f7fdfa4f709db85c16e7ec858347fe1 SHA1 fad25cc16284f800523109e551edf74cccb71376 SHA256 f84fefdbea921a498d266cff3e7f93eecf0cb3cb07dab01058828fb9c8ba8c30
+MD5 53e614efd1819bed2617aeb635979f5f djvu-3.5.20-r1.ebuild 3532
+RMD160 89d958c97f7fdfa4f709db85c16e7ec858347fe1 djvu-3.5.20-r1.ebuild 3532
+SHA256 f84fefdbea921a498d266cff3e7f93eecf0cb3cb07dab01058828fb9c8ba8c30 djvu-3.5.20-r1.ebuild 3532
+MISC ChangeLog 9336 RMD160 89596228c647d8f3bce0a952f95d9e6f77948e50 SHA1 bedb9db183a7504ceb53265790d8a685fc0db57e SHA256 e0d2034629f228172ee2a07d7e4990b3fdf6c934aa111afa404fb818c803ba9e
+MD5 dabe8f557759bd9621b692edcab7d940 ChangeLog 9336
+RMD160 89596228c647d8f3bce0a952f95d9e6f77948e50 ChangeLog 9336
+SHA256 e0d2034629f228172ee2a07d7e4990b3fdf6c934aa111afa404fb818c803ba9e ChangeLog 9336
 MISC metadata.xml 865 RMD160 09cb90b4680856217c680e395e15957263c01472 SHA1 35e8a38a7dbed0d7f547cf21fa5bbb0133591e3d SHA256 13f4ad340f245deb6b5ba0d5ecfd5fe5aa408ff8ef9b2fe37a2f63ffc793c672
 MD5 ad8a8096a50ceca743956ec76d0818ef metadata.xml 865
 RMD160 09cb90b4680856217c680e395e15957263c01472 metadata.xml 865
@@ -31,12 +23,6 @@ SHA256 13f4ad340f245deb6b5ba0d5ecfd5fe5aa408ff8ef9b2fe37a2f63ffc793c672 metadata
 MD5 28fc1d89b6b373dbba13e0c296c04e7f files/digest-djvu-3.5.19 253
 RMD160 b704bedd8a6fb5a7dc68f17f3bc302e4f2ec207a files/digest-djvu-3.5.19 253
 SHA256 68a72e2fd1d6cf67ff769e59191eef47f78757563183a908cb0ec667a374ceb5 files/digest-djvu-3.5.19 253
-MD5 28fc1d89b6b373dbba13e0c296c04e7f files/digest-djvu-3.5.19-r1 253
-RMD160 b704bedd8a6fb5a7dc68f17f3bc302e4f2ec207a files/digest-djvu-3.5.19-r1 253
-SHA256 68a72e2fd1d6cf67ff769e59191eef47f78757563183a908cb0ec667a374ceb5 files/digest-djvu-3.5.19-r1 253
-MD5 00f676bee49c97564d1b965f15c66609 files/digest-djvu-3.5.20 253
-RMD160 4a48b0c7b50215ae19f310fa3fd915986dff1b72 files/digest-djvu-3.5.20 253
-SHA256 b546af157360b36e9707c38de12529910652d3708587164cffe3f2df99400f7e files/digest-djvu-3.5.20 253
 MD5 00f676bee49c97564d1b965f15c66609 files/digest-djvu-3.5.20-r1 253
 RMD160 4a48b0c7b50215ae19f310fa3fd915986dff1b72 files/digest-djvu-3.5.20-r1 253
 SHA256 b546af157360b36e9707c38de12529910652d3708587164cffe3f2df99400f7e files/digest-djvu-3.5.20-r1 253
diff --git a/app-text/djvu/djvu-3.5.19-r1.ebuild b/app-text/djvu/djvu-3.5.19-r1.ebuild
deleted file mode 100644
index 3a18f8655a5c..000000000000
--- a/app-text/djvu/djvu-3.5.19-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.19-r1.ebuild,v 1.1 2007/08/13 10:26:59 pva Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-inherit fdo-mime nsplugins flag-o-matic eutils multilib toolchain-funcs autotools
-
-MY_P="${PN}libre-${PV}"
-
-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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="xml qt3 jpeg tiff debug threads nls nsplugin kde doc"
-
-DEPEND="jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( media-libs/tiff )
-	qt3? ( <x11-libs/qt-4 )"
-
-S="${WORKDIR}/${MY_P}"
-
-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
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Do not strip binaries as portage does this for us. bug #135208
-	sed -i 's:${INSTALL_PROGRAM} -s:${INSTALL_PROGRAM}:' \
-		gui/djview/Makefile.in tools/Makefile.in xmltools/Makefile.in
-
-	# Fix compilaton with --as-needed. bug #132473
-	epatch "${FILESDIR}"/djvulibre-3.5.17-pthread-flag.patch
-
-	AT_M4DIR="config" eautoreconf
-}
-
-src_compile() {
-	# assembler problems and hence non-building with pentium4
-	# <obz@gentoo.org>
-	replace-flags -march=pentium4 -march=pentium3
-	echo LINGUAS=$LINGUAS
-
-	# When enabling qt it must be compiled with threads. See bug #89544.
-	if use qt3 ; then
-		QTCONF=" --with-qt --enable-threads "
-	elif use threads ; then
-		QTCONF=" --without-qt --disable-djview --enable-threads "
-	else
-		QTCONF=" --without-qt --disable-djview --disable-threads "
-	fi
-
-	# We install all desktop files by hand.
-	econf --disable-desktopfiles \
-		$(use_enable xml xmltools) \
-		$(use_with jpeg) \
-		$(use_with tiff) \
-		$(use_enable nls i18n) \
-		$(use_enable debug) \
-		${QTCONF} \
-		|| die "econf failed"
-
-	if ! use nsplugin; then
-		sed -e 's:nsdejavu::' -i "${S}"/gui/Makefile || die
-	fi
-
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} install
-
-	dodoc README TODO NEWS
-
-	use doc && cp -r doc/ "${D}"/usr/share/doc/${PF}
-
-	# Install desktop files.
-	cd desktopfiles
-	insinto /usr/share/icons/hicolor/22x22/mimetypes && newins hi22-djvu.png image-vnd.djvu.png
-	insinto	/usr/share/icons/hicolor/32x32/mimetypes && newins hi32-djvu.png image-vnd.djvu.png
-	insinto	/usr/share/icons/hicolor/48x48/mimetypes && newins hi48-djvu.png image-vnd.djvu.png
-	insinto	/usr/share/mime/packages && doins djvulibre-mime.xml
-	if use kde ; then
-		insinto /usr/share/mimelnk/image && doins vnd.djvu.desktop x-djvu.desktop
-		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
-		insinto /usr/share/applications/ && doins djvulibre-djview3.desktop
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/app-text/djvu/djvu-3.5.20-r1.ebuild b/app-text/djvu/djvu-3.5.20-r1.ebuild
index b55f5fc9c2f4..179430345575 100644
--- a/app-text/djvu/djvu-3.5.20-r1.ebuild
+++ b/app-text/djvu/djvu-3.5.20-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.20-r1.ebuild,v 1.1 2007/12/13 09:52:52 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.20-r1.ebuild,v 1.2 2007/12/24 06:48:10 pva Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
-inherit fdo-mime nsplugins flag-o-matic eutils multilib toolchain-funcs autotools
+inherit fdo-mime nsplugins flag-o-matic eutils multilib toolchain-funcs autotools confutils
 
 MY_P="${PN}libre-${PV}"
 
@@ -19,7 +19,7 @@ IUSE="xml qt3 jpeg tiff debug threads nls nsplugin kde doc"
 
 DEPEND="jpeg? ( >=media-libs/jpeg-6b-r2 )
 	tiff? ( media-libs/tiff )
-	qt3? ( <x11-libs/qt-4 )"
+	qt3? ( =x11-libs/qt-3* )"
 
 S=${WORKDIR}/${MY_P}
 
@@ -35,6 +35,8 @@ pkg_setup() {
 		ewarn "Add \"qt3\" to your USE flags if you want it."
 		ewarn
 	fi
+
+	confutils_use_depend_all nsplugin qt3
 }
 
 src_unpack() {
diff --git a/app-text/djvu/djvu-3.5.20.ebuild b/app-text/djvu/djvu-3.5.20.ebuild
deleted file mode 100644
index 36621bc3d62a..000000000000
--- a/app-text/djvu/djvu-3.5.20.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.20.ebuild,v 1.1 2007/12/10 12:02:04 pva Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-inherit fdo-mime nsplugins flag-o-matic eutils multilib toolchain-funcs autotools
-
-MY_P="${PN}libre-${PV}"
-
-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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="xml qt3 jpeg tiff debug threads nls nsplugin kde doc"
-
-DEPEND="jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( media-libs/tiff )
-	qt3? ( <x11-libs/qt-4 )"
-
-S=${WORKDIR}/${MY_P}
-
-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
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Do not strip binaries as portage does this for us. bug #135208
-	find -name Makefile.in -exec sed -i 's:${INSTALL_PROGRAM} -s:${INSTALL_PROGRAM}:' \{\} \;
-	eautomake
-}
-src_compile() {
-	# assembler problems and hence non-building with pentium4
-	# <obz@gentoo.org>
-	replace-flags -march=pentium4 -march=pentium3
-	echo LINGUAS=$LINGUAS
-
-	# When enabling qt it must be compiled with threads. See bug #89544.
-	if use qt3 ; then
-		QTCONF=" --with-qt --enable-threads "
-	elif use threads ; then
-		QTCONF=" --without-qt --disable-djview --enable-threads "
-	else
-		QTCONF=" --without-qt --disable-djview --disable-threads "
-	fi
-
-	# We install all desktop files by hand.
-	econf --disable-desktopfiles \
-		$(use_enable xml xmltools) \
-		$(use_with jpeg) \
-		$(use_with tiff) \
-		$(use_enable nls i18n) \
-		$(use_enable debug) \
-		${QTCONF} \
-		|| die "econf failed"
-
-	if ! use nsplugin; then
-		sed -e 's:nsdejavu::' -i "${S}"/gui/Makefile || die
-	fi
-
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} install
-
-	dodoc README TODO NEWS
-
-	use doc && cp -r doc/ "${D}"/usr/share/doc/${PF}
-
-	# Install desktop files.
-	cd desktopfiles
-	insinto /usr/share/icons/hicolor/22x22/mimetypes && newins hi22-djvu.png image-vnd.djvu.png
-	insinto	/usr/share/icons/hicolor/32x32/mimetypes && newins hi32-djvu.png image-vnd.djvu.png
-	insinto	/usr/share/icons/hicolor/48x48/mimetypes && newins hi48-djvu.png image-vnd.djvu.png
-	insinto	/usr/share/mime/packages && doins djvulibre-mime.xml
-	if use kde ; then
-		insinto /usr/share/mimelnk/image && doins vnd.djvu.desktop x-djvu.desktop
-		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
-		insinto /usr/share/applications/ && doins djvulibre-djview3.desktop
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/app-text/djvu/files/digest-djvu-3.5.19-r1 b/app-text/djvu/files/digest-djvu-3.5.19-r1
deleted file mode 100644
index 3fb5fdd6713e..000000000000
--- a/app-text/djvu/files/digest-djvu-3.5.19-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0330d87ad337e408e21e1018eb511839 djvulibre-3.5.19.tar.gz 2380092
-RMD160 2eb9b5df021bb7121a051d3256999da27dd3b682 djvulibre-3.5.19.tar.gz 2380092
-SHA256 57ffa154f45de309b352ce53aa6618af2f8639d1e330470c3c955241d44ccd78 djvulibre-3.5.19.tar.gz 2380092
diff --git a/app-text/djvu/files/digest-djvu-3.5.20 b/app-text/djvu/files/digest-djvu-3.5.20
deleted file mode 100644
index 2c0705b80cf0..000000000000
--- a/app-text/djvu/files/digest-djvu-3.5.20
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c94091de014b3aaf037d3d0f398d36c2 djvulibre-3.5.20.tar.gz 2416958
-RMD160 fb755064912586585656b9701b7d98bd3019c67b djvulibre-3.5.20.tar.gz 2416958
-SHA256 d937528e10c16831d8df31893ee24da8ec2bfd9e9170671c482a1b1abfc5efc3 djvulibre-3.5.20.tar.gz 2416958