From 6c962622fb76e13390838655db21e9ba95ed8e30 Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek@gentoo.org>
Date: Tue, 23 Aug 2011 16:04:09 +0000
Subject: [PATCH] Drop .la files, bug 379399. Remove old.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64
---
 dev-python/pygobject/ChangeLog               |   6 +-
 dev-python/pygobject/Manifest                |  22 +++-
 dev-python/pygobject/pygobject-2.28.4.ebuild | 132 -------------------
 dev-python/pygobject/pygobject-2.28.6.ebuild |   3 +-
 4 files changed, 22 insertions(+), 141 deletions(-)
 delete mode 100644 dev-python/pygobject/pygobject-2.28.4.ebuild

diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog
index 6873a4f3a9d3..070801e73c5e 100644
--- a/dev-python/pygobject/ChangeLog
+++ b/dev-python/pygobject/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pygobject
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.122 2011/08/20 18:35:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.123 2011/08/23 16:04:09 nirbheek Exp $
+
+  23 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> -pygobject-2.28.4.ebuild,
+  pygobject-2.28.6.ebuild:
+  Drop .la files, bug 379399. Remove old.
 
   20 Aug 2011; Jeroen Roovers <jer@gentoo.org> pygobject-2.28.6.ebuild:
   Stable for HPPA (bug #369909).
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 38144477b544..c4c576004303 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -13,17 +13,25 @@ AUX pygobject-2.28.3-fix-codegen-location.patch 1948 RMD160 be495b6c8fe0123eda3b
 AUX pygobject-2.28.3-make_check.patch 2705 RMD160 e59fee5df0cbb89c0d64aabdd5eb3033da0f3d80 SHA1 38e945ff7ba5ba1cd59493dfe88f6657317a6c6c SHA256 91ddf8f2d1d767f771b91568c1d669019cf4e302baf1dd2eeed4b41ff7cb75b6
 AUX pygobject-2.28.3-support_multiple_python_versions.patch 3938 RMD160 2cc8e5c1d278ff7285a02b596b2cb285e011cc5a SHA1 8c6a215cc3d5e142db9dae5644fe27ced2da5b52 SHA256 7269f232a9b4ffe1c920c610796cb8f1dc5bcdc5cd5d03ebc7045f45d5f5d089
 DIST pygobject-2.26.0.tar.bz2 808427 RMD160 dd164d29232509f729fe7f766b18d1985eca73f6 SHA1 d091412760d44477e76ae995125c8fc5a15eae74 SHA256 5554acff9c27b647144143b0459359864e4a6f2ff62c7ba21cf310ad755cf7c7
-DIST pygobject-2.28.4.tar.bz2 882762 RMD160 5a8fb5a3692b6adf7c27aa7657f1118637246726 SHA1 a98871985960923b2245163b7c2171cfd1ede356 SHA256 70e3a05dd5f688e68b5dafa2412cd4fdbc0af83792a5752ef6353c4accf2022c
 DIST pygobject-2.28.6.tar.xz 747248 RMD160 4bc5e8546a5029d3d6b154629ab3fa4023d96bef SHA1 b1749ba806499f4c2780dbd1cbb363aaf1f41e78 SHA256 fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8
 EBUILD pygobject-2.26.0-r1.ebuild 3830 RMD160 66b0a34cc3dc97a812b5cc835634bbe4d137d411 SHA1 7b0112d2c3b69558bce8caece2699a6257308708 SHA256 24921120355c7e64502a581d8e798f16c954eb87bbd9a143b81d19ccbc44d17b
-EBUILD pygobject-2.28.4.ebuild 3787 RMD160 0afd5ce3ade16fc7d5f42b428a37e4dea84022e3 SHA1 99b9f5253588b22e7047e235652140f3054d644f SHA256 fdf1392a529dfeb25001e9309e7623ec2b32bad81c9d3c3e38bb175a1d225767
-EBUILD pygobject-2.28.6.ebuild 3800 RMD160 4fc82a188965e920f54f2b517fd34ada49531e68 SHA1 05c10abda8c34f488cf83bf4aa28c5e75486db76 SHA256 f9abbb6196078c77c1af9c0c03eb6d3910accd37d9a8a29a4c51bd12cc2edfa6
-MISC ChangeLog 18470 RMD160 ddd233a3199d81b798ab5b1d6a92bd3d459f433f SHA1 bd185fb1983fea8add4f6306cc4281d433501207 SHA256 799aafbd882b674cf1d4caefaacf6527b80efb158d5418ec908a882489f42410
+EBUILD pygobject-2.28.6.ebuild 3826 RMD160 9f7d6eb1daefaa4dad08ae49bdb06b4f230fa7ee SHA1 fa8bab01762ebccd99c076ad6204e366cb288687 SHA256 8c065422025ad6e24bc70a294483c85472a176dd973c0a90b13caabe8fb557e7
+MISC ChangeLog 18625 RMD160 14f0cab9a1dc75adc379e81556a20afe13ae6e2b SHA1 1061b054866bed29ceca27c2d20a923eb3fd1c10 SHA256 badcd484803d480a5f41e39333877dd490e98780aa7d2a3143129d9cffd6b620
 MISC metadata.xml 382 RMD160 6b39793f627fa71b2e71979d910f944dec3d2c07 SHA1 cc1fb99567697670ace85665a1a45a90bcd6d23d SHA256 9dc0bee05a8cffd8bdd29bc2b30a1aebe7ac319af5afdac9618f26a9943f14e5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5P/msACgkQVWmRsqeSphNq1ACfeNhUjYEJJJXdVNVd09/YCbLy
-PukAn0MFcOJp3dTNwDfZr1fxqAq5VXTI
-=lpFb
+iQIcBAEBAgAGBQJOU8+AAAoJEO/kOhxWD91kElAP/0YdWEvZIe2vuJA690dm42Qh
+y5wlkOLSeZJ1ly8sY0oe8UW07TPmg17YC1Cf28XG0d/jrhhvkuPTLD8oMw3+y+ZI
+KoiGFyzt94p4WtogIjH+hMrmC8STGh9At8zMyWFATsPNH0pVdHh4Zp+UDYZHWcTl
+PHqyGBTjsgkvg8VR+4HuV3B2/hcSxbVON40/FJzgiEHAPubgsz3AJia7eBftfUEI
+lVwG88CDstlQ4MrfdvRu6NcPiEAJVb9hdir6gzBOcOfKx9nOES1dbRXPIAtszfJf
+58zxzZg6ispCkt/vor7N9C137uKgYYN7HyLK1Wl9XyeZTqpVDK40UqeAf34dasdY
+vrG3sJ9c6+EVqG4QWwTjis5dxsBqcFE2Q2dwXealxTpYVfWwzwKkpLRt4rWoHhmq
+OY8CtD+ToJrVAPEShCtQsQKpy3piw4VhLB+qixBQl764jquRxmZq5McBOhrIT4yr
+RHRIkDUcvEpqrWqXdBFnyhpZB/hSC0jPgH2PTCx84mW+xzkvdXvusxyBkzHCt6+6
+5S8+sUr+BCwHZdYUqdF1tlkw1DdJEdVY0xlFL4Y9dZ8IrYk716ujbaHEL0w0ec3i
+lII6O84f16k+ISUwpwb2eOGQbSjD+QkUw/Cm141UIhtMs9/D52AkgHGWxymAsOEd
+cuosZS3SDeZi0PmRV3qN
+=nnDk
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pygobject/pygobject-2.28.4.ebuild b/dev-python/pygobject/pygobject-2.28.4.ebuild
deleted file mode 100644
index d009bdf31171..000000000000
--- a/dev-python/pygobject/pygobject-2.28.4.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.28.4.ebuild,v 1.2 2011/04/27 16:43:06 arfrever Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-SUPPORT_PYTHON_ABIS="1"
-# pygobject is partially incompatible with Python 3.
-# PYTHON_DEPEND="2:2.6 3:3.1"
-# RESTRICT_PYTHON_ABIS="2.4 2.5 3.0 *-jython"
-PYTHON_DEPEND="2:2.6"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython"
-
-# XXX: Is the alternatives stuff needed anymore?
-inherit alternatives autotools gnome2 python virtualx
-
-DESCRIPTION="GLib's GObject library bindings for Python"
-HOMEPAGE="http://www.pygtk.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc +cairo examples +introspection libffi test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.24.0:2
-	introspection? (
-		>=dev-libs/gobject-introspection-0.10.2
-		cairo? ( >=dev-python/pycairo-1.2.0 ) )
-	libffi? ( virtual/libffi )"
-DEPEND="${COMMON_DEPEND}
-	doc? (
-		dev-libs/libxslt
-		>=app-text/docbook-xsl-stylesheets-1.70.1 )
-	test? (
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc )
-	>=dev-util/pkgconfig-0.12"
-RDEPEND="${COMMON_DEPEND}
-	!<dev-python/pygtk-2.13"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog* NEWS README"
-	G2CONF="${G2CONF}
-		--disable-dependency-tracking
-		$(use_enable doc docs)
-		$(use_enable cairo)
-		$(use_enable introspection)
-		$(use_with libffi ffi)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix FHS compliance, see upstream bug #535524
-	epatch "${FILESDIR}/${PN}-2.28.3-fix-codegen-location.patch"
-
-	# Do not build tests if unneeded, bug #226345
-	epatch "${FILESDIR}/${PN}-2.28.3-make_check.patch"
-
-	# Support installation for multiple Python versions, upstream bug #648292
-	epatch "${FILESDIR}/${PN}-2.28.3-support_multiple_python_versions.patch"
-
-	# Disable tests that fail
-	epatch "${FILESDIR}/${PN}-2.28.3-disable-failing-tests.patch"
-
-	# disable pyc compiling
-	ln -sfn $(type -P true) py-compile
-
-	eautoreconf
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_execute_function -s gnome2_src_configure
-}
-
-src_compile() {
-	python_execute_function -d -s
-}
-
-# FIXME: With python multiple ABI support, tests return 1 even when they pass
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	testing() {
-		XDG_CACHE_HOME="${T}/$(PYTHON --ABI)"
-		Xemake check PYTHON=$(PYTHON -a)
-	}
-	python_execute_function -s testing
-}
-
-src_install() {
-	[[ -z ${ED} ]] && local ED="${D}"
-	installation() {
-		gnome2_src_install
-		mv "${ED}$(python_get_sitedir)/pygtk.py" "${ED}$(python_get_sitedir)/pygtk.py-2.0"
-		mv "${ED}$(python_get_sitedir)/pygtk.pth" "${ED}$(python_get_sitedir)/pygtk.pth-2.0"
-	}
-	python_execute_function -s installation
-
-	python_clean_installation_image
-
-	sed "s:/usr/bin/python:/usr/bin/python2:" \
-		-i "${ED}"/usr/bin/pygobject-codegen-2.0 \
-		|| die "Fix usage of python interpreter"
-
-	if use examples; then
-		insinto /usr/share/doc/${P}
-		doins -r examples || die "doins failed"
-	fi
-}
-
-pkg_postinst() {
-	create_symlinks() {
-		alternatives_auto_makesym "$(python_get_sitedir)/pygtk.py" pygtk.py-[0-9].[0-9]
-		alternatives_auto_makesym "$(python_get_sitedir)/pygtk.pth" pygtk.pth-[0-9].[0-9]
-	}
-	python_execute_function create_symlinks
-
-	python_mod_optimize $(use introspection && echo gi) glib gobject gtk-2.0 pygtk.py
-}
-
-pkg_postrm() {
-	python_mod_cleanup $(use introspection && echo gi) glib gobject gtk-2.0 pygtk.py
-
-	create_symlinks() {
-		alternatives_auto_makesym "$(python_get_sitedir)/pygtk.py" pygtk.py-[0-9].[0-9]
-		alternatives_auto_makesym "$(python_get_sitedir)/pygtk.pth" pygtk.pth-[0-9].[0-9]
-	}
-	python_execute_function create_symlinks
-}
diff --git a/dev-python/pygobject/pygobject-2.28.6.ebuild b/dev-python/pygobject/pygobject-2.28.6.ebuild
index c07fa71c56db..87e842bc408d 100644
--- a/dev-python/pygobject/pygobject-2.28.6.ebuild
+++ b/dev-python/pygobject/pygobject-2.28.6.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.28.6.ebuild,v 1.6 2011/08/20 18:35:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.28.6.ebuild,v 1.7 2011/08/23 16:04:09 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 GNOME_TARBALL_SUFFIX="xz"
 SUPPORT_PYTHON_ABIS="1"
 # pygobject is partially incompatible with Python 3.
-- 
2.26.2