Revision bump, fixing some rpm related issues

Package-Manager: portage-2.1.1_pre2-r4

4 files changed, 141 insertions, 8 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index ecef749111b9..a68801698f5a 100644
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/util-vserver
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.58 2006/07/01 17:51:35 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.59 2006/07/09 10:20:33 phreak Exp $
+
+*util-vserver-0.30.210-r15 (09 Jul 2006)
+
+  09 Jul 2006; Christian Heim <phreak@gentoo.org>
+  +util-vserver-0.30.210-r15.ebuild:
+  Revision bump, fixing some rpm related issues
 
   01 Jul 2006; Christian Heim <phreak@gentoo.org>
   util-vserver-0.30.210-r13.ebuild, util-vserver-0.30.210-r14.ebuild:
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index d7c4b86a89f8..d9ca668188b1 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 DIST util-vserver-0.30.210-patches-r13.tar.bz2 26978 RMD160 440aa77df60dccaceea9cd3bad7bb902c4252632 SHA1 6746c583f4b7018093050d0ed1e5df5857bdd9fb SHA256 26000063103fe822ede1f8ce0c14d6f79b4757f76863420d06f3164dc167ad9e
 DIST util-vserver-0.30.210-patches-r14.tar.bz2 27322 RMD160 8a10a48728f7cd09732e064b51cb6c0f40628873 SHA1 b4a462139e6863aab4a1441854045985b2110394 SHA256 8f2e4fd22e03cba4920c675ba95c07f97e781e251a59bcddc0573e29a4ec489d
+DIST util-vserver-0.30.210-patches-r15.tar.bz2 28874 RMD160 c6db33a2d2344ab9babf5a47260b684ab0329b14 SHA1 6313f1b86642e217d87adf0419394710ec94b330 SHA256 7aa3b5df8e53d821bc5c27652081e9c1925d811b1d3b2b2aff1466406031737e
 DIST util-vserver-0.30.210.tar.bz2 600032 RMD160 b8f426e319feeafc9be91315947c10a147586f1f SHA1 1075dc239277c7ecc76a644e7bbfeee869864595 SHA256 6ae5be2557f4659d260c68d239a8e879b0625201688807fd9baa4bdcc4580d04
 EBUILD util-vserver-0.30.210-r13.ebuild 3048 RMD160 7d9963719dce974bd29d23bdf14f61db8468f86f SHA1 80f7982695db7a29aa821f33cad3175565ead354 SHA256 33244f9cd2c5a450f5449ba4263b9ebf120aab822de344b93af815ce0db2261b
 MD5 de1cf005a317021660eee5ecd879a197 util-vserver-0.30.210-r13.ebuild 3048
@@ -12,10 +13,14 @@ EBUILD util-vserver-0.30.210-r14.ebuild 3069 RMD160 ea2bae1db467f19ef1e6554f2393
 MD5 94917e3a959acd707cf11fb7ef15bb81 util-vserver-0.30.210-r14.ebuild 3069
 RMD160 ea2bae1db467f19ef1e6554f2393c2f93873dda1 util-vserver-0.30.210-r14.ebuild 3069
 SHA256 ef031285850d65136fbc6a59b0bf242fcd3daafaa31a1bb9ab380dd3e5113cfc util-vserver-0.30.210-r14.ebuild 3069
