Don't install desktop without viewer (bug 188691; thank Justin Blanchard <justinb AT imsa.edu> for report)

Package-Manager: portage-2.1.3.5

4 files changed, 135 insertions, 5 deletions

diff --git a/app-text/djvu/ChangeLog b/app-text/djvu/ChangeLog
index 116704be5ef9..4fff2dbc5e14 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.66 2007/07/22 06:34:22 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.67 2007/08/13 10:26:59 pva Exp $
+
+*djvu-3.5.19-r1 (13 Aug 2007)
+
+  13 Aug 2007; <pva@gentoo.org> +djvu-3.5.19-r1.ebuild:
+  Don't install desktop without viewer (bug 188691; thank Justin Blanchard
+  <justinb AT imsa.edu> for report)
 
   22 Jul 2007; <pva@gentoo.org> -files/djvu-3.5.16-gcc41-hash.patch,
   -files/djvu-3.5.16-gcc41.patch,
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index c47d5f7f2c44..81641a3ebb56 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -3,14 +3,18 @@ MD5 90ec522dba21d16d4df5e55e50e2a36d files/djvulibre-3.5.17-pthread-flag.patch 2
 RMD160 35f4c484e567ed7a7dcfb51559925ed49ad5db26 files/djvulibre-3.5.17-pthread-flag.patch 2419
 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
+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
-MISC ChangeLog 8534 RMD160 58145dc4f02f03c35225639161352c5d6ddf7259 SHA1 4a7d55af889b5121d8a792f3c62f5b8eb2a27c6b SHA256 e96503e763a3398bb0b44eca0928006193eada7efdc298350a14bbd56ee43199
-MD5 13ba80e238f8b466bc9452de09a30d00 ChangeLog 8534
-RMD160 58145dc4f02f03c35225639161352c5d6ddf7259 ChangeLog 8534
-SHA256 e96503e763a3398bb0b44eca0928006193eada7efdc298350a14bbd56ee43199 ChangeLog 8534
+MISC ChangeLog 8733 RMD160 1bdd8a2fae75f9e3a5eb39a5cbde210c2b9bd5c1 SHA1 e760395fbe3ab5b938522f4e316fc40d3d78cb07 SHA256 e9607d9d94da81481c2b13db6537735d8793286b766faeb17ca2bcc8ad83f38c
+MD5 c5c4d059a913e959c128edfda248308e ChangeLog 8733
+RMD160 1bdd8a2fae75f9e3a5eb39a5cbde210c2b9bd5c1 ChangeLog 8733
+SHA256 e9607d9d94da81481c2b13db6537735d8793286b766faeb17ca2bcc8ad83f38c ChangeLog 8733
 MISC metadata.xml 865 RMD160 09cb90b4680856217c680e395e15957263c01472 SHA1 35e8a38a7dbed0d7f547cf21fa5bbb0133591e3d SHA256 13f4ad340f245deb6b5ba0d5ecfd5fe5aa408ff8ef9b2fe37a2f63ffc793c672
 MD5 ad8a8096a50ceca743956ec76d0818ef metadata.xml 865
 RMD160 09cb90b4680856217c680e395e15957263c01472 metadata.xml 865
@@ -18,3 +22,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
diff --git a/app-text/djvu/djvu-3.5.19-r1.ebuild b/app-text/djvu/djvu-3.5.19-r1.ebuild
new file mode 100644
index 000000000000..3a18f8655a5c
--- /dev/null
+++ b/app-text/djvu/djvu-3.5.19-r1.ebuild
@@ -0,0 +1,114 @@
+# 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/files/digest-djvu-3.5.19-r1 b/app-text/djvu/files/digest-djvu-3.5.19-r1
new file mode 100644
index 000000000000..3fb5fdd6713e
--- /dev/null
+++ b/app-text/djvu/files/digest-djvu-3.5.19-r1
@@ -0,0 +1,3 @@
+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