summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2013-04-20 12:22:32 +0000
committerPacho Ramos <pacho@gentoo.org>2013-04-20 12:22:32 +0000
commitab10edf46e61746e8d5820cebb9a185e428b227b (patch)
treeb68ef5f2e6a559f124bfa4292d596f6435dce744 /dev-python/pygobject
parentVersion bump (diff)
downloadgentoo-2-ab10edf46e61746e8d5820cebb9a185e428b227b.tar.gz
gentoo-2-ab10edf46e61746e8d5820cebb9a185e428b227b.tar.bz2
gentoo-2-ab10edf46e61746e8d5820cebb9a185e428b227b.zip
Version bump, drop old
(Portage version: 2.1.11.62/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'dev-python/pygobject')
-rw-r--r--dev-python/pygobject/ChangeLog9
-rw-r--r--dev-python/pygobject/pygobject-2.28.6-r52.ebuild135
-rw-r--r--dev-python/pygobject/pygobject-3.2.2.ebuild119
-rw-r--r--dev-python/pygobject/pygobject-3.8.1.ebuild (renamed from dev-python/pygobject/pygobject-3.4.2.ebuild)85
4 files changed, 43 insertions, 305 deletions
diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog
index a93efd0af84e..28281770bea1 100644
--- a/dev-python/pygobject/ChangeLog
+++ b/dev-python/pygobject/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-python/pygobject
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.213 2013/04/10 19:51:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.214 2013/04/20 12:22:32 pacho Exp $
+
+*pygobject-3.8.1 (20 Apr 2013)
+
+ 20 Apr 2013; Pacho Ramos <pacho@gentoo.org> +pygobject-3.8.1.ebuild,
+ -pygobject-2.28.6-r52.ebuild, -pygobject-3.2.2.ebuild,
+ -pygobject-3.4.2.ebuild:
+ Version bump, drop old
10 Apr 2013; Agostino Sarubbo <ago@gentoo.org> pygobject-2.28.6-r53.ebuild,
pygobject-3.2.2-r1.ebuild:
diff --git a/dev-python/pygobject/pygobject-2.28.6-r52.ebuild b/dev-python/pygobject/pygobject-2.28.6-r52.ebuild
deleted file mode 100644
index 28bfd717cc83..000000000000
--- a/dev-python/pygobject/pygobject-2.28.6-r52.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.28.6-r52.ebuild,v 1.14 2012/12/10 04:04:38 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-SUPPORT_PYTHON_ABIS="1"
-# pygobject is partially incompatible with Python 3.
-# PYTHON_DEPEND="2:2.6 3:3.1"
-# RESTRICT_PYTHON_ABIS="2.4 2.5 3.0 *-jython"
-PYTHON_DEPEND="2:2.6"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython 2.7-pypy-*"
-
-# XXX: Is the alternatives stuff needed anymore?
-inherit alternatives autotools eutils gnome2 python virtualx
-
-DESCRIPTION="GLib's GObject library bindings for Python"
-HOMEPAGE="http://www.pygtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 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"
-IUSE="examples libffi test"
-# FIXME: tests require introspection support, but we can't enable introspection,
-# or we get file collisions with slot 3 :/
-RESTRICT="test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.24.0:2
- libffi? ( virtual/libffi )"
-DEPEND="${COMMON_DEPEND}
- dev-util/gtk-doc-am
- test? (
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc )
- virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
- !<dev-python/pygtk-2.13"
-
-pkg_setup() {
- DOCS="AUTHORS ChangeLog* NEWS README"
- # --disable-introspection and --disable-cairo because we use pygobject:3
- # for introspection support
- G2CONF="${G2CONF}
- --disable-dependency-tracking
- --disable-introspection
- --disable-cairo
- $(use_with libffi ffi)"
- python_pkg_setup
-}
-
-src_prepare() {
- # Fix FHS compliance, see upstream bug #535524
- epatch "${FILESDIR}/${PN}-2.28.3-fix-codegen-location.patch"
-
- # Do not build tests if unneeded, bug #226345
- epatch "${FILESDIR}/${PN}-2.28.3-make_check.patch"
-
- # Support installation for multiple Python versions, upstream bug #648292
- epatch "${FILESDIR}/${PN}-2.28.3-support_multiple_python_versions.patch"
-
- # Disable tests that fail
- epatch "${FILESDIR}/${PN}-2.28.3-disable-failing-tests.patch"
-
- # Fix warning spam
- epatch "${FILESDIR}/${P}-set_qdata.patch"
- epatch "${FILESDIR}/${P}-gio-types-2.32.patch"
-
- python_clean_py-compile_files
-
- eautoreconf
- gnome2_src_prepare
-
- python_copy_sources
-}
-
-src_configure() {
- python_execute_function -s gnome2_src_configure
-}
-
-src_compile() {
- python_execute_function -d -s
-}
-
-# FIXME: With python multiple ABI support, tests return 1 even when they pass
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
-
- testing() {
- XDG_CACHE_HOME="${T}/$(PYTHON --ABI)"
- Xemake check PYTHON=$(PYTHON -a)
- }
- python_execute_function -s testing
-}
-
-src_install() {
- [[ -z ${ED} ]] && local ED="${D}"
- installation() {
- gnome2_src_install
- mv "${ED}$(python_get_sitedir)/pygtk.py" "${ED}$(python_get_sitedir)/pygtk.py-2.0"
- mv "${ED}$(python_get_sitedir)/pygtk.pth" "${ED}$(python_get_sitedir)/pygtk.pth-2.0"
- }
- python_execute_function -s installation
-
- python_clean_installation_image
-
- sed "s:/usr/bin/python:/usr/bin/python2:" \
- -i "${ED}"/usr/bin/pygobject-codegen-2.0 \
- || die "Fix usage of python interpreter"
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
-
-pkg_postinst() {
- create_symlinks() {
- alternatives_auto_makesym "$(python_get_sitedir)/pygtk.py" pygtk.py-[0-9].[0-9]
- alternatives_auto_makesym "$(python_get_sitedir)/pygtk.pth" pygtk.pth-[0-9].[0-9]
- }
- python_execute_function create_symlinks
-
- python_mod_optimize glib gobject gtk-2.0 pygtk.py
-}
-
-pkg_postrm() {
- python_mod_cleanup glib gobject gtk-2.0 pygtk.py
-
- create_symlinks() {
- alternatives_auto_makesym "$(python_get_sitedir)/pygtk.py" pygtk.py-[0-9].[0-9]
- alternatives_auto_makesym "$(python_get_sitedir)/pygtk.pth" pygtk.pth-[0-9].[0-9]
- }
- python_execute_function create_symlinks
-}
diff --git a/dev-python/pygobject/pygobject-3.2.2.ebuild b/dev-python/pygobject/pygobject-3.2.2.ebuild
deleted file mode 100644
index d6e136ba04e1..000000000000
--- a/dev-python/pygobject/pygobject-3.2.2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.2.2.ebuild,v 1.13 2012/10/28 15:43:58 armin76 Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="2:2.6 3:3.1:3.2"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.0 3.3 *-jython *-pypy-*"
-
-inherit autotools eutils gnome2 python virtualx
-
-DESCRIPTION="GLib's GObject library bindings for Python"
-HOMEPAGE="http://www.pygtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 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"
-IUSE="+cairo examples test +threads" # doc
-REQUIRED_USE="test? ( cairo )"
-
-COMMON_DEPEND=">=dev-libs/glib-2.31.0:2
- >=dev-libs/gobject-introspection-1.31.20
- virtual/libffi
- cairo? ( >=dev-python/pycairo-1.10.0 )"
-DEPEND="${COMMON_DEPEND}
- test? (
- dev-libs/atk[introspection]
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- x11-libs/gdk-pixbuf:2[introspection]
- x11-libs/gtk+:3[introspection]
- x11-libs/pango[introspection] )
- virtual/pkgconfig"
-# docs disabled for now per upstream default since they are very out of date
-# doc? (
-# app-text/docbook-xml-dtd:4.1.2
-# dev-libs/libxslt
-# >=app-text/docbook-xsl-stylesheets-1.70.1 )
-
-# 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]"
-
-pkg_setup() {
- DOCS="AUTHORS ChangeLog* NEWS README"
- # Hard-enable libffi support since both gobject-introspection and
- # glib-2.29.x rdepend on it anyway
- G2CONF="${G2CONF}
- --disable-dependency-tracking
- --with-ffi
- $(use_enable cairo)
- $(use_enable threads thread)"
-
- python_pkg_setup
-}
-
-src_prepare() {
- # Do not build tests if unneeded, bug #226345
- epatch "${FILESDIR}/${PN}-2.90.1-make_check.patch"
-
- # Disable tests that fail
- #epatch "${FILESDIR}/${PN}-2.28.3-disable-failing-tests.patch"
-
- python_clean_py-compile_files
-
- eautoreconf
- gnome2_src_prepare
-
- python_copy_sources
-}
-
-src_configure() {
- configuration() {
- PYTHON="$(PYTHON)" gnome2_src_configure
- }
- python_execute_function -s configuration
-}
-
-src_compile() {
- python_src_compile
-}
-
-# FIXME: With python multiple ABI support, tests return 1 even when they pass
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-
- testing() {
- export XDG_CACHE_HOME="${T}/$(PYTHON --ABI)"
- Xemake check PYTHON=$(PYTHON -a)
- unset XDG_CACHE_HOME
- }
- python_execute_function -s testing
- unset GIO_USE_VFS
-}
-
-src_install() {
- python_execute_function -s gnome2_src_install
- python_clean_installation_image
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
-
-pkg_postinst() {
- python_mod_optimize gi
-}
-
-pkg_postrm() {
- python_mod_cleanup gi
-}
diff --git a/dev-python/pygobject/pygobject-3.4.2.ebuild b/dev-python/pygobject/pygobject-3.8.1.ebuild
index 8e6d29649c0f..732a27c52508 100644
--- a/dev-python/pygobject/pygobject-3.4.2.ebuild
+++ b/dev-python/pygobject/pygobject-3.8.1.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.4.2.ebuild,v 1.1 2012/11/12 17:23:16 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.8.1.ebuild,v 1.1 2013/04/20 12:22:32 pacho Exp $
-EAPI="4"
+EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="2:2.6 3:3.1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.0 *-jython *-pypy-*"
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
-inherit autotools eutils gnome2 python virtualx
+inherit autotools eutils gnome2 python-r1 virtualx
DESCRIPTION="GLib's GObject library bindings for Python"
HOMEPAGE="http://www.pygtk.org/"
@@ -17,13 +15,17 @@ HOMEPAGE="http://www.pygtk.org/"
LICENSE="LGPL-2.1+"
SLOT="3"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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"
-IUSE="+cairo examples test +threads" # doc
+IUSE="+cairo examples test +threads"
+
REQUIRED_USE="test? ( cairo )"
-COMMON_DEPEND=">=dev-libs/glib-2.31.0:2
+COMMON_DEPEND="
+ >=dev-libs/glib-2.31.0:2
>=dev-libs/gobject-introspection-1.34.1.1
- virtual/libffi
- cairo? ( >=dev-python/pycairo-1.10.0 )"
+ virtual/libffi:=
+ cairo? ( >=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}] )
+ ${PYTHON_DEPS}
+"
DEPEND="${COMMON_DEPEND}
x11-libs/cairo[glib]
virtual/pkgconfig
@@ -31,14 +33,11 @@ DEPEND="${COMMON_DEPEND}
dev-libs/atk[introspection]
media-fonts/font-cursor-misc
media-fonts/font-misc-misc
+ virtual/python-unittest2[${PYTHON_USEDEP}]
x11-libs/gdk-pixbuf:2[introspection]
x11-libs/gtk+:3[introspection]
- x11-libs/pango[introspection] )"
-# docs disabled for now per upstream default since they are very out of date
-# doc? (
-# app-text/docbook-xml-dtd:4.1.2
-# dev-libs/libxslt
-# >=app-text/docbook-xsl-stylesheets-1.70.1 )
+ x11-libs/pango[introspection] )
+"
# We now disable introspection support in slot 2 per upstream recommendation
# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9); however,
@@ -48,69 +47,55 @@ RDEPEND="${COMMON_DEPEND}
!<dev-python/pygtk-2.13
!<dev-python/pygobject-2.28.6-r50:2[introspection]"
-pkg_setup() {
- python_pkg_setup
-}
-
src_prepare() {
DOCS="AUTHORS ChangeLog* NEWS README"
- # Hard-enable libffi support since both gobject-introspection and
- # glib-2.29.x rdepend on it anyway
- G2CONF="${G2CONF}
- --disable-dependency-tracking
- --with-ffi
- $(use_enable cairo)
- $(use_enable threads thread)"
- # Do not build tests if unneeded, bug #226345
- epatch "${FILESDIR}/${PN}-3.4.1.1-make_check.patch"
+ # Do not build tests if unneeded, bug #226345, upstream bug #698444
+ epatch "${FILESDIR}/${PN}-3.7.90-make_check.patch"
+
+ # Run tests with older python too
+# epatch "${FILESDIR}/${PN}-3.7.90-run-tests-with-old-python.patch"
eautoreconf
gnome2_src_prepare
- python_clean_py-compile_files
python_copy_sources
}
src_configure() {
- configuration() {
- PYTHON="$(PYTHON)" gnome2_src_configure
- }
- python_execute_function -s configuration
+ # 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
+
+ python_foreach_impl run_in_build_dir \
+ gnome2_src_configure \
+ --with-ffi \
+ $(use_enable cairo) \
+ $(use_enable threads thread)
}
src_compile() {
- python_src_compile
+ python_foreach_impl run_in_build_dir gnome2_src_compile
}
-# FIXME: With python multiple ABI support, tests return 1 even when they pass
src_test() {
unset DBUS_SESSION_BUS_ADDRESS
export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
testing() {
- export XDG_CACHE_HOME="${T}/$(PYTHON --ABI)"
- Xemake check PYTHON=$(PYTHON -a)
+ export XDG_CACHE_HOME="${T}/${EPYTHON}"
+ run_in_build_dir Xemake check
unset XDG_CACHE_HOME
}
- python_execute_function -s testing
+ python_foreach_impl testing
unset GIO_USE_VFS
}
src_install() {
- python_execute_function -s gnome2_src_install
- python_clean_installation_image
+ python_foreach_impl run_in_build_dir gnome2_src_install
if use examples; then
insinto /usr/share/doc/${PF}
doins -r examples
fi
}
-
-pkg_postinst() {
- python_mod_optimize gi
-}
-
-pkg_postrm() {
- python_mod_cleanup gi
-}