use append-flags, not CFLAGS=$CFLAGS

(Portage version: 2.1.1_pre2-r4)
 (Signed Manifest commit)

3 files changed, 11 insertions, 265 deletions

diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 752bc2dac0cb..63380e12bc85 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -29,21 +29,16 @@ AUX config-netboot 9853 RMD160 3d62cf31765adbc88c7a39f0f21223d7e73ef627 SHA1 0dc
 MD5 d9841a0171170d16bb121c696591e7ef files/config-netboot 9853
 RMD160 3d62cf31765adbc88c7a39f0f21223d7e73ef627 files/config-netboot 9853
 SHA256 75cae861b7bae144ca86998cb90dae9bcb0f54e09ed0c36d1ed81ad79a401e3d files/config-netboot 9853
-DIST busybox-1.1.0.tar.bz2 1408642 RMD160 12769c88b1813063044ff29d43171be114cf178d SHA1 433cafb1badc1f752069d18217129651fe93be69 SHA256 3377d271dcfcbf8f49368c63c4819d4f8306bc529766bb0d8f4a12888fb20596
 DIST busybox-1.1.3.tar.bz2 1435820 RMD160 b1e3409bc3180532af60140cdc5cfa84591c9641 SHA1 9feb01c74e370e7e59b6ccecd9cee2760435b462 SHA256 5228a88866211810c69d7a5be925cf87df47519b1d9d403aaca63bbdd32c975e
 DIST busybox-1.2.0.tar.bz2 1399041 RMD160 c9cc9cf3ad3f947519489c8492a845228a736438 SHA1 857ec4bec588af8f1f843472f02d2058a215f4bb SHA256 e066e6f526fd1a4473f4431a05848181d12056bd1c12456954a68f9b15a57624
-EBUILD busybox-1.1.0.ebuild 6761 RMD160 b8a191e8319261be603a2195886df00245eef243 SHA1 a7f216a73e4ec91063f6241ff5c63d5130f589ac SHA256 a7dcab7b8e16cc274f3b1821a0593d40c2df3d960ee03d8849b29ba76b777cb4
-MD5 523b7cf5384c0dc117c4bdab3e04f770 busybox-1.1.0.ebuild 6761
-RMD160 b8a191e8319261be603a2195886df00245eef243 busybox-1.1.0.ebuild 6761
-SHA256 a7dcab7b8e16cc274f3b1821a0593d40c2df3d960ee03d8849b29ba76b777cb4 busybox-1.1.0.ebuild 6761
-EBUILD busybox-1.1.3.ebuild 6637 RMD160 10972d2c6bbfb97c0b66b03069d0ac832c20156d SHA1 1cc7e36613505569fe2b100a79780dd85b990d21 SHA256 99414ab5552d1b0c3d91dead0faeb0ba2808778e3251fee47f510b790cd162e6
-MD5 0151b917fc70fbde079e8bf01202fa89 busybox-1.1.3.ebuild 6637
-RMD160 10972d2c6bbfb97c0b66b03069d0ac832c20156d busybox-1.1.3.ebuild 6637
-SHA256 99414ab5552d1b0c3d91dead0faeb0ba2808778e3251fee47f510b790cd162e6 busybox-1.1.3.ebuild 6637
-EBUILD busybox-1.2.0.ebuild 6649 RMD160 918684b78a7485b490fd5d9621c904580116ad11 SHA1 76e45470ca3508079891769275039951f98b8f7d SHA256 becddb3403c0b763d95b0615e39b0fc268fe526488577b133c41b8c35a06138f
-MD5 572cd3ce5d4fe698d9d80dc11398f1bd busybox-1.2.0.ebuild 6649
-RMD160 918684b78a7485b490fd5d9621c904580116ad11 busybox-1.2.0.ebuild 6649
-SHA256 becddb3403c0b763d95b0615e39b0fc268fe526488577b133c41b8c35a06138f busybox-1.2.0.ebuild 6649
+EBUILD busybox-1.1.3.ebuild 6628 RMD160 913d2b16fbd352459d476c0ea43914a28591b7e2 SHA1 eb137e24aad34e6c97df39d78eb691f868e4f2fb SHA256 ce9adaf0b05f5879f7c50e653e665b31dc1439776bae781ca70015ce4d3d5308
+MD5 33e048d9d6416b060343e0454f152c41 busybox-1.1.3.ebuild 6628
+RMD160 913d2b16fbd352459d476c0ea43914a28591b7e2 busybox-1.1.3.ebuild 6628
+SHA256 ce9adaf0b05f5879f7c50e653e665b31dc1439776bae781ca70015ce4d3d5308 busybox-1.1.3.ebuild 6628
+EBUILD busybox-1.2.0.ebuild 6640 RMD160 662f81c69046bcb0607c97d6c6cc6fd16ff19f7c SHA1 6268bcb50a8d729ca0e29d9b64d889eab29c79df SHA256 518278a3a9d5c08df2c26c55257f33d5c3acfd238059ce706c3d8287c9cb4aa9
+MD5 bbae384bf114f0001fcbb6393994a21b busybox-1.2.0.ebuild 6640
+RMD160 662f81c69046bcb0607c97d6c6cc6fd16ff19f7c busybox-1.2.0.ebuild 6640
+SHA256 518278a3a9d5c08df2c26c55257f33d5c3acfd238059ce706c3d8287c9cb4aa9 busybox-1.2.0.ebuild 6640
 MISC ChangeLog 16887 RMD160 07863d543b074d48503191bf246d4db718a0d50d SHA1 d913a3e936221c7de5a4c18d01bd2d59d0b2f9b4 SHA256 6d98f8aa3ebbb8ec541893f77f9c334e95eb3465b63389c992287ec4db823055
 MD5 3e6ece63bf0e34bd65171621c4def0b8 ChangeLog 16887
 RMD160 07863d543b074d48503191bf246d4db718a0d50d ChangeLog 16887
