3 files changed, 2 insertions, 113 deletions
diff --git a/dev-python/pygtk/Manifest b/dev-python/pygtk/Manifest
index a2074a578aa9..ba87d01d7995 100644
--- a/dev-python/pygtk/Manifest
+++ b/dev-python/pygtk/Manifest
@@ -6,6 +6,5 @@ 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-r4.ebuild 2785 BLAKE2B 4336886560b94516354ebb9d4c3f346a946ab743a600e3877bbf72bfb618f64f3cdc33c25a60c6e6de8222e24df80f58bd797f482bf52ff42b3b97ecc34c9dd5 SHA512 c7c50cc52ff3767f538536591182c71aaf47e3355e08ba1061e5ff1124da7da066253c3a518da766fb39d4bf30ad09666393d9165740eca33af3e781df98da1c
-EBUILD pygtk-2.24.0-r5.ebuild 2731 BLAKE2B 0b0790045b9f8c033b6c8f77c8aa8baa2c2debeb9732b955b0181b955309c51bc941760b0aa326c54d1c936e83aef320fef9941bd2ff15773d686ddda399321c SHA512 46407f9ff92b3a91fe0087a8b74bfdce0ea272403867893e74112837e46ce7defcbf6289c76c706ba305b206d0d053ae9cb12a1b704105fa868133e6dbce1b94
+EBUILD pygtk-2.24.0-r5.ebuild 2730 BLAKE2B b6f738a026ffd6d07f641df93c056fb7adf85a1d38a8bae7a3c6d6569a862131ecf87d5963376ed59987aac2db01ecec33a4eb4d0c1a114660b4e656c632cc87 SHA512 f6337281a99898b0d484344b5a0698e51857af12a2037e82af2017ebb877cd95ed0cdeb488113277a5b540fa60e417dc0113706429ca1e2fdd1e8cfd2cd89a26
 MISC metadata.xml 1105 BLAKE2B 271b1e6baf35487a0746bdb5eebe9a9f7c8f5dc2b14806e717a3fc3b468c063609c0693b3ee881e4538ca789926b5a9987f9fcac1746709f1ba19c36949af72c SHA512 037cab51c9a9cab4649559886753432a9e204dfd3fb2f145946a805fda17c3b544014d10b8b59a5b4b3d8e97d15a0048cd6f295bbca36515e963d52e9ad6181c
diff --git a/dev-python/pygtk/pygtk-2.24.0-r4.ebuild b/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
deleted file mode 100644
index 6ee58a37e618..000000000000
--- a/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="bz2"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils flag-o-matic gnome2 ltprune python-r1 virtualx
-
-DESCRIPTION="GTK+2 bindings for Python"
-HOMEPAGE="http://www.pygtk.org/"
-
-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"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=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[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-2.26.8-r53:2[${PYTHON_USEDEP}]
-	|| (
-		>=dev-python/numpy-python2-1.16.5[${PYTHON_USEDEP}]
-		<dev-python/numpy-1.17.4[${PYTHON_USEDEP}]
-	)
-	>=gnome-base/libglade-2.5:2.0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		dev-libs/libxslt
-		>=app-text/docbook-xsl-stylesheets-1.70.1 )
-"
-
-src_prepare() {
-	# Fix declaration of codegen in .pc
-	epatch "${FILESDIR}/${PN}-2.13.0-fix-codegen-location.patch"
-	epatch "${FILESDIR}/${PN}-2.14.1-libdir-pc.patch"
-
-	# Fix leaks of Pango objects
-	epatch "${FILESDIR}/${PN}-2.24.0-fix-leaks.patch"
-
-	# Fail when tests are failing, bug #391307
-	epatch "${FILESDIR}/${PN}-2.24.0-test-fail.patch"
-
-	# Fix broken tests, https://bugzilla.gnome.org/show_bug.cgi?id=709304
-	epatch "${FILESDIR}/${P}-test_dialog.patch"
-
-	# Fix build on Darwin
-	epatch "${FILESDIR}/${PN}-2.24.0-quartz-objc.patch"
-
-	# Examples is handled "manually"
-	sed -e 's/\(SUBDIRS = .* \)examples/\1/' \
-		-i Makefile.am Makefile.in || die
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466968
-
-	AT_M4DIR="m4" eautoreconf
-
-	prepare_pygtk() {
-		mkdir -p "${BUILD_DIR}" || die
-	}
-	python_foreach_impl prepare_pygtk
-}
-
-src_configure() {
-	use hppa && append-flags -ffunction-sections
-	configure_pygtk() {
-		ECONF_SOURCE="${S}" gnome2_src_configure \
-			$(use_enable doc docs) \
-			--with-glade \
-			--enable-thread
-	}
-	python_foreach_impl run_in_build_dir configure_pygtk
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
-	# Let tests pass without permissions problems, bug #245103
-	gnome2_environment_reset
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	testing() {
-		cd tests
-		Xemake check-local
-	}
-	python_foreach_impl run_in_build_dir testing
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog INSTALL MAPPING NEWS README THREADS TODO
-
-	if use examples; then
-		rm examples/Makefile*
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-
-	python_foreach_impl run_in_build_dir gnome2_src_install
-	prune_libtool_files --modules
-}
diff --git a/dev-python/pygtk/pygtk-2.24.0-r5.ebuild b/dev-python/pygtk/pygtk-2.24.0-r5.ebuild
index 75f810067b23..eb77f4c41088 100644
--- a/dev-python/pygtk/pygtk-2.24.0-r5.ebuild
+++ b/dev-python/pygtk/pygtk-2.24.0-r5.ebuild
@@ -12,7 +12,7 @@ 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"
+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"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"