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

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

5 files changed, 27 insertions, 18 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/Manifest b/gnome-extra/libgsf/Manifest
index 4aa8f17085c4..d0ad2f49ebe6 100644
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -9,15 +9,19 @@ DIST gnome-mplayer-0.9.6-gconf-2.m4.tgz 763 RMD160 cdf17b11dea5da26cc9a17fff9534
 DIST libgsf-1.14.21.tar.bz2 597463 RMD160 168c0200fde9792bd8c7937d1c83f3af9c8c0193 SHA1 17981f238f1f8dddb7af01c161bd6a1c4d5e85d2 SHA256 eef0a9d6eca4e6af6c16b208947e3c958c428b94d22792bdd0b80c08a4b301db
 DIST libgsf-1.14.22.tar.xz 506188 RMD160 a47fa284ace94ead51f2130cba31d8962d554f3b SHA1 ca1c5aa92a840e322d7cafd9f2dede3d38a69660 SHA256 a5f23be3cab72abd91bb443a32f41d6adc73250285b53787460750b6d60b783f
 DIST libgsf-1.14.23.tar.xz 515136 RMD160 443d250b2f498c771c972851824cc717b7b29c62 SHA1 4f19933342b2d42246200e3522b0797a032fdf19 SHA256 bfc1c6178f5319d5e6d854c380ce26542f9a103a5ff31c9d25a834e0be52fb17
-EBUILD libgsf-1.14.21.ebuild 3100 RMD160 8f4add9dac2bca2095d0d8c829d55027c4853d0a SHA1 05a82c24f2823240a97f01c9eec52d13a007e79b SHA256 3c1520434c228de353a2127c8438e52c94bcea2ebe0becac5694e8f8dff9da18
-EBUILD libgsf-1.14.22.ebuild 2786 RMD160 47f2221cf5c063d1aa61bc67dc0a6b1c1afb9636 SHA1 6cd0a11416bbcae733292a032620ba08640bfad6 SHA256 7a866856b0efa083471d511740b2d96f680ed8785e37c55a18edf36a1b6b0fe5
-EBUILD libgsf-1.14.23.ebuild 2993 RMD160 0db41a0bed220185426a22006929dbd62f3ed095 SHA1 66d004512cce822778a08517ca1f68ff1eb5938b SHA256 53bcb6e50c893b16b59c387f4650da92fb508c2c36adf7b9e0cd31b9b9213800
-MISC ChangeLog 24897 RMD160 45bec95048d4f3352bf27bb71b4a15580014530e SHA1 dd512ccce93e159c8e4dc183f3ba902e8c0f48b0 SHA256 e8d8edaa1125cd1696920b2d00f93088f13250d981777bfba1bb0a556e4fffb0
+EBUILD libgsf-1.14.21.ebuild 3109 RMD160 7584949c9b9a034bd2246529e8dfcb346efb58c8 SHA1 95ab880389cb60da5f5c4197dcf7ca0d4c7c363c SHA256 250dd2d22a2c0878692c7ffbfd847fab55aef6293a034a8de86ea7e89d4d99d6
+EBUILD libgsf-1.14.22.ebuild 2797 RMD160 06962eba427d0616cbbe7ad1602e0e666c858eff SHA1 12599103cceaf4d07cd263db45ba735d11f983bf SHA256 4fb0287d5a5736ba217fa2efd7d403dfe42ec13024ffc2ac065bc756a34b7db3
+EBUILD libgsf-1.14.23.ebuild 3005 RMD160 eb66a6eeb16af8da5fdcaa748c6c5a617591ef45 SHA1 30f52fe3d40418aa0cf8a08aa1b16fd823472ddc SHA256 cf6c2ac158c79e76a5f4a3f0986724b8066e79dc4197c9bd31d3dd8e13ec466a
+MISC ChangeLog 25129 RMD160 77da80b53c09034c4973e2da30f8c01fd83c8ded SHA1 e71e4be8e1546aa6671833135d8b97da8aca8bc8 SHA256 b4753a3bf033ed89c3d544d42dfbf0e4440d0d83fd41ba31ad9ba07f536135ff
 MISC metadata.xml 403 RMD160 fd3cb8449a769b9561ed0f6dbda866e776be7a0e SHA1 3d88da1800401c14140410e95b3c597904ab8330 SHA256 1be1454195dc641b968829a70975fa8f9897199d72017a9964be954fe19e6552
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+dj0QACgkQCaWpQKGI+9QT7wCfdUSoB4/jSwr0ZrZqZe3wtkAN
-rWwAnjqEQGxX2I+ZNJedppKp+P7Qski1
-=STNf
+iQEcBAEBAgAGBQJPpI2GAAoJEJ0WA1zPCt1hzpMIAJ9wdjBtIYxMBb14bNy+wN0e
+ZvtyxFSdJhEEMP6GAcyLHd7JA1n14tZ412HJ8kAGOyMOVMlmAjBFYR2g1o7vCSfN
+BhF5UnSqDjBDpX3alrWeG+gCTSqZzl8wzK/VoxbgN3ZptC62a49mpSEo3HaShN6o
+faiwKYRxWiBUy2h0pxo7GtyEDE+CFCub5SROUtGPwh8Fhq/+ab6byb9iES3mbopk
+U8KXEBZxI49zsreTz6hC0yXakpE3oGv54a/sVW6349ysj+Fy8Aj/4wu+DGdFqGT0
+vEiJFrDaRTu7eeWZ7mSunjkc9lJvWhK9VcfKQgyyNH5RzYjJXaaiVSjqc4yLx4Y=
+=wZo/
 -----END PGP SIGNATURE-----
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() {