Join glib and cairo useflags into one, rename openjpeg useflag to jpeg2k.

  Update patch. Remove older revisions.
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

6 files changed, 23 insertions, 102 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index c42600a452c2..7b583ab31131 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,14 @@
 # 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.205 2010/01/24 17:24:05 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.206 2010/01/24 22:20:04 yngwin Exp $
+
+*poppler-0.12.3-r2 (24 Jan 2010)
+
+  24 Jan 2010; Ben de Groot <yngwin@gentoo.org> -poppler-0.12.3.ebuild,
+  -poppler-0.12.3-r1.ebuild, +poppler-0.12.3-r2.ebuild,
+  files/poppler-0.12.3-fix-headers-installation.patch, metadata.xml:
+  Join glib and cairo useflags into one, rename openjpeg useflag to jpeg2k.
+  Update patch. Remove older revisions.
 
   24 Jan 2010; Ben de Groot <yngwin@gentoo.org> poppler-0.12.3-r1.ebuild,
   +files/poppler-0.12.3-fix-headers-installation.patch:
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index f2a025f6be16..1f2e843bcbdd 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,6 +1,6 @@
 AUX poppler-0.10.5-xpdf-3.02pl3.patch 23613 RMD160 3fc822a157c30475a20cb2b37f33bab324935ece SHA1 87f5fe73588727c23b9308ea6a934cef2bd14e02 SHA256 896fa93da3e7448b42932ee8e292bb816da6c5a59fc68341fc822d287787328e
 AUX poppler-0.12.3-cmake-disable-tests.patch 2121 RMD160 3edded24926076c9c0ef42d0f1f295a8d46cafdb SHA1 fd22bdf1d887bcedd83673992fd182bfdb3bfcb0 SHA256 182489ee0d76a38c6d2570721a6777d78077ace4249bbeac7dad8d29b075c01b
-AUX poppler-0.12.3-fix-headers-installation.patch 1403 RMD160 f5fa19a401825ec3697211628d6d45c1386c0377 SHA1 7c16f6a4788da7d6dbf0687bc95e31aacbf5a3bc SHA256 204793906b3a189faaee9a869ce36f275e845e760b63f6a8f65da568a26a1fb0
+AUX poppler-0.12.3-fix-headers-installation.patch 1110 RMD160 8e327ab79c6cc3dc149b83be8c96ceb0ecfd494d SHA1 fa9b58cc1ca6f81f5dd30a41f89b8b5c136d9fe4 SHA256 ef05df49853ecde1fa5711f799f75d2811d56481f199995d88efb198f9f5b12e
 AUX poppler-0.6.1-xpdf-3.02pl2.patch 17438 RMD160 c8a4bd0eda87f94b183fe0d0aa6d8864f3f9c569 SHA1 fc17401fea3cbe73687cce9ddb9185018fdb859e SHA256 5c6fd90b752f3f40a3d3e9d63fdc5ac0220841a88a05f5551054edd78f1f0f9d
 AUX poppler-0.8.3-page-init.patch 400 RMD160 9e2a4aa31e862996d7227084a46357c8fdd7a299 SHA1 edb7be8791b0e19119714c68f60cc3bf1cb6446d SHA256 9a44ccad42dcb2644713921c9e3dac2b757e54a81d313653345e176b6a36a158
 AUX poppler-CVE-2009-1188.patch 390 RMD160 2c3dee7856ad81c1d7989ac7db3d14e77a905c2d SHA1 bbda66e3d4f5cb3ca0e47ddecdf083843933b514 SHA256 78e2ea204b2b1640adff9cf24b4c6ad9c97da9698f5760bbbc89987918b10937
