Fix cairo flipping off gtk. Cairo only needs to be able to flip on gtk if enabled.

(Portage version: 2.2_rc12/cvs/Linux 2.6.27-rc8 x86_64)

2 files changed, 125 insertions, 1 deletions

diff --git a/app-text/poppler-bindings/ChangeLog b/app-text/poppler-bindings/ChangeLog
index 42a8b8d2a6fa..90266f15eb13 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/ChangeLog,v 1.110 2008/10/12 21:48:08 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/ChangeLog,v 1.111 2008/10/13 19:49:33 loki_val Exp $
+
+*poppler-bindings-0.10.0-r1 (13 Oct 2008)
+
+  13 Oct 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +poppler-bindings-0.10.0-r1.ebuild:
+  Fix cairo flipping off gtk. Cairo only needs to be able to flip on gtk if
+  enabled.
 
 *poppler-bindings-0.10.0 (12 Oct 2008)
 
diff --git a/app-text/poppler-bindings/poppler-bindings-0.10.0-r1.ebuild b/app-text/poppler-bindings/poppler-bindings-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..e749cee3b20e
--- /dev/null
+++ b/app-text/poppler-bindings/poppler-bindings-0.10.0-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2008 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.10.0-r1.ebuild,v 1.1 2008/10/13 19:49:33 loki_val Exp $
+
+EAPI="2"
+
+inherit autotools eutils multilib
+
+MY_P=${P/-bindings/}
+DESCRIPTION="rendering bindings for GUI toolkits for poppler"
+HOMEPAGE="http://poppler.freedesktop.org/"
+
+# Creating the testsuite tarball
+# must be done if upstream has added tests since last release.
+# can be checked at cgit.freedesktop.org
+#
+# git clone git://anongit.freedesktop.org/git/poppler/test
+# rm -rf test/.git
+# tar czf poppler-test-${PV}.tar.gz test
+
+SRC_URI="http://poppler.freedesktop.org/${MY_P}.tar.gz
+	test? ( mirror://gentoo/poppler-test-0.9.2.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="gtk qt3 cairo qt4 test"
+
+RDEPEND="~app-text/poppler-${PV}
+	cairo? (
+		>=x11-libs/cairo-1.4
+		!gtk? (
+			>=x11-libs/gtk+-2.8
+			>=dev-libs/glib-2.8
+		 )
+	)
+	gtk? (
+		>=x11-libs/gtk+-2.8
+		>=dev-libs/glib-2.8
+	)
+	qt3? ( =x11-libs/qt-3* )
+	qt4? ( || ( ( x11-libs/qt-core:4
+			x11-libs/qt-gui:4
+			x11-libs/qt-test:4 )
+		=x11-libs/qt-4.3*:4 ) )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	test? ( gtk? ( >=gnome-base/libglade-2 ) )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if ! { use gtk || use qt3 || use qt4 || use cairo; }
+	then
+		eerror "You've selected to build no bindings for poppler."
+		eerror "Please select at least one of:"
+		eerror "gtk, qt3, qt4, cairo"
+		die "Please select a toolkit"
+	fi
+
+}
+
+src_prepare() {
+	sed -i \
+		-e 's:$(top_builddir)/poppler/libpoppler.la:-lpoppler:'	\
+		$(find . -name 'Makefile.am' ) || die "404"
+	sed -i \
+		-e '/libpoppler_la_LIBADD/,/win32_libs/d'		\
+		-e '/libpoppler_la_SOURCES/,/XpdfPluginAPI.cc/d'	\
+		-e '/libpoppler.la/d'					\
+		-e '/libpoppler_la/d'					\
+		poppler/Makefile.am || die "404"
+
+	sed -i \
+		-e '/if BUILD_SPLASH_OUTPUT/,/endif/d'			\
+		-e '/poppler.pc\t/d'					\
+		-e ':$(splash_pc_file):d'				\
+		Makefile.am || die "404"
+
+	eautoreconf
+}
+
+src_configure() {
+	# Configure needs help finding qt libs on multilib systems
+	export QTLIB="${QTDIR}/$(get_libdir)"
+	echo $QTLIB
+
+	econf	--disable-utils						\
+		--disable-static					\
+		$(use_enable gtk poppler-glib)				\
+		$(use_enable qt3 poppler-qt)				\
+		$(use_enable qt4 poppler-qt4)				\
+		$(use cairo && echo "--enable-poppler-glib")		\
+		$(use_enable cairo cairo-output)			\
+		|| die "configuration failed"
+}
+
+src_compile() {
+	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 "emake install failed"
+	rm -f $(find "${D}" -name '*.la')
+}
+
+pkg_postinst() {
+	ewarn "You need to rebuild everything depending on poppler, use revdep-rebuild"
+}