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

  Update patch. Remove older revisions.
(Portage version: 2.2_rc61/cvs/Linux x86_64)

5 files changed, 19 insertions, 97 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/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
-}