@@ -11,8 +11,7 @@ DIST poppler-0.8.7.tar.gz 1469587 RMD160 ea03cdf88a432e5748988e3576110a2989aa79e
 EBUILD poppler-0.10.4.ebuild 1418 RMD160 998207af8466d72972f37661fb525cc0dc518811 SHA1 83f3da4fec479c16724034aba94af580d89e64aa SHA256 d4fe10a324f4cb84f5bbd2a904d16f7a4d354a20d8401d0234a0b442d7201746
 EBUILD poppler-0.10.5-r1.ebuild 1546 RMD160 b9d0b20562af0d922165378047ca0987edbc7276 SHA1 9fccb0470523c28ef9c94b4a133c9d0a4e8a07c1 SHA256 4965bf856f18a03f010bdf83cc5c362e3997b315ee6f3ae971415e1f7ac37179
 EBUILD poppler-0.10.5.ebuild 1429 RMD160 fdfdc4ff982718d4d66764be55a85f2b9d2864da SHA1 e614256ddba20ecb13634e7c29fc0a8eb62d1cf7 SHA256 f427a65911cb9d5fa525db9cc3543b4bb6eb68d83f53637dc3a174450651b62f
-EBUILD poppler-0.12.3-r1.ebuild 2345 RMD160 58821d16d8b07f957854715545691faa14ad7839 SHA1 b631796799c1bfd4cea0488e5b273b674274d62a SHA256 8737d4b54ee0c2730749ba4e0b8a885035768637c4c64f3bf9c863f1c1c7c2da
-EBUILD poppler-0.12.3.ebuild 2280 RMD160 394ac46dafe005448d43e4670978082749da91db SHA1 e2b4ce3b90cd5935afeedde85d95c80e032fe1ce SHA256 76255939ee3f04e337e1deb0fa841792be9afc786cfdd97d2a376b3c2bbb9249
+EBUILD poppler-0.12.3-r2.ebuild 2324 RMD160 1ad5309cc68f6312d24292dc8fcbb8f38874fd55 SHA1 3221d0e8fb3a3c4b31fc08c8e33872bcd15fb16a SHA256 a67f61e47e1dbf48c6d322737aacd4a10822d938ba2048115a4acdfd5f8b1fd5
 EBUILD poppler-0.8.7.ebuild 1322 RMD160 cfc3c9100cc5d55013f238401731ec8b077c8111 SHA1 e5b2a4cd1755ba77088b0c06e7382c16d31a3aef SHA256 cae06f6ee6a9a6d611123f0feed6956206345cc38fae84a24d837c4b7ecac27e
