Bug #359731 - Die early if get_libdir fails.

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

13 files changed, 84 insertions, 29 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 4f80a94a7396..9753a4b39059 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.814 2011/03/18 23:02:02 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.815 2011/03/21 12:41:11 zmedico Exp $
+
+  21 Mar 2011; Zac Medico <zmedico@gentoo.org> portage-2.1.6.7.ebuild,
+  portage-2.1.6.13.ebuild, portage-2.1.8.3.ebuild, portage-2.1.9.25.ebuild,
+  portage-2.1.9.42.ebuild, portage-2.1.9.43.ebuild, portage-2.1.9.44.ebuild,
+  portage-2.2.0_alpha26.ebuild, portage-2.2.0_alpha27.ebuild,
+  portage-2.2.0_alpha28.ebuild, portage-9999.ebuild:
+  Bug #359731 - Die early if get_libdir fails.
 
 *portage-2.2.0_alpha28 (18 Mar 2011)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index dbb8751287ff..407baf426477 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -15,23 +15,23 @@ DIST portage-2.2.0_alpha26.tar.bz2 782877 RMD160 910207d58a0c4a559ae86ddc23338e3
 DIST portage-2.2.0_alpha27.patch.bz2 10385 RMD160 b39f838be4f17230a9043416ca28a25fb029036f SHA1 3a522757f9a7921cd55e199642d968975dac7096 SHA256 136a2c455c5482c1baf8f1784755a0265f09c9d57a9342a797daacd42681959a
 DIST portage-2.2.0_alpha28.patch.bz2 17814 RMD160 ef151ed039e9c66798f54b91bfbc5f27ff90c1d5 SHA1 acc9521878efb1ea4a22ed8f59b7636074436b83 SHA256 733b636c8df4d475bd1ecc1c8bc02334608c1b5937d16224c0e9e29c968103ff
 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
