Add cogl-pango vala bindings from 0.15.x, required for vala support in libchamplain-0.12.x (bug #402013).

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 167 insertions, 5 deletions

diff --git a/dev-lang/vala/ChangeLog b/dev-lang/vala/ChangeLog
index b5722f22d190..b8502581dd70 100644
--- a/dev-lang/vala/ChangeLog
+++ b/dev-lang/vala/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/vala
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/ChangeLog,v 1.85 2012/02/01 02:55:39 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/ChangeLog,v 1.86 2012/02/04 22:38:36 tetromino Exp $
+
+*vala-0.14.2-r1 (04 Feb 2012)
+
+  04 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +vala-0.14.2-r1.ebuild, +files/vala-0.14.2-cogl-pango-1.0.patch:
+  Add cogl-pango vala bindings from 0.15.x, required for vala support in
+  libchamplain-0.12.x (bug #402013).
 
 *vala-0.14.2 (01 Feb 2012)
 
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index f14b24e9daa0..fd42da1b235f 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX vala-0.14.2-cogl-pango-1.0.patch 5733 RMD160 556ce9944c75e2c07b8032f303db810033b623b9 SHA1 a04fa37d5a3f22794459a9e77bb982eba4becfc8 SHA256 2ebaa8e78abe09161bda977887eec6ffe5f9badcce5df1f6aaec945c48cb8d46
 DIST vala-0.10.4.tar.bz2 2418192 RMD160 854ecfad5e846075810c2342da7a8da532be5d42 SHA1 d490149292d49f25008e1a774ece55e7cc639b73 SHA256 4d23bd8b904ec59537ed5bcf44064104ccc41d639a3386cbc62d91f6bf0301c4
 DIST vala-0.12.1.tar.xz 2286024 RMD160 a7e4a3b810a5981f1fa8b66603d37dfd447494b7 SHA1 18b9277f89cbab44a0f5c2095333d52afb035487 SHA256 f102bb64549ebe88955bb9fa0f502d974413aec71fec88e3544c65adfeb0afb4
 DIST vala-0.14.0.tar.xz 2593052 RMD160 4b9ba7777921a12b5fdfdd28c491c0608396bcb8 SHA1 82c330e23b6d2fd894c38b6ad131b040d61eea5c SHA256 3830a30b54738ddfb29ab7819a4ac2370392f52fde090742a8a304fadaec747c
@@ -10,13 +11,14 @@ EBUILD vala-0.10.4-r1.ebuild 1325 RMD160 04508649e0d62bad8bef0d52b9cf4f810ad34d0
 EBUILD vala-0.12.1.ebuild 1287 RMD160 e97ee6a5c63a16108432eff24a550f694c055347 SHA1 d060b815b1ad7cfd74909e800bf315a2df47c062 SHA256 c04c23fdf43c53f1c1d839f6abe357751471b458adb672f9951ee53a5ae755eb
 EBUILD vala-0.14.0.ebuild 1299 RMD160 7413021f92ec553682f352c3f282686f8bd00fd2 SHA1 f64622744cf1faedf4fdef466003f528d2cb4ea9 SHA256 a5648f370da0e553e993438da14cb93abbc13700f39e81054fef244ab2326c0c
 EBUILD vala-0.14.1.ebuild 1300 RMD160 8ac241938c1055eeed56dd1d1764fc85836f71fc SHA1 82418c7e9076610de4e18ad845efd3a149ce2e09 SHA256 77fad104cc12fe37d1384064dc77683f0ff0140194df1930a17368551f429191
+EBUILD vala-0.14.2-r1.ebuild 1493 RMD160 5bafe303b278497e5e9691b79bd38ba0ba71fdcd SHA1 4e905c6ed7d1cc6210671c0c310b825c7f656773 SHA256 142696766d98fc710054bfcfd3d8257abe63488924927d21c3ee9198dc8e1f2d
 EBUILD vala-0.14.2.ebuild 1246 RMD160 bcd34113b3a937f69a2cb49fa2a8792e8c08ef36 SHA1 8f54e6af0bdf7d1364b64f1e7688b172e343363a SHA256 9a22020c855306c4f2f84c0165dc9da9705f036d867e63abaebe19f5dfe1ab9c
-MISC ChangeLog 12560 RMD160 252ed3599a5c5a8e78215b61f41c55b9d71d4aab SHA1 4ab533407efd67976bb205af06579b8707ebccbf SHA256 b97a2f2e8e58590cdaeb0e75a7b6db4dbc03d9a33dfad2fd491feda85d8acd10
+MISC ChangeLog 12828 RMD160 03ef4957bc92460a10e49a22f67ab994cdc26b62 SHA1 030f284cb6d4bc4989c5e75e4a23d500e5eb762e SHA256 29cfb971d8c3daec3063b4af13ae8e99669b23d4f7a5430c0c1ba0fecbedb9cc
 MISC metadata.xml 246 RMD160 0908bdc9d087812644613d8cd68b9324b5546b91 SHA1 409735e3e1557c563b5e8005228c1f0c34a52611 SHA256 98f5590ad1f7d7d67baf30bb9c20e3e664b9fa811feb66daafc073351873449f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk8oqbkACgkQdjK8w9WeBnDrCgD+LReEcF3ZPQshVkpCCoBJemBf
-qDxKwjTkVK8G5bRdMt4A/i5Z+zaALRKbIOWqyEasr5SOtpII5djR5SUuhtyIfnvv
-=0HGr
+iF4EAREIAAYFAk8ts3EACgkQdjK8w9WeBnCOsgEAhC5F2xbowSEXMobfBeXvPLIK
+06z7d22w7G7UmbY2VqkA/3Tieob0/mMKApss05AjhT1sp9DsWOH6AQGgiuE0KI3G
+=+j/H
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/vala/files/vala-0.14.2-cogl-pango-1.0.patch b/dev-lang/vala/files/vala-0.14.2-cogl-pango-1.0.patch
new file mode 100644
index 000000000000..987f7177fbb9
--- /dev/null
+++ b/dev-lang/vala/files/vala-0.14.2-cogl-pango-1.0.patch
@@ -0,0 +1,92 @@
+From 7af6a003e386739a37b356ab073772ae38b1f9c6 Mon Sep 17 00:00:00 2001
+From: Evan Nemerson <evan@coeus-group.com>
+Date: Thu, 12 Jan 2012 15:08:08 -0800
+Subject: [PATCH] Add cogl-pango-1.0 bindings
+
+---
+ vapi/Makefile.am         |    7 ++++++-
+ vapi/cogl-pango-1.0.deps |    2 ++
+ vapi/cogl-pango-1.0.vapi |   30 ++++++++++++++++++++++++++++++
+ 3 files changed, 38 insertions(+), 1 deletions(-)
+ create mode 100644 vapi/cogl-pango-1.0.deps
+ create mode 100644 vapi/cogl-pango-1.0.vapi
+
+diff --git a/vapi/Makefile.am b/vapi/Makefile.am
+index c9a7aad..cd3b9e1 100644
+--- a/vapi/Makefile.am
++++ b/vapi/Makefile.am
+@@ -28,6 +28,8 @@ dist_vapi_DATA = \
+ 	clutter-json-1.0.vapi \
+ 	cogl-1.0.vapi \
+ 	cogl-1.0.deps \
++	cogl-pango-1.0.vapi \
++	cogl-pango-1.0.deps \
+ 	curses.vapi \
+ 	dbus-glib-1.vapi \
+ 	enchant.vapi \
+@@ -246,7 +248,7 @@ dist_noinst_DATA = \
+ 	config.vapi \
+ 	$(NULL)
+ 
+-BINDINGS = atk clutter-1.0 clutter-gtk-0.10 clutter-gtk-1.0 cogl-1.0 gconf-2.0 gdk-2.0 gdk-3.0 gdk-pixbuf-2.0 gdk-x11-2.0 gdk-x11-3.0 gdl-1.0 gdu gdu-gtk gedit-2.20 gedit gio-2.0 gio-unix-2.0 gnome-desktop-2.0 gnome-keyring-1 gnome-vfs-2.0 goocanvas gstreamer-0.10 gstreamer-app-0.10 gstreamer-audio-0.10 gstreamer-base-0.10 gstreamer-cdda-0.10 gstreamer-check-0.10 gstreamer-controller-0.10 gstreamer-dataprotocol-0.10 gstreamer-fft-0.10 gstreamer-interfaces-0.10 gstreamer-net-0.10 gstreamer-netbuffer-0.10 gstreamer-pbutils-0.10 gstreamer-riff-0.10 gstreamer-rtp-0.10 gstreamer-rtsp-0.10 gstreamer-sdp-0.10 gstreamer-tag-0.10 gstreamer-video-0.10 gtk+-2.0 gtk+-3.0 gtksourceview-2.0 gtksourceview-3.0 gudev-1.0 hildon-1 hildon-fm-2 json-glib-1.0 libepc-1.0 libgda-4.0 libgda-report-4.0 libgdata libglade-2.0 libgnome-2.0 libgnome-menu libgnomeui-2.0 libgsf-1 libnotify liboobs-1 libpeas-1.0 librsvg-2.0 libsexy libsoup-2.2 libsoup-2.4 libwnck-1.0 loudmouth-1.0 mx-1.0 packagekit-glib2 pango pangocairo poppler-glib purple rest-0.6 rest-extras-0.6 rest-0.7 tracker-indexer-module-1.0 twitter-glib-1.0 unique-1.0 vte vte-2.90 webkit-1.0
++BINDINGS = atk clutter-1.0 clutter-gtk-0.10 clutter-gtk-1.0 cogl-1.0 cogl-pango-1.0 gconf-2.0 gdk-2.0 gdk-3.0 gdk-pixbuf-2.0 gdk-x11-2.0 gdk-x11-3.0 gdl-1.0 gdu gdu-gtk gedit-2.20 gedit gio-2.0 gio-unix-2.0 gnome-desktop-2.0 gnome-keyring-1 gnome-vfs-2.0 goocanvas gstreamer-0.10 gstreamer-app-0.10 gstreamer-audio-0.10 gstreamer-base-0.10 gstreamer-cdda-0.10 gstreamer-check-0.10 gstreamer-controller-0.10 gstreamer-dataprotocol-0.10 gstreamer-fft-0.10 gstreamer-interfaces-0.10 gstreamer-net-0.10 gstreamer-netbuffer-0.10 gstreamer-pbutils-0.10 gstreamer-riff-0.10 gstreamer-rtp-0.10 gstreamer-rtsp-0.10 gstreamer-sdp-0.10 gstreamer-tag-0.10 gstreamer-video-0.10 gtk+-2.0 gtk+-3.0 gtksourceview-2.0 gtksourceview-3.0 gudev-1.0 hildon-1 hildon-fm-2 json-glib-1.0 libepc-1.0 libgda-4.0 libgda-report-4.0 libgdata libglade-2.0 libgnome-2.0 libgnome-menu libgnomeui-2.0 libgsf-1 libnotify liboobs-1 libpeas-1.0 librsvg-2.0 libsexy libsoup-2.2 libsoup-2.4 libwnck-1.0 loudmouth-1.0 mx-1.0 packagekit-glib2 pango pangocairo poppler-glib purple rest-0.6 rest-extras-0.6 rest-0.7 tracker-indexer-module-1.0 twitter-glib-1.0 unique-1.0 vte vte-2.90 webkit-1.0
+ 
+ VAPIGEN = $(top_builddir)/vapigen/vapigen
+ VAPIGENFLAGS = --vapidir $(srcdir)
+@@ -275,6 +277,9 @@ clutter-gtk-1.0:
+ cogl-1.0:
+ 	$(GENVAPI) --library $(srcdir)/cogl-1.0 $(PACKAGESDIR)/cogl-1.0/cogl-1.0-custom.vala $(PACKAGESDIR)/cogl-1.0/cogl-1.0.gi
+ 
++cogl-pango-1.0:
++	$(GENVAPI) --library $(srcdir)/cogl-pango-1.0 --metadatadir $(METADATADIR) --pkg cogl-1.0 --pkg pango $(GIRDIR)/CoglPango-1.0.gir
++
+ gconf-2.0:
+ 	$(GENVAPI) --library $(srcdir)/gconf-2.0 $(PACKAGESDIR)/gconf-2.0/gconf-2.0.gi
+ 
+diff --git a/vapi/cogl-pango-1.0.deps b/vapi/cogl-pango-1.0.deps
+new file mode 100644
+index 0000000..ebc27e5
+--- /dev/null
++++ b/vapi/cogl-pango-1.0.deps
+@@ -0,0 +1,2 @@
++cogl-1.0
++pango
+diff --git a/vapi/cogl-pango-1.0.vapi b/vapi/cogl-pango-1.0.vapi
+new file mode 100644
+index 0000000..4b2599c
+--- /dev/null
++++ b/vapi/cogl-pango-1.0.vapi
+@@ -0,0 +1,30 @@
++/* cogl-pango-1.0.vapi generated by vapigen, do not modify. */
++
++[CCode (cprefix = "CoglPango", gir_namespace = "CoglPango", gir_version = "1.0", lower_case_cprefix = "cogl_pango_")]
++namespace CoglPango {
++	[CCode (cheader_filename = "cogl-pango/cogl-pango.h")]
++	public class FontMap : Pango.FontMap {
++		[CCode (has_construct_function = false)]
++		protected FontMap ();
++		public static void clear_glyph_cache (Pango.CairoFontMap fm);
++		public static Pango.Context create_context (Pango.CairoFontMap fm);
++		public static unowned Pango.Renderer get_renderer (Pango.CairoFontMap fm);
++		public static bool get_use_mipmapping (Pango.CairoFontMap fm);
++		public static Pango.FontMap @new ();
++		public static void set_resolution (Pango.CairoFontMap font_map, double dpi);
++		public static void set_use_mipmapping (Pango.CairoFontMap fm, bool value);
++	}
++	[CCode (cheader_filename = "cogl-pango/cogl-pango.h", type_id = "cogl_pango_renderer_get_type ()")]
++	public class Renderer : Pango.Renderer {
++		[CCode (has_construct_function = false)]
++		protected Renderer ();
++	}
++	[CCode (cheader_filename = "cogl-pango/cogl-pango.h")]
++	public static void ensure_glyph_cache_for_layout (Pango.Layout layout);
++	[CCode (cheader_filename = "cogl-pango/cogl-pango.h")]
++	public static void render_layout (Pango.Layout layout, int x, int y, Cogl.Color color, int flags);
++	[CCode (cheader_filename = "cogl-pango/cogl-pango.h")]
++	public static void render_layout_line (Pango.LayoutLine line, int x, int y, Cogl.Color color);
++	[CCode (cheader_filename = "cogl-pango/cogl-pango.h")]
++	public static void render_layout_subpixel (Pango.Layout layout, int x, int y, Cogl.Color color, int flags);
++}
+-- 
+1.7.8.4
+
diff --git a/dev-lang/vala/vala-0.14.2-r1.ebuild b/dev-lang/vala/vala-0.14.2-r1.ebuild
new file mode 100644
index 000000000000..31b8a9bab4b4
--- /dev/null
+++ b/dev-lang/vala/vala-0.14.2-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.14.2-r1.ebuild,v 1.1 2012/02/04 22:38:36 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools alternatives eutils gnome2
+
+DESCRIPTION="Vala - Compiler for the GObject type system"
+HOMEPAGE="http://live.gnome.org/Vala"
+
+LICENSE="LGPL-2.1"
+SLOT="0.14"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-linux"
+IUSE="test +vapigen"
+
+RDEPEND=">=dev-libs/glib-2.16:2"
+DEPEND="${RDEPEND}
+	!${CATEGORY}/${PN}:0
+	sys-devel/flex
+	|| ( sys-devel/bison dev-util/byacc dev-util/yacc )
+	dev-util/pkgconfig
+	dev-libs/libxslt
+	test? (
+		dev-libs/dbus-glib
+		>=dev-libs/glib-2.26:2 )"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-unversioned
+		$(use_enable vapigen)"
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+}
+
+src_prepare() {
+	# Patch from 0.15.x, needed for libchamplain:0.12, bug #402013,
+	# https://bugzilla.gnome.org/show_bug.cgi?id=669379
+	epatch "${FILESDIR}/${PN}-0.14.2-cogl-pango-1.0.patch"
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+
+	insinto /usr/share/aclocal
+	newins vala.m4 vala-${SLOT/./-}.m4
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	alternatives_auto_makesym /usr/share/aclocal/vala.m4 "vala-0-[0-9][0-9].m4"
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	alternatives_auto_makesym /usr/share/aclocal/vala.m4 "vala-0-[0-9][0-9].m4"
+}