diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-02-07 23:20:26 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-02-07 23:20:26 +0000 |
| commit | 4cbf38e3649f0d36be696a9ea04d095f121da0db (patch) | |
| tree | 233ae4e159fb9c1737c040dbdb8cf73d6c331bde /dev-lang/python | |
| parent | Removing the additional RELEASE in KV_FULL when using _rc/_pre ebuilds which ... (diff) | |
| download | historical-4cbf38e3649f0d36be696a9ea04d095f121da0db.tar.gz historical-4cbf38e3649f0d36be696a9ea04d095f121da0db.tar.bz2 historical-4cbf38e3649f0d36be696a9ea04d095f121da0db.zip | |
Multilib releated cleanup.
Package-Manager: portage-2.0.51-r15
Diffstat (limited to 'dev-lang/python')
| -rw-r--r-- | dev-lang/python/ChangeLog | 4 | ||||
| -rw-r--r-- | dev-lang/python/Manifest | 10 | ||||
| -rw-r--r-- | dev-lang/python/files/python-updater | 16 |
3 files changed, 16 insertions, 14 deletions
diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog index 12be6680e394..2828b7ce1705 100644 --- a/dev-lang/python/ChangeLog +++ b/dev-lang/python/ChangeLog @@ -1,11 +1,11 @@ # ChangeLog for dev-lang/python # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.127 2005/02/07 20:47:42 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.128 2005/02/07 23:20:26 eradicator Exp $ *python-2.4-r2 (07 Feb 2005) 07 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> - +files/python-2.4-libdir.patch, +python-2.4-r2.ebuild: + +files/python-2.4-libdir.patch, files/python-updater, +python-2.4-r2.ebuild: Multilib releated cleanup. *python-2.2.3-r6 (06 Feb 2005) diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index 6583f9eb9e8c..72f77a47c9d5 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 dd3f672e0f8fb9f880343ac35a8a4777 ChangeLog 21819 +MD5 c3bb6ef31def5c889ba26ef50429aa47 ChangeLog 21841 MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221 MD5 b0dabb5b661c34b2054f5ae852c2fd45 python-2.1.3-r1.ebuild 2329 MD5 1e424541a26b4d5785a6e830e6a14fe8 python-2.2.3-r6.ebuild 4498 @@ -35,7 +35,7 @@ MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.1 178 MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.2 178 MD5 201acd1cfd5124f25c58a8db3f78a502 files/python-config-2.3 178 MD5 d74e7f0fd47f00e8b3fe7ca36b7eb629 files/python-config-2.4 179 -MD5 fe5a878d2ba1e49ebc789b65f430290a files/python-updater 8611 +MD5 1cf4c21ad3b0aafc571b05b9a9e54594 files/python-updater 8761 MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r6 62 MD5 d5e1334ddcc639401001d01f26ce0af5 files/digest-python-2.3.3-r2 66 MD5 c2e3a6ed5d700a7976f5b763cd935599 files/digest-python-2.3.4-r1 66 @@ -48,7 +48,7 @@ MD5 fccf57b8c47164b676517e516898dc46 files/digest-python-2.4-r2 64 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) -iD8DBQFCB9P4ArHZZzCEUG0RAvNtAJ9oleNNZt7uEoY1j+IHFDmgvL8Y5ACdEsxm -/jBUE2awob6Gvi/vNHgLDvA= -=Ehvj +iD8DBQFCB/fNArHZZzCEUG0RAtLwAJ471bXtbZPczeCat48LLd/3vDBIRACdEW+4 +4bqT/XY9EWT/ngCV9t1Mzr4= +=tY48 -----END PGP SIGNATURE----- diff --git a/dev-lang/python/files/python-updater b/dev-lang/python/files/python-updater index 12a381782b2c..ca6ef7d4364e 100644 --- a/dev-lang/python/files/python-updater +++ b/dev-lang/python/files/python-updater @@ -166,11 +166,11 @@ done # /usr/lib/python${OLD_PY_VER} # # -OLD_MODULES_DIR=/usr/lib/python${OLD_PY_VER} +OLD_MODULES_DIRS="/usr/lib/python${OLD_PY_VER} /usr/lib32/python${OLD_PY_VER} /usr/lib64/python${OLD_PY_VER}" OLD_INCLUDE_DIR=/usr/include/python${OLD_PY_VER} eloginfo "Starting Python Updater from ${OLD_PY_VER} to ${NEW_PY_VER} :" -eloginfo "Searching for packages with files in ${OLD_MODULES_DIR} .." +eloginfo "Searching for packages with files in ${OLD_MODULES_DIRS} .." # iterate thru all the installed package's contents for content in `find ${PKG_DBDIR} -name CONTENTS`; do @@ -190,12 +190,14 @@ for content in `find ${PKG_DBDIR} -name CONTENTS`; do continue; fi - if fgrep "${OLD_MODULES_DIR}" ${content} > /dev/null; then - PKGS_TO_REMERGE="${PKGS_TO_REMERGE} ${CATPKGVER}" - elogecho "Adding to list: ${CATPKGVER}" + for OLD_MODULES_DIR in ${OLD_MODULES_DIRS}; do + if fgrep "${OLD_MODULES_DIR}" ${content} > /dev/null; then + PKGS_TO_REMERGE="${PKGS_TO_REMERGE} ${CATPKGVER}" + elogecho "Adding to list: ${CATPKGVER}" elif fgrep "${OLD_INCLUDE_DIR}" ${content} > /dev/null; then - PKGS_TO_REMERGE="${PKGS_TO_REMERGE} ${CATPKGVER}" - fi + PKGS_TO_REMERGE="${PKGS_TO_REMERGE} ${CATPKGVER}" + fi + done done # now we have to do each emerge seperately because if an installed version |