version bump, remove old

(Portage version: 2.1.2_pre1)

4 files changed, 157 insertions, 1 deletions

diff --git a/app-text/poppler-bindings/ChangeLog b/app-text/poppler-bindings/ChangeLog
index c0c67d3d05f0..f831916227e9 100644
--- a/app-text/poppler-bindings/ChangeLog
+++ b/app-text/poppler-bindings/ChangeLog
@@ -1,6 +1,14 @@
 # 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.50 2006/09/03 11:08:18 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/ChangeLog,v 1.51 2006/09/23 09:25:26 genstef Exp $
+
+*poppler-bindings-0.5.4 (23 Sep 2006)
+
+  23 Sep 2006; Stefan Schweizer <genstef@gentoo.org>
+  -files/poppler-0.5.0-bindings.patch, +files/glib-2.0.fix,
+  -poppler-bindings-0.5.0.ebuild, -poppler-bindings-0.5.1.ebuild,
+  +poppler-bindings-0.5.4.ebuild:
+  version bump, remove old
 
   03 Sep 2006; Bryan Østergaard <kloeri@gentoo.org>
   poppler-bindings-0.5.3.ebuild:
diff --git a/app-text/poppler-bindings/files/digest-poppler-bindings-0.5.4 b/app-text/poppler-bindings/files/digest-poppler-bindings-0.5.4
new file mode 100644
index 000000000000..3cf1476067e6
--- /dev/null
+++ b/app-text/poppler-bindings/files/digest-poppler-bindings-0.5.4
@@ -0,0 +1,3 @@
+MD5 053fdfd70533ecce1a06353fa945f061 poppler-0.5.4.tar.gz 1062401
+RMD160 f28c89b03388757067505df3c60a1d878626b0dd poppler-0.5.4.tar.gz 1062401
+SHA256 ca0f880a4ff07391e99b443f0e7c9860241df6a6aaa327b9d811b358d94a29c9 poppler-0.5.4.tar.gz 1062401
diff --git a/app-text/poppler-bindings/files/glib-2.0.fix b/app-text/poppler-bindings/files/glib-2.0.fix
new file mode 100644
index 000000000000..3a37620281c7
--- /dev/null
+++ b/app-text/poppler-bindings/files/glib-2.0.fix
@@ -0,0 +1,74 @@
+diff -urN poppler-0.5.4~/configure.ac poppler-0.5.4/configure.ac
+--- poppler-0.5.4~/configure.ac	2006-09-22 01:22:02.000000000 +0200
++++ poppler-0.5.4/configure.ac	2006-09-22 15:13:48.000000000 +0200
+@@ -183,7 +183,7 @@
+               enable_poppler_glib=$enableval,
+               enable_poppler_glib="try")
+ if test x$enable_poppler_glib = xyes; then
+-  PKG_CHECK_MODULES(POPPLER_GLIB, gdk-2.0 >= 2.4.0 glib >= 2.6)
++  PKG_CHECK_MODULES(POPPLER_GLIB, gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6)
+ elif test x$enable_poppler_glib = xtry; then
+   PKG_CHECK_MODULES(POPPLER_GLIB, gdk-2.0 >= 2.4.0,
+                     [enable_poppler_glib="yes"],
+diff -urN poppler-0.5.4~/configure poppler-0.5.4/configure
+--- poppler-0.5.4~/configure	2006-09-22 02:54:32.000000000 +0200
++++ poppler-0.5.4/configure	2006-09-22 15:14:19.000000000 +0200
+@@ -24957,12 +24957,12 @@
+         pkg_cv_POPPLER_GLIB_CFLAGS="$POPPLER_GLIB_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-2.0 >= 2.4.0 glib >= 2.6\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "gdk-2.0 >= 2.4.0 glib >= 2.6") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6\"") >&5
++  ($PKG_CONFIG --exists --print-errors "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_POPPLER_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gdk-2.0 >= 2.4.0 glib >= 2.6" 2>/dev/null`
++  pkg_cv_POPPLER_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -24975,12 +24975,12 @@
+         pkg_cv_POPPLER_GLIB_LIBS="$POPPLER_GLIB_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-2.0 >= 2.4.0 glib >= 2.6\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "gdk-2.0 >= 2.4.0 glib >= 2.6") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6\"") >&5
++  ($PKG_CONFIG --exists --print-errors "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_POPPLER_GLIB_LIBS=`$PKG_CONFIG --libs "gdk-2.0 >= 2.4.0 glib >= 2.6" 2>/dev/null`
++  pkg_cv_POPPLER_GLIB_LIBS=`$PKG_CONFIG --libs "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -24999,14 +24999,14 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gdk-2.0 >= 2.4.0 glib >= 2.6"`
++	        POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6"`
+         else
+-	        POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gdk-2.0 >= 2.4.0 glib >= 2.6"`
++	        POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$POPPLER_GLIB_PKG_ERRORS" >&5
+ 
+-	{ { echo "$as_me:$LINENO: error: Package requirements (gdk-2.0 >= 2.4.0 glib >= 2.6) were not met:
++	{ { echo "$as_me:$LINENO: error: Package requirements (gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6) were not met:
+ 
+ $POPPLER_GLIB_PKG_ERRORS
+ 
+@@ -25017,7 +25017,7 @@
+ and POPPLER_GLIB_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&5
+-echo "$as_me: error: Package requirements (gdk-2.0 >= 2.4.0 glib >= 2.6) were not met:
++echo "$as_me: error: Package requirements (gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6) were not met:
+ 
+ $POPPLER_GLIB_PKG_ERRORS
+ 
diff --git a/app-text/poppler-bindings/poppler-bindings-0.5.4.ebuild b/app-text/poppler-bindings/poppler-bindings-0.5.4.ebuild
new file mode 100644
index 000000000000..4f7a18c9aef6
--- /dev/null
+++ b/app-text/poppler-bindings/poppler-bindings-0.5.4.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.4.ebuild,v 1.1 2006/09/23 09:25:26 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"
+
+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.2-bindings.patch
+	epatch ${FILESDIR}/glib-2.0.fix
+
+	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() {
+	make DESTDIR=${D} install || die "make install failed"
+}
+
+pkg_postinst() {
+	ewarn "You need to rebuild everything depending on poppler, use revdep-rebuild"
+}