Fixed nsbrowser plugin, qt threads problem bug #89544 and version bump bug #101389.

(Portage version: 2.1_pre3-r1)

4 files changed, 88 insertions, 15 deletions

diff --git a/app-text/djvu/ChangeLog b/app-text/djvu/ChangeLog
index 5b814ef9a1fb..e6519306381a 100644
--- a/app-text/djvu/ChangeLog
+++ b/app-text/djvu/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/djvu
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.25 2005/09/17 19:49:16 flameeyes Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.26 2006/01/23 19:50:01 ehmsen Exp $
+
+*djvu-3.5.16 (23 Jan 2006)
+
+  23 Jan 2006; Martin Ehmsen <ehmsen@gentoo.org> +djvu-3.5.16.ebuild:
+  DjVu must be compile with threads if qt is enabled for djview to get
+  compiled, see bug #89544.
+  Fixed nsbrowser plugin install location.
+  Version bump, see bug #101389.
 
   16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
   Converted to UTF-8, fixed encoding screwups
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index ea2e2ff00166..4826f626282c 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 66842404ce1a80d17f3ab4f43ccea6b6 ChangeLog 3138
 MD5 9755fe91fba4e4fd0fcc505b688975ad djvu-3.5.12.ebuild 1044
-MD5 9ea65b6aaa0b0ad499459ad8bbcea63a ChangeLog 2864
-MD5 986cb703c5675d7e0fd2df81fdb6bb64 djvu-3.5.14.ebuild 1108
 MD5 214930004dd850e115ab479b188d43be djvu-3.5.14-r1.ebuild 1575
-MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+MD5 986cb703c5675d7e0fd2df81fdb6bb64 djvu-3.5.14.ebuild 1108
+MD5 b407079cbfd9183591a5423576a99800 djvu-3.5.16.ebuild 1670
 MD5 376a63d9cbc58a7737d37680734f0ee0 files/digest-djvu-3.5.12 69
 MD5 4a5cc41ce600d15a29fd720f279aaaf1 files/digest-djvu-3.5.14 69
 MD5 4a5cc41ce600d15a29fd720f279aaaf1 files/digest-djvu-3.5.14-r1 69
+MD5 9d143101f8c3e394b08fef327d262e26 files/digest-djvu-3.5.16 69
 MD5 0da6de34d8db09192d2c881416108427 files/gentoo-acdesktop.m4 2491
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDLHNbj5H05b2HAEkRAqcjAJ9i3T8nq6j9i2HfZUvcyxibdpj6EACggH5n
-FtYH4Vn2jT46IJZLzrUBnMA=
-=45jN
------END PGP SIGNATURE-----
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
diff --git a/app-text/djvu/djvu-3.5.16.ebuild b/app-text/djvu/djvu-3.5.16.ebuild
new file mode 100644
index 000000000000..d65aac0aa3d7
--- /dev/null
+++ b/app-text/djvu/djvu-3.5.16.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.16.ebuild,v 1.1 2006/01/23 19:50:01 ehmsen Exp $
+
+inherit nsplugins flag-o-matic fdo-mime
+
+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="~x86 ~sparc ~amd64 ~ppc"
+IUSE="xml qt jpeg tiff debug threads nls nsplugin kde"
+
+DEPEND="jpeg? ( >=media-libs/jpeg-6b-r2 )
+	tiff? ( media-libs/tiff )
+	qt? ( <x11-libs/qt-4 )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+
+	# Replace autochecking acdesktop.m4 with a gentoo-specific one
+	cp ${FILESDIR}/gentoo-acdesktop.m4 ${S}/gui/desktop/acdesktop.m4
+
+	cd ${S}
+	aclocal -I config -I gui/desktop || die "aclocal failed"
+	autoconf || die "autoconf failed"
+	libtoolize --copy --force
+}
+
+src_compile() {
+	# assembler problems and hence non-building with pentium4 
+	# <obz@gentoo.org>
+	replace-flags -march=pentium4 -march=pentium3
+
+	if use kde ; then
+		export kde_mimelnk=/usr/share/mimelnk
+	fi
+
+	# When enabling qt it must be compiled with threads. See bug #89544.
+	if use qt ; then
+		QTCONF=" --with-qt --enable-threads "
+	elif use threads ; then
+		QTCONF=" --enable-threads "
+	else
+		QTCONF=" --disable-threads "
+	fi
+
+	econf --enable-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:nsdjvu::' -i ${S}/gui/Makefile
+	fi
+
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} plugindir=/usr/lib/${PLUGINS_DIR} install
+}
diff --git a/app-text/djvu/files/digest-djvu-3.5.16 b/app-text/djvu/files/digest-djvu-3.5.16
new file mode 100644
index 000000000000..405a43141371
--- /dev/null
+++ b/app-text/djvu/files/digest-djvu-3.5.16
@@ -0,0 +1 @@
+MD5 5591c99a50aed1613a796a5aa4978fc0 djvulibre-3.5.16.tar.gz 1803961