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

4 files changed, 126 insertions, 8 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 0f858bfc..0b5f52fb 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,30 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.281 2011/04/03 18:27:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.286 2011/04/16 05:56:36 tomka Exp $
+
+  16 Apr 2011; Thomas Kahle <tomka@gentoo.org> poppler-0.14.5-r1.ebuild:
+  x86 stable per bug 308017
+
+  15 Apr 2011; Christoph Mende <angelos@gentoo.org> poppler-0.14.5-r1.ebuild:
+  Stable on amd64 wrt bug #308017
+
+*poppler-0.16.4 (15 Apr 2011)
+
+  15 Apr 2011; Maciej Mrozowski <reavertm@gentoo.org>
+  -poppler-0.16.3-r1.ebuild, +poppler-0.16.4.ebuild:
+  Version bump, remove old
+
+  14 Apr 2011; Jeroen Roovers <jer@gentoo.org> poppler-0.14.5-r1.ebuild:
+  Stable for HPPA (bug #308017).
+
+*poppler-0.16.3-r1 (14 Apr 2011)
+*poppler-0.14.5-r1 (14 Apr 2011)
+
+  14 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +poppler-0.14.5-r1.ebuild, -poppler-0.16.3.ebuild,
+  +poppler-0.16.3-r1.ebuild:
+  Disable abiword backend (not supported anymore, security issues, bug
+  308017)
 
   03 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -poppler-0.14.4.ebuild:
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 85c50d24..dce18c94 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,6 +1,7 @@
 DIST poppler-0.14.5.tar.gz 1798194 RMD160 80d4441912b02d89777405ce03f8e175c4ccfa9e SHA1 e23b115e4ebc06c937318688b06a7c6b3319a00a SHA256 c805317c4c1a7080098ae8c7c2a1c1b8e2c784858fc2e04941878eeb8164814c
-DIST poppler-0.16.3.tar.gz 1948009 RMD160 fa32924ef23f0eb9e134f8d98ae35ecf2cbf29df SHA1 0da87a1c3dc11a2c1e31c5c6603d5479545354bb SHA256 23d1fee6c5c91fe488d2c49c5da9938c751c41dc9f87f407d1ce9e38304505d1
+DIST poppler-0.16.4.tar.gz 1949196 RMD160 9f1cb773ea6ae933dcf1f2c7923c3a6efc2ae82f SHA1 e5194c04646b919172b96299f9299f90833ed943 SHA256 0e48e54d6e6d7269f049cf9d060e3ed078cad69808bda8a6da285a7b41c3a2a6
+EBUILD poppler-0.14.5-r1.ebuild 2641 RMD160 1a6e936a0224c4cedabd81bcaf43dc0f80d91bff SHA1 88931ed50adef75f7118a67cd47829dfd7d0aa01 SHA256 da74d4d543686279855dd086fcdd4c47b9333ac065b17fab701bf422d3b0c573
 EBUILD poppler-0.14.5.ebuild 2690 RMD160 21387b1df56f41bfd06e5791892d4fe3e2afa29c SHA1 2b9c318344b214628dcbb0da48706a9c1c69a8ef SHA256 d5e7136aca07217102825e3f4a87f929e7955d79cdd2db16aa4e41a200418fac
-EBUILD poppler-0.16.3.ebuild 2876 RMD160 0d895e9e9f26a26c169ea0b816e6f4b71f53a966 SHA1 ace5e72e1ed3f7fcce2468c68c00a0582bf90793 SHA256 1716410b9cfbe970da85c394cf6c54e14b37ce5d881af600d86ef19264c07763
-MISC ChangeLog 39733 RMD160 d142f940f1f54892516a58012641858cacdee09f SHA1 ac17ce78f1eeeba7ffd097cfc059f2221a095558 SHA256 aeb85d59afff4fc762c0abfdc5ea7b75392447c00622bf7309d169c283d56594
+EBUILD poppler-0.16.4.ebuild 2821 RMD160 3139e9cda4d06ed3c1a7e16e7f471de651afb05b SHA1 e7a6424338f95dfa376e8f10ba8b72255459110f SHA256 7493458337f9301099a4d996d77c86e71855eb69cd9e8c3f20df65a11a2d4fea
+MISC ChangeLog 40505 RMD160 e2f11df08030ff4b2108d03ac461872c9f6e8674 SHA1 dbce18a9e35f7591a520a41a459f12c6c11cd211 SHA256 1117a0723feafe60f4aa7939b66a5e2b68422e3e9e00111b623ffd444620b9cc
 MISC metadata.xml 655 RMD160 a03607c3809e0ceeaecf8c72950a88e242323ebe SHA1 1a02720d525df969c8f30b9587fb0da845817ba5 SHA256 2963931ac0f87f5e878bf7e6f983b393a2a9da2178b9b84e97444a85d27bc95d
diff --git a/app-text/poppler/poppler-0.14.5-r1.ebuild b/app-text/poppler/poppler-0.14.5-r1.ebuild
new file mode 100644
index 00000000..5f7bd9f8
--- /dev/null
+++ b/app-text/poppler/poppler-0.14.5-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.14.5-r1.ebuild,v 1.4 2011/04/16 05:56:36 tomka 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"
+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="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
+	>=media-libs/freetype-2.3.9
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		>=x11-libs/cairo-1.8.4
+		>=x11-libs/gtk+-2.14.0:2
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/openjpeg )
+	lcms? ( =media-libs/lcms-1* )
+	png? ( >=media-libs/libpng-1.4 )
+	qt3? ( >=x11-libs/qt-meta-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-qt4
+	!app-text/poppler-utils
+	cjk? ( >=app-text/poppler-data-0.2.1 )
+"
+
+DOCS=(AUTHORS ChangeLog 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
+		-DENABLE_ABIWORD=OFF
+		$(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)
+		$(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 "linking to it. If you're not a portage-2.2_rc user, you're advised"
+	ewarn "to run revdep-rebuild"
+}
diff --git a/app-text/poppler/poppler-0.16.3.ebuild b/app-text/poppler/poppler-0.16.4.ebuild
index 94f2f872..789b0c3a 100644
--- a/app-text/poppler/poppler-0.16.3.ebuild
+++ b/app-text/poppler/poppler-0.16.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.16.3.ebuild,v 1.1 2011/02/28 18:54:52 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.16.4.ebuild,v 1.1 2011/04/16 03:55:11 reavertm Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
 LICENSE="GPL-2"
 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 curl cxx debug doc exceptions +introspection jpeg
+IUSE="cairo cjk curl cxx debug doc exceptions +introspection jpeg
 jpeg2k +lcms png qt3 qt4 +utils +xpdf-headers"
 
 # No test data provided
@@ -23,7 +23,6 @@ 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.10.0
@@ -61,9 +60,9 @@ src_configure() {
 		-DBUILD_QT4_TESTS=OFF
 		-DBUILD_CPP_TESTS=OFF
 		$(cmake-utils_use_with qt3)
+		-DENABLE_ABIWORD=OFF
 		-DENABLE_SPLASH=ON
 		-DENABLE_ZLIB=ON
-		$(cmake-utils_use_enable abiword)
 		$(cmake-utils_use_enable curl LIBCURL)
 		$(cmake-utils_use_enable cxx CPP)
 		$(cmake-utils_use_enable jpeg2k LIBOPENJPEG)