gentoo resync : 04.08.2018

13 files changed, 69 insertions, 60 deletions

diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 42275eb3dc42..94932c7698fa 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index e42fbb1a7184..e3f9a4a9f266 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -13,6 +13,6 @@ DIST htop-2.2.0.tar.gz 308109 BLAKE2B 323a3bfe5032b6d59a3f751831a2af6aa7ae7e9ecc
 DIST htop-3.0.0_beta4.tar.gz 179849 BLAKE2B 2990090a3b898673fd3bf985077721aed79d00ee07c8a6808b25eb84e320a9c494bd8ad7440ea142ae01bd634ab8863e2cca01c5a52bd19a7e2f4746334acce8 SHA512 4a9c8765ddbd366b06f23e14dc2176cd2da5346e32867c6fa9f11e57018acb6cc37f9ada044febb1b9d414e4dc5958c3c84455649e9c05f64ddf1b37c59fc05e
 EBUILD htop-2.0.2.ebuild 1392 BLAKE2B 951213ba4c64dd0aafed491cfc608075015b22c8bfc5cb7af0436b46bb5a624d5584fe07a6e10b68d336a9a9c1aebf6a361feb0eaa18818082d404b4c14e455d SHA512 034da8860aae7b9f4587acb420cd51367eec49a062488f4ac97d0caa4093209448efc7357dbd8ff1376673259211f31a09f82172442d09578bcf40c1e8e4caf0
 EBUILD htop-2.1.0-r1.ebuild 1992 BLAKE2B 1eb22bcc2d7d5a78ab7f5db4aff0c5e2908f58b42dffeaa10ef7730b7a5dd2c5dc403c048c09ca959cea68edd3ddd6c2ad8da5e7860a6ae0e663e5a631e6ca85 SHA512 96f1d32dc7f3f5decf550af430d81e16f0368deb0ab4142e2960d79e753cb486238f746d8eb6e6790fd5f874acde158ddf5e6638aa8bffd80edc89dbea1734e3
-EBUILD htop-2.2.0.ebuild 1506 BLAKE2B 40768733346a26d5f05f0490f4afb751b82bdf0c0cdee7573d90bd5fbe13153a16cb2c19549239c253eb70b308c7f5efabb06602db94303ac95d468b0429a559 SHA512 058725dda9fe0868570a51958f4f15db7be4bfe1c73a1938ef011b2071ed33653a94dc67ff4f65207a68790162852c4ac51060ce07d797a30bbc03eb780dfa65
-EBUILD htop-3.0.0_beta4.ebuild 1851 BLAKE2B 5d2e0e05ba8d2e4367f6be6fe865dfee6478a7111449ae54037b5e01383bc8ff87112fedad96a6c9378d50ab293520fa4ae11dbc40580a560ba2702ccccd336c SHA512 689993ec609120040ec0d9cb1483dd2d3f5b9b6dc5c144e28f1e1d6ddedc4dc2e59f83121203dc95276caba1a064abe6382b6ba40fa1898b06e40b6964207c25
+EBUILD htop-2.2.0.ebuild 1508 BLAKE2B 9be84608f2bfb6dfdd02e114b1e66542a614607ac076514976078e64da67c0ce173cf8b87e6dfe3d44333b7487cc08e1aadd3b9d32358ddd1b91e1c150faff8a SHA512 726d006e4e3a8e537039a8021b14c5d6a82c273f29175994a5dc020e1612294d60c3146e4572ef5509d766df8196336f649844b0123c96cf657baa9289e1be8b
+EBUILD htop-3.0.0_beta4.ebuild 1811 BLAKE2B e32ebe3f3a2e6c703b7599f0c43f7cb891368d342a4ddd42198cec5cea470bcf52bfb8f931f4edf5b5298fd167197f8d41e15f426617c40adec1b32044370769 SHA512 6375ffac952ed8126c23a617660f76f4fd2e181790d387baa221cbe40a836cfbe5f2154718247d883abec5e76c8f6c817279d90b19fa61a12d549bac3ca19d65
 MISC metadata.xml 750 BLAKE2B 57d419667fbc0053cb2f24908a4e43fefecca832bd86e8d562a4a43090b82f049c62457388ffe8bc4c1f3d49e1119da50f8221686b69956f4ea9426259fb6f3a SHA512 e35d8a5177f9e5bb3136759a7c4c0de5dee4366e3380952c8d72dbdfab46be5f880b77450046f02846c7baa1892e88835c8480808333934ec1bec04c34cd9072
