From 52b4d3e02c934341a8601bb7cdd01b997e4c07e3 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 11 Jul 2013 21:40:23 -0700 Subject: [PATCH] feat(dev-python/pygobject) remove as portage-stable has newer versions --- .../dev-python/pygobject/Manifest | 1 - ...ygobject-2.15.4-fix-codegen-location.patch | 50 ------- .../files/pygobject-2.18.0-automake111.patch | 13 -- ...ject-2.18.0-cross-generate-constants.patch | 36 ----- .../files/pygobject-2.18.0-make_check.patch | 57 -------- .../pygobject/pygobject-2.18.0-r1.ebuild | 138 ------------------ .../pygobject/pygobject-2.18.0-r4.ebuild | 1 - 7 files changed, 296 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/files/pygobject-2.15.4-fix-codegen-location.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/files/pygobject-2.18.0-automake111.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/files/pygobject-2.18.0-cross-generate-constants.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/files/pygobject-2.18.0-make_check.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/pygobject-2.18.0-r1.ebuild delete mode 120000 sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/pygobject-2.18.0-r4.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/Manifest deleted file mode 100644 index 8aeb6e3aac..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pygobject-2.18.0.tar.bz2 639205 RMD160 db454107949b0e797c6c151aa426368ef0f59317 SHA1 f800eda7978fe9813600cfdda973da15c3178bb0 SHA256 b11b840ae31e6e644986806ee3400f4528b803d07b6cee26add45e0f2e5e622b diff --git a/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/files/pygobject-2.15.4-fix-codegen-location.patch b/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/files/pygobject-2.15.4-fix-codegen-location.patch deleted file mode 100644 index 8882cd0790..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/files/pygobject-2.15.4-fix-codegen-location.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- - Fix FHS compliance of codegen - - codegen/Makefile.am | 2 +- - codegen/pygtk-codegen-2.0.in | 3 ++- - pygtk-2.0.pc.in | 2 +- - 3 files changed, 4 insertions(+), 3 deletions(-) - ---- a/codegen/Makefile.am 2007-11-01 12:20:22.000000000 -0400 -+++ b/codegen/Makefile.am 2008-05-28 22:21:04.000000000 -0400 -@@ -2,7 +2,7 @@ PLATFORM_VERSION = 2.0 - - bin_SCRIPTS = pygobject-codegen-$(PLATFORM_VERSION) - --codegendir = $(pkgdatadir)/$(PLATFORM_VERSION)/codegen -+codegendir = $(pyexecdir)/gtk-2.0/codegen - - codegen_PYTHON = \ - __init__.py \ ---- a/codegen/pygobject-codegen-2.0.in 2007-11-01 12:20:22.000000000 -0400 -+++ b/codegen/pygobject-codegen-2.0.in 2008-05-28 22:24:38.000000000 -0400 -@@ -1,9 +1,10 @@ - #!/bin/sh - - prefix=@prefix@ -+exec_prefix=@exec_prefix@ - datarootdir=@datarootdir@ - datadir=@datadir@ --codegendir=${datadir}/pygobject/2.0/codegen -+codegendir=@pyexecdir@/gtk-2.0/codegen - - PYTHONPATH=$codegendir - export PYTHONPATH ---- a/pygobject-2.0.pc.in 2007-11-01 12:20:22.000000000 -0400 -+++ b/pygobject-2.0.pc.in 2008-05-28 22:21:04.000000000 -0400 -@@ -4,6 +4,7 @@ - datarootdir=@datarootdir@ - datadir=@datadir@ - libdir=@libdir@ -+pyexecdir=@pyexecdir@ - - # you can use the --variable=pygtkincludedir argument to - # pkg-config to get this value. You might want to use this to -@@ -12,5 +12,5 @@ - defsdir=${datadir}/pygobject/2.0/defs --codegendir=${datadir}/pygobject/2.0/codegen -+codegendir=${pyexecdir}/gtk-2.0/codegen - - Name: PyGObject - Description: Python bindings for GObject diff --git a/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/files/pygobject-2.18.0-automake111.patch b/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/files/pygobject-2.18.0-automake111.patch deleted file mode 100644 index 9e57bb7f56..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/files/pygobject-2.18.0-automake111.patch +++ /dev/null @@ -1,13 +0,0 @@ -# Fix build failure due to automake 1.11. -# defsgen.py was installed twice -# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=279813 ---- a/codegen/Makefile.am -+++ b/codegen/Makefile.am -@@ -18,7 +18,6 @@ - docextract_to_xml.py \ - docgen.py \ - h2def.py \ -- defsgen.py \ - createdefs.py \ - mergedefs.py \ - missingdefs.py \ diff --git a/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/files/pygobject-2.18.0-cross-generate-constants.patch b/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/files/pygobject-2.18.0-cross-generate-constants.patch deleted file mode 100644 index a84dd9581e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/files/pygobject-2.18.0-cross-generate-constants.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -214,6 +214,20 @@ - - fi - -+dnl Get the host compiler if cross-compiling -+dnl -+AM_CONDITIONAL(CROSS_COMPILING, [ test $cross_compiling = yes ]) -+AC_MSG_CHECKING([for CC_FOR_BUILD]) -+if test "x${CC_FOR_BUILD+set}" != "xset" ; then -+ if test "x$cross_compiling" = "xyes" ; then -+ CC_FOR_BUILD=${CC_FOR_BUILD-gcc} -+ else -+ CC_FOR_BUILD=${CC} -+ fi -+fi -+AC_MSG_RESULT([$CC_FOR_BUILD]) -+AC_SUBST(CC_FOR_BUILD) -+ - AC_CONFIG_FILES( - Makefile - pygobject-2.0.pc ---- a/gobject/Makefile.am -+++ b/gobject/Makefile.am -@@ -71,6 +71,13 @@ - if PLATFORM_WIN32 - _gobject_la_CFLAGS += -DPLATFORM_WIN32 - endif -+ -+# Strip all the noise (system includes/etc...) before the main func -+generate-constants$(EXEEXT): generate-constants.c -+ printf '#include \nint main()' > generate-constants.pre.c -+ $(CC) $(generate_constants_CFLAGS) -E generate-constants.c | sed -e '1,/^int main/d' >> generate-constants.pre.c -+ $(CC_FOR_BUILD) -o $@ generate-constants.pre.c -+ rm -f generate-constants.pre.c diff --git a/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/files/pygobject-2.18.0-make_check.patch b/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/files/pygobject-2.18.0-make_check.patch deleted file mode 100644 index f351092b2f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/files/pygobject-2.18.0-make_check.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- tests/Makefile.am -+++ tests/Makefile.am -@@ -11,7 +11,7 @@ - test-thread.h \ - test-unknown.h - --noinst_LTLIBRARIES = testhelper.la -+check_LTLIBRARIES = testhelper.la - linked_LIBS = testhelper.la - - testhelper_la_LDFLAGS = -module -avoid-version -@@ -47,6 +47,7 @@ - cp $(top_srcdir)/gobject/*.py $(top_builddir)/gobject; \ - cp $(top_srcdir)/gio/*.py $(top_builddir)/gio; \ - fi -+ $(LN_S) .libs/testhelper.so testhelper.so - @$(PYTHON) $(srcdir)/runtests.py $(top_builddir) $(top_srcdir) - @if test "$(top_builddir)" != "$(top_srcdir)"; then \ - rm -f $(top_builddir)/glib/*.py; \ -@@ -58,8 +59,5 @@ - @rm -fr $(top_builddir)/gio/*.pyc - - --all: $(LTLIBRARIES:.la=.so) - clean-local: -- rm -f $(LTLIBRARIES:.la=.so) --.la.so: -- $(LN_S) .libs/$@ $@ || true -+ rm -f .libs/testhelper.so ---- tests/runtests.py -+++ tests/runtests.py -@@ -6,6 +6,9 @@ - - import common - -+# Some tests fail with translated messages. -+os.environ["LC_ALL"] = "C" -+ - program = None - if len(sys.argv) == 3: - buildDir = sys.argv[1] ---- tests/test_gio.py -+++ tests/test_gio.py -@@ -386,9 +386,10 @@ - - def testQueryWritableNamespaces(self): - infolist = self.file.query_writable_namespaces() -- for info in infolist: -- if info.name == "xattr": -- self.assertEqual(info.type, gio.FILE_ATTRIBUTE_TYPE_STRING) -+ if infolist: -+ for info in infolist: -+ if info.name == "xattr": -+ self.assertEqual(info.type, gio.FILE_ATTRIBUTE_TYPE_STRING) - - def testSetAttribute(self): - self._f.write("testing attributes") diff --git a/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/pygobject-2.18.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/pygobject-2.18.0-r1.ebuild deleted file mode 100644 index 4c753ea0cf..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-python/pygobject/pygobject-2.18.0-r1.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.18.0.ebuild,v 1.10 2009/08/19 16:30:10 jer Exp $ - -EAPI="3" -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" - -# 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 s390 sh sparc x86 ~x86-fbsd" -IUSE="doc examples libffi 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 ) - >=dev-util/pkgconfig-0.12" -RDEPEND="${COMMON_DEPEND} - !