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

5 files changed, 128 insertions, 16 deletions

diff --git a/Documentation/package.unmask/kde-3.5 b/Documentation/package.unmask/kde-3.5
index 2f8205ca..a9fce644 100644
--- a/Documentation/package.unmask/kde-3.5
+++ b/Documentation/package.unmask/kde-3.5
@@ -2,6 +2,7 @@
 =app-arch/p7zip-9.04
 =app-arch/p7zip-9.13
 =app-arch/p7zip-9.13-r1
+=app-arch/p7zip-9.13-r3
 =app-backup/keep-0.4.0-r1
 =app-cdr/k3b-1.0.5-r6
 =app-cdr/kcdlabel-2.13-r1
@@ -65,6 +66,7 @@
 =app-text/kding-0.4.3
 =app-text/poppler-0.14.4
 =app-text/poppler-0.14.5
+=app-text/poppler-0.16.0
 =dev-db/hk_classes-0.8.3
 =dev-db/hk_classes-0.8.3-r1
 =dev-db/knoda-0.8.3
diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 7128b472..4f336e2c 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,15 @@
 # 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.268 2010/11/07 21:35:45 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.270 2010/12/28 18:40:40 reavertm Exp $
+
+  28 Dec 2010; Maciej Mrozowski <reavertm@gentoo.org> poppler-0.16.0.ebuild:
+  Raise cairo dependencies to 1.10.0, bug 349917.
+
+*poppler-0.16.0 (27 Dec 2010)
+
+  27 Dec 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  +poppler-0.16.0.ebuild, metadata.xml:
+  Version bump 0.16.0. Update metadata.xml, add myself as a maintainer.
 
 *poppler-0.14.5 (07 Nov 2010)
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 96adac12..7773ccd7 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,6 +1,8 @@
 DIST poppler-0.14.4.tar.gz 1794096 RMD160 505ac4c3759a7d4b14c1d077f9249f317dc2d2af SHA1 c51931d7229126c16da54b72bfe63a190c2b5160 SHA256 97c394144802e733eaec2682e06bddc4939c71ede58df045127aa94bd244c713
 DIST poppler-0.14.5.tar.gz 1798194 RMD160 80d4441912b02d89777405ce03f8e175c4ccfa9e SHA1 e23b115e4ebc06c937318688b06a7c6b3319a00a SHA256 c805317c4c1a7080098ae8c7c2a1c1b8e2c784858fc2e04941878eeb8164814c
+DIST poppler-0.16.0.tar.gz 1945847 RMD160 2ff9f206c113e4afe9281e1e6ef148d6beeb7045 SHA1 5511b0c1aae543401fc5ea360be97119b20e2a10 SHA256 e93e104abd710c310ebb98838f8147b198fbe0564cf8f5b273a75a1f7a01c5ac
 EBUILD poppler-0.14.4.ebuild 2682 RMD160 3b6da6a3df389c5d0e2ad29791ede1b7ae9ef153 SHA1 89834c86040da0b89537eb56c81e76ab4cac825c SHA256 ea99f07a737f41cf2ab941c298d9d2cd67ab99d7b7e12a520d2076fd72d5bdc0
 EBUILD poppler-0.14.5.ebuild 2694 RMD160 16e6da20262dc6119031dfa4185246a410662270 SHA1 0deba3cbf56068ae337162e2af032d34fdd65bf5 SHA256 cd25b56e55beb12d8ec475972e0ab8d6a524a62c42f0efe24b08a868050985eb
-MISC ChangeLog 38080 RMD160 f458f8842d7db9f2e0a43eaef800589478faf374 SHA1 bd92b2b0d88a8758ba2a5130c5264c3a420897c5 SHA256 c424fcc84d5c05ba74425a614365105ded924de23d7f5a9ef58f1a4775cbe62d
-MISC metadata.xml 564 RMD160 078af3bfc173aeaf994a9886723d7ca9a73f9b3f SHA1 2288b78748160193bc62d30bb458a26afd031f04 SHA256 3be05c7573d0473701d0589caac0ed0c7bf4f738bf33d6e9bda47166d6ad7ace
+EBUILD poppler-0.16.0.ebuild 2871 RMD160 411a60f7054a22ffea575d365b98515cc5bb4810 SHA1 3d2ff9d233b3d5f3b769d43904e997a4ccb9e010 SHA256 3041df24448012605cbdb7a821a3456e39d8c1d51db36d942a47fecf4e0f8b16
+MISC ChangeLog 38406 RMD160 2fa4effb0be88403d86314d200f46d8ae672b54a SHA1 c29d9fb2936abc8074f073fb22e9d6662f08947e SHA256 2e8b7345367c5ff1b215504179e3cef9ed3f1f2a21644bfced0e141043007f46
+MISC metadata.xml 655 RMD160 a03607c3809e0ceeaecf8c72950a88e242323ebe SHA1 1a02720d525df969c8f30b9587fb0da845817ba5 SHA256 2963931ac0f87f5e878bf7e6f983b393a2a9da2178b9b84e97444a85d27bc95d
diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
index 80f083ea..75a57170 100644
--- a/app-text/poppler/metadata.xml
+++ b/app-text/poppler/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kde</herd>
-  <herd>printing</herd>
-  <use>
-    <flag name='abiword'>
-      Enable support for <pkg>app-office/abiword</pkg> output. Requires
-      <pkg>dev-libs/libxml2</pkg>.
-    </flag>
-    <flag name='xpdf-headers'>Install xpdf headers.</flag>
-    <flag name='exceptions'>Enable exceptions throwing.</flag>
-	<flag name='utils'>
-      Install command-line PDF converters and various utilities.
-    </flag>
-  </use>
+<herd>kde</herd>
+<herd>printing</herd>
+<maintainer>
+	<email>reavertm@gentoo.org</email>
+	<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>
+	<flag name='xpdf-headers'></flag>
+</use>
 </pkgmetadata>
diff --git a/app-text/poppler/poppler-0.16.0.ebuild b/app-text/poppler/poppler-0.16.0.ebuild
new file mode 100644
index 00000000..8d84a6c8
--- /dev/null
+++ b/app-text/poppler/poppler-0.16.0.ebuild
@@ -0,0 +1,99 @@
+# 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.16.0.ebuild,v 1.2 2010/12/28 18:40:40 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"
+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
+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.10.0
+		>=x11-libs/gtk+-2.20.1:2[introspection?]
+		introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
+	)
+	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-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_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 introspection GObjectIntrospection)
+		$(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"
+}