From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id F27131388C1 for ; Thu, 3 Mar 2016 09:44:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1CF8EE0804; Thu, 3 Mar 2016 09:44:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AABB4E0804 for ; Thu, 3 Mar 2016 09:44:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2AC43340BA2 for ; Thu, 3 Mar 2016 09:44:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D80891607 for ; Thu, 3 Mar 2016 09:44:19 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1456997089.7fa3fadde8fa6ed0e86a6db6df57de98b594719e.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/util-vserver/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild X-VCS-Directories: sys-cluster/util-vserver/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: 7fa3fadde8fa6ed0e86a6db6df57de98b594719e X-VCS-Branch: master Date: Thu, 3 Mar 2016 09:44:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6a08c486-1a42-49ce-9f5f-1e4841caf93e X-Archives-Hash: 667c53710d4b1481647237e63245afba commit: 7fa3fadde8fa6ed0e86a6db6df57de98b594719e Author: Patrice Clement gentoo org> AuthorDate: Thu Mar 3 09:24:32 2016 +0000 Commit: Patrice Clement gentoo org> CommitDate: Thu Mar 3 09:24:49 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fa3fadd sys-cluster/util-vserver: Housekeeping. Add missing dies. Package-Manager: portage-2.2.26 .../util-vserver-0.30.216_pre3120.ebuild | 32 ++++++++++++++-------- 1 file 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 79bea53..fab02ae 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"