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

6 files changed, 31 insertions, 106 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 0b5f52fb..9ab2f0ce 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,28 @@
 # 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.286 2011/04/16 05:56:36 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.292 2011/05/01 00:21:42 reavertm Exp $
+
+*poppler-0.16.5 (01 May 2011)
+
+  01 May 2011; Maciej Mrozowski <reavertm@gentoo.org> -poppler-0.16.4.ebuild,
+  +poppler-0.16.5.ebuild:
+  Version bump, remove old
+
+  26 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> -poppler-0.14.5.ebuild:
+  old
+
+  26 Apr 2011; Kacper Kowalik <xarthisius@gentoo.org> poppler-0.14.5-r1.ebuild:
+  ppc64 stable wrt #308017
+
+  23 Apr 2011; Raúl Porcel <armin76@gentoo.org> poppler-0.14.5-r1.ebuild:
+  alpha/ia64/s390/sh/sparc stable wrt #308017
+
+  22 Apr 2011; Brent Baude <ranger@gentoo.org> poppler-0.14.5-r1.ebuild:
+  Marking poppler-0.14.5-r1 ppc for bug 308017
+
+  21 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  poppler-0.14.5-r1.ebuild:
+  arm stable, bug 308017
 
   16 Apr 2011; Thomas Kahle <tomka@gentoo.org> poppler-0.14.5-r1.ebuild:
   x86 stable per bug 308017
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index dce18c94..8bc08e0e 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,7 +1,6 @@
 DIST poppler-0.14.5.tar.gz 1798194 RMD160 80d4441912b02d89777405ce03f8e175c4ccfa9e SHA1 e23b115e4ebc06c937318688b06a7c6b3319a00a SHA256 c805317c4c1a7080098ae8c7c2a1c1b8e2c784858fc2e04941878eeb8164814c
-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.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
+DIST poppler-0.16.5.tar.gz 1950312 RMD160 dd28bec64bf19050ba2cbdd5a71fa398370de21a SHA1 29994e0b1be1110400d943f9b921675ba1a52eb5 SHA256 9f27b949c0cd52eef981654b8e13acd62e1e0f9a4bde4d96876da11ad84c39d9
+EBUILD poppler-0.14.5-r1.ebuild 2638 RMD160 dbb78383770f6c797380d1ab841f69d678d1b87c SHA1 cd25dd21ecff962647a5b8712e4d24b52ab343c5 SHA256 77680ac5bf9eb20528ed396a024a1619ab0c57785ea33a12a83fc34eecfb480a
+EBUILD poppler-0.16.5.ebuild 2821 RMD160 e465d381835715b7877f17f7ba4eee32552eb0f9 SHA1 1c9cd834e4a191106e84277f70fd143e2cbe541f SHA256 cbd81ee89cae49217b1b2e7f9f2ec703da6443d2a11952419bc2694634515bdf
+MISC ChangeLog 41219 RMD160 a18b5382a8d08184821822021511ce2614a2fec6 SHA1 16824a23edfff3a85b1a9a13a15351c152782dc6 SHA256 62697ce362aa90d2ff116ea3e25e3d2a643a8a5a132fec842188fa205fe5979c
+MISC metadata.xml 531 RMD160 bdae255e3871cac7966787a198b50d0f77180747 SHA1 8d191a0d9acc9c4494dd4b80ba72e420cf5489a4 SHA256 afef403de543eb24d44ec80c5353f932dffd16c5cd805f311a82089cdb4f4a99
diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
index 75a57170..f9380288 100644
--- a/app-text/poppler/metadata.xml
+++ b/app-text/poppler/metadata.xml
@@ -8,7 +8,6 @@
 	<name>Maciej Mrozowski</name>
 </maintainer>
 <use>
-	<flag name='abiword'>Enable support for <pkg>app-office/abiword</pkg> output. Requires <pkg>dev-libs/libxml2</pkg>.</flag>
 	<flag name='exceptions'>Enable exceptions throwing.</flag>
 	<flag name='introspection'>Enable GObject introspection.</flag>
 	<flag name='utils'>Install command-line PDF converters and various utilities.</flag>
diff --git a/app-text/poppler/poppler-0.14.5-r1.ebuild b/app-text/poppler/poppler-0.14.5-r1.ebuild
index 5f7bd9f8..52790a7b 100644
--- a/app-text/poppler/poppler-0.14.5-r1.ebuild
+++ b/app-text/poppler/poppler-0.14.5-r1.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.14.5-r1.ebuild,v 1.4 2011/04/16 05:56:36 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.14.5-r1.ebuild,v 1.8 2011/04/26 07:45:23 xarthisius Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@ 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"
+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"
 
diff --git a/app-text/poppler/poppler-0.14.5.ebuild b/app-text/poppler/poppler-0.14.5.ebuild
deleted file mode 100644
index ba32a2bf..00000000
--- a/app-text/poppler/poppler-0.14.5.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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.ebuild,v 1.8 2011/02/19 15:15:49 xarthisius 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="+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
-	>=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
-	)
-	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
-		$(cmake-utils_use_enable abiword)
-		$(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.4.ebuild b/app-text/poppler/poppler-0.16.5.ebuild
index 789b0c3a..681f968e 100644
--- a/app-text/poppler/poppler-0.16.4.ebuild
+++ b/app-text/poppler/poppler-0.16.5.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.4.ebuild,v 1.1 2011/04/16 03:55:11 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.16.5.ebuild,v 1.1 2011/05/01 00:21:42 reavertm Exp $
 
 EAPI="2"