gentoo resync : 18.11.2017

3 files changed, 14 insertions, 28 deletions

diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest
index af535daf14aa..34c0d83c361f 100644
--- a/app-admin/entr/Manifest
+++ b/app-admin/entr/Manifest
@@ -1,8 +1,5 @@
-DIST entr-3.7.tar.gz 23326 SHA256 94efd50c8f7e9d569060d5deebf366c3565e81e814ab332b973d7298fa8ea22f SHA512 a1687ec2da99f65fba3f668e41345ba76cb8c87cc2343d98c0dcc0ac0dedeb40cd8b5fd9aa3eba1dee8add94585de939864633bf0020cea1043699019dfa15fe WHIRLPOOL 1a9077a3cd8939bcea49c42e2a85eb094840942bdd23f6911c32c9d3184f742d06666e12c3d53c5e99026c82a20612bce8fd9441ccb27eddb68b61196a79fee8
-DIST entr-3.8.tar.gz 24251 SHA256 ebb1e793d948db76481f081011bf1dad8b4449e067f4e5fe68176191f84b26bd SHA512 8530a40eefc78571f3a2ab09f63d25d880167ec2d76e0c32fb25dce40e22b3f9f3b5f27874c1b95480206628e314298f001a4c0b487485ac88f2996002b41a2a WHIRLPOOL 27ccd2d4be2758c765ccf834df45b53db8ca7a0de1c880dee5183f37e6838b1a2764801b33b4ecbb4ec890b97b90c720aba0dbc66d37c4dc943ffb61b21af320
 DIST entr-3.9.tar.gz 24554 SHA256 02d78f18ae530e64bfbb9d8e0250962f85946e10850dd065899d03af15f26876 SHA512 e0d58b7f4dc20ba9cfb12a165172817dfd647e859e2133b01b59427f9bb9612ee5b8e8f6563f31cc15b57251e60b2cb639c764f65d6daeb4456ecbccc7b39c12 WHIRLPOOL 46ca452280537e08b04616b6ce31dde463788328fb6e283d6a55d486dda97ec2dc4b0a23f67e925be66dd76bebb6e5a1aad19c8d8973e3c2faa19f5397082b19
-EBUILD entr-3.7.ebuild 494 SHA256 eedfa642f37a6da546d59443fd28b2c0210284de4c93a925775654e78f68f4ac SHA512 55c8fd3f5ac2f7ae70e361305b13c47da886355b226bb44165414bc70ab704825bfcf1c9eb3753f24e132d0105c6200c4b609c5e7bf69fc9aa35ffdf6083daf0 WHIRLPOOL 9ac9d2044d013033e83c69d2eaf2b27d8644951caeb18d5086678130f002da179f31d36803d63697c6763721f568e41528554b0f1f1574de37fc51c06555af76
-EBUILD entr-3.8.ebuild 498 SHA256 0e882d6f5aec79c496845917b9441beb809a49415f82da6647c14d22a6bc5842 SHA512 6e4b45c4f3310b2ffbe6fe5fe855be3815ae92ae224b217aa55064764ba2c9daf6e7e45d80d01a2e03c2617d36bd0904fd243c06ed949fe27271fd79c686a594 WHIRLPOOL 5865118fa4626294d138afe2dcaacf413c6f0a27c495b294b0c451a2d76bec065e260869fdb0a0603627462a48a8e4fe378b74df4ed20e66912299ea72052bf4
+EBUILD entr-3.9-r1.ebuild 634 SHA256 4e012b253ce54209add4c3fc220a8becbf5bc805566e87391ec683d618220083 SHA512 0ab51ed5730ceb722f333c221f533a95732adb820cd3571130fa3d0b67b8ca663696a05900fc2859c670a0ddf7319a7fa26b59afbd117fdb18425fb837752910 WHIRLPOOL 43eacd586ddfe06bc5c0b10ac8bfb658d8ef2be7ea7a0db6ae3281c7fe781bf3af56160b2a6e41f97be0b5aa3f156160aebbb5624db13ebb70862efbb5c71098
 EBUILD entr-3.9.ebuild 498 SHA256 0e882d6f5aec79c496845917b9441beb809a49415f82da6647c14d22a6bc5842 SHA512 6e4b45c4f3310b2ffbe6fe5fe855be3815ae92ae224b217aa55064764ba2c9daf6e7e45d80d01a2e03c2617d36bd0904fd243c06ed949fe27271fd79c686a594 WHIRLPOOL 5865118fa4626294d138afe2dcaacf413c6f0a27c495b294b0c451a2d76bec065e260869fdb0a0603627462a48a8e4fe378b74df4ed20e66912299ea72052bf4
 MISC ChangeLog 2314 SHA256 9a8785a05834cf43f24194acf41d833d54944b38c8fda098b58b9a38a0709a5b SHA512 4f2c635609b7dc022a58bce143f7851b4b2692eb3ac1c4c1aa2be9835fb798c4c1dcecd63dafcddfba5a5ffc24e5ca74c05c2d2396cd56fcba79427911059dc3 WHIRLPOOL 82c4b02c27f5f6d4d070bc2145a8b4224065507fb4f44bd21b2b3bc208c8a9dbdd6ba786b12e772cc813ff0bac6cf5e0454f36287b2ffbffbfc01436c1c63827
 MISC metadata.xml 377 SHA256 3684c43060a9b340ca7710c1697b9c3cd8b6218f6bda4ebadd23cc6661dc4748 SHA512 7db7620ce42324e2a551b2fa5898aab491c868b5d28b938e163ea1bf24aed66913fff8d611e95c634e65aa5372bed9314a55b278d62157929d6873cea7994bd6 WHIRLPOOL c704ca2f5573778786616e592f36f8cd6ed3003f981ecdb5287bfbd882fff0d93e423f38999fb24e7f0e5e813e922e7f64c0de7c364974637141514062af6b61
diff --git a/app-admin/entr/entr-3.8.ebuild b/app-admin/entr/entr-3.8.ebuild
deleted file mode 100644
index 3acbed282720..000000000000
--- a/app-admin/entr/entr-3.8.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Run arbitrary commands when files change"
-HOMEPAGE="http://entrproject.org"
-SRC_URI="http://entrproject.org/code/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	mv eradman-* "${P}" || die
-}
-
-src_configure() {
-	sh configure || die
-	sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die
-}
diff --git a/app-admin/entr/entr-3.7.ebuild b/app-admin/entr/entr-3.9-r1.ebuild
index 448abf84b1fb..a0df05becf54 100644
--- a/app-admin/entr/entr-3.7.ebuild
+++ b/app-admin/entr/entr-3.9-r1.ebuild
@@ -3,13 +3,15 @@
 
 EAPI=6
 
+inherit toolchain-funcs
+
 DESCRIPTION="Run arbitrary commands when files change"
 HOMEPAGE="http://entrproject.org"
 SRC_URI="http://entrproject.org/code/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
 IUSE="test"
 
 src_unpack() {
@@ -21,3 +23,13 @@ src_configure() {
 	sh configure || die
 	sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die
 }
+
+src_compile() {
+	export CC=$(tc-getCC)
+	default
+}
+
+src_test() {
+	export CC=$(tc-getCC)
+	default
+}