From 3b7f92373a80b7b13b46ae1e373520fc8d4ebcf7 Mon Sep 17 00:00:00 2001 From: Benedikt Boehm Date: Mon, 30 Jan 2012 10:45:09 +0000 Subject: version bump (Portage version: 2.2.0_alpha84/cvs/Linux x86_64) --- sys-cluster/util-vserver/ChangeLog | 10 +- .../util-vserver-0.30.216_pre2935.ebuild | 125 ------------------- .../util-vserver-0.30.216_pre3004.ebuild | 136 +++++++++++++++++++++ 3 files changed, 144 insertions(+), 127 deletions(-) delete mode 100644 sys-cluster/util-vserver/util-vserver-0.30.216_pre2935.ebuild create mode 100644 sys-cluster/util-vserver/util-vserver-0.30.216_pre3004.ebuild diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog index 6b77fe138d7f..291a375c1e83 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-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.107 2011/11/20 09:13:21 xarthisius Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.108 2012/01/30 10:45:09 hollow Exp $ + +*util-vserver-0.30.216_pre3004 (30 Jan 2012) + + 30 Jan 2012; Benedikt Böhm + -util-vserver-0.30.216_pre2935.ebuild, +util-vserver-0.30.216_pre3004.ebuild: + version bump 20 Nov 2011; Kacper Kowalik util-vserver-0.30.216_pre2910.ebuild, util-vserver-0.30.216_pre2935.ebuild, diff --git a/sys-cluster/util-vserver/util-vserver-0.30.216_pre2935.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre2935.ebuild deleted file mode 100644 index 4b83b5dc3c1e..000000000000 --- a/sys-cluster/util-vserver/util-vserver-0.30.216_pre2935.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2011 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.216_pre2935.ebuild,v 1.2 2011/11/20 09:13:21 xarthisius Exp $ - -inherit eutils bash-completion - -MY_P=${P/_/-} -S="${WORKDIR}"/${MY_P} - -DESCRIPTION="Linux-VServer admin utilities" -HOMEPAGE="http://www.nongnu.org/util-vserver/" -SRC_URI="http://people.linux-vserver.org/~dhozac/t/uv-testing/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~sparc ~x86" - -IUSE="" - -CDEPEND="dev-libs/beecrypt - net-firewall/iptables - net-misc/vconfig - sys-apps/iproute2 - || ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp )" - -DEPEND=">=dev-libs/dietlibc-0.30-r2 - ${CDEPEND}" - -RDEPEND="${CDEPEND}" - -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_compile() { - econf --with-vrootdir=${VDIRBASE} \ - --with-initscripts=gentoo \ - --localstatedir=/var || die "econf failed!" - emake || die "emake failed!" -} - -src_install() { - make DESTDIR="${D}" install install-distribution \ - || die "make 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}" - keepdir "${VDIRBASE}"/.pkg - - # remove legacy config file - rm -f "${D}"/etc/vservers.conf - - # bash-completion - dobashcompletion "${FILESDIR}"/bash_completion util-vserver - - dodoc README ChangeLog NEWS AUTHORS THANKS util-vserver.spec -} - -pkg_preinst() { - has_version "<${CATEGORY}/${PN}-0.30.211" - old_init_script_warn=$? -} - -pkg_postinst() { - # Create VDIRBASE in postinst, so it is (a) not unmerged and (b) also - # present when merging. - - [ ! -d "${VDIRBASE}" ] && mkdir -p "${VDIRBASE}" &> /dev/null - setattr --barrier "${VDIRBASE}" &> /dev/null - - rm /etc/vservers/.defaults/vdirbase - ln -sf "${VDIRBASE}" /etc/vservers/.defaults/vdirbase - - 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 [[ $old_init_script_warn = 0 ]] ; 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." - ewarn - fi -} diff --git a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3004.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3004.ebuild new file mode 100644 index 000000000000..6a4fb4ad3b8a --- /dev/null +++ b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3004.ebuild @@ -0,0 +1,136 @@ +# Copyright 1999-2012 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.216_pre3004.ebuild,v 1.1 2012/01/30 10:45:09 hollow Exp $ + +EAPI=4 + +inherit eutils bash-completion + +MY_P=${P/_/-} +S="${WORKDIR}"/${MY_P} + +DESCRIPTION="Linux-VServer admin utilities" +HOMEPAGE="http://www.nongnu.org/util-vserver/" +SRC_URI="http://people.linux-vserver.org/~dhozac/t/uv-testing/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~sparc ~x86" + +IUSE="" + +CDEPEND="dev-libs/beecrypt + net-firewall/iptables + net-misc/vconfig + sys-apps/iproute2 + || ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp )" + +DEPEND=">=dev-libs/dietlibc-0.30-r2 + ${CDEPEND}" + +RDEPEND="${CDEPEND}" + +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_test() { + # do not use $D from portage by accident (#297982) + sed -i -e 's/^\$D //' "${S}"/src/testsuite/vunify-test.sh + default +} + +src_configure() { + econf --with-vrootdir=${VDIRBASE} \ + --with-initscripts=gentoo \ + --localstatedir=/var +} + +src_compile() { + emake || die "emake failed!" +} + +src_install() { + make DESTDIR="${D}" install install-distribution \ + || die "make 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}" + keepdir "${VDIRBASE}"/.pkg + + # remove legacy config file + rm -f "${D}"/etc/vservers.conf + + # bash-completion + dobashcompletion "${FILESDIR}"/bash_completion util-vserver + + dodoc README ChangeLog NEWS AUTHORS THANKS util-vserver.spec +} + +pkg_preinst() { + has_version "<${CATEGORY}/${PN}-0.30.211" + old_init_script_warn=$? +} + +pkg_postinst() { + # Create VDIRBASE in postinst, so it is (a) not unmerged and (b) also + # present when merging. + + [ ! -d "${VDIRBASE}" ] && mkdir -p "${VDIRBASE}" &> /dev/null + setattr --barrier "${VDIRBASE}" &> /dev/null + + rm /etc/vservers/.defaults/vdirbase + ln -sf "${VDIRBASE}" /etc/vservers/.defaults/vdirbase + + 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 [[ $old_init_script_warn = 0 ]] ; 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." + ewarn + fi +} -- cgit v1.2.3-65-gdbad