Version bump. Fixes gcc46 build issue, bug #361057, thank Vladimir for report and Ryan Hill for fix.

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

4 files changed, 118 insertions, 12 deletions

diff --git a/app-text/djvu/ChangeLog b/app-text/djvu/ChangeLog
index 5083c25100e7..348405d86324 100644
--- a/app-text/djvu/ChangeLog
+++ b/app-text/djvu/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/djvu
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.117 2011/04/16 18:52:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.118 2011/04/30 20:14:27 pva Exp $
+
+*djvu-3.5.24 (30 Apr 2011)
+
+  30 Apr 2011; Peter Volkov <pva@gentoo.org> +djvu-3.5.24.ebuild,
+  +files/djvu-3.5.24-gcc46.patch:
+  Version bump. Fixes gcc46 build issue, bug #361057, thank Vladimir for report
+  and Ryan Hill for fix.
 
   16 Apr 2011; Raúl Porcel <armin76@gentoo.org> djvu-3.5.23.ebuild:
   ia64/s390/sh stable wrt #358193
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index 5c4ab9da5dbf..1e1368b84b13 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX djvu-3.5.24-gcc46.patch 332 RMD160 63a7d0425bb50399b348b6640d96d3377eee4605 SHA1 b9639e6b5701dd7de1b11d880047b4f20398db99 SHA256 493d241e1a91a1dc3ab0b46678eccee8db8a8bce15ad4fa1d828ad7a1ef5a259
 DIST djvulibre-3.5.22.tar.gz 3027985 RMD160 f74cec88c5fbda28976e64669d3e48833b4dfdcd SHA1 f869d4114052a7df7b8da2d334d124934f1293a6 SHA256 3d9242f98db8f5fc8ca239ccaa91e70c20451fe3b3fa8de6f133e0888f89f0be
 DIST djvulibre-3.5.23.tar.gz 3028428 RMD160 66d6dc71cdaa8c2412197f52562c99bef6b924a6 SHA1 b19f6b461515a52eb1048aec81e04dfd836d681f SHA256 608c07e629626cfe713168c942a07d2db3b0b19df4aae1f598473f4a2daf213d
+DIST djvulibre-3.5.24.tar.gz 2998853 RMD160 cee93324ecfa7d832f29f390b4e8d82424b9eed0 SHA1 075d1d4a333a2fe74e4c9240d853be016e27e983 SHA256 c0734c81d22a0e458c3fb5efd4c3eab051bcb6ad8740f5a5784c1f5699482534
 EBUILD djvu-3.5.22-r1.ebuild 2214 RMD160 1e764bb53716bc5204663ebb9b465b0c90d02d0b SHA1 7f73773bdb0187f631ea036c3548c9f1dc61dcf6 SHA256 9a8f5a62f658883a46f15838a6f04fad591c0befbc4a2a5b53b528a2c08154e5
 EBUILD djvu-3.5.23.ebuild 2035 RMD160 3d2d054e96e8a7da13769bdbd6fba1e64a5bb58b SHA1 36dfc8c2d463482463a15342ac3a852a7c90e84b SHA256 50d58ba81449efa5bbbe760d34f751c08461fe8fa03da141b793edb93f79d6db
