version bump

(Portage version: 2.1.2.7)

4 files changed, 172 insertions, 1 deletions

diff --git a/app-text/poppler-bindings/ChangeLog b/app-text/poppler-bindings/ChangeLog
index 291eb5d7be44..da9c80f63436 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/ChangeLog,v 1.64 2007/04/07 21:05:45 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/ChangeLog,v 1.65 2007/05/31 13:58:40 genstef Exp $
+
+*poppler-bindings-0.5.9 (31 May 2007)
+
+  31 May 2007; Stefan Schweizer <genstef@gentoo.org>
+  +files/poppler-0.5.9-bindings.patch, +poppler-bindings-0.5.9.ebuild:
+  version bump
 
   07 Apr 2007; Stefan Schweizer <genstef@gentoo.org>
   poppler-bindings-0.5.3.ebuild, poppler-bindings-0.5.4.ebuild:
diff --git a/app-text/poppler-bindings/files/digest-poppler-bindings-0.5.9 b/app-text/poppler-bindings/files/digest-poppler-bindings-0.5.9
new file mode 100644
index 000000000000..85ee4a6c1d4d
--- /dev/null
+++ b/app-text/poppler-bindings/files/digest-poppler-bindings-0.5.9
@@ -0,0 +1,3 @@
+MD5 8d1ac008614c0e413bcac95b8102fa07 poppler-0.5.9.tar.gz 1169002
+RMD160 3aab75dfb1f4226048c23ed9b6f08fdb2608feb1 poppler-0.5.9.tar.gz 1169002
+SHA256 bee251e5149ac9dd8824aac316456b78a82f4e1954eb3c1a94db3625340ef61e poppler-0.5.9.tar.gz 1169002
diff --git a/app-text/poppler-bindings/files/poppler-0.5.9-bindings.patch b/app-text/poppler-bindings/files/poppler-0.5.9-bindings.patch
new file mode 100644
index 000000000000..a45afc73fb4e
--- /dev/null
+++ b/app-text/poppler-bindings/files/poppler-0.5.9-bindings.patch
@@ -0,0 +1,93 @@
+diff -ur poppler-0.5.9.orig/glib/Makefile.am poppler-0.5.9/glib/Makefile.am
+--- poppler-0.5.9.orig/glib/Makefile.am	2007-05-31 12:38:10.000000000 +0200
++++ poppler-0.5.9/glib/Makefile.am	2007-05-31 12:38:17.000000000 +0200
+@@ -82,7 +82,7 @@
+ 	poppler-private.h
+ 
+ libpoppler_glib_la_LIBADD =				\
+-	$(top_builddir)/poppler/libpoppler.la		\
++	-lpoppler					\
+ 	$(POPPLER_GLIB_LIBS)				\
+ 	$(FREETYPE_LIBS)				\
+ 	$(FONTCONFIG_LIBS)				\
+@@ -96,7 +96,7 @@
+        test-poppler-glib.c
+ 
+ test_poppler_glib_LDADD =			\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler				\
+ 	libpoppler-glib.la			\
+ 	$(POPPLER_GLIB_LIBS)			\
+ 	$(FREETYPE_LIBS)			\
+Nur in poppler-0.5.9/glib: Makefile.am.orig.
+diff -ur poppler-0.5.9.orig/Makefile.am poppler-0.5.9/Makefile.am
+--- poppler-0.5.9.orig/Makefile.am	2007-05-31 12:38:10.000000000 +0200
++++ poppler-0.5.9/Makefile.am	2007-05-31 12:38:17.000000000 +0200
+@@ -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 -ur poppler-0.5.9.orig/qt/Makefile.am poppler-0.5.9/qt/Makefile.am
+--- poppler-0.5.9.orig/qt/Makefile.am	2007-05-31 12:38:10.000000000 +0200
++++ poppler-0.5.9/qt/Makefile.am	2007-05-31 12:38:17.000000000 +0200
+@@ -24,7 +24,7 @@
+ 	poppler-private.h
+ 
+ libpoppler_qt_la_LIBADD = 			\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler				\
+ 	$(POPPLER_QT_LIBS)			\
+ 	$(FREETYPE_LIBS)			\
+ 	$(FONTCONFIG_LIBS)
+@@ -41,7 +41,7 @@
+        test-poppler-qt.cpp
+ 
+ test_poppler_qt_LDADD =				\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler				\
+ 	libpoppler-qt.la			\
+ 	$(POPPLER_QT_LIBS)			\
+ 	$(FREETYPE_LIBS)
+Nur in poppler-0.5.9/qt: Makefile.am.orig.
+diff -ur poppler-0.5.9.orig/qt4/src/Makefile.am poppler-0.5.9/qt4/src/Makefile.am
+--- poppler-0.5.9.orig/qt4/src/Makefile.am	2007-05-31 12:38:10.000000000 +0200
++++ poppler-0.5.9/qt4/src/Makefile.am	2007-05-31 12:38:55.000000000 +0200
+@@ -35,7 +35,7 @@
+ 	poppler-private.h
+ 
+ libpoppler_qt4_la_LIBADD = 			\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler				\
+ 	$(FONTCONFIG_LIBS)				\
+ 	$(POPPLER_QT4_LIBS)
+ 
+Nur in poppler-0.5.9/qt4/src: Makefile.am.orig.
+Nur in poppler-0.5.9/qt4/src: Makefile.am.rej.
+diff -ur poppler-0.5.9.orig/qt4/tests/Makefile.am poppler-0.5.9/qt4/tests/Makefile.am
+--- poppler-0.5.9.orig/qt4/tests/Makefile.am	2007-05-31 12:38:10.000000000 +0200
++++ poppler-0.5.9/qt4/tests/Makefile.am	2007-05-31 12:38:17.000000000 +0200
+@@ -7,7 +7,7 @@
+ 	$(POPPLER_QT4_CFLAGS)
+ 
+ LDADDS =					\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler				\
+ 	$(top_builddir)/qt4/src/libpoppler-qt4.la	\
+ 	$(FONTCONFIG_LIBS)				\
+ 	$(POPPLER_QT4_LIBS)
+Nur in poppler-0.5.9/qt4/tests: Makefile.am.orig.
diff --git a/app-text/poppler-bindings/poppler-bindings-0.5.9.ebuild b/app-text/poppler-bindings/poppler-bindings-0.5.9.ebuild
new file mode 100644
index 000000000000..9f4b1b6c98b3
--- /dev/null
+++ b/app-text/poppler-bindings/poppler-bindings-0.5.9.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2007 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.9.ebuild,v 1.1 2007/05/31 13:58:40 genstef Exp $
+
+inherit autotools eutils multilib
+
+MY_P=${P/-bindings/}
+DESCRIPTION="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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="gtk qt3 cairo qt4"
+
+RDEPEND="~app-text/poppler-${PV}
+	cairo? ( >=x11-libs/cairo-0.5 )
+	gtk? (
+		>=x11-libs/gtk+-2.6
+		>=gnome-base/libglade-2
+	)
+	qt3? ( =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 "${FILESDIR}"/poppler-0.5.9-bindings.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)"
+	echo $QTLIB
+
+	econf --enable-opi \
+		$(use_enable cairo cairo-output) \
+		$(use_enable gtk poppler-glib) \
+		$(use_enable qt3 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() {
+	emake DESTDIR="${D}" install || die "make install failed"
+}
+
+pkg_postinst() {
+	ewarn "You need to rebuild everything depending on poppler, use revdep-rebuild"
+}