Bump to CVS snapshot as it fixes plugin crash and amd64.

Package-Manager: portage-2.2_rc23/cvs/Linux i686

3 files changed, 129 insertions, 3 deletions

diff --git a/app-text/djvu/ChangeLog b/app-text/djvu/ChangeLog
index 70e6927f9264..edbb218a12ed 100644
--- a/app-text/djvu/ChangeLog
+++ b/app-text/djvu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/djvu
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.86 2008/12/01 21:23:48 ranger Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.87 2009/01/20 18:38:36 pva Exp $
+
+*djvu-3.5.21_p20090103 (20 Jan 2009)
+
+  20 Jan 2009; Peter Volkov <pva@gentoo.org> +djvu-3.5.21_p20090103.ebuild:
+  Bump to CVS snapshot as it fixes plugin crash and amd64.
 
   01 Dec 2008; Brent Baude <ranger@gentoo.org> djvu-3.5.21.ebuild:
   stable ppc64, bug 244258
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index 99c5ca0edd39..80a200e94fdd 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,10 +1,12 @@
 AUX djvu-3.5.21-parallel-build.patch 2664 RMD160 82b42bc660a02f15f8f71e8ccb164fcc21221ebc SHA1 9b3632421fb3710f0e849530cec1fdfab5844a77 SHA256 074f9e76509976fbe72c1432c1794300501e3fee8e59d10143fb9c8dd13665fc
 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.19.tar.gz 2380092 RMD160 2eb9b5df021bb7121a051d3256999da27dd3b682 SHA1 439977e03c8c35ca74eb5887993edb317923133f SHA256 57ffa154f45de309b352ce53aa6618af2f8639d1e330470c3c955241d44ccd78
 DIST djvulibre-3.5.20.tar.gz 2416958 RMD160 fb755064912586585656b9701b7d98bd3019c67b SHA1 88ec94512f3f7845b42c2585f75e07a9cf147380 SHA256 d937528e10c16831d8df31893ee24da8ec2bfd9e9170671c482a1b1abfc5efc3
 DIST djvulibre-3.5.21.tar.gz 2993718 RMD160 2163b784d705cc7b55bb3d9c9eb85edec44f28a7 SHA1 a6ef5cb1445baa333883754c703abd75cc5b34f6 SHA256 39f80c1810be22c5ea7f6a44bbb449c3e29902895dcff9da6a8440891a67b8b4
 EBUILD djvu-3.5.19.ebuild 3295 RMD160 85ad554d5a7c8dd8990f8f8408c3b3953eba8704 SHA1 965f1fc093303026bba9eaf4829e1438ed84f898 SHA256 8c50ba5e182e3ecd34ec9a002159c8365f1a9e4c4b9af3be3ffd58734f60f9ce
 EBUILD djvu-3.5.20-r1.ebuild 3524 RMD160 f9d14a06cdb2f57eeb4f41ff1ca3de87656551f1 SHA1 b9cdaec5cb6decb40a2d0aa49f639e71bc0dfef2 SHA256 b9ea8ac19f23d61e8db831eff08af6bae3b1c33f83880ce397ef0d9c8de8bc04
 EBUILD djvu-3.5.21.ebuild 3327 RMD160 98f91477ad1eb10d1ddb434726eef015c21bac8a SHA1 895d1553ebb388e32f5b08dfcf4c15eab7afdc8f SHA256 80a93fd443611de1a5f8da5cb7989cc94007a44f60e9d6d59b54441f02de5c1e
-MISC ChangeLog 11188 RMD160 440185705164afb12835040a61867dc370d8a4ec SHA1 f1d4c8c328badedc2cc1eecedb98fe84fe7ea2a2 SHA256 f8c72f0c147435607d883aa6a1b0abc27ae9288a7b341fd07ecc369ba5df0d37
+EBUILD djvu-3.5.21_p20090103.ebuild 3231 RMD160 a401de55ce95aa023673743bbbe184348d3d44d8 SHA1 c297c45756a216f60881b976e58c724c6284ed91 SHA256 b966689496c50118148399634e4843bc28cd52f1ec2d0d35cf885960d60e7ffd
+MISC ChangeLog 11359 RMD160 5664bc71e237ccffbc8afe974348f932d642b3db SHA1 778b9f4c5a77a45596591a7b32a532dda2ec5a6b SHA256 de13ed5b0a4460fa2f60a6f9968b96b1ba231ca0b0f29202e1d50aeccc2c7217
 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
new file mode 100644
index 000000000000..7e24e90bf671
--- /dev/null
+++ b/app-text/djvu/djvu-3.5.21_p20090103.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2009 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.1 2009/01/20 18:38:36 pva Exp $
+
+EAPI=1
+inherit fdo-mime nsplugins flag-o-matic eutils multilib toolchain-funcs confutils
+
+MY_P="${PN}libre-${PV#*_p}"
+
+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 threads nls nsplugin 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 ) )"
+
+S=${WORKDIR}/${MY_P}
+
+LANGS="cs de en fr ja zh"
+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
+		for X in ${LANGS}; do
+			if use linguas_${X}; then
+				I18N="${I18N} ${X}"
+			fi
+		done
+		I18N="${I18N# }"
+		if test -n "$I18N"; then
+			I18N="--enable-i18n=${I18N}"
+		else
+			I18N="--enable-i18n"
+		fi
+	else
+		I18N="--disable-i18n"
+	fi
+
+	# 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) \
+		"${I18N}" \
+		$(use_enable debug) \
+		${QTCONF}
+
+	if ! use nsplugin; then
+		sed -e 's:nsdejavu::' -i "${S}"/gui/Makefile || die
+	fi
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake 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 || die
+	insinto	/usr/share/icons/hicolor/32x32/mimetypes && newins hi32-djvu.png image-vnd.djvu.png || die
+	insinto	/usr/share/icons/hicolor/48x48/mimetypes && newins hi48-djvu.png image-vnd.djvu.png || die
+	insinto	/usr/share/mime/packages && doins djvulibre-mime.xml || die
+	if use kde ; then
+		insinto /usr/share/mimelnk/image && doins vnd.djvu.desktop || die
+		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() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}