[app-text/poppler] Update from main portage tree

6 files changed, 99 insertions, 136 deletions

diff --git a/Documentation/maintainers/import_poppler b/Documentation/maintainers/import_poppler
index 736d91e5..87d045b1 100755
--- a/Documentation/maintainers/import_poppler
+++ b/Documentation/maintainers/import_poppler
@@ -11,7 +11,7 @@ cp -r "${PORTDIR:-/usr/portage}/app-text/poppler" app-text/
 sed -i \
     -e 's/^\(IUSE=.*\) qt4/\1 qt3 qt4/' \
     -e 's/-DWITH_Qt3=OFF/$(cmake-utils_use_with qt3)/' \
-    -e 's/^\([ \t]*\)\(qt4? ( x11-libs\/qt-core:4\)/\1qt3? ( >=x11-libs\/qt-3.3:3 )\n\1\2/' \
+    -e 's/^\([ \t]*\)\(qt4? (\)/\1qt3? ( >=x11-libs\/qt-3.3:3 )\n\1\2/' \
     -e 's/^\(inherit.*\)/\1 qt3/' \
     app-text/poppler/*.ebuild
 
diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index b21dccc3..2b8e125f 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,36 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.230 2010/04/25 17:37:03 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.236 2010/06/09 14:38:35 scarabeus Exp $
+
+  09 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  poppler-0.14.0-r1.ebuild:
+  Use preserved_old_lib features to be nice on <portage-2.2 guys.
+
+*poppler-0.14.0-r1 (09 Jun 2010)
+
+  09 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -poppler-0.14.0.ebuild, +poppler-0.14.0-r1.ebuild:
+  Update tarball to not use screwed one released by upstream. Revbump to
+  force update.
+
+*poppler-0.14.0 (08 Jun 2010)
+
+  08 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  +poppler-0.14.0.ebuild:
+  Version bump 0.14.0
+
+  08 Jun 2010; Fabian Groffen <grobian@gentoo.org> poppler-0.12.4-r3.ebuild:
+  Don't define _XOPEN_SOURCE on Solaris either, such that we can compile
+  there too.
+
+  19 May 2010; Fabian Groffen <grobian@gentoo.org> poppler-0.12.4-r3.ebuild:
+  Fixed compilation on Darwin 8 (OSX 10.4) by not defining _XOPEN_SOURCE at
+  all.
+
+  17 May 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  -poppler-0.12.3-r6.ebuild, -poppler-0.12.4-r2.ebuild,
+  poppler-0.12.4-r3.ebuild:
+  Remove old versions
 
 *poppler-0.12.4-r3 (25 Apr 2010)
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index d5aa01bf..39938563 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -11,9 +11,9 @@ AUX poppler-0.12.4-strings_h.patch 927 RMD160 f1bbe64a295a78ba3596b1ad834cd14859
 AUX poppler-0.12.4-xopen_source.patch 1878 RMD160 13541fb85dec76297d1d35c9591c1f7b6b720a62 SHA1 b98a3a25f867000aa937e1b9e1e39cec7a7b829d SHA256 2c6877e6bf886d7fbda08cdf2f7a0716c876bb6f5406b8919986306b5e589758
 DIST poppler-0.12.3.tar.gz 1616883 RMD160 a8fd07ec4dc918cc17390a5236aff9a43e1f7253 SHA1 bce8b675fb7c22d507b1965efa7bd71d9ce09460 SHA256 7a4ffe6d2950c446c285700d3b2dc399540a27ce635dd712aff646f02f8dfbcc
 DIST poppler-0.12.4.tar.gz 1674400 RMD160 9c212ebb8fc3d4cbc532f1c826428cc4d195cb5b SHA1 306507e0fbf47736b456218618f043a216c263ef SHA256 2afa2a54bd4ccb09e92f82b64bcafa95d39a404a3b3db9d6a5fcad0e0229857a
+DIST poppler-0.14.0.tar.bz2 887492 RMD160 a90ff77a186afa096bebc2d04af1c3d49a146898 SHA1 cd3505688435f9288bdb4b8384c60dc5adac822f SHA256 a5d64d5d0d416c7130694993acc68e3c96e4aeb070b9d12dc6ab6cb3b75cc720
 EBUILD poppler-0.12.3-r3.ebuild 2798 RMD160 cff94d54b4290fafe11d16b1ffd56b0104e7b39b SHA1 3ca019b2a41b8a5e14d2471ef73dee6b4758fe91 SHA256 2bffaada1b931e1b115ad0173ccf7ea29e94ee1a78a970daf8673df61fe5a563
-EBUILD poppler-0.12.3-r6.ebuild 2934 RMD160 62cc12cca9fc6afceeaf64a267079eada39140fd SHA1 25344ea43513ddaee64b7023ed6c27b0882aac91 SHA256 fc9b963488fb61ad6936f6f0f7cfe2041948933641574709e24fb4a546267bee
-EBUILD poppler-0.12.4-r2.ebuild 3028 RMD160 4d1653abe79409996a64c4b7cabee126755edec2 SHA1 ae0b532eda73a425098d9e5fc308e1be564c93a1 SHA256 016f92287f0763771436e34d3863a5991ddb2ec9af388211ec846f2d9d99ca31
-EBUILD poppler-0.12.4-r3.ebuild 3149 RMD160 eba98e5ed990056b39c91955296caf530f9e4290 SHA1 c9f4e194a25c5d00b61ca731e220909a86db1f9f SHA256 8e1ee02601faf50a651ba52ed57128a4d9e8ce31df62430101d0956fc62a1ee0
-MISC ChangeLog 33137 RMD160 ba959fbf273a57760f20ad968df16ee5e8243eb6 SHA1 595e9a72b91548135209b01e6fd8ead1a7b95c63 SHA256 57866c4bc5a82103c7240e5b5a9766ee5b275b7dc49912e97671ce66d6147212
+EBUILD poppler-0.12.4-r3.ebuild 3661 RMD160 4ee571977ca9f435c96d9821b9f333ddd40bfb4c SHA1 80ba5f180f698f9f61909d7c7c7859ee7d4f5027 SHA256 12daff043bbcb6f9e6508f25be9252d0c9c06559538897745dfb5a7e86178ead
+EBUILD poppler-0.14.0-r1.ebuild 2796 RMD160 7ac305d2d1e49e8c494838fb02a4f9f64a80431f SHA1 050d45bd542ea9b54b573c0d2547a4475ebca768 SHA256 0ce24b4e9d8ad106c38443f12bf40b70ddc21a7cfd26f28c93b95b21bd54e383
+MISC ChangeLog 34140 RMD160 05139e8e479ee08334f5c4a80557f4f176490728 SHA1 52ce2f3c6b987df9a22bc08fbde8728cb29f28e1 SHA256 13ac66ab69c944e41360dae33c5af479446eda1f1fc9cb91b1a6fd8477a76aa1
 MISC metadata.xml 662 RMD160 b2bfa73aa44dfcdd9174ab7ae7e210957dd1dead SHA1 c53dbd326209bbbd743a539c08a07bb4d045507b SHA256 484bd11aa8a96c00b419805d8ca7537ac1adb99385894ff0f3d6cb7f8d1cc3ae
diff --git a/app-text/poppler/poppler-0.12.4-r2.ebuild b/app-text/poppler/poppler-0.12.4-r2.ebuild
deleted file mode 100644
index b33cf753..00000000
--- a/app-text/poppler/poppler-0.12.4-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.4-r2.ebuild,v 1.1 2010/04/10 02:13:17 reavertm Exp $
-
-EAPI="2"
-
-inherit cmake-utils qt3
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="http://poppler.freedesktop.org/"
-SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+abiword cairo cjk debug doc exceptions jpeg jpeg2k +lcms png qt3 qt4 +utils +xpdf-headers"
-
-COMMON_DEPEND=">=media-libs/fontconfig-2.6.0
-	>=media-libs/freetype-2.3.9
-	sys-libs/zlib
-	abiword? ( dev-libs/libxml2:2 )
-	cairo? ( dev-libs/glib:2
-			 >=x11-libs/cairo-1.8.4
-			 >=x11-libs/gtk+-2.14.0:2 )
-	jpeg? ( >=media-libs/jpeg-7:0 )
-	jpeg2k? ( media-libs/openjpeg )
-	lcms? ( media-libs/lcms )
-	png? ( media-libs/libpng )
-	qt3? ( >=x11-libs/qt-3.3:3 )
-	qt4? ( x11-libs/qt-core:4
-		   x11-libs/qt-gui:4 )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	!dev-libs/poppler
-	!dev-libs/poppler-glib
-	!dev-libs/poppler-qt3
-	!dev-libs/poppler-qt4
-	!app-text/poppler-utils
-	cjk? ( >=app-text/poppler-data-0.2.1 )"
-
-DOCS="AUTHORS ChangeLog NEWS README README-XPDF TODO"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.12.3-cmake-disable-tests.patch
-	epatch "${FILESDIR}"/${PN}-0.12.3-fix-headers-installation.patch
-	epatch "${FILESDIR}"/${PN}-0.12.3-gdk.patch
-	epatch "${FILESDIR}"/${PN}-0.12.3-darwin-gtk-link.patch
-	epatch "${FILESDIR}"/${P}-config.patch  #304407
-	epatch "${FILESDIR}"/${PN}-0.12.3-cairo-downscale.patch  #303817
-	epatch "${FILESDIR}"/${PN}-0.12.3-preserve-cflags.patch  #309297
-	epatch "${FILESDIR}"/${PN}-0.12.4-nanosleep-rt.patch
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT4_TESTS=OFF
-		$(cmake-utils_use_with qt3)
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		$(cmake-utils_use_enable abiword)
-		$(cmake-utils_use_enable lcms)
-		$(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
-		$(cmake-utils_use_enable utils)
-		$(cmake-utils_use_enable xpdf-headers XPDF_HEADERS)
-		$(cmake-utils_use_with cairo)
-		$(cmake-utils_use_with cairo GTK)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with png)
-		$(cmake-utils_use_with qt4)
-		$(cmake-utils_use exceptions USE_EXCEPTIONS)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use cairo && use doc; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/* || die 'failed to install API documentation'
-	fi
-}
-
-pkg_postinst() {
-	ewarn 'After upgrading app-text/poppler you may need to reinstall packages'
-	ewarn 'depending on it. If you have gentoolkit installed, you can find those'
-	ewarn 'with `equery d poppler`.'
-}
diff --git a/app-text/poppler/poppler-0.12.4-r3.ebuild b/app-text/poppler/poppler-0.12.4-r3.ebuild
index be25a1c0..dc0601d2 100644
--- a/app-text/poppler/poppler-0.12.4-r3.ebuild
+++ b/app-text/poppler/poppler-0.12.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild,v 1.1 2010/04/25 17:37:03 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild,v 1.7 2010/06/08 19:18:43 grobian Exp $
 
 EAPI="2"
 
@@ -11,33 +11,41 @@ HOMEPAGE="http://poppler.freedesktop.org/"
 SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
 IUSE="+abiword cairo cjk debug doc exceptions jpeg jpeg2k +lcms png qt3 qt4 +utils +xpdf-headers"
 
-COMMON_DEPEND=">=media-libs/fontconfig-2.6.0
+COMMON_DEPEND="
+	>=media-libs/fontconfig-2.6.0
 	>=media-libs/freetype-2.3.9
 	sys-libs/zlib
 	abiword? ( dev-libs/libxml2:2 )
-	cairo? ( dev-libs/glib:2
-			 >=x11-libs/cairo-1.8.4
-			 >=x11-libs/gtk+-2.14.0:2 )
+	cairo? (
+		dev-libs/glib:2
+		>=x11-libs/cairo-1.8.4
+		>=x11-libs/gtk+-2.14.0:2
+	)
 	jpeg? ( >=media-libs/jpeg-7:0 )
 	jpeg2k? ( media-libs/openjpeg )
 	lcms? ( media-libs/lcms )
 	png? ( media-libs/libpng )
 	qt3? ( >=x11-libs/qt-3.3:3 )
-	qt4? ( x11-libs/qt-core:4
-		   x11-libs/qt-gui:4 )"
+	qt4? (
+		x11-libs/qt-core:4
+		x11-libs/qt-gui:4
+	)
+"
 DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+"
 RDEPEND="${COMMON_DEPEND}
 	!dev-libs/poppler
 	!dev-libs/poppler-glib
 	!dev-libs/poppler-qt3
 	!dev-libs/poppler-qt4
 	!app-text/poppler-utils
-	cjk? ( >=app-text/poppler-data-0.2.1 )"
+	cjk? ( >=app-text/poppler-data-0.2.1 )
+"
 
 DOCS="AUTHORS ChangeLog NEWS README README-XPDF TODO"
 
@@ -52,6 +60,14 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.12.4-nanosleep-rt.patch
 	epatch "${FILESDIR}"/${PN}-0.12.4-strings_h.patch #314925
 	epatch "${FILESDIR}"/${PN}-0.12.4-xopen_source.patch #314925
+	# The whole _XOPEN_SOURCE thing breaks OSX Tiger and Solaris, this
+	# is introduced by #309297, and made worse by #314925.  Since
+	# vanilla sources don't have this enabled, the whole _XOPEN_SOURCE
+	# isn't set by default, and hence correct from upstream's point of
+	# view.  FreeBSD folks should file a proper bug for #314925 if they
+	# really need it to compile vanilla sources.
+	[[ ${CHOST} == *-darwin8 || ${CHOST} == *-solaris* ]] && \
+		sed -i -e '/add_definitions/d' cmake/modules/PopplerMacros.cmake
 }
 
 src_configure() {
@@ -62,8 +78,8 @@ src_configure() {
 		-DENABLE_SPLASH=ON
 		-DENABLE_ZLIB=ON
 		$(cmake-utils_use_enable abiword)
-		$(cmake-utils_use_enable lcms)
 		$(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
+		$(cmake-utils_use_enable lcms)
 		$(cmake-utils_use_enable utils)
 		$(cmake-utils_use_enable xpdf-headers XPDF_HEADERS)
 		$(cmake-utils_use_with cairo)
diff --git a/app-text/poppler/poppler-0.12.3-r6.ebuild b/app-text/poppler/poppler-0.14.0-r1.ebuild
index 5e6848cd..d3837a46 100644
--- a/app-text/poppler/poppler-0.12.3-r6.ebuild
+++ b/app-text/poppler/poppler-0.14.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.3-r6.ebuild,v 1.1 2010/04/10 02:13:17 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.14.0-r1.ebuild,v 1.2 2010/06/09 14:38:35 scarabeus Exp $
 
 EAPI="2"
 
@@ -8,59 +8,64 @@ inherit cmake-utils qt3
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
 HOMEPAGE="http://poppler.freedesktop.org/"
-SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
+SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+abiword cairo cjk debug doc exceptions jpeg jpeg2k +lcms png qt3 qt4 +utils +xpdf-headers"
+SLOT="0"
+IUSE="+abiword cairo cjk curl cxx debug doc exceptions jpeg jpeg2k +lcms png qt3 qt4 +utils +xpdf-headers"
+
+# No test data provided
+RESTRICT="test"
 
-COMMON_DEPEND=">=media-libs/fontconfig-2.6.0
+COMMON_DEPEND="
+	>=media-libs/fontconfig-2.6.0
 	>=media-libs/freetype-2.3.9
 	sys-libs/zlib
 	abiword? ( dev-libs/libxml2:2 )
-	cairo? ( dev-libs/glib:2
-			 >=x11-libs/cairo-1.8.4
-			 >=x11-libs/gtk+-2.14.0:2 )
+	cairo? (
+		dev-libs/glib:2
+		>=x11-libs/cairo-1.8.4
+		>=x11-libs/gtk+-2.14.0:2
+	)
+	curl? ( net-misc/curl )
 	jpeg? ( >=media-libs/jpeg-7:0 )
 	jpeg2k? ( media-libs/openjpeg )
 	lcms? ( media-libs/lcms )
 	png? ( media-libs/libpng )
 	qt3? ( >=x11-libs/qt-3.3:3 )
-	qt4? ( x11-libs/qt-core:4
-		   x11-libs/qt-gui:4 )"
+	qt4? (
+		x11-libs/qt-core:4
+		x11-libs/qt-gui:4
+	)
+"
 DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+"
 RDEPEND="${COMMON_DEPEND}
 	!dev-libs/poppler
 	!dev-libs/poppler-glib
 	!dev-libs/poppler-qt3
 	!dev-libs/poppler-qt4
 	!app-text/poppler-utils
-	cjk? ( >=app-text/poppler-data-0.2.1 )"
+	cjk? ( >=app-text/poppler-data-0.2.1 )
+"
 
-DOCS="AUTHORS ChangeLog NEWS README README-XPDF TODO"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cmake-disable-tests.patch
-	epatch "${FILESDIR}"/${P}-fix-headers-installation.patch
-	epatch "${FILESDIR}"/${P}-gdk.patch
-	epatch "${FILESDIR}"/${P}-darwin-gtk-link.patch
-	epatch "${FILESDIR}"/${P}-config.patch  #304407
-	epatch "${FILESDIR}"/${P}-cairo-downscale.patch  #303817
-	epatch "${FILESDIR}"/${PN}-0.12.3-preserve-cflags.patch  #309297
-}
+DOCS=(AUTHORS NEWS README README-XPDF TODO)
 
 src_configure() {
 	mycmakeargs=(
 		-DBUILD_GTK_TESTS=OFF
 		-DBUILD_QT4_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
 		$(cmake-utils_use_with qt3)
 		-DENABLE_SPLASH=ON
 		-DENABLE_ZLIB=ON
 		$(cmake-utils_use_enable abiword)
-		$(cmake-utils_use_enable lcms)
+		$(cmake-utils_use_enable curl LIBCURL)
+		$(cmake-utils_use_enable cxx CPP)
 		$(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
+		$(cmake-utils_use_enable lcms)
 		$(cmake-utils_use_enable utils)
 		$(cmake-utils_use_enable xpdf-headers XPDF_HEADERS)
 		$(cmake-utils_use_with cairo)
@@ -84,8 +89,12 @@ src_install() {
 	fi
 }
 
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/libpoppler-glib.so.5
+	preserve_old_lib /usr/$(get_libdir)/libpoppler.so.6
+}
+
 pkg_postinst() {
-	ewarn 'After upgrading app-text/poppler you may need to reinstall packages'
-	ewarn 'depending on it. If you have gentoolkit installed, you can find those'
-	ewarn 'with `equery d poppler`.'
+	preserve_old_lib_notify /usr/$(get_libdir)/libpoppler-glib.so.5
+	preserve_old_lib_notify /usr/$(get_libdir)/libpoppler.so.6
 }