add qt4 bindings, add current cvs, remove docs already provided by poppler

Package-Manager: portage-2.1_pre7-r2

6 files changed, 240 insertions, 4 deletions

diff --git a/app-text/poppler-bindings/ChangeLog b/app-text/poppler-bindings/ChangeLog
index 740772c2909c..f2654227f6c6 100644
--- a/app-text/poppler-bindings/ChangeLog
+++ b/app-text/poppler-bindings/ChangeLog
@@ -1,6 +1,13 @@
 # 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.24 2006/03/26 19:17:11 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/ChangeLog,v 1.25 2006/04/01 18:30:19 genstef Exp $
+
+*poppler-bindings-0.5.1-r1 (01 Apr 2006)
+
+  01 Apr 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/poppler-0.5.1-arthur.patch, +files/poppler-0.5.1-r1-bindings.patch,
+  +poppler-bindings-0.5.1-r1.ebuild:
+  add qt4 bindings, add current cvs, remove docs already provided by poppler
 
   26 Mar 2006; Stefan Schweizer <genstef@gentoo.org>
   poppler-bindings-0.5.0.ebuild, poppler-bindings-0.5.1.ebuild:
diff --git a/app-text/poppler-bindings/Manifest b/app-text/poppler-bindings/Manifest
index 9e2e3c4344e7..2fc2b1796da3 100644
--- a/app-text/poppler-bindings/Manifest
+++ b/app-text/poppler-bindings/Manifest
@@ -1,24 +1,36 @@
-MD5 72a4df7a8e2d4ee87a5d4a077a5c488b ChangeLog 3653
-RMD160 2d3f6f6444fbc651ccd8643522552e6b09b806b6 ChangeLog 3653
-SHA256 2ed336e554168eb8f42e8ad2b6a73c5df51534915f59fdfe7ed90d53f60373ac ChangeLog 3653
+MD5 5132960df6bec5488f11ada27f291f42 ChangeLog 3940
+RMD160 a3a614a21d326379a94dcf32dc9c621fd04a84aa ChangeLog 3940
+SHA256 0357d62a5dc1d97cd49623c8dd1157c798f68ded6126a3ebb0830c593b2c84d9 ChangeLog 3940
 MD5 e876193dfd11bf13602043abf0ecec21 files/digest-poppler-bindings-0.5.0 241
 RMD160 4ac5024c341597422cfd4e2a1625b6ff9f1b4e6f files/digest-poppler-bindings-0.5.0 241
 SHA256 51bb8ae71c9ac143ae67a7cecb81aa02fdf8798baf3bc90ebb499692ba5d3ea7 files/digest-poppler-bindings-0.5.0 241
 MD5 bfbec6a51d5b284cf7d771906303774e files/digest-poppler-bindings-0.5.1 241
 RMD160 1c8ffab9e42cce045bee08a442a00c45310e0fa6 files/digest-poppler-bindings-0.5.1 241
 SHA256 77347834bd17a13a58e26dbeeeb04dbec2c24683a03d7d5d29ade883897355bf files/digest-poppler-bindings-0.5.1 241
+MD5 536189ff37491801ccc8e97791212f95 files/digest-poppler-bindings-0.5.1-r1 524
+RMD160 44cded8464779364da3b5fbd4966d442fb96a244 files/digest-poppler-bindings-0.5.1-r1 524
+SHA256 a1bc0d718cd6203e4849066bcee67f97b04e8dcb80a354029daf2124a84500a7 files/digest-poppler-bindings-0.5.1-r1 524
 MD5 293623f77988fe5a042ce6fa81099ae5 files/poppler-0.5.0-bindings.patch 2928
 RMD160 e3bede718e8a4161aa931e46ceb35498d5fe8e2a files/poppler-0.5.0-bindings.patch 2928
 SHA256 3e06b35deb4a1b2fa4b25c9c0dbfd99005ed62b8dc842d5f219a998f42e88795 files/poppler-0.5.0-bindings.patch 2928
