From 16449a80e28af2209916cc66d19c9a44ca2b90d9 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 20 Feb 2019 15:11:50 +0000
Subject: gentoo resync : 20.02.2019

---
 sys-cluster/util-vserver/Manifest                         |  3 ++-
 ...-vserver-0.30.216_pre3120-vserver-init-functions.patch | 11 +++++++++++
 .../util-vserver/util-vserver-0.30.216_pre3120-r1.ebuild  | 15 +++++++++++----
 3 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 sys-cluster/util-vserver/files/util-vserver-0.30.216_pre3120-vserver-init-functions.patch

(limited to 'sys-cluster/util-vserver')

diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index 9f6c231fcfde..f3a612bb2b0d 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -1,5 +1,6 @@
 AUX bash_completion 7568 BLAKE2B 853a448c7675888ae8e8a79218c2f156684a0189e27e94a0c512477dd1065c3f178485810d8ef2242e7e4a5b3c17533f8e6279d4fe3dc720f4ea9864f0f66dc2 SHA512 b9e5745775121107da14540103bbf4943692a514cf3cd69b71c999a5e0eb1c81253b6ac4ca635cdb6e64cd1f1c1204dfecd4a6f83cbe7d5448625c53f80ed3bb
+AUX util-vserver-0.30.216_pre3120-vserver-init-functions.patch 476 BLAKE2B 29479f8de5f7f0b455ce98cededff4b54535ffffa1762681646fd594d3f84b2c10674cb2269987c3b1106ac64cfab8aaf9c747a0f75e7d2ee0127cc08e2e459b SHA512 0d973356d9b2cb403d7f0895836850f7500e42b1d304880da6542584a37d877b840ab1a134bc754915fbcc702b4824158004f22d3acee3eaf64e298620bed987
 DIST util-vserver-0.30.216-pre3120.tar.gz 990833 BLAKE2B a9227d4b4074300f188617c48ec7884f8cf34e8b2c2685eab7678b00fbca6ea5ad4bc9dd926f88e49633165b0402802a3077d029ee4c75447112705fdb41ca4c SHA512 eca7680a8b06fecd678b4dad5824c92b53d872b3e7ec9cc275425437fb7fcfb3991f58770096f20d8274e37927a39b64ed9db082ef806e76d0c603b2cd64ef32
-EBUILD util-vserver-0.30.216_pre3120-r1.ebuild 2577 BLAKE2B cd7ad46e0a1307edc3b9248f30959a712e09ce21ada06dfd787b0390331a46c4b428cc2287ead248304a5c08b8c99de91395445fc13b45264de6aa1bee3dceed SHA512 cd81a853fae7d732385f4c60802e6ffa83a6de83ad55213b2fd7dd0bebcac4040c85c656627e4c9220bf9ef563d3807b152615038fc8ba06e616a3422ffbcb6e
+EBUILD util-vserver-0.30.216_pre3120-r1.ebuild 2697 BLAKE2B 4ff53e547164d2a34b79ec2d0e1e1f686d20b73fb6078a2fb0fc0d1b82540105c117317f4cdb1340f61eb3a2221b787a899c3be3d39d00e4bf6b53760ad23825 SHA512 124764e5c8c57086a3b0c57c2d1cdfdba58f8e31ceb18df95b6f411ec5b2ec2a1e6546d93c3a133f946bf4455b5a52173390782deacfb3abc83aba8425bc2777
 EBUILD util-vserver-0.30.216_pre3120.ebuild 2626 BLAKE2B 8687a97b2e603e34f39cbaaf4d9dc89fa6a6e0cc848df90b106a6771ac181b5f28804697afa53b3bed83599756e0bd6eb279df6240790f4dd68a33c135588a16 SHA512 aca3576606941549fcdbd51b7e5ffec420013dd1763e6f4af48aaba281fe9796e5c4ec84ca9289b7bfec1fc78e73832fcf7eaaaea60766ad6c33b4fc1cba3d44
 MISC metadata.xml 608 BLAKE2B 08f33a158673400b65c252f2baefce7e21cbc227ff8e8f0d5fb0470dfb721d8c1936784958d67b9575ba56bd466af4d8a7c369d8712ff9d600f45b48cd88c9c6 SHA512 38db9a382d90e296630c14ab82f175f955f82429fb1dae2e63c1b8cc9924dc527772bd5d6aa302a41dbacc2d3d330e2bc67a010570179c265ebd6f377d214931
diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.216_pre3120-vserver-init-functions.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.216_pre3120-vserver-init-functions.patch
new file mode 100644
index 000000000000..9026ba07c967
--- /dev/null
+++ b/sys-cluster/util-vserver/files/util-vserver-0.30.216_pre3120-vserver-init-functions.patch
@@ -0,0 +1,11 @@
+--- a/scripts/vserver-init.functions	2019-02-20 07:54:16.747585681 +0000
++++ b/scripts/vserver-init.functions	2019-02-20 07:54:31.457661349 +0000
+@@ -80,7 +80,7 @@
+ 
+ function create_dirs()
+ {
+-    $_MKDIR -p "$__RUNDIR" && $_MKDIR -p "$__VSHELPERSTATEDIR" && $_MKDIR -p `$_READLINK "$__PKGSTATEREVDIR"`
++    $_MKDIR -p "$__RUNDIR" && $_MKDIR -p "$__VSHELPERSTATEDIR" && $_MKDIR -p "$__PKGCACHEDIR" && $_MKDIR -p `$_READLINK "$__PKGSTATEREVDIR"`
+ }
+ 
+ function mount_cgroup()
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120-r1.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120-r1.ebuild
index 228e64e50988..d9776666cc1a 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120-r1.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,6 +30,12 @@ RDEPEND="
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-vserver-init-functions.patch"
+)
+
+DOCS=( README ChangeLog NEWS AUTHORS THANKS util-vserver.spec )
+
 pkg_setup() {
 	if [[ -z "${VDIRBASE}" ]]; then
 		einfo
@@ -68,15 +74,16 @@ src_compile() {
 src_install() {
 	make DESTDIR="${D}" install install-distribution || die
 
+	# remove runtime paths
+	rm -r "${D}"/var/run || die
+	rm -r "${D}"/var/cache || die
+
 	# keep dirs
-	keepdir /var/cache/vservers
 	keepdir "${VDIRBASE}"
 	keepdir "${VDIRBASE}"/.pkg
 
 	# bash-completion
 	newbashcomp "${FILESDIR}"/bash_completion ${PN}
-
-	dodoc README ChangeLog NEWS AUTHORS THANKS util-vserver.spec
 }
 
 pkg_postinst() {
-- 
cgit v1.2.3