Fix problems resulting from earlier failing .

Package-Manager: portage-2.1.10.39/cvs/Linux x86_64

diff --git a/dev-python/pypy/ChangeLog b/dev-python/pypy/ChangeLog
index 9baff3af4c757f88afe3b8398a6009b540b3f3b3..caf2167836d94e19e6ee093a6e121356a872ac8f 100644 (file)
--- a/dev-python/pypy/ChangeLog
+++ b/dev-python/pypy/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pypy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.4 2011/11/30 08:57:27 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.5 2011/11/30 11:42:55 djc Exp $
+
+  30 Nov 2011; Dirkjan Ochtman <djc@gentoo.org> pypy-1.7.ebuild:
+  Fix problems resulting from earlier failing ${S}.
 
   30 Nov 2011; Dirkjan Ochtman <djc@gentoo.org> -files/1.5-patches.patch,
   -pypy-1.5.ebuild:

diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index cbbe29c9260fdb5c7a596ce642fe901b67a9f7e1..31b4aef975e9f15109f20542d72f30a495155f59 100644 (file)
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -4,13 +4,13 @@ Hash: SHA512
 AUX 1.7-patches.patch 1842 RMD160 ee42ff2383477353cf0230a8567b22d87a4b4d56 SHA1 4fa9f1ac91b3b5466e21d8d58dbc9f09b1fd90dd SHA256 1417373a73221b65dcccdee1539a7a11018384ea3f7908cacc2e07b525ebe291
 AUX 1.7-scripts-location.patch 412 RMD160 811c3cc38370f97274f8ec5cc36f34b3e79dae56 SHA1 c03fa9679443ed9461829745f5bb00cfecd3eb22 SHA256 abc39fbbf69d1d6b478a4a16626950e8e0b607fb05c6e1e1c10618c59fccdda9
 DIST release-1.7.tar.bz2 14842336 RMD160 f94199989fc7eab30d256b341367e82049b84745 SHA1 db16d92db6b76960b76328f821c8c50a6d66864e SHA256 2e0884f4696cc8617be73cb8af8da063073d685b3d3e5de3366bfae4d33fac16
-EBUILD pypy-1.7.ebuild 2263 RMD160 a508d311d32092e74297c1ac5bd92694c4047694 SHA1 5a1222e7317fba9eb4d6e34f1ced003efc8ea303 SHA256 292ce9f325b9eae96922f8eb6be8aba7e10122f7163c7e1ade4688ef3f189b4d
-MISC ChangeLog 815 RMD160 46615ba084bad93509ebeaf8b5bda04321117594 SHA1 47c761b199e0e3f393e271f6c51ba00843b4e2ff SHA256 52749a88be42c950671bf271e4ad82db9a39309818133457acbccc92a0765029
+EBUILD pypy-1.7.ebuild 2215 RMD160 21f6c4424c942750d5ddb0f2dfa5148274528b28 SHA1 4f9d5aeed25b09675f54850fbedab3f11dc13e38 SHA256 07b2c90bdf76c234cdf3c135352df4d5a72791fab610effed3fc2c7aa777d471
+MISC ChangeLog 933 RMD160 c7479504860718247e2ae1979bef3ad049ec8fc6 SHA1 35cb5064752e76b3b952c5693cc46aaac649fa9b SHA256 2e2db8c12dc664cc2885f92099f5b12d07d7ed00e5c78c420e2ad39488e9af43
 MISC metadata.xml 344 RMD160 4bd17fc59db518f8bc618d4dea646125bac847e8 SHA1 e4e25b65789bae8aaeb01ee897ca594d935287d6 SHA256 ba7629d47b3bf832a55ad33e58d361492b2f366a5d3a948f981862bdd1d54d73
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk7V8B0ACgkQxeMuLWsGW/s6PgCgijRA82cEWvEno+eBIC2CmqQC
-YeEAn23a099zO4H1Uqsof9nfPVPRY8EI
-=J2HR
+iEYEAREKAAYFAk7WFsgACgkQxeMuLWsGW/ssEACeNMoZqrZupFTfimtCvBqyfaTU
+fwQAoK//huika/TonsDp4eT+jlJbZgeU
+=WI/d
 -----END PGP SIGNATURE-----

diff --git a/dev-python/pypy/pypy-1.7.ebuild b/dev-python/pypy/pypy-1.7.ebuild
index 58ec49661cbe1f7967546aef4d53972c663bdc62..ec49a0152ef07813d772f6cacf3f607871941ce7 100644 (file)
--- a/dev-python/pypy/pypy-1.7.ebuild
+++ b/dev-python/pypy/pypy-1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.7.ebuild,v 1.1 2011/11/30 08:49:18 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.7.ebuild,v 1.2 2011/11/30 11:42:55 djc Exp $
 
 EAPI="3"
 
@@ -52,7 +52,7 @@ src_compile() {
                conf+=" --stackless"
        fi
 
-       conf+=" ./pypy-pypy-release-${PV}/pypy/translator/goal/targetpypystandalone.py"
+       conf+=" ./pypy/translator/goal/targetpypystandalone.py"
        # Avoid linking against libraries disabled by use flags
        optional_use=("bzip2" "ncurses" "xml" "ssl")
        optional_mod=("bz2" "_minimal_curses" "pyexpat" "_ssl")
@@ -64,7 +64,7 @@ src_compile() {
                fi
        done
 
-       translate_cmd="$(PYTHON -2) ./pypy-pypy-release-${PV}/pypy/translator/goal/translate.py $conf"
+       translate_cmd="$(PYTHON -2) ./pypy/translator/goal/translate.py $conf"
        echo ${_BOLD}"${translate_cmd}"${_NORMAL}
        ${translate_cmd} || die "compile error"
 }