+MD5 96d36c0ffd0b851de5501a7a6f754ba6 files/poppler-0.5.1-arthur.patch 1420
+RMD160 24628ffec2d19f251c9901ce4fd102a6260febd3 files/poppler-0.5.1-arthur.patch 1420
+SHA256 f25d0dda38ec392923c6de2835635b9a5dc9599cad5aad35e0e7fea2704cbd98 files/poppler-0.5.1-arthur.patch 1420
 MD5 446d870c27304d4bdef6fca86e9bb624 files/poppler-0.5.1-bindings.patch 3014
 RMD160 deab225ad3c9a0f719784f38e6f734e2825ec875 files/poppler-0.5.1-bindings.patch 3014
 SHA256 18a89c526341019d44ca0054b0b6f54a8c903b05d0bec69a94d2a72a2897d68f files/poppler-0.5.1-bindings.patch 3014
+MD5 dd9bbe42d7cb066d25d0bc67a019581f files/poppler-0.5.1-r1-bindings.patch 2982
+RMD160 07ee852dd5988822886be6bebf1431f9e69b66e2 files/poppler-0.5.1-r1-bindings.patch 2982
+SHA256 32dfeb415c242b67f67c4934b7d725f18296d56af90a84f4a3d6b3862298c175 files/poppler-0.5.1-r1-bindings.patch 2982
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata.xml 161
 MD5 5fdd43aee2bb2adf5709f25dd97a5af7 poppler-bindings-0.5.0.ebuild 1921
 RMD160 0f99c11a5501a30a7a0bf98ac36bbb6ade1b8ae6 poppler-bindings-0.5.0.ebuild 1921
 SHA256 2c6bba081a07c6b7fac777a9767f6dec22d59b8b04ddc8e027b4800c5813081e poppler-bindings-0.5.0.ebuild 1921
+MD5 46c841479c26be35c14c3b9b205d103e poppler-bindings-0.5.1-r1.ebuild 1891
+RMD160 d176fed11442075a3a3112b7eda4d9277e4a7e21 poppler-bindings-0.5.1-r1.ebuild 1891
+SHA256 4ecd35b0ef4f9067c9c059e36c718348653a8ce36bd2ec762cb1d8b61ccb8a27 poppler-bindings-0.5.1-r1.ebuild 1891
 MD5 16258bb5c47b7b5f264cb949bce2c18c poppler-bindings-0.5.1.ebuild 1627
 RMD160 80f2cf2dd888c6da4b99e806c18c0f46435b2cec poppler-bindings-0.5.1.ebuild 1627
 SHA256 59ffecc50fc855006d0d0ff6b0629b5f5a2734dd9b259d7378b040cd6eca526d poppler-bindings-0.5.1.ebuild 1627