-EBUILD portage-2.1.6.13.ebuild 9886 RMD160 830a84ad6f5c8640f55351d67edeb1a1bf75e70a SHA1 29aa8a43789805fca31b5a32d98c082fe9f510a4 SHA256 e0ad29eeb0bda0c9c137bdc933e2b286990264364672498b56cc5e057ae7ba4a
-EBUILD portage-2.1.6.7.ebuild 8538 RMD160 af018f60721b1d1e581d48e4ecadea2e6fe2a4e7 SHA1 7b9a758aba1f35784f55f2a14ad59584456e5ee6 SHA256 d29ccc18665540c61e5f65f09bd66b71c60c7d6e3e69613cdb47ccc3a4758745
-EBUILD portage-2.1.8.3.ebuild 9340 RMD160 780017b0883c831955afdacd4f244abef4abd6b7 SHA1 4ff771cde579fa6cbc114db2dd0679cba068c91e SHA256 00cab3ffd5bfa21d9dd757ccc78107287f13725748333f9d68dd7391c855c58f
-EBUILD portage-2.1.9.25.ebuild 9704 RMD160 e5c4a8b8277794cde6c04cc15430b7976991eaea SHA1 89376d1548770de9273c09023b300f6af736e5bb SHA256 5598c3d543f5642618428badcb57935882e5e14649fecf43f26a9c12fa2cf8b8
-EBUILD portage-2.1.9.42.ebuild 10146 RMD160 c274fa1582464916582f2fdd604bc56aa6aa8e9c SHA1 53c8b6c551e6c6d95a6573953ad382122e54bc09 SHA256 48076213a3f975815b2286076018f7405aea83bbe27d8f09716adc2b49bebaa6
-EBUILD portage-2.1.9.43.ebuild 10158 RMD160 5c7bb59beadd229728e80176ea4f596b5228f5cc SHA1 1d90ff1c3a4790a3109e852a54c48249746bf065 SHA256 4a2383e0221e41b591b056273d92f62942076dd450de73e6ae0aace53c9f2cb8
-EBUILD portage-2.1.9.44.ebuild 10158 RMD160 3bbc0e4a3bbeade134919cf96d85b67033f22ee7 SHA1 4379c35e84fa56c54122d3370fcf57f2f08412d5 SHA256 402294b9eac6c546c3c6af87038b4728271711303ea62251d1574a3d78cb0166
-EBUILD portage-2.2.0_alpha26.ebuild 11910 RMD160 5d97d65465d88041e7b867d183360168f1fcccf9 SHA1 3dd5b726ca786bc001ae3ea8e9d7e42733bfdc37 SHA256 f8d6ed8816e1fd564cba13b0135a68492169600a49c7749e99dea129cfc5ef7f
-EBUILD portage-2.2.0_alpha27.ebuild 11920 RMD160 5adb4bb85ec9f946435399d80c56fb3c48412ec4 SHA1 6666b8f25417122304b3e2a1143a463e5cc55142 SHA256 6227121b39b6276ba626b96fd8cdfc64f68430e3994707e8c89e923f4e1db325
-EBUILD portage-2.2.0_alpha28.ebuild 11920 RMD160 a3867e0a4c3a9c9e2a46544ad83fc44137fdccbd SHA1 2bd4384761efe296863d34467629188593376232 SHA256 97323ed9c7bac9a0b224cef8d5cf11c0ff7c67c330667e2c3df95a97d8ee0b9e
-EBUILD portage-9999.ebuild 11135 RMD160 764fe0e66765c6dcef8c6cc913c7023e67134b02 SHA1 204b6e4eeeaefbf350736c1c972286f8a2c616a5 SHA256 a889364030377df96880a7112a1fcfd69bfd377cad3413ab566c65934fa0b836
-MISC ChangeLog 63716 RMD160 3e0405b248c014626d61d0859bc7aec9baba20bf SHA1 36c0557ba1b17163505b1e11f13c021b5692fcc8 SHA256 c0c14004e5d33eb662ddd82ca3d6d311b697e964b20b8952b3b8640c08704aa9
+EBUILD portage-2.1.6.13.ebuild 10024 RMD160 9ced91ec38a818e60fee3596bcf01cdec28e0f78 SHA1 e01917384a918f1f0103d578e562096c1e4d5ac8 SHA256 7e1647c82454c0e75b9e49819fd97e4a4b02da1e019e72df6d23771f2314ec7b
+EBUILD portage-2.1.6.7.ebuild 8676 RMD160 9967872943beb5e221be1ce040eadb02795d80d2 SHA1 70bb504bd851ae1a08eff4c89bb11d4376a65d93 SHA256 28c714fa8620615f6b316a6f9e45180eae3f74edbfe8690008f5931db855898d
+EBUILD portage-2.1.8.3.ebuild 9462 RMD160 1a151e92c882a3ff39f8a40b1d2ac655a4dd919e SHA1 6c0ec4e9efe64ae06dc933f68659c364096196e5 SHA256 1e11fb9863c208df9329c3011c126341a2d7fff7948841bad6c9018569f313b8
+EBUILD portage-2.1.9.25.ebuild 9826 RMD160 4bbab2429c83c6f21ce88d6e3049940a1dca5e23 SHA1 f79c7ce0706b2080303f8543e2c23fc9ad2284f0 SHA256 6317acfd3e6ebf6e248950fac2f8af4703866b3974fe2089707cc479d2a5e563
+EBUILD portage-2.1.9.42.ebuild 10268 RMD160 7cfc6aeddde815bcaf7e7230aae5252ac308dd7f SHA1 bdb5fb06dadbc655421c63b8536bfefa7bc098a4 SHA256 374962428548ce30feea1b412d0bd303414949c68b37ffbf0aa862b42dd3a095
+EBUILD portage-2.1.9.43.ebuild 10280 RMD160 cab576603d48084314a3296e70a5fe77337f1969 SHA1 ef0c1446206c3580d1bca087c5e6d73e28133abe SHA256 a0937a3076dffbe0fd9b39dc49307227e8b9492543c7b11193a387a46a0a5cf7
+EBUILD portage-2.1.9.44.ebuild 10280 RMD160 987dbd7e2d791c968eb516c53275d7586d0b96c9 SHA1 86dd421ade38385e37e03226b682be698215d5f0 SHA256 67f0b2b4ad7b6301532fb7d3574cd27d21147883c1666c6063af99d4e25dcaff
+EBUILD portage-2.2.0_alpha26.ebuild 12032 RMD160 af77d25e80d32077382a4ba548e24f3dfac872d8 SHA1 e99438ca90b9319842cc35890ae8bb4a80a9be8f SHA256 d6ae1d557b61089697dad0a5be747f98ebb97a3b476ded7e1fd75fccde30f4e9
+EBUILD portage-2.2.0_alpha27.ebuild 12042 RMD160 6f1a9602b8f0bafd1535c708b383f39d7c4b07f3 SHA1 8027bc324fa4994dc59b20c6413062f3612a7f40 SHA256 0ca85c76376010b13d0df6f38ff943b46e0ca20a4201e3c9b92660c0148a6dad
+EBUILD portage-2.2.0_alpha28.ebuild 12042 RMD160 2bb489b07fd044da88b07b25abef0872311c6120 SHA1 8be39f3fea7863ca21e27cd14ec83206766d1e4a SHA256 d615f1cd0c26b5aec409a1dec57a043fc5d95f54dfd328ee6665b77bd3c6144f
+EBUILD portage-9999.ebuild 11257 RMD160 49f20be243e9889ea3517def6c18da2a90e33d31 SHA1 441d421bc0aec242e73b951d108748e213aeed5b SHA256 961e8fc01784b465feeb5aae3ebee46548fc1595e6e37fcfe4b9c5a0b62dec44
+MISC ChangeLog 64103 RMD160 1297200b694610e9ba21662f4834616d7311ecf1 SHA1 6621f8b77cc80f40049c173df8f0ef3cc35517da SHA256 6191533b34323ddc444a49eb1f56e28099122154dc05760eae9c16119ec26db7
 MISC metadata.xml 724 RMD160 becdb078c637d12e9d7402cd9297a942c657717e SHA1 ce260048be905d15470185ad22ee57a192f561a6 SHA256 371fa80623857d4e03f85fb64bc58570a4ec030e6376ea2e8d1232b6aa3ebc44
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2D5HQACgkQ/ejvha5XGaPQRQCg3iJhmu01nQHvUsRHtAC7BQr9
-o78AoLgjTy7UuHnrQpn75nyGXK+Gzoy1
-=Pt1b
+iEYEARECAAYFAk2HR2sACgkQ/ejvha5XGaN6MgCgnupbe9rzl4hC+l1pYuj7Z62p
+gqQAn0pXw4w5c5x3jCITdRny6umsWuu4
+=OJg4
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.6.13.ebuild b/sys-apps/portage/portage-2.1.6.13.ebuild
index e5c778f3e17e..174fbf302c88 100644
--- a/sys-apps/portage/portage-2.1.6.13.ebuild
+++ b/sys-apps/portage/portage-2.1.6.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.13.ebuild,v 1.19 2010/10/13 01:30:40 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.13.ebuild,v 1.20 2011/03/21 12:41:11 zmedico Exp $
 
 # EAPI 1 since python-2.5 is also EAPI 1.
 EAPI=1
