gentoo resync : 02.11.2017

10 files changed, 116 insertions, 7 deletions

diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index a539f7bc6184..9ec5adce953f 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -12,4 +12,4 @@ EBUILD ca-certificates-20170717.3.32.1.ebuild 6278 SHA256 6a119d901acd84ee15e09f
 EBUILD ca-certificates-20170717.3.33.ebuild 6278 SHA256 6a119d901acd84ee15e09f3331f0179fc59abaf134479346babab2ea4a8b43ce SHA512 394207e7ac8970d6b0724ec1bb3d7c233724d4c2f9a05a8c7a475b2d40e08483e940ad185ca6eea023c5d6bff6868b0aa10c4f642eccb6238ffa71ef9505df94 WHIRLPOOL e706d2d9404b81c1b193e3a7c0a61a3465e9d2b3912713196773362b08106aa1fb29f0e5d7138c1bb349fe90390f4a597c93a43291dff8d00b2bcdb63dbbfe9a
 MISC ChangeLog 13827 SHA256 03be314bd258d19e70f073f6041d41e923f368948cd6972a2d2974a8626cba81 SHA512 45905a654eb2f3927c7146a616938fec5345fe5e8dd5d21c02598731870caeb210f89f099d2f130e1d98f4c2b1c7c82a78841172ba0e930e208a944064ded770 WHIRLPOOL 2c89a74ef968ba4d445414547dec2dd152cdcbef4a29fe128d4e197d1ac7b82cd99f83853b0d0bae0165dd7f6c7239e5664847d84e2dd4a18a503f64e04caa6c
 MISC ChangeLog-2015 18522 SHA256 79448844b1ba037ee3e6776a0fb72f52f4183900673949aeb28c7b2922f7b739 SHA512 9878595d40dfe3e6eb2acaf5d63eaaf8ed626abd7c2a57621feb26b1bd470ff45457b0abae297fe5fcf335bd968a73a4b051b72471cb671f81539d17f1919bf7 WHIRLPOOL b9d6560a5791537e4a18a9d66463fecdd2f631c3f73dbda40596438b4e4dbcac40a36a321b149d704b883ecf96039275ec2df7104a69b9234c971cba801b7347
-MISC metadata.xml 530 SHA256 dbed1b656a18288075b648dcb24e50fe2d13aaae7c73c87195693d0ed5b53b39 SHA512 3ceccbf31537b511152ebf9f00a4d862de8f0839b2aed48c5d64887a424e5df450113d4547dca46639ea9e1fe038fd765aae1ac1d7fb1fea1c7c7fffcfefc5e7 WHIRLPOOL 8c263af062ff38a797444ae7333e6c5f8f80f905fdb3e11060b3c4ae2f4a16699a58e8096d59cf2bf22bf3f3c9e0de87c8c42ef307278ca4352c1118a8e88cb5
+MISC metadata.xml 528 SHA256 82257b6c86e0cd30e5939f853827af168389f14bd3010ac8cf8e3dd1085545e2 SHA512 84e804b3a3715fa5a862f5b97c8821d0ecd6a95820a198a09543461374e24d3f0d0dcdc96687f065c0d69b4bf8e151bbf692d02850185c0e71418b14513e2e74 WHIRLPOOL 654f1f8d4b0c4646a749ee982e2437db39421fcd018a2c428a77f3d1f11279a69533019a02749b153c0d5c30f9fa18403b0f4a45de6315bb347d991368d4c5c1
diff --git a/app-misc/ca-certificates/metadata.xml b/app-misc/ca-certificates/metadata.xml
index f516f0769776..07953c7a15d2 100644
--- a/app-misc/ca-certificates/metadata.xml
+++ b/app-misc/ca-certificates/metadata.xml
@@ -7,11 +7,11 @@
 </maintainer>
 <use>
   <flag name="cacert">
