diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2005-11-14 18:41:54 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2005-11-14 18:41:54 +0000 |
| commit | 505246c8b93f99f2711f27218678e8c8f3d5c86b (patch) | |
| tree | 258e3b0a2e225d0616b0c82c64db9f10d31ecd6a | |
| parent | revision bump (diff) | |
| download | gentoo-2-505246c8b93f99f2711f27218678e8c8f3d5c86b.tar.gz gentoo-2-505246c8b93f99f2711f27218678e8c8f3d5c86b.tar.bz2 gentoo-2-505246c8b93f99f2711f27218678e8c8f3d5c86b.zip | |
Simplify multilib building logic. Other cleanups.
(Portage version: 2.0.53_rc7)
| -rw-r--r-- | sys-apps/sandbox/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/sandbox/sandbox-1.2.13.ebuild | 18 |
2 files changed, 11 insertions, 12 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/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 } |