@@ -68,6 +68,12 @@ fi
 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}"
diff --git a/sys-apps/portage/portage-2.1.6.7.ebuild b/sys-apps/portage/portage-2.1.6.7.ebuild
index 6ce689460928..0ef5fc0b7841 100644
--- a/sys-apps/portage/portage-2.1.6.7.ebuild
+++ b/sys-apps/portage/portage-2.1.6.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.ebuild,v 1.18 2010/10/13 01:30:40 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.7.ebuild,v 1.19 2011/03/21 12:41:11 zmedico Exp $
 
 inherit eutils multilib python
 
@@ -67,6 +67,12 @@ fi
 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}"
diff --git a/sys-apps/portage/portage-2.1.8.3.ebuild b/sys-apps/portage/portage-2.1.8.3.ebuild
index ad248eebdd60..befba59746b6 100644
--- a/sys-apps/portage/portage-2.1.8.3.ebuild
+++ b/sys-apps/portage/portage-2.1.8.3.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/sys-apps/portage/portage-2.1.8.3.ebuild,v 1.11 2011/02/06 19:36:59 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.8.3.ebuild,v 1.12 2011/03/21 12:41:11 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -77,6 +77,10 @@ compatible_python_is_selected() {
 }
 
 pkg_setup() {
+	# Bug #359731 - Die early if get_libdir fails.
+	[[ -z $(get_libdir) ]] && \
+		die "get_libdir returned an empty string"
+
 	if ! use python3 && ! compatible_python_is_selected ; then
 		ewarn "Attempting to select a compatible default python interpreter"
 		local x success=0
diff --git a/sys-apps/portage/portage-2.1.9.25.ebuild b/sys-apps/portage/portage-2.1.9.25.ebuild
index 79f0d43f3227..f9a11679db02 100644
--- a/sys-apps/portage/portage-2.1.9.25.ebuild
+++ b/sys-apps/portage/portage-2.1.9.25.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/sys-apps/portage/portage-2.1.9.25.ebuild,v 1.8 2011/02/06 19:36:59 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.9.25.ebuild,v 1.9 2011/03/21 12:41:11 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -79,6 +79,10 @@ compatible_python_is_selected() {
 }
 
 pkg_setup() {
+	# Bug #359731 - Die early if get_libdir fails.
+	[[ -z $(get_libdir) ]] && \
+		die "get_libdir returned an empty string"
+
 	if ! use python3 && ! compatible_python_is_selected ; then
 		ewarn "Attempting to select a compatible default python interpreter"
 		local x success=0
diff --git a/sys-apps/portage/portage-2.1.9.42.ebuild b/sys-apps/portage/portage-2.1.9.42.ebuild
index 20139dd28846..7d6ac7076278 100644
--- a/sys-apps/portage/portage-2.1.9.42.ebuild
+++ b/sys-apps/portage/portage-2.1.9.42.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/sys-apps/portage/portage-2.1.9.42.ebuild,v 1.6 2011/03/17 19:44:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.9.42.ebuild,v 1.7 2011/03/21 12:41:11 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -80,6 +80,10 @@ compatible_python_is_selected() {
 }
 
 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."
diff --git a/sys-apps/portage/portage-2.1.9.43.ebuild b/sys-apps/portage/portage-2.1.9.43.ebuild
index 5aac51d1970e..2a650a4addf4 100644
--- a/sys-apps/portage/portage-2.1.9.43.ebuild
+++ b/sys-apps/portage/portage-2.1.9.43.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/sys-apps/portage/portage-2.1.9.43.ebuild,v 1.1 2011/03/14 19:03:12 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.9.43.ebuild,v 1.2 2011/03/21 12:41:11 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -80,6 +80,10 @@ compatible_python_is_selected() {
 }
 
 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."
diff --git a/sys-apps/portage/portage-2.1.9.44.ebuild b/sys-apps/portage/portage-2.1.9.44.ebuild
index 59a9dae9b89a..9f8f002b4c91 100644
--- a/sys-apps/portage/portage-2.1.9.44.ebuild
+++ b/sys-apps/portage/portage-2.1.9.44.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/sys-apps/portage/portage-2.1.9.44.ebuild,v 1.1 2011/03/18 23:02:02 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.9.44.ebuild,v 1.2 2011/03/21 12:41:11 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -80,6 +80,10 @@ compatible_python_is_selected() {
 }
 
 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."
diff --git a/sys-apps/portage/portage-2.2.0_alpha26.ebuild b/sys-apps/portage/portage-2.2.0_alpha26.ebuild
index 9895447394d0..822f2c53623e 100644
--- a/sys-apps/portage/portage-2.2.0_alpha26.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha26.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/sys-apps/portage/portage-2.2.0_alpha26.ebuild,v 1.1 2011/03/02 05:33:15 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha26.ebuild,v 1.2 2011/03/21 12:41:11 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -80,6 +80,10 @@ compatible_python_is_selected() {
 }
 
 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."
diff --git a/sys-apps/portage/portage-2.2.0_alpha27.ebuild b/sys-apps/portage/portage-2.2.0_alpha27.ebuild
index 9a1ec3b319e6..027c92d34235 100644
--- a/sys-apps/portage/portage-2.2.0_alpha27.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha27.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/sys-apps/portage/portage-2.2.0_alpha27.ebuild,v 1.1 2011/03/14 19:03:12 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha27.ebuild,v 1.2 2011/03/21 12:41:11 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -80,6 +80,10 @@ compatible_python_is_selected() {
 }
 
 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."
diff --git a/sys-apps/portage/portage-2.2.0_alpha28.ebuild b/sys-apps/portage/portage-2.2.0_alpha28.ebuild
index 95b00c02a130..d741bcf8dba8 100644
--- a/sys-apps/portage/portage-2.2.0_alpha28.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha28.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/sys-apps/portage/portage-2.2.0_alpha28.ebuild,v 1.1 2011/03/18 23:02:02 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha28.ebuild,v 1.2 2011/03/21 12:41:11 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -80,6 +80,10 @@ compatible_python_is_selected() {
 }
 
 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."
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 28796cd93eab..db052c76bbcd 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.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/sys-apps/portage/portage-9999.ebuild,v 1.20 2011/02/25 20:46:25 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.21 2011/03/21 12:41:11 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -65,6 +65,10 @@ compatible_python_is_selected() {
 }
 
 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."