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

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-rc8 x86_64

3 files changed, 127 insertions, 2 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/Manifest b/app-text/poppler-bindings/Manifest
index 1a43848ef2b9..601ba9d2e804 100644
--- a/app-text/poppler-bindings/Manifest
+++ b/app-text/poppler-bindings/Manifest
@@ -7,9 +7,10 @@ DIST poppler-0.8.7.tar.gz 1469587 RMD160 ea03cdf88a432e5748988e3576110a2989aa79e
 DIST poppler-test-0.6.1.tar.gz 1607711 RMD160 611099f130ae9c00dead6c603dd224282109c2d9 SHA1 62ad06c9f139142b759938533abf0b8262065d81 SHA256 d629504772b4df3bfa7e6ce149f901370135b2d27e32ca4961e4ab8fc7039f88
 DIST poppler-test-0.8.5.tar.gz 4171047 RMD160 2aec8ef1106aa154d3e988007973f4e7895cb085 SHA1 85de8a40095d2ab33c23960ba4a57c4447e68362 SHA256 4f5db5848ef0ff603a053c6ef3fd8ba9b7e42c71b135488d398bfbc143419690
 DIST poppler-test-0.9.2.tar.bz2 3755392 RMD160 c3e4799fb5d8cc1ce668119626bff618fbaeb65f SHA1 b18379521c24008fd5e31ebf62debb353a190000 SHA256 8c9f93aa01817d30d79c410c37c4890b5e96294ae15c736da88fd97501195fa9
+EBUILD poppler-bindings-0.10.0-r1.ebuild 2931 RMD160 8b8c9267bc848a056b0c1f4bd1e815cc52e68c6b SHA1 f2cbed9e7420026abaede85953ee90e3548db8ec SHA256 2f42f0a3d48ac9976a5b606b8d0d014025dcb7a89bcf8a6b99a642591fc1b25b
 EBUILD poppler-bindings-0.10.0.ebuild 2917 RMD160 a6cf754d4925f7643bf58c3b0ce89f1788719724 SHA1 9d47a03cf98018ed8e696fc96072ece4a739511a SHA256 63fc6a2c5eb803ceefe9414077865d55d0bde3e029ff3cd3f1e2090b397cdda6
 EBUILD poppler-bindings-0.6.1.ebuild 1964 RMD160 3827939d16e5fe4704d43e3a8b5531f8ef7198ac SHA1 cd3041395c06a8e7541dafa30f042b50aa87c230 SHA256 94e0aae466e8fd86b01945364d16d578ce50e3a2221a1780f06d37b8f4d34d2c
 EBUILD poppler-bindings-0.6.3.ebuild 2119 RMD160 b743f850d8f50381161c24e82202a2b7250bc0a7 SHA1 3bab83d72d348e90c8ae8c827fe6b6cb3902886c SHA256 6e052633f7ccf2f97ca9998e4bb132c025a45426195a651b5058f10457424451
 EBUILD poppler-bindings-0.8.7.ebuild 2062 RMD160 e4192733ee0a92dd661c31014333edba7cc3a898 SHA1 10e37b2611d892fd6b0758c66b770bee8055556a SHA256 aa75c3a08a5f5f4ccc509d536bc5fe8307e43c3d3987a021cbbd3211ed8a2ed6
-MISC ChangeLog 17704 RMD160 32babcac49221eb163b0525750df9fc5d5a44ee1 SHA1 5221a8b5611541f524668e2a1449a5451d733c78 SHA256 8575227a121c03196a49429f1d2ce117fba4524099a338fd80dfd5570c600914
+MISC ChangeLog 17926 RMD160 84916848a306692d74ef20bc9cd69e7479986dac SHA1 ff1c2c49e3660f50387b5d004f7879af8b944d50 SHA256 101fc3f65aadab2d3e4769d25de10c0f2055676bd28cbb77281384318d5c2d99
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
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"
+}