gentoo Easter resync : 12.04.2020

5 files changed, 157 insertions, 5 deletions

diff --git a/dev-python/pygtk/Manifest b/dev-python/pygtk/Manifest
index eb5d7494ecbf..a2074a578aa9 100644
--- a/dev-python/pygtk/Manifest
+++ b/dev-python/pygtk/Manifest
@@ -1,9 +1,11 @@
 AUX pygtk-2.13.0-fix-codegen-location.patch 507 BLAKE2B 5013ac893c46143c2271a89df374584e43f28a78416466a6b1f5e5279452d1768800a700c6273f323b4bbb32831f046809f56f3fe4753c58c863f8aa7dd52514 SHA512 382fae5afc3082f0239e1228c226c8ae6ac1b8524cb9a2aa8ca2b3d3cef5b1e280058df1a3c764785f129c4d4c8808e1c4f6fa09f213ee53efa269ca4ad27542
 AUX pygtk-2.14.1-libdir-pc.patch 284 BLAKE2B 9ad16a6abfea68a656f58641cc572955b967e0dbe4baa3b92052bf92744da955a5be1cd721326d9a7b7e052879859bb59c79f4f5302fe55177653f3eadba6866 SHA512 cf1fb2731b14d9f96624be0bd250c178c25232f579e585567d8e44436f43f1d5444c9c85acca7cc13511cd036e19eacc40df158b0103c785f22149b76c9fe1a9
 AUX pygtk-2.24.0-fix-leaks.patch 1681 BLAKE2B a3c8fea7152e41e7877badd1482cbbf51a2ebb65cb7d695da568d210a8de381e081eef28f09a8044ec54e258ca7a04cafe5135d2badfd93986494926ce21bcf6 SHA512 438d72249f3a7073a8cba690610ca551ffa2c88b9df693b00a46178fdb53eec9a6e7db068b7b2700de4e4506810cc0746560db889abfdd2d30e57e8821f9d878
+AUX pygtk-2.24.0-pango-1.44.patch 966 BLAKE2B fb4d531dcdb00a03bb356210c24dcb6b2a23bf14c631995ab2b9fb7ec0be97f6f0fe0cd6cd19fb6a87d1d6ba3aaaeae72a4db1bd3961545646fed5c7d2d91ce6 SHA512 121df3804ab4f3356c726a1adfcea1aedfef73bf04cc91241c48fdc32cd53b8082df4919cefd14945090d8a2e9ae7ff397eb7735f9cd4f0a72feadefb303462c
 AUX pygtk-2.24.0-quartz-objc.patch 1023 BLAKE2B 2fca6b1b92f424e853a6724857372f704581e2fac12a15e4b98261f471fc7381d4fae6b4517bdeb45b46e790692b1fdba0d35998c7d12b711cd0d04a6bb434eb SHA512 9e8f2bdfdd5ab4a4296f928fce5da532d16dc135cb58017bd0238deaa6fdf45a0f4b43a6ef76b5f9e117beade8172f230456636f3bc00672502cd126d609c35a
-AUX pygtk-2.24.0-test-fail.patch 248 BLAKE2B b71575b455e5e5ba740f412d199572d7be2f2290f84d047bab45c7ed464a029bb23ab9696a96b42b69575d2a977ecbd2fa63ced9b325b456a341f756ce00314d SHA512 e306324fa5542c492942c3a3f0be4d6a53f5641fff4362507195afa89bd73722aa2f65563ce7a8000d04b7824f69d840d3a8a53b8ec39bc31b97d2d215ebfde3
+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 2788 BLAKE2B bbb5bcfcaf86af9c9b6e9b315e6a7bad5bbfe442c2a9936970c4a1b8ee6e796016b7084759de4ecc012170b64e6c2eb67a1e5895cc9adf90bff6f90b164a3b22 SHA512 86d90dd4515fd41b1dfdc12625fae9de963571dc2700d35c7357cba8edd36606e1758aa789a2ebde7cad44834c5a62674f04ad4747b51b98af70a4051123b383
+EBUILD pygtk-2.24.0-r4.ebuild 2785 BLAKE2B 4336886560b94516354ebb9d4c3f346a946ab743a600e3877bbf72bfb618f64f3cdc33c25a60c6e6de8222e24df80f58bd797f482bf52ff42b3b97ecc34c9dd5 SHA512 c7c50cc52ff3767f538536591182c71aaf47e3355e08ba1061e5ff1124da7da066253c3a518da766fb39d4bf30ad09666393d9165740eca33af3e781df98da1c
+EBUILD pygtk-2.24.0-r5.ebuild 2731 BLAKE2B 0b0790045b9f8c033b6c8f77c8aa8baa2c2debeb9732b955b0181b955309c51bc941760b0aa326c54d1c936e83aef320fef9941bd2ff15773d686ddda399321c SHA512 46407f9ff92b3a91fe0087a8b74bfdce0ea272403867893e74112837e46ce7defcbf6289c76c706ba305b206d0d053ae9cb12a1b704105fa868133e6dbce1b94
 MISC metadata.xml 1105 BLAKE2B 271b1e6baf35487a0746bdb5eebe9a9f7c8f5dc2b14806e717a3fc3b468c063609c0693b3ee881e4538ca789926b5a9987f9fcac1746709f1ba19c36949af72c SHA512 037cab51c9a9cab4649559886753432a9e204dfd3fb2f145946a805fda17c3b544014d10b8b59a5b4b3d8e97d15a0048cd6f295bbca36515e963d52e9ad6181c
