Revert libdir changes in existing ebuilds, in order to avoid possible issues when re-installing those versions on multilib systems. Revision bump latest versions with the libdir changes, which is necessary in order to avoid mentioned issues.

Package-Manager: portage-2.2.0_alpha123_p22/cvs/Linux i686

7 files changed, 56 insertions, 27 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index df8f725280f5..27fd9f1f54d0 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1082 2012/09/01 20:15:23 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1083 2012/09/01 21:10:02 zmedico Exp $
+
+*portage-2.1.11.12-r1 (01 Sep 2012)
+*portage-2.2.0_alpha123-r1 (01 Sep 2012)
+
+  01 Sep 2012; Zac Medico <zmedico@gentoo.org> +portage-2.1.11.12-r1.ebuild,
+  +portage-2.2.0_alpha123-r1.ebuild, -portage-2.1.11.12.ebuild,
+  -portage-2.2.0_alpha123.ebuild, portage-2.1.11.9.ebuild,
+  portage-2.1.6.7_p1.ebuild, portage-2.2.0_alpha120.ebuild:
+  Revert libdir changes in existing ebuilds, in order to avoid possible issues
+  when re-installing those versions on multilib systems. Revision bump latest
+  versions with the libdir changes, which is necessary in order to avoid
+  mentioned issues.
 
   01 Sep 2012; Zac Medico <zmedico@gentoo.org> portage-2.1.11.12.ebuild,
   portage-2.1.11.9.ebuild, portage-2.1.6.7_p1.ebuild,
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 445980d7bc9a..41f248743748 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -11,18 +11,18 @@ DIST portage-2.2.0_alpha111.tar.bz2 836193 SHA256 3187c6915aaab681e444eca0cbe050
 DIST portage-2.2.0_alpha120.patch.bz2 33973 SHA256 24a5447e9af37013e30c3372e3eef799e1de17884f6328f08396e8f50c9527d1 SHA512 397114af03680734ba95de42087ead7b8cb122c4952407fb0b0c86c510c65be487d0578a3e5052f8c03c0ed9487b6f8138a4d6fb54b9025c16bd393800b67b59 WHIRLPOOL 440e5796f53be19b4a3af8dacfba576b8bd3cf7fa01bfe1b5d0f1af8fb15fb9daa8efe5d9d909d37712c7a381c3811a8dc213106f19cb87fad3faec75c4c8e9d
 DIST portage-2.2.0_alpha123.tar.bz2 807753 SHA256 d9818aaba4fb48111adcc54b6034091cd01fb879287be07a83a0c433852ab1a9 SHA512 e1a2df85f7f0dcdd70657ab9a183d975f9eb0455695af505aace87bb8a2e258d31986f1691b99a7d52248093886326c640e32a52ef04c1cee3f3906cd68c0591 WHIRLPOOL aac57874a4fc63faae3d543b39fd7f1ef149bf8c3091b71c925bf651fde7d4d80f97f1d38b301fc5585d510bb734e26a3d99f40a0885d20b805d49d73cf390d2
 DIST portage-man-pl-2.1.2.tar.bz2 53893 SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f SHA512 5f5c8dd1559048546633b1e7291ff8c0f5d637595f1a4c98405424b08c30c089fc9359e0214f78fbe358754f20d327794f4692b9b67639585c29b755975ee853 WHIRLPOOL 756e267b84077501d976f46fa448cda5368cd52aeca6ec43d109c81fe8e2364e0cd0f35630d68a4186c70e3b440b7c870b86ac7ef83cc0afa43e10f9f8e1f422
