summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-12-03 19:52:40 +0000
committerMike Frysinger <vapier@gentoo.org>2005-12-03 19:52:40 +0000
commit0e32b81ad1edb707fe922cc1a6c986b811ea3277 (patch)
treecccea3a77d7985bee04197fa3d0f07316d3ddf6d /sys-apps/sandbox
parentgcc 4.1 patch thanks to Hanno (diff)
downloadhistorical-0e32b81ad1edb707fe922cc1a6c986b811ea3277.tar.gz
historical-0e32b81ad1edb707fe922cc1a6c986b811ea3277.tar.bz2
historical-0e32b81ad1edb707fe922cc1a6c986b811ea3277.zip
make sure we reset CHOST or src_install may fail on multiabi systems
Package-Manager: portage-2.0.53
Diffstat (limited to 'sys-apps/sandbox')
-rw-r--r--sys-apps/sandbox/Manifest8
-rw-r--r--sys-apps/sandbox/sandbox-1.2.16.ebuild17
2 files changed, 12 insertions, 13 deletions
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 13963d336e72..0bbd81edd75b 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -6,11 +6,11 @@ MD5 97d135bb57b8e72a00cb615055d919cc files/digest-sandbox-1.2.12 67
MD5 ed12f6dab5b8d733c60a6495cbaa43a9 files/digest-sandbox-1.2.16 67
MD5 4a6b419321a7e1ee609c8af41905ff1b metadata.xml 337
MD5 3bd9114811a6ab32056c15562df7c540 sandbox-1.2.12.ebuild 3160
-MD5 59a25aeec8104a87a4e1757f339e4efd sandbox-1.2.16.ebuild 3106
+MD5 f4609f8335c1cf5310bf8f8580497233 sandbox-1.2.16.ebuild 3050
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
-iD8DBQFDkES21ZcsMnZjRyIRAg5kAJ40SjBU+QpfdM694jozmCtnOB83qwCfTD8m
-vOt3hG/6UpHzsIarVgqrlpw=
-=9KZC
+iD8DBQFDkfgngIKl8Uu19MoRAr73AJ9Xcb0ItMjUoJJlt4VH13sNq8PAuQCdErgl
+HTZ1dWOPvFQzgkfy/klLZ7o=
+=EyOH
-----END PGP SIGNATURE-----
diff --git a/sys-apps/sandbox/sandbox-1.2.16.ebuild b/sys-apps/sandbox/sandbox-1.2.16.ebuild
index 2a64ad33e30b..579c367258eb 100644
--- a/sys-apps/sandbox/sandbox-1.2.16.ebuild
+++ b/sys-apps/sandbox/sandbox-1.2.16.ebuild
@@ -1,6 +1,6 @@
# 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.16.ebuild,v 1.1 2005/12/02 12:48:51 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.16.ebuild,v 1.2 2005/12/03 19:52:40 vapier Exp $
#
# don't monkey with this ebuild unless contacting portage devs.
@@ -66,8 +66,8 @@ src_compile() {
[[ -n ${CBUILD} && ${CBUILD} != ${CHOST} ]] && iscross=1
- OABI="${ABI}"
- OCHOST="${CHOST}"
+ OABI=${ABI}
+ OCHOST=${CHOST}
for ABI in $(get_install_abis); do
mkdir "${WORKDIR}/build-${ABI}-${OCHOST}"
cd "${WORKDIR}/build-${ABI}-${OCHOST}"
@@ -89,27 +89,26 @@ src_compile() {
die "emake failed for ${ABI}"
}
done
- ABI="${OABI}"
+ ABI=${OABI}
+ CHOST=${OCHOST}
}
src_install() {
setup_multilib
- OABI="${ABI}"
+ OABI=${ABI}
for ABI in $(get_install_abis); do
cd "${WORKDIR}/build-${ABI}-${CHOST}"
einfo "Installing sandbox for ABI=${ABI}..."
make DESTDIR="${D}" install || die "make install failed for ${ABI}"
done
- ABI="${OABI}"
+ ABI=${OABI}
keepdir /var/log/sandbox
fowners root:portage /var/log/sandbox
fperms 0770 /var/log/sandbox
- for x in "${S}"/{AUTHORS,COPYING,ChangeLog,NEWS,README} ; do
- [[ -s ${x} ]] && dodoc "${x}"
- done
+ dodoc AUTHORS ChangeLog NEWS README
}
pkg_preinst() {