Adapt to latest pygobject don't providing python2.6 support

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 12 insertions, 88 deletions

diff --git a/x11-libs/goocanvas/ChangeLog b/x11-libs/goocanvas/ChangeLog
index d5aba2101aab..843f0e6c596b 100644
--- a/x11-libs/goocanvas/ChangeLog
+++ b/x11-libs/goocanvas/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/goocanvas
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goocanvas/ChangeLog,v 1.48 2014/02/22 22:43:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goocanvas/ChangeLog,v 1.49 2014/04/26 08:28:51 pacho Exp $
+
+  26 Apr 2014; Pacho Ramos <pacho@gentoo.org> -goocanvas-2.0.1-r1.ebuild,
+  goocanvas-2.0.2.ebuild:
+  Adapt to latest pygobject don't providing python2.6 support
 
   22 Feb 2014; Pacho Ramos <pacho@gentoo.org> goocanvas-2.0.2.ebuild:
   Fix wrong commit, bug 502160
diff --git a/x11-libs/goocanvas/Manifest b/x11-libs/goocanvas/Manifest
index 12a6715b7c71..e17d90beb71d 100644
--- a/x11-libs/goocanvas/Manifest
+++ b/x11-libs/goocanvas/Manifest
@@ -4,19 +4,17 @@ Hash: SHA256
 AUX goocanvas-1.0.0-gold.patch 848 SHA256 d4bcfc3f6b8c83fb4f1e1f1d858342382306d6f9664b5473170acbafe06ed0f0 SHA512 8e61ca8a0e9d673bc77a90e9c8f8a5107717df32d094b34aed04ea2bb56383fd2a018e3fd3a4ece5b18a754adc83d29095a80fb0a34e24db0cd900a6fa8cefea WHIRLPOOL a18e56aee8b16e50ec4bac963f74d2a728ff23254c19203a7fa4469dc3ca671f0cbbaca8b125e023d28a85b33fc45a00f9b1a12da8529ba834153e257a09daa7
 AUX goocanvas-2.0.1-gold.patch 977 SHA256 bebf72cb01d53337e8263e6703aaa99b1495d17e903f1394b4d6ef8e38e24f3b SHA512 49cc55ee804ccf7b49212b61a6955c3d469baac688b45f98c88d586015a0c6d46246bdf646aae5988138a9f4521cef4673d04d73bac00b9af0b31565fecce733 WHIRLPOOL c4448c1a2c100957594b7b6455553e9c87193d2f7bb151d1e8e4ffa259e19b3605dd510acb04ac074b87c25b4433b1af1ede431a10bac6560e736cb418fe9eeb
 DIST goocanvas-1.0.0.tar.bz2 570552 SHA256 1c072ef88567cad241fb4addee26e9bd96741b1503ff736d1c152fa6d865711e SHA512 fef4364b57dc777b6dcceb026f940121a24a8a3792e8d37d320eb47b7747ab0d54d8d7911b4ff77c21ca2b251937c9312da04221bbc246a07bbf4062689de644 WHIRLPOOL fb8592136bacf10d73e3aeeac9366c0614f8cd60e74a30d31e475b1ae9a1ac76c97b64837490f916733d31191a90c121ac0d60e077acef7cc61a861f5b57fde7
