Fix multilib.

Package-Manager: portage-2.0.51.19

5 files changed, 118 insertions, 15 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 854bcec7c9ee..e71ab3a6461f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,24 +3,24 @@ Hash: SHA1
 
 MD5 30d382e0a20f8b25e643e0e4ac60e949 ChangeLog 806
 MD5 c697b628359c7055961817876804f0a6 metadata.xml 221
-MD5 b169f143c9eb3069924e41f10e8d40ac portage-2.0.51-r15.ebuild 13133
 MD5 f9fd4371c2fb44b47a0a5d3cfd4f118c portage-2.0.51.18.ebuild 13211
+MD5 b169f143c9eb3069924e41f10e8d40ac portage-2.0.51-r15.ebuild 13133
 MD5 985b398e1a2d623efa13c1c1fbe18119 portage-2.0.51.19.ebuild 13211
-MD5 f0b7328c994da26708e29d66df5b6670 portage-2.0.51.20-r4.ebuild 6292
+MD5 2409c3aefb8aba120ea09d6654b86f19 portage-2.0.51.20-r4.ebuild 6276
 MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911
-MD5 99e1115b7cb92bf81695feace57456da files/digest-portage-2.0.51-r15 71
 MD5 4458663c2aa36fb828981a89ffcaac97 files/digest-portage-2.0.51.18 70
 MD5 f8627c17a73d8568e94f92ea15c69360 files/digest-portage-2.0.51.19 70
+MD5 5f2f342d78aec333f4136420afd6a31f files/digest-portage-2.0.51.20-r4 70
+MD5 47a7436ab36074e8d1c7db19edb2c65a files/dispatch-conf-fixes.patch 1244
 MD5 8c6ba58bbfddca72824b15dacbed69ec files/gcc-2.95-libsandbox.patch 1163
+MD5 99e1115b7cb92bf81695feace57456da files/digest-portage-2.0.51-r15 71
+MD5 77b9bad3d53c36ce5ef3ecdf16554d5a files/emerge-fixes.patch 685
 MD5 a144de1dc5bb195a0a71fd2a5fd572fd files/portage-fixes.patch 1012
-MD5 47a7436ab36074e8d1c7db19edb2c65a files/dispatch-conf-fixes.patch 1244
 MD5 502ca546fcf8ca5141435a9edee6a57f files/repoman-fixes.patch 417
-MD5 5f2f342d78aec333f4136420afd6a31f files/digest-portage-2.0.51.20-r4 70
-MD5 77b9bad3d53c36ce5ef3ecdf16554d5a files/emerge-fixes.patch 685
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCa2nAxvWNPsk/ZP4RAhkMAKCgvXWl5pWS5qezoN8B4Paywl1GlQCeKEs6
-UBpcdyd0cJtOrcmg/B6f6Hg=
-=q4oo
+iD8DBQFCa+T7ArHZZzCEUG0RAg7VAJ47ZWxoxRA9LWp4jw2QZfGoBH/RJQCeJy2W
+b2jfgLRtuePUYEAWBBiVGHU=
+=vk0f
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/sandbox/ChangeLog b/sys-apps/sandbox/ChangeLog
index 6b1920e2ec8f..559bc207e874 100644
--- a/sys-apps/sandbox/ChangeLog
+++ b/sys-apps/sandbox/ChangeLog
@@ -1,6 +1,12 @@
 # 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.5 2005/04/24 08:11:20 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.6 2005/04/24 18:22:00 eradicator Exp $
+
+*sandbox-1.2.1-r3 (24 Apr 2005)
+
+  24 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +sandbox-1.2.1-r3.ebuild:
+  Fix multilib.
 
 *sandbox-1.2.1 (24 Apr 2005)
   24 Apr 2005; Brian Harring <ferringb@gentoo.org> +sandbox-1.2.1-r2.ebuild:
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index e2d519f054a6..051c8a198db0 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -1,20 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 c2f3644981790e85c45988e336433fc2 ChangeLog 802
+MD5 034ac0d90bcd60acce9919a9f5dfe311 ChangeLog 939
 MD5 968e2965b0b6f620634dae6d28d8b4c4 metadata.xml 455
 MD5 fa4e917c828593f1c202fe11f019e2d3 sandbox-1.2.ebuild 1711
-MD5 47438c0ad7e347064cdaf223d6a5f042 sandbox-1.2.1.ebuild 1747
 MD5 23e070ffbbc6123cc5082bab1b9de240 sandbox-1.2.1-r1.ebuild 2131
 MD5 ff83893e146a467c718131e5f68ff52e sandbox-1.2.1-r2.ebuild 2110
+MD5 47438c0ad7e347064cdaf223d6a5f042 sandbox-1.2.1.ebuild 1747
+MD5 bbacfd0118ee1f0ad5c712813e265f51 sandbox-1.2.1-r3.ebuild 2293
 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCa3A3xvWNPsk/ZP4RAgvhAJ4/1fDGK6UUFJUJj7e+2KYmysojTgCeOudl
-amH3d1oJKSqDKY4+Ytvs0AQ=
-=H7y4
+iD8DBQFCa+PhArHZZzCEUG0RApBsAJ9PcIcQUyiQOKSci3k/Z2RYMKHh3wCggTth
+WORuQML0+3Nw70B4+JF31ZI=
+=Qeaf
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/sandbox/files/digest-sandbox-1.2.1-r3 b/sys-apps/sandbox/files/digest-sandbox-1.2.1-r3
new file mode 100644
index 000000000000..6cdf0c26f8f5
--- /dev/null
+++ b/sys-apps/sandbox/files/digest-sandbox-1.2.1-r3
@@ -0,0 +1 @@
+MD5 233586e779d83a260cb747c982acdaa2 sandbox-1.2.1.tar.bz2 220410
diff --git a/sys-apps/sandbox/sandbox-1.2.1-r3.ebuild b/sys-apps/sandbox/sandbox-1.2.1-r3.ebuild
new file mode 100644
index 000000000000..b3c074612147
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-1.2.1-r3.ebuild
@@ -0,0 +1,94 @@
+# 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.1-r3.ebuild,v 1.1 2005/04/24 18:22:00 eradicator Exp $
+
+inherit eutils flag-o-matic eutils toolchain-funcs multilib
+#
+# don't monkey with this ebuild unless contacting portage devs.
+# period.
+#
+
+IUSE=""
+DESCRIPTION="sandbox'd LD_PRELOAD hack"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	http://dev.gentoo.org/~azarah/sandbox/${P}.tar.bz2"
+DEPEND=""
+LICENSE="GPL-2"
+SLOT='0'
+
+#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"
+
+# This revbump just fixes multilib on amd64's 2005.0
+KEYWORDS="~amd64"
+
+RESTRICT="multilib-pkg-force"
+
+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() {
+	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}
+			ewarn $(pwd)
+			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
+}