-MISC ChangeLog 28264 RMD160 bce4606cae036205ee32bd1266a9572224cee474 SHA1 8cc9b570c053f3b07a2bf658c6f8c3f873ea7744 SHA256 9da28ee79c9f7f287c0f26c824b2e3e6ce792a112bb15b1ed9718642a4540d80
-MISC metadata.xml 720 RMD160 ea0d90d63ccc0e6a918e3259d07f6020a2957675 SHA1 d9a6c0578b9965e5b2f25e8c8f8b54370dd47c8e SHA256 230a9312f7867d64a2d2aa713df88e72b43b99a8aaf1fabfa3f05081a5482319
+MISC ChangeLog 28612 RMD160 e3832400fd3c4230874248503d4fa797c1ef28ff SHA1 c4537ffb4101509b7cc46916b81d71b03227fc07 SHA256 9aad69f5dff2fdb2a649e20817063674a35da7241344072375d8cea7a23b5457
+MISC metadata.xml 565 RMD160 6a9e714721911707b23fb27535d64ab92c90a5f8 SHA1 ca7711ec7b7d2953310ae3b00ff2f447371c103f SHA256 ec946c05ddfa21325d7cb705cee3342f4a95a1d08b02f324e4bac36bfc479e0b
diff --git a/app-text/poppler/files/poppler-0.12.3-fix-headers-installation.patch b/app-text/poppler/files/poppler-0.12.3-fix-headers-installation.patch
index 9eafd877b819..c382a0a34293 100644
--- a/app-text/poppler/files/poppler-0.12.3-fix-headers-installation.patch
+++ b/app-text/poppler/files/poppler-0.12.3-fix-headers-installation.patch
@@ -14,16 +14,7 @@ index 0cd32df..070be33 100644
    install(FILES
      fofi/FoFiBase.h
      fofi/FoFiEncodings.h
-@@ -374,6 +379,9 @@ if(ENABLE_XPDF_HEADERS)
-     install(FILES
-       poppler/JPEG2000Stream.h
-       DESTINATION include/poppler)
-+    install(FILES
-+      poppler/goo/JpegWriter.h
-+      DESTINATION include/poppler/goo)
-   else(LIBOPENJPEG_FOUND)
-     install(FILES
-       poppler/JPXStream.h
+ 
 diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
 index 6ed9523..9f5d0e7 100644
 --- a/glib/CMakeLists.txt
diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
index e8b52ad04888..5f266d2e8136 100644
--- a/app-text/poppler/metadata.xml
+++ b/app-text/poppler/metadata.xml
@@ -8,8 +8,6 @@
     <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='glib'>Enable glib bindings.</flag>
-    <flag name='openjpeg'>Use openjpeg for JPX streams. Requires <pkg>media-libs/openjpeg</pkg>.</flag>
     <flag name='utils'>Install command-line PDF converters and various utilities.</flag>
   </use>
 </pkgmetadata>
diff --git a/app-text/poppler/poppler-0.12.3-r1.ebuild b/app-text/poppler/poppler-0.12.3-r2.ebuild
index 6b4406cf611b..c8da5e1efc39 100644
--- a/app-text/poppler/poppler-0.12.3-r1.ebuild
+++ b/app-text/poppler/poppler-0.12.3-r2.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-r1.ebuild,v 1.2 2010/01/24 17:24:05 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.3-r2.ebuild,v 1.1 2010/01/24 22:20:04 yngwin Exp $
 
 EAPI="2"
 
@@ -13,17 +13,17 @@ SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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 +glib jpeg +lcms openjpeg png qt4 +utils +xpdf-headers"
+IUSE="+abiword cairo cjk debug doc exceptions jpeg jpeg2k +lcms png 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 )
-	glib? (	dev-libs/glib:2
-			cairo? ( >=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 )
-	openjpeg? ( media-libs/openjpeg )
+	jpeg2k? ( media-libs/openjpeg )
 	png? ( media-libs/libpng )
 	qt4? ( x11-libs/qt-core:4
 		   x11-libs/qt-gui:4 )"
@@ -51,11 +51,11 @@ src_configure() {
 		-DENABLE_ZLIB=ON
 		$(cmake-utils_use_enable abiword)
 		$(cmake-utils_use_enable lcms)
-		$(cmake-utils_use_enable openjpeg LIBOPENJPEG)
+		$(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 glib GTK)
+		$(cmake-utils_use_with cairo GTK)
 		$(cmake-utils_use_with jpeg)
 		$(cmake-utils_use_with png)
 		$(cmake-utils_use_with qt4)
@@ -68,7 +68,7 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 
-	if use glib && use doc; then
+	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'
diff --git a/app-text/poppler/poppler-0.12.3.ebuild b/app-text/poppler/poppler-0.12.3.ebuild
deleted file mode 100644
index 683b7b2e71e5..000000000000
--- a/app-text/poppler/poppler-0.12.3.ebuild
+++ /dev/null
@@ -1,75 +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.3.ebuild,v 1.2 2010/01/24 01:44:03 abcd Exp $
-
-EAPI="2"
-
-inherit cmake-utils
-
-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 ~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 glib jpeg +lcms openjpeg png 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 )
-	glib? (	dev-libs/glib:2
-			cairo? ( >=x11-libs/cairo-1.8.4
-					 >=x11-libs/gtk+-2.14.0:2 ) )
-	jpeg? ( >=media-libs/jpeg-7:0 )
-	openjpeg? ( media-libs/openjpeg )
-	png? ( media-libs/libpng )
-	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 )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-cmake-disable-tests.patch"
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT4_TESTS=OFF
-		-DWITH_Qt3=OFF
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		$(cmake-utils_use_enable abiword)
-		$(cmake-utils_use_enable lcms)
-		$(cmake-utils_use_enable openjpeg LIBOPENJPEG)
-		$(cmake-utils_use_enable utils)
-		$(cmake-utils_use_enable xpdf-headers XPDF_HEADERS)
-		$(cmake-utils_use_with cairo)
-		$(cmake-utils_use_with glib 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
-
-	# For now install gtk-doc there
-	if use glib && use doc; then
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/* || die 'failed to install API documentation'
-	fi
-}