version bump, cleanup

Package-Manager: portage-2.1.2.2

5 files changed, 36 insertions, 44 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index 236e78148378..5b8193c3bc6d 100644
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/util-vserver
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.76 2007/03/29 21:14:00 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.77 2007/04/05 17:37:57 hollow Exp $
+
+  05 Apr 2007; Benedikt Böhm <hollow@gentoo.org>
+  -util-vserver-0.30.212-r1.ebuild, +util-vserver-0.30.213_rc6.ebuild:
+  version bump, cleanup
 
   29 Mar 2007; Benedikt Böhm <hollow@gentoo.org>
   +util-vserver-0.30.213_rc5.ebuild:
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index 9756d5388991..88518a9532a6 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -24,10 +24,7 @@ RMD160 f8c4bfd740846c43e56a97db86302e81b8afa1c8 files/util-vserver-0.30.212-wrap
 SHA256 548b9732f12492f1ca58d72c3fd8634c99047d1619c19a1c9407a6864150c3fe files/util-vserver-0.30.212-wrapper.patch 1349
 DIST util-vserver-0.30.212.tar.bz2 643139 RMD160 e0bb7600204c99bf2192332b2fb5680cd647d226 SHA1 366e9aa56490de71dccebf7ee99a81e37a274267 SHA256 dad182f0c882f32d96cab8d9065e4417d9c2f8146e1e2c9f197580389cc4a484
 DIST util-vserver-0.30.213-rc5.tar.bz2 658971 RMD160 3dab9d82bbab865ed9321c8f3021e0db26a681ca SHA1 f6ddb295f5673b4456cdcadb1963c27ad4b4a6e4 SHA256 cab90fc33684362806908c2628afc7e54bac9262b900b9d5bfb0e7fb67ccdafe
-EBUILD util-vserver-0.30.212-r1.ebuild 3757 RMD160 275973cb7a4cfb52c775a440e8881956b94515f5 SHA1 7e37bf9b4c34fc9618e07945ae41cf0412882932 SHA256 bbcf71fb7174272fb086a489d6bd778add6dee9d4595e73c006bfd29d4bd00c6
-MD5 f89476c6d4bbdce62ccbfbc5a213dc64 util-vserver-0.30.212-r1.ebuild 3757
-RMD160 275973cb7a4cfb52c775a440e8881956b94515f5 util-vserver-0.30.212-r1.ebuild 3757
-SHA256 bbcf71fb7174272fb086a489d6bd778add6dee9d4595e73c006bfd29d4bd00c6 util-vserver-0.30.212-r1.ebuild 3757
+DIST util-vserver-0.30.213-rc6.tar.bz2 659195 RMD160 ebd8c8c12b3556ceaad7267aa6e1ce4fe069f545 SHA1 cd975a8163d99ba2371b55a8d30d66c189701cd0 SHA256 c7a8d1a3f0285cd73743b7cf887135ff8a0817e04db40e42ea483e5d7d1d5ee4
 EBUILD util-vserver-0.30.212-r2.ebuild 3805 RMD160 0458dbb0559ffd332f313caed2548dfb7c97a891 SHA1 83bf584d99911f1e22dbc7e408875c95f5636414 SHA256 9202e553354bf78d90b8f2675521722591a08b500be15732c1b013a5943af676
 MD5 052cc36651d1aa8595583af1a85a315d util-vserver-0.30.212-r2.ebuild 3805
 RMD160 0458dbb0559ffd332f313caed2548dfb7c97a891 util-vserver-0.30.212-r2.ebuild 3805
@@ -36,20 +33,24 @@ EBUILD util-vserver-0.30.213_rc5.ebuild 3355 RMD160 420f847fd0ffcbea2eefbdd55f06
 MD5 f56435a18f36b93e1cf45554ff698cdb util-vserver-0.30.213_rc5.ebuild 3355
 RMD160 420f847fd0ffcbea2eefbdd55f06baf2920eb24f util-vserver-0.30.213_rc5.ebuild 3355
 SHA256 d857a59c7ffc9224d542a8aca72e6f824358d2e5d55cfc70f3e2fc7a17331db0 util-vserver-0.30.213_rc5.ebuild 3355
