fix bug 162353 and remove old version

Package-Manager: portage-2.1.2_rc4-r6

3 files changed, 12 insertions, 94 deletions

diff --git a/app-emulation/x86-chroot/Manifest b/app-emulation/x86-chroot/Manifest
index fb2cf7a8f279..fcc4c528de00 100644
--- a/app-emulation/x86-chroot/Manifest
+++ b/app-emulation/x86-chroot/Manifest
@@ -1,32 +1,24 @@
-AUX initd 1461 RMD160 228cff7b58d56a965bedada78ef74be9d97f5998 SHA1 e90451434695b2f1adc57bf2ad55099c48316832 SHA256 96e5162daa301dce54f719f710c92ad9168543d630514a739ff4123c96bbbdbd
-MD5 5c579d5b368f9a30302a39ca59d00b84 files/initd 1461
-RMD160 228cff7b58d56a965bedada78ef74be9d97f5998 files/initd 1461
-SHA256 96e5162daa301dce54f719f710c92ad9168543d630514a739ff4123c96bbbdbd files/initd 1461
-AUX x86-chroot 86 RMD160 8329b497e36fb54b8394fd879fa40a3894ad179e SHA1 813acb2b6405fc91a83fd6e9ec7513081386abbc SHA256 982b8d7cdf99c922ec48622f8a2d3261fc98c005d6e47da59205be85a7b83c52
-MD5 cf707c29d74c15e9f57976c2a0071edf files/x86-chroot 86
-RMD160 8329b497e36fb54b8394fd879fa40a3894ad179e files/x86-chroot 86
-SHA256 982b8d7cdf99c922ec48622f8a2d3261fc98c005d6e47da59205be85a7b83c52 files/x86-chroot 86
-DIST stage3-i686-2006.0.tar.bz2 104949773 RMD160 6f0b95ed55a26d2421af9c6982fa7b05e272225e SHA1 dc3aeeba33dc661b81225cb4909fcc1787c69db1 SHA256 98f11e98e7aa13d8a8c88255587f79fe998f6623b39909c21d8a7764dca8abe6
+AUX initd 1442 RMD160 ee5eb105226082c87d56255dba0f5a6cb9bd3084 SHA1 958bedee6e7c2972382dc200f6c3c5d53311ec92 SHA256 21b4fa553bcfe928c6476b1bc601bb64f57f67c310cd608983545a57b8a6d17e
+MD5 8d8238cb092e80ac0356ae268a179cbf files/initd 1442
+RMD160 ee5eb105226082c87d56255dba0f5a6cb9bd3084 files/initd 1442
+SHA256 21b4fa553bcfe928c6476b1bc601bb64f57f67c310cd608983545a57b8a6d17e files/initd 1442
+AUX x86-chroot 147 RMD160 11e7cff1940f1416bb26a21e72c4ddfab528e71d SHA1 7caa06133af6fae8b9a231fdec038a4b2e7f8b7d SHA256 040815e312e836b13e3f00dbba0acf4de0e74126493b9fd80c2b0d4a2ec6f074
+MD5 4074034ad7fffe9c2fa0ea39448dc8d6 files/x86-chroot 147
+RMD160 11e7cff1940f1416bb26a21e72c4ddfab528e71d files/x86-chroot 147
+SHA256 040815e312e836b13e3f00dbba0acf4de0e74126493b9fd80c2b0d4a2ec6f074 files/x86-chroot 147
 DIST stage3-i686-2006.1.tar.bz2 112603344 RMD160 07b84e3115f849221fbf5a73c7d5969a46fe9814 SHA1 846daae998047a6e48532f6a3b2cd1502432a32e SHA256 5837a8f6788df03f75c1b01c29981d9faab598ed18691de0ba0983105b59d7de
-EBUILD x86-chroot-2006.0.ebuild 2347 RMD160 406704b73e305765422f2e5edd1cc93268b591fd SHA1 bb98d3976232a5903613381c07182c8060f87440 SHA256 00eba96f9db7415e75c761bd1e89ec88af93469f4237d78580a7c4a33c7f1858
-MD5 07bfc9c21febd4a49ffa999a38504d1d x86-chroot-2006.0.ebuild 2347
-RMD160 406704b73e305765422f2e5edd1cc93268b591fd x86-chroot-2006.0.ebuild 2347
-SHA256 00eba96f9db7415e75c761bd1e89ec88af93469f4237d78580a7c4a33c7f1858 x86-chroot-2006.0.ebuild 2347
 EBUILD x86-chroot-2006.1.ebuild 2321 RMD160 337405743784cf64bcff59d8b93eb89af3fb9f05 SHA1 90b36319e879537430b45c2b4159cc1899129a85 SHA256 0e9d2f39655102fc61cdc1b6d82cb2d80c3b1abd141e683ad92067134ca701f5
 MD5 a0f9b6cf63558c1cca9069c7c84546da x86-chroot-2006.1.ebuild 2321
 RMD160 337405743784cf64bcff59d8b93eb89af3fb9f05 x86-chroot-2006.1.ebuild 2321
 SHA256 0e9d2f39655102fc61cdc1b6d82cb2d80c3b1abd141e683ad92067134ca701f5 x86-chroot-2006.1.ebuild 2321
-MISC ChangeLog 726 RMD160 dd584167212e36fd63faacea1a6648971dd94911 SHA1 96bc7e2f24fb5c1d557cabc504627bc0fd595a81 SHA256 8d90d3f59a4a7a8cce946bb92e304b7f189a54fad089312c72260c5d565d5ce9
-MD5 3c14f9d33c03cee7bc1fd8b9ec0db95a ChangeLog 726
-RMD160 dd584167212e36fd63faacea1a6648971dd94911 ChangeLog 726
-SHA256 8d90d3f59a4a7a8cce946bb92e304b7f189a54fad089312c72260c5d565d5ce9 ChangeLog 726
+MISC ChangeLog 861 RMD160 d7af651a7fc984bba7153c196e17efd1974252a1 SHA1 24ca4b97e8191aee0077c604f8b8d583a70036ae SHA256 e92076fc946a0e9ea2027468093a7539a889c807d9dedc5041594efb63795b1f
+MD5 0e254655b0c4eb2f24a47fc325d099b5 ChangeLog 861
+RMD160 d7af651a7fc984bba7153c196e17efd1974252a1 ChangeLog 861
+SHA256 e92076fc946a0e9ea2027468093a7539a889c807d9dedc5041594efb63795b1f ChangeLog 861
 MISC metadata.xml 485 RMD160 2233cf5d20e2e0c279865ba84133a1f2c860ac6c SHA1 15c3f194b35eb270bcd52a39bd4dc24cb165c6e6 SHA256 ef474470c23048c3d0f449d9b824b8c8e1b89da169ecc176de072d0dce60b2ee
 MD5 fd25fba5b52d422419fe9f54f96c8ee4 metadata.xml 485
 RMD160 2233cf5d20e2e0c279865ba84133a1f2c860ac6c metadata.xml 485
 SHA256 ef474470c23048c3d0f449d9b824b8c8e1b89da169ecc176de072d0dce60b2ee metadata.xml 485
-MD5 e0e08e75771c9a451095a94d6301db4e files/digest-x86-chroot-2006.0 268
-RMD160 cf63531fdaa6c248f193a5d8697d36b59c8d3c2c files/digest-x86-chroot-2006.0 268
-SHA256 49586268ceb285f76644ee5a4f8bf303c4ffa7e78ba3d7d5262ee935180f247e files/digest-x86-chroot-2006.0 268
 MD5 34205292383ab846ee020b0a1e43e93b files/digest-x86-chroot-2006.1 268
 RMD160 ff1c8b7bfa84403800046395317f2b76c11bd760 files/digest-x86-chroot-2006.1 268
 SHA256 9bcea040be6c144c1906f22887c63033ac4addd99a06fabc267c502362cba73d files/digest-x86-chroot-2006.1 268
diff --git a/app-emulation/x86-chroot/files/digest-x86-chroot-2006.0 b/app-emulation/x86-chroot/files/digest-x86-chroot-2006.0
deleted file mode 100644
index ebe1b4c1fa49..000000000000
--- a/app-emulation/x86-chroot/files/digest-x86-chroot-2006.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 42b5b865cfd199d4c607b95e5ce140fe stage3-i686-2006.0.tar.bz2 104949773
-RMD160 6f0b95ed55a26d2421af9c6982fa7b05e272225e stage3-i686-2006.0.tar.bz2 104949773
-SHA256 98f11e98e7aa13d8a8c88255587f79fe998f6623b39909c21d8a7764dca8abe6 stage3-i686-2006.0.tar.bz2 104949773
diff --git a/app-emulation/x86-chroot/x86-chroot-2006.0.ebuild b/app-emulation/x86-chroot/x86-chroot-2006.0.ebuild
deleted file mode 100644
index b8604378e459..000000000000
--- a/app-emulation/x86-chroot/x86-chroot-2006.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/x86-chroot/x86-chroot-2006.0.ebuild,v 1.2 2006/08/27 09:16:28 blubb Exp $
-
-inherit linux-info
-
-DESCRIPTION="Provides a 32bit chroot for amd64 users"
-HOMEPAGE="http://amd64.gentoo.org/"
-SRC_URI="http://distfiles.gentoo.org/releases/x86/${PV}/stages/stage3-i686-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="-* ~amd64"
-IUSE="X"
-
-RDEPEND="sys-apps/setarch
-	X? ( x11-apps/xhost )"
-
-CONFIG_CHECK="IA32_EMULATION"
-CHROOT_LOCATION=${CHROOT_LOCATION:-/opt/x86-chroot}
-
-pkg_setup() {
-	if [[ -e ${CHROOT_LOCATION} && -z ${IKNOWMYSHIT} ]] ; then
-		eerror "ATTENTION! The location you are going to install the chroot to"
-		eerror "already exists and probably contains a chroot. Re-merging ${PN}"
-		eerror "will overwrite files in the chroot and likely result in a broken"
-		eerror "chroot. If you still want to merge it, execute:"
-		eerror ""
-		eerror "export IKNOWMYSHIT=breakmychroot"
-		die "Previous chroot instance found!"
-	fi
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	cd ${WORKDIR}
-	mkdir -p ".${CHROOT_LOCATION}"
-	cd ".${CHROOT_LOCATION}"
-	unpack ${A}
-}
-
-src_compile() {
-	cat <<- EOF > "${WORKDIR}/${CHROOT_LOCATION}/etc/make.conf"
-		CFLAGS="-O2 -march=athlon-xp -msse2 -pipe -fomit-frame-pointer"
-		CHOST="i686-pc-linux-gnu"
-		CXXFLAGS="\${CFLAGS}"
-	EOF
-	echo "env-update" >> "${WORKDIR}/${CHROOT_LOCATION}/root/.bashrc"
-	echo "CHROOT_LOCATION=${CHROOT_LOCATION}" >	"${WORKDIR}/${CHROOT_LOCATION}/etc/conf.d/${PN}"
-}
-
-src_install() {
-	mv ${WORKDIR}/* ${D}/ || die "moving chroot failed!"
-	newinitd ${FILESDIR}/initd ${PN} || die "could not install init.d file!"
-	mkdir -p "${D}/etc/conf.d"
-	echo "CHROOT_LOCATION=${CHROOT_LOCATION}" > "${D}/etc/conf.d/${PN}" || die "could not install conf.d file!"
-	dobin ${FILESDIR}/${PN} || die "couldn't install x86-chroot"
-}
-
-pkg_postinst() {
-	einfo "Your chroot system is now installed. To do all the necessary setup"
-	einfo "work, run '/etc/init.d/x86-chroot start'. To start a chroot session,"
-	einfo "run 'x86-chroot'."
-}
-
-pkg_prerm() {
-	[[ -f /etc/conf.d/${PN} ]] && source /etc/conf.d/${PN}
-	ewarn "There are still files around in ${CHROOT_LOCATION}; make sure you
-	manually"
-	ewarn "remove that directory *after* checking the mounts for it"
-}