[gentoo-commits] proj/gnome:master commit in: dev-python/pygobject/files/, dev-python/pygobject/

[Mart Raudsepp]

commit:     37668a8e48c239cfb8951876504410f3eca6dd20
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 18 20:21:35 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Sep 18 20:21:35 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=37668a8e

dev-python/pygobject: remove, 3.28.3 available in ::gentoo

Main tree version removes some by now unnecessary test workarounds
(cairo.SubpixelOrder stuff seems solved, compat gtk stuff moved to
a separate file than we still sed and I don't get test failures),
which however might have been still relevant in the overlay 3.26
version.
Also updates comment about gnome-common to autoconf-archive, as that's
what it needs now for eautoreconf. However 3.30 and git master use
meson. Relatedly, the 9999 is thus useless here now (still autotools),
so remove that too.

 .../files/pygobject-3.16.1-unittest.patch          |  15 ---
 dev-python/pygobject/metadata.xml                  |  12 ---
 dev-python/pygobject/pygobject-3.26.1.ebuild       | 107 ---------------------
 dev-python/pygobject/pygobject-9999.ebuild         | 105 --------------------
 4 files changed, 239 deletions(-)

diff --git a/dev-python/pygobject/files/pygobject-3.16.1-unittest.patch b/dev-python/pygobject/files/pygobject-3.16.1-unittest.patch
deleted file mode 100644
index 5ee15b1d..00000000
--- a/dev-python/pygobject/files/pygobject-3.16.1-unittest.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Comment out unittest that ought to work but for some reason does not want to.
-
---- a/tests/test_glib.py	2015-05-10 14:01:45.873164005 +0200
-+++ b/tests/test_glib.py	2015-03-05 09:32:55.000000000 +0100
-@@ -38,8 +38,8 @@
-     def test_xdg_dirs(self):
-         d = GLib.get_user_data_dir()
-         self.assertTrue('/' in d, d)
--        d = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC)
--        self.assertTrue('/' in d, d)
-+        #d = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC)
-+        #self.assertTrue('/' in d, d)
-         with warnings.catch_warnings():
-             warnings.simplefilter('ignore', PyGIDeprecationWarning)
- 

diff --git a/dev-python/pygobject/metadata.xml b/dev-python/pygobject/metadata.xml
deleted file mode 100644
index 08a5bd43..00000000
--- a/dev-python/pygobject/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@g.o</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-<maintainer type="project">
-		<email>python@g.o</email>
-		<name>Python</name>
-	</maintainer>
-</pkgmetadata>

diff --git a/dev-python/pygobject/pygobject-3.26.1.ebuild b/dev-python/pygobject/pygobject-3.26.1.ebuild
deleted file mode 100644
index 535769f2..00000000
--- a/dev-python/pygobject/pygobject-3.26.1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
-
-inherit eutils gnome2 python-r1 virtualx
-
-DESCRIPTION="GLib's GObject library bindings for Python"
-HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cairo examples test"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	test? ( cairo )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-1.46.0:=
-	virtual/libffi:=
-	cairo? (
-		>=dev-python/pycairo-1.11.1[${PYTHON_USEDEP}]
-		x11-libs/cairo )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	cairo? ( x11-libs/cairo[glib] )
-	test? (
-		dev-libs/atk[introspection]
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc
-		x11-libs/cairo[glib]
-		x11-libs/gdk-pixbuf:2[introspection,jpeg]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection]
-		python_targets_python2_7? ( dev-python/pyflakes[$(python_gen_usedep python2_7)] ) )
-"
-# gnome-base/gnome-common required by eautoreconf
-
-# We now disable introspection support in slot 2 per upstream recommendation
-# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9); however,
-# older versions of slot 2 installed their own site-packages/gi, and
-# slot 3 will collide with them.
-RDEPEND="${COMMON_DEPEND}
-	!<dev-python/pygtk-2.13
-	!<dev-python/pygobject-2.28.6-r50:2[introspection]
-"
-
-src_prepare() {
-	# Test fail with xvfb but not X
-	sed -e 's/^.*TEST_NAMES=compat_test_pygtk .*;/echo "Test disabled";/' \
-		-i tests/Makefile.{am,in} || die
-
-	# FAIL: test_cairo_font_options (test_cairo.TestPango)
-	# AssertionError: <type 'cairo.SubpixelOrder'> != <type 'int'>
-	sed -e 's/^.*type(font_opts.get_subpixel_order()), int.*/#/' \
-		-i tests/test_cairo.py || die
-
-	gnome2_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	# Hard-enable libffi support since both gobject-introspection and
-	# glib-2.29.x rdepend on it anyway
-	# docs disabled by upstream default since they are very out of date
-	configuring() {
-		gnome2_src_configure \
-			$(use_enable cairo)
-
-		# Pyflakes tests work only in python2, bug #516744
-		if use test && [[ ${EPYTHON} != python2.7 ]]; then
-			sed -e 's/if type pyflakes/if false/' \
-				-i Makefile || die "sed failed"
-		fi
-	}
-
-	python_foreach_impl run_in_build_dir configuring
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
-	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-	local -x SKIP_PEP8="yes"
-
-	testing() {
-		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
-		emake -C "${BUILD_DIR}" check
-	}
-	virtx python_foreach_impl testing
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir gnome2_src_install
-
-	dodoc -r examples
-}

diff --git a/dev-python/pygobject/pygobject-9999.ebuild b/dev-python/pygobject/pygobject-9999.ebuild
deleted file mode 100644
index 1faffe2b..00000000
--- a/dev-python/pygobject/pygobject-9999.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
-
-inherit eutils gnome2 python-r1 virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="GLib's GObject library bindings for Python"
-HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE="+cairo examples test"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	test? ( cairo )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-1.46.0:=
-	virtual/libffi:=
-	cairo? (
-		>=dev-python/pycairo-1.11.1[${PYTHON_USEDEP}]
-		x11-libs/cairo )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	cairo? ( x11-libs/cairo[glib] )
-	test? (
-		dev-libs/atk[introspection]
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc
-		x11-libs/cairo[glib]
-		x11-libs/gdk-pixbuf:2[introspection,jpeg]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection]
-		python_targets_python2_7? ( dev-python/pyflakes[$(python_gen_usedep python2_7)] ) )
-"
-# gnome-base/gnome-common required by eautoreconf
-
-# We now disable introspection support in slot 2 per upstream recommendation
-# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9); however,
-# older versions of slot 2 installed their own site-packages/gi, and
-# slot 3 will collide with them.
-RDEPEND="${COMMON_DEPEND}
-	!<dev-python/pygtk-2.13
-	!<dev-python/pygobject-2.28.6-r50:2[introspection]
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	# Hard-enable libffi support since both gobject-introspection and
-	# glib-2.29.x rdepend on it anyway
-	# docs disabled by upstream default since they are very out of date
-	configuring() {
-		gnome2_src_configure \
-			$(use_enable cairo)
-
-		# Pyflakes tests work only in python2, bug #516744
-		if use test && [[ ${EPYTHON} != python2.7 ]]; then
-			sed -e 's/if type pyflakes/if false/' \
-				-i Makefile || die "sed failed"
-		fi
-	}
-
-	python_foreach_impl run_in_build_dir configuring
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
-	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-	local -x SKIP_PEP8="yes"
-
-	testing() {
-		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
-		emake -C "${BUILD_DIR}" check
-	}
-	virtx python_foreach_impl testing
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir gnome2_src_install
-
-	dodoc -r examples
-}