-    Include root certs from CAcert (http://www.cacert.org/) and
-    Software in the Public Interest (http://www.spi-inc.org/)
+	Include root certificates from CAcert (http://www.cacert.org/) and Software
+	in the Public Interest (http://www.spi-inc.org/)
   </flag>
   <flag name="insecure_certs">
-    Install certs which are known to *not* being trustworthy.
+	Install certificates which are known to be untrustworthy.
   </flag>
 </use>
 </pkgmetadata>
diff --git a/app-misc/fsniper/Manifest b/app-misc/fsniper/Manifest
index c0047ffd7a6c..e60d38369865 100644
--- a/app-misc/fsniper/Manifest
+++ b/app-misc/fsniper/Manifest
@@ -1,7 +1,8 @@
 AUX fsniper-1.3.1-format-security.patch 992 SHA256 d11bfc8a4bd9f0d5be771d5084949b07f67a7808c7bc8a6443dd037001d3a961 SHA512 1956600123b92f76b1cf94a3867e5671c08876e5d16e211141725ab81f95a0b4ea48bc9f80e3f55bb658055c43cc3b0df42870ee53301adf5db7d5310e39092b WHIRLPOOL d64000eaa2ca102afa34dd429bb7a745cd1f30b38da8e8efdadde421aa8d9e0431d4d357e8bc3461b9476179c4b7dfeba0856793e3a2fe949d0a5f9b346fe695
 AUX fsniper-1.3.1-umask.patch 663 SHA256 37a510bfb6ff48d77dcc0a29e1445966f5920ed45573a8624b0d8e876e52ab55 SHA512 8532ff2624355fb4e3057442190416b02c9c8f03629ab23def757e122e411673a1826c5a6e8495007e38258bb453fa88af516a6e6b9dd56e8fc8a6a991cf371d WHIRLPOOL 4430b3c2d938c91bd47ef44287b64c83f80d39683338b70d7de6bdef0d0dfd907880f6b023af81290214605f236fbde8811788e16e262dc0496fe6cf98afa310
+AUX fsniper-1.3.1-waitpid.patch 374 SHA256 8e84acbf15b6a7c368c7f09ac250cf9971f2848d61681979250872ce9165ee21 SHA512 f38ab368b2e7abb1a46a047cca66ecbbff6d63e4239a96b9f04e1774d88719dff79a16c347f0ee13c06137f10a4f5773e7088ebdeafa782e1e0488674f41b00c WHIRLPOOL 6e8eb693b439528d37e73a95d1e72dbd6136379fd80701305e007d53805bdbe301b2a3ec5f90b769918a767425eb6d3c28ae76bc49f86943dbcb1c33cdd64caf
 DIST fsniper-1.3.1.tar.gz 282700 SHA256 e65a34221fc05eb7ececcd2fb783e3418de032f89082e09be3a8f75f6b056e6b SHA512 285b56ca239fb9c2c0319c8c5d24e368cda89d547bae25f69b528167c6fa5ebaab31f7fa178cb6b02735168043150605724ac14cc65e7347c6e49e2dc1e5ba87 WHIRLPOOL 8eb15c409baa1166e5b12fca29cc7a4b2e131d56664ef9966cf51574647eed2203386da9118cc65a678f1004e579422d4c23c155021284fec4d7e921ab3f717d
-EBUILD fsniper-1.3.1-r2.ebuild 622 SHA256 db86303430d506d48549a1494be9eda96891e338a09d37655e114769e4cb7204 SHA512 bdadd37e313e849865569258ed29b43192a34aa93096f8ff1c7547acbb3c2f768597c26f7d414ea3a4b871c07909eb0843f1511e454eb2931b2caf706756986c WHIRLPOOL d702ad7cc6d8f873e13e5324a824711a32ea4662541e922123a9bc2842ee31d17e598a5b118f081f4a04a0a94d4474ce22464adc4920c05d626a0fc34a67b1cd
+EBUILD fsniper-1.3.1-r2.ebuild 656 SHA256 f12b19a3a50a159e95db040d4c5794a4c9b787769da58c35780fd622a1fb4a30 SHA512 9506739bf2c87f5bc26a226f22f2b7668fcb6ad7d1b49e860f430ff01b80e89b46b52ed83290c57e4b781e23b09a1cf8a0cbae3ace7d5e8fbca6c90e6849d8d7 WHIRLPOOL 50934a862d1d2998369c28ded3606176b96dff89f7a4c2524f92c26ae1d5b9885695fce30d27186df4511bac9eead2c65162898fea7229041a56458b8bde9d94
 MISC ChangeLog 2513 SHA256 bcb17a2f10ab52b3c3952fc12c052f03f98814b6fa3b3b8e4bfd91acb76d6cd9 SHA512 25e674b23c7f3b4aa21a2f2eaff667ace9e9e50497ba0229ee44d18a9dc4f7c3a54872acbde656fc5d9275b67e1702e7a6c2680eb51d85e0799e57166f7ff2ed WHIRLPOOL ad397e11c884203c03b79b1168998d7ee47cdb551fecdb214bb5a3b9573518769c423d0ce2aae3c9a319ada03c76b3e5acc9e1d40d84023e093d12590b0e7d87
 MISC ChangeLog-2015 1732 SHA256 3b9c99aeeac25fb4c901acf22643168d0b9d26ab017fd4dc0f2c09e235d1b76e SHA512 380bfafd5f5b73e79878245d2225651ffd26902c2e7bc2cd14bf69b7a5672334fc7c22883ef66fec1cd7fadf18419081ff4af0e3b55a9f0580b943726f2e11b9 WHIRLPOOL 31663b90f0ee39de424b6f0a1ed8751863fcb459f5c26976100940b6f0829523ef3493be3092083382771b25d4af066ca368f4b5c28b181e48827a3a03c83131
 MISC metadata.xml 352 SHA256 e879ecaacfc409eee41dea674d8818de1581cabfadd69f36f4addfb3714bad79 SHA512 03ad4670d0169a04bf038deca3fbe594d487168ef110914541a74c4f97f958bf112411143dfa7c22856f65e37a645ec6ab4be038aa3108d15416c3a264723da9 WHIRLPOOL ea6748730dd695349d9b1a029da908704094ed7e2f0c197ca14eba3083f06520b792533bbfefafc2d9840bb83805fac27f60f1985f8588b5dc0e1863e026bfac
diff --git a/app-misc/fsniper/files/fsniper-1.3.1-waitpid.patch b/app-misc/fsniper/files/fsniper-1.3.1-waitpid.patch
new file mode 100644
index 000000000000..1363c4cbf73f
--- /dev/null
+++ b/app-misc/fsniper/files/fsniper-1.3.1-waitpid.patch
@@ -0,0 +1,15 @@
+Replace obsolete wait3 by waitpid
+
+--- a/src/main.c
++++ b/src/main.c
+@@ -193,8 +193,8 @@
+ /* handler for reaping children after the fork is done. */
+ void handle_child_signal()
+ {
+-    union wait status;
+-    while (wait3(&status, WNOHANG, 0) > 0) {} 
++    int status;
++    while (waitpid(-1, &status, WNOHANG) > 0) {} 
+ }
+ 
+ /* handler for HUP. reloads the config file. */
diff --git a/app-misc/fsniper/fsniper-1.3.1-r2.ebuild b/app-misc/fsniper/fsniper-1.3.1-r2.ebuild
index 55bfb55850f4..7b845d7f9bf8 100644
--- a/app-misc/fsniper/fsniper-1.3.1-r2.ebuild
+++ b/app-misc/fsniper/fsniper-1.3.1-r2.ebuild
@@ -23,6 +23,7 @@ RDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${P}-format-security.patch
 	"${FILESDIR}"/${P}-umask.patch
+	"${FILESDIR}"/${P}-waitpid.patch
 )
 
 DOCS=( AUTHORS COPYING NEWS README example.conf )
diff --git a/app-misc/jail/Manifest b/app-misc/jail/Manifest
index 1770a1ca1bf3..fdde23887112 100644
--- a/app-misc/jail/Manifest
+++ b/app-misc/jail/Manifest
@@ -2,7 +2,9 @@ AUX jail-1.9-gentoo.patch 3186 SHA256 bf3c42da26870dca1295f1fc5ca1d49eb1073137d7
 AUX jail-1.9-ldflags.patch 328 SHA256 26034a6e25281483ac3add1deb42c49bcfcde00693f958aaf0eda542ba98bd37 SHA512 8b92e834a447f5fb916ff4cfb3fa1ca89d048e954ffc2a8cd8889e21a8037b54ee14d241f1a988d2c686d3ce844205354a5763f0f44cef8b2413e1ba05ff405b WHIRLPOOL 554b15eb9a7d57c53a656ae7c7c9adfeb069aa3c7f1d9e12e96a7c455d4ebf2ea11e80a139e66fc9b4e8ac19c2e847767d54337540f54626d1e0c4b47e2ba67b
 AUX jail-1.9-multiuser-rsa.patch 856 SHA256 e67e3f140f82ba3bdbeb0d650c918d97a7ddedee6c56a620c4273d8a6009b428 SHA512 b6cc3018faf06346c747242b8b721554438dd4db11621411142a50e7ed41ee009af8387fb2742a44c8fe243f5201f58da77d48a54a83d709ed5e8e8172f50541 WHIRLPOOL 853bcf6d1b7822464513bc19dcdc87054a6ad73176e632df366e2cecf9ac47a474123b3dde386554e804f3e1dfa4d0234d27f04d63d564a7610738b5c9486993
 AUX jail-1.9-wrongshell.patch 330 SHA256 d9de983e7c31e09927a87ac56c028ffb4f2f9692825aba765a157a63908eb07f SHA512 ee92dbfb9e147d94d2ebfaaf597ad381d93bd1e5fc65e85a20ee37c9066dbe7560a3385977cd3d30b87f5cdb2d90c19827a7adac69f667ea61a4920ec0b02cbd WHIRLPOOL 0f67fab357c81d354d324fafd44c073fd587a61054203a5d6e7df10e6f28b28d731805dda3107ffea5ef80c6b0f65f02887b14604bc6b4f9055412fca629416a
+AUX jail-2.0-sysmacros.patch 418 SHA256 9f02afb182ce6a0e677797e457fd36223c5ace04f7c6888709058d1da5a4caab SHA512 26da017e6c1852938799ca5a1b768dde881a29b2160a57b69a741250717c408901b95c253c0e29c8b81e94bfa303cf42cf9edb9cfd7c43166035bf846ed89f1e WHIRLPOOL 05cb9df01844037935b0c47d51ba42b84f42f0a4e4fe02d7fe69d902e569506fb1284318a25d08e1353aa4ccbf0d876f1e70f89b977216a0d770982134ec876e
 DIST jail-2.0.tar.gz 31095 SHA256 0ecdcc5230c99a7382d168ea60e9253c6bf5eec60b50f04f2588185c1974b07e SHA512 dfca62091b34f9adbe4e94de1dbf0ccd31bd3f8e492ea9788f712e97271b389475bc19e0390c12445353c4f73e5ba2458360bf55f5f64491705e82192db985ae WHIRLPOOL bd8619ae57d0e56d164397e8a0fb795ed2fe7215064aef5cfbfb293ea3325d5177b673459011781b0bbeddf2b0327987d5fb95a5dfe957b359908ca10db5147c
+EBUILD jail-2.0-r1.ebuild 1994 SHA256 26d8f0d142c942f2d26f50080bdd1950a2028bc872aa7fbfb854bb1ebc9aed35 SHA512 8657ab225a382eb86f6836182c6e2b4587a8d4cc4a62ebdaa172ea4eea5dae5aa94d31890c0d5ac27bc4efab4039977ff12eeec83d5d3639bcc7d91dedd26335 WHIRLPOOL 9e54f9350551388e9c982a3f2b1736237a4164d2de98a175194e3e804fb62fa56f8c6e8448aa8b93371cb53a6e4696e98e7e506df09714c8f74a0a2bbb4e8c2b
 EBUILD jail-2.0.ebuild 1940 SHA256 6c0737aab4723649e618c4a06615ebf5d5fdccf0bca765edc71abd68789af222 SHA512 a8df73039d7c93d4952c9c010f465131e91f15dd4cc2a806a3d90a9a4896d744d40ce50dbd36e651646846bff3e2d93c0537748d1ac8351dd0e93f9f9e683555 WHIRLPOOL 465cfe111351663579e1c9f0720913774bcaaa85cfc09589b00244ed15a1b52610351d75fa7f1e2d00efdfe1653898911cba99b465d57e5c45e279321c4b78d5
 MISC ChangeLog 2550 SHA256 329042eca797913c025b77f478dbb5000cad81f245862745b5ce6fe9601b3ac2 SHA512 855b9098f2a43999bc1f03954ef20443bd4eb8c6b2af92680a1a2ec0ffe817793c341d5ddb3ddea5b96a9b36bd4b6aa08dcf28d54708c7feb3f3ca63947b5014 WHIRLPOOL d5fe03ace67842f5681152ba53fc73b666771c7186944f692948b7ec06b85e04611e85ac46690c5790e4c98dc752648b133bc821c66715b0cca85a641eafedc1
 MISC ChangeLog-2015 4302 SHA256 7f3ca8f265eb601948090cdd59d301efe4b9412fbf6eacd61cf896371812be0c SHA512 fb7df40a8275d488556009ac1080b38be7068accd5d4cc6149a7127a03acfe4d2b2cb20a949249a11e85c78b4b734ecaf18b0c406081d9c234d58dd45a019519 WHIRLPOOL 360f35bfc112c4c118e5f88cc317a49ed25c201cf771f6c5aa887b2d167a9a3496745e9148d926eb46c9fa84a2a0b428588432ae4201173cb7c317f1b32d7982
diff --git a/app-misc/jail/files/jail-2.0-sysmacros.patch b/app-misc/jail/files/jail-2.0-sysmacros.patch
new file mode 100644
index 000000000000..4843c3d97194
--- /dev/null
+++ b/app-misc/jail/files/jail-2.0-sysmacros.patch
@@ -0,0 +1,20 @@
+--- src/generic_helpers.c
++++ src/generic_helpers.c
+@@ -27,6 +27,7 @@
+ 
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+--- src/terminal_helpers.c
++++ src/terminal_helpers.c
+@@ -25,6 +25,7 @@
+ 
+ #include <stdlib.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <string.h>
diff --git a/app-misc/jail/jail-2.0-r1.ebuild b/app-misc/jail/jail-2.0-r1.ebuild
new file mode 100644
index 000000000000..62eb691b4a39
--- /dev/null
+++ b/app-misc/jail/jail-2.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 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/tmux/Manifest b/app-misc/tmux/Manifest
index 71a6f6cbdaec..bf990756bf8d 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -14,7 +14,7 @@ EBUILD tmux-2.3-r1.ebuild 2234 SHA256 4520d131331ff7e3252c41b1f1b23c0ef54e9e646b
 EBUILD tmux-2.5-r2.ebuild 2073 SHA256 c1a0d91f81a179c0d37083425580fa7a4e0781f9cbb688f6ed34242b3bdb173e SHA512 fa557f19858c312918d6190cbd029dcbfec05a494236027e3be78bd8be8843823f5112150387986709881577b0bb3fc66bba42a4001729456136dd89739844d5 WHIRLPOOL a0d6f3f70703c9a542be1ad054e6c0bee4cb19b62c606c45d3ab19585c67335bb53144c515eeb73754a1466c4702a605bcdfea9ecb6408701cded7c4cb9a523b
 EBUILD tmux-2.5.ebuild 2263 SHA256 ecb390bc782d86ad5683a275beea9f4973d284835ec0bcd7a12ffe5460d10589 SHA512 d5abbfd108431a47bab4195e9397d0b2748fd59c0036c0c71caa34b741069eb0a5a3d14fe98d0874d312e740a5831a7df3aecc0de2eb3163842663a94638a389 WHIRLPOOL ab2379833a33ca4c5bfa0a2480eb25b55449cceeb312ffce735b753ceed3497f74308e50d8866c90d0e9f0b2bb5e4f4e557f2657c392dcf3eccb40362480e2e6
 EBUILD tmux-2.6.ebuild 2148 SHA256 bc032237fc5cc7a8960b0c889337c47d0ecc30092f1068d9fc682dece7de98cd SHA512 46b4fc09f9ca6c65cf50c3940ade441e0adbadc72fd3a06d617af996d1f6ee3017b04c89682dd69eeb6091d4ad614b53723f7b71ba16bfac4e4d5be374a1c9c3 WHIRLPOOL e8ba8ec927fe8df5666847a000a3112e424e89874ffe017f729702e26f93e6790a77ca6711bbe3bcc56e5a6c6c6b9523d030fee454b1148ac35fddc885ac8b94
-EBUILD tmux-9999.ebuild 2346 SHA256 300add86406140cd86e2545c172f5e82a23a223b3ba57b5df4038c1303860ee8 SHA512 de07cdc5030c2ca65093f39da2096a95f7646952bd1ce3f88b80168ba333e331584cc325ac2c4e149896b810ca878c87a02fa74b4e1e360b6e8c07c216205aa3 WHIRLPOOL 5218036a7955ccf7618cd93a7fa4c0792263121c2556178c7c973fed8def061e21fe57f89cd16e91ec04132489ded019abcab3ec566e929d74bd779c3886402a
+EBUILD tmux-9999.ebuild 2349 SHA256 549e0ed4e556dc90e6c75f6ecba0e5575bc96c92e7e8c261032371029b68fc88 SHA512 0fd75b67ac3e782f9c6aec6e36bafd69f025555c493961da7945994b0cb3dc1d8991d5a41ad68f85bd176564427e0b5f21ffc53ee9a4db41d50caa043ac0dec2 WHIRLPOOL 29cb0d8326a7ac0828e5607c02804e8f38014af7f55b3f08eeb116365d0355c86852319febdbfad0d90e2312c1b34102678f8ad835310a95e51f18534437cf80
 MISC ChangeLog 11111 SHA256 40d6a76372e83b25f367ffb20c6d08611f58362b47c42336b566569f4eb9e9b5 SHA512 c17306d91735003e437466a8b1ff2b9604e80895ac8ec0de0da287a9ec54e53745dddba9a3d2c6ac08ef64e374d4dad308f88570d2d66b2c5f9f7f8ea071fcd7 WHIRLPOOL e0073f1636a3efffaea27d61990c0ac09a19c9a4e0038138aa3622fa952eb438a290d649a61c0f090ca6a17f4de53fa9395362ca348eab310b90f425ffc8dbc0
 MISC ChangeLog-2015 13810 SHA256 cbb95f774d96b6b2f12e4421bb5ee3b75820f4ab9ff571f9a47420fd3928daa2 SHA512 7a14a2e19346013beadd9bade2366c7168ec12b54ecf2429ded745bddea83e7ea228a4bb4f729254db523d7c6c5ba2cc9e5f2a4fc771948ff6d624d6a9d3be08 WHIRLPOOL e9e3694e0f4bbff32cb1e44585faed0944440f5c39477594fc3ee1a62cf7f6b1dd453e7789083e99d6a451b8c6a9bbeb39fa373b65000988ee5c64aef899d010
 MISC metadata.xml 708 SHA256 f2ec9cd1fad4645b66650e9b8986eea15a904d965e697eee47221cfce6a7313e SHA512 2d676e2d9a5427a287d7dbe0d73e6ea96b2eba3328c8380a503e814e263a5c6ea5b4bf33aef7c9e0840f37d75b40e5e4a4feca5cc07c38de50b35e9da497f8ce WHIRLPOOL 129dc87a569a00d729b5d6c4c6e034ba093ea2beb79d0fd5e0110ee069077ab708c1bd0786fcb9f4676afada082fd0030620f9fe09ac677ec34a90db7afe5dcc
diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild
index 9e06490e5cc9..56c460fec6f1 100644
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-9999.ebuild
@@ -54,7 +54,7 @@ src_prepare() {
 	replace-flags -Os -O2
 
 	# regenerate aclocal.m4 to support earlier automake versions
-	rm aclocal.m4 || die
+	rm -f aclocal.m4 || die
 
 	default
 	eautoreconf