Version bump. Add introspection support.

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

4 files changed, 100 insertions, 10 deletions

diff --git a/x11-libs/goocanvas/ChangeLog b/x11-libs/goocanvas/ChangeLog
index bfbf61dd3ad8..de178fd81bbc 100644
--- a/x11-libs/goocanvas/ChangeLog
+++ b/x11-libs/goocanvas/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/goocanvas
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goocanvas/ChangeLog,v 1.24 2011/09/28 13:13:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goocanvas/ChangeLog,v 1.25 2011/11/20 19:59:12 eva Exp $
+
+*goocanvas-2.0.1 (20 Nov 2011)
+
+  20 Nov 2011; Gilles Dartiguelongue <eva@gentoo.org> +goocanvas-2.0.1.ebuild,
+  metadata.xml:
+  Version bump. Add introspection support.
 
   28 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> goocanvas-1.0.0.ebuild:
   Remove useless libtool archive (libgoocanvas.la) which is causing other pkgs
diff --git a/x11-libs/goocanvas/Manifest b/x11-libs/goocanvas/Manifest
index e90e97d24c04..420cdf5c9fb5 100644
--- a/x11-libs/goocanvas/Manifest
+++ b/x11-libs/goocanvas/Manifest
@@ -4,19 +4,17 @@ Hash: SHA1
 DIST goocanvas-0.14.tar.bz2 604778 RMD160 bbda9f746636654ffac397b7d95a091bfec4580e SHA1 67610985c6869731b6bc66878444f96c92e314fb SHA256 1b94c37ac0c13cad8fd858b25c03570e39f3566d136c2f76bb32de3deee233db
 DIST goocanvas-1.0.0.tar.bz2 570552 RMD160 c55c6c037207fcef409d7a8d3ea83e4acef54e69 SHA1 b41d38726fa537258a5f00908eff2d6aad9a5e50 SHA256 1c072ef88567cad241fb4addee26e9bd96741b1503ff736d1c152fa6d865711e
 DIST goocanvas-2.0.0.tar.bz2 577541 RMD160 03b2aa85d60229e8883be0f1f5526e17a5057fd6 SHA1 32b67b17b1f2a29fa725fd8e77b40b1e8c244cf2 SHA256 9f8d7f700ad9617adef37e63f58cb2d038d799443e3756040f368ceea7f01331
+DIST goocanvas-2.0.1.tar.xz 486788 RMD160 54fd656cac8d7dd6434f4f701faa5c2153f85c4e SHA1 7f496b17d56467ed69d96e721f87af7497747204 SHA256 0c3a595a6d2a4fe0f1a1a5243637e66aa1bfbaf6492455bfd0b51e0dec9b1553
 EBUILD goocanvas-0.14.ebuild 1275 RMD160 650024458381ffb659365d9a90a3e135f074060c SHA1 1dfb483dc34b3f1936ffa1da7e0efdfe0229b23d SHA256 b06033c2e91398967ceed50c0fae50209d2c8b3fa7c46f356e80c4aec03db021
 EBUILD goocanvas-1.0.0.ebuild 1302 RMD160 a1d6026608f3d351caf78f848e02715fa1bc56ec SHA1 4749a549b893f57d28a2b33c459d124e0eae5657 SHA256 ec7b36e0cb935d271413c89f1bcae0be7d8dc1824957dfcd5520826a857c4b94
 EBUILD goocanvas-2.0.0.ebuild 1096 RMD160 8394f3f01156461dd372afb3b5386890dd3adcec SHA1 eeede182275b24e869921ac6cee20a85c4538817 SHA256 96f79d39fdc851fc0f4394f23d993fcc438d6e77123ebb3b0bfc2fd2dc9ee220
