Fix dependencies. Use python_get_sitedir(). Patch by Arfrever.

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

4 files changed, 40 insertions, 16 deletions

diff --git a/dev-python/logilab-common/Manifest b/dev-python/logilab-common/Manifest
index ef312c5ce9d0..010e615cfd88 100644
--- a/dev-python/logilab-common/Manifest
+++ b/dev-python/logilab-common/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST logilab-common-0.55.2.tar.gz 182524 RMD160 1d9f751c60ac020c913f097b1c032d904b39ef87 SHA1 996531afeb306317fa4b10a22c6f6ec3336e43c1 SHA256 3242039f4e0732b510e03ef638f1ea43e65ddb7154164a9bda02514ee514f99a
 DIST logilab-common-0.57.1.tar.gz 181975 RMD160 30bd73381e292b1c8e5b809de2ca8928918b107f SHA1 4538448dec42ea7dc40ff24c9066d187eab6f79c SHA256 102c4860cad1ffaee98e6746ad89de4e5c40b63a569d4e131379b84c4907ed0a
 EBUILD logilab-common-0.55.2.ebuild 2088 RMD160 7d363f6fe78f67eaaecc5729f2560fd10af9f81a SHA1 c1e1ffa83c17dc9283c493a114b942f6cdfe24f7 SHA256 cded24b316c00c7733c984549fd66afd36b08a7ba1726498c94db43a75219e9c
-EBUILD logilab-common-0.57.1.ebuild 2396 RMD160 dd5f67dc004277dbd5b7596166f4fb702a55b585 SHA1 acb19287987d97ac34eea06092472e519d7a8d1f SHA256 a3e9a3b7ad8c9c42430bc0e12a86754739bfb5f1157ff0c5ca9f2e53df345ca8
-MISC ChangeLog 15910 RMD160 8d843f1e50ca54b10e14b1c863859a861f8bdaa2 SHA1 09eb277e8d5a00911e2780a9b6253a90e58195e6 SHA256 e2cb163d51ed0c4463c535a7b9d1b68aa4ee2783a8549b51f538d7047d8224ec
+EBUILD logilab-common-0.57.1.ebuild 2092 RMD160 90460221e5c961c1b5a7e117b81aa20405a9579d SHA1 4fe686e3dda97b9d90f3dffd14c0f0f89a247e5b SHA256 a00ddc97bca9e528dfb5cdde5334252c404f8713b40a1416e54ad7cbd3e0c2c1
+MISC ChangeLog 16048 RMD160 67890f10508fc0b04a2924da4fcc20014bb89eff SHA1 22f46038cd3d39392a623228a0851c187694523c SHA256 b0c1bd5add50019a9fb51412d95b4e5922dde6a1811127c60f4108a5865be762
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk9es6kACgkQC77qH+pIQ6S42gD8CwyuDxWRi4ilGjZ9JRFZiPhz
+UQ7stYvzkY45HjncObcBAJXoUyOpsnhOw1nNuiJvctafLe3vJ+ALxa2sfCc+oFjB
+=ASYf
+-----END PGP SIGNATURE-----
diff --git a/dev-python/logilab-constraint/ChangeLog b/dev-python/logilab-constraint/ChangeLog
index e4da53acd7f5..98a89396c9d3 100644
--- a/dev-python/logilab-constraint/ChangeLog
+++ b/dev-python/logilab-constraint/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/logilab-constraint
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-constraint/ChangeLog,v 1.5 2012/03/12 07:20:30 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-constraint/ChangeLog,v 1.6 2012/03/13 02:38:20 floppym Exp $
+
+  13 Mar 2012; Mike Gilbert <floppym@gentoo.org>
+  logilab-constraint-0.4.0.ebuild:
+  Fix dependencies. Use python_get_sitedir(). Patch by Arfrever.
 
   12 Mar 2012; Patrick Lauer <patrick@gentoo.org>
   logilab-constraint-0.4.0.ebuild:
diff --git a/dev-python/logilab-constraint/Manifest b/dev-python/logilab-constraint/Manifest
index 2c111914c167..adf29357f507 100644
--- a/dev-python/logilab-constraint/Manifest
+++ b/dev-python/logilab-constraint/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST constraint-0.4.0.tar.gz 38297 RMD160 4dd688e2c354572493845684ec24be4592deb354 SHA1 d023717fbdaa1a43042786f6dbd1a893aac338a7 SHA256 bc09e4cc33c3d13a4dd0200bcb45daa4d1c4a7e8bfe47100b886a68bd4265034
-EBUILD logilab-constraint-0.4.0.ebuild 1430 RMD160 ecc5627e01157289e8342d90301e4a335401142c SHA1 73976da85472404eaff246b55cf73eeb008d3d77 SHA256 4e11919c10146425747c3770b80babe0f426ddf2a4e978d193ea21ae8b9ce909
-MISC ChangeLog 955 RMD160 b3683ea6bd19e10c88abd9f3898d6abeb021b909 SHA1 86da875aa2bd2c8a8cbb8c2305ace2eeac2c3145 SHA256 47af1ae6a54506301a485ca75033a59c085762f9270c86cee7e14c4db9f2135e
+EBUILD logilab-constraint-0.4.0.ebuild 1340 RMD160 3a0bdcd36e4bf2b79f96bb1794d7ac1447673c64 SHA1 d622f66110b86888e04b3eef31806969ea1bd33d SHA256 ae6665c9b523576ac4da58cd377dd6fed84866111a80e49c76248094a8a126bc
+MISC ChangeLog 1105 RMD160 c6e997f255798d9822ea937bd7577ca867f19cf9 SHA1 798099c3a5964b87c8aec47b0157077cfe4053ca SHA256 bf325336965c5cc2b396fb171c88acac2117ef2e67b5ea29b36077daa6fca8c3
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk9esyIACgkQC77qH+pIQ6SaBQD/XPvM2XOQ+k4fYEEsyB6CyXh+
+foZGZZE6mpzt5k48b88BAMUy+jAldkysn+zY9yGxnVskZe7jZMcCBzHvcKIRAJEN
+=rNDA
+-----END PGP SIGNATURE-----
diff --git a/dev-python/logilab-constraint/logilab-constraint-0.4.0.ebuild b/dev-python/logilab-constraint/logilab-constraint-0.4.0.ebuild
index 43913eeb5732..0b69113d6f16 100644
--- a/dev-python/logilab-constraint/logilab-constraint-0.4.0.ebuild
+++ b/dev-python/logilab-constraint/logilab-constraint-0.4.0.ebuild
@@ -1,11 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-constraint/logilab-constraint-0.4.0.ebuild,v 1.6 2012/03/12 07:20:30 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-constraint/logilab-constraint-0.4.0.ebuild,v 1.7 2012/03/13 02:38:20 floppym Exp $
 
-EAPI="2"
+EAPI="3"
+PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
-inherit distutils multilib
+inherit distutils
 
 MY_P="${P#logilab-}"
 DESCRIPTION="A finite domain constraints solver written in 100% pure Python"
@@ -20,19 +22,17 @@ IUSE="doc"
 DEPEND=""
 RDEPEND=">=dev-python/logilab-common-0.12.0"
 
-RESTRICT_PYTHON_ABIS="3*"
-
-PYTHON_MODNAME="logilab/constraint"
-
 DOCS="doc/CONTRIBUTORS"
+PYTHON_MODNAME="logilab/constraint"
 
 src_install() {
 	distutils_src_install
 
-	# Avoid conflict with dev-python/logilab-common.
-	rm -f "${D}"usr/$(get_libdir)/python*/site-packages/logilab/__init__.py || die
-	rm -f "${D}"usr/$(get_libdir)/pypy*/site-packages/logilab/__init__.py || die
-	rm -f "${D}"usr/$(get_libdir)/jython*/site-packages/logilab/__init__.py || die
+	delete_unneeded_files() {
+		# Avoid collisions with dev-python/logilab-common.
+		rm -f "${ED}$(python_get_sitedir)/logilab/__init__.py"
+	}
+	python_execute_function -q delete_unneeded_files
 
 	if use doc; then
 		dohtml doc/documentation.html