From: Nick Bowler <nbowler@draconx.ca>
Date: Wed, 23 Jun 2021 03:02:05 +0000 (-0400)
Subject: dev-python/pygobject: Adapt to more python2 disabling.
X-Git-Url: https://git.draconx.ca/gitweb/gentoo-fixes.git/commitdiff_plain/01f04002a147cb0e0e027be974d28b486b0d30e3

dev-python/pygobject: Adapt to more python2 disabling.

Need to adjust in order to avoid dependency on python-exec[python2_7]
which is automatically included in PYTHON_DEPS.

And add an IUSE default so python2 is selected out of the box.
---

diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index e52e9d6..a508ee7 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -8,4 +8,4 @@ AUX pygobject-2.28.6-python-byte-compile.patch 539 BLAKE2B b2d64ab0ad8943948c7bf
 AUX pygobject-2.28.6-set_qdata.patch 847 BLAKE2B 696aa6c48ee900db738f8a92265a625a3ab7b59afece84157bf0b9abd0aca5ae68b7ac8cc627a47a5b1a688029d592abcc38e403543a4144e055bcdac68285e4 SHA512 19025af51a8387061276ec9d6c8eb0ecadb5124bba2c4ab3755ab653df467896d19c366d80ce9313fd46e43b493b7c536f780014cf18a6ac47f4b1d2ad4bedb4
 AUX pygobject-2.28.6-tests-no-introspection.patch 1257 BLAKE2B 7ff0587b4b40a1519927f8837b5487847ad0d0aa25f57dbaa4b10eaed2eff79f52d6581ca29f1688ebdbe71db231aba56de06c3aa8b246fdd1799320d9a15cc3 SHA512 7d57cb9bbd0b16f4fb0ed9d5eca310c47daf86b89daefa41fb0cf5dd470a6f6a31d0dad31dd261332c039d39bd778f9de8de7260c5856f1b718f72b9aabc01b4
 DIST pygobject-2.28.6.tar.xz 747248 BLAKE2B 5f92794034b2d0559a623db4a7d273a7dc3f099cae87ede91b17e81acac085a9298c6b81b45b4b8540b6a75ced97e474a993437dbfcfc2133d3321d6a979b541 SHA512 37544ea2377258758169b25a2969d5ee1c9ffb9b6e63e05bc7a0471a49ac9169c51ec587d4489172c7d256f53df878a81c1992a08059aa7e43dbbb69f799545c
-EBUILD pygobject-2.28.6-r57.ebuild 3815 BLAKE2B 13bdd3340133165e52ccb240be031a7c0734ded439b0a0fa8f37dfd70c9769d9db04f240fbd2dc5921ab30a504f50862f749164e13de037bd721ebb45da3f7cd SHA512 98644b9e87663905975455384609196c1e9026a54644a748487683d9dfbf202f29ac29ea289ba38d987796e38e4496e011b6b7cdaa702fc37e9210d176bbe0a4
+EBUILD pygobject-2.28.6-r58.ebuild 3189 BLAKE2B 8b5b3d4927d17f69011236b6da32f162c94ec7a20840e5feb1bd241c4cb73ac9296dadfbdebbfac4d21d4b3d5b10a4143bd7f55236ef45ee1bc81befd70a63ee SHA512 312db297d7f1d0634d61888c42cf46633b3fe2b909fc3673efd0897ced92eae5cec7cf0f6e19b0e3adab27f3788173ac94cbe59d85f2a6b811a936c844cea313
diff --git a/dev-python/pygobject/pygobject-2.28.6-r57.ebuild b/dev-python/pygobject/pygobject-2.28.6-r58.ebuild
similarity index 78%
rename from dev-python/pygobject/pygobject-2.28.6-r57.ebuild
rename to dev-python/pygobject/pygobject-2.28.6-r58.ebuild
index 78e9cfe..255a005 100644
--- a/dev-python/pygobject/pygobject-2.28.6-r57.ebuild
+++ b/dev-python/pygobject/pygobject-2.28.6-r58.ebuild
@@ -20,13 +20,13 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit autotools eutils gnome2 python-r1 virtualx
 
-DESCRIPTION="GLib's GObject library bindings for Python"
+DESCRIPTION="GLib's GObject library bindings for Python 2"
 HOMEPAGE="http://www.pygtk.org/"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples libffi test"
+IUSE="examples libffi test +python_targets_python2_7"
 RESTRICT="!test? ( test )"
 REQUIRED_USE=$PYTHON_REQUIRED_USE
 
@@ -34,10 +34,9 @@ BDEPEND="virtual/pkgconfig
 	dev-util/gtk-doc-am"
 
 RDEPEND=">=dev-libs/glib-2.24.0:2
-	dev-lang/python-exec:2
 	libffi? ( dev-libs/libffi:= )
 	!<dev-python/pygtk-2.23
-	$PYTHON_DEPS"
+	dev-lang/python:2.7"
 
 DEPEND="$RDEPEND
 	test? (
@@ -80,13 +79,6 @@ src_prepare() {
 	gnome2_src_prepare
 
 	python_copy_sources
-	prepare_shebangs() {
-		# Make a backup with unconverted shebangs to keep python_doscript happy
-		cp codegen/codegen.py pygobject-codegen-2.0
-		sed -e "s%#! \?/usr/bin/env python%#!${PYTHON}%" \
-			-i codegen/*.py || die "shebang convertion failed"
-	}
-	python_foreach_impl run_in_build_dir prepare_shebangs
 }
 
 src_configure() {
@@ -122,18 +114,7 @@ src_test() {
 }
 
 src_install() {
-	installing() {
-		local f prefixed_sitedir
-
-		gnome2_src_install
-
-		python_doscript pygobject-codegen-2.0
-
-		# Don't keep multiple copies of pygobject-codegen-2.0 script
-		prefixed_sitedir=$(python_get_sitedir)
-		dosym "${prefixed_sitedir#${EPREFIX}}/gtk-2.0/codegen/codegen.py" "/usr/lib/python-exec/${EPYTHON}/pygobject-codegen-2.0"
-	}
-	python_foreach_impl run_in_build_dir installing
+	python_foreach_impl run_in_build_dir gnome2_src_install
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}