Revert some changes while keeping others.

Package-Manager: portage-2.1.4_rc4

4 files changed, 54 insertions, 67 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 56d4e40df1f1..fb39187595c8 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.166 2007/12/02 23:33:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.167 2007/12/03 00:14:07 vapier Exp $
+
+  03 Dec 2007; Mike Frysinger <vapier@gentoo.org>
+  -files/busybox-1.8.2-flags-strip.patch, busybox-1.8.2.ebuild:
+  Revert some changes while keeping others.
 
 *busybox-1.7.4 (02 Dec 2007)
 
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index d4b62775da23..11e6f16ba87c 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -37,10 +37,6 @@ AUX busybox-1.7.0-bb.patch 880 RMD160 fae03d9ed63f81d4ec043c4fc1eff5158eba5250 S
 MD5 743ba1bb9056833bc1f22505c9286653 files/busybox-1.7.0-bb.patch 880
 RMD160 fae03d9ed63f81d4ec043c4fc1eff5158eba5250 files/busybox-1.7.0-bb.patch 880
 SHA256 83c62f48e3ad89a77b2e0dd74d8ffa586faf2d112c3540c930f39e4abf3ccd55 files/busybox-1.7.0-bb.patch 880
-AUX busybox-1.8.2-flags-strip.patch 925 RMD160 59303141eefd66c1df536dd69764f2b808da5fd1 SHA1 53cabf792e774c881728921ba41951f40caa9e3b SHA256 d99fe22472f45a235e1b5a83c34240ad1a536f1be6c82984949bf6e1e4a71056
-MD5 eddf26c1d90eb21caaf56d9b333f8e2e files/busybox-1.8.2-flags-strip.patch 925
-RMD160 59303141eefd66c1df536dd69764f2b808da5fd1 files/busybox-1.8.2-flags-strip.patch 925
-SHA256 d99fe22472f45a235e1b5a83c34240ad1a536f1be6c82984949bf6e1e4a71056 files/busybox-1.8.2-flags-strip.patch 925
 AUX mdev-start.sh 2411 RMD160 0513dc2423a62d2728cd04ef01172906a79f4d01 SHA1 52efb662fc0726c18da0964adf1d80571766ce01 SHA256 33f45f6f09ee28f623b4cc0dcc1e60743141d9a969c04b9566ac3d0687cb670a
 MD5 6d6f6aec47ea4f757d4836a57d2d66d5 files/mdev-start.sh 2411
 RMD160 0513dc2423a62d2728cd04ef01172906a79f4d01 files/mdev-start.sh 2411
@@ -101,14 +97,14 @@ EBUILD busybox-1.7.4.ebuild 7016 RMD160 cb970a2e3b5c0ea84a7814b92513721a8c0a92c9
 MD5 aba209e90c7b2da6389e7aebce1d3efc busybox-1.7.4.ebuild 7016
 RMD160 cb970a2e3b5c0ea84a7814b92513721a8c0a92c9 busybox-1.7.4.ebuild 7016
 SHA256 c9ea3950d733fd109adff5232cc56aa99ac91807b06a566b280d95f737b85974 busybox-1.7.4.ebuild 7016
