gentoo resync : 28.04.2021

3 files changed, 35 insertions, 32 deletions

diff --git a/app-misc/jail/Manifest b/app-misc/jail/Manifest
index 5fa67496cd8d..b1c122c08c4e 100644
--- a/app-misc/jail/Manifest
+++ b/app-misc/jail/Manifest
@@ -9,5 +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-r4.ebuild 2225 BLAKE2B 9d4d2d7b52ad25b14fd0acfdf12eff4ea85cfe009ff45ee8cc8a639a839b50df7323e3526bc7413e00eec48628dcb11ac530ea5aaa17b05bcefce531e5d63491 SHA512 467e6d011f3deaf90e2a53ebb0330b6ed44c909dac025df5f403c8dfd150d85381a0cab7c3dc6fcc3bf9d6393d28a260797e196dd7e27922505c1df16fb08e37
-MISC metadata.xml 749 BLAKE2B 6280537aad78398b6a8eb29ca55982ca838f91ad547a71a78dbedb5e63e9e028740ef230d3fd8668079c3d2983daf55187a04fdf662cceaff1f39e468d6f6143 SHA512 a9cee89d1b10080ba67cbbce957b8118484c0224368728ba1dbb553c0c6189c73c2f9c7b257a5e4fcde39270bd4d83f8e43f25948b28c151f0d9170af121b7d9
+EBUILD jail-2.0-r4.ebuild 2228 BLAKE2B 0dc5385363d4b9b52cebd572fd8094613447545f199f665f080bd2dd9cea90f362ec8b369b1f9e782c4ddd20cd657892fd1cf311752bca515374df19748a5ad3 SHA512 38c2769338d5442589f01fde20d19657ad09ace8cc4ac2b821bad9e41a0e40c41000a8b3e3e645b18bfd645a1fa0e58641bc015c2149cdc6d6d2c0d732e319fb
+MISC metadata.xml 745 BLAKE2B b3182c8a1f9f31ecfe0526b88d2e8fd4f898af2a6ddc4371a841d2a7aa2e4d89cb462b03bca0f334b952afe910d7c6bd555083c292326f57e2f91755259fc40b SHA512 6b4396d20fb883385246425e04dda03453f7a49b210a30b0863b1b163b664ae5bd55ddc8c6bf862cdffe1087e34167299379c28e06a8ac6aacde2f2993363880
diff --git a/app-misc/jail/jail-2.0-r4.ebuild b/app-misc/jail/jail-2.0-r4.ebuild
index 4e8ef915d7e0..b3921ab2daec 100644
--- a/app-misc/jail/jail-2.0-r4.ebuild
+++ b/app-misc/jail/jail-2.0-r4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils flag-o-matic toolchain-funcs
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Builds a chroot and configures all the required files, directories and libraries"
 HOMEPAGE="https://github.com/spiculator/jail"
@@ -11,13 +12,11 @@ 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"
-IUSE=""
 
 RDEPEND="
 	dev-lang/perl
 	dev-util/strace
 "
-DEPEND=""
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.9-gentoo.patch
@@ -35,41 +34,45 @@ PATCHES=(
 )
 
 src_compile() {
+	emake -C src CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
 	# 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
+	sed -i \
+		-e "s:usr/local:${D}/usr:g" \
+		-e "s:^COPT =.*:COPT = -Wl,-z,no:g" \
+		src/Makefile || die
 
-	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" )
+	FILES=(
+		"${ED}/usr/bin/mkjailenv"
+		"${ED}/usr/bin/addjailsw"
+		"${ED}/usr/bin/addjailuser"
+		"${ED}/etc/jail.conf"
+		"${ED}/usr/lib/libjail.pm"
+		"${ED}/usr/lib/arch/generic/definitions"
+		"${ED}/usr/lib/arch/generic/functions"
+		"${ED}/usr/lib/arch/linux/definitions"
+		"${ED}/usr/lib/arch/linux/functions"
+		"${ED}/usr/lib/arch/freebsd/definitions"
+		"${ED}/usr/lib/arch/freebsd/functions"
+		"${ED}/usr/lib/arch/irix/definitions"
+		"${ED}/usr/lib/arch/irix/functions"
+		"${ED}/usr/lib/arch/solaris/definitions"
+		"${ED}/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
+	sed -i "s:/usr/etc:/etc:" "${ED}"/usr/lib/libjail.pm || die
 
 	dodoc doc/{CHANGELOG,INSTALL,README,SECURITY,VERSION}
 }
diff --git a/app-misc/jail/metadata.xml b/app-misc/jail/metadata.xml
index 425dd3d2d460..26ee509dcdca 100644
--- a/app-misc/jail/metadata.xml
+++ b/app-misc/jail/metadata.xml
@@ -7,9 +7,9 @@
 		<bugs-to>https://github.com/spiculator/jail/issues</bugs-to>
 	</upstream>
 	<longdescription>
-Jail Chroot Project is an attempt of write a tool that builds a chrooted environment. 
-The main goal of Jail is to be as simple as possible, and highly portable. The most 
-difficult step when building a chrooted environment is to set up the right libraries and 
-files. Here, Jail comes to the rescue with a tool to automagically configures and builds 
+Jail Chroot Project is an attempt of write a tool that builds a chrooted environment.
+The main goal of Jail is to be as simple as possible, and highly portable. The most
+difficult step when building a chrooted environment is to set up the right libraries and
+files. Here, Jail comes to the rescue with a tool to automagically configures and builds
 all the required files, directories and libraries.</longdescription>
 </pkgmetadata>