-DIST goocanvas-2.0.1-patches-p20130718.tar.xz 7256 SHA256 33e21f8b98526ebbfca264301b1e53d1a695d31f0630fc681721b6715874b359 SHA512 14e18576535b9ce1b024d5d07af93739286aac90e24df71d25e3422ce78460384a7e654348344be0769933606da14bc923b36fbdbd5a31f61e3baa68c0294e43 WHIRLPOOL 2bfd6886c50ecb25599a5e64450ee9a1303b4e11c4b4f7db927c4491116fe918285ea2af6c8900e736ce2369359f4d15ea8bd3ab52ebeb117100b64fd6654bdb
 DIST goocanvas-2.0.1.tar.xz 486788 SHA256 0c3a595a6d2a4fe0f1a1a5243637e66aa1bfbaf6492455bfd0b51e0dec9b1553 SHA512 670d6b42eeb3f27cd683b8fbd7129eba91cbb413d90c9bcdbd351318eae04cc6738942a6a19a7842ada5ea9b58315329ef19fc5645be5666c17cc61246ddd143 WHIRLPOOL 818946bab884c90e24eba2f6e9b025c14a758331b15d0b7bd7b091c06f4c467564a00212cca0f0789fa1736b8b7bd6a5b4e9e779356e3b16de12540ff5c5a7c8
 DIST goocanvas-2.0.2.tar.xz 502732 SHA256 f20e5fbef8d1a2633033edbd886dd13146a1b948d1813a9c353a80a29295d1d0 SHA512 2b3014b832a5426884aa472fbfabcca171ef90305afccd312583d259517725a1839509e39b13b30c5097bf54ed9b3dfd2bf9eeca4e813a82d14cf1d5a54578ac WHIRLPOOL 714682b70d747e5db94140e5067e4df3c396332cab9f8b112141f39135758cea0a7e07405d796a70d81b95b76ce68ec17c58b317d0508dc413f2e6139dc39c87
 EBUILD goocanvas-1.0.0.ebuild 1419 SHA256 bdc3faf2553156195aad8e07935c347a311c67c1be7026cb163947302f230196 SHA512 b5d0d7ee2edaea5150e318734fc8004b14262f145ae4eba68fee63818cd19923c484c1bf30a2b5f4233692e15400c893394e33b6c93189110baac713c25ac3c2 WHIRLPOOL c8bf3ed4ffcd07ead36915960433e6aa733729bbf677366718cbd0196308b7bbbcea9f6b4a58e0be90f8a54633f81fe255339b36119c4313ae9c71101521ee1b
-EBUILD goocanvas-2.0.1-r1.ebuild 2055 SHA256 31e9da03de47298a11fcca668c4ec4d86b9e16bf38fc65d9b881e73f40993a1b SHA512 5a01e612e826a3abdbe717d84c6be36708eb862b34f03d50113ea7f11a34e738ae1ed4f142bd94313fcdf0fea5c99883eadf80aebdd17993da77e65111ca3f88 WHIRLPOOL 170881ec7b969d39f620b6cf8115c744fba868325ceb0deca3572ef543854dd24844f24147a3e332f7e2bb9b46f8f1a7e1eeb9c6f7f157995116879ffb8c5edb
 EBUILD goocanvas-2.0.1.ebuild 1969 SHA256 dcd8973e772c0d390f47703b2a5d2060cffcb134743044265dd9c06107143de1 SHA512 dc2dcea616b964ae8f2cf547b1e2899f0b17a5f7c697ce231a606fd2459fe1fa72a53b405ccdba504ae4c2869cd8bde97dd41e6552aeab08dbb93757b5f6af5b WHIRLPOOL a9670f0d6b3bf2669b98e80ea3b26cec0e71ca4ad0d071f8220a98d384e97517f1707821d7c64a7b9e68487dbd1b1c4cf5597e7049db42e3a61eb2515089cc44
