From d422c8e90f0dff10984e51e816ec2009701b9765 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Tue, 22 Jun 2021 23:21:46 -0400 Subject: [PATCH] dev-python/pygtk: 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. --- dev-python/pygtk/Manifest | 2 +- ...{pygtk-2.24.0-r6.ebuild => pygtk-2.24.0-r7.ebuild} | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) rename dev-python/pygtk/{pygtk-2.24.0-r6.ebuild => pygtk-2.24.0-r7.ebuild} (94%) diff --git a/dev-python/pygtk/Manifest b/dev-python/pygtk/Manifest index 764e907..95c8b3b 100644 --- a/dev-python/pygtk/Manifest +++ b/dev-python/pygtk/Manifest @@ -6,4 +6,4 @@ AUX pygtk-2.24.0-quartz-objc.patch 1023 BLAKE2B 2fca6b1b92f424e853a6724857372f70 AUX pygtk-2.24.0-test-fail.patch 252 BLAKE2B 9d808e50d9e64f481cd8d83e4693a60f472d4cf75b3d356c49d73056939b25d48842a1a64becbb17220ac74adb466deec0d1a42081144c7f853a5f5d1c7fddfa SHA512 22965a5ccc14ba842551ca07ca31d3a26f246354e35a7a24f66c34ace41fa1ee51a46ab404a103a8824957d5a197469ff6762eb829e236269420ba1842cb351b AUX pygtk-2.24.0-test_dialog.patch 961 BLAKE2B 035021b5a4a94e487f8e4fdd69b83e54d2baea1891ce1bf8378e7375749de4a45477acdfe2a07e259d907bb182c2951bb512e7ded0ffdeed138ab4fce81f81b7 SHA512 13254063895412641b51cb536892f2c4b9bb76ac1ffa92f8d82fa20b80f5c7748392a968315af3731def20392de917a0ae2b4ac0607cee9e2f38911283d33ca9 DIST pygtk-2.24.0.tar.bz2 2361097 BLAKE2B 35b8ad94f242dcfb5d0593762eaa5480928e63bfbf8d030dd199200daa1dd6fd1769c878517cbb56e3beeaeecedb554b06b04cc35f9b2eefd2d8ec4381daf707 SHA512 64f4344fcf7636e0b2016ffd5310250b5c02a1bf87e44aef39b5d4cf4a5fc50d27cb4f030d4c6802cff61fffb88dee7752821e3d8a4cd1c34dc3745d9ff2f0da -EBUILD pygtk-2.24.0-r6.ebuild 3127 BLAKE2B 42e8978d176855b454cdc31ecaccb58be0d0f2a29522fd8d69dc58256c2a36d2f97f95dce7d504a5dc43f1d9aca5511cb6119126cdb99a1a15afcdc5f5cd4455 SHA512 a720ff7f946c596ec64efcf29a457e8130fd5190d19ed4bd92dabef1dae397367b67ad9741646690fc6072b3d62378ba6b870b774a753dc193dd3523616c6f40 +EBUILD pygtk-2.24.0-r7.ebuild 3180 BLAKE2B f16cd0f83bc8105b6b184e491332920b673801687809fc6b89052ad3a16de27280a19268e84da3536a075f1165904c95816ca26153bd1960e58459e4d3efcb2a SHA512 caacf72817028094a37ac4401e1abaabd2f65db0dc14d2be736bede4bb163b9ae5186a3de9e65f9784ffc8f1e4e5099346b5a749cb61b83968f8c0f876a43db0 diff --git a/dev-python/pygtk/pygtk-2.24.0-r6.ebuild b/dev-python/pygtk/pygtk-2.24.0-r7.ebuild similarity index 94% rename from dev-python/pygtk/pygtk-2.24.0-r6.ebuild rename to dev-python/pygtk/pygtk-2.24.0-r7.ebuild index a73bcd5..aa521c2 100644 --- a/dev-python/pygtk/pygtk-2.24.0-r6.ebuild +++ b/dev-python/pygtk/pygtk-2.24.0-r7.ebuild @@ -25,21 +25,22 @@ HOMEPAGE="https://gitlab.gnome.org/Archive/pygtk" LICENSE="LGPL-2.1" SLOT="2" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc examples test" +IUSE="doc examples test +python_targets_python2_7" REQUIRED_USE=$PYTHON_REQUIRED_USE RESTRICT="!test? ( test )" -RDEPEND="${PYTHON_DEPS} - >=dev-libs/glib-2.8:2 +DEPEND=">=dev-libs/glib-2.8:2 >=x11-libs/pango-1.16 >=dev-libs/atk-1.12 >=x11-libs/gtk+-2.24:2 >=dev-python/pycairo-1.0.2:2[$PYTHON_USEDEP] >=dev-python/pygobject-2.26.8-r53:2[$PYTHON_USEDEP] >=gnome-base/libglade-2.5:2.0" -DEPEND=$RDEPEND -BDEPEND="virtual/pkgconfig +RDEPEND="$DEPEND + dev-lang/python:2.7" +BDEPEND="dev-lang/python:2.7 + virtual/pkgconfig doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 )" -- 2.43.0