New semi-major rev of poppler

Package-Manager: portage-2.1_pre3-r1

10 files changed, 210 insertions, 22 deletions

diff --git a/app-text/poppler-bindings/ChangeLog b/app-text/poppler-bindings/ChangeLog
index 6111a0c3ba51..7f092660f6e8 100644
--- a/app-text/poppler-bindings/ChangeLog
+++ b/app-text/poppler-bindings/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/poppler-bindings
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/ChangeLog,v 1.8 2006/01/20 15:53:54 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/ChangeLog,v 1.9 2006/01/20 17:01:18 dang Exp $
+
+*poppler-bindings-0.5.0 (20 Jan 2006)
+
+  20 Jan 2006; <dang@gentoo.org> +files/poppler-0.5.0-bindings.patch,
+  +poppler-bindings-0.5.0.ebuild:
+  New semi-major rev of poppler
 
 *poppler-bindings-0.4.4 (20 Jan 2006)
 
diff --git a/app-text/poppler-bindings/Manifest b/app-text/poppler-bindings/Manifest
index e14dd620875d..7b23a5ba18a9 100644
--- a/app-text/poppler-bindings/Manifest
+++ b/app-text/poppler-bindings/Manifest
@@ -1,18 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 325718c1a0681ab1e9a4ab3e1a8c9179 ChangeLog 1323
 MD5 fd7bca7be5c5d5779b32f4c4e7fe9b4c files/digest-poppler-bindings-0.4.3-r2 65
 MD5 391a4af00a2993115c7fa9145936a221 files/digest-poppler-bindings-0.4.4 65
+MD5 342ecc2fc9aa2b0328c7522269b66049 files/digest-poppler-bindings-0.5.0 65
 MD5 3342aad1175b4b522f84e453999fbb05 files/poppler-0.4.1-cairo-ft.patch 470
 MD5 73800d8735fd2813b3ef67ad511fc2b5 files/poppler-0.4.3-bindings.patch 2915
