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 1R81Ig-0004Gw-62 for garchives@archives.gentoo.org; Mon, 26 Sep 2011 02:52:10 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 33EAC21C2BA; Mon, 26 Sep 2011 02:51:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CD0D921C2BA for ; Mon, 26 Sep 2011 02:51:57 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 327F31B410D for ; Mon, 26 Sep 2011 02:51:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0789E8004F for ; Mon, 26 Sep 2011 02:51:56 +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: <2050b2b30349f70f0b4fc66570788aa0feadf201.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:gnome-next commit in: dev-python/pygobject/files/, dev-python/pygobject/ X-VCS-Repository: proj/gnome X-VCS-Files: dev-python/pygobject/files/pygobject-2.90.1-dsextras.py.patch dev-python/pygobject/files/pygobject-2.90.1-rename-doc-directories.patch dev-python/pygobject/files/pygobject-2.90.1-support_multiple_python_versions.patch dev-python/pygobject/files/pygobject-3.0.0-support_multiple_python_versions.patch dev-python/pygobject/pygobject-2.90.3.ebuild dev-python/pygobject/pygobject-3.0.0.ebuild X-VCS-Directories: dev-python/pygobject/files/ dev-python/pygobject/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 2050b2b30349f70f0b4fc66570788aa0feadf201 Date: Mon, 26 Sep 2011 02:51:56 +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: X-Archives-Hash: b5b9a1c738186be305181e47e1e2460e commit: 2050b2b30349f70f0b4fc66570788aa0feadf201 Author: Alexandre Rostovtsev gmail com> AuthorDate: Mon Sep 26 02:44:42 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Mon Sep 26 02:49:02 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D2050b2b3 dev-python/pygobject: 2.90.3 =E2=86=92 3.0.0 Version bump. Drop dsextras patch (applied upstream) and doc renaming patch (now irrelevant, since the documentation is no longer built or installed at all). Update python version patch for makefile changes. Update dependencies. --- .../files/pygobject-2.90.1-dsextras.py.patch | 28 ------- .../pygobject-2.90.1-rename-doc-directories.patch | 67 --------------= - ...t-2.90.1-support_multiple_python_versions.patch | 75 --------------= --- ...ct-3.0.0-support_multiple_python_versions.patch | 85 ++++++++++++++= ++++++ ...object-2.90.3.ebuild =3D> pygobject-3.0.0.ebuild} | 31 ++----- 5 files changed, 93 insertions(+), 193 deletions(-) diff --git a/dev-python/pygobject/files/pygobject-2.90.1-dsextras.py.patc= h b/dev-python/pygobject/files/pygobject-2.90.1-dsextras.py.patch deleted file mode 100644 index ff3ae7e..0000000 --- a/dev-python/pygobject/files/pygobject-2.90.1-dsextras.py.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c13d63ffa55cf03bc8fa37f19961714d7386a69a Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Sun, 14 Aug 2011 14:37:41 -0400 -Subject: [PATCH] Drop dsextras.py (it's installed by pygobject-2.28.x) - ---- - Makefile.am | 5 ----- - 1 files changed, 0 insertions(+), 5 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 3b8b6fe..e696cea 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -56,11 +56,6 @@ INCLUDES =3D -I$(top_srcdir)/gobject $(PYTHON_INCLUDE= S) $(GLIB_CFLAGS) - pkgconfigdir =3D $(libdir)/pkgconfig - pkgconfig_DATA =3D pygobject-$(PLATFORM_VERSION).pc -=20 --# python modules --pkgpyexecdir =3D $(pyexecdir)/gtk-2.0 --pkgpyexec_PYTHON =3D dsextras.py --pkgpyexec_LTLIBRARIES =3D -- - # python - pyexec_LTLIBRARIES =3D -=20 ---=20 -1.7.6 - diff --git a/dev-python/pygobject/files/pygobject-2.90.1-rename-doc-direc= tories.patch b/dev-python/pygobject/files/pygobject-2.90.1-rename-doc-dir= ectories.patch deleted file mode 100644 index 3dabca5..0000000 --- a/dev-python/pygobject/files/pygobject-2.90.1-rename-doc-directories.= patch +++ /dev/null @@ -1,67 +0,0 @@ -From 662425742f5f93bf2cc5e774d5d49a20ea6dd989 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Sun, 14 Aug 2011 15:36:20 -0400 -Subject: [PATCH] Rename doc directories to prevent file collisions with - 2.28.x - ---- - docs/Makefile.am | 8 ++++---- - docs/reference/pygobject-ref.xml | 2 +- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/docs/Makefile.am b/docs/Makefile.am -index ad68613..4fa30a9 100644 ---- a/docs/Makefile.am -+++ b/docs/Makefile.am -@@ -20,7 +20,7 @@ HTML_FILES =3D \ - html/gobject-functions.html \ - html/index.html \ - html/index.sgml \ -- html/pygobject.devhelp \ -+ html/pygobject-3.0.devhelp \ - html/pygobject-introduction.html -=20 -=20 -@@ -52,7 +52,7 @@ XSL_FILES =3D \ - # so the date is newer then the files in HTML_FILES - FIXXREF =3D xsl/fixxref.py -=20 --TARGET_DIR =3D $(datadir)/gtk-doc/html/pygobject -+TARGET_DIR =3D $(datadir)/gtk-doc/html/pygobject-3.0 - CSSdir =3D $(TARGET_DIR) - CSS_DATA =3D $(CSS_FILES) -=20 -@@ -75,7 +75,7 @@ uninstall-local: - rm -f $(DESTDIR)$(TARGET_DIR)/* -=20 -=20 --XSLdir =3D $(datadir)/pygobject/xsl -+XSLdir =3D $(datadir)/pygobject-3.0/xsl - XSL_DATA =3D $(XSL_FILES) $(FIXXREF) -=20 - EXTRA_DIST =3D \ -@@ -102,7 +102,7 @@ CLEANFILES =3D reference/builddate.xml $(HTML_FILES) - $(HTML_FILES): $(XML_FILES) $(XSL_FILES) - @xsltproc --nonet --xinclude -o $(BUILDDIR)/html/ \ - --path $(BUILDDIR)/reference:$(srcdir)/reference \ -- --stringparam gtkdoc.bookname "pygobject" \ -+ --stringparam gtkdoc.bookname "pygobject-3.0" \ - --stringparam gtkdoc.version ${REF_VERSION} \ - $(srcdir)/xsl/ref-html-style.xsl \ - $(srcdir)/reference/pygobject-ref.xml -diff --git a/docs/reference/pygobject-ref.xml b/docs/reference/pygobject= -ref.xml -index ee90a55..1f39690 100644 ---- a/docs/reference/pygobject-ref.xml -+++ b/docs/reference/pygobject-ref.xml -@@ -9,7 +9,7 @@ - - - &builddate; -- PyGObject Reference Manual -+ PyGObject 3.0 Reference Manual - for version &version; - for PyGObject version &version; - ---=20 -1.7.6 - diff --git a/dev-python/pygobject/files/pygobject-2.90.1-support_multiple= _python_versions.patch b/dev-python/pygobject/files/pygobject-2.90.1-supp= ort_multiple_python_versions.patch deleted file mode 100644 index 18ce706..0000000 --- a/dev-python/pygobject/files/pygobject-2.90.1-support_multiple_python= _versions.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 712f9f95c1bc1a75b5bf877a8cd882760512a84b Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -Date: Fri, 8 Apr 2011 15:43:39 +0200 -Subject: [PATCH] Enable support to build against multiple version of pyt= hon - ---- - gi/Makefile.am | 2 +- - gi/_glib/Makefile.am | 10 +++++----- - gi/_gobject/Makefile.am | 2 +- - 3 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/gi/Makefile.am b/gi/Makefile.am -index ee5eb00..86bff1b 100644 ---- a/gi/Makefile.am -+++ b/gi/Makefile.am -@@ -27,7 +27,7 @@ _gi_la_LDFLAGS =3D \ - -export-symbols-regex "init_gi|PyInit__gi" - _gi_la_LIBADD =3D \ - $(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_SOURCES =3D \ - pygi-repository.c \ - pygi-repository.h \ -diff --git a/gi/_glib/Makefile.am b/gi/_glib/Makefile.am -index fcea61d..013f7ad 100644 ---- a/gi/_glib/Makefile.am -+++ b/gi/_glib/Makefile.am -@@ -1,7 +1,7 @@ - AUTOMAKE_OPTIONS =3D 1.7 - INCLUDES =3D $(PYTHON_INCLUDES) $(GLIB_CFLAGS) -DPY_SSIZE_T_CLEAN -=20 --lib_LTLIBRARIES =3D libpyglib-gi-2.0-@PYTHON_BASENAME@.la -+lib_LTLIBRARIES =3D libpyglib-gi-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.= la -=20 - pkgpyexecdir =3D $(pyexecdir) -=20 -@@ -16,9 +16,9 @@ if PLATFORM_WIN32 - common_ldflags +=3D -no-undefined - endif -=20 --libpyglib_gi_2_0_@PYTHON_BASENAME@_la_CFLAGS =3D $(GLIB_CFLAGS) --libpyglib_gi_2_0_@PYTHON_BASENAME@_la_LIBADD =3D $(GLIB_LIBS) $(FFI_LIB= S) --libpyglib_gi_2_0_@PYTHON_BASENAME@_la_SOURCES =3D \ -+libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_CFLAGS =3D $(GLIB= _CFLAGS) -+libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_LIBADD =3D $(GLIB= _LIBS) $(FFI_LIBS) -+libpyglib_gi_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_SOURCES =3D \ - pyglib.c \ - pyglib.h \ - pyglib-private.h \ -@@ -26,7 +26,7 @@ libpyglib_gi_2_0_@PYTHON_BASENAME@_la_SOURCES =3D \ -=20 - _glib_la_CFLAGS =3D $(GLIB_CFLAGS) - _glib_la_LDFLAGS =3D $(common_ldflags) -export-symbols-regex "_glib|PyI= nit__glib" --_glib_la_LIBADD =3D $(GLIB_LIBS) $(PYTHON_LIBS) libpyglib-gi-2.0-@PYTHO= N_BASENAME@.la -+_glib_la_LIBADD =3D $(GLIB_LIBS) $(PYTHON_LIBS) libpyglib-gi-2.0-@PYTHO= N_BASENAME@@PYTHON_VERSION@.la - _glib_la_SOURCES =3D \ - glibmodule.c \ - pygiochannel.c \ -diff --git a/gi/_gobject/Makefile.am b/gi/_gobject/Makefile.am -index 7e15d4c..a901fe0 100644 ---- a/gi/_gobject/Makefile.am -+++ b/gi/_gobject/Makefile.am -@@ -30,7 +30,7 @@ _gobject_la_LIBADD =3D \ - $(GLIB_LIBS) \ - $(FFI_LIBS) \ - $(PYTHON_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 -=20 - _gobject_la_SOURCES =3D \ - gobjectmodule.c \ ---=20 -1.7.6 - 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 new file mode 100644 index 0000000..f0fab7f --- /dev/null +++ b/dev-python/pygobject/files/pygobject-3.0.0-support_multiple_python_= versions.patch @@ -0,0 +1,85 @@ +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-2.90.3.ebuild b/dev-python/py= gobject/pygobject-3.0.0.ebuild similarity index 74% rename from dev-python/pygobject/pygobject-2.90.3.ebuild rename to dev-python/pygobject/pygobject-3.0.0.ebuild index f5aa30a..5916ddc 100644 --- a/dev-python/pygobject/pygobject-2.90.3.ebuild +++ b/dev-python/pygobject/pygobject-3.0.0.ebuild @@ -23,22 +23,23 @@ HOMEPAGE=3D"http://www.pygtk.org/" LICENSE=3D"LGPL-2.1" SLOT=3D"3" KEYWORDS=3D"~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=3D"doc +cairo examples test +threads" +IUSE=3D"+cairo examples test +threads" # doc =20 COMMON_DEPEND=3D">=3Ddev-libs/glib-2.24.0:2 - >=3Ddev-libs/gobject-introspection-0.10.2 + >=3Ddev-libs/gobject-introspection-1.29 virtual/libffi cairo? ( >=3Ddev-python/pycairo-1.10.0 )" DEPEND=3D"${COMMON_DEPEND} - doc? ( - app-text/docbook-xml-dtd:4.1.2 - dev-libs/libxslt - >=3Dapp-text/docbook-xsl-stylesheets-1.70.1 ) test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc >=3Ddev-libs/gobject-introspection-1.29.17 ) >=3Ddev-util/pkgconfig-0.12" +# 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 +# >=3Dapp-text/docbook-xsl-stylesheets-1.70.1 ) =20 # We now disable introspection support in slot 2 per upstream recommenda= tion # (see https://bugzilla.gnome.org/show_bug.cgi?id=3D642048#c9); however, @@ -55,7 +56,6 @@ pkg_setup() { G2CONF=3D"${G2CONF} --disable-dependency-tracking --with-ffi - $(use_enable doc docs) $(use_enable cairo) $(use_enable threads thread)" } @@ -63,26 +63,11 @@ pkg_setup() { src_prepare() { gnome2_src_prepare =20 - # Drop site-packages/gtk-2.0/dsextras.py, it's installed by slot 2 - epatch "${FILESDIR}/${PN}-2.90.1-dsextras.py.patch" - # 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}-2.90.1-support_multiple_python_versions.patch= " - - # Rename doc directories to prevent file collision with slot 2 - epatch "${FILESDIR}/${PN}-2.90.1-rename-doc-directories.patch" - if [[ ${PV} !=3D 9999 ]]; then - # rename and sed pre-built docs so devhelp can display them correctly - mv docs/html/pygobject.devhelp docs/html/pygobject-3.0.devhelp || die - sed -e 's:PyGObject Reference Manual:PyGObject 3.0 Reference Manual:' = \ - -e 's:name=3D"pygobject":name=3D"pygobject-3.0":' \ - -i docs/html/pygobject-3.0.devhelp || die - sed -e 's:href=3D"pygobject/:href=3D"pygobject-3.0/:g' \ - -i docs/html/index.sgml || die - fi + epatch "${FILESDIR}/${PN}-3.0.0-support_multiple_python_versions.patch" =20 # Disable tests that fail #epatch "${FILESDIR}/${PN}-2.28.3-disable-failing-tests.patch"