-MISC ChangeLog 15106 RMD160 f4c8ff8e312f148b63792edd9b43732ef7407cc8 SHA1 dfe5ddd677f7612b20412e572babc8a6053f8502 SHA256 f4856ed5e80c5d635482c908c7eb1a7a98cd3603bc68a1e635bb6d056b09756c
+EBUILD djvu-3.5.24.ebuild 2251 RMD160 9eccbff81d3053df90ab9b1569b3db6aaaee6536 SHA1 b28c0bf7870cbb9df86ec2678dcc30bbb806b909 SHA256 4da4483b7f3668fbbaa9b360d77ac341946d1084276de1312e85a9f53e09131f
+MISC ChangeLog 15336 RMD160 b81519387fb6505f9302984521688bb1d63d9311 SHA1 3e2aeea818633a043a94385a7c5ebf54b46b273f SHA256 498c821d99b979b689b0f5eaf9fd1eb59b24613814504af3265c7ae068369205
 MISC metadata.xml 865 RMD160 09cb90b4680856217c680e395e15957263c01472 SHA1 35e8a38a7dbed0d7f547cf21fa5bbb0133591e3d SHA256 13f4ad340f245deb6b5ba0d5ecfd5fe5aa408ff8ef9b2fe37a2f63ffc793c672
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk2p5V8ACgkQuQc30/atMkBzrwCfTkWi6UUoIEBhnk3nTmATvg5G
-3CQAnjQBdXThqNHldXZHFKEId/yBPqiW
-=2fj7
------END PGP SIGNATURE-----
diff --git a/app-text/djvu/djvu-3.5.24.ebuild b/app-text/djvu/djvu-3.5.24.ebuild
new file mode 100644
index 000000000000..15d54b1b7142
--- /dev/null
+++ b/app-text/djvu/djvu-3.5.24.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.24.ebuild,v 1.1 2011/04/30 20:14:28 pva Exp $
+
+EAPI="4"
+inherit eutils fdo-mime autotools flag-o-matic
+
+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="debug doc jpeg nls tiff xml"
+
+RDEPEND="jpeg? ( virtual/jpeg )
+	tiff? ( media-libs/tiff )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+# No gui, only manual pages left and only on ja...
+LANGS="ja"
+IUSE+=" $(printf "linguas_%s" ${LANGS})"
+
+src_prepare() {
+	sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688
+	rm aclocal.m4 config/{libtool.m4,ltmain.sh,install-sh}
+	epatch "${FILESDIR}/${P}-gcc46.patch"
+	AT_M4DIR="config" eautoreconf
+}
+
+src_configure() {
+	local X 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
+
+	use debug && append-cppflags "-DRUNTIME_DEBUG_ONLY"
+
+	# We install all desktop files by hand.
+	econf --disable-desktopfiles \
+		--without-qt \
+		$(use_enable xml xmltools) \
+		$(use_with jpeg) \
+		$(use_with tiff) \
+		"${I18N}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc README TODO NEWS
+	use doc && dodoc -r doc
+
+	# Install desktop files.
+	cd desktopfiles
+	for i in {22,32,48,64}; do
+		insinto /usr/share/icons/hicolor/${i}x${i}/mimetypes
+		newins hi${i}-djvu.png image-vnd.djvu.png
+	done
+	insinto /usr/share/mime/packages
+	doins djvulibre-mime.xml
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+	if ! has_version app-text/djview4 || ! has_version app-text/djview; then
+		elog "For djviewer or browser plugin, emerge app-text/djview."
+	fi
+	if has_version app-text/djview4; then
+		ewarn "Note, that app-text/djview4 has changed its name to app-text/djview."
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+}
diff --git a/app-text/djvu/files/djvu-3.5.24-gcc46.patch b/app-text/djvu/files/djvu-3.5.24-gcc46.patch
new file mode 100644
index 000000000000..5eb23cd44e62
--- /dev/null
+++ b/app-text/djvu/files/djvu-3.5.24-gcc46.patch
@@ -0,0 +1,13 @@
+=== modified file 'libdjvu/GSmartPointer.h'
+--- libdjvu/GSmartPointer.h	2011-04-30 19:29:11 +0000
++++ libdjvu/GSmartPointer.h	2011-04-30 19:34:21 +0000
+@@ -62,6 +62,8 @@
+ # pragma interface
+ #endif
+ 
++#include <cstddef>
++
+ /** @name GSmartPointer.h
+ 
+     Files #"GSmartPointer.h"# and #"GSmartPointer.cpp"# define a smart-pointer
+