Dropping the explicit DEPEND/RDEPEND on sys-process/procps, as that is already contained in base/packages (thus the system target on all arches). Moving away from the extra ugly myconf-stuff, putting it all in econf's hand. Unifying `make install' and `make install-distribution'. Adjusting the pkg_postinst to use elog instead of einfo. Adding a hint, if upgrading to >0.30.211, as the init-scripts changed.

Package-Manager: portage-2.1.2-r1

3 files changed, 73 insertions, 58 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index d2dd8d196b6f..12ee86e2a443 100644
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,15 @@
 # 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.68 2006/12/21 22:37:48 phreak Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.69 2007/01/20 12:35:49 phreak Exp $
+
+  20 Jan 2007; Christian Heim <phreak@gentoo.org>
+  util-vserver-0.30.212.ebuild:
+  Dropping the explicit DEPEND/RDEPEND on sys-process/procps, as that is already
+  contained in base/packages (thus the system target on all arches). Moving away
+  from the extra ugly myconf-stuff, putting it all in econf's hand. Unifying
+  `make install' and `make install-distribution'. Adjusting the pkg_postinst to
+  use elog instead of einfo. Adding a hint, if upgrading to >0.30.211, as the
+  init-scripts changed.
 
   21 Dec 2006; Christian Heim <phreak@gentoo.org>
   util-vserver-0.30.210-r13.ebuild, util-vserver-0.30.211.ebuild,
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index c47c7758c15e..7433d772b1da 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -30,14 +30,14 @@ EBUILD util-vserver-0.30.211.ebuild 3748 RMD160 cb6beaaa6489d3e5511049f5fa700610
 MD5 7083d9253ab270405c9854605edabf09 util-vserver-0.30.211.ebuild 3748
 RMD160 cb6beaaa6489d3e5511049f5fa700610642e8758 util-vserver-0.30.211.ebuild 3748
 SHA256 8282a7f9a115458390ba13ea9a6e47ec48a5af9b81747f265bc211c821568c48 util-vserver-0.30.211.ebuild 3748
-EBUILD util-vserver-0.30.212.ebuild 3708 RMD160 a296b779c47d122d1fe3411c08fa72264ad4299d SHA1 7b3283db346515201c212d2e38b16cc034298a2e SHA256 b38f94319aed938e5822125343cd2bb48a30b3c432e74975a9839729c3ad01d8
-MD5 09073d032755f67c04eb52e4800564d7 util-vserver-0.30.212.ebuild 3708
-RMD160 a296b779c47d122d1fe3411c08fa72264ad4299d util-vserver-0.30.212.ebuild 3708
-SHA256 b38f94319aed938e5822125343cd2bb48a30b3c432e74975a9839729c3ad01d8 util-vserver-0.30.212.ebuild 3708
-MISC ChangeLog 13812 RMD160 90fd2905dc0405a14099f84d052ac3402f0a8e42 SHA1 80bb011e548896249c04f88b7b465d1469e6f610 SHA256 aae3ad454140faddc020a754f708716ab7809d360bb8a4a18429caff2e4c3106
-MD5 03373ff32fcb9a7475f99378f0e74d37 ChangeLog 13812
-RMD160 90fd2905dc0405a14099f84d052ac3402f0a8e42 ChangeLog 13812
-SHA256 aae3ad454140faddc020a754f708716ab7809d360bb8a4a18429caff2e4c3106 ChangeLog 13812
+EBUILD util-vserver-0.30.212.ebuild 3835 RMD160 d418b900a498069e88ff7b8a2657e50dc20eaf5e SHA1 566f6c0b2a7d6ffc8766ace0e26a6fa8a8d63f8e SHA256 c6b084daad7761586c8ef3400927bbcc4710f0d7f099cb8c54e9582acbecbbb2
+MD5 f544cf1c49efabe237d31c684bf033e5 util-vserver-0.30.212.ebuild 3835
+RMD160 d418b900a498069e88ff7b8a2657e50dc20eaf5e util-vserver-0.30.212.ebuild 3835
+SHA256 c6b084daad7761586c8ef3400927bbcc4710f0d7f099cb8c54e9582acbecbbb2 util-vserver-0.30.212.ebuild 3835
+MISC ChangeLog 14316 RMD160 60b90942052629aca13084bc6d36d2b51ef0daae SHA1 c4f86c9b2a02e8b7ad71accf44b2e6d0f96b542c SHA256 f6f5e7b4556650963e8d33b2969bc55f05e01f1dbd1c68ea3d1ba33cbf3310a9
+MD5 3d4c047d3df01a94a0ce314b54be952a ChangeLog 14316
+RMD160 60b90942052629aca13084bc6d36d2b51ef0daae ChangeLog 14316
+SHA256 f6f5e7b4556650963e8d33b2969bc55f05e01f1dbd1c68ea3d1ba33cbf3310a9 ChangeLog 14316
 MISC metadata.xml 588 RMD160 43bd819942f6f0c03bec0bcf67601a7099b59a2b SHA1 d0e5af40193886066bbe1060324dede1f0fd367f SHA256 798e87b6d5fb379322178e9f8b7432371f630caaf3fd6ff369e35056483cc31d
 MD5 493021fa14e20216e8ce772e9dc10a62 metadata.xml 588
 RMD160 43bd819942f6f0c03bec0bcf67601a7099b59a2b metadata.xml 588