-MISC ChangeLog 3238 RMD160 a81c83673ad743df83b5a3c748c7dd0685b9adea SHA1 e9b599c9e5c0d74182a867ae933dba97e21eee25 SHA256 7eac7d285153cb25a64a2facf11061a4d1b3e92ce5a1fc046dea8e6f99671eb4
-MISC metadata.xml 212 RMD160 2efe77aefa7626228858aaf918c803a4c3cfcc15 SHA1 d60f227bcd6cbd433b428bc25e4581a4d6c4b67a SHA256 aa0aceb5ff8ebef735fb2ee1f9d9604fa135e3c3034b873d242d954327ad495a
+EBUILD goocanvas-2.0.1.ebuild 1976 RMD160 d8dec04d3eb9ca0a0774b8a261a64ae1d7c245e0 SHA1 ee016d591c65fb42131d8f875e814e7eefd7cd80 SHA256 3248737881a76ac45e53c5d9696a56fad319e27826dfade548b426f28adc66fb
+MISC ChangeLog 3403 RMD160 2e36dcf43857d49469e15e2fd41b4f8ed73fd284 SHA1 a551481c34510bf40ee24df10526f22e0fb41e38 SHA256 b9385c205a575fe0bc28ac39b8d17230224f29ebf287fd4927ce8f0b22c9609e
+MISC metadata.xml 333 RMD160 8448c47d0a0fad95efd3eb613bd316aa45e799ba SHA1 116aec20ff5d5104a5b1b50d90c33f38e65b85e1 SHA256 99fdf746d1d5a0ac13c755cf6189061e62057ff1f61c06147c531acd810059ff
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOgx2gAAoJEEdUh39IaPFNEGQH/3FBX7TnSzvJ2qCtHfEQcRpR
-Zg3fRuWJ9BRWHgd6m5RpQZV2RPATY6Jf/Pw8cULX9oHTD0j8l81PWaQkaiZZsYWN
-MgrpoFBmZTYWX6kku2NUUTcK87gwOconWpuz1FIypmbvK4t+8IqryZ3Hm8/5YSjv
-6VOTioMhRI8DbUBUfQUfrBb9GTeiwBTu/W7YihJfTO+k0xWs9qLwMWENSrLjknVR
-jShQZHlaXV4FnrcDJ2+D3J66m5y2yx4RY+Q278swtPP55zUa2Ca2KyEexcHeDWI/
-nXquussUNnsuB3AS6qGGtD47Ih3sGnLwLbbxmtOnkIvCIAnAgH08dDT+MHDhCOs=
-=ESew
+iEYEARECAAYFAk7JXBYACgkQ1fmVwcYIWAZ3JwCfWo864mO0M2nYZjPM03a16FKP
+8DAAn26Dz1qwY6sSn7rOoLhon+9ipi0j
+=uRco
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/goocanvas/goocanvas-2.0.1.ebuild b/x11-libs/goocanvas/goocanvas-2.0.1.ebuild
new file mode 100644
index 000000000000..d74bb17faa55
--- /dev/null
+++ b/x11-libs/goocanvas/goocanvas-2.0.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goocanvas/goocanvas-2.0.1.ebuild,v 1.1 2011/11/20 19:59:12 eva Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="python? 2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.[45] 3.* *-jython"
+
+inherit gnome2 python
+
+DESCRIPTION="Canvas widget for GTK+ using the cairo 2D library for drawing"
+HOMEPAGE="http://live.gnome.org/GooCanvas"
+
+LICENSE="GPL-2"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc examples +introspection python"
+
+# python only enables python specific binding override
+RDEPEND=">=x11-libs/gtk+-3.0.0:3
+	>=dev-libs/glib-2.28.0:2
+	>=x11-libs/cairo-1.10.0
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+	python? ( >=dev-python/pygobject-2.28 )
+"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.8 )"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	G2CONF="${G2CONF}
+		--disable-rebuilds
+		--disable-static
+		$(use_enable introspection)
+		$(use_enable python)"
+
+	if use python; then
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Do not build demos
+	sed -e 's/^\(SUBDIRS =.*\)demo\(.*\)$/\1\2/' \
+		-i Makefile.am Makefile.in || die "sed failed"
+
+	# Python bindings are built/installed manually.
+	sed -e "/SUBDIRS = python/d" -i bindings/Makefile.am bindings/Makefile.in
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+
+	gnome2_src_prepare
+}
+
+src_compile() {
+	gnome2_src_compile
+
+	if use python; then
+		python_copy_sources bindings/python
+		python_execute_function -s -d --source-dir bindings/python
+	fi
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use python; then
+		python_execute_function -s -d --source-dir bindings/python
+		python_clean_installation_image
+	fi
+
+	if use examples; then
+		insinto "/usr/share/doc/${P}/examples/"
+		doins demo/*.[ch] demo/*.png
+	fi
+}
diff --git a/x11-libs/goocanvas/metadata.xml b/x11-libs/goocanvas/metadata.xml
index dd73b66ea569..4c478e2494cd 100644
--- a/x11-libs/goocanvas/metadata.xml
+++ b/x11-libs/goocanvas/metadata.xml
@@ -4,4 +4,8 @@
     <maintainer>
         <email>eva@gentoo.org</email>
     </maintainer>
+	<use>
+    	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
+			introspection</flag>
+	</use>
 </pkgmetadata>