gentoo resync : 11.02.2018

3 files changed, 4 insertions, 33 deletions

diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest
index 3cb302af4aa4..d9f8c28b0acb 100644
--- a/app-admin/entr/Manifest
+++ b/app-admin/entr/Manifest
@@ -1,4 +1,3 @@
-DIST entr-3.9.tar.gz 24554 BLAKE2B b901041d50acf3f7a29c93c84d46ee42a35878dd30e2e5da94b053acb8d38556d5bfde69d39b4520ee81121ba6ff0fabffeaeb0c33718302c26b517992776fde SHA512 e0d58b7f4dc20ba9cfb12a165172817dfd647e859e2133b01b59427f9bb9612ee5b8e8f6563f31cc15b57251e60b2cb639c764f65d6daeb4456ecbccc7b39c12
-EBUILD entr-3.9-r1.ebuild 634 BLAKE2B ec31508e37e0dbc057209bb9474164a2d98fc6c057b9d69eac70e74dd26649e0bf6532eec79613259ea8b450b2fefd3728c852a6319809cae181505fd9fc0140 SHA512 0ab51ed5730ceb722f333c221f533a95732adb820cd3571130fa3d0b67b8ca663696a05900fc2859c670a0ddf7319a7fa26b59afbd117fdb18425fb837752910
-EBUILD entr-3.9.ebuild 498 BLAKE2B aa81e80160de5d92bda10b5bc1972b5fcd9881c74aca408cf3b9ba2f44f96921efa9f3550f5ef38128b0109d068e440cece6096e5acc063fcbf69ff0799dbdfa SHA512 6e4b45c4f3310b2ffbe6fe5fe855be3815ae92ae224b217aa55064764ba2c9daf6e7e45d80d01a2e03c2617d36bd0904fd243c06ed949fe27271fd79c686a594
+DIST entr-4.0.tar.gz 24758 BLAKE2B 6d57cb93d55bb362b8e771745c9333a5a5eaa156f36a7c9e7318d94f0056fc98b2071bcea7fd33b68ac1dc1d5332fc849e0ea89bc2582196acd51e1490fce96e SHA512 d803c27441448374a866636e0e592a8395488e162e2e8c031aafec3457d10041dc52e10d06cc1e209cd86f69ca021171ef105056206b9afe603a89958eef2707
+EBUILD entr-4.0.ebuild 579 BLAKE2B caff26e939080b9fc895617b9ca76c3141a9bb2965a1fae7d8fd79e8b8d3075cb82cc635bc503a67c6438414b0f37a67ea9aec2dbd2564890c6069d244890e73 SHA512 806acd46a7f3d3c285d3f063a2e3a9b247a54dcb50020ebcc6a4fc1e3bbf1fb6f46987f0e6d0a6071d44613ab47a953a0ae21bc8cdaf024c05d456e34bbdc9be
 MISC metadata.xml 377 BLAKE2B 377ae6a1620e09bf5a309a212ed7b4db5516e51b9e955373502252ab4fa5bdd9520d5c145905634d76e3884a3a993a6fb2cbe37e730e177081ea5f0c65b3c1ec SHA512 7db7620ce42324e2a551b2fa5898aab491c868b5d28b938e163ea1bf24aed66913fff8d611e95c634e65aa5372bed9314a55b278d62157929d6873cea7994bd6
diff --git a/app-admin/entr/entr-3.9.ebuild b/app-admin/entr/entr-3.9.ebuild
deleted file mode 100644
index 3acbed282720..000000000000
--- a/app-admin/entr/entr-3.9.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.9-r1.ebuild b/app-admin/entr/entr-4.0.ebuild
index a0df05becf54..829cf311603a 100644
--- a/app-admin/entr/entr-3.9-r1.ebuild
+++ b/app-admin/entr/entr-4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit toolchain-funcs
+inherit toolchain-funcs vcs-snapshot
 
 DESCRIPTION="Run arbitrary commands when files change"
 HOMEPAGE="http://entrproject.org"
@@ -14,11 +14,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
 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