diff options
| author |   Patrice Clement <monsieurp@gentoo.org> | 2016-03-03 09:24:32 +0000 |
|---|---|---|
| committer | Patrice Clement <monsieurp@gentoo.org> | 2016-03-03 09:24:49 +0000 |
| commit | 7fa3fadde8fa6ed0e86a6db6df57de98b594719e (patch) | |
| tree | 0bc870f697025eb09eee2fe48ea54acedaa92a91 /sys-cluster | |
| parent | sys-apps/daisydog: new package for Chromium OS watchdog daemon (diff) | |
| download | gentoo-7fa3fadde8fa6ed0e86a6db6df57de98b594719e.tar.gz gentoo-7fa3fadde8fa6ed0e86a6db6df57de98b594719e.tar.bz2 gentoo-7fa3fadde8fa6ed0e86a6db6df57de98b594719e.zip | |
sys-cluster/util-vserver: Housekeeping. Add missing dies.
Package-Manager: portage-2.2.26
Diffstat (limited to 'sys-cluster')
| -rw-r--r-- | sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild index 79bea53779ba..fab02aed082e 100644 --- a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild +++ b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild @@ -6,8 +6,7 @@ EAPI=5 inherit eutils bash-completion-r1 -MY_P=${P/_/-} -S="${WORKDIR}"/${MY_P} +MY_P="${P/_/-}" DESCRIPTION="Linux-VServer admin utilities" HOMEPAGE="http://www.nongnu.org/util-vserver/" @@ -19,16 +18,20 @@ KEYWORDS="~alpha amd64 ~sparc x86" IUSE="" -CDEPEND="dev-libs/beecrypt +CDEPEND=" + dev-libs/beecrypt net-firewall/iptables net-misc/vconfig sys-apps/iproute2" -DEPEND=">dev-libs/dietlibc-0.33 - ${CDEPEND}" +DEPEND=" + ${CDEPEND} + >dev-libs/dietlibc-0.33" RDEPEND="${CDEPEND}" +S="${WORKDIR}/${MY_P}" + pkg_setup() { if [[ -z "${VDIRBASE}" ]]; then einfo @@ -45,14 +48,19 @@ pkg_setup() { src_test() { # do not use $D from portage by accident (#297982) - sed -i -e 's/^\$D //' "${S}"/src/testsuite/vunify-test.sh + sed -i -e 's/^\$D //' "${S}"/src/testsuite/vunify-test.sh || die + default } src_configure() { - econf --with-vrootdir=${VDIRBASE} \ - --with-initscripts=gentoo \ + local myeconf=( + --with-vrootdir="${VDIRBASE}" + --with-initscripts=gentoo --localstatedir=/var + ) + + econf "${myeconf[@]}" } src_compile() { @@ -78,11 +86,11 @@ pkg_postinst() { # Create VDIRBASE in postinst, so it is (a) not unmerged and (b) also # present when merging. - mkdir -p "${VDIRBASE}" - setattr --barrier "${VDIRBASE}" + mkdir -p "${VDIRBASE}" || die + setattr --barrier "${VDIRBASE}" || die - rm /etc/vservers/.defaults/vdirbase - ln -sf "${VDIRBASE}" /etc/vservers/.defaults/vdirbase + rm /etc/vservers/.defaults/vdirbase || die + ln -sf "${VDIRBASE}" /etc/vservers/.defaults/vdirbase || die elog elog "You have to run the vprocunhide command after every reboot" |