Restrict pypy python ABI (bug #414587, thanks to Marien Zwart). Update to virtual/pkgconfig.

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

4 files changed, 15 insertions, 10 deletions

diff --git a/gnome-extra/libgsf/ChangeLog b/gnome-extra/libgsf/ChangeLog
index 9b5bc2feef20..63262cd198b9 100644
--- a/gnome-extra/libgsf/ChangeLog
+++ b/gnome-extra/libgsf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/libgsf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.197 2012/04/29 18:58:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.198 2012/05/05 02:16:32 tetromino Exp $
+
+  05 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  libgsf-1.14.21.ebuild, libgsf-1.14.22.ebuild, libgsf-1.14.23.ebuild:
+  Restrict pypy python ABI (bug #414587, thanks to Marien Zwart). Update to
+  virtual/pkgconfig.
 
   29 Apr 2012; Pacho Ramos <pacho@gentoo.org>
   +files/libgsf-1.14.23-clone-identifier.patch, libgsf-1.14.23.ebuild:
diff --git a/gnome-extra/libgsf/libgsf-1.14.21.ebuild b/gnome-extra/libgsf/libgsf-1.14.21.ebuild
index 4db5f6817fc2..414c70a34e74 100644
--- a/gnome-extra/libgsf/libgsf-1.14.21.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.21.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.21.ebuild,v 1.9 2012/02/29 06:14:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.21.ebuild,v 1.10 2012/05/05 02:16:32 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.6"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45] 3.* *-jython"
+RESTRICT_PYTHON_ABIS="2.[45] 3.* *-jython *-pypy-*"
 
 inherit autotools eutils gnome2 python multilib
 
@@ -34,9 +34,9 @@ RDEPEND="
 	thumbnail? ( >=gnome-base/gconf-2:2 )"
 
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
 	>=dev-util/intltool-0.35.0
 	dev-util/gtk-doc-am
+	virtual/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1 )"
 
 PDEPEND="gnome? ( || (
diff --git a/gnome-extra/libgsf/libgsf-1.14.22.ebuild b/gnome-extra/libgsf/libgsf-1.14.22.ebuild
index 1d8397676faf..9de430de3a5a 100644
--- a/gnome-extra/libgsf/libgsf-1.14.22.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.22.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.22.ebuild,v 1.5 2012/04/29 15:52:13 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.22.ebuild,v 1.6 2012/05/05 02:16:32 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.6"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45] 3.* *-jython"
+RESTRICT_PYTHON_ABIS="2.[45] 3.* *-jython *-pypy-*"
 
 inherit autotools eutils gnome2 python multilib
 
@@ -29,9 +29,9 @@ RDEPEND=">=dev-libs/glib-2.16:2
 		>=dev-python/pygtk-2.10:2 )"
 
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
 	>=dev-util/intltool-0.35.0
 	dev-util/gtk-doc-am
+	virtual/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1 )"
 
 pkg_setup() {
diff --git a/gnome-extra/libgsf/libgsf-1.14.23.ebuild b/gnome-extra/libgsf/libgsf-1.14.23.ebuild
index 2af6582e914a..f9010cf3aa98 100644
--- a/gnome-extra/libgsf/libgsf-1.14.23.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.23.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.23.ebuild,v 1.2 2012/04/29 18:58:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.23.ebuild,v 1.3 2012/05/05 02:16:32 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.6"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45] 3.* *-jython"
+RESTRICT_PYTHON_ABIS="2.[45] 3.* *-jython *-pypy-*"
 
 inherit autotools eutils gnome2 python multilib
 
@@ -30,10 +30,10 @@ RDEPEND=">=dev-libs/glib-2.26:2
 		>=dev-python/pygtk-2.10:2 )"
 
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
 	>=dev-util/intltool-0.35.0
 	dev-util/gtk-doc-am
 	dev-libs/gobject-introspection-common
+	virtual/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1 )"
 
 pkg_setup() {