diff --git a/sys-process/htop/htop-2.2.0.ebuild b/sys-process/htop/htop-2.2.0.ebuild
index 5647433903d2..bd549ea95a59 100644
--- a/sys-process/htop/htop-2.2.0.ebuild
+++ b/sys-process/htop/htop-2.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit linux-info python-single-r1
 
diff --git a/sys-process/htop/htop-3.0.0_beta4.ebuild b/sys-process/htop/htop-3.0.0_beta4.ebuild
index 26c184d21dd0..0b5a668213d3 100644
--- a/sys-process/htop/htop-3.0.0_beta4.ebuild
+++ b/sys-process/htop/htop-3.0.0_beta4.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
-inherit autotools linux-info python-single-r1
+inherit autotools linux-info python-any-r1
 
 DESCRIPTION="interactive process viewer"
 HOMEPAGE="https://hisham.hm/htop/"
@@ -25,8 +25,6 @@ DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	virtual/pkgconfig"
 
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
 DOCS=( ChangeLog README )
 
 CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
@@ -39,11 +37,11 @@ PATCHES=(
 
 pkg_setup() {
 	if ! has_version sys-process/lsof; then
-		ewarn "To use lsof features in htop(what processes are accessing"
+		ewarn "To use lsof features in htop (what processes are accessing"
 		ewarn "what files), you must have sys-process/lsof installed."
 	fi
 
-	python-single-r1_pkg_setup
+	python-any-r1_pkg_setup
 	linux-info_pkg_setup
 }
 
diff --git a/sys-process/numactl/Manifest b/sys-process/numactl/Manifest
index 94b7f1be07b8..931ba881c9e3 100644
--- a/sys-process/numactl/Manifest
+++ b/sys-process/numactl/Manifest
@@ -5,6 +5,6 @@ DIST numactl-2.0.11.tar.gz 408175 BLAKE2B 0767d555d5254e780ef50bd66215e84208e88f
 DIST numactl-2.0.12.tar.gz 423020 BLAKE2B 39d33612591df805715c51280bf34b8328ba6fc49bdaf9dd3bd67e076f9d319c9622ef72766c12e319f4be27ee9ec7f5ecb054a6e8c7c3cf568a69aea624d511 SHA512 316b10f50e6eee4cee9cf191f19381ec4a61980354eec3f9fe43fef21465bee28a82adeb9c235d4877e82950ccd14c9473b79fd1e2f5a7f598ec2fac230780ff
 EBUILD numactl-2.0.11-r1.ebuild 1668 BLAKE2B 14394a9c9620741f45c43b11d8272253f3fb643626aa654edc5fbde9bbe1796e4fa48fc2d4248ff7fc2e6469f04658c0aeb2119de101d30208dd1f3e61c79fec SHA512 f7a4265e81b14d1d5b6814ecddc5640f30fb1ca9c7cf7e8750a754bd397e7327d9af00598a7c19b8906f405487205cbee62f1937faee83fb56a5d1adbe48d740
 EBUILD numactl-2.0.11.ebuild 1527 BLAKE2B 64b4e024b16d1ba057f3bc61613229ff5659613149567ee52440205baac3a793a390724104883da1241daafaf11fccffd764ec68efef41c138b904be800f6c1f SHA512 0a0a6eff479e075be84a48dbe2994c1ce884ad3dee6da4d2d83c770ec7db42cdde077bcd3e17c23166bf19eb83eeecbeb86d1b7c48df34c3146bfece8db481dd
-EBUILD numactl-2.0.12.ebuild 1685 BLAKE2B 7cc6cb2a721489583a179a97b244a48c45f0767e44ed1d9f2fa9740e2eeb7eedd82031a86b60a1a0a9c2636228ef288c2d6bbb213f1972449a7db03ff57a201d SHA512 1e9d8b3863c12794f2fbd917d06e99e448a66e80de3a01f08dce3a6c290a806b2e24537876cd6792c278bbc35a2cd901b78ae5e972b02b14ae94dcc3d265b0ae
+EBUILD numactl-2.0.12.ebuild 1684 BLAKE2B b6ec387ed6594b5d17ee9e3f8a194979bb53e718432ad01e09ebfe8a6553e65de0a01301e4e95c8353a3dff6199beff2c5fdc208317934db87f14d5dd95fae42 SHA512 7b0e7bdbeb49aea6a0db81e261f8fa2bef14e85b4c3697db561f5c213c42cdd65e847179cae22c96c3261797d91a3b2a5b1b1b8cdb5f0eb424e4c951523a8edb
 EBUILD numactl-9999.ebuild 1685 BLAKE2B 7cc6cb2a721489583a179a97b244a48c45f0767e44ed1d9f2fa9740e2eeb7eedd82031a86b60a1a0a9c2636228ef288c2d6bbb213f1972449a7db03ff57a201d SHA512 1e9d8b3863c12794f2fbd917d06e99e448a66e80de3a01f08dce3a6c290a806b2e24537876cd6792c278bbc35a2cd901b78ae5e972b02b14ae94dcc3d265b0ae
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-process/numactl/numactl-2.0.12.ebuild b/sys-process/numactl/numactl-2.0.12.ebuild
index 312ab570210b..382d2e6496e8 100644
--- a/sys-process/numactl/numactl-2.0.12.ebuild
+++ b/sys-process/numactl/numactl-2.0.12.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/numactl/numactl/releases/download/v${PV}/${P}.tar.gz"
 	# ARM lacks the __NR_migrate_pages syscall.
-	KEYWORDS="~amd64 -arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux"
+	KEYWORDS="~amd64 -arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-process/prll/Manifest b/sys-process/prll/Manifest
index 16658204bbf2..a4d646d9834a 100644
--- a/sys-process/prll/Manifest
+++ b/sys-process/prll/Manifest
@@ -1,3 +1,5 @@
 DIST prll-0.6.2.tar.bz2 37870 BLAKE2B 00adcb56e49dfe6a04235f628fee1aee5a0164ada30e3a2ac624f73f7e613c7bdd411012f01e8278bc95a1e8e96479d9177f48745759feb4681c0f75a6420419 SHA512 6157ab4d69ab21b0995d5e8e788605b9b602fa0268beae2d6b69e6bf32c734869f023d881ecdd0df83c1f45b584c88eef8beb88d2c58f657340697bf48dfd8cd
+DIST prll-0.6.4.tar.gz 49885 BLAKE2B 07a63ddc6260c302070f27488142118286a0312ef807a6eaebbac180dbfb479c78f66cfb96cddbb7a62c3d96a79a9c4962daf1fbd308ec475ae8d03a999fd276 SHA512 df830eae9be91e175444ba14c23efde3f10152b968ca6b1365e0ab57c68df1a00712a0e6d77cd02aae4ed7a23fc7c25f207ba08bc1559b8331c42dec1d38dbfa
 EBUILD prll-0.6.2.ebuild 650 BLAKE2B 429bc383fac5dffceb9b06708a55220cb2042798679adeca48ebb3293849f3740d5bed4ffa997e8f020d20c1ae003c87af0f4ac0db39095c9fb4554fee9dc52b SHA512 2a62e8dabd145b856a70d758b44fbc68f204beeceb37a50df7314351893ded41d341bef17bfb823b78e03b1898d338ce9c03c55caa6446ccaff32af931bdc94c
+EBUILD prll-0.6.4.ebuild 907 BLAKE2B e8d5b26d80502f0e86950b3e1a9c4bf2f43531ef458a3aef0ac70af6e88fc1ad60862963e51a08fe95fc8325b608dde0d5615cbfb3472fc8319eb5865b564d71 SHA512 be508e27b1566d04c5582ae398a2a15e5c587bd3b45aabec528ab6bcc5e61d3bc8ba6e5decef7b410bbb717ccbcc9ff8500bd90fb17782fca69d5f76a3e0ddc0
 MISC metadata.xml 339 BLAKE2B 5d5aac74be32e919165c7e7dddef200d0b53582ebc72a6399a47f1ab7e43095119a036fdd516813742b1ae503ee2662e035d9bc8f57b62412f11d57671e85919 SHA512 9277474c200a9a9c93d86eeb36dff14c3a2a0defd7c4d4559a4e841f4ab347eb8c99ea32f430153448b6a52d0e1fbe8cccd12d0d3dce556dfbf630e3b51d3871
diff --git a/sys-process/prll/prll-0.6.4.ebuild b/sys-process/prll/prll-0.6.4.ebuild
new file mode 100644
index 000000000000..1d9cfb0e7449
--- /dev/null
+++ b/sys-process/prll/prll-0.6.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs readme.gentoo-r1
+
+DESCRIPTION="A utility for parallelizing execution of shell functions"
+HOMEPAGE="https://github.com/exzombie/prll"
+SRC_URI="https://github.com/exzombie/prll/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+RESTRICT="test"
+
+DOC_CONTENTS="
+You must source the prll.sh file located\nin /etc/profile.d to be able to use prll:\n
+ $ source /etc/profile.d/prll.sh
+"
+
+src_prepare() {
+	default
+	sed \
+		-e '/then sh/d' \
+		-e '/then zsh/d' \
+		-e '/then dash/d' \
+		-i tests/Makefile || die
+	tc-export CC
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install
+	einstalldocs
+	readme.gentoo_create_doc
+	rm -rf "${D}/usr/share/doc/prll" || die
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index 9cb935d90fc3..7644c0a2bf73 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -3,6 +3,6 @@ AUX psmisc-22.21-sysmacros.patch 693 BLAKE2B f5e346821af0ae418431d8585a6f7f6150d
 DIST psmisc-22.21.tar.gz 457702 BLAKE2B 7e81b695546c3dca6e1ade47bd1cd736ad434eb964608ead3e7d5a3b97f6d3d6c927e8e13ee525e716b66067e5a1573c4f0b8434540b9c66aac6e6b8f15bcfde SHA512 766aeb45687090b88b17176c5117a603e83fe92a13c013aea72c8ee80048adf02e18c7daa52ddfb8b2135f7c9a1bcae38896cdfb8d0158728d85a446c5e0d5ae
 DIST psmisc-23.1.tar.xz 296136 BLAKE2B e53f7b80f1106622d652dad772d4236a62a1eb58e277f078cf0392d5a0bd7963c66805e28f6d1300999f2e2e5dcb692b1ecb3f6d39cefa77ebbc87302cd730be SHA512 f678869ea555986a2538ada9630b74ce79304f3ee85cc9d69a3912d8d30ad491829eac0dcb69aae7003ee9b5de9645d2135b80a9e0b77824e60c417dc0be5f95
 EBUILD psmisc-22.21-r3.ebuild 1381 BLAKE2B 0ab006290c79539f4bcf949f0e6cbbbca2c55236f5068856f5b53aeb6444908138fc1f0dd15040c596ae34fb6f8a5eeda31ad0483d85154a91804eff7dee9e1e SHA512 e909d68ebb9b81959c8c4126bf511337450c19fdc66dac38db2fa66bf580e88d42a070e9fc602f9b68bbf0d96044ff57ae7b7655095e48aec5e8dab37bd1a483
-EBUILD psmisc-23.1-r1.ebuild 1288 BLAKE2B c328f628e104ec2643566a5344295a2d4ec64c358cf4a6d655a082ad99eef29538f70df7df525a759d8877d3ff8ed8d5d7c8e03b2347a89d2ecf88bc11bc8a24 SHA512 00f08c5f38cd85183c12d58396c466e0560c51c9caa261900338960d93238eb6972ed532b895a8d8d78333d9ae5c4cabada112dc621ba3a7c4f94322667e071c
+EBUILD psmisc-23.1-r1.ebuild 1284 BLAKE2B 13109642c6810f9e98d7cedeee15c829e5191b61ce52763c6443af447f57b1c9dc385ee6c44579b6c9c3bd8ae85bfc7b8b5c75cc003303c7c4a6ffb82487018f SHA512 baddd89816a428f51ad059b0e5dba6a880d784156d7f600a5191949f0f5dc0094289b969b209d17ade453c64f5f48642640654281321edda0c316b16405f01f7
 EBUILD psmisc-23.1.ebuild 1299 BLAKE2B c7cf0bf50d0f3b718c419668ef2314282f4ca9628886584ecad78cd8b60f10c3a0335286e56554965b70796d00e7a7ccb2d56e59083a64ccb19ccac4e5803ba5 SHA512 0387c7623dd36e04f74e7a83d948d1ff0a064a8b5108267b9d5ab1024a72f9225e4ae1e7bdee014b2ae69e2c609528810484e0e22708f7a17f6ea349fe634ece
 MISC metadata.xml 326 BLAKE2B 899a2f3fa295d2e0e8d6114542a149db37c730b845d7ba720127ca2b9b85044c53ff7aa107f866a6e2ece895a8159e25350b17d9665fc9ff915aed3640ac22cf SHA512 580a0e66078b7304d0bf76e3c990e61ee4c073b49381b60c5f3f01e2b64d5f0c318eb5596f7da09a70fa52dc93769b25f37f531038e5d7ce6278dda10e18117c
diff --git a/sys-process/psmisc/psmisc-23.1-r1.ebuild b/sys-process/psmisc/psmisc-23.1-r1.ebuild
index dcc3b3833485..12e1d145077c 100644
--- a/sys-process/psmisc/psmisc-23.1-r1.ebuild
+++ b/sys-process/psmisc/psmisc-23.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="ipv6 nls selinux X"
 
 RDEPEND=">=sys-libs/ncurses-5.7-r7:0=
diff --git a/sys-process/tini/Manifest b/sys-process/tini/Manifest
index 149ef74eaa4e..9b6b410c78c5 100644
--- a/sys-process/tini/Manifest
+++ b/sys-process/tini/Manifest
@@ -1,7 +1,5 @@
 DIST tini-0.16.1.tar.gz 29641 BLAKE2B 637ee17bbf8553b7803dc78cc40ec55ea919ec003005c7f2524322df6cc93a2e4c6fc017fa25c581f50eb17482956ebf37bf49c7796c33d227c7327ca467a906 SHA512 aa0a802c403a07771a2b28a07b97fa2c93d40b5d5be2cba6556c8e7a92e608453010625d0236d26c27bdd2820aed3ad9ca676b70f7fcd5986d7f91eb928d053c
-DIST tini-0.17.0.tar.gz 30881 BLAKE2B 8212bfa56b6ade3b79e1d4d3144b10b98e4daf19e9a9c93f6db44dfea22f80b4c6810619832b339984681d1933d00964f7cfbf516286354141f795d3cb5e745f SHA512 4e59241bd621cd89f9c07dcd7a21754a947c87d3571b06bc5f034c0059a20cbc02d4d22fd08a79633b84fd47980dbf5240e2d2fa382aaf5c32e6003710b7691a
 DIST tini-0.18.0.tar.gz 32152 BLAKE2B d676f0f1b4d9f6dca98cdb626aa7c525ec55e090cfeb1cf0e9ab167f1ef4285123223873e92e81d5d62ceb631e26e9012f16b28b1d35813ac801f8e4594be70b SHA512 83279180b6a875aaff9b6b7446ee7e71fd05357279744afcb4db67c76572dc871acfba86c035857009b5dd88ca75d9f2e815d6a925563cdb3e6e771eb83be9b1
 EBUILD tini-0.16.1.ebuild 910 BLAKE2B 44bd74197ebd18fddb00f4f9b285da19dcdbcdce97548317ca4e786e7e3ce5724e3a2c85c5741b6ceff57e46c87c632cd27e2c629a7b18ecb7d98eb91b0f4e63 SHA512 a7f116a229f64b1b90f7117ad3788e514138f30a10779ce13c06672f796fda300e69301426c0c912ee777894e7e156b1dc4421cc3b9d2a994e86a28f25ea2334
-EBUILD tini-0.17.0.ebuild 911 BLAKE2B db44d845dd47b42e0a707d5bb342cfdcc7f6d79ba2f5e114fc03788be003854e7f7b2b53f86b80a1bae961b85d0ae98a8dce34187027aa2e088cd7b33feb4e46 SHA512 1b3d1aa8f75d7ac3fbbae3dbdee31e370e1c2c44c1763ade560e5940153fa0f45c63e7e3ffba97b18fa5c0f41b50efec3bd519964893af77467c2e2c8126709d
-EBUILD tini-0.18.0.ebuild 1105 BLAKE2B 356280a58fe5c1f146c83531021e131c9162da1e1075820d1aae4c130b3c71ff214f3270375be83efbbff705a9e5d90a8224ead03c2828e9bc6853789f69a747 SHA512 7cf39465ae7a3a3ea332c9277380d62e813097ef12f5dd50ea1002de87e4925ffddeca550138f7469fdfc19e7701c35ce13fb5f46172df54edb1c698e803d861
+EBUILD tini-0.18.0.ebuild 1429 BLAKE2B 2799a4a06d4edbbced8eafc5a2ca2c8f8aadfc3da16b128933787e4f2e2adcbe9d074600d0b48d0a6ddda713b406aba776ce62fa1006176b1a4340223fea644e SHA512 2ebd3c06e3d81c7072269c12c779cd62e1341f4460fa9b46d9d571ec9858128c998860d09184c65bad0abaa93e4d17542159bef48ad43a38f21ebf831d86650c
 MISC metadata.xml 603 BLAKE2B 5e702a958ad14189e4be030441833428283784695d116c8404be905b6aece027ec8acbe05394c6108d13ad04eae0284dc88cbab77364aeb73dfc21001457f7f7 SHA512 9e6651c7f9ae7a2b3d856af9e74e8656f89de4496fcacf5d97bcbe4d2b20be01c306cb3e116a0ad7eabe213e2476245894ffa53e5c63ef9b4e73ca989584af9c
diff --git a/sys-process/tini/tini-0.17.0.ebuild b/sys-process/tini/tini-0.17.0.ebuild
deleted file mode 100644
index 15f145ee4ab7..000000000000
--- a/sys-process/tini/tini-0.17.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="A tiny but valid init for containers"
-HOMEPAGE="https://github.com/krallin/tini"
-SRC_URI="https://github.com/krallin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+args +static"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	# Do not strip binary
-	sed -i -e 's/-Wl,-s")$/")/' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=()
-	use args || mycmakeargs+=(-DMINIMAL=ON)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	append-cflags -DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use static; then
-		mv "${ED%/}"/usr/bin/{${PN}-static,${PN}} || die
-	else
-		rm "${ED%/}"/usr/bin/${PN}-static || die
-	fi
-}
diff --git a/sys-process/tini/tini-0.18.0.ebuild b/sys-process/tini/tini-0.18.0.ebuild
index 6055c7e98a14..9650f2b376b0 100644
--- a/sys-process/tini/tini-0.18.0.ebuild
+++ b/sys-process/tini/tini-0.18.0.ebuild
@@ -17,8 +17,20 @@ IUSE="+args +static"
 
 src_prepare() {
 	cmake-utils_src_prepare
-	# Do not strip binary
-	sed -i -e 's/-Wl,-s")$/")/' \
+
+	local sed_args=(
+		# Do not strip binary
+		-e 's/-Wl,-s")$/")/'
+
+		# Remove -Werror and -pedantic-errors in order to allow macro
+		# redefinition, so that CFLAGS="-U_FORTIFY_SOURCE" does not
+		# trigger an error due to add_definitions(-D_FORTIFY_SOURCE=2)
+		# in CMakeLists.txt (bug 626438).
+		-e "s/ -Werror / /"
+		-e "s/ -pedantic-errors / /"
+	)
+
+	sed -i "${sed_args[@]}" \
 		-e "s/git.*status --porcelain.*/true/" \
 		-e "s/git.*log -n 1.*/true/" \
 		-e "s/git.\${tini_VERSION_GIT}/git.${GIT_COMMIT}/" \