-MISC ChangeLog 15696 RMD160 cc851f35438c20c40bbfc15b7879e645438f435d SHA1 ceeb739953224a2b91919d5e98c2dabc39a10f3d SHA256 42896fdd277ff90922b1b731ac2d23aadcfd5b3c05b40bf5246ff4f3754bbcf6
-MD5 430f7978ea5df567b3d16a16bd155e49 ChangeLog 15696
-RMD160 cc851f35438c20c40bbfc15b7879e645438f435d ChangeLog 15696
-SHA256 42896fdd277ff90922b1b731ac2d23aadcfd5b3c05b40bf5246ff4f3754bbcf6 ChangeLog 15696
+EBUILD util-vserver-0.30.213_rc6.ebuild 3355 RMD160 5ebb9392f502b0ef8cedfb280bd5a815944f415b SHA1 ad6e5333457299fc22ca555c6cab119fc38c3096 SHA256 ef7db114f5c85a7b42bf74101d74c65c4bbfd9a729a21bb82105315cab812340
+MD5 796fc9ad542fd1722cd0a3f6b8c8d136 util-vserver-0.30.213_rc6.ebuild 3355
+RMD160 5ebb9392f502b0ef8cedfb280bd5a815944f415b util-vserver-0.30.213_rc6.ebuild 3355
+SHA256 ef7db114f5c85a7b42bf74101d74c65c4bbfd9a729a21bb82105315cab812340 util-vserver-0.30.213_rc6.ebuild 3355
+MISC ChangeLog 15842 RMD160 23c1e4dfccecfbd0d02728499ec2d40c1ff262ee SHA1 81bfe2da66baa85077ca3449e137df5952d48d3a SHA256 88da1861a15fad06b7376e1e7ffae62d378d28bc2be9c9f2a6ba9ff0aad1f866
+MD5 0eb72a734c23c9553cdaca84ff7618fd ChangeLog 15842
+RMD160 23c1e4dfccecfbd0d02728499ec2d40c1ff262ee ChangeLog 15842
+SHA256 88da1861a15fad06b7376e1e7ffae62d378d28bc2be9c9f2a6ba9ff0aad1f866 ChangeLog 15842
 MISC metadata.xml 588 RMD160 43bd819942f6f0c03bec0bcf67601a7099b59a2b SHA1 d0e5af40193886066bbe1060324dede1f0fd367f SHA256 798e87b6d5fb379322178e9f8b7432371f630caaf3fd6ff369e35056483cc31d
 MD5 493021fa14e20216e8ce772e9dc10a62 metadata.xml 588
 RMD160 43bd819942f6f0c03bec0bcf67601a7099b59a2b metadata.xml 588
 SHA256 798e87b6d5fb379322178e9f8b7432371f630caaf3fd6ff369e35056483cc31d metadata.xml 588
-MD5 0f5d705e788b54f83af3531af62e739e files/digest-util-vserver-0.30.212-r1 268
-RMD160 9e595c3a71440aede6174887c9cb093c123667c5 files/digest-util-vserver-0.30.212-r1 268
-SHA256 d85b209f085a57250ac6312dc686ac3d1be5c43d491f0c4cc8fd300f74c3421b files/digest-util-vserver-0.30.212-r1 268
 MD5 0f5d705e788b54f83af3531af62e739e files/digest-util-vserver-0.30.212-r2 268
 RMD160 9e595c3a71440aede6174887c9cb093c123667c5 files/digest-util-vserver-0.30.212-r2 268
 SHA256 d85b209f085a57250ac6312dc686ac3d1be5c43d491f0c4cc8fd300f74c3421b files/digest-util-vserver-0.30.212-r2 268
 MD5 588379c10c34915c72c69e73eda1d92c files/digest-util-vserver-0.30.213_rc5 280
 RMD160 8e126af4d5bb5d387009a3ad5faa5ecab43f2de1 files/digest-util-vserver-0.30.213_rc5 280
 SHA256 a7315c2c3bf023bd69c9d1f9fc20abd07c9ea35eb4e46b8b7e22931ba4e95a1f files/digest-util-vserver-0.30.213_rc5 280
