Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev-python/pygobject/ChangeLog9
-rw-r--r--dev-python/pygobject/pygobject-2.26.0-r1.ebuild138
-rw-r--r--dev-python/pygobject/pygobject-2.28.6-r50.ebuild139
-rw-r--r--dev-python/pygobject/pygobject-2.28.6.ebuild133
-rw-r--r--dev-python/pygobject/pygobject-3.2.1.ebuild (renamed from dev-python/pygobject/pygobject-3.0.3.ebuild)34
5 files changed, 19 insertions, 434 deletions
diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog
index 214f5ba1b4be..b9ef1efb36fd 100644
--- a/dev-python/pygobject/ChangeLog
+++ b/dev-python/pygobject/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-python/pygobject
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.156 2012/05/04 15:12:14 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.157 2012/05/12 13:03:54 pacho Exp $
+
+*pygobject-3.2.1 (12 May 2012)
+
+ 12 May 2012; Pacho Ramos <pacho@gentoo.org> +pygobject-3.2.1.ebuild,
+ -pygobject-2.26.0-r1.ebuild, -pygobject-2.28.6-r50.ebuild,
+ -pygobject-2.28.6.ebuild, -pygobject-3.0.3.ebuild:
+ Version bump, remove old.
04 May 2012; Patrick Lauer <patrick@gentoo.org> pygobject-2.26.0-r1.ebuild,
pygobject-2.28.6-r50.ebuild, pygobject-2.28.6-r51.ebuild,
diff --git a/dev-python/pygobject/pygobject-2.26.0-r1.ebuild b/dev-python/pygobject/pygobject-2.26.0-r1.ebuild
deleted file mode 100644
index 6f7e0114bafb..000000000000
--- a/dev-python/pygobject/pygobject-2.26.0-r1.ebuild
+++ /dev/null
@@ -1,138 +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.26.0-r1.ebuild,v 1.21 2012/05/04 15:12:14 patrick Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="2:2.5"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-jython 2.7-pypy-*"
-PYTHON_USE_WITH="threads="
-
-inherit alternatives autotools 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 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc cairo examples +introspection libffi test +threads"
-
-RDEPEND=">=dev-libs/glib-2.24:2
- !<dev-python/pygtk-2.13
- introspection? (
- >=dev-libs/gobject-introspection-0.9.5
- cairo? ( >=dev-python/pycairo-1.0.2 ) )
- libffi? ( virtual/libffi )"
-DEPEND="${RDEPEND}
- doc? (
- dev-libs/libxslt
- >=app-text/docbook-xsl-stylesheets-1.70.1 )
- test? (
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc )
- virtual/pkgconfig"
-
-pkg_setup() {
- DOCS="AUTHORS ChangeLog* NEWS README"
- G2CONF="${G2CONF}
- --disable-dependency-tracking
- $(use_enable doc docs)
- $(use_enable cairo)
- $(use_enable introspection)
- $(use_enable threads thread)
- $(use_with libffi ffi)"
-}
-
-src_prepare() {
- # Fix FHS compliance, see upstream bug #535524
- epatch "${FILESDIR}/${PN}-2.15.4-fix-codegen-location.patch"
-
- # Do not build tests if unneeded, bug #226345
- epatch "${FILESDIR}/${PN}-2.26.0-make_check.patch"
-
- # Support installation for multiple Python versions
- epatch "${FILESDIR}/${PN}-2.18.0-support_multiple_python_versions.patch"
-
- # Disable non-working tests
- epatch "${FILESDIR}/${PN}-2.26.0-disable-non-working-tests.patch"
-
- # Fix crash in instance property; bug# 344459
- epatch "${FILESDIR}/${PN}-2.26.0-nocrash.patch"
-
- # Disable calls to PyGILState_* when threads are disabled
- epatch "${FILESDIR}/${PN}-2.26.0-disabled-threads.patch"
-
- # disable pyc compiling
- echo '#!/bin/sh' > py-compile
-
- eautoreconf
- gnome2_src_prepare
-
- python_copy_sources
-}
-
-src_configure() {
- python_execute_function -s gnome2_src_configure
-}
-
-src_compile() {
- python_execute_function -d -s
-}
-
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
-
- testing() {
- if has ${PYTHON_ABI} 2.4 2.5; then
- einfo "Skipping tests with Python ${PYTHON_ABI}. dev-python/pycairo supports only Python >=2.6."
- return 0
- fi
-
- 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/${P}
- doins -r examples || die "doins failed"
- 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 gtk-2.0 pygtk.py
-}
-
-pkg_postrm() {
- python_mod_cleanup 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-2.28.6-r50.ebuild b/dev-python/pygobject/pygobject-2.28.6-r50.ebuild
deleted file mode 100644
index d2774d000416..000000000000
--- a/dev-python/pygobject/pygobject-2.28.6-r50.ebuild
+++ /dev/null
@@ -1,139 +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-r50.ebuild,v 1.9 2012/05/04 15:12:14 patrick Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="xz"
-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 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 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples +introspection 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}
- doc? (
- dev-libs/libxslt
- >=app-text/docbook-xsl-stylesheets-1.70.1 )
- test? (
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc )
- virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
- !<dev-python/pygtk-2.13"
-# Use slot 3 for introspection support per upstream recommendation
-# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9);
-# keep introspection USE flag in slot 2 for backward compatibility for now.
-PDEPEND="introspection? ( dev-python/pygobject:3 )"
-
-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_enable doc docs)
- $(use_with libffi ffi)"
-}
-
-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"
-
- # disable pyc compiling
- echo '#!/bin/sh' > py-compile
-
- 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/${P}
- doins -r examples || die "doins failed"
- 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-2.28.6.ebuild b/dev-python/pygobject/pygobject-2.28.6.ebuild
deleted file mode 100644
index 375552542699..000000000000
--- a/dev-python/pygobject/pygobject-2.28.6.ebuild
+++ /dev/null
@@ -1,133 +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.ebuild,v 1.15 2012/05/04 15:12:14 patrick Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="xz"
-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 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 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc +cairo examples +introspection libffi test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.24.0:2
- introspection? (
- >=dev-libs/gobject-introspection-0.10.2
- cairo? ( >=dev-python/pycairo-1.2.0 ) )
- libffi? ( virtual/libffi )"
-DEPEND="${COMMON_DEPEND}
- doc? (
- dev-libs/libxslt
- >=app-text/docbook-xsl-stylesheets-1.70.1 )
- 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"
- G2CONF="${G2CONF}
- --disable-dependency-tracking
- $(use_enable doc docs)
- $(use_enable cairo)
- $(use_enable introspection)
- $(use_with libffi ffi)"
-}
-
-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"
-
- # disable pyc compiling
- echo '#!/bin/sh' > py-compile
-
- 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/${P}
- doins -r examples || die "doins failed"
- 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 $(use introspection && echo gi) glib gobject gtk-2.0 pygtk.py
-}
-
-pkg_postrm() {
- python_mod_cleanup $(use introspection && echo gi) 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.0.3.ebuild b/dev-python/pygobject/pygobject-3.2.1.ebuild
index b2ae32044c77..8b04657bb410 100644
--- a/dev-python/pygobject/pygobject-3.0.3.ebuild
+++ b/dev-python/pygobject/pygobject-3.2.1.ebuild
@@ -1,16 +1,15 @@
# 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.0.3.ebuild,v 1.7 2012/05/04 15:12:14 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.2.1.ebuild,v 1.1 2012/05/12 13:03:54 pacho Exp $
EAPI="4"
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 2.7-pypy-*"
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.0 *-jython *-pypy-*"
-# XXX: Is the alternatives stuff needed anymore?
-inherit alternatives autotools gnome2 python virtualx
+inherit autotools gnome2 python virtualx
DESCRIPTION="GLib's GObject library bindings for Python"
HOMEPAGE="http://www.pygtk.org/"
@@ -20,16 +19,15 @@ SLOT="3"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~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
-COMMON_DEPEND=">=dev-libs/glib-2.24.0:2
- >=dev-libs/gobject-introspection-1.29
+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? (
media-fonts/font-cursor-misc
media-fonts/font-misc-misc
- >=dev-libs/gobject-introspection-1.29.1
- )
+ >=dev-libs/gobject-introspection-1.29.17 )
virtual/pkgconfig"
# docs disabled for now per upstream default since they are very out of date
# doc? (
@@ -62,23 +60,10 @@ src_prepare() {
# Do not build tests if unneeded, bug #226345
epatch "${FILESDIR}/${PN}-2.90.1-make_check.patch"
- # Support installation for multiple Python versions, upstream bug #648292
- epatch "${FILESDIR}/${PN}-3.0.0-support_multiple_python_versions.patch"
-
# Disable tests that fail
#epatch "${FILESDIR}/${PN}-2.28.3-disable-failing-tests.patch"
- # FIXME: disable tests that require >=gobject-introspection-1.31
- epatch "${FILESDIR}/${P}-disable-new-gi-tests.patch"
-
- # Upstream patch to fix GObject.property min/max values; in next release
- epatch "${FILESDIR}/${P}-gobject-property-min-max.patch"
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=666852
- epatch "${FILESDIR}/${PN}-3.0.3-tests-python3.patch"
-
- # disable pyc compiling
- echo '#!/bin/sh' > py-compile
+ python_clean_py-compile_files
eautoreconf
gnome2_src_prepare
@@ -87,7 +72,10 @@ src_prepare() {
}
src_configure() {
- python_execute_function -s gnome2_src_configure
+ configuration() {
+ PYTHON="$(PYTHON)" gnome2_src_configure
+ }
+ python_execute_function -s configuration
}
src_compile() {