Add sanity check for $DEFAULT_ABI #385993 by Christian Samsel.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 950cfe54f1f45d341163cec0451d66cb3bb3dc87..a7fc64374eb56775a12bcb55be5e06688ab6df3a 100644 (file)
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,13 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.513 2011/10/04 18:36:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.514 2011/10/09 16:34:39 vapier Exp $
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
 
+  09 Oct 2011; Mike Frysinger <vapier@gentoo.org> baselayout-2.1.ebuild:
+  Add sanity check for $DEFAULT_ABI #385993 by Christian Samsel.
+
   04 Oct 2011; Mike Frysinger <vapier@gentoo.org> baselayout-2.1.ebuild:
   Try to make error output a little more understandable #385625 by Paul Varner.
 

diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 9ab360f78d72ffe45b0e3b24afd72f1ae0f29898..26e6dacc116e7c4fd2b68fde601bb72ba644f790 100644 (file)
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
 DIST baselayout-2.0.3.tar.bz2 39969 RMD160 ca4ae235382780cd386c89f0147fbe17bb599414 SHA1 c5dbcc2d131254b2bb14b782101e2318d1dfcd2d SHA256 879308781d845f467eb2b45b9ff006aa799e943f45ddba518f43acae1ec84bdd
 DIST baselayout-2.1.tar.bz2 40398 RMD160 bba874c5d3290848236703125c130107c1244f55 SHA1 84783a773ec050700b3b0ce4c7645ae878f7f7fb SHA256 2ac6f2156513a2820a0eeeecc2cf7e7c0b5e0c750b324f1e21912d5f3cda4956
 EBUILD baselayout-2.0.3.ebuild 7366 RMD160 579ac15844268e72cd9e1f593501e9a5806f4043 SHA1 3dcb7064e613d063fbe2428f7e3f57d92a2d9219 SHA256 e72e760fbc2452212fee89e5f4c00437b11d7973b5c27933c58481e9a656f5a4
-EBUILD baselayout-2.1.ebuild 7464 RMD160 50e0959926baf9a8094317da4086ea3d56ecf787 SHA1 fc66e178519eeec5e07d10043f8d256f69734f9c SHA256 273de62cc2d47bb5785be491758c96a4ba7899034ce56b6b8aea966aa3de33ca
-MISC ChangeLog 107628 RMD160 922489a99b595e8e02373206d19b262b0bffe396 SHA1 2c5f82f0d6c6a7b8ba3080b3ed64f3912fea1818 SHA256 c309615ecd6cd858a55dbf022d93e4e1e400bfb92a73c58f4fc76be05e32226c
+EBUILD baselayout-2.1.ebuild 7550 RMD160 0458a515d3c0ac9b974592418a621b8935c8d44b SHA1 fcbbd9b360cf38d05a364c9438280d21b2c39eb2 SHA256 bbc878a0c76101c962b4f88dd3d2c340a70cddbf36b4f3de9ee761bba4ef2212
+MISC ChangeLog 107767 RMD160 69c3df4f9e534d684bcf72db29ac75bacd380b0e SHA1 126bf125fac61f8dbcbe1f24c3ae8053647696df SHA256 c10bafefc3e649cdfa1dc37af2c083c795a160ab5900a806fe17cd0a0f9a81d3
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6LUhQACgkQaC/OocHi7JaccAEAgffFtguu+yH34J9TdaB6TDau
-mqSzIiHZCFKcOXHY830A/A3T5fs+CACwJGjIweugDk6l+Qer1pWGpanQHgCyBByt
-=YVwI
+iF4EAREIAAYFAk6RzSUACgkQaC/OocHi7JavcwD/TMULjO8pICHOGGCOCHvMF001
+oOs0paHQCoRwuOnc87MBAIHJFFtUBt0m8zXJbqY5jH/EMOtUnVsr94BFfsL4UMqx
+=g7oI
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/baselayout/baselayout-2.1.ebuild b/sys-apps/baselayout/baselayout-2.1.ebuild
index 9b157fa7d29a51932129ce8c70b149233e4f47b9..f84919f392a0057be447d90ecad2a9273ab3b26a 100644 (file)
--- a/sys-apps/baselayout/baselayout-2.1.ebuild
+++ b/sys-apps/baselayout/baselayout-2.1.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/baselayout/baselayout-2.1.ebuild,v 1.2 2011/10/04 18:36:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.1.ebuild,v 1.3 2011/10/09 16:34:39 vapier Exp $
 
 inherit eutils multilib
 
@@ -36,6 +36,8 @@ multilib_layout() {
        local libdir libdirs=$(get_all_libdirs) def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
        : ${libdirs:=lib}       # it isn't that we don't trust multilib.eclass...
 
+       [ -z "${def_libdir}" ] && die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
+
        # figure out which paths should be symlinks and which should be directories
        local dirs syms exp d
        for libdir in ${libdirs} ; do