-EBUILD goocanvas-2.0.2.ebuild 1719 SHA256 7ebdd45e25da620dcac60d806cc632f0afe340c900a522574029df38c00fbedc SHA512 af2d9d5e3764cb343a9df9b006ac1420f627c8490c39e53d9cd8887bac84a73e08ceef4eb01510a8b683e48304cc9b96b6fbbb481df16a78177c9afc06c7e972 WHIRLPOOL 0a3e72061b0121b71faa1f9d5fe34b38a663086185c4df07b10a16f8d6c249163c291f892c7a18c42b79160138f6d3168254b1722ca1c51333224b626ab69c3e
-MISC ChangeLog 6778 SHA256 ffea5f102f16f76bf7c9e729fa79d8850acf5bcf538093d06a3c8f2164e53faf SHA512 0d0defa9e6ebe364f2811e51687b840d237aebe8627df7735401ff6c9422fcf43ea48a724346446e9d94435af62580f292e789b28bc2e1e838e46eb656d8f382 WHIRLPOOL 011bae9bc6b8772e8a36639eab6231025145af0351fbf4d119492ec563d217316faac986e8891a0db3bf164bce9d8b308c5bf8c8fa82b02a5f6da304e24511ab
+EBUILD goocanvas-2.0.2.ebuild 1713 SHA256 c46d85b736f66979a74a54877c979d6a3a083efe832a95833f91e9fddb61de03 SHA512 32c2365b0ad9d5ec1d6d2d61f6f8425e79a6be0442ca7c1eb7416c6e0b66131bd41f1798dec645620b531284072a6a327520a55218ca80c8b7174dc709d77fda WHIRLPOOL b94a7519d8d2e75af3ea549ee450e65d07bd5defc0cd2847ddd36c4b1103dc5530eeac36775158ed9dcbc735c665bfb3bdd2d0afe1ae347088121f6e69899668
+MISC ChangeLog 6941 SHA256 1de98ad35a1d43cd20363e47c719b5414284b00f1105c40d261ced7134e15b5c SHA512 d540570b387ad1878666a7ea9cdd3fa94a4bb36274bd3bf624952ad1f9e42f1eb1b1a4a25bc869fac85e32e1de5d2f7ab0105828f31b24b8b073a72be328163b WHIRLPOOL 2bd1a35da846fde67d9c154f91eb1757b9687a1b19f05e35d9b1cf7505ed3de8ae43cfcbf5aa35f9ab52a0bb198804d5d7f59c01fa8b819d45b09ffcaf9ca781
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMJKBoACgkQCaWpQKGI+9R8BwCfexyDjkKuH9mQg00RP2XGC7jC
-hBEAnj2X8/Y3gLBrfGFThsHEK6PAWwmX
-=ZMZM
+iEYEAREIAAYFAlNbbkQACgkQCaWpQKGI+9RuvQCePOEnFA1pZlvX5sSCyv0bvgXf
+AewAnAmr/LfJJQATGttc53Xr1yIF9w5E
+=XxWX
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/goocanvas/goocanvas-2.0.1-r1.ebuild b/x11-libs/goocanvas/goocanvas-2.0.1-r1.ebuild
deleted file mode 100644
index f3ef52ea3db9..000000000000
--- a/x11-libs/goocanvas/goocanvas-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2013 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-r1.ebuild,v 1.1 2013/08/12 04:06:56 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit autotools eutils gnome2 python-r1
-
-DESCRIPTION="Canvas widget for GTK+ using the cairo 2D library for drawing"
-HOMEPAGE="http://live.gnome.org/GooCanvas"
-SRC_URI="${SRC_URI}
-	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}-patches-p20130718.tar.xz"
-
-LICENSE="LGPL-2"
-SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="examples +introspection python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# 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? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig"
-
-src_prepare() {
-	# from upstream git master
-	epatch "../${P}-patches-p20130718/"*.patch
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=671766
-	epatch "${FILESDIR}"/${P}-gold.patch
-
-	eautoreconf
-
-	# 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
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-rebuilds \
-		--disable-static \
-		$(use_enable introspection) \
-		--disable-python
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	gnome2_src_install
-
-	if use python; then
-		sub_install() {
-			python_moduleinto $(python -c "import gi;print gi._overridesdir")
-			python_domodule bindings/python/GooCanvas.py
-		}
-		python_foreach_impl sub_install
-	fi
-
-	if use examples; then
-		insinto "/usr/share/doc/${P}/examples/"
-		doins demo/*.[ch] demo/*.png
-	fi
-}
diff --git a/x11-libs/goocanvas/goocanvas-2.0.2.ebuild b/x11-libs/goocanvas/goocanvas-2.0.2.ebuild
index 93728b186dc0..bf349faf10be 100644
--- a/x11-libs/goocanvas/goocanvas-2.0.2.ebuild
+++ b/x11-libs/goocanvas/goocanvas-2.0.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goocanvas/goocanvas-2.0.2.ebuild,v 1.5 2014/02/22 22:43:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goocanvas/goocanvas-2.0.2.ebuild,v 1.6 2014/04/26 08:28:51 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit gnome2 python-r1