Move gtk/qt bindings to poppler-bindings to resolve circular deps

(Portage version: 2.1_pre3-r1)

4 files changed, 61 insertions, 12 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index a06713902eef..58221beb5168 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/poppler
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.30 2005/12/29 04:57:02 vapier Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.31 2006/01/03 21:17:21 dang Exp $
+
+*poppler-0.4.3-r2 (03 Jan 2006)
+
+  03 Jan 2006; <dang@gentoo.org> +poppler-0.4.3-r2.ebuild:
+  Move gtk/qt bindings to poppler-bindings to resolve circular deps
 
   29 Dec 2005; Mike Frysinger <vapier@gentoo.org> files/poppler-gcc41.patch:
   Add another gcc-4.1.x fix #116977 by gim.
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 18b0a68d2200..63a328978630 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 3924f6680d0536d9e357389ade01609a ChangeLog 3903
 MD5 9fcae20e4d0c670e6f53602e516991aa files/digest-poppler-0.3.0 65
 MD5 9fcae20e4d0c670e6f53602e516991aa files/digest-poppler-0.3.0-r1 65
@@ -8,6 +5,7 @@ MD5 be62fc9641cde65e89b62b2a629bb617 files/digest-poppler-0.4.2 65
 MD5 be62fc9641cde65e89b62b2a629bb617 files/digest-poppler-0.4.2-r1 65
 MD5 fd7bca7be5c5d5779b32f4c4e7fe9b4c files/digest-poppler-0.4.3 65
 MD5 91f251deb3a322d16a5ea68576f1c9a9 files/digest-poppler-0.4.3-r1 137
+MD5 91f251deb3a322d16a5ea68576f1c9a9 files/digest-poppler-0.4.3-r2 137
 MD5 3342aad1175b4b522f84e453999fbb05 files/poppler-0.4.1-cairo-ft.patch 470
 MD5 c6805b961ecb2a526246a39bbff57f23 files/poppler-0.4.2-CAN-2005-3193.patch 3940
 MD5 ce7b0785e0aca755f5840c802dd7fed8 files/poppler-gcc41.patch 1612
@@ -17,11 +15,5 @@ MD5 6999412acc1316a8e229eada23ab192b poppler-0.3.0.ebuild 856
 MD5 e9d6d5b72e5ba3ca39372fa29ff9ffb7 poppler-0.4.2-r1.ebuild 1442
 MD5 0a4aeea8b99f0bde18dd89db5fc6d313 poppler-0.4.2.ebuild 1383
 MD5 c14c7f37c67cf86b45017e60fba63537 poppler-0.4.3-r1.ebuild 1460
+MD5 edce152fdbde59e6bf228944ee95a70b poppler-0.4.3-r2.ebuild 1370
 MD5 73581022e21e0c1521e08454a71ca131 poppler-0.4.3.ebuild 1350
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDs2y82+ySkm8kpY0RAqP9AKCgSxmaobHLdlZDKH9XtfsE4Kg7PQCfcaVc
-r2U2XSWbshCKm98ZezyWwyo=
-=9xOy
------END PGP SIGNATURE-----
diff --git a/app-text/poppler/files/digest-poppler-0.4.3-r2 b/app-text/poppler/files/digest-poppler-0.4.3-r2
new file mode 100644
index 000000000000..101e5bbaf715
--- /dev/null
+++ b/app-text/poppler/files/digest-poppler-0.4.3-r2
@@ -0,0 +1,2 @@
+MD5 7952d78e9dece4f6f04a96af8185e197 poppler-0.4.3-utils.patch.gz 46235
+MD5 791dc78d8366eb05580183fe85174555 poppler-0.4.3.tar.gz 779582
diff --git a/app-text/poppler/poppler-0.4.3-r2.ebuild b/app-text/poppler/poppler-0.4.3-r2.ebuild
new file mode 100644
index 000000000000..b81e26cf7d59
--- /dev/null
+++ b/app-text/poppler/poppler-0.4.3-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.4.3-r2.ebuild,v 1.1 2006/01/03 21:17:21 dang Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="Poppler is a 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
+	mirror://${P}-utils.patch.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="jpeg zlib cairo"
+
+RDEPEND=">=media-libs/freetype-2.1.8
+	media-libs/fontconfig
+	virtual/ghostscript
+	cairo? ( >=x11-libs/cairo-0.5 )
+	jpeg? ( >=media-libs/jpeg-6b )
+	zlib? ( sys-libs/zlib )
+	!<app-text/xpdf-3.01-r4"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=sys-devel/automake-1.9.6"
+
+src_unpack(){
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/poppler-0.4.1-cairo-ft.patch
+	epatch ${DISTDIR}/${P}-utils.patch.gz
+	eautoreconf
+}
+
+src_compile() {
+	econf --disable-poppler-qt4 --enable-opi \
+		--disable-poppler-glib --disable-poppler-qt \
+		$(use_enable cairo cairo-output) \
+		$(use_enable jpeg libjpeg) \
+		$(use_enable zlib) \
+		|| die "configuration failed"
+	emake || die "compilation failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc README AUTHORS ChangeLog NEWS README-XPDF TODO
+}