-MISC ChangeLog 11690 RMD160 3f9eca07c6c0267e349517ad28c95f31e31bd91d SHA1 82b38ea775bf0f90a1bb71d210a9ca6a8437a662 SHA256 d09779dc5e089f06675f6e0831dc8c0d48625b7df34acfe817e858534e52a903
-MD5 f7803f698f064636842dc536d19254a2 ChangeLog 11690
-RMD160 3f9eca07c6c0267e349517ad28c95f31e31bd91d ChangeLog 11690
-SHA256 d09779dc5e089f06675f6e0831dc8c0d48625b7df34acfe817e858534e52a903 ChangeLog 11690
+EBUILD util-vserver-0.30.210-r15.ebuild 3069 RMD160 bd756d2238ad6db46704f5e77e67bbd9af32ca0e SHA1 ca0068af25f7caa61e10ce9c5604f1a18ad1710f SHA256 8497b4afc86a77a4ead9e93d26d8c735a789d0c393d0fcaacd2e2b4bef932857
+MD5 c8349ac8e84d5b270f1475acadb0bf0a util-vserver-0.30.210-r15.ebuild 3069
+RMD160 bd756d2238ad6db46704f5e77e67bbd9af32ca0e util-vserver-0.30.210-r15.ebuild 3069
+SHA256 8497b4afc86a77a4ead9e93d26d8c735a789d0c393d0fcaacd2e2b4bef932857 util-vserver-0.30.210-r15.ebuild 3069
+MISC ChangeLog 11868 RMD160 26110a641ec6dcd507d0b0f7956395f8782ab00c SHA1 bd4fac593faa1f1989f0efe380572501c51014b9 SHA256 0370e6a95707090b2f021d813bc08b88bf87594d859e6a5db2479f256460db52
+MD5 d6cc7ceb023be7b95e2f65fef7a6c287 ChangeLog 11868
+RMD160 26110a641ec6dcd507d0b0f7956395f8782ab00c ChangeLog 11868
+SHA256 0370e6a95707090b2f021d813bc08b88bf87594d859e6a5db2479f256460db52 ChangeLog 11868
 MISC metadata.xml 588 RMD160 43bd819942f6f0c03bec0bcf67601a7099b59a2b SHA1 d0e5af40193886066bbe1060324dede1f0fd367f SHA256 798e87b6d5fb379322178e9f8b7432371f630caaf3fd6ff369e35056483cc31d
 MD5 493021fa14e20216e8ce772e9dc10a62 metadata.xml 588
 RMD160 43bd819942f6f0c03bec0bcf67601a7099b59a2b metadata.xml 588
@@ -26,10 +31,13 @@ SHA256 79be461cd53fcb5001642cba8bb6209721985b5ded8d0a1069a5fa5b00ac77f0 files/di
 MD5 4466cca95361e1ff23c495b9eb9c5e3b files/digest-util-vserver-0.30.210-r14 569
 RMD160 8d1ecf7cd73d66a85937d1f6bdde8915eb89f3af files/digest-util-vserver-0.30.210-r14 569
 SHA256 2e7a110df6205960c2122c72bd0688c6f00acc53aca555031344434f262e29a2 files/digest-util-vserver-0.30.210-r14 569
