Bump. Dropping jpeg and zlib useflags because they only control whether to use the internal implementation or the shared lib. Dropping cjk useflag because all it does is pull in a data-package. Go EAPI-2. Drop la files and static archives, not used. Dropping keywords for arm hppa ia64 m68k mips s390 sh sparc-fbsd cause they don't have openjpeg keyworded.

(Portage version: 2.2_rc11/cvs/Linux 2.6.27-rc8 x86_64)

3 files changed, 33 insertions, 61 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index c3fb54fe79e8..06c6de734c76 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.174 2008/10/07 12:04:19 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.175 2008/10/08 14:10:34 loki_val Exp $
+
+*poppler-0.9.3 (08 Oct 2008)
+
+  08 Oct 2008; Peter Alfredsen <loki_val@gentoo.org> -poppler-0.8.5.ebuild,
+  -poppler-0.9.2.ebuild, +poppler-0.9.3.ebuild:
+  Bump. Dropping jpeg and zlib useflags because they only control whether to
+  use the internal implementation or the shared lib. Dropping cjk useflag
+  because all it does is pull in a data-package. Go EAPI-2. Drop la files
+  and static archives, not used. Dropping keywords for arm hppa ia64 m68k
+  mips s390 sh sparc-fbsd cause they don't have openjpeg keyworded.
 
   07 Oct 2008; nixnut <nixnut@gentoo.org> poppler-0.8.7.ebuild:
   Stable on ppc wrt bug 239414
diff --git a/app-text/poppler/poppler-0.8.5.ebuild b/app-text/poppler/poppler-0.8.5.ebuild
deleted file mode 100644
index 99ef99f9eef7..000000000000
--- a/app-text/poppler/poppler-0.8.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.8.5.ebuild,v 1.1 2008/08/03 19:49:45 loki_val Exp $
-
-inherit libtool eutils
-
-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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="cjk jpeg zlib"
-
-RDEPEND=">=media-libs/freetype-2.1.8
-	>=media-libs/fontconfig-2
-	cjk? ( app-text/poppler-data )
-	jpeg? ( >=media-libs/jpeg-6b )
-	dev-libs/libxml2
-	!app-text/pdftohtml"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-	econf \
-		--disable-poppler-qt4 \
-		--disable-poppler-glib \
-		--disable-poppler-qt \
-		--disable-gtk-test \
-		--disable-cairo-output \
-		--enable-xpdf-headers \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable zlib) \
-		|| die "configuration failed"
-	emake || die "compilation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc README AUTHORS ChangeLog NEWS README-XPDF TODO
-}
diff --git a/app-text/poppler/poppler-0.9.2.ebuild b/app-text/poppler/poppler-0.9.3.ebuild
index 597199564b55..d9bff593f535 100644
--- a/app-text/poppler/poppler-0.9.2.ebuild
+++ b/app-text/poppler/poppler-0.9.3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.9.2.ebuild,v 1.1 2008/09/26 17:52:13 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.9.3.ebuild,v 1.1 2008/10/08 14:10:34 loki_val Exp $
+
+EAPI=2
 
 inherit libtool eutils
 
@@ -10,36 +12,38 @@ SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="doc cjk jpeg zlib"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
 
 RDEPEND=">=media-libs/freetype-2.1.8
 	>=media-libs/fontconfig-2
-	cjk? ( app-text/poppler-data )
-	jpeg? ( >=media-libs/jpeg-6b )
-	zlib? ( sys-libs/zlib )
+	app-text/poppler-data
+	>=media-libs/jpeg-6b
+	media-libs/openjpeg
+	sys-libs/zlib
 	dev-libs/libxml2
 	!app-text/pdftohtml"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1.0 )"
 
-src_compile() {
-	econf \
-		--disable-poppler-qt4 \
-		--disable-poppler-glib \
-		--disable-poppler-qt \
-		--disable-gtk-test \
-		--disable-cairo-output \
-		--enable-xpdf-headers \
-		$(use_enable doc gtk-doc) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable zlib) \
+src_configure() {
+	econf 	--disable-static		\
+		--disable-poppler-qt4		\
+		--disable-poppler-glib		\
+		--disable-poppler-qt		\
+		--disable-gtk-test		\
+		--disable-cairo-output		\
+		--enable-xpdf-headers		\
+		--enable-libjpeg		\
+		--enable-libopenjpeg		\
+		--enable-zlib			\
+		$(use_enable doc gtk-doc)	\
 		|| die "configuration failed"
-	emake || die "compilation failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 	dodoc README AUTHORS ChangeLog NEWS README-XPDF TODO
+	rm -f $(find "${D}" -name '*.la')
 }