diff options
author | Martin Schlemmer <azarah@gentoo.org> | 2005-11-28 10:34:43 +0000 |
---|---|---|
committer | Martin Schlemmer <azarah@gentoo.org> | 2005-11-28 10:34:43 +0000 |
commit | 1978ab3de82b381b62163cd86b61ca1f3a00e031 (patch) | |
tree | 9765e43fa833e32a193ff735b143e2254ec26317 /sys-apps | |
parent | yet another patch from the sf.net tracker (diff) | |
download | gentoo-2-1978ab3de82b381b62163cd86b61ca1f3a00e031.tar.gz gentoo-2-1978ab3de82b381b62163cd86b61ca1f3a00e031.tar.bz2 gentoo-2-1978ab3de82b381b62163cd86b61ca1f3a00e031.zip |
New release.
(Portage version: 2.0.53_rc7)
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/sandbox/ChangeLog | 7 | ||||
-rw-r--r-- | sys-apps/sandbox/Manifest | 12 | ||||
-rw-r--r-- | sys-apps/sandbox/files/digest-sandbox-1.2.14 | 1 | ||||
-rw-r--r-- | sys-apps/sandbox/sandbox-1.2.14.ebuild | 114 |
4 files changed, 123 insertions, 11 deletions
diff --git a/sys-apps/sandbox/ChangeLog b/sys-apps/sandbox/ChangeLog index d4c197247d44..e13362d12e27 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.49 2005/11/14 18:41:54 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.50 2005/11/28 10:34:43 azarah Exp $ + +*sandbox-1.2.14 (28 Nov 2005) + + 28 Nov 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.14.ebuild: + New release. 14 Nov 2005; Martin Schlemmer <azarah@gentoo.org> sandbox-1.2.13.ebuild: Simplify multilib building logic. Other cleanups. diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest index b4c1af81316d..21834dca92bb 100644 --- a/sys-apps/sandbox/Manifest +++ b/sys-apps/sandbox/Manifest @@ -1,11 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - 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 MD5 b82ec2a608295a15c019aa485cfceb37 files/digest-sandbox-1.2.13 67 +MD5 598f16a521987f565cbe705e579e3f22 files/digest-sandbox-1.2.14 67 MD5 0b9d8a3302f89af8fcb328f02eb16824 files/digest-sandbox-1.2.9 66 MD5 36e3d59477310a00b5b240377e4e47dd files/sandbox-1.2.10-uclibc-getcwd.patch 751 MD5 76e3fe575f6739c3a9de06eb2dcdd1ac files/sandbox-1.2.9-uclibc-getcwd.patch 508 @@ -14,11 +12,5 @@ MD5 93c2db7fef4c24386baf4d5be753be05 sandbox-1.2.10.ebuild 2910 MD5 41d4e62b633477ef141bb1a03ebb241b sandbox-1.2.11.ebuild 3020 MD5 3bd9114811a6ab32056c15562df7c540 sandbox-1.2.12.ebuild 3160 MD5 e41b4d1bf0b65a813658e2592af765b1 sandbox-1.2.13.ebuild 3001 +MD5 e41b4d1bf0b65a813658e2592af765b1 sandbox-1.2.14.ebuild 3001 MD5 2d8462f23197a05dc7198d1d43d7c7ae sandbox-1.2.9.ebuild 3009 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDg5ldgIKl8Uu19MoRAkEoAJwOjwOmaBIuG2KFycg8P+ivhKFruACdFYJ4 -ljW/oDsX5LfQvgzVTE5Je/c= -=cIZQ ------END PGP SIGNATURE----- diff --git a/sys-apps/sandbox/files/digest-sandbox-1.2.14 b/sys-apps/sandbox/files/digest-sandbox-1.2.14 new file mode 100644 index 000000000000..6fa654b3bd10 --- /dev/null +++ b/sys-apps/sandbox/files/digest-sandbox-1.2.14 @@ -0,0 +1 @@ +MD5 cbc05b64fc57c56bc47c894ff9f6ddde sandbox-1.2.14.tar.bz2 223690 diff --git a/sys-apps/sandbox/sandbox-1.2.14.ebuild b/sys-apps/sandbox/sandbox-1.2.14.ebuild new file mode 100644 index 000000000000..d57c39a77854 --- /dev/null +++ b/sys-apps/sandbox/sandbox-1.2.14.ebuild @@ -0,0 +1,114 @@ +# 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.14.ebuild,v 1.1 2005/11/28 10:34:43 azarah Exp $ + +# +# don't monkey with this ebuild unless contacting portage devs. +# period. +# + +inherit eutils flag-o-matic eutils toolchain-funcs multilib + +DESCRIPTION="sandbox'd LD_PRELOAD hack" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="mirror://gentoo/${P}.tar.bz2 + http://dev.gentoo.org/~azarah/sandbox/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +#KEYWORDS=" alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="" +RESTRICT="multilib-pkg-force" + +DEPEND="" + +setup_multilib() { + if use amd64 && has_m32 && [[ ${CONF_MULTILIBDIR} == "lib32" ]]; then + export DEFAULT_ABI="amd64" + export MULTILIB_ABIS="x86 amd64" + export CFLAGS_amd64=${CFLAGS_amd64:-"-m64"} + export CFLAGS_x86=${CFLAGS_x86-"-m32 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"} + export CHOST_amd64="x86_64-pc-linux-gnu" + export CHOST_x86="i686-pc-linux-gnu" + export LIBDIR_amd64=${LIBDIR_amd64-${CONF_LIBDIR}} + export LIBDIR_x86=${LIBDIR_x86-${CONF_MULTILIBDIR}} + fi +} + +src_unpack() { + unpack ${A} +} + +abi_fail_check() { + local ABI=$1 + if [[ ${ABI} == "x86" ]] ; then + echo + eerror "Building failed for ABI=x86!. This usually means a broken" + eerror "multilib setup. Please fix that before filling a bugreport" + eerror "against sandbox." + echo + fi +} + +src_compile() { + setup_multilib + + filter-lfs-flags #90228 + + has_multilib_profile && append-flags -DSB_HAVE_64BIT_ARCH + + ewarn "If configure fails with a 'cannot run C compiled programs' error, try this:" + ewarn "FEATURES=-sandbox emerge sandbox" + + local iscross=0 + [[ -n ${CBUILD} && ${CBUILD} != ${CHOST} ]] && iscross=1 + + OABI="${ABI}" + for ABI in $(get_install_abis); do + export ABI + export CHOST=$(get_abi_CHOST) + [[ ${iscross} == 0 ]] && export CBUILD=${CHOST} + # Needed for older broken portage versions (bug #109036) + portageq has_version "${ROOT}" '<portage-2.0.51.22' && \ + unset EXTRA_ECONF + + 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 || { + abi_fail_check "${ABI}" + die "emake failed for ${ABI}" + } + done + ABI="${OABI}" +} + +src_install() { + setup_multilib + + OABI="${ABI}" + for ABI in $(get_install_abis); do + cd ${S}-${ABI} + einfo "Installing sandbox for ABI=${ABI}..." + make DESTDIR="${D}" install || die "make install failed for ${ABI}" + done + 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 +} + +pkg_preinst() { + chown root:portage ${IMAGE}/var/log/sandbox + chmod 0770 ${IMAGE}/var/log/sandbox +} |