-EBUILD portage-2.1.11.12.ebuild 9545 SHA256 222705ca24ec36ff655fa512fa80ad9fd2876e28f8d31cb3b47e27f9718c41a3 SHA512 e3ef702f60ed2976c4f74647efa84db1c346872fce09b3f03888ce11081e2e4e3794a2e48a6dade44e642becee06a62541cd4f6a0ae9dbe741ba19f798a1aff0 WHIRLPOOL 05ea540c7a9187f940665b2be7790640164d213552a0862e8bf29e74e27b49c57186c832a6df6c2e4209905c0079a2af1456424daa59b425976d1c42419dcf83
-EBUILD portage-2.1.11.9.ebuild 9649 SHA256 80db1c47e7fd6b3de1965591ae85cf9ba10db1882945d9f4f305b6b397bbe73e SHA512 912d9f22f2b5727e71c3f31b4ad992d65217aaf5376481f0282835967e54e1e73c065a7c8b4efaf144b65d93d223fbbfd15dac65729f67fff3cf6324be5bd9e2 WHIRLPOOL c11851c347fd609e576e0523653e48381df3421da96bab68144e2e0a21a0b9bbc467f2281bbaac46232f525ef80d54b2507598a980ec0f0e0c0d6004bb7ec64b
-EBUILD portage-2.1.6.7_p1.ebuild 8179 SHA256 55aa896d3dda15e8cb0cd13def378086e302b28d713bf2e92258a3130371e2a4 SHA512 9d711b4a4b6ea7675afd3eaef8294da7a775bde7cad35a13437ab012575e99481638c74dedb4db169efe7a3b5361718011c95b3cd9b6759ced250d3e51ef31d1 WHIRLPOOL baa406f0c6d7468d9e47fca7fe57d7a50f8231bc48a0d72eec0515578740cc2ca59975ac96d5d21966115347947c510208a37e77a46a94ab6e8de65e6c131236
-EBUILD portage-2.2.0_alpha120.ebuild 11758 SHA256 d12318fad3ef240259d3a0d5f5798963a9cf25d2b535f2477e1afaccc80dc2b1 SHA512 5011b4cd3f4a4b5cf98f8e73d542ad9818ed7dac4de9e3c356389f4ac732bfc1c63d1d8103fb88b7f76b5c6b8d2c05340365720e3e5a24e042617f30400c516e WHIRLPOOL adcb2c11895e86e919f0f0f236698a3e71259a2700b5ebc04ab2509c719f640b68d70e318da425265274f4a05959c0e37e9588d2097b29b37ec0ac9b9f5e93e4
-EBUILD portage-2.2.0_alpha123.ebuild 11636 SHA256 30bde0575bad81aa959416d133d08ca11b5bea38be35a9d897408caa6ff1e368 SHA512 46fc164e0b6226427655ea862f024deec564e3c5882bdc6593c2c64903253dbf2b844b1ffadf657881881503a02a5d4e6b8765f41a5acfc2171e696c33e562e5 WHIRLPOOL 92b61bfb7c81bf8ed35f8a8f9524a66f219717287c282c844c6827b6f93994711322b5d2261e74f225450623fe95ad260af38cb8f17beeca74991247ce107a33
+EBUILD portage-2.1.11.12-r1.ebuild 9548 SHA256 2734cf4e9e08c4f38a0b2404943c63c2931968bff40821faf1dfced8c4059f79 SHA512 7e7c36f077ef6b9329296c3ac65b5ffd7f0919aad67d246e4a4a85ba521d4dc5d81f3d269ffb04ff0c8a7c4a1425fbf46421383c253f3cd989b85ad3cd0c1b34 WHIRLPOOL ba93ca235b0a7723df6732ce33822763088571cbbf4464ef5f6f5d6e8714fe73bfd69eca10193f197d9f8ba339ae6d68a3c7deb9a9a6ddb103c1aa939f9db7a6
+EBUILD portage-2.1.11.9.ebuild 9833 SHA256 4b4e3df3e35a4cfba3fd3134d1dc16514e382af4474a42c925fae058440c197c SHA512 9cc3b74e87904575b7646cc1de33cadb249d7b1b03d6e3dda94a347c2ed27291d217ebcb4410cd520551289830d69c8a80a2a9a739c883a11cc9e8693f5c8335 WHIRLPOOL 4031694d504fa820b9470204d6d3297de7e98c5a6b087967977db0190326c0b6d52d611af4f3086f66a04eafa08edd277c259e4257d2ce7997a704533359c44f
+EBUILD portage-2.1.6.7_p1.ebuild 8392 SHA256 75dfa3bdb1100ca28ba46eb83e34ffc196cb3e57204e7b4f451cfb19a1644e62 SHA512 ac70b4ba9d658c4d79953088b2fdaeed8d0e31986ff7c649272c39a743ddfdf112e44d3f0f8078941c47a06b373002cfcd454100585d5bbaa807a2079b19eb8c WHIRLPOOL 57c26b40de86f3d6969fe66d5b1fd6df55f5478e03c855813ff83b1e485f99d1b34cbf30422b5b60986263cae4d4ee066daaa01c0166a04f53c7bb829fd214e1
+EBUILD portage-2.2.0_alpha120.ebuild 11951 SHA256 9530b793174de796ecf951a2808cb163005b605630b0455c57194e97f2a36dd2 SHA512 f6af265d8d9b1cbf884787105abb32335727c179d904fbdecba598878083f7384088a5db063aee4282afd4daa4d20f02466911d6c5625bf538c7cdb437026866 WHIRLPOOL 93daa1caa5b31023b1fbb11e8baabf1abced715c879acdc1bb578f75dc58d3737e23bba2c9fa3bd69702810640e47a1debbf3464d16db7a6f68a3d37799b3b76
+EBUILD portage-2.2.0_alpha123-r1.ebuild 11639 SHA256 f030ea2bbe4d750ecfc1ee5d3d8f8acd88e8e44945e0282adf6fe28a3e1386e6 SHA512 796418b41e224c306a3a78f7c1362e7792386fecd9806dc2080a79123041010a11ade8ce454595217ed72404402db65272d9b49c80571d8511b039a22d80a61f WHIRLPOOL 7994b2ba2250648fbe9bb63b83009a7687968f16d61ca1173419705122871cb450a11872d979a95b5feacad1e6edc41fee6e233778b30eeb6767fc44de46c81e
 EBUILD portage-9999.ebuild 10893 SHA256 038e7cb28801dbfe4b62cfa68107181480a429f91ff891e33abf861f88f62566 SHA512 cb7862fb64784836b1dd65b894494a3a8e4a806db1e15317207e394af6862cbfd57b9b181abea39282b17c23daf56c18f1e414052a205f473a4abedc0f107949 WHIRLPOOL 5a12d9ae1fbf31e93d002c62979a574b05328d237b63d34479d6e2e65126ab2c852e9ac47cf86f7ce69dfadc486741606636c944e098e4b070121e742c718b59
