diff options
Diffstat (limited to 'sys-apps/sandbox')
-rw-r--r-- | sys-apps/sandbox/ChangeLog | 5 | ||||
-rw-r--r-- | sys-apps/sandbox/Manifest | 10 | ||||
-rw-r--r-- | sys-apps/sandbox/sandbox-1.2.13.ebuild | 18 |
3 files changed, 16 insertions, 17 deletions
diff --git a/sys-apps/sandbox/ChangeLog b/sys-apps/sandbox/ChangeLog index 7b18daf1b670..d4c197247d44 100644 --- a/sys-apps/sandbox/ChangeLog +++ b/sys-apps/sandbox/ChangeLog @@ -1,6 +1,9 @@ # 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.48 2005/10/13 17:52:56 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.49 2005/11/14 18:41:54 azarah Exp $ + + 14 Nov 2005; Martin Schlemmer <azarah@gentoo.org> sandbox-1.2.13.ebuild: + Simplify multilib building logic. Other cleanups. 13 Oct 2005; Martin Schlemmer <azarah@gentoo.org> sandbox-1.2.12.ebuild, sandbox-1.2.13.ebuild: diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest index 7cf79544ce6a..ac70956bf4b9 100644 --- a/sys-apps/sandbox/Manifest +++ b/sys-apps/sandbox/Manifest @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 9703c8401e696bea87289dfb35928a3e ChangeLog 6473 +MD5 1167f4447fc3e0fb31f2a156de853755 ChangeLog 6602 MD5 9fe5eef00b6290f1c9fb750c3bfc1fad files/digest-sandbox-1.2.10 67 MD5 a3b2897eb709807fa36afb0c7b23c01d files/digest-sandbox-1.2.11 67 MD5 97d135bb57b8e72a00cb615055d919cc files/digest-sandbox-1.2.12 67 @@ -13,12 +13,12 @@ MD5 4a6b419321a7e1ee609c8af41905ff1b metadata.xml 337 MD5 9ad9f72791d00e4ecaf1d022821a25f3 sandbox-1.2.10.ebuild 2913 MD5 b30e1ca75642855f73ec2bb819f3f0c2 sandbox-1.2.11.ebuild 3023 MD5 ca2729f214a5c4c02a7ebb406b67f139 sandbox-1.2.12.ebuild 3159 -MD5 b9051757b6ff540b0cb8670ff26d08f5 sandbox-1.2.13.ebuild 3170 +MD5 c855214654d3eba85dbfd119417e203c sandbox-1.2.13.ebuild 3000 MD5 316ac3ed1bdc5b458df0a3ef64ce9e56 sandbox-1.2.9.ebuild 3012 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDTp+l1ZcsMnZjRyIRAhWfAJ9NzY/rfZ225Z04kCBKHO1fbOUKqwCgv3uI -phOqBieHsELUpD3hae9S+sI= -=4xJZ +iD8DBQFDeNts1ZcsMnZjRyIRAi5tAKC0xAqn3TzUZbxt4DsxhEuY3L+KmwCcC5yW +dZsq/xoSShOombwTH1T3d6w= +=gNva -----END PGP SIGNATURE----- diff --git a/sys-apps/sandbox/sandbox-1.2.13.ebuild b/sys-apps/sandbox/sandbox-1.2.13.ebuild index e9a1d0da49e7..d4e9b226f586 100644 --- a/sys-apps/sandbox/sandbox-1.2.13.ebuild +++ b/sys-apps/sandbox/sandbox-1.2.13.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.13.ebuild,v 1.3 2005/10/13 17:52:56 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.13.ebuild,v 1.4 2005/11/14 18:41:54 azarah Exp $ # # don't monkey with this ebuild unless contacting portage devs. @@ -37,13 +37,7 @@ setup_multilib() { } src_unpack() { - setup_multilib - for ABI in $(get_install_abis) ; do - cd ${WORKDIR} - unpack ${A} - einfo "Unpacking sandbox for ABI=${ABI}..." - mv ${S} ${S%/}-${ABI} || die "failed moving \$S to ${ABI}" - done + unpack ${A} } abi_fail_check() { @@ -79,9 +73,11 @@ src_compile() { portageq has_version "${ROOT}" '<portage-2.0.51.22' && \ unset EXTRA_ECONF - cd ${S}-${ABI} + mkdir "${S}-${ABI}" + cd "${S}-${ABI}" einfo "Configuring sandbox for ABI=${ABI}..." + ECONF_SOURCE="../${P}/" \ econf --libdir="/usr/$(get_libdir)" einfo "Building sandbox for ABI=${ABI}..." emake || { @@ -107,8 +103,8 @@ src_install() { fowners root:portage /var/log/sandbox fperms 0770 /var/log/sandbox - for x in "${S}-${ABI}"/{AUTHORS,COPYING,ChangeLog,NEWS,README} ; do - [[ -f ${x} && $(stat -c "%s" "${x}") -gt 0 ]] && dodoc "${x}" + for x in "${S}"/{AUTHORS,COPYING,ChangeLog,NEWS,README} ; do + [[ -s ${x} ]] && dodoc "${x}" done } |