+MD5 7f9b359a908b92073225b8d127d04083 files/poppler-0.5.0-bindings.patch 2751
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 a910c03003c4f6422942661260247207 poppler-bindings-0.4.3-r2.ebuild 1303
 MD5 cd4bbf6e01c9d6d18fcc8338c6e93ec0 poppler-bindings-0.4.4.ebuild 1251
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFD0QfGomPajV0RnrERAgDyAJkB85brvI3vl9YD5AcNMCJMa+Os0wCfWda3
-/fDAcoEGQ4fg3RyBP12ODiQ=
-=fLKI
------END PGP SIGNATURE-----
+MD5 7e3d4caaa1e04f286dd0533609567fba poppler-bindings-0.5.0.ebuild 1276
diff --git a/app-text/poppler-bindings/files/digest-poppler-bindings-0.5.0 b/app-text/poppler-bindings/files/digest-poppler-bindings-0.5.0
new file mode 100644
index 000000000000..9442bb845fb6
--- /dev/null
+++ b/app-text/poppler-bindings/files/digest-poppler-bindings-0.5.0
@@ -0,0 +1 @@
+MD5 c84c1be19f43e4a84872ff08234c1960 poppler-0.5.0.tar.gz 935312
diff --git a/app-text/poppler-bindings/files/poppler-0.5.0-bindings.patch b/app-text/poppler-bindings/files/poppler-0.5.0-bindings.patch
new file mode 100644
index 000000000000..c30adb5b8b36
--- /dev/null
+++ b/app-text/poppler-bindings/files/poppler-0.5.0-bindings.patch
@@ -0,0 +1,78 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN poppler-0.5.0.orig/glib/Makefile.am poppler-0.5.0/glib/Makefile.am
+--- poppler-0.5.0.orig/glib/Makefile.am	2006-01-02 07:37:11.000000000 -0500
++++ poppler-0.5.0/glib/Makefile.am	2006-01-20 10:36:39.000000000 -0500
+@@ -76,7 +76,7 @@
+ 	poppler-private.h
+ 
+ libpoppler_glib_la_LIBADD =			\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler				\
+ 	$(POPPLER_GLIB_LIBS)			\
+ 	$(FREETYPE_LIBS)			\
+ 	$(cairo_libs)
+@@ -87,7 +87,7 @@
+        test-poppler-glib.c
+ 
+ test_poppler_glib_LDADD =			\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler				\
+ 	libpoppler-glib.la			\
+ 	$(POPPLER_GLIB_LIBS)			\
+ 	$(FREETYPE_LIBS)			\
+diff --exclude-from=/home/dang/.diffrc -u -ruN poppler-0.5.0.orig/Makefile.am poppler-0.5.0/Makefile.am
+--- poppler-0.5.0.orig/Makefile.am	2006-01-10 11:09:33.000000000 -0500
++++ poppler-0.5.0/Makefile.am	2006-01-20 10:38:38.000000000 -0500
+@@ -29,7 +29,7 @@
+ utils_subdir = utils
+ endif
+ 
+-SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir)
++SUBDIRS = $(glib_subdir) $(qt_subdir) $(qt4_subdir)
+ 
+ EXTRA_DIST =					\
+ 	README-XPDF				\
+@@ -40,9 +40,6 @@
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA =				\
+-	poppler.pc				\
+-	$(cairo_pc_file)			\
+-	$(splash_pc_file)			\
+ 	$(glib_pc_file)				\
+ 	$(qt_pc_file)                           \
+ 	$(qt4_pc_file)
+diff --exclude-from=/home/dang/.diffrc -u -ruN poppler-0.5.0.orig/qt/Makefile.am poppler-0.5.0/qt/Makefile.am
+--- poppler-0.5.0.orig/qt/Makefile.am	2006-01-03 09:02:31.000000000 -0500
++++ poppler-0.5.0/qt/Makefile.am	2006-01-20 10:36:39.000000000 -0500
+@@ -35,7 +35,7 @@
+        test-poppler-qt.cpp
+ 
+ test_poppler_qt_LDADD =				\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler				\
+ 	libpoppler-qt.la			\
+ 	$(POPPLER_QT_LIBS)			\
+ 	$(FREETYPE_LIBS)
+diff --exclude-from=/home/dang/.diffrc -u -ruN poppler-0.5.0.orig/qt4/src/Makefile.am poppler-0.5.0/qt4/src/Makefile.am
+--- poppler-0.5.0.orig/qt4/src/Makefile.am	2006-01-03 09:40:17.000000000 -0500
++++ poppler-0.5.0/qt4/src/Makefile.am	2006-01-20 10:40:19.000000000 -0500
+@@ -21,6 +21,6 @@
+ 	poppler-private.h
+ 
+ libpoppler_qt4_la_LIBADD = 			\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler				\
+ 	$(POPPLER_QT4_LIBS)
+ 
+diff --exclude-from=/home/dang/.diffrc -u -ruN poppler-0.5.0.orig/qt4/tests/Makefile.am poppler-0.5.0/qt4/tests/Makefile.am
+--- poppler-0.5.0.orig/qt4/tests/Makefile.am	2006-01-02 07:37:13.000000000 -0500
++++ poppler-0.5.0/qt4/tests/Makefile.am	2006-01-20 10:36:39.000000000 -0500
+@@ -6,7 +6,7 @@
+ 	$(POPPLER_QTTEST_CXXFLAGS)
+ 
+ LDADDS =					\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler				\
+ 	$(top_builddir)/qt4/src/libpoppler-qt4.la	\
+ 	$(POPPLER_QT4_LIBS)
+ 
diff --git a/app-text/poppler-bindings/poppler-bindings-0.5.0.ebuild b/app-text/poppler-bindings/poppler-bindings-0.5.0.ebuild
new file mode 100644
index 000000000000..92fce9ca4cf3
--- /dev/null
+++ b/app-text/poppler-bindings/poppler-bindings-0.5.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/poppler-bindings-0.5.0.ebuild,v 1.1 2006/01/20 17:01:18 dang Exp $
+
+inherit eutils
+
+MY_P=${P/-bindings/}
+DESCRIPTION="Poppler bindings are rendering bindings for GUI toolkits for poppler"
+HOMEPAGE="http://poppler.freedesktop.org"
+SRC_URI="http://poppler.freedesktop.org/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="gtk qt cairo"
+
+RDEPEND=">=app-text/poppler-0.5.0
+	cairo? ( >=x11-libs/cairo-0.5 )
+	gtk? ( >=x11-libs/gtk+-2.6 )
+	qt? ( =x11-libs/qt-3* )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=sys-devel/automake-1.9.6"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack(){
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${MY_P}-bindings.patch
+	autoreconf -f -v -i || die "autoreconf failed"
+}
+
+src_compile() {
+	econf --disable-poppler-qt4 --enable-opi \
+		$(use_enable cairo cairo-output) \
+		$(use_enable gtk poppler-glib) \
+		$(use_enable qt poppler-qt) \
+		|| die "configuration failed"
+	emake || die "compilation failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc README AUTHORS ChangeLog NEWS README-XPDF TODO
+}
diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index b16ed3a56e2c..59686b7b07b5 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.46 2006/01/19 19:10:52 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.47 2006/01/20 17:00:46 dang Exp $
+
+*poppler-0.5.0 (20 Jan 2006)
+
+  20 Jan 2006; <dang@gentoo.org> +files/poppler-0.5.0-cairo-ft.patch,
+  +poppler-0.5.0.ebuild:
+  New semi-major rev of poppler
 
 *poppler-0.4.4 (19 Jan 2006)
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index eaca125c693d..81ef3cbceed4 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,12 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 4cc051ad0b6898ac0f38dbbe7a85c6f4 ChangeLog 6354
 MD5 9fcae20e4d0c670e6f53602e516991aa files/digest-poppler-0.3.0 65
 MD5 9fcae20e4d0c670e6f53602e516991aa files/digest-poppler-0.3.0-r1 65
 MD5 be62fc9641cde65e89b62b2a629bb617 files/digest-poppler-0.4.2-r1 65
 MD5 91f251deb3a322d16a5ea68576f1c9a9 files/digest-poppler-0.4.3-r4 137
 MD5 549a2b9f8016feedcb7a4fa849aa28e3 files/digest-poppler-0.4.4 137