+MD5 4ee3276995ed6c8b17d6563a19b06579 files/digest-util-vserver-0.30.213_rc6 280
+RMD160 d68b6b875d490bb0a8d3644c6c2ffd1cbee074f6 files/digest-util-vserver-0.30.213_rc6 280
+SHA256 63c69e84f66b351b6a562ed84feea262afd2361317e4ed457a3af7e5961af609 files/digest-util-vserver-0.30.213_rc6 280
diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.212-r1 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.212-r1
deleted file mode 100644
index 0babb2f87de0..000000000000
--- a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.212-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 386b91732b7f0f132b4e9d978389dcc2 util-vserver-0.30.212.tar.bz2 643139
-RMD160 e0bb7600204c99bf2192332b2fb5680cd647d226 util-vserver-0.30.212.tar.bz2 643139
-SHA256 dad182f0c882f32d96cab8d9065e4417d9c2f8146e1e2c9f197580389cc4a484 util-vserver-0.30.212.tar.bz2 643139
diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.213_rc6 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.213_rc6
new file mode 100644
index 000000000000..15bdf76c26b6
--- /dev/null
+++ b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.213_rc6
@@ -0,0 +1,3 @@
+MD5 01d74784652ba339ac3b7a56317416aa util-vserver-0.30.213-rc6.tar.bz2 659195
+RMD160 ebd8c8c12b3556ceaad7267aa6e1ce4fe069f545 util-vserver-0.30.213-rc6.tar.bz2 659195
+SHA256 c7a8d1a3f0285cd73743b7cf887135ff8a0817e04db40e42ea483e5d7d1d5ee4 util-vserver-0.30.213-rc6.tar.bz2 659195
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.212-r1.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.213_rc6.ebuild
index 4779107ed1b1..a80cf321fb6f 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.212-r1.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.213_rc6.ebuild
@@ -1,26 +1,33 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.212-r1.ebuild,v 1.2 2007/01/21 14:09:20 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.213_rc6.ebuild,v 1.1 2007/04/05 17:37:57 hollow Exp $
 
-inherit eutils bash-completion
+WANT_AUTOMAKE="1.9"
+
+inherit autotools eutils bash-completion
 
 DESCRIPTION="Linux-VServer admin utilities"
 HOMEPAGE="http://www.nongnu.org/util-vserver/"
-SRC_URI="http://ftp.linux-vserver.org/pub/utils/${PN}/${P}.tar.bz2"
+SRC_URI="http://people.linux-vserver.org/~dhozac/t/uv-testing/${P/_rc/-rc}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 
 IUSE=""
 
-RDEPEND="dev-libs/beecrypt
+DEPEND=">=dev-libs/dietlibc-0.30-r2
+	dev-libs/beecrypt
 	net-firewall/iptables
 	net-misc/vconfig
 	sys-apps/iproute2"
 
-DEPEND="${RDEPEND}
-	>=dev-libs/dietlibc-0.30-r2"
+RDEPEND="sys-apps/iproute2
+	net-misc/vconfig
+	net-firewall/iptables
+	dev-libs/beecrypt"
+
+S="${WORKDIR}/${P/_rc/-rc}"
 
 pkg_setup() {
 	if [[ -z "${VDIRBASE}" ]]; then
@@ -36,18 +43,10 @@ pkg_setup() {
 	einfo
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-wrapper.patch
-	epatch "${FILESDIR}"/${P}-initpost.patch
-}
-
 src_compile() {
 	econf --with-vrootdir=${VDIRBASE} \
-		--localstatedir=/var \
-		--with-initrddir=/etc/init.d || die "econf failed!"
+		--with-initscripts=gentoo \
+		--localstatedir=/var || die "econf failed!"
 	emake || die "emake failed!"
 }
 
@@ -55,11 +54,6 @@ src_install() {
 	make DESTDIR="${D}" install install-distribution \
 		|| die "make install failed!"
 
-	# create the /sbin/vshelper symlink so we don't have to mess around with
-	# (a) echoing stuff to /etc/sysctl.conf
-	# (b) changing the default vshelper in the kernel sources.
-	dosym /usr/lib/util-vserver/vshelper /sbin/vshelper
-
 	# keep dirs
 	keepdir /var/run/vservers
 	keepdir /var/run/vservers.rev
@@ -71,13 +65,6 @@ src_install() {
 	# remove legacy config file
 	rm -f "${D}"/etc/vservers.conf
 
-	# remove the non-gentoo init-scripts:
-	rm -f "${D}"/etc/init.d/*
-
-	# and install gentoo'ized ones:
-	doinitd "${FILESDIR}"/init.d/vservers.default
-	doinitd "${FILESDIR}"/init.d/vprocunhide
-
 	# bash-completion
 	dobashcompletion "${FILESDIR}"/bash_completion util-vserver