version bump to rc3

7 files changed, 13 insertions, 226 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index b46f6ef0f005..b267ba59c7ba 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.36 2004/07/26 17:53:26 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.37 2004/08/17 16:42:13 solar Exp $
+
+*busybox-1.00_rc3 (17 Aug 2004)
+
+  17 Aug 2004; <solar@gentoo.org> -busybox-1.0.0_pre20040721.ebuild,
+  -busybox-1.0.0_pre20040726.ebuild, +busybox-1.00_rc3.ebuild:
+  version bump to rc3
 
 *busybox-1.0.0_pre20040726 (26 Jul 2004)
 
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 2cfb084f95fb..93b167ea5297 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,10 +1,9 @@
 MD5 bc6b0e4b7611df0d97f0c380b9fa7c07 busybox-0.60.5-r1.ebuild 1407
-MD5 cb76e95c02747537c98b57b3eefb0bae busybox-1.0.0_pre20040726.ebuild 6064
-MD5 4a0c2e0afd7d4403faccccb6350bca98 busybox-1.0.0_pre20040721.ebuild 5876
 MD5 bb58878c35f17f5bad4aa060f1dcc25e busybox-0.60.3-r2.ebuild 1183
 MD5 9e86b9ca59e72b18415a78c63f801a1c busybox-1.00_pre8.ebuild 5647
 MD5 f98f75be102af5709caff4cf84eaeb90 busybox-0.60.3-r1.ebuild 1091
 MD5 850bd351d581d0e98c74552826d24eae busybox-0.60.5-r2.ebuild 2280
+MD5 7f7ad74187099c6459c0e9dcf832bcc4 busybox-1.00_rc3.ebuild 6066
 MD5 1bd31e3e0e815f8158f21419aecf535e ChangeLog 7488
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 9ce965b12114a360496fe06e952139a8 files/Config.h 11695
@@ -21,6 +20,5 @@ MD5 61ecae720ff226b1e543f7c1d0900043 files/digest-busybox-0.60.3-r2 66
 MD5 eed3465a5e0e5ddae7dac2c1c1f879ef files/digest-busybox-0.60.5-r1 66
 MD5 eed3465a5e0e5ddae7dac2c1c1f879ef files/digest-busybox-0.60.5-r2 66
 MD5 9af76647376bd7228609763aaad090e8 files/busybox-0.60.5-dietlibc.diff 13526
-MD5 d47728f8dbd20dcc2afefc031b7e40be files/digest-busybox-1.0.0_pre20040721 70
-MD5 d011d58b98b5c94414b229858c6cb2c5 files/digest-busybox-1.0.0_pre20040726 70
+MD5 75d3d96c0d23ddd4ffae3daa59e0fb1e files/digest-busybox-1.00_rc3 70
 MD5 3a4b93f7ec6f3aaade20029a81562b88 files/msh.diff 433
diff --git a/sys-apps/busybox/busybox-1.0.0_pre20040721.ebuild b/sys-apps/busybox/busybox-1.0.0_pre20040721.ebuild
deleted file mode 100644
index c31dc2564e8b..000000000000
--- a/sys-apps/busybox/busybox-1.0.0_pre20040721.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.0.0_pre20040721.ebuild,v 1.1 2004/07/21 13:13:49 solar Exp $
-
-inherit eutils
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-SNAPSHOT=20040721
-HOMEPAGE="http://www.busybox.net/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~mips ~arm ~amd64"
-IUSE="debug static savedconfig make-busybox-symlinks"
-#IUSE="${IUSE} cross"
-
-MY_PV=${PV/_/-}
-
-if [ "$SNAPSHOT" != "" ]; then
-	MY_P=${PN}
-	SRC_URI="http://www.busybox.net/downloads/snapshots/${PN}-${SNAPSHOT}.tar.bz2"
-else
-	MY_P=${PN}-${MY_PV}
-	SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.gz"
-fi
-
-S=${WORKDIR}/${MY_P}
-
-DEPEND="virtual/libc
-	!amd64? ( uclibc? ( dev-libs/uclibc ) )
-	>=sys-apps/sed-4"
-
-RDEPEND="!static? ( ${DEPEND} )"
-
-# <pebenito> then eventually turning on selinux would mean
-# adding a dep: selinux? ( sys-libs/libselinux )
-
-busybox_config_option() {
-	[ "$2" = "" ] && return 1
-	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;;
-		*) return 1;;
-	esac
-	einfo `grep CONFIG_$2 .config`
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	use amd64 && epatch ${FILESDIR}/${P}-amd64.patch
-
-	# 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}}.config; do
-			if [ -r /etc/${PN}/${CCHOST}/${conf} ]; then
-				cp /etc/${PN}/${CCHOST}/${conf} ${S}/.config
-				break;
-			fi
-		done
-		if [ -r "${S}/.config" ]; then
-			einfo "Found your /etc/${PN}/${CCHOST}/${conf} and using it."
-			return 0
-		fi
-	fi
-
-	# busybox has changed quite a bit from 0.[5-6]* to 1.x so this
-	# config might not be cd ready.
-
-	make allyesconfig > /dev/null
-	busybox_config_option n DMALLOC
-	busybox_config_option n FEATURE_SUID
-
-	# setting the cross compiler from here would be somewhat of a
-	# pain do to as we would need a multiline sed expression which
-	# does not always seem to work so hot for me.
-
-	use static \
-		&& busybox_config_option y STATIC \
-		|| busybox_config_option n STATIC
-
-	# 1.00-pre2 uses the old selinux api which is no longer
-	# maintained. perhaps the next stable release will include
-	# support. 
-	# 1.00-pre5  pebenito says busybox is still using the old se api.
-	#use selinux \
-	#	&& busybox_config_option y SELINUX \
-	#	|| 
-	busybox_config_option n SELINUX
-
-	use debug \
-		&& busybox_config_option y DEBUG \
-		|| busybox_config_option n DEBUG
-
-	# Supported architectures:
-
-	# Busybox in general will build on any architecture supported by
-	# gcc.  It has a few specialized features added for __sparc__
-	# and __alpha__.  insmod functionality is currently limited to
-	# x86, ARM, SH3/4, powerpc, m68k, MIPS, and v850e.
-	case ${ARCH} in
-		alpha|sparc*)
-			# non x86 needs to figure out what works for
-			# them the best. sparc64 bobmed while building
-			# ash in my tests
-			busybox_config_option n INSMOD
-			busybox_config_option n MODPROBE
-			busybox_config_option n RMMOD;;
-		*) ;;
-	esac
-
-	#busybox_features=`grep CONFIG_ .config | tr '#' '\n' | 
-	#	awk  '{print $1}' | cut -d = -f 1 | grep -v ^$ | cut -c 8- | 
-	#		tr [A-Z] [a-z] | awk '{print "busybox_"$1}'`
-	#for f in $busybox_features; do
-	#	has $f ${FEATURES} && busybox_config_option y `echo ${f/busybox_/}|tr [a-z] [A-Z]`
-	#done
-	( echo | make clean oldconfig > /dev/null ) || :
-}
-
-busybox_set_cross_compiler() {
-	return 0
-	# revisit this another day.
-	#if use cross ; then
-	#	case ${ARCH} in
-	#		x86*) CROSS="/usr/i386-linux-uclibc/bin/i386-uclibc-";;
-	#		*) ;;
-	#	esac
-	#fi
-	[ -n "${CROSS}" ] && einfo "Setting cross compiler prefix to ${CROSS}"
-}
-
-src_compile() {
-	busybox_set_cross_compiler
-	#emake -j1 CROSS="${CROSS}" include/config.h busybox || die
-	emake -j1 CROSS="${CROSS}" busybox || die
-}
-
-src_install() {
-	busybox_set_cross_compiler
-
-	into /
-	dobin busybox
-	if use make-busybox-symlinks ; then
-		make CROSS="${CROSS}" install || die
-		dodir /bin
-		cp -a _install/bin/* ${D}/bin/
-		dodir /sbin
-		cp -a _install/sbin/* ${D}/sbin/
-		cd ${D}
-		local symlink
-		for symlink in {bin,sbin}/* ; 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 LICENSE 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}` -a `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-busybox-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}/${CCHOST}/${PN}-${PV}-${PR}.config"
-		einfo "Read this ebuild for more info on how to take advantage of this option"
-		insinto /etc/${PN}/${CCHOST}/
-		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/busybox-1.0.0_pre20040726.ebuild b/sys-apps/busybox/busybox-1.00_rc3.ebuild
index 5915220412a6..0ae508a3c50d 100644
--- a/sys-apps/busybox/busybox-1.0.0_pre20040726.ebuild
+++ b/sys-apps/busybox/busybox-1.00_rc3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.0.0_pre20040726.ebuild,v 1.1 2004/07/26 17:53:26 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00_rc3.ebuild,v 1.1 2004/08/17 16:42:13 solar Exp $
 
 inherit eutils
 
 DESCRIPTION="Utilities for rescue and embedded systems"
-SNAPSHOT=20040726
+#SNAPSHOT=20040726
 HOMEPAGE="http://www.busybox.net/"
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,7 +20,7 @@ if [ "$SNAPSHOT" != "" ]; then
 	SRC_URI="http://www.busybox.net/downloads/snapshots/${PN}-${SNAPSHOT}.tar.bz2"
 else
 	MY_P=${PN}-${MY_PV}
-	SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.gz"
+	SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
 fi
 
 S=${WORKDIR}/${MY_P}
diff --git a/sys-apps/busybox/files/digest-busybox-1.0.0_pre20040721 b/sys-apps/busybox/files/digest-busybox-1.0.0_pre20040721
deleted file mode 100644
index 71d0105daaa4..000000000000
--- a/sys-apps/busybox/files/digest-busybox-1.0.0_pre20040721
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e8b958ecbc41859e82e7f176433decf6 busybox-20040721.tar.bz2 1122138
diff --git a/sys-apps/busybox/files/digest-busybox-1.0.0_pre20040726 b/sys-apps/busybox/files/digest-busybox-1.0.0_pre20040726
deleted file mode 100644
index d04b6a066ef1..000000000000
--- a/sys-apps/busybox/files/digest-busybox-1.0.0_pre20040726
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e523798760db4779a473983347382ef6 busybox-20040726.tar.bz2 1122388
diff --git a/sys-apps/busybox/files/digest-busybox-1.00_rc3 b/sys-apps/busybox/files/digest-busybox-1.00_rc3
new file mode 100644
index 000000000000..1ec2fb13248f
--- /dev/null
+++ b/sys-apps/busybox/files/digest-busybox-1.00_rc3
@@ -0,0 +1 @@
+MD5 cb28b670a20a4670827e4a9472d22f01 busybox-1.00-rc3.tar.bz2 1106088