Revert qt3 drop, nsplugin should stay.

Package-Manager: portage-2.1.7.16/cvs/Linux x86_64

3 files changed, 37 insertions, 14 deletions

diff --git a/app-text/djvu/ChangeLog b/app-text/djvu/ChangeLog
index f20ba8964f30..ede6361b8d9c 100644
--- a/app-text/djvu/ChangeLog
+++ b/app-text/djvu/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/djvu
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.99 2010/01/18 10:05:45 pva Exp $
+
+  18 Jan 2010; Peter Volkov <pva@gentoo.org> djvu-3.5.22.ebuild:
+  Revert qt3 drop, nsplugin should stay.
 
   05 Jan 2010; Ben de Groot <yngwin@gentoo.org>
   djvu-3.5.21_p20090103.ebuild, djvu-3.5.22.ebuild:
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index dff5e1bea4ea..050cffa96b92 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -3,6 +3,6 @@ AUX djvulibre-3.5.17-pthread-flag.patch 2419 RMD160 35f4c484e567ed7a7dcfb5155992
 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 2410 RMD160 01b8c3d2a7a13f91693b351e4372df970b42a3a1 SHA1 87b6027017b2c3f040b774ec7302c4a8fcc85ee0 SHA256 e46ed9fa61883e5d113fcd644bdf52d4bebb3cd480166822c682dad1d34eb4fe
-EBUILD djvu-3.5.22.ebuild 2417 RMD160 cb25dff0aa3db7796a286cca8a3901775d05f82c SHA1 e3044dc10999cab23271ad5f941dde20d8336327 SHA256 9fe786554efc2b2dd60396af6bdf1b72140e6da32edee70ace6863545148a9f9
-MISC ChangeLog 12880 RMD160 f65dfa316e501d0b5bb580c22c05d7936312f9dc SHA1 a233f3cb15997b9681e32a2df97e966a49223070 SHA256 eabdee578e0bc58b15a3a7c369abbc45879a4a1b4ed8dad1351b8c1f233331f5
+EBUILD djvu-3.5.22.ebuild 2956 RMD160 5599789477c254b7c65f811b32b634dee7b3cd6b SHA1 aec7ec5ed6d57158561836857ce72b1d457488f2 SHA256 8f12d8f6406c9135b5dd779565b27de996e45b590e949484df150cc4fdb42fb2
+MISC ChangeLog 12984 RMD160 8f0194666bc37ba56d03c8e78b115dbcb7b07181 SHA1 646769d5c419dcab155222aec59b4c3f6be661fb SHA256 bce2cb09d1b56f5ff9bab6e752d57cdcc3d80dd9eb9a69f35a2201be2b86f81a
 MISC metadata.xml 865 RMD160 09cb90b4680856217c680e395e15957263c01472 SHA1 35e8a38a7dbed0d7f547cf21fa5bbb0133591e3d SHA256 13f4ad340f245deb6b5ba0d5ecfd5fe5aa408ff8ef9b2fe37a2f63ffc793c672
diff --git a/app-text/djvu/djvu-3.5.22.ebuild b/app-text/djvu/djvu-3.5.22.ebuild
index 32240401ca4c..d38a051ae226 100644
--- a/app-text/djvu/djvu-3.5.22.ebuild
+++ b/app-text/djvu/djvu-3.5.22.ebuild
@@ -1,9 +1,9 @@
 # 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.4 2010/01/05 11:17:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.22.ebuild,v 1.5 2010/01/18 10:05:45 pva Exp $
 
 EAPI=1
-inherit fdo-mime flag-o-matic eutils multilib toolchain-funcs
+inherit fdo-mime nsplugins flag-o-matic eutils multilib toolchain-funcs confutils
 
 MY_P="${PN}libre-${PV#*_p}"
 
@@ -14,11 +14,13 @@ 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 jpeg tiff debug nls kde doc"
+IUSE="xml qt3 jpeg tiff debug nls nsplugin kde doc"
 
 RDEPEND="jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( media-libs/tiff )"
-DEPEND="${RDEPEND}"
+	tiff? ( media-libs/tiff )
+	qt3? ( x11-libs/qt:3 )"
+DEPEND="${RDEPEND}
+	qt3? ( nsplugin? ( x11-libs/libXt ) )"
 
 S=${WORKDIR}/${MY_P}
 
@@ -27,6 +29,17 @@ 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
@@ -45,17 +58,19 @@ src_compile() {
 		I18N="--disable-i18n"
 	fi
 
-	# We install all desktop files by hand and Qt3 is deprecated
-	econf \
-		--disable-desktopfiles \
-		--without-qt \
+	# We install all desktop files by hand.
+	econf --disable-desktopfiles \
+		$(use_with qt3 qt) \
 		$(use_enable xml xmltools) \
 		$(use_with jpeg) \
 		$(use_with tiff) \
 		"${I18N}" \
-		$(use_enable debug)
+		$(use_enable debug) \
+		${QTCONF}
 
-	sed -e 's:nsdejavu::' -i "${S}"/gui/Makefile || die
+	if ! use nsplugin; then
+		sed -e 's:nsdejavu::' -i "${S}"/gui/Makefile || die
+	fi
 
 	emake || die "emake failed"
 }
@@ -78,6 +93,11 @@ 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() {