@@ -52,9 +52,9 @@ MD5 0f5d705e788b54f83af3531af62e739e files/digest-util-vserver-0.30.212 268
 RMD160 9e595c3a71440aede6174887c9cb093c123667c5 files/digest-util-vserver-0.30.212 268
 SHA256 d85b209f085a57250ac6312dc686ac3d1be5c43d491f0c4cc8fd300f74c3421b files/digest-util-vserver-0.30.212 268
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFiwzCyuNVb5qfaOYRAg4hAKCkm4ZDXvjlI7vdJejXEkcBn66aCgCff3UJ
-NFwrp0nGEU9/bn2qYjQtuTE=
-=YD4i
+iD8DBQFFsgx7yuNVb5qfaOYRAuckAJ9i98u+g0++sM5D5vuZ+DTBzQfntwCgu5/F
+j7V04Qiqs92PytXAtoXHjFU=
+=Dz3M
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.212.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.212.ebuild
index fc7b85270569..3e9326a89aeb 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.212.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.212.ebuild
@@ -1,6 +1,9 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.ebuild,v 1.2 2006/12/21 22:37:48 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.212.ebuild,v 1.3 2007/01/20 12:35:49 phreak Exp $
+
+WANT_AUTOMAKE="1.9"
+WANT_AUTOCONF="latest"
 
 inherit autotools eutils bash-completion
 
@@ -18,15 +21,12 @@ DEPEND=">=dev-libs/dietlibc-0.30-r2
 	dev-libs/beecrypt
 	net-firewall/iptables
 	net-misc/vconfig
-	sys-apps/iproute2
-	sys-process/procps
-	=sys-devel/automake-1.9*"
+	sys-apps/iproute2"
 
 RDEPEND="sys-apps/iproute2
 	net-misc/vconfig
 	net-firewall/iptables
-	dev-libs/beecrypt
-	sys-process/procps"
+	dev-libs/beecrypt"
 
 pkg_setup() {
 	if [[ -z "${VDIRBASE}" ]]; then
@@ -40,12 +40,6 @@ pkg_setup() {
 	einfo
 	einfo "Using \"${VDIRBASE}\" as vserver base directory"
 	einfo
-
-	myconf="${myconf} --with-vrootdir=${VDIRBASE}"
-
-	# default paths
-	myconf="${myconf} --localstatedir=/var"
-	myconf="${myconf} --with-initrddir=/etc/init.d"
 }
 
 src_unpack() {
@@ -56,13 +50,15 @@ src_unpack() {
 }
 
 src_compile() {
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
+	econf --with-vrootdir=${VDIRBASE} \
+		--localstatedir=/var \
+		--with-initrddir=/etc/init.d || die "econf failed!"
+	emake || die "emake failed!"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	make DESTDIR="${D}" install-distribution || die "install-distribution failed"
+	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
@@ -94,33 +90,43 @@ src_install() {
 }
 
 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 vprocunhide default"
-	einfo
-	ewarn "Since util-vserver-0.30.211 all Gentoo specific wrappers"
-	ewarn "have been merged upstream, and may now have a slightly"
-	ewarn "different syntax, i.e. you have to update scripts that"
-	ewarn "depend on these wrappers (vesync, vemerge, vupdateworld"
-	ewarn "and vdispatch-conf)"
-	ewarn
-	ewarn "Additionally the init scripts have changed and now use"
-	ewarn "upstream scripts as backend. An init script to start"
-	ewarn "virtual servers in the 'default' group/mark has been"
-	ewarn "installed by this ebuild:"
-	ewarn
-	ewarn "  rc-update add vservers.default default"
-	ewarn
-	ewarn "To start vservers in other groups/marks, you have to"
-	ewarn "symlink the default init script the same way you do"
-	ewarn "with net.* scripts:"
-	ewarn
-	ewarn "  ln -s /etc/init.d/vservers.default /etc/init.d/vservers.<mark>"
-	ewarn
+	elog
+	elog "You have to run the vprocunhide command after every reboot"
+	elog "in order to setup /proc permissions correctly for vserver"
+	elog "use. An init script has been installed by this package."
+	elog "To use it you should add it to a runlevel:"
+	elog
+	elog " rc-update add vprocunhide default"
+	elog
+
+	if has_version "<0.30.211" ; then
+		ewarn "Please make sure, that you remove the old init-script from any"
+		ewarn "runlevel and remove it from your init.d dir!"
+		ewarn
+		ewarn "# rc-update del vservers"
+		ewarn "# rm -f ${ROOT}etc/init.d/vservers"
+		ewarn
+		ewarn "Since util-vserver-0.30.211 all Gentoo specific wrappers"
+		ewarn "have been merged upstream, and may now have a slightly"
+		ewarn "different syntax, i.e. you have to update scripts that"
+		ewarn "depend on these wrappers (vesync, vemerge, vupdateworld"
+		ewarn "and vdispatch-conf)"
+		ewarn
+		ewarn "Additionally the init scripts have changed and now use"
+		ewarn "upstream scripts as backend. An init script to start"
+		ewarn "virtual servers in the 'default' group/mark has been"
+		ewarn "installed by this ebuild:"
+		ewarn
+		ewarn "  rc-update add vservers.default default"
+		ewarn
+		ewarn "To start vservers in other groups/marks, you have to"
+		ewarn "symlink the default init script the same way you do"
+		ewarn "with net.* scripts:"
+		ewarn
+		ewarn "  ln -s /etc/init.d/vservers.default /etc/init.d/vservers.<mark>"
+		ewarn
+	fi
+
 	ewarn "You should definitly fix up the barrier of your vserver"
 	ewarn "base directory by using the following command in a root shell:"
 	ewarn