commit: 2af490dc930448f41784ae44bd976f2edd068421 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Sep 21 14:29:00 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Sep 21 14:29:32 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2af490dc
dev-python/pygtk: Remove last-rited pkg Closes: https://bugs.gentoo.org/706462 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/pygtk/Manifest | 1 - .../files/pygtk-2.13.0-fix-codegen-location.patch | 11 --- .../pygtk/files/pygtk-2.14.1-libdir-pc.patch | 12 --- .../pygtk/files/pygtk-2.24.0-fix-leaks.patch | 58 ----------- .../pygtk/files/pygtk-2.24.0-pango-1.44.patch | 41 -------- .../pygtk/files/pygtk-2.24.0-quartz-objc.patch | 45 --------- .../pygtk/files/pygtk-2.24.0-test-fail.patch | 9 -- .../pygtk/files/pygtk-2.24.0-test_dialog.patch | 28 ------ dev-python/pygtk/metadata.xml | 23 ----- dev-python/pygtk/pygtk-2.24.0-r5.ebuild | 109 --------------------- profiles/package.deprecated | 4 - profiles/package.mask | 6 -- 12 files changed, 347 deletions(-) diff --git a/dev-python/pygtk/Manifest b/dev-python/pygtk/Manifest deleted file mode 100644 index 88f41a5593e..00000000000 --- a/dev-python/pygtk/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pygtk-2.24.0.tar.bz2 2361097 BLAKE2B 35b8ad94f242dcfb5d0593762eaa5480928e63bfbf8d030dd199200daa1dd6fd1769c878517cbb56e3beeaeecedb554b06b04cc35f9b2eefd2d8ec4381daf707 SHA512 64f4344fcf7636e0b2016ffd5310250b5c02a1bf87e44aef39b5d4cf4a5fc50d27cb4f030d4c6802cff61fffb88dee7752821e3d8a4cd1c34dc3745d9ff2f0da diff --git a/dev-python/pygtk/files/pygtk-2.13.0-fix-codegen-location.patch b/dev-python/pygtk/files/pygtk-2.13.0-fix-codegen-location.patch deleted file mode 100644 index 701d828f1f8..00000000000 --- a/dev-python/pygtk/files/pygtk-2.13.0-fix-codegen-location.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/pygtk-2.0.pc.in 2007-11-01 12:20:22.000000000 -0400 -+++ b/pygtk-2.0.pc.in 2008-05-28 22:21:04.000000000 -0400 -@@ -12,7 +12,7 @@ pygtkincludedir=${includedir}/pygtk-2.0 - # This is strictly speaking not necessarily so (we refer to another - # package), but we want to preserve compatibility with times codegen - # was in PyGTK, not PyGObject. --codegendir=${datadir}/pygobject/2.0/codegen -+codegendir=${pyexecdir}/gtk-2.0/codegen - - Name: PyGTK - Description: Python bindings for GTK+ and related libraries diff --git a/dev-python/pygtk/files/pygtk-2.14.1-libdir-pc.patch b/dev-python/pygtk/files/pygtk-2.14.1-libdir-pc.patch deleted file mode 100644 index d943e952a42..00000000000 --- a/dev-python/pygtk/files/pygtk-2.14.1-libdir-pc.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://bugzilla.gnome.org/show_bug.cgi?id=663421 - ---- a/pygtk-2.0.pc.in -+++ b/pygtk-2.0.pc.in -@@ -12,6 +12,7 @@ - includedir=@includedir@ - datarootdir=@datarootdir@ - datadir=@datadir@ -+libdir=@libdir@ - pyexecdir=@pyexecdir@ - - # you can use the --variable=pygtkincludedir argument to diff --git a/dev-python/pygtk/files/pygtk-2.24.0-fix-leaks.patch b/dev-python/pygtk/files/pygtk-2.24.0-fix-leaks.patch deleted file mode 100644 index 9106d43c419..00000000000 --- a/dev-python/pygtk/files/pygtk-2.24.0-fix-leaks.patch +++ /dev/null @@ -1,58 +0,0 @@ -From eca72baa5616fbe4dbebea43c7e5940847dc5ab8 Mon Sep 17 00:00:00 2001 -From: Owen W. Taylor <otay...@fishsoup.net> -Date: Tue, 27 Sep 2011 04:17:52 +0000 -Subject: Fix leaks of Pango objects - -Gtk.PrintContext.create_pango_context() -Gtk.PrintContext.create_pango_layout() -pangocairo.CairoContext.create_layout() - -were leaking the objects they returned. - -https://bugzilla.gnome.org/show_bug.cgi?id=660216 ---- -diff --git a/gtk/gtk-2.10.defs b/gtk/gtk-2.10.defs -index 69c7e0c..faa45e1 100644 ---- a/gtk/gtk-2.10.defs -+++ b/gtk/gtk-2.10.defs -@@ -1388,12 +1388,14 @@ - (define-method create_pango_context - (of-object "GtkPrintContext") - (c-name "gtk_print_context_create_pango_context") -+ (caller-owns-return #t) - (return-type "PangoContext*") - ) - - (define-method create_pango_layout - (of-object "GtkPrintContext") - (c-name "gtk_print_context_create_pango_layout") -+ (caller-owns-return #t) - (return-type "PangoLayout*") - ) - -diff --git a/pangocairo.override b/pangocairo.override -index bb923e6..5101107 100644 ---- a/pangocairo.override -+++ b/pangocairo.override -@@ -118,11 +118,16 @@ _wrap_pango_cairo_update_context(PyGObject *self, PyObject *args, PyObject *kwar - static PyObject * - _wrap_pango_cairo_create_layout(PyGObject *self) - { -- PangoLayout *ret; -+ PangoLayout *layout; -+ PyObject *ret; - -- ret = pango_cairo_create_layout(PycairoContext_GET(self)); -+ layout = pango_cairo_create_layout(PycairoContext_GET(self)); - /* pygobject_new handles NULL checking */ -- return pygobject_new((GObject *)ret); -+ ret = pygobject_new((GObject *)layout); -+ if (layout) -+ g_object_unref(layout); -+ -+ return ret; - } - - static PyObject * --- -cgit v0.9.2 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 deleted file mode 100644 index b4ed200d004..00000000000 --- a/dev-python/pygtk/files/pygtk-2.24.0-pango-1.44.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 4aaa48eb80c6802aec6d03e5695d2a0ff20e0fc2 Mon Sep 17 00:00:00 2001 -From: Jordan Petridis <jpetri...@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-quartz-objc.patch b/dev-python/pygtk/files/pygtk-2.24.0-quartz-objc.patch deleted file mode 100644 index 828057e62b7..00000000000 --- a/dev-python/pygtk/files/pygtk-2.24.0-quartz-objc.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Anders F Bjorklund <a...@users.sourceforge.net> -Date: Mon, 4 Apr 2011 21:34:20 +0200 -Subject: [PATCH] use objective-c for quartz - -https://bugzilla.gnome.org/show_bug.cgi?id=646743 ---- - configure.ac | 5 +++++ - gtk/Makefile.am | 5 +++++ - 2 files changed, 10 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 84c78f6c..27192f9c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -445,6 +445,11 @@ case $gdk_target in - ;; - esac - -+if test "x$gdk_target" = "xquartz"; then -+ AM_CONDITIONAL(USE_QUARTZ, true) -+else -+ AM_CONDITIONAL(USE_QUARTZ, false) -+fi - - dnl checks to see if numpy is installed. - AC_ARG_ENABLE(numpy, -diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index 7bb5d0c8..44d68700 100644 ---- a/gtk/Makefile.am -+++ b/gtk/Makefile.am -@@ -9,6 +9,11 @@ INCLUDES = \ - $(PYGOBJECT_CFLAGS) \ - -I$(srcdir)/gtk - -+if USE_QUARTZ -+# same as in gtk+/gdk/quartz/Makefile.am -+INCLUDES += "-xobjective-c" -+endif -+ - # defs files - defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs - defs_DATA = --- -2.12.0 - 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 deleted file mode 100644 index a02b5506669..00000000000 --- a/dev-python/pygtk/files/pygtk-2.24.0-test-fail.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/tests/runtests.py -+++ b/tests/runtests.py -@@ -41,4 +41,5 @@ - suite.addTest(loader.loadTestsFromName(name)) - - testRunner = unittest.TextTestRunner() --testRunner.run(suite) -+result = testRunner.run(suite) -+sys.exit(not result.wasSuccessful()) diff --git a/dev-python/pygtk/files/pygtk-2.24.0-test_dialog.patch b/dev-python/pygtk/files/pygtk-2.24.0-test_dialog.patch deleted file mode 100644 index 832007af232..00000000000 --- a/dev-python/pygtk/files/pygtk-2.24.0-test_dialog.patch +++ /dev/null @@ -1,28 +0,0 @@ -From eb92ecdfe7e310499743a5686560e18bb48ef0f0 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetrom...@gentoo.org> -Date: Wed, 2 Oct 2013 14:51:20 -0400 -Subject: [PATCH] tests: fix MessageDialogTest.testSubclass - -Don't check sub.__gtype__ until we set sub - -https://bugzilla.gnome.org/show_bug.cgi?id=709304 ---- - tests/test_dialog.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/test_dialog.py b/tests/test_dialog.py -index a6a3ce5..6540be3 100644 ---- a/tests/test_dialog.py -+++ b/tests/test_dialog.py -@@ -20,7 +20,7 @@ class MessageDialogTest(unittest.TestCase): - print sub.__gtype__.name - self.assertEqual(sub.__gtype__.name, 'GtkMessageDialog') - -- type('Sub', (gtk.MessageDialog,), {'__gtype_name__': 'SubDialog'}) -+ sub = type('Sub', (gtk.MessageDialog,), {'__gtype_name__': 'SubDialog'}) - self.assertEqual(sub.__gtype__.name, 'SubDialog') - - def testDialogLeak(self): --- -1.8.3.2 - diff --git a/dev-python/pygtk/metadata.xml b/dev-python/pygtk/metadata.xml deleted file mode 100644 index a6d18544f32..00000000000 --- a/dev-python/pygtk/metadata.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>gn...@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -<maintainer type="project"> - <email>pyt...@gentoo.org</email> - <name>Python</name> -</maintainer> -<longdescription> -PyGTK provides a convenient wrapper for the GTK+ library for use in -Python programs, taking care of many of the boring details such as -managing memory and type casting. When combined with PyORBit and -gnome-python, it can be used to write full featured Gnome applications. -</longdescription> -<longdescription lang="ja"> -PyGTKは、Python言語プログラムでGTK+ライブラリを使うための、マネージング・メモリ>やタイプ・キャスティングの様な詰まらない事柄の世話をしてくれる便利なラッパーを提 -供します。PyORBitとgnome-pythonと組みあわせると、GNOMEのアプリケーションの特性を -完全に抑えるものにすることができます。 -</longdescription> -</pkgmetadata> diff --git a/dev-python/pygtk/pygtk-2.24.0-r5.ebuild b/dev-python/pygtk/pygtk-2.24.0-r5.ebuild deleted file mode 100644 index eb77f4c4108..00000000000 --- a/dev-python/pygtk/pygtk-2.24.0-r5.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# 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 -} diff --git a/profiles/package.deprecated b/profiles/package.deprecated index 353af57fa3b..55fd49cc234 100644 --- a/profiles/package.deprecated +++ b/profiles/package.deprecated @@ -61,10 +61,6 @@ gnome-base/libgnome-keyring gnome-base/libgnomeui gnome-base/orbit -# Andreas Sturmlechner <ast...@gentoo.org> (2020-03-08) -# dev-python/pygtk is in the process of being removed, tracker bug #706462 -dev-python/pygtk - # Andreas Sturmlechner <ast...@gentoo.org> (2020-03-08) # x11-libs/gtkglext is in the process of being removed, tracker bug #698950 x11-libs/gtkglext diff --git a/profiles/package.mask b/profiles/package.mask index fd63df6c6e3..2e147f2f6b9 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -583,12 +583,6 @@ dev-haskell/certificate # Does not compile against ghc-8.8. Removal in 30 days. dev-lang/epic -# Michał Górny <mgo...@gentoo.org> (2020-08-22) -# Dead since 2011. Frowned upon for years now. Python 2 only. -# Finally all reverse dependencies are masked. -# Tracker bug #706462. Removal in 30 days. -dev-python/pygtk - # Alfredo Tupone <tup...@gentoo.org> (2020-08-16) # Ported to py3.8 but not yet released # Masked to allow py2.7 removal