-MISC ChangeLog 111202 SHA256 353d6eaeda92df50bcd14b536bcf89b22c614d1130d4927b7d890e522e0fca6b SHA512 eb0731e2fb765565dcd85b830f59f563bd4b74a612114618fe52245b7b4b77316d760ba74c2c2962d33fcfa68c16ed92f6e706d2cb4000d3d0bdd5f053770fe3 WHIRLPOOL 1bf803a8177fa6a40e5f6ea318abbec087a89b984e1934b5f880af75df2cb269e2ed17b828616884c83d5d0e412290e3a6cc3021dfbd7ca45916699cd351ed7c
+MISC ChangeLog 111791 SHA256 1a879bfe87b6eded4d226d67cfbf69e9b7ad3347860e0ab76ec0ac224331f901 SHA512 8e67f2a5d0c96325768de6a65300fc5b58064c00e5fbf4a936d9498620ec5a38f9b7268931f51800ceca74712a8c3ffbbfbf725d29d3bee1d3a0fb96668c03e0 WHIRLPOOL 8e93d82c9798c835bb5f15a529161f6805b785cd725a61989ae40ab0aa8419a9b24b2974feda815062ffac1f775d5831a1ddbd8a387a178d259fcbeb6afd1675
 MISC metadata.xml 926 SHA256 23463fa1d9a37979e2dffb502fffdd4dcd5dc932f4b5b3053999609012e4fc65 SHA512 41478467f90c58d8044471ed85ad6365e976b8cdb43556f024345861d08f1e9ae2f2fc728d114521adece630793248f2598fa330233eb98ae7b42950cf056d08 WHIRLPOOL 1aff07692c1fbca18cd3498f1cac2e64749b784a3135d881fc4cb95040bdfb93af079df1e053a547cfe08ea4384268e36ec98fc25160ad94e6ef65c6d04e5452
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBCbOIACgkQ/ejvha5XGaPdMACgtVE3k0iBC2tyNq0c+DfWHTAn
-HzkAoOFjEQQsmb51DZvPZdurN1/Mc9uf
-=7dgm
+iEYEAREIAAYFAlBCebEACgkQ/ejvha5XGaNNswCdGu+OoSOb9mqAdx633yO0knde
+egAAnj4x5WzFlo9i2USnIizsgWJKTj0C
+=jT4W
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.11.12.ebuild b/sys-apps/portage/portage-2.1.11.12-r1.ebuild
index 08c2878c3cbe..f1a1462ee12f 100644
--- a/sys-apps/portage/portage-2.1.11.12.ebuild
+++ b/sys-apps/portage/portage-2.1.11.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.12.ebuild,v 1.2 2012/09/01 20:15:23 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.12-r1.ebuild,v 1.1 2012/09/01 21:10:02 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
diff --git a/sys-apps/portage/portage-2.1.11.9.ebuild b/sys-apps/portage/portage-2.1.11.9.ebuild
index fca770d18653..80079c5817c7 100644
--- a/sys-apps/portage/portage-2.1.11.9.ebuild
+++ b/sys-apps/portage/portage-2.1.11.9.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.9.ebuild,v 1.9 2012/09/01 20:15:23 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.9.ebuild,v 1.10 2012/09/01 21:10:02 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
 EAPI=2
