Fixup libc detection. Fix bug or two.

(Portage version: 2.0.51.20-r5)

4 files changed, 101 insertions, 11 deletions

diff --git a/sys-apps/sandbox/ChangeLog b/sys-apps/sandbox/ChangeLog
index 4f30488da196..34a009d6f613 100644
--- a/sys-apps/sandbox/ChangeLog
+++ b/sys-apps/sandbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/sandbox
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.7 2005/04/28 16:34:28 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.8 2005/04/29 13:47:44 azarah Exp $
+
+*sandbox-1.2.3 (29 Apr 2005)
+
+  29 Apr 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.3.ebuild:
+  Fixup libc detection.  Fix bug or two.
 
 *sandbox-1.2.2 (28 Apr 2005)
 
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 04f9cc17369a..9b21e8c45760 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 a3592597695ce78b015b705e47472fc0 ChangeLog 1069
 MD5 968e2965b0b6f620634dae6d28d8b4c4 metadata.xml 455
 MD5 fa4e917c828593f1c202fe11f019e2d3 sandbox-1.2.ebuild 1711
@@ -9,16 +6,11 @@ MD5 23e070ffbbc6123cc5082bab1b9de240 sandbox-1.2.1-r1.ebuild 2131
 MD5 ff83893e146a467c718131e5f68ff52e sandbox-1.2.1-r2.ebuild 2110
 MD5 6fcdfc54e50834549f956f92430059ff sandbox-1.2.1-r3.ebuild 2299
 MD5 3c85f7c72e45afadde1025fc0ef3a205 sandbox-1.2.2.ebuild 2235
+MD5 3c85f7c72e45afadde1025fc0ef3a205 sandbox-1.2.3.ebuild 2235
 MD5 06ad9881ad2610487c66565ee5b39389 files/digest-sandbox-1.2 64
 MD5 9b60e9e6d1e45533a0e719fdf023ec07 files/digest-sandbox-1.2.1 66
 MD5 9b60e9e6d1e45533a0e719fdf023ec07 files/digest-sandbox-1.2.1-r1 66
 MD5 9b60e9e6d1e45533a0e719fdf023ec07 files/digest-sandbox-1.2.1-r2 66
 MD5 9b60e9e6d1e45533a0e719fdf023ec07 files/digest-sandbox-1.2.1-r3 66
 MD5 fb651b249c3214a6d0fa321e1d419e07 files/digest-sandbox-1.2.2 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCcRHE1ZcsMnZjRyIRAieOAKCq7aZGZoIoJshc7QBMM/Wycr/jWwCfalE0
-yhHYvi0m4Gwg6YwFK9gpeGc=
-=ObUc
------END PGP SIGNATURE-----
+MD5 bf2c5f346fcc11659401c9240b1b8db9 files/digest-sandbox-1.2.3 66
diff --git a/sys-apps/sandbox/files/digest-sandbox-1.2.3 b/sys-apps/sandbox/files/digest-sandbox-1.2.3
new file mode 100644
index 000000000000..f0bc8bd7c964
--- /dev/null
+++ b/sys-apps/sandbox/files/digest-sandbox-1.2.3
@@ -0,0 +1 @@
+MD5 651ec9f054242f5955628ccd1345eb3f sandbox-1.2.3.tar.bz2 221372
diff --git a/sys-apps/sandbox/sandbox-1.2.3.ebuild b/sys-apps/sandbox/sandbox-1.2.3.ebuild
new file mode 100644
index 000000000000..7f63068468df
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-1.2.3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.3.ebuild,v 1.1 2005/04/29 13:47:44 azarah Exp $
+
+inherit eutils flag-o-matic eutils toolchain-funcs multilib
+#
+# don't monkey with this ebuild unless contacting portage devs.
+# period.
+#
+
+DESCRIPTION="sandbox'd LD_PRELOAD hack"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	http://dev.gentoo.org/~azarah/sandbox/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+RESTRICT="multilib-pkg-force"
+
+#KEYWORDS="  alpha  amd64  arm  hppa  ia64  mips  ppc  ppc-macos  ppc64  s390  sh  sparc  x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+DEPEND="virtual/libc"
+
+check_multilib() {
+	has_m32
+	if [ "$?" == 0 ]; then
+		einfo "Found valid multilib environment."
+		einfo "Building with multilib support."
+		export MULTILIB="1"
+	else
+		ewarn "No valid multilib environment found!"
+		ewarn "Building without multilib support. If"
+		ewarn "you want to have multilib support,"
+		ewarn "emerge gcc with \"multilib\" in your"
+		ewarn "useflags."
+	fi
+}
+
+src_unpack() {
+	if has_multilib_profile; then
+		for TA in $(get_install_abis); do
+			unpack ${A} || die "unpack failed"
+			cd ${S}
+			epunt_cxx
+			cd ${WORKDIR}
+			mv ${S} ${S%/}-${TA} || die "failed mving \$S to $TA"
+		done
+	else
+		unpack ${A} || die "unpack failed"
+		cd ${S}
+		epunt_cxx
+	fi
+}
+
+src_compile() {
+	filter-lfs-flags #90228
+	if has_multilib_profile; then
+		OABI="${ABI}"
+		export CFLAGS="${CFLAGS} -DSB_HAVE_64BIT_ARCH"
+		for ABI in $(get_install_abis); do
+			export ABI
+			cd ${S}-${ABI}
+			econf --libdir="/usr/$(get_libdir)" || die "econf failed for $ABI"
+			emake || die "emake failed for $ABI"
+		done
+		ABI="${OABI}"
+	else
+		if useq amd64; then
+			check_multilib
+			export HAVE_64BIT_ARCH="${MULTILIB}"
+		fi
+		cd ${S}
+		econf || die "econf failed"
+		emake || die "emake failed"
+	fi
+}
+
+src_install() {
+	if has_multilib_profile; then
+		OABI="${ABI}"
+		for ABI in $(get_install_abis); do
+			export ABI
+			cd ${S}-${ABI}
+			make DESTDIR="${D}" install || die "make install failed for $ABI"
+		done
+		ABI="${OABI}"
+	else
+		cd ${S}
+		einstall || die "einstalled failed"
+	fi
+}