Fixes for PYTHOON ABI, #316251

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 39 insertions, 11 deletions

diff --git a/sci-visualization/gwyddion/ChangeLog b/sci-visualization/gwyddion/ChangeLog
index d789fd12a58d..20a4e81439f8 100644
--- a/sci-visualization/gwyddion/ChangeLog
+++ b/sci-visualization/gwyddion/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/gwyddion
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/ChangeLog,v 1.20 2009/12/18 03:05:13 markusle Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/ChangeLog,v 1.21 2010/05/21 09:29:35 jlec Exp $
+
+  21 May 2010; Justin Lecher <jlec@gentoo.org> gwyddion-2.18.ebuild,
+  gwyddion-2.19.ebuild:
+  Fixes for PYTHOON ABI, #316251
 
 *gwyddion-2.19 (18 Dec 2009)
 
diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest
index 879b301bfe99..6760668c11a2 100644
--- a/sci-visualization/gwyddion/Manifest
+++ b/sci-visualization/gwyddion/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST gwyddion-2.10.tar.bz2 2425036 RMD160 a4c32fefe9c31c1aee9169cad6399f25ec3bbff6 SHA1 186d0cc03edefd807b33efdbb6d59cc7f98fdad6 SHA256 90bde6f10e38c563886251984c60d32155119601e400f97a0cd59b7378a740eb
 DIST gwyddion-2.18.tar.bz2 3213859 RMD160 d6d7d38faf3c461ec500a679491f9630eb0f804b SHA1 4f692579090eada0aab47fcdd775d350f8e25f07 SHA256 8bd9ebb62cdae3c200c504893c52840135bb7c7d61d397e163bcda622aed01ec
 DIST gwyddion-2.19.tar.bz2 3250383 RMD160 b28886d386bab03c5d72556680ac01dbdd5031f3 SHA1 a0761c807590e437a92b4160f3bbeb016f4d3f7e SHA256 87efdc05dccfe53f01764b16766077c14ad64a756885545940b50d5f6dbf442e
 EBUILD gwyddion-2.10.ebuild 1142 RMD160 163e3061b6c11d511a891ca50df6b7815c254f00 SHA1 d9836a55080c426fc5e56ff6aac46788c90533bf SHA256 d3960aecf18c07f44835a7413d946c25d532192ce62079f0272d8ac4ab7f02d2
-EBUILD gwyddion-2.18.ebuild 1803 RMD160 bbd2f5276944c020d7f7a848d1990e09841830be SHA1 a5b8e47d72d2856a64fece4a04943f331e06b68d SHA256 765e932f038f30c54f00fbc333e20fffe0343c1cff9785dda196b54086af5974
-EBUILD gwyddion-2.19.ebuild 1803 RMD160 66b81cf891ef9dacedccdbfcd44307a21258c585 SHA1 dff5fa765cccdf707d4b0c24a3f1ecf1ecdcee71 SHA256 18357ea931a8a3a5ed3145b135f921090ca639f961b20e04f7eda356603e974d
-MISC ChangeLog 3635 RMD160 ecd1d7281ffdf8bb5070c5b348b10a89c7da75d2 SHA1 33d324b696d3d3a7cbd0cb5833fe69c6e1520158 SHA256 8a8a23f4fe62889ca8e6ff96f78ad6564c80dd41295abe8869f54e97c9677e5e
+EBUILD gwyddion-2.18.ebuild 1894 RMD160 3fa80289ce1b04e6ce00c653d439a80dad7c7c95 SHA1 ff300d406f2f78d46e2301f78de7ddb3e6ecb4b8 SHA256 8a6f75a01c3845b43e72aa0d975116ef46024ad8bfaec0bcb8e189d610631311
+EBUILD gwyddion-2.19.ebuild 1894 RMD160 29fa4467999fdb15eeac0b943f6fb565be8652a1 SHA1 fbb1b5af1decb4da5b37decb511c78a5c5946088 SHA256 0e7205dce25df607a31173a826916e08bcb048d6e1d1528189ba0722f96e7450
+MISC ChangeLog 3758 RMD160 936d1adf54e1d6a1cdd193fc0911bbf523ff7db1 SHA1 634bdf7365eaafb30e7656c52fd1cc6761210960 SHA256 d43ef429fbf3d61326c300337e9b66bc72f801e06fb0be76c89e05c9da4cb10a
 MISC metadata.xml 665 RMD160 d379af16b892718bf0542efc881de7585183f3a9 SHA1 6d0355e6952c3ef0ae0f91eb31064e62c152ce5e SHA256 15f2e0a0b492c34081f99fe145fd97d8070f683199b09047864e583325ccbff3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkv2UoQACgkQgAnW8HDreRZPhQCgp9mgdXul94As/rA4k88leCCE
+JrMAoKHPRWPkoj1Z4Vy9JIlvZEBUWfU6
+=GO9g
+-----END PGP SIGNATURE-----
diff --git a/sci-visualization/gwyddion/gwyddion-2.18.ebuild b/sci-visualization/gwyddion/gwyddion-2.18.ebuild
index db6fc86e66f3..39f431045a97 100644
--- a/sci-visualization/gwyddion/gwyddion-2.18.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.18.ebuild
@@ -1,9 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.18.ebuild,v 1.1 2009/11/12 21:50:23 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.18.ebuild,v 1.2 2010/05/21 09:29:35 jlec Exp $
 
 EAPI=2
-inherit fdo-mime gnome2-utils
+
+PYTHON_DEPEND="python? 2"
+
+inherit fdo-mime gnome2-utils python
 
 DESCRIPTION="A software framework for SPM data analysis"
 HOMEPAGE="http://gwyddion.net/"
@@ -32,6 +35,10 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( dev-util/gtk-doc )"
 
+pkg_setup() {
+	use python && python_set_active_version 2
+}
+
 src_configure() {
 	econf \
 		--disable-desktop-file-update \
diff --git a/sci-visualization/gwyddion/gwyddion-2.19.ebuild b/sci-visualization/gwyddion/gwyddion-2.19.ebuild
index eb0c6c513c24..f21d27081719 100644
--- a/sci-visualization/gwyddion/gwyddion-2.19.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.19.ebuild
@@ -1,9 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.19.ebuild,v 1.1 2009/12/18 03:05:13 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.19.ebuild,v 1.2 2010/05/21 09:29:35 jlec Exp $
 
 EAPI=2
-inherit fdo-mime gnome2-utils
+
+PYTHON_DEPEND="python? 2"
+
+inherit fdo-mime gnome2-utils python
 
 DESCRIPTION="A software framework for SPM data analysis"
 HOMEPAGE="http://gwyddion.net/"
@@ -32,6 +35,10 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( dev-util/gtk-doc )"
 
+pkg_setup() {
+	use python && python_set_active_version 2
+}
+
 src_configure() {
 	econf \
 		--disable-desktop-file-update \