Version bump for Gnome 3.14. Clean up old revisions.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key C6085806)

6 files changed, 15 insertions, 328 deletions

diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog
index b539d7d4cb49..1a3b199cc9f9 100644
--- a/dev-python/pygobject/ChangeLog
+++ b/dev-python/pygobject/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/pygobject
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.262 2014/10/11 11:54:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.263 2014/12/22 18:43:17 eva Exp $
+
+*pygobject-3.14.0 (22 Dec 2014)
+
+  22 Dec 2014; Gilles Dartiguelongue <eva@gentoo.org> -pygobject-3.10.2.ebuild,
+  -pygobject-3.12.1.ebuild, -pygobject-3.13.3.ebuild, +pygobject-3.14.0.ebuild,
+  -files/pygobject-2.28.3-disable-failing-tests.patch,
+  -files/pygobject-2.90.1-make_check.patch:
+  Version bump for Gnome 3.14. Clean up old revisions.
 
   11 Oct 2014; Markus Meier <maekke@gentoo.org> pygobject-3.12.2.ebuild:
   arm stable, bug #512012
diff --git a/dev-python/pygobject/files/pygobject-2.28.3-disable-failing-tests.patch b/dev-python/pygobject/files/pygobject-2.28.3-disable-failing-tests.patch
deleted file mode 100644
index 86a66ddffbc1..000000000000
--- a/dev-python/pygobject/files/pygobject-2.28.3-disable-failing-tests.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From df94ec3795c1efaf3eab9207c957e3ea5744971b Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Fri, 8 Apr 2011 16:23:37 +0200
-Subject: [PATCH 4/4] Disable tests that fail
-
----
- tests/test_gio.py       |    4 ++--
- tests/test_overrides.py |    4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tests/test_gio.py b/tests/test_gio.py
-index e14eddf..9c645f5 100644
---- a/tests/test_gio.py
-+++ b/tests/test_gio.py
-@@ -1007,7 +1007,7 @@ class TestVfs(unittest.TestCase):
- class TestVolume(unittest.TestCase):
-     def setUp(self):
-         self.monitor = gio.volume_monitor_get()
--    
-+"""    
-     def testVolumeEnumerate(self):
-         volumes = self.monitor.get_volumes()
-         self.failUnless(isinstance(volumes, list))
-@@ -1018,7 +1018,7 @@ class TestVolume(unittest.TestCase):
-                 for id in ids:
-                     if id is not None:
-                         self.failUnless(isinstance(id, str))
--
-+"""
- class TestFileInputStream(unittest.TestCase):
-     def setUp(self):
-         self._f = open("file.txt", "w+")
-diff --git a/tests/test_overrides.py b/tests/test_overrides.py
-index 3421c3a..9de1a7f 100644
---- a/tests/test_overrides.py
-+++ b/tests/test_overrides.py
-@@ -322,13 +322,13 @@ class TestPango(unittest.TestCase):
-         desc = Pango.FontDescription('monospace')
-         self.assertEquals(desc.get_family(), 'monospace')
-         self.assertEquals(desc.get_variant(), Pango.Variant.NORMAL)
--
-+"""
-     def test_layout(self):
-         self.assertRaises(TypeError, Pango.Layout)
-         context = Pango.Context()
-         layout = Pango.Layout(context)
-         self.assertEquals(layout.get_context(), context)
--
-+"""
- class TestGdk(unittest.TestCase):
- 
-     def test_constructor(self):
--- 
-1.7.4.1
-
diff --git a/dev-python/pygobject/files/pygobject-2.90.1-make_check.patch b/dev-python/pygobject/files/pygobject-2.90.1-make_check.patch
deleted file mode 100644
index c2e80d69a9e5..000000000000
--- a/dev-python/pygobject/files/pygobject-2.90.1-make_check.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From b5c4b8b97a1ccb9a4c63ab726ea9c84d81ef51ca Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Fri, 5 Nov 2010 23:39:08 +0100
-Subject: [PATCH 2/3] Do not build tests unless needed
-
-[Alexandre Rostovtsev <tetromino@gmail.com>: port to 2.90.1]
----
- tests/Makefile.am |   10 ++++------
- tests/runtests.py |    3 +++
- 2 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 4ec6477..c52cb9d 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -1,5 +1,5 @@
- CLEANFILES =
--noinst_LTLIBRARIES = libregress.la libgimarshallingtests.la
-+check_LTLIBRARIES = libregress.la libgimarshallingtests.la
- 
- nodist_libregress_la_SOURCES = $(GI_DATADIR)/tests/regress.c $(GI_DATADIR)/tests/regress.h
- libregress_la_CFLAGS = $(GIO_CFLAGS) $(PYCAIRO_CFLAGS)
-@@ -43,7 +43,7 @@ gschemas.compiled: org.gnome.test.gschema.xml
- 
- CLEANFILES += Regress-1.0.gir Regress-1.0.typelib GIMarshallingTests-1.0.gir GIMarshallingTests-1.0.typelib gschemas.compiled
- 
--noinst_LTLIBRARIES += testhelper.la
-+check_LTLIBRARIES += testhelper.la
- 
- testhelper_la_CFLAGS = -I$(top_srcdir)/gi/_gobject -I$(top_srcdir)/gi/_glib $(PYTHON_INCLUDES) $(GLIB_CFLAGS)
- testhelper_la_LDFLAGS = -module -avoid-version
-@@ -63,8 +63,6 @@ testhelper.la: $(testhelper_la_OBJECTS) $(testhelper_la_DEPENDENCIES)
- 	test -L $@ || $(LN_S) .libs/$@ $@
- 
- 
--all: $(LTLIBRARIES:.la=.so)
--
- TEST_FILES_STATIC = \
- 	test_gobject.py \
- 	test_interface.py \
-@@ -97,7 +95,7 @@ EXTRA_DIST = \
- EXTRA_DIST += $(TEST_FILES_STATIC) $(TEST_FILES_GI)
- 
- clean-local:
--	rm -f $(LTLIBRARIES:.la=.so) file.txt~
-+	rm -f $(check_LTLIBRARIES:.la=.so) file.txt~
- 
- DBUS_LAUNCH=$(shell which dbus-launch)
- RUN_TESTS_ENV_VARS= \
-@@ -108,7 +106,7 @@ RUN_TESTS_ENV_VARS= \
- 	TESTS_BUILDDIR=$(builddir)
- RUN_TESTS_LAUNCH=$(RUN_TESTS_ENV_VARS) $(DBUS_LAUNCH) $(EXEC_NAME) $(PYTHON) $(srcdir)/runtests.py
- 
--check-local: $(LTLIBRARIES:.la=.so) Regress-1.0.typelib GIMarshallingTests-1.0.typelib gschemas.compiled
-+check-local: $(check_LTLIBRARIES:.la=.so) Regress-1.0.typelib GIMarshallingTests-1.0.typelib gschemas.compiled
- 	TEST_FILES="$(TEST_FILES_STATIC)" $(RUN_TESTS_LAUNCH)
- 	TEST_FILES="$(TEST_FILES_GI)" $(RUN_TESTS_LAUNCH)
- 
-diff --git a/tests/runtests.py b/tests/runtests.py
-index 2a8ecf4..dc9fb03 100755
---- a/tests/runtests.py
-+++ b/tests/runtests.py
-@@ -7,6 +7,9 @@ import sys
- 
- import unittest
- 
-+# Some tests fail with translated messages.
-+os.environ["LC_ALL"] = "C"
-+
- if '--help' in sys.argv:
-     print("Usage: ./runtests.py <testfiles>")
-     sys.exit(0)
diff --git a/dev-python/pygobject/pygobject-3.10.2.ebuild b/dev-python/pygobject/pygobject-3.10.2.ebuild
deleted file mode 100644
index 404f7c34b155..000000000000
--- a/dev-python/pygobject/pygobject-3.10.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.10.2.ebuild,v 1.15 2014/07/06 12:48:44 mgorny Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
-
-inherit gnome2 python-r1 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 ~s390 ~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"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	test? ( cairo )
-"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.35.9:2
-	>=dev-libs/gobject-introspection-1.35.9
-	virtual/libffi:=
-	cairo? (
-		>=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}]
-		x11-libs/cairo )
-	${PYTHON_DEPS}
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	cairo? ( x11-libs/cairo[glib] )
-	test? (
-		dev-libs/atk[introspection]
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc
-		x11-libs/cairo[glib]
-		x11-libs/gdk-pixbuf:2[introspection]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection] )
-"
-# gnome-base/gnome-common required by eautoreconf
-
-# 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]"
-
-src_prepare() {
-	gnome2_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	# 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_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-	export GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-
-	testing() {
-		export XDG_CACHE_HOME="${T}/${EPYTHON}"
-		run_in_build_dir Xemake check
-		unset XDG_CACHE_HOME
-	}
-	python_foreach_impl testing
-	unset GIO_USE_VFS
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog* NEWS README"
-
-	python_foreach_impl run_in_build_dir gnome2_src_install
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/pygobject/pygobject-3.13.3.ebuild b/dev-python/pygobject/pygobject-3.13.3.ebuild
deleted file mode 100644
index 0d839cf27048..000000000000
--- a/dev-python/pygobject/pygobject-3.13.3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.13.3.ebuild,v 1.1 2014/07/23 01:44:22 idella4 Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
-
-inherit gnome2 python-r1 virtualx
-
-DESCRIPTION="GLib's GObject library bindings for Python"
-HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	test? ( cairo )"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-1.38
-	virtual/libffi:=
-	cairo? (
-		>=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}]
-		x11-libs/cairo )
-	${PYTHON_DEPS}"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	cairo? ( x11-libs/cairo[glib] )
-	test? (
-		dev-libs/atk[introspection]
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc
-		x11-libs/cairo[glib]
-		x11-libs/gdk-pixbuf:2[introspection]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection] )"
-# gnome-base/gnome-common required by eautoreconf
-# 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]"
-
-src_prepare() {
-	gnome2_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	# 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 \
-			$(use_enable cairo) \
-			$(use_enable threads thread)
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-	export GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-
-	testing() {
-		export XDG_CACHE_HOME="${T}/${EPYTHON}"
-		run_in_build_dir Xemake check
-		unset XDG_CACHE_HOME
-	}
-	python_foreach_impl testing
-	unset GIO_USE_VFS
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog* NEWS README"
-
-	python_foreach_impl run_in_build_dir gnome2_src_install
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/pygobject/pygobject-3.12.1.ebuild b/dev-python/pygobject/pygobject-3.14.0.ebuild
index 85354c80f5c2..96f692a1a7fe 100644
--- a/dev-python/pygobject/pygobject-3.12.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.14.0.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.12.1.ebuild,v 1.3 2014/07/06 12:48:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.14.0.ebuild,v 1.1 2014/12/22 18:43:17 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit gnome2 python-r1 virtualx
 
 DESCRIPTION="GLib's GObject library bindings for Python"
-HOMEPAGE="http://www.pygtk.org/"
+HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
@@ -24,7 +24,7 @@ REQUIRED_USE="
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-1.38
+	>=dev-libs/gobject-introspection-1.39
 	virtual/libffi:=
 	cairo? (
 		>=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}]
@@ -51,7 +51,8 @@ DEPEND="${COMMON_DEPEND}
 # slot 3 will collide with them.
 RDEPEND="${COMMON_DEPEND}
 	!<dev-python/pygtk-2.13
-	!<dev-python/pygobject-2.28.6-r50:2[introspection]"
+	!<dev-python/pygobject-2.28.6-r50:2[introspection]
+"
 
 src_prepare() {
 	gnome2_src_prepare
@@ -64,7 +65,6 @@ src_configure() {
 	# 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)
 }