gentoo resync : 10.02.2019

3 files changed, 2 insertions, 38 deletions

diff --git a/app-admin/chroot_safe/Manifest b/app-admin/chroot_safe/Manifest
index 7b3bb1f18aae..2b20cd575730 100644
--- a/app-admin/chroot_safe/Manifest
+++ b/app-admin/chroot_safe/Manifest
@@ -1,5 +1,4 @@
 AUX chroot_safe-1.4-ldflags.patch 399 BLAKE2B 3acacf5d552da06fd1907d988f113d96058efbd357cd4e6bbe514d8e8ed750b7931f3ea61a065cf605c42e3d7a21986da5d27e5b242cc0d594adcd6537b9893a SHA512 f5e3114b5d553f95d1b885d1ff43aee4d3cfb2d15a5d519818ff2f4c36fe099cdd27e6bd578dbf7ce957c38d8b329fd786f0efb22d0785197706e19892da2753
 DIST chroot_safe-1.4.tgz 25886 BLAKE2B 62247d568240a93914e5c42c3bfefd2e8793a9b6bd27c13668ff3cc48ec396b622553764e934045c0c570eeff7b15c5ae9fb7b3623c5661be537e79ce9d93287 SHA512 7eee0d8e2c75ccf4bd918f610c21511498a6499b638d09634993a4d6874882a0dbc8c27eea95e9776f1722593e3445399a893557bfa6398a11b85447564dfe61
-EBUILD chroot_safe-1.4-r1.ebuild 751 BLAKE2B 825222628b786c4067aa2b3dce7d03fd83485e388c9de3c159f40f5067160bc789f7d4454c1781a4877eda35439c22f4bcea93e339adca96f12149f83a0e9c6e SHA512 58b66c42b8b874facf8f9fbfdd84d4aabd689b3738c6cc04022b6e127972c799cdd218e21298e56ce73c7d96a61039c958f4c5218a463aad31d1711f8d5e9b32
-EBUILD chroot_safe-1.4.ebuild 783 BLAKE2B acdc573b676ce35d9cf686f15f33231099361986209e15a28ac05c17a1b487dfa7d689ecd0ae2e474a23f089f50c63972aa4673c2e2e406a652f4ce4f2dca909 SHA512 f5977571dfaf1f7e63cdd6d75bd7ba01986856e75bb73dcc49f0da6d08f9a127cfe56cb286026f3f504956994e238fa53cf571400f4fdcba2116b9935c455364
+EBUILD chroot_safe-1.4-r1.ebuild 749 BLAKE2B 27bb2b3dbd90bf5a8ee1378594a9ace8aa8e65d2e04db15747df411b183d092aae31f811fecec835ddea1ada588e51cbd862073a3598897a4f538a68d0f128c6 SHA512 aeb191ed14e6660131be89da3152a0a4844d0a55a69380462cc81f2b68bbf86c285997dc964698323f77a91a3069cf42f0cbb91645b3978d264304a06b2c5158
 MISC metadata.xml 247 BLAKE2B 306b96b46dafe605c41d3111cf9bd2fc3ef659f9f66692d05f952f8c9606d5bf1b1dd8051cdf1cd2d4e41f01934e57ae3e55ae46d23ba5acc2314d2fef325a4f SHA512 c46fc3160d29be2ce0948b1503ce44ead81dc76a264e183dc667be4e4f9bce0e235c94c2ebd06934b63cc7575aa8d5f27a528bb79185d35a138c7e0ec6dd1e3c
diff --git a/app-admin/chroot_safe/chroot_safe-1.4-r1.ebuild b/app-admin/chroot_safe/chroot_safe-1.4-r1.ebuild
index e9ade8684f94..919fdcc1757f 100644
--- a/app-admin/chroot_safe/chroot_safe-1.4-r1.ebuild
+++ b/app-admin/chroot_safe/chroot_safe-1.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN//_}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
 
diff --git a/app-admin/chroot_safe/chroot_safe-1.4.ebuild b/app-admin/chroot_safe/chroot_safe-1.4.ebuild
deleted file mode 100644
index 210b10565d66..000000000000
--- a/app-admin/chroot_safe/chroot_safe-1.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils multilib
-
-DESCRIPTION="a tool to chroot any dynamically linked application in a safe and sane manner"
-HOMEPAGE="http://chrootsafe.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN//_}/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-}
-
-src_configure() {
-	econf --libexecdir="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_compile() {
-	emake CPPFLAGS="${CXXFLAGS}" CXX="$(tc-getCXX)"
-}
-
-src_install() {
-	dolib.so chroot_safe.so
-	dosbin chroot_safe
-	sed -i -e "s:/chroot_safe::" "${ED}"/usr/sbin/chroot_safe \
-		|| die "sed chroot_safe failed"
-	doman chroot_safe.1
-	dodoc CHANGES.txt
-}