From: "Gilles Dartiguelongue" <eva@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: dev-python/pygobject/
Date: Mon, 10 Sep 2018 21:33:54 +0000 (UTC) [thread overview]
Message-ID: <1536588132.4b16f44d3dddaa6f8c205039f79d7529122eb276.eva@gentoo> (raw)
commit: 4b16f44d3dddaa6f8c205039f79d7529122eb276
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 10 13:44:18 2018 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Sep 10 14:02:12 2018 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=4b16f44d
dev-python/pygobject: 3.24.1-r1 → 3.26.1
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Manifest-Sign-Key: 0x5A56C8CD0C13248A
...gobject-9999.ebuild => pygobject-3.26.1.ebuild} | 60 +++++++++-------------
dev-python/pygobject/pygobject-9999.ebuild | 46 ++++++-----------
2 files changed, 40 insertions(+), 66 deletions(-)
diff --git a/dev-python/pygobject/pygobject-9999.ebuild b/dev-python/pygobject/pygobject-3.26.1.ebuild
similarity index 59%
copy from dev-python/pygobject/pygobject-9999.ebuild
copy to dev-python/pygobject/pygobject-3.26.1.ebuild
index 9adddeb4..535769f2 100644
--- a/dev-python/pygobject/pygobject-9999.ebuild
+++ b/dev-python/pygobject/pygobject-3.26.1.ebuild
@@ -1,28 +1,19 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
-
-GCONF_DEBUG="no"
+EAPI=6
GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE="+cairo examples test +threads"
+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}
@@ -31,10 +22,10 @@ REQUIRED_USE="
COMMON_DEPEND="${PYTHON_DEPS}
>=dev-libs/glib-2.38:2
- >=dev-libs/gobject-introspection-1.39:=
+ >=dev-libs/gobject-introspection-1.46.0:=
virtual/libffi:=
cairo? (
- >=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/pycairo-1.11.1[${PYTHON_USEDEP}]
x11-libs/cairo )
"
DEPEND="${COMMON_DEPEND}
@@ -45,10 +36,10 @@ DEPEND="${COMMON_DEPEND}
media-fonts/font-cursor-misc
media-fonts/font-misc-misc
x11-libs/cairo[glib]
- x11-libs/gdk-pixbuf:2[introspection]
+ x11-libs/gdk-pixbuf:2[introspection,jpeg]
x11-libs/gtk+:3[introspection]
x11-libs/pango[introspection]
- !sparc? ( python_targets_python2_7? ( dev-python/pyflakes[$(python_gen_usedep python2_7)] ) ) )
+ python_targets_python2_7? ( dev-python/pyflakes[$(python_gen_usedep python2_7)] ) )
"
# gnome-base/gnome-common required by eautoreconf
@@ -62,8 +53,14 @@ RDEPEND="${COMMON_DEPEND}
"
src_prepare() {
- # Comment out broken unittest
- epatch "${FILESDIR}"/${PN}-3.16.1-unittest.patch
+ # 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
@@ -75,8 +72,7 @@ src_configure() {
# docs disabled by upstream default since they are very out of date
configuring() {
gnome2_src_configure \
- $(use_enable cairo) \
- $(use_enable threads thread)
+ $(use_enable cairo)
# Pyflakes tests work only in python2, bug #516744
if use test && [[ ${EPYTHON} != python2.7 ]]; then
@@ -93,27 +89,19 @@ src_compile() {
}
src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
- export GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
- export SKIP_PEP8="yes"
+ 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() {
- export XDG_CACHE_HOME="${T}/${EPYTHON}"
- run_in_build_dir Xemake check
- unset XDG_CACHE_HOME
+ local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
+ emake -C "${BUILD_DIR}" check
}
- python_foreach_impl testing
- unset GIO_USE_VFS
+ virtx python_foreach_impl testing
}
src_install() {
- DOCS="AUTHORS ChangeLog* NEWS README"
-
python_foreach_impl run_in_build_dir gnome2_src_install
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
+ dodoc -r examples
}
diff --git a/dev-python/pygobject/pygobject-9999.ebuild b/dev-python/pygobject/pygobject-9999.ebuild
index 9adddeb4..1faffe2b 100644
--- a/dev-python/pygobject/pygobject-9999.ebuild
+++ b/dev-python/pygobject/pygobject-9999.ebuild
@@ -1,11 +1,9 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
-
-GCONF_DEBUG="no"
+EAPI=6
GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
inherit eutils gnome2 python-r1 virtualx
if [[ ${PV} = 9999 ]]; then
@@ -20,9 +18,9 @@ SLOT="3"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~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 ~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 +threads"
+IUSE="+cairo examples test"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
@@ -31,10 +29,10 @@ REQUIRED_USE="
COMMON_DEPEND="${PYTHON_DEPS}
>=dev-libs/glib-2.38:2
- >=dev-libs/gobject-introspection-1.39:=
+ >=dev-libs/gobject-introspection-1.46.0:=
virtual/libffi:=
cairo? (
- >=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/pycairo-1.11.1[${PYTHON_USEDEP}]
x11-libs/cairo )
"
DEPEND="${COMMON_DEPEND}
@@ -45,10 +43,10 @@ DEPEND="${COMMON_DEPEND}
media-fonts/font-cursor-misc
media-fonts/font-misc-misc
x11-libs/cairo[glib]
- x11-libs/gdk-pixbuf:2[introspection]
+ x11-libs/gdk-pixbuf:2[introspection,jpeg]
x11-libs/gtk+:3[introspection]
x11-libs/pango[introspection]
- !sparc? ( python_targets_python2_7? ( dev-python/pyflakes[$(python_gen_usedep python2_7)] ) ) )
+ python_targets_python2_7? ( dev-python/pyflakes[$(python_gen_usedep python2_7)] ) )
"
# gnome-base/gnome-common required by eautoreconf
@@ -62,9 +60,6 @@ RDEPEND="${COMMON_DEPEND}
"
src_prepare() {
- # Comment out broken unittest
- epatch "${FILESDIR}"/${PN}-3.16.1-unittest.patch
-
gnome2_src_prepare
python_copy_sources
}
@@ -75,8 +70,7 @@ src_configure() {
# docs disabled by upstream default since they are very out of date
configuring() {
gnome2_src_configure \
- $(use_enable cairo) \
- $(use_enable threads thread)
+ $(use_enable cairo)
# Pyflakes tests work only in python2, bug #516744
if use test && [[ ${EPYTHON} != python2.7 ]]; then
@@ -93,27 +87,19 @@ src_compile() {
}
src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
- export GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
- export SKIP_PEP8="yes"
+ 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() {
- export XDG_CACHE_HOME="${T}/${EPYTHON}"
- run_in_build_dir Xemake check
- unset XDG_CACHE_HOME
+ local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
+ emake -C "${BUILD_DIR}" check
}
- python_foreach_impl testing
- unset GIO_USE_VFS
+ virtx python_foreach_impl testing
}
src_install() {
- DOCS="AUTHORS ChangeLog* NEWS README"
-
python_foreach_impl run_in_build_dir gnome2_src_install
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
+ dodoc -r examples
}
next reply other threads:[~2018-09-10 21:34 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-10 21:33 Gilles Dartiguelongue [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-01-12 11:30 [gentoo-commits] proj/gnome:master commit in: dev-python/pygobject/ Dennis Lamm
2016-03-25 0:56 Ole Reifschneider
2015-10-22 23:06 Remi Cardona
2015-10-13 20:03 Ole Reifschneider
2015-10-12 20:34 Ole Reifschneider
2014-11-23 13:07 Remi Cardona
2014-11-23 13:07 Remi Cardona
2014-04-24 22:35 Gilles Dartiguelongue
2014-04-20 13:54 Gilles Dartiguelongue
2012-05-05 0:36 Alexandre Restovtsev
2012-02-21 10:44 Nirbheek Chauhan
2011-10-02 0:31 Alexandre Restovtsev
2011-10-01 8:23 Alexandre Restovtsev
2011-04-19 8:50 Nirbheek Chauhan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1536588132.4b16f44d3dddaa6f8c205039f79d7529122eb276.eva@gentoo \
--to=eva@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox