version bump

Package-Manager: portage-2.1.1_rc1-r4

4 files changed, 92 insertions, 5 deletions

diff --git a/app-emulation/x86-chroot/ChangeLog b/app-emulation/x86-chroot/ChangeLog
index c2aa90101c3a..d23891c6dbf0 100644
--- a/app-emulation/x86-chroot/ChangeLog
+++ b/app-emulation/x86-chroot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/x86-chroot
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/x86-chroot/ChangeLog,v 1.2 2006/08/27 09:16:28 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/x86-chroot/ChangeLog,v 1.3 2006/09/05 22:10:55 blubb Exp $
+
+*x86-chroot-2006.1 (05 Sep 2006)
+
+  05 Sep 2006; <blubb@gentoo.org> +x86-chroot-2006.1.ebuild:
+  release bump
 
   27 Aug 2006; <blubb@gentoo.org> files/initd, x86-chroot-2006.0.ebuild:
   xhost needs to be run outside the chroot
diff --git a/app-emulation/x86-chroot/Manifest b/app-emulation/x86-chroot/Manifest
index 07cdb796cf3d..d6b27851548d 100644
--- a/app-emulation/x86-chroot/Manifest
+++ b/app-emulation/x86-chroot/Manifest
@@ -7,14 +7,19 @@ 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
+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
-MISC ChangeLog 506 RMD160 c23790e7978c1764460b808fef53cd73ffee3ce0 SHA1 b80c5fe5d7e48696c5126fd2efaaa599feb22c57 SHA256 ed21f953a1d33e128671e883f2d128f872bf77747d92071d21eb4bab9a5d66bc
-MD5 88e491092d75bda6e445c84fef321dce ChangeLog 506
-RMD160 c23790e7978c1764460b808fef53cd73ffee3ce0 ChangeLog 506
-SHA256 ed21f953a1d33e128671e883f2d128f872bf77747d92071d21eb4bab9a5d66bc ChangeLog 506
+EBUILD x86-chroot-2006.1.ebuild 2347 RMD160 7d5d4a5da55a76199267a1b4ce231f0caa4236c9 SHA1 ef5f9af029659c764c6d7a514ce3ab5170702ed8 SHA256 d8de47cada10cc1a37003003f4107a73e5bf9c9bdfd4ca706a4186746911a9df
+MD5 88facf6b96ccabaeed60883255857bd4 x86-chroot-2006.1.ebuild 2347
+RMD160 7d5d4a5da55a76199267a1b4ce231f0caa4236c9 x86-chroot-2006.1.ebuild 2347
+SHA256 d8de47cada10cc1a37003003f4107a73e5bf9c9bdfd4ca706a4186746911a9df x86-chroot-2006.1.ebuild 2347
+MISC ChangeLog 617 RMD160 833e8f639a2aaa6359f76fe345091a842e5696a6 SHA1 d4cf52882467d36a2d2ed9b6b038ad344c0809ae SHA256 5960956415a108e8f5adaac579095e2e606786dc601822b527000a89942a429e
+MD5 3d9f038accaa8e945a6244db0cca6850 ChangeLog 617
+RMD160 833e8f639a2aaa6359f76fe345091a842e5696a6 ChangeLog 617
+SHA256 5960956415a108e8f5adaac579095e2e606786dc601822b527000a89942a429e ChangeLog 617
 MISC metadata.xml 485 RMD160 2233cf5d20e2e0c279865ba84133a1f2c860ac6c SHA1 15c3f194b35eb270bcd52a39bd4dc24cb165c6e6 SHA256 ef474470c23048c3d0f449d9b824b8c8e1b89da169ecc176de072d0dce60b2ee
 MD5 fd25fba5b52d422419fe9f54f96c8ee4 metadata.xml 485
 RMD160 2233cf5d20e2e0c279865ba84133a1f2c860ac6c metadata.xml 485
@@ -22,3 +27,6 @@ SHA256 ef474470c23048c3d0f449d9b824b8c8e1b89da169ecc176de072d0dce60b2ee metadata
 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.1 b/app-emulation/x86-chroot/files/digest-x86-chroot-2006.1
new file mode 100644
index 000000000000..a09dab48c9bb
--- /dev/null
+++ b/app-emulation/x86-chroot/files/digest-x86-chroot-2006.1
@@ -0,0 +1,3 @@
+MD5 aa2333b6fc7c1ba4bf251523273887df stage3-i686-2006.1.tar.bz2 112603344
+RMD160 07b84e3115f849221fbf5a73c7d5969a46fe9814 stage3-i686-2006.1.tar.bz2 112603344
+SHA256 5837a8f6788df03f75c1b01c29981d9faab598ed18691de0ba0983105b59d7de stage3-i686-2006.1.tar.bz2 112603344
diff --git a/app-emulation/x86-chroot/x86-chroot-2006.1.ebuild b/app-emulation/x86-chroot/x86-chroot-2006.1.ebuild
new file mode 100644
index 000000000000..9d30a207c356
--- /dev/null
+++ b/app-emulation/x86-chroot/x86-chroot-2006.1.ebuild
@@ -0,0 +1,71 @@
+# 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.1.ebuild,v 1.1 2006/09/05 22:10:55 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"
+}