@@ -52,9 +47,6 @@ MISC metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 SHA1 aa4b2
 MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161
 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 metadata.xml 161
 SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e metadata.xml 161
-MD5 f6c0e8bba77ce0a1ed09e590071c033c files/digest-busybox-1.1.0 247
-RMD160 960eafa3aed947d819a4f5e56935c5942f3b6999 files/digest-busybox-1.1.0 247
-SHA256 99e19c3a0386f9f61a27cd5a213ef49b588160ffb0c8db44773b542d2a971c5e files/digest-busybox-1.1.0 247
 MD5 df5ae4a9e4c890771c2b9862b62934e3 files/digest-busybox-1.1.3 247
 RMD160 2d9494499a2dbb4298b75881ba8ad1c4faf5cfd5 files/digest-busybox-1.1.3 247
 SHA256 8e2b432ca3a9d41a3570fc5e46c188a90a297211dd5edfa201aec67025bf6bda files/digest-busybox-1.1.3 247
@@ -64,9 +56,7 @@ SHA256 c451956a96baf9e9a0a1e22c65fa5ad2f05f3ad5ffe14ee48b82ea7d8cd679d4 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iQCVAwUBRLKURp4WFLgrx1GWAQK2nAP7BdUKo4L5GayjhQwRdzOyEjIcLyJ9Knn3
-FanHAPVinWiWqp9tQF92molflNG4xyUhXMurjL7tjx0j9Q35Ywe9OVVXAJ3wNzhE
-L0xdNEcIGAEfCjVKHIEcKd3mXd7SgTJsmnOUpznQ3/n5+oQiQWS60zS0BtAVKuW1
-ROrdJDR6huk=
-=ddft
+iD8DBQFEuFh3amhnQswr0vIRAj3JAKC8Gqv4Js1npwdmJRpyn4yQgtpyJgCcDrh1
+7Kg7b0Ii3rN3U4vinVz7z4s=
+=7w61
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.1.0.ebuild b/sys-apps/busybox/busybox-1.1.0.ebuild
deleted file mode 100644
index fdbc50593fe3..000000000000
--- a/sys-apps/busybox/busybox-1.1.0.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.1.0.ebuild,v 1.17 2006/06/28 03:33:18 tgall Exp $
-
-inherit eutils
-
-#SNAPSHOT=20040726
-SNAPSHOT=""
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="http://www.busybox.net/"
-if [[ -n ${SNAPSHOT} ]] ; then
-	MY_P=${PN}
-	SRC_URI="http://www.busybox.net/downloads/snapshots/${PN}-${SNAPSHOT}.tar.bz2"
-else
-	MY_P=${PN}-${PV/_/-}
-	SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="debug static savedconfig netboot floppyboot make-symlinks"
-RESTRICT="test"
-
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-# <pebenito> then eventually turning on selinux would mean
-# adding a dep: selinux? ( sys-libs/libselinux )
-
-busybox_set_env() {
-	type -p ${CHOST}-ar > /dev/null && export CROSS=${CHOST}-
-	# Don't let KBUILD_OUTPUT mess us up #88088
-	unset KBUILD_OUTPUT
-}
-
-busybox_config_option() {
-	case $1 in
-		y) sed -i -e "s:.*CONFIG_$2.*set:CONFIG_$2=y:g" .config;;
-		n) sed -i -e "s:CONFIG_$2=y:# CONFIG_$2 is not set:g" .config;;
-		Y) echo "CONFIG_$2=y" >> .config;;
-		N) echo "CONFIG_$2=n" >> .config;;
-		*) use $1 \
-		       && busybox_config_option y $2 \
-		       || busybox_config_option n $2
-		   return 0
-		   ;;
-	esac
-	einfo $(grep "CONFIG_$2[= ]" .config)
-}
-
-src_unpack() {
-	busybox_set_env
-	unpack ${A}
-	cd "${S}"
-
-	# patches go here!
-	epatch "${FILESDIR}"/1.1.0/bb.patch
-	epatch "${FILESDIR}"/1.1.0/ppc64-insmod.patch
-	epatch "${FILESDIR}"/1.1.0/glibc.patch
-
-	# we'll let portage do the stripping
-	# respect env CFLAGS
-	sed -i \
-		-e '/STRIPCMD:=/s:=.*:=true:' \
-		-e '/^CFLAGS=/s:=:+=:' \
-		Rules.mak
-
-	# check for a busybox config before making one of our own.
-	# if one exist lets return and use it.
-	# fine grained config control for user defined busybox configs.
-	# [package]-[version]-[revision].config
-	# [package]-[version].config
-	# [package].config
-
-	if use savedconfig ; then
-		[[ -r .config ]] && rm .config
-		for conf in ${PN}-${PV}-${PR} ${PN}-${PV} ${PN}; do
-			configfile=${ROOT}/etc/${PN}/${CHOST}/${conf}.config
-			[[ -r ${configfile} ]] || configfile=/etc/${PN}/${CHOST}/${conf}.config
-			if [[ -r ${configfile} ]] ; then
-				cp ${configfile} ${S}/.config
-				break
-			fi
-		done
-		if [[ -r ${S}/.config ]] ; then
-			einfo "Found your ${configfile} and using it."
-			return 0
-		fi
-	fi
-	if use netboot ; then
-		cp "${FILESDIR}"/config-netboot .config
-		sed -i \
-			-e '/DEFAULT_SCRIPT/s:/share/udhcpc/default.script:/lib/udhcpc.script:' \
-			networking/udhcp/libbb_udhcp.h \
-			|| die "fixing netboot/udhcpc"
-	elif use floppyboot ; then
-		cp "${FILESDIR}"/config-floppyboot .config
-	fi
-
-	# setup the config file
-	make allyesconfig > /dev/null
-	busybox_config_option n DMALLOC
-	busybox_config_option n FEATURE_SUID_CONFIG
-
-	# If these are not set and we are using a uclibc/busybox setup
-	# all calls to system() will fail.
-	busybox_config_option y FEATURE_SH_IS_ASH
-	busybox_config_option n FEATURE_SH_IS_NONE
-
-	busybox_config_option static STATIC
-	busybox_config_option debug DEBUG
-	use debug \
-		&& busybox_config_option Y NO_DEBUG_LIB \
-		&& busybox_config_option N DMALLOC \
-		&& busybox_config_option N EFENCE
-
-	# 1.00-pre5 uses the old selinux api which is no longer maintained
-	#busybox_config_option selinux SELINUX
-	busybox_config_option n SELINUX
-
-	# default a bunch of uncommon options to off
-	for opt in LOCALE_SUPPORT TFTP FTP{GET,PUT} IPCALC TFTP HUSH \
-		LASH MSH INETD DPKG RPM2CPIO RPM FOLD LOGNAME OD CRONTAB \
-		UUDECODE UUENCODE SULOGIN DC
-	do
-		busybox_config_option n ${opt}
-	done
-
-	make oldconfig > /dev/null
-}
-
-src_compile() {
-	busybox_set_env
-	use ppc64 && CFLAGS="${CFLAGS} -mminimal-toc"
-	emake -j1 CROSS="${CROSS}" depend || die "depend failed"
-	emake CROSS="${CROSS}" busybox || die "build failed"
-	if ! use static ; then
-		mv busybox{,.bak}
-		local failed=0
-		emake -j1 \
-			LDFLAGS="${LDFLAGS} -static" \
-			CROSS="${CROSS}" \
-			busybox || failed=1
-		if [[ ${failed} == 1 ]] ; then
-			if has_version '<sys-libs/glibc-2.3.5' ; then
-				eerror "Your glibc has broken static support, ignorning static build failure."
-				eerror "See http://bugs.gentoo.org/show_bug.cgi?id=94879"
-				cp busybox.bak bb
-			else
-				die "static build failed"
-			fi
-		else
-			mv busybox bb
-		fi
-		mv busybox{.bak,}
-	fi
-}
-
-src_install() {
-	busybox_set_env
-
-	into /
-	dobin busybox
-	use static \
-		&& dosym busybox /bin/bb \
-		|| dobin bb
-
-	if use make-symlinks ; then
-		if [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
-			ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
-			ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
-			ewarn "If you are creating a binary only and not merging this is probably ok."
-			ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is realy what you want."
-			die "silly options will destroy your system"
-		fi
-		make CROSS="${CROSS}" install || die
-		cp -pPR _install/${x}/* "${D}"/ || die "copying links for ${x} failed"
-		cd "${D}"
-		# XXX: should really move this to pkg_preinst() ...
-		local symlink
-		for symlink in {,usr/}{bin,sbin}/* linuxrc ; do
-			[[ -L ${symlink} ]] || continue
-			[[ -e ${ROOT}/${symlink} ]] \
-				&& eerror "Deleting symlink ${symlink} because it exists in ${ROOT}" \
-				&& rm ${symlink}
-		done
-		cd "${S}"
-	fi
-
-	dodoc AUTHORS Changelog README TODO
-
-	cd docs || die
-	docinto txt
-	dodoc *.txt
-	docinto pod
-	dodoc *.pod
-	dohtml *.html *.sgml
-
-	# no man files?
-	# cd ../man && doman *.1
-
-	cd ../examples || die
-	docinto examples
-	dodoc inittab depmod.pl
-
-	cd bootfloppy || die
-	docinto bootfloppy
-	dodoc bootfloppy.txt display.txt mkdevs.sh etc/* etc/init.d/* 2>/dev/null
-
-	cd ../../ || die
-	if has buildpkg ${FEATURES} && has keepwork ${FEATURES} ; then
-		cd "${S}"
-		# this should install to the ./_install/ dir by default.
-		# we make a micro pkg of busybox that can be used for
-		# embedded systems -solar
-		if ! use make-symlinks ; then
-			make CROSS="${CROSS}" install || die
-		fi
-		cd ./_install/ \
-			&& tar --no-same-owner -jcvf ${WORKDIR}/${MY_P}-${ARCH}.bz2 . \
-			&& cd ..
-	fi
-
-	if use savedconfig ; then
-		einfo "Saving this build config to /etc/${PN}/${CHOST}/${PN}-${PV}-${PR}.config"
-		einfo "Read this ebuild for more info on how to take advantage of this option"
-		insinto /etc/${PN}/${CHOST}/
-		newins "${S}"/.config ${PN}-${PV}-${PR}.config
-	fi
-}
-
-pkg_postinst() {
-	echo
-	einfo "This ebuild has support for user defined configs"
-	einfo "Please read this ebuild for more details and re-emerge as needed"
-	einfo "if you want to add or remove functionality for ${PN}"
-	echo
-}
diff --git a/sys-apps/busybox/files/digest-busybox-1.1.0 b/sys-apps/busybox/files/digest-busybox-1.1.0
deleted file mode 100644
index 7c8cbcf909be..000000000000
--- a/sys-apps/busybox/files/digest-busybox-1.1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 855e12c7c9dc90e16b014a788925e4cb busybox-1.1.0.tar.bz2 1408642
-RMD160 12769c88b1813063044ff29d43171be114cf178d busybox-1.1.0.tar.bz2 1408642
-SHA256 3377d271dcfcbf8f49368c63c4819d4f8306bc529766bb0d8f4a12888fb20596 busybox-1.1.0.tar.bz2 1408642