diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2011-04-13 15:09:24 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2011-04-13 15:09:24 +0000 |
| commit | 2a5dd63ae1d13c55aa70736c3f429d7ff6ed74be (patch) | |
| tree | d4f896217a37475a0adaa53d25b7bd0a8f3b0f8f /dev-lang | |
| parent | Don't PROVIDE virtual/man, it is a new-style virtual now. Bug 358839. (diff) | |
| download | historical-2a5dd63ae1d13c55aa70736c3f429d7ff6ed74be.tar.gz historical-2a5dd63ae1d13c55aa70736c3f429d7ff6ed74be.tar.bz2 historical-2a5dd63ae1d13c55aa70736c3f429d7ff6ed74be.zip | |
Fix calculation of EROOT.
Package-Manager: portage-2.2.0_alpha29_p18/cvs/Linux x86_64
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/python/Manifest | 20 | ||||
| -rw-r--r-- | dev-lang/python/python-2.6.6-r2.ebuild | 4 | ||||
| -rw-r--r-- | dev-lang/python/python-2.7.1-r1.ebuild | 4 |
3 files changed, 19 insertions, 9 deletions
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index c996d102ec3f..bed41264b893 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -29,8 +29,8 @@ EBUILD python-2.4.6.ebuild 9220 RMD160 1d8d11abfdec1a1fe9aa1f2a156e88aa5b2ccd8c EBUILD python-2.5.4-r4.ebuild 9570 RMD160 2728a627e55360fefeabd135740e64214522f94a SHA1 00d1bf2ae833c7936ab6b55b3850d17e0a69b4b1 SHA256 4b2dc5a62b416f13d207994066faba6d32727dba731cb5cee2c88e82b0098f7b EBUILD python-2.6.5-r3.ebuild 9366 RMD160 3a22472409d3121e56b833d5ddb506fe3a5466d3 SHA1 4028e186dda3236c4d3d64afdd420397f03bb6b6 SHA256 5524ed7a4caf7146caecf506e5548557dcb35b2cd37ad4abc833fac64b3c9cac EBUILD python-2.6.6-r1.ebuild 9547 RMD160 c0d9b794307c5cfd9f4196afc0a2c7f1c8afffdf SHA1 d910e739e5480f1628bd94bf85e4ac150fe87b7d SHA256 9f82696fd40b199b8e2851c98eae667f0691ad88a0743bfa472ff94c401aed85 -EBUILD python-2.6.6-r2.ebuild 10414 RMD160 47fcb0bbb7bd7c420d3ae6eaec7d055e43914441 SHA1 dc075ef98d7ffed53387d380f0ec18e958f679ca SHA256 bceff90a6b2010ab84d9fc53b64b536039086cfb0d5dd9bb40ef52767a595a8b -EBUILD python-2.7.1-r1.ebuild 10994 RMD160 3d61dbf6452dcfd75f2005c758901848c2f7f837 SHA1 35e17088d388ec27136857c931b5353a95fbca2a SHA256 bd5360efc98a95d11654bb35e96be6cb76f24e853340b3b0fee9b51a0e3ed631 +EBUILD python-2.6.6-r2.ebuild 10456 RMD160 02a12fb212d839c28a6ff3fd3f81e5cfc14156e4 SHA1 7717ff2bda22ce5ad461b7ea9a3f9c7824215c22 SHA256 1b9d4499b96cbdf103b28d45ffca871494c5d587810eda87bfe910fe0248773e +EBUILD python-2.7.1-r1.ebuild 11036 RMD160 bcaee9cb552d301aa98ab31409f50bc85b3d3504 SHA1 92a1a73302d37af3143e35a0fb41d47664ecdd32 SHA256 aba9a88ee98f3620dc112a768e20e0de628d3263bad6cf6dd673c88f14127d37 EBUILD python-3.1.2-r4.ebuild 9457 RMD160 ce8a7df4650c8474c79e5d53dc4c0fff729584b6 SHA1 925922c06f195615f6ed82d593004a0a341188a7 SHA256 230aca0a26b610ff572a25ae3abc1ec7bbddc7a4997df7811b1b35afb09a611f EBUILD python-3.1.3-r1.ebuild 9704 RMD160 c5fa27effa63b0eaf876e3222d26c4532c7191b5 SHA1 fce5eea37742e59a3c9087a22764607fe5780c19 SHA256 00cf56abd74cc3acf869cb86c7b9fe78f9286518cc09c1b63b97e86f83d8f125 EBUILD python-3.2.ebuild 10030 RMD160 932fe44751adb15bf1999b21930107c9fb048676 SHA1 e6815b73b6d50a350c62d5bc265559f3884151d0 SHA256 98fb0d66cce65f7f4a13973b7c6281ace75ceb3c6831e3a108e804c63d4ae9e5 @@ -39,7 +39,17 @@ MISC metadata.xml 661 RMD160 54831d16b8807086bfabdbb3df9d33336b5d42a0 SHA1 9867c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk2asJUACgkQOeoy/oIi7uzNfACcD577YX/DuZNOKJDd/xLIP2dk -0PoAoJl+AiEk0ueFEXj/2dLCycOb5/AY -=xxvX +iQIcBAEBAgAGBQJNpby7AAoJENgZr6v6gHY0gtYQAKlNqa4VCT5ki9Khe2HjlIaB +eXba2C+8ns4Yr8qHzTUxn8c/jc20I8oDI9fGnAr0OLiETOiNG1TtE2s9XDG4mwBj +dRl53/rnDOF9YNxVHmFIKbYOuDFhvvwuvhzuwy8Q9kiIXzaQeDDExN2eOWp732pm +nYIx0n6iJEJELFKmodol7BhGAgooa6MRQpRewdpLrg5DZz/W0yaF6FWVZFfwRdE6 +43ESpvjQreB+UXmfREEi8Fdg9NM1pU+VlayJn9v5U7MSu3cjtyA7F7slEUUUsl0V +JAGUMx2dIKtX42llR7Wmt7EIMAePTUdqqfY/ulwhlTPVj4CO9YqPQRBraRjAk/Xg +wSGNL/M+jSWXOVeJk6H34j2EnFesdrYW6Rghg8W8HAbQRsileOIjBhTl8yFNxBU5 +QjU9YQzCZrZpNJzXXYANbrrMXZc83eTLLfVbT/u+hhqlSV6bEUHMZaUOSIQ5okLA +hPCe9pxjpy0v+tD3ymJb1Gpgy+IoYWC0mim/2i2iVLryuJoQRTKPHC7IvMXHxO2A +xeHqsXM7B44j6IOlllM+iRrB1OC3VxZUEFoFM92ClENnNXn7XmUkrCKDSrrJh8MC +CgFVXBEwDKZMaUpsYES6Kd2J21NtwSKYF3ZJfpSz9DKpAeGf5fGORWdqZDW+YZNV +WOR4sPEksbv9Oz7Vqe2F +=aDzN -----END PGP SIGNATURE----- diff --git a/dev-lang/python/python-2.6.6-r2.ebuild b/dev-lang/python/python-2.6.6-r2.ebuild index 27055ea49e55..0985977fe614 100644 --- a/dev-lang/python/python-2.6.6-r2.ebuild +++ b/dev-lang/python/python-2.6.6-r2.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-lang/python/python-2.6.6-r2.ebuild,v 1.8 2011/04/05 06:01:55 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.6-r2.ebuild,v 1.9 2011/04/13 15:09:24 arfrever Exp $ EAPI="2" WANT_AUTOMAKE="none" @@ -304,7 +304,7 @@ pkg_preinst() { } eselect_python_update() { - [[ -z "${EROOT}" ]] && EROOT="${ROOT%/}${EPREFIX}/" + [[ -z "${EROOT}" || (! -d "${EROOT}" && -d "${ROOT}") ]] && EROOT="${ROOT%/}${EPREFIX}/" if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then eselect python update diff --git a/dev-lang/python/python-2.7.1-r1.ebuild b/dev-lang/python/python-2.7.1-r1.ebuild index 67b942f1d7b0..2a48bf26bf8a 100644 --- a/dev-lang/python/python-2.7.1-r1.ebuild +++ b/dev-lang/python/python-2.7.1-r1.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-lang/python/python-2.7.1-r1.ebuild,v 1.8 2011/04/05 06:01:55 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.1-r1.ebuild,v 1.9 2011/04/13 15:09:24 arfrever Exp $ EAPI="2" WANT_AUTOMAKE="none" @@ -326,7 +326,7 @@ pkg_preinst() { } eselect_python_update() { - [[ -z "${EROOT}" ]] && EROOT="${ROOT%/}${EPREFIX}/" + [[ -z "${EROOT}" || (! -d "${EROOT}" && -d "${ROOT}") ]] && EROOT="${ROOT%/}${EPREFIX}/" if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then eselect python update |