+MD5 342ecc2fc9aa2b0328c7522269b66049 files/digest-poppler-0.5.0 65
 MD5 3342aad1175b4b522f84e453999fbb05 files/poppler-0.4.1-cairo-ft.patch 470
 MD5 c6805b961ecb2a526246a39bbff57f23 files/poppler-0.4.2-CAN-2005-3193.patch 3940
 MD5 85f437a5b01fef3f2139fcee826c4c6a files/poppler-0.4.3-bug117481.patch 2593
@@ -14,6 +12,7 @@ MD5 8b92823cdaec86c3cb5993440d95c306 files/poppler-0.4.3-gcc41.patch 479
 MD5 93baf580cd860acff7c064fe57408d32 files/poppler-0.4.3-pdf2xml.patch 840
 MD5 63413b6d02c3bc97a966821e7befd8eb files/poppler-0.4.4-bug117481.patch 696
 MD5 29dc1ccc279993123bd97abfe9d60287 files/poppler-0.4.4-cairo-lines.patch 760
+MD5 e225a2f3c1263f09bcf7ee2f45b55305 files/poppler-0.5.0-cairo-ft.patch 481
 MD5 f52250f6bc64f4201e663a46ed126f9b files/poppler-gcc41.patch 1131
 MD5 580dbf31fbeac60b3e29d38fdeabc4f1 files/poppler-no-libjpeg.patch 773
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
@@ -22,10 +21,4 @@ MD5 6999412acc1316a8e229eada23ab192b poppler-0.3.0.ebuild 856
 MD5 e9d6d5b72e5ba3ca39372fa29ff9ffb7 poppler-0.4.2-r1.ebuild 1442
 MD5 49580afaf5b4b9002297bf66e452f9bf poppler-0.4.3-r4.ebuild 1576
 MD5 fb29205148f6f6e6ce94b5587f4aecad poppler-0.4.4.ebuild 1532
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDz+RtomPajV0RnrERAjeRAJ90nfLvo7Xysm6txYpbmS7rX/BU5wCfSyab
-Y7d/tUWDkbHo+IjleTqEf1A=
-=548X
------END PGP SIGNATURE-----
+MD5 5eed9ff91e29dbbd90abaad59463bd83 poppler-0.5.0.ebuild 1489
diff --git a/app-text/poppler/files/digest-poppler-0.5.0 b/app-text/poppler/files/digest-poppler-0.5.0
new file mode 100644
index 000000000000..9442bb845fb6
--- /dev/null
+++ b/app-text/poppler/files/digest-poppler-0.5.0
@@ -0,0 +1 @@
+MD5 c84c1be19f43e4a84872ff08234c1960 poppler-0.5.0.tar.gz 935312
diff --git a/app-text/poppler/files/poppler-0.5.0-cairo-ft.patch b/app-text/poppler/files/poppler-0.5.0-cairo-ft.patch
new file mode 100644
index 000000000000..ec2d99d2b2c1
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.5.0-cairo-ft.patch
@@ -0,0 +1,11 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN poppler-0.5.0.orig/test/Makefile.am poppler-0.5.0/test/Makefile.am
+--- poppler-0.5.0.orig/test/Makefile.am	2005-12-09 14:38:49.000000000 -0500
++++ poppler-0.5.0/test/Makefile.am	2006-01-20 10:29:58.000000000 -0500
+@@ -31,6 +31,7 @@
+ 	-I$(top_srcdir)				\
+ 	-I$(top_srcdir)/poppler			\
+ 	$(cairo_includes)			\
++ 	$(FREETYPE_CFLAGS)			\
+ 	$(GTK_TEST_CFLAGS)			
+ 
+ noinst_PROGRAMS = $(gtk_splash_test) $(gtk_cairo_test) $(pdf_inspector)
diff --git a/app-text/poppler/poppler-0.5.0.ebuild b/app-text/poppler/poppler-0.5.0.ebuild
new file mode 100644
index 000000000000..d4191bbdc5c9
--- /dev/null
+++ b/app-text/poppler/poppler-0.5.0.ebuild
@@ -0,0 +1,52 @@
+# 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.5.0.ebuild,v 1.1 2006/01/20 17:00:46 dang Exp $
+
+inherit eutils
+
+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"
+
+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
+	cairo? ( >=x11-libs/cairo-0.5 )
+	jpeg? ( >=media-libs/jpeg-6b )
+	zlib? ( sys-libs/zlib )
+	!app-text/pdftohtml
+	!<app-text/xpdf-3.01-r4
+	virtual/ghostscript"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=sys-devel/automake-1.9.6"
+
+src_unpack(){
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-cairo-ft.patch
+	epatch ${FILESDIR}/${PN}-0.4.4-bug117481.patch
+	epatch ${FILESDIR}/${PN}-0.4.3-pdf2xml.patch
+	epatch ${FILESDIR}/${PN}-0.4.4-cairo-lines.patch
+	autoreconf -f -v -i || die "autoreconf failed"
+}
+
+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 pdf2xml.dtd
+}