diff --git a/app-text/poppler-bindings/files/digest-poppler-bindings-0.5.1-r1 b/app-text/poppler-bindings/files/digest-poppler-bindings-0.5.1-r1
new file mode 100644
index 000000000000..2350d35c34ef
--- /dev/null
+++ b/app-text/poppler-bindings/files/digest-poppler-bindings-0.5.1-r1
@@ -0,0 +1,6 @@
+MD5 1ce8b61d6b91463dc2790b3eff1b1ec7 poppler-0.5.1-cvs20060401.patch.bz2 41297
+RMD160 35659844e017eeacf16da6172377b8e144201b61 poppler-0.5.1-cvs20060401.patch.bz2 41297
+SHA256 56e1c52451a14c2d6eba7f55eece60102e2ee5dd2fb24aeb18e584d0109cf027 poppler-0.5.1-cvs20060401.patch.bz2 41297
+MD5 a136cd731892f4570933034ba97c8704 poppler-0.5.1.tar.gz 954930
+RMD160 ffd39323da0e0c487a6e7de48d8a607385189ddd poppler-0.5.1.tar.gz 954930
+SHA256 2ee3f06d64dd703a2411428169fe21c17f6358950bb797d52ca8eebd1dcf1abe poppler-0.5.1.tar.gz 954930
diff --git a/app-text/poppler-bindings/files/poppler-0.5.1-arthur.patch b/app-text/poppler-bindings/files/poppler-0.5.1-arthur.patch
new file mode 100644
index 000000000000..54fb172b9e25
--- /dev/null
+++ b/app-text/poppler-bindings/files/poppler-0.5.1-arthur.patch
@@ -0,0 +1,52 @@
+diff -ur poppler.orig/poppler/Makefile.am poppler/poppler/Makefile.am
+--- poppler.orig/poppler/Makefile.am	2006-04-01 17:30:36.000000000 +0200
++++ poppler/poppler/Makefile.am	2006-04-01 17:35:23.000000000 +0200
+@@ -17,10 +17,10 @@
+ 
+ if BUILD_POPPLER_QT4
+ 
+-arthur_headers =				\
+-	ArthurOutputDev.h
++poppler_arthur = libpoppler-arthur.la
+ 
+-arthur_sources =				\
++libpoppler_arthur_la_SOURCES =			\
++	ArthurOutputDev.h			\
+ 	ArthurOutputDev.cc
+ 
+ arthur_includes =				\
+@@ -79,13 +79,13 @@
+ 
+ lib_LTLIBRARIES = libpoppler.la
+ 
+-noinst_LTLIBRARIES = $(poppler_cairo)
++noinst_LTLIBRARIES = $(poppler_cairo)		\
++	$(poppler_arthur)
+ 
+ libpoppler_la_LIBADD =				\
+ 	$(top_builddir)/goo/libgoo.la		\
+ 	$(top_builddir)/fofi/libfofi.la		\
+ 	$(splash_libs)				\
+-	$(arthur_libs)				\
+ 	$(libjpeg_libs)				\
+ 	$(zlib_libs)				\
+ 	$(FREETYPE_LIBS)
+@@ -97,7 +97,6 @@
+ poppler_includedir = $(includedir)/poppler
+ poppler_include_HEADERS =	\
+ 	$(splash_headers)	\
+-	$(arthur_headers)	\
+ 	Annot.h			\
+ 	Array.h			\
+ 	BaseFile.h		\
+diff -ur poppler.orig/qt4/src/Makefile.am poppler/qt4/src/Makefile.am
+--- poppler.orig/qt4/src/Makefile.am	2006-04-01 17:41:02.000000000 +0200
++++ poppler/qt4/src/Makefile.am	2006-04-01 17:40:49.000000000 +0200
+@@ -24,6 +24,7 @@
+ 
+ libpoppler_qt4_la_LIBADD = 			\
+ 	-lpoppler				\
++	$(top_builddir)/poppler/libpoppler-arthur.la	\
+ 	$(POPPLER_QT4_LIBS)
+ 
+ libpoppler_qt4_la_LDFLAGS = -version-info 1:0:0
diff --git a/app-text/poppler-bindings/files/poppler-0.5.1-r1-bindings.patch b/app-text/poppler-bindings/files/poppler-0.5.1-r1-bindings.patch
new file mode 100644
index 000000000000..d3cb8996ef93
--- /dev/null
+++ b/app-text/poppler-bindings/files/poppler-0.5.1-r1-bindings.patch
@@ -0,0 +1,88 @@
+diff --exclude='*.orig' --exclude='*.rej' -ruN poppler-0.5.1.orig/glib/Makefile.am poppler-0.5.1/glib/Makefile.am
+--- poppler-0.5.1.orig/glib/Makefile.am	2006-03-03 19:37:27.000000000 +0100
++++ poppler-0.5.1/glib/Makefile.am	2006-03-03 19:38:15.000000000 +0100
+@@ -79,7 +79,7 @@
+ 	poppler-private.h
+ 
+ libpoppler_glib_la_LIBADD =				\
+-	$(top_builddir)/poppler/libpoppler.la		\
++	-lpoppler					\
+ 	$(POPPLER_GLIB_LIBS)				\
+ 	$(FREETYPE_LIBS)				\
+ 	$(cairo_libs)
+@@ -92,7 +92,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='*.orig' --exclude='*.rej' -ruN poppler-0.5.1.orig/Makefile.am poppler-0.5.1/Makefile.am
+--- poppler-0.5.1.orig/Makefile.am	2006-03-03 19:37:27.000000000 +0100
++++ poppler-0.5.1/Makefile.am	2006-03-03 19:37:33.000000000 +0100
+@@ -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,7 @@
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA =				\
+-	poppler.pc				\
+ 	$(cairo_pc_file)			\
+-	$(splash_pc_file)			\
+ 	$(glib_pc_file)				\
+ 	$(qt_pc_file)                           \
+ 	$(qt4_pc_file)
+diff --exclude='*.orig' --exclude='*.rej' -ruN poppler-0.5.1.orig/qt/Makefile.am poppler-0.5.1/qt/Makefile.am
+--- poppler-0.5.1.orig/qt/Makefile.am	2006-03-03 19:37:27.000000000 +0100
++++ poppler-0.5.1/qt/Makefile.am	2006-03-03 19:37:33.000000000 +0100
+@@ -22,7 +22,7 @@
+ 	poppler-private.h
+ 
+ libpoppler_qt_la_LIBADD = 			\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler				\
+ 	$(POPPLER_QT_LIBS)			\
+ 	$(FREETYPE_LIBS)
+ 
+@@ -38,7 +38,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='*.orig' --exclude='*.rej' -ruN poppler-0.5.1.orig/qt4/src/Makefile.am poppler-0.5.1/qt4/src/Makefile.am
+--- poppler-0.5.1.orig/qt4/src/Makefile.am	2006-03-03 19:37:27.000000000 +0100
++++ poppler-0.5.1/qt4/src/Makefile.am	2006-03-03 19:37:33.000000000 +0100
+@@ -23,7 +23,7 @@
+ 	poppler-private.h
+ 
+ libpoppler_qt4_la_LIBADD = 			\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler				\
+ 	$(POPPLER_QT4_LIBS)
+ 
+ libpoppler_qt4_la_LDFLAGS = -version-info 1:0:0
+diff --exclude='*.orig' --exclude='*.rej' -ruN poppler-0.5.1.orig/qt4/tests/Makefile.am poppler-0.5.1/qt4/tests/Makefile.am
+--- poppler-0.5.1.orig/qt4/tests/Makefile.am	2006-03-03 19:37:27.000000000 +0100
++++ poppler-0.5.1/qt4/tests/Makefile.am	2006-03-03 19:37:33.000000000 +0100
+@@ -7,7 +7,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.1-r1.ebuild b/app-text/poppler-bindings/poppler-bindings-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..804712a23b92
--- /dev/null
+++ b/app-text/poppler-bindings/poppler-bindings-0.5.1-r1.ebuild
@@ -0,0 +1,71 @@
+# 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.1-r1.ebuild,v 1.1 2006/04/01 18:30:19 genstef Exp $
+
+inherit autotools eutils multilib
+
+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
+	http://dev.gentoo.org/~genstef/files/dist/${MY_P}-cvs20060401.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk qt cairo qt4"
+
+RDEPEND="~app-text/poppler-${PV}
+	cairo? ( >=x11-libs/cairo-0.5 )
+	gtk? (
+		>=x11-libs/gtk+-2.6
+		>=gnome-base/libglade-2
+	)
+	qt? ( =x11-libs/qt-3* )
+	qt4? ( =x11-libs/qt-4* )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=sys-devel/automake-1.9.6"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack(){
+	unpack ${A}
+	cd ${S}
+	epatch ${WORKDIR}/${MY_P}-cvs20060401.patch
+	epatch ${FILESDIR}/${MY_P}-r1-bindings.patch
+	epatch ${FILESDIR}/${MY_P}-arthur.patch
+	AT_M4DIR="m4" eautoreconf
+	sed -i s:/usr/lib/qt:/usr/lib/qt4: configure
+}
+
+src_compile() {
+	# Configure needs help finding qt libs on multilib systems
+	export QTLIB="${QTDIR}/$(get_libdir)"
+
+	econf --enable-opi \
+		$(use_enable cairo cairo-output) \
+		$(use_enable gtk poppler-glib) \
+		$(use_enable qt poppler-qt) \
+		$(use_enable qt4 poppler-qt4) \
+		|| die "configuration failed"
+	cd poppler
+	if use cairo; then
+		emake libpoppler-cairo.la || die "cairo failed"
+	fi
+	if use qt4; then
+		emake libpoppler-arthur.la || die "arthur failed"
+	fi
+	cd ..
+	emake || die "compilation failed"
+}
+
+src_install() {
+	dolib.a poppler/libpoppler-cairo.la
+	make DESTDIR=${D} install || die "make install failed"
+}
+
+pkg_postinst() {
+	ewarn "You need to rebuild everything depending on poppler, use revdep-rebuild"
+}