gentoo resync : 10.02.2019

3 files changed, 2 insertions, 73 deletions

diff --git a/app-misc/jail/Manifest b/app-misc/jail/Manifest
index 20eb74011974..e8326ea9fc25 100644
--- a/app-misc/jail/Manifest
+++ b/app-misc/jail/Manifest
@@ -9,6 +9,5 @@ AUX jail-2.0-openat-syscall.patch 645 BLAKE2B db200b5969f031059a749283d5ee0945ab
 AUX jail-2.0-symlinks.patch 308 BLAKE2B ebe34547c79b036a4303afc48f8d3581b7963982d7c435418a2895a19f9663c8f015ee5992a2484f4dcfa1f7be5a5ac953cc6e76c2b035c63a4410e2a22824f4 SHA512 64e72367dee1f1639a4206280a28228d01702ddb1eefa75c7faabe32cbec699f3083d11b67dccdd56b8953f34646ab4eceb70ac898f1b2a60d142ce564a92b4f
 AUX jail-2.0-sysmacros.patch 426 BLAKE2B b4cccd5258f9e164f5432083ffb9aaa418c475b90a3a5b6210eb38a62440acc0b47ef6df07ff7241de6f3d9b284cebb151ca10b40b64b1591722097028dfbc1b SHA512 b8baa43c1ca0ddd1b08171489e2a3bf08bdd1911cb7d3bb06b8a20178b64716742faf505aec4156c012b3643298c5f4b79f03787f914717caa4c92e752852e4b
 DIST jail-2.0.tar.gz 31095 BLAKE2B c86d0c677eab38c7d90317c3a19dfdadd17ea74903a886015fc1c3926fe09855be4ed9f72b18e6f144de4a7c93fb6c5be3ca77f4ccf501ebedd09533337ce578 SHA512 dfca62091b34f9adbe4e94de1dbf0ccd31bd3f8e492ea9788f712e97271b389475bc19e0390c12445353c4f73e5ba2458360bf55f5f64491705e82192db985ae
-EBUILD jail-2.0-r1.ebuild 1991 BLAKE2B a0e0ba8b3d16324cf15199cb27f87e39a7df73f5d7d67a19b0806d7fc32c7b032a88b93876c2669d9a02702ecb5263f759b706763cf6ff41c5c5a4787a0cf388 SHA512 fe7787da5600a14444902560c8de142c237585b9ac006d96081ab0736ae9a09816d2e59158a76cb80efac867404c3aa09aee4e9ad899eb4b90de77982dd1a56f
-EBUILD jail-2.0-r4.ebuild 2211 BLAKE2B 8df423376baa65ac3b24de8bdf60a6e53dc5e38e0f67807a7d8c4f9741ed6ac38c53cfca497cc832a7ff660973ce5a621003ea5cf114d68ad17277d3709ff5bc SHA512 9c80666b71e28166bc01d423f68b4de2fbd17add5c4335f55287810e7a6ebfbe7f29d42b5841d9e5380f9a4b94b7f86731ed02d9a752ee5d96acde83b535f8fc
+EBUILD jail-2.0-r4.ebuild 2209 BLAKE2B 29f135548c57b6372c10e2826cdf250e063501b2d0317a7a27a46a5809732ecf1e53c531205fd2b286bc1011853def26ea143f6d598c8c124f289a364b671ecf SHA512 33a43b82ceca2f6e51e64bfdde53d457e6fad55e96f1bd67fa247fb205404793f6db791a5a8a7cd80c93c3d18b715899020b1244c6ff68a3125626c9ba5add7c
 MISC metadata.xml 749 BLAKE2B 6280537aad78398b6a8eb29ca55982ca838f91ad547a71a78dbedb5e63e9e028740ef230d3fd8668079c3d2983daf55187a04fdf662cceaff1f39e468d6f6143 SHA512 a9cee89d1b10080ba67cbbce957b8118484c0224368728ba1dbb553c0c6189c73c2f9c7b257a5e4fcde39270bd4d83f8e43f25948b28c151f0d9170af121b7d9
diff --git a/app-misc/jail/jail-2.0-r1.ebuild b/app-misc/jail/jail-2.0-r1.ebuild
deleted file mode 100644
index 60664a83e8e8..000000000000
--- a/app-misc/jail/jail-2.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Builds a chroot and configures all the required files, directories and libraries"
-HOMEPAGE="https://github.com/spiculator/jail"
-SRC_URI="https://github.com/spiculator/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND=">=sys-apps/sed-4"
-RDEPEND="dev-lang/perl
-	dev-util/strace"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.9-gentoo.patch \
-		"${FILESDIR}"/${PN}-1.9-wrongshell.patch \
-		"${FILESDIR}"/${PN}-1.9-multiuser-rsa.patch \
-		"${FILESDIR}"/${PN}-1.9-ldflags.patch \
-		"${FILESDIR}"/${PN}-2.0-sysmacros.patch
-}
-
-src_compile() {
-	# configuration files should be installed in /etc not /usr/etc
-	sed -i "s:\$4/etc:\${D}/etc:g" install.sh || die
-
-	# the destination directory should be /usr not /usr/local
-	sed -i -e "s:usr/local:${D}/usr:g" \
-		-e "s:^COPT =.*:COPT = -Wl,-z,no:g" src/Makefile || die
-
-	# Below didn't work. Don't know why
-	#append-ldflags -Wl,-z,now
-	emake -C src CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake -C src install
-
-	# remove //var/tmp/portage/${P}/image//usr from files
-	FILES=( "${D}/usr/bin/mkjailenv"
-		"${D}/usr/bin/addjailsw"
-		"${D}/usr/bin/addjailuser"
-		"${D}/etc/jail.conf"
-		"${D}/usr/lib/libjail.pm"
-		"${D}/usr/lib/arch/generic/definitions"
-		"${D}/usr/lib/arch/generic/functions"
-		"${D}/usr/lib/arch/linux/definitions"
-		"${D}/usr/lib/arch/linux/functions"
-		"${D}/usr/lib/arch/freebsd/definitions"
-		"${D}/usr/lib/arch/freebsd/functions"
-		"${D}/usr/lib/arch/irix/definitions"
-		"${D}/usr/lib/arch/irix/functions"
-		"${D}/usr/lib/arch/solaris/definitions"
-		"${D}/usr/lib/arch/solaris/functions" )
-
-	for f in "${FILES[@]}"; do
-		sed -i "s:/${D}/usr:/usr:g" ${f} || die
-	done
-
-	sed -i "s:/usr/etc:/etc:" "${D}"/usr/lib/libjail.pm || die
-
-	dodoc doc/{CHANGELOG,INSTALL,README,SECURITY,VERSION}
-}
diff --git a/app-misc/jail/jail-2.0-r4.ebuild b/app-misc/jail/jail-2.0-r4.ebuild
index d023f2811adf..37ab62bd42c6 100644
--- a/app-misc/jail/jail-2.0-r4.ebuild
+++ b/app-misc/jail/jail-2.0-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/spiculator/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="