From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SAQGA-000217-R1 for garchives@archives.gentoo.org; Wed, 21 Mar 2012 18:27:47 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BCF0DE096D; Wed, 21 Mar 2012 18:27:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 78723E0943 for ; Wed, 21 Mar 2012 18:27:13 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A78021B4043 for ; Wed, 21 Mar 2012 18:27:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 7FF20E543A for ; Wed, 21 Mar 2012 18:27:08 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <1332354374.827c9b55797a0ec367bd97b5598f21f950403bee.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: dev-python/pygobject/files/, dev-python/pygobject/ X-VCS-Repository: proj/gnome X-VCS-Files: dev-python/pygobject/files/pygobject-3.0.0-support_multiple_python_versions.patch dev-python/pygobject/pygobject-3.1.1.ebuild dev-python/pygobject/pygobject-3.1.92.ebuild dev-python/pygobject/pygobject-9999.ebuild X-VCS-Directories: dev-python/pygobject/files/ dev-python/pygobject/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 827c9b55797a0ec367bd97b5598f21f950403bee X-VCS-Branch: master Date: Wed, 21 Mar 2012 18:27:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: ee9aa549-7082-4a42-af12-0e0460b5bd20 X-Archives-Hash: 2ccac8b4060dd1a239b2bbeb17445ec1 commit: 827c9b55797a0ec367bd97b5598f21f950403bee Author: Alexandre Rostovtsev gentoo org> AuthorDate: Wed Mar 21 18:17:44 2012 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Wed Mar 21 18:26:14 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D827c9b55 dev-python/pygobject: 3.1.1 =E2=86=92 3.1.92 Instead of patching, set PYTHON for multiple python version support (fix from the progress overlay by Arfrever). --- ...ct-3.0.0-support_multiple_python_versions.patch | 85 --------------= ------ ...object-3.1.1.ebuild =3D> pygobject-3.1.92.ebuild} | 17 ++-- dev-python/pygobject/pygobject-9999.ebuild | 19 ++--- 3 files changed, 17 insertions(+), 104 deletions(-) diff --git a/dev-python/pygobject/files/pygobject-3.0.0-support_multiple_= python_versions.patch b/dev-python/pygobject/files/pygobject-3.0.0-suppor= t_multiple_python_versions.patch deleted file mode 100644 index f0fab7f..0000000 --- a/dev-python/pygobject/files/pygobject-3.0.0-support_multiple_python_= versions.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 228ce7f0f99d2f5fa7d4ac86784d4e81032f9a3a Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -Date: Fri, 8 Apr 2011 15:43:39 +0200 -Subject: [PATCH 2/3] Enable support to build against multiple version of - python - ---- - gi/Makefile.am | 2 +- - gi/_glib/Makefile.am | 14 +++++++------- - gi/_gobject/Makefile.am | 2 +- - 3 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/gi/Makefile.am b/gi/Makefile.am -index 0584cc9..9abb61d 100644 ---- a/gi/Makefile.am -+++ b/gi/Makefile.am -@@ -83,7 +83,7 @@ _gi_la_CPPFLAGS =3D \ - _gi_la_LIBADD =3D \ - $(extension_libadd) \ - $(GI_LIBS) \ -- $(top_builddir)/gi/_glib/libpyglib-gi-2.0-@PYTHON_BASENAME@.la -+ $(top_builddir)/gi/_glib/libpyglib-gi-2.0-@PYTHON_BASENAME@@PYTHON_VER= SION@.la - _gi_la_LDFLAGS =3D \ - $(extension_ldflags) \ - -export-symbols-regex "init_gi|PyInit__gi" -diff --git a/gi/_glib/Makefile.am b/gi/_glib/Makefile.am -index 3cf2593..eaa0ce9 100644 ---- a/gi/_glib/Makefile.am -+++ b/gi/_glib/Makefile.am -@@ -27,24 +27,24 @@ pyglib_PYTHON =3D \ - __init__.py \ - option.py -=20 --lib_LTLIBRARIES =3D libpyglib-gi-2.0-@PYTHON_BASENAME@.la -+lib_LTLIBRARIES =3D libpyglib-gi-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.= la -=20 --libpyglib_gi_2_0_@PYTHON_BASENAME@_la_SOURCES =3D \ -+libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_SOURCES =3D \ - pyglib.c \ - pyglib.h \ - pyglib-private.h \ - pyglib-python-compat.h --libpyglib_gi_2_0_@PYTHON_BASENAME@_la_CPPFLAGS =3D \ -+libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_CPPFLAGS =3D \ - $(extension_cppflags) --libpyglib_gi_2_0_@PYTHON_BASENAME@_la_CFLAGS =3D \ -+libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_CFLAGS =3D \ - $(GLIB_CFLAGS) --libpyglib_gi_2_0_@PYTHON_BASENAME@_la_LIBADD =3D \ -+libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_LIBADD =3D \ - $(extension_libadd) \ - $(FFI_LIBS) \ - $(GLIB_LIBS) -=20 - if OS_WIN32 --libpyglib_gi_2_0_@PYTHON_BASENAME@_la_LDFLAGS =3D \ -+libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_LDFLAGS =3D \ - -no-undefined - endif -=20 -@@ -73,7 +73,7 @@ _glib_la_CPPFLAGS =3D \ - _glib_la_LIBADD =3D \ - $(extension_libadd) \ - $(GLIB_LIBS) \ -- libpyglib-gi-2.0-@PYTHON_BASENAME@.la -+ libpyglib-gi-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la - _glib_la_LDFLAGS =3D \ - $(extension_ldflags) \ - -export-symbols-regex "_glib|PyInit__glib" -diff --git a/gi/_gobject/Makefile.am b/gi/_gobject/Makefile.am -index 6bddcf7..023907f 100644 ---- a/gi/_gobject/Makefile.am -+++ b/gi/_gobject/Makefile.am -@@ -65,7 +65,7 @@ _gobject_la_LIBADD =3D \ - $(extension_libadd) \ - $(GLIB_LIBS) \ - $(FFI_LIBS) \ -- $(top_builddir)/gi/_glib/libpyglib-gi-2.0-@PYTHON_BASENAME@.la -+ $(top_builddir)/gi/_glib/libpyglib-gi-2.0-@PYTHON_BASENAME@@PYTHON_VER= SION@.la - _gobject_la_LDFLAGS =3D \ - $(extension_ldflags) \ - -export-symbols-regex "_gobject|PyInit__gobject" ---=20 -1.7.6.1 - diff --git a/dev-python/pygobject/pygobject-3.1.1.ebuild b/dev-python/pyg= object/pygobject-3.1.92.ebuild similarity index 86% rename from dev-python/pygobject/pygobject-3.1.1.ebuild rename to dev-python/pygobject/pygobject-3.1.92.ebuild index 71c93a8..e155391 100644 --- a/dev-python/pygobject/pygobject-3.1.1.ebuild +++ b/dev-python/pygobject/pygobject-3.1.92.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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.4 2011/12/31 18:47:31 tetromino Exp $ +# $Header: $ =20 EAPI=3D"4" GCONF_DEBUG=3D"no" @@ -27,7 +27,7 @@ fi IUSE=3D"+cairo examples test +threads" # doc =20 COMMON_DEPEND=3D">=3Ddev-libs/glib-2.31.0:2 - >=3Ddev-libs/gobject-introspection-1.31 + >=3Ddev-libs/gobject-introspection-1.31.20 virtual/libffi cairo? ( >=3Ddev-python/pycairo-1.10.0 )" DEPEND=3D"${COMMON_DEPEND} @@ -67,14 +67,10 @@ src_prepare() { # Do not build tests if unneeded, bug #226345 epatch "${FILESDIR}/${PN}-2.90.1-make_check.patch" =20 - # Support installation for multiple Python versions, upstream bug #6482= 92 - 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" =20 - # disable pyc compiling - echo > py-compile + python_clean_py-compile_files =20 [[ ${PV} !=3D 9999 ]] && eautoreconf gnome2_src_prepare @@ -83,7 +79,10 @@ src_prepare() { } =20 src_configure() { - python_execute_function -s gnome2_src_configure + configuration() { + PYTHON=3D"$(PYTHON)" gnome2_src_configure + } + python_execute_function -s configuration } =20 src_compile() { diff --git a/dev-python/pygobject/pygobject-9999.ebuild b/dev-python/pygo= bject/pygobject-9999.ebuild index 4800d33..e155391 100644 --- a/dev-python/pygobject/pygobject-9999.ebuild +++ b/dev-python/pygobject/pygobject-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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.4 2011/12/31 18:47:31 tetromino Exp $ +# $Header: $ =20 EAPI=3D"4" GCONF_DEBUG=3D"no" @@ -26,8 +26,8 @@ else fi IUSE=3D"+cairo examples test +threads" # doc =20 -COMMON_DEPEND=3D">=3Ddev-libs/glib-2.24.0:2 - >=3Ddev-libs/gobject-introspection-1.31 +COMMON_DEPEND=3D">=3Ddev-libs/glib-2.31.0:2 + >=3Ddev-libs/gobject-introspection-1.31.20 virtual/libffi cairo? ( >=3Ddev-python/pycairo-1.10.0 )" DEPEND=3D"${COMMON_DEPEND} @@ -67,14 +67,10 @@ src_prepare() { # Do not build tests if unneeded, bug #226345 epatch "${FILESDIR}/${PN}-2.90.1-make_check.patch" =20 - # Support installation for multiple Python versions, upstream bug #6482= 92 - 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" =20 - # disable pyc compiling - echo > py-compile + python_clean_py-compile_files =20 [[ ${PV} !=3D 9999 ]] && eautoreconf gnome2_src_prepare @@ -83,7 +79,10 @@ src_prepare() { } =20 src_configure() { - python_execute_function -s gnome2_src_configure + configuration() { + PYTHON=3D"$(PYTHON)" gnome2_src_configure + } + python_execute_function -s configuration } =20 src_compile() {