-inherit eutils python
+inherit eutils multilib python
 
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
@@ -98,6 +98,10 @@ current_python_has_xattr() {
 }
 
 pkg_setup() {
+	# Bug #359731 - Die early if get_libdir fails.
+	[[ -z $(get_libdir) ]] && \
+		die "get_libdir returned an empty string"
+
 	if use python2 && use python3 ; then
 		ewarn "Both python2 and python3 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python3."
@@ -217,6 +221,7 @@ src_install() {
 	emake DESTDIR="${D}" \
 		sysconfdir="/etc" \
 		prefix="/usr" \
+		libdir="/usr/$(get_libdir)" \
 		install || die
 
 	# Use dodoc for compression, since the Makefile doesn't do that.
@@ -277,9 +282,9 @@ pkg_preinst() {
 pkg_postinst() {
 	# Compile all source files recursively. Any orphans
 	# will be identified and removed in postrm.
-	python_mod_optimize /usr/lib/portage/pym
+	python_mod_optimize /usr/$(get_libdir)/portage/pym
 }
 
 pkg_postrm() {
-	python_mod_cleanup /usr/lib/portage/pym
+	python_mod_cleanup /usr/$(get_libdir)/portage/pym
 }
diff --git a/sys-apps/portage/portage-2.1.6.7_p1.ebuild b/sys-apps/portage/portage-2.1.6.7_p1.ebuild
index 89e754857b34..e75056cbb90f 100644
--- a/sys-apps/portage/portage-2.1.6.7_p1.ebuild
+++ b/sys-apps/portage/portage-2.1.6.7_p1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.7_p1.ebuild,v 1.3 2012/09/01 20:15:23 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.7_p1.ebuild,v 1.4 2012/09/01 21:10:02 zmedico Exp $
 
-inherit eutils python
+inherit eutils multilib python
 
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
@@ -64,6 +64,12 @@ done
 S="${WORKDIR}"/${PN}-${TARBALL_PV}
 S_PL="${WORKDIR}"/${PN}-${PV_PL}
 
+pkg_setup() {
+	# Bug #359731 - Die early if get_libdir fails.
+	[[ -z $(get_libdir) ]] && \
+		die "get_libdir returned an empty string"
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -113,7 +119,8 @@ src_test() {
 }
 
 src_install() {
-	local portage_base="/usr/lib/portage"
+	local libdir=$(get_libdir)
+	local portage_base="/usr/${libdir}/portage"
 	local portage_share_config=/usr/share/portage/config
 
 	cd "${S}"/cnf
@@ -184,14 +191,14 @@ src_install() {
 
 	dodir /usr/bin
 	for x in ebuild emerge portageq repoman xpak; do
-		dosym ../lib/portage/bin/${x} /usr/bin/${x}
+		dosym ../${libdir}/portage/bin/${x} /usr/bin/${x}
 	done
 
 	dodir /usr/sbin
 	local x
 	for x in archive-conf dispatch-conf emaint emerge-webrsync env-update \
 		etc-update fixpackages quickpkg regenworld ; do
-		dosym ../lib/portage/bin/${x} /usr/sbin/${x}
+		dosym ../${libdir}/portage/bin/${x} /usr/sbin/${x}
 	done
 	dosym env-update /usr/sbin/update-env
 	dosym etc-update /usr/sbin/update-etc
@@ -213,7 +220,7 @@ pkg_preinst() {
 pkg_postinst() {
 	# Compile all source files recursively. Any orphans
 	# will be identified and removed in postrm.
-	python_mod_optimize /usr/lib/portage/pym
+	python_mod_optimize /usr/$(get_libdir)/portage/pym
 
 	local warning_shown=0
 	if [ $DOWNGRADE_FROM_2_2 = 0 ] ; then
@@ -252,5 +259,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	python_mod_cleanup /usr/lib/portage/pym
+	python_mod_cleanup /usr/$(get_libdir)/portage/pym
 }
diff --git a/sys-apps/portage/portage-2.2.0_alpha120.ebuild b/sys-apps/portage/portage-2.2.0_alpha120.ebuild
index 93d6c6003e17..2dfaac1521b4 100644
--- a/sys-apps/portage/portage-2.2.0_alpha120.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha120.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha120.ebuild,v 1.3 2012/09/01 20:15:23 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha120.ebuild,v 1.4 2012/09/01 21:10:02 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
 EAPI=3
-inherit eutils python
+inherit eutils multilib python
 
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
@@ -98,6 +98,10 @@ current_python_has_xattr() {
 }
 
 pkg_setup() {
+	# Bug #359731 - Die early if get_libdir fails.
+	[[ -z $(get_libdir) ]] && \
+		die "get_libdir returned an empty string"
+
 	if use python2 && use python3 ; then
 		ewarn "Both python2 and python3 USE flags are enabled, but only one"
 		ewarn "can be in the shebangs. Using python3."
@@ -251,6 +255,7 @@ src_install() {
 	emake DESTDIR="${D}" \
 		sysconfdir="${EPREFIX}/etc" \
 		prefix="${EPREFIX}/usr" \
+		libdir="${EPREFIX}/usr/$(get_libdir)" \
 		install || die
 
 	# Use dodoc for compression, since the Makefile doesn't do that.
@@ -305,7 +310,7 @@ pkg_preinst() {
 pkg_postinst() {
 	# Compile all source files recursively. Any orphans
 	# will be identified and removed in postrm.
-	python_mod_optimize /usr/lib/portage/pym
+	python_mod_optimize /usr/$(get_libdir)/portage/pym
 
 	if $WORLD_MIGRATION_UPGRADE && \
 		grep -q "^@" "${EROOT}/var/lib/portage/world"; then
@@ -336,5 +341,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	python_mod_cleanup /usr/lib/portage/pym
+	python_mod_cleanup /usr/$(get_libdir)/portage/pym
 }
diff --git a/sys-apps/portage/portage-2.2.0_alpha123.ebuild b/sys-apps/portage/portage-2.2.0_alpha123-r1.ebuild
index 2e9bcf378d24..67a69d878d57 100644
--- a/sys-apps/portage/portage-2.2.0_alpha123.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha123-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha123.ebuild,v 1.2 2012/09/01 20:15:23 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha123-r1.ebuild,v 1.1 2012/09/01 21:10:02 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.