dev-python/pygtk: EAPI-6, pango-1.44, numpy #14540

a17r · 2020-02-03T16:51:34Z

--- pygtk-2.24.0-r4.ebuild      2020-03-15 20:12:07.995897861 +0100
+++ pygtk-2.24.0-r5.ebuild      2020-03-15 20:28:15.301829211 +0100
@@ -1,23 +1,23 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-GCONF_DEBUG="no"
+EAPI=6
+
 GNOME_TARBALL_SUFFIX="bz2"
 PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils flag-o-matic gnome2 ltprune python-r1 virtualx
+inherit autotools flag-o-matic gnome2 python-r1 virtualx
 
 DESCRIPTION="GTK+2 bindings for Python"
-HOMEPAGE="http://www.pygtk.org/"
+HOMEPAGE="https://gitlab.gnome.org/Archive/pygtk"
 
 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 ~sh ~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}"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="${PYTHON_DEPS}
        >=dev-libs/glib-2.8:2
        >=x11-libs/pango-1.16
@@ -25,10 +25,6 @@
        >=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}
@@ -38,28 +34,31 @@
                >=app-text/docbook-xsl-stylesheets-1.70.1 )
 "
 
-src_prepare() {
+PATCHES=(
        # 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"
-
+       "${FILESDIR}/${PN}-2.13.0-fix-codegen-location.patch"
+       "${FILESDIR}/${PN}-2.14.1-libdir-pc.patch"
        # Fix leaks of Pango objects
-       epatch "${FILESDIR}/${PN}-2.24.0-fix-leaks.patch"
-
+       "${FILESDIR}/${PN}-2.24.0-fix-leaks.patch"
        # Fail when tests are failing, bug #391307
-       epatch "${FILESDIR}/${PN}-2.24.0-test-fail.patch"
-
+       "${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"
-
+       "${FILESDIR}/${P}-test_dialog.patch"
        # Fix build on Darwin
-       epatch "${FILESDIR}/${PN}-2.24.0-quartz-objc.patch"
+       "${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 -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466968
+       sed -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+               -i configure.ac || die #466968
 
        AT_M4DIR="m4" eautoreconf
 
@@ -74,6 +73,7 @@
        configure_pygtk() {
                ECONF_SOURCE="${S}" gnome2_src_configure \
                        $(use_enable doc docs) \
+                       --disable-numpy \
                        --with-glade \
                        --enable-thread
        }
@@ -91,7 +91,7 @@
 
        testing() {
                cd tests
-               Xemake check-local
+               virtx emake check-local
        }
        python_foreach_impl run_in_build_dir testing
 }
@@ -100,11 +100,11 @@
        dodoc AUTHORS ChangeLog INSTALL MAPPING NEWS README THREADS TODO
 
        if use examples; then
-               rm examples/Makefile*
+               rm examples/Makefile* || die
                insinto /usr/share/doc/${PF}
                doins -r examples
        fi
 
        python_foreach_impl run_in_build_dir gnome2_src_install
-       prune_libtool_files --modules
+       find "${D}" -name '*.la' -type f -delete || die
 }

gentoo-bot · 2020-02-03T16:52:15Z

Pull Request assignment

Submitter: @a17r
Areas affected: ebuilds, profiles
Packages affected: dev-python/pygtk

dev-python/pygtk: @gentoo/gnome, @gentoo/python

Linked bugs

Bugs linked: 703052, 662518

In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of Conduct ● Copyright policy (expl.) ● Devmanual ● GitHub PRs ● Proxy-maint guide

dev-python/pygtk/pygtk-2.24.0-r5.ebuild

dev-python/pygtk/files/pygtk-2.24.0-pango-1.44.patch

gentoo-repo-qa-bot · 2020-02-03T18:29:25Z

Pull request CI report

Report generated at: 2020-02-03 18:29 UTC
Newest commit scanned: 3f0f0b7
Status: ❌ broken

There are too many broken packages to determine whether the breakages were added by the pull request. If in doubt, please rebase.

- Use virtx - Add missing || die Reported-by: Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

Source: https://github.com/flathub/org.glimpse_editor.Glimpse/blob/master/patches/pygtk-Drop-the-PangoFont-find_shaper-virtual-method.patch Thanks-to: Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> Closes: https://bugs.gentoo.org/703052 Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

Reported-by: Perfect Gentleman <perfect007gentleman@gmail.com> Bug: https://bugs.gentoo.org/662518 Package-Manager: Portage-2.3.86, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

gentoo-bot added assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. labels Feb 3, 2020

a17r requested a review from leio February 3, 2020 16:52

a17r added the do not merge Please DO NOT MERGE this PR. It will not be assigned but it will be scanned by CI. label Feb 3, 2020

Arfrever reviewed Feb 3, 2020

View reviewed changes

dev-python/pygtk/pygtk-2.24.0-r5.ebuild Outdated Show resolved Hide resolved

Arfrever reviewed Feb 3, 2020

View reviewed changes

dev-python/pygtk/files/pygtk-2.24.0-pango-1.44.patch Outdated Show resolved Hide resolved

a17r force-pushed the pygtk-vs-pango branch 2 times, most recently from 5b93bb9 to 3f0f0b7 Compare February 3, 2020 17:11

a17r force-pushed the pygtk-vs-pango branch from 3f0f0b7 to 69674ec Compare March 15, 2020 19:15

dev-python/pygtk: EAPI-6 bump, update HOMEPAGE

424392c

- Use virtx - Add missing || die Reported-by: Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

a17r force-pushed the pygtk-vs-pango branch from 69674ec to 75e59a5 Compare March 15, 2020 19:27

a17r added 2 commits March 15, 2020 20:28

dev-python/pygtk: Unconditionally --disable-numpy

52e25a1

Reported-by: Perfect Gentleman <perfect007gentleman@gmail.com> Bug: https://bugs.gentoo.org/662518 Package-Manager: Portage-2.3.86, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

a17r force-pushed the pygtk-vs-pango branch from 75e59a5 to 52e25a1 Compare March 15, 2020 19:28

gentoo-bot closed this in 3128d10 Mar 15, 2020

a17r deleted the pygtk-vs-pango branch February 5, 2021 21:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

dev-python/pygtk: EAPI-6, pango-1.44, numpy #14540

dev-python/pygtk: EAPI-6, pango-1.44, numpy #14540

a17r commented Feb 3, 2020 •

edited

gentoo-bot commented Feb 3, 2020

gentoo-repo-qa-bot commented Feb 3, 2020

dev-python/pygtk: EAPI-6, pango-1.44, numpy #14540

dev-python/pygtk: EAPI-6, pango-1.44, numpy #14540

Conversation

a17r commented Feb 3, 2020 • edited

gentoo-bot commented Feb 3, 2020

Pull Request assignment

Linked bugs

gentoo-repo-qa-bot commented Feb 3, 2020

Pull request CI report

a17r commented Feb 3, 2020 •

edited