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.

(Portage version: 2.1.2-r1)

2 files changed, 61 insertions, 46 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/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