+MD5 44983d294823b40e3ee692ec31fa97ca files/digest-util-vserver-0.30.210-r15 569
+RMD160 ddbb27f41ca46b8a2abca4c50d2d8064a33234e3 files/digest-util-vserver-0.30.210-r15 569
+SHA256 3ca11c73bfe7eacb4f39cdce0e11f5d53fa723743b39e16266661c413d89fd70 files/digest-util-vserver-0.30.210-r15 569
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEprYxflZ8QqxhrsMRAvq5AKCUWTlg64oz63Owyf6bT9saeCNfoQCgwOVl
-bAhAc64swBmuuoIq+UCs20I=
-=XLv0
+iD8DBQFEsNh5flZ8QqxhrsMRAoP9AKCiMRxCd6xFvNM84t+zAtHfvzhoPACffULx
+UclCsLevz73UCiAeJBFI6Ps=
+=j25h
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.210-r15 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.210-r15
new file mode 100644
index 000000000000..9123aeb7f8c1
--- /dev/null
+++ b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.210-r15
@@ -0,0 +1,6 @@
+MD5 5771a7e4837d899a7080eb31a278278e util-vserver-0.30.210-patches-r15.tar.bz2 28874
+RMD160 c6db33a2d2344ab9babf5a47260b684ab0329b14 util-vserver-0.30.210-patches-r15.tar.bz2 28874
+SHA256 7aa3b5df8e53d821bc5c27652081e9c1925d811b1d3b2b2aff1466406031737e util-vserver-0.30.210-patches-r15.tar.bz2 28874
+MD5 1e8fff7cb6246d21ed029f082123019b util-vserver-0.30.210.tar.bz2 600032
+RMD160 b8f426e319feeafc9be91315947c10a147586f1f util-vserver-0.30.210.tar.bz2 600032
+SHA256 6ae5be2557f4659d260c68d239a8e879b0625201688807fd9baa4bdcc4580d04 util-vserver-0.30.210.tar.bz2 600032
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.210-r15.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.210-r15.ebuild
new file mode 100644
index 000000000000..42c2b9ffb473
--- /dev/null
+++ b/sys-cluster/util-vserver/util-vserver-0.30.210-r15.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2006 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.210-r15.ebuild,v 1.1 2006/07/09 10:20:33 phreak Exp $
+
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="Linux-VServer admin utilities"
+HOMEPAGE="http://www.nongnu.org/util-vserver/"
+SRC_URI="http://www.13thfloor.at/~ensc/util-vserver/files/alpha/${P}.tar.bz2
+	http://dev.gentoo.org/~hollow/distfiles/${P}-patches-${PR}.tar.bz2
+	http://dev.gentoo.org/~phreak/distfiles/${P}-patches-${PR}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+IUSE=""
+
+DEPEND=">=dev-libs/dietlibc-0.28
+	dev-libs/beecrypt
+	net-firewall/iptables
+	net-misc/vconfig
+	sys-apps/iproute2
+	sys-process/procps"
+
+RDEPEND="sys-apps/iproute2
+	net-misc/vconfig
+	net-firewall/iptables
+	dev-libs/beecrypt
+	sys-process/procps"
+
+pkg_setup() {
+	if [[ -z "${VDIRBASE}" ]]; then
+		einfo
+		einfo "You can change the default vserver base directory (/vservers)"
+		einfo "by setting the VDIRBASE environment variable."
+	fi
+
+	: ${VDIRBASE:=/vservers}
+
+	einfo
+	einfo "Using \"${VDIRBASE}\" as vserver base directory"
+	einfo
+}
+
+src_unpack() {
+	unpack ${A} || die
+	cd "${S}" || die
+
+	cp "${WORKDIR}"/tools/* scripts/ || die "failed to copy gentoo tools"
+	epatch "${WORKDIR}"/patches/*.patch
+
+	AT_M4DIR="-I m4" \
+	eautoreconf
+}
+
+src_compile() {
+	econf --localstatedir=/var \
+	      --with-initrddir=/etc/init.d \
+	      --with-vrootdir="${VDIRBASE}" || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "install failed"
+
+	# keep dirs
+	keepdir /var/run/vservers
+	keepdir /var/run/vservers.rev
+	keepdir /var/run/vshelper
+	keepdir /var/lock/vservers
+	keepdir /var/cache/vservers
+
+	keepdir "${VDIRBASE}"
+	fperms 000 "${VDIRBASE}"
+
+	# remove the non-gentoo init-scripts:
+	rm -f "${D}"/etc/init.d/*
+
+	# and install gentoo'ized ones:
+	doinitd "${WORKDIR}"/init.d/vservers
+	doconfd "${WORKDIR}"/conf.d/vservers
+
+	dodoc README ChangeLog NEWS AUTHORS THANKS util-vserver.spec
+}
+
+pkg_postinst() {
+	einfo
+	einfo "You have to run the vprocunhide command after every reboot"
+	einfo "in order to setup /proc permissions correctly for vserver"
+	einfo "use. An init script has been installed by this package."
+	einfo "To use it you should add it to a runlevel:"
+	einfo
+	einfo " rc-update add vservers default"
+	einfo
+	einfo "This init script will also help you to start/stop your vservers"
+	einfo "on reboot. See ${ROOT}etc/conf.d/vserver for details"
+	ewarn
+	ewarn "You should definitly fix up the barrier of your vserver"
+	ewarn "base directory by using the following command in a root shell:"
+	ewarn
+	ewarn " setattr --barrier ${VDIRBASE}"
+	ewarn
+	ewarn "IMPORTANT UPGRADE WARNING:"
+	ewarn
+	ewarn "Since 0.30.208-r3 the vprocunhide init-script has been merged"
+	ewarn "with the vservers init script. The following steps are"
+	ewarn "required to keep current behaviour:"
+	ewarn
+	ewarn " rc-update del vprocunhide"
+	ewarn " rc-update add vservers default"
+	ewarn
+}