diff --git a/dev-python/pygtk/files/pygtk-2.24.0-pango-1.44.patch b/dev-python/pygtk/files/pygtk-2.24.0-pango-1.44.patch
new file mode 100644
index 000000000000..b4ed200d0046
--- /dev/null
+++ b/dev-python/pygtk/files/pygtk-2.24.0-pango-1.44.patch
@@ -0,0 +1,41 @@
+From 4aaa48eb80c6802aec6d03e5695d2a0ff20e0fc2 Mon Sep 17 00:00:00 2001
+From: Jordan Petridis <jpetridis@gnome.org>
+Date: Thu, 24 Oct 2019 22:58:36 +0200
+Subject: [PATCH] Drop the PangoFont find_shaper virtual method
+
+This API has been removed from Pango 1.44.6, because it was completely
+unused by anything.
+
+However, PyGTK tries to bind everything, even unused API.
+
+Removing this from PyGTK means we can build it against the latest Pango
+again.
+
+https://gitlab.gnome.org/GNOME/pango/issues/417
+---
+ pango.defs | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/pango.defs b/pango.defs
+index 6935c964..da968f58 100644
+--- a/pango.defs
++++ b/pango.defs
+@@ -1391,15 +1391,6 @@
+   )
+ )
+ 
+-(define-virtual find_shaper
+-  (of-object "PangoFont")
+-  (return-type "PangoEngineShape*")
+-  (parameters
+-    '("PangoLanguage*" "lang")
+-    '("guint32" "ch")
+-  )
+-)
+-
+ (define-virtual get_glyph_extents
+   (of-object "PangoFont")
+   (return-type "none")
+-- 
+2.24.1
+
diff --git a/dev-python/pygtk/files/pygtk-2.24.0-test-fail.patch b/dev-python/pygtk/files/pygtk-2.24.0-test-fail.patch
index 5bb1aec13d89..a02b5506669c 100644
--- a/dev-python/pygtk/files/pygtk-2.24.0-test-fail.patch
+++ b/dev-python/pygtk/files/pygtk-2.24.0-test-fail.patch
@@ -1,5 +1,5 @@
---- tests/runtests.py
-+++ tests/runtests.py
+--- a/tests/runtests.py
++++ b/tests/runtests.py
 @@ -41,4 +41,5 @@
      suite.addTest(loader.loadTestsFromName(name))
  
diff --git a/dev-python/pygtk/pygtk-2.24.0-r4.ebuild b/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
index a96895dac635..6ee58a37e618 100644
--- a/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
+++ b/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.pygtk.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh 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"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygtk/pygtk-2.24.0-r5.ebuild b/dev-python/pygtk/pygtk-2.24.0-r5.ebuild
new file mode 100644
index 000000000000..75f810067b23
--- /dev/null
+++ b/dev-python/pygtk/pygtk-2.24.0-r5.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GNOME_TARBALL_SUFFIX="bz2"
+PYTHON_COMPAT=( python2_7 )
+inherit autotools flag-o-matic gnome2 python-r1 virtualx
+
+DESCRIPTION="GTK+2 bindings for Python"
+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"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+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}]
+	>=gnome-base/libglade-2.5:2.0
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		dev-libs/libxslt
+		>=app-text/docbook-xsl-stylesheets-1.70.1 )
+"
+
+PATCHES=(
+	# Fix declaration of codegen in .pc
+	"${FILESDIR}/${PN}-2.13.0-fix-codegen-location.patch"
+	"${FILESDIR}/${PN}-2.14.1-libdir-pc.patch"
+	# Fix leaks of Pango objects
+	"${FILESDIR}/${PN}-2.24.0-fix-leaks.patch"
+	# Fail when tests are failing, bug #391307
+	"${FILESDIR}/${PN}-2.24.0-test-fail.patch"
+	# Fix broken tests, https://bugzilla.gnome.org/show_bug.cgi?id=709304
+	"${FILESDIR}/${P}-test_dialog.patch"
+	# Fix build on Darwin
+	"${FILESDIR}/${PN}-2.24.0-quartz-objc.patch"
+	# x11-libs/pango-1.44
+	"${FILESDIR}/${PN}-2.24.0-pango-1.44.patch"
+)
+
+src_prepare() {
+	default
+
+	# Examples is handled "manually"
+	sed -e 's/\(SUBDIRS = .* \)examples/\1/' \
+		-i Makefile.am Makefile.in || die
+
+	sed -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		-i 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) \
+			--disable-numpy \
+			--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
+		virtx emake 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* || die
+		dodoc -r examples
+	fi
+
+	python_foreach_impl run_in_build_dir gnome2_src_install
+	find "${D}" -name '*.la' -type f -delete || die
+}