-EBUILD busybox-1.8.2.ebuild 6976 RMD160 3c8b971b5c5db02e49fad03972db5296f204fa6f SHA1 f71419fec3d279b64f578191677765691f11238e SHA256 4c61cf5e99ea1f41cb48da5249d251f30a81b183c8d0ba2f68a363e9bccc022e
-MD5 d37f97a38da491bbc4e69eb131479a05 busybox-1.8.2.ebuild 6976
-RMD160 3c8b971b5c5db02e49fad03972db5296f204fa6f busybox-1.8.2.ebuild 6976
-SHA256 4c61cf5e99ea1f41cb48da5249d251f30a81b183c8d0ba2f68a363e9bccc022e busybox-1.8.2.ebuild 6976
-MISC ChangeLog 25053 RMD160 4aa9b401719a70827b0319b136efbb2669168ae2 SHA1 8be6dae22168f885862555fe2fe884bae5215770 SHA256 6631e0557a4cae4bc2573fbad8110e7477dff3440a1c60d935ae4fa6b078f3ee
-MD5 002af26d335bf6a38b30e77f9797edce ChangeLog 25053
-RMD160 4aa9b401719a70827b0319b136efbb2669168ae2 ChangeLog 25053
-SHA256 6631e0557a4cae4bc2573fbad8110e7477dff3440a1c60d935ae4fa6b078f3ee ChangeLog 25053
+EBUILD busybox-1.8.2.ebuild 7048 RMD160 2c46adfaff498611ebfee6b9605e0e533edf6f78 SHA1 69d1609d60e927bcffc607adce77f5362c99c6b2 SHA256 3eb8ae5a6af44256f55ff256bef20b4f7d7e4362c05bf7b5e0881eb30fa614aa
+MD5 239d4aec9523cef751181b3766b748b3 busybox-1.8.2.ebuild 7048
+RMD160 2c46adfaff498611ebfee6b9605e0e533edf6f78 busybox-1.8.2.ebuild 7048
+SHA256 3eb8ae5a6af44256f55ff256bef20b4f7d7e4362c05bf7b5e0881eb30fa614aa busybox-1.8.2.ebuild 7048
+MISC ChangeLog 25212 RMD160 8a2537effedd0d99f583d34ceac351b92875dff1 SHA1 3fb6293d6a2017bae6f35df2e1d33475c3467694 SHA256 b1ac50b286f4807e2c9bee7b852c9548655c44d94de0c8f0ab37b3330b6af788
+MD5 69b5e68cfe58d1740fd45498f38a48c8 ChangeLog 25212
+RMD160 8a2537effedd0d99f583d34ceac351b92875dff1 ChangeLog 25212
+SHA256 b1ac50b286f4807e2c9bee7b852c9548655c44d94de0c8f0ab37b3330b6af788 ChangeLog 25212
 MISC metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 SHA1 aa4b2873e32de89c0b0aeb26b5782f77cb00948e SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e
 MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161
 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 metadata.xml 161
@@ -152,7 +148,7 @@ SHA256 5e2ce9089e972a240334bcca819f6424d96bb12eeafa57478ebb840523f8c12f files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHU0DFp/wUKkr7RBoRAojIAJwIS7ThRAkXzfqALwkIWEef7X0L9QCg2cSr
-1Hg4V8sXTzx+u/xdA8omCsU=
-=fvHn
+iD8DBQFHU0pVp/wUKkr7RBoRAr9qAJ93d0zbnaCuCf+o0BP2K7frzlWMpwCeMWZp
+oRoaqTqaFtUJSxe9qW/jshI=
+=TTlp
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.8.2.ebuild b/sys-apps/busybox/busybox-1.8.2.ebuild
index 9320fd865857..5b9ac55f8b0a 100644
--- a/sys-apps/busybox/busybox-1.8.2.ebuild
+++ b/sys-apps/busybox/busybox-1.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.8.2.ebuild,v 1.2 2007/11/30 21:49:34 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.8.2.ebuild,v 1.3 2007/12/03 00:14:07 vapier Exp $
 
 inherit eutils flag-o-matic savedconfig toolchain-funcs
 
@@ -58,7 +58,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug pam static make-symlinks selinux uclibc"
+IUSE="debug make-symlinks pam selinux static"
 RESTRICT="test"
 
 DEPEND="selinux? ( sys-libs/libselinux )
@@ -88,18 +88,22 @@ src_unpack() {
 	# patches go here!
 	epatch "${FILESDIR}"/busybox-1.7.0-bb.patch
 
-	# set build environment
-	MAKE_CONFIG="CROSS_COMPILE=${CHOST}- ARCH=$(tc-arch-kernel) HOSTCC=${CBUILD}-gcc"
-
 	# work around broken ass powerpc compilers
 	use ppc64 && append-flags -mminimal-toc
-	if ! use uclibc; then
-		epatch "${FILESDIR}/${P}-flags-strip.patch"
-		sed -i 's:-Wl,--gc-sections::' scripts/trylink
-		sed -i '/^#error Aborting compilation./d' applets/applets.c
-	fi
+	# flag cleanup
+	sed -i -r \
+		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
+		Makefile.flags || die
+	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
+	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
+	cat <<-EOF >> Makefile.flags
+	CROSS_COMPILE := ${CHOST}-
+	HOSTCC := $(tc-getBUILD_CC)
+	SKIP_STRIP = y
+	EOF
 
 	# check for a busybox config before making one of our own.
+	# if one exist lets return and use it.
 
 	restore_config .config
 	if [ -f .config ]; then
@@ -107,30 +111,20 @@ src_unpack() {
 		return 0
 	else
 		ewarn "Could not locate user configfile, so we will save a default one"
-
-		# setup the config file
-		make allyesconfig > /dev/null
-		busybox_config_option n DMALLOC
-		busybox_config_option n FEATURE_SUID_CONFIG
-		busybox_config_option n BUILD_AT_ONCE
-		busybox_config_option n BUILD_LIBBUSYBOX
-
-		# 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
-
-		# 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 DEBUG_INIT \
-			DEBUG_CROND_OPTION FEATURE_UDHCP_DEBUG TASKSET \
-			WERROR
-		do
-			busybox_config_option n ${opt}
-		done
 	fi
 
+	# setup the config file
+	make allyesconfig > /dev/null
+	busybox_config_option n DMALLOC
+	busybox_config_option n FEATURE_SUID_CONFIG
+	busybox_config_option n BUILD_AT_ONCE
+	busybox_config_option n BUILD_LIBBUSYBOX
+
+	# 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
+
 	if use static && use pam ; then
 		ewarn "You cannot have USE='static pam'.  Assuming static is more important."
 	fi
@@ -146,16 +140,25 @@ src_unpack() {
 
 	busybox_config_option selinux 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 DEBUG_YANK_SUSv2 DEBUG_INIT \
+		DEBUG_CROND_OPTION FEATURE_UDHCP_DEBUG TASKSET
+	do
+		busybox_config_option n ${opt}
+	done
+
 	make oldconfig > /dev/null
 }
 
 src_compile() {
 	unset KBUILD_OUTPUT #88088
 
-	emake busybox ${MAKE_CONFIG} || die "build failed"
+	emake busybox || die "build failed"
 	if ! use static && ! use pam ; then
 		mv busybox_unstripped{,.bak}
-		emake busybox CONFIG_STATIC=y ${MAKE_CONFIG} || die "static build failed"
+		emake CONFIG_STATIC=y busybox || die "static build failed"
 		mv busybox_unstripped bb
 		mv busybox_unstripped{.bak,}
 	fi
@@ -178,7 +181,7 @@ src_install() {
 	doins "${FILESDIR}"/mdev-start.sh || die
 
 	# bundle up the symlink files for use later
-	emake install ${MAKE_CONFIG} || die
+	emake install || die
 	rm _install/bin/busybox
 	tar cf busybox-links.tar -C _install . || : #;die
 	insinto /usr/share/${PN}
diff --git a/sys-apps/busybox/files/busybox-1.8.2-flags-strip.patch b/sys-apps/busybox/files/busybox-1.8.2-flags-strip.patch
deleted file mode 100644
index 64aed46661e9..000000000000
--- a/sys-apps/busybox/files/busybox-1.8.2-flags-strip.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -urNp busybox-1.8.2.org/Makefile.flags busybox-1.8.2/Makefile.flags
---- busybox-1.8.2.org/Makefile.flags	2007-11-10 03:40:54.000000000 +0200
-+++ busybox-1.8.2/Makefile.flags	2007-11-26 12:02:27.000000000 +0200
-@@ -41,12 +41,10 @@ ifneq ($(CONFIG_WERROR),y)
- CFLAGS += $(call cc-option,-Wmissing-prototypes -Wmissing-declarations,)
- endif
- 
--CFLAGS += $(call cc-option,-Os -fno-builtin-strlen -finline-limit=0 -fomit-frame-pointer -ffunction-sections -fdata-sections,)
- # -fno-guess-branch-probability: prohibit pseudo-random guessing
- # of branch probabilities (hopefully makes bloatcheck more stable):
- CFLAGS += $(call cc-option,-fno-guess-branch-probability,)
- CFLAGS += $(call cc-option,-funsigned-char -static-libgcc,)
--CFLAGS += $(call cc-option,-falign-functions=1 -falign-jumps=1 -falign-labels=1 -falign-loops=1,)
- 
- # FIXME: These warnings are at least partially to be concerned about and should
- # be fixed..