Version bump

(Portage version: 2.2_rc61/cvs/Linux x86_64)

3 files changed, 77 insertions, 7 deletions

diff --git a/dev-libs/poppler-glib/ChangeLog b/dev-libs/poppler-glib/ChangeLog
index 165cbb9d94cf..9c8a4d1afca1 100644
--- a/dev-libs/poppler-glib/ChangeLog
+++ b/dev-libs/poppler-glib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/poppler-glib
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/poppler-glib/ChangeLog,v 1.17 2009/10/18 14:08:05 loki_val Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/poppler-glib/ChangeLog,v 1.18 2010/01/15 22:35:42 yngwin Exp $
+
+*poppler-glib-0.12.3 (15 Jan 2010)
+
+  15 Jan 2010; Ben de Groot <yngwin@gentoo.org> +poppler-glib-0.12.3.ebuild,
+  metadata.xml:
+  Version bump
 
 *poppler-glib-0.12.1 (18 Oct 2009)
 
diff --git a/dev-libs/poppler-glib/metadata.xml b/dev-libs/poppler-glib/metadata.xml
index 1fab2d1eca81..dda5494d3f5a 100644
--- a/dev-libs/poppler-glib/metadata.xml
+++ b/dev-libs/poppler-glib/metadata.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>printing</herd>
-<maintainer>
-	<email>loki_val@gentoo.org</email>
-	<name>Peter Alfredsen</name>
-</maintainer>
+  <herd>printing</herd>
+  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>loki_val@gentoo.org</email>
+    <name>Peter Alfredsen</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-libs/poppler-glib/poppler-glib-0.12.3.ebuild b/dev-libs/poppler-glib/poppler-glib-0.12.3.ebuild
new file mode 100644
index 000000000000..86d90d733cd1
--- /dev/null
+++ b/dev-libs/poppler-glib/poppler-glib-0.12.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/poppler-glib/poppler-glib-0.12.3.ebuild,v 1.1 2010/01/15 22:35:42 yngwin Exp $
+
+EAPI=2
+
+POPPLER_MODULE=glib
+
+inherit poppler flag-o-matic
+
+DESCRIPTION="Glib bindings for poppler"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+cairo"
+
+# The Cairo renderer represents a superset of the splash renderer.
+# We could also have a gtk use-flag for the interface to gdk-pixbuf, but that wouldn't
+# make sense for us, because:
+# 1. Every app that is ok with only [cairo] is already depending on gtk+:2 :
+#	media-gfx/inkscape
+#	app-text/evince
+# 2. Cairo is a dependency of gtk+:2
+# 3. gdk and gdk-pixbuf is the old way of doing things. Everybody is hot for cairo.
+# 4. In fact, the only app that's ok with [-cairo,-gtk] is app-misc/tracker.
+
+RDEPEND="
+	~dev-libs/poppler-${PV}
+	>=dev-libs/glib-2.16
+	cairo? (
+		>=x11-libs/cairo-1.8.4
+		>=x11-libs/gtk+-2.14.0:2
+	)
+	"
+DEPEND="
+	${RDEPEND}
+	dev-util/pkgconfig
+	"
+
+pkg_setup() {
+	POPPLER_CONF="$(use_enable cairo cairo-output) $(use_enable cairo gdk) $(use_enable cairo splash-output)"
+	POPPLER_PKGCONFIG=( poppler-glib.pc cairo=poppler-cairo.pc )
+	if ! use cairo
+	then
+		export CPPFLAGS="${CPPFLAGS} -DHAVE_SPLASH" poppler_src_compile
+	fi
+}
+
+src_prepare() {
+	poppler_src_prepare
+	sed -i	\
+		-e 's:reference::'	\
+		-e 's:demo::'		\
+		-e '/DISABLE_DEPRECATED/d' \
+		glib/Makefile.in || die "Fixing glib Makefile.in failed"
+	use cairo || { sed -i -e 's:gdk-2.0 gdk-pixbuf-2.0 ::' poppler-glib.pc.in || die "Sedding poppler-glib.pc.in failed" ; }
+}
+
+src_compile() {
+	use cairo && POPPLER_MODULE_S="${S}/poppler" poppler_src_compile libpoppler-cairo.la
+	poppler_src_compile
+}