gentoo resync : 14.07.2018

3 files changed, 3 insertions, 46 deletions

diff --git a/dev-util/hadolint/Manifest b/dev-util/hadolint/Manifest
index 84fffecc0aed..9b2e2e3d6f9d 100644
--- a/dev-util/hadolint/Manifest
+++ b/dev-util/hadolint/Manifest
@@ -1,7 +1,5 @@
-DIST hadolint-1.5.0.tar.gz 31002 BLAKE2B 889885192f8ae12c468b90923948970d617bb5dc0156efa615e8ef750b3940b66d84215a21d0dca11ee7176f12b32c47a35a763035c9c2023bb8dc83b2b0af69 SHA512 19e246d82670e27751729394ba73ef03260525eedb0dbe26a605dd2c30e95386bafb85f9063a94d3a3e8b47fb05c248bdd6fda0ef9cf95285b1ec0ef54ad6d15
-DIST hadolint-1.7.2.tar.gz 34960 BLAKE2B db1ff9df439e3dbc0e36a47749d0013e76abadfecfb87abfce9e4e41f654a3955bdff2804c92a60e1e399b0e74601c80a7a96012de93bed48e0425afee359e39 SHA512 1562ca9e2b81d6840bd89b98ce706372e32e93505efd6eecef613ddcb089306653da09ef09f8876fe19c6effd1520784ae05c83bb2460975628389ef80f5df93
+DIST hadolint-1.10.2.tar.gz 39009 BLAKE2B 84552ce978d6f53b6e2e769da402585777ce7ef5bd7b66cc538b4f22d73a54b0d07246c1d68b9628f9e2d17d9db2bb472e1902cf017f13344b9277b27658b652 SHA512 2104cb588bdb9620d6a5831ab0f38e6fbd45ab19ba6dbd38e6ced43995f2dd6509d7f9d0180d59a828bbe8de46738f7ff2f3ba9859d9ac4a04b1ba9015071fd9
 DIST hadolint-1.7.4.tar.gz 35187 BLAKE2B e40892f739d7714f62b322d1d3bb6d5cb285e9e6f3bc9c35d21a8d0eef837f32966b6292ce3e20ff461e2775777b2bf6192676ab76d32a558a8242dfe12c697d SHA512 ad92d1f6a1efee2b853613ec078396847e7ee2c525d6069d3cf1708d1af229133eff35e0dee6f0680433a2c6781839beeda02f8cebb52e360c622e6b05ac5925
-EBUILD hadolint-1.5.0.ebuild 1064 BLAKE2B a4001c12da3c75c033a7efb686005e9fc7fdbf532dad9bc36db569371c82a604b4563cd24b7c2130f13ccbd7612ae344ae8c50443d7828d89156de04d00c7658 SHA512 9934c3ac41e0764c87b5ea4ca0c88853751662a84a7f24e5aa6357e92edb6cb8ee23e6416cd67ef400897f39bcbb9f47ea4802de6b8884def844db8562b6a88c
-EBUILD hadolint-1.7.2.ebuild 1137 BLAKE2B 67e11fc0f94683b2382fe875c4b3626531bb3d8d2c054e04da76b1cf9734ee63f7936332fb1ac53af2e8ee6fca0bce4c6ee6c88beb53f8d2ec2a0b0efdef70f0 SHA512 b3feca48b6a4342417513789c7aefd02f5ef3676e467a4889a639a7279c90aa1ef2336d5d1f4c3a84c05c12a85b66e42cd811a69eb382a613599a8f6a549ba4b
+EBUILD hadolint-1.10.2.ebuild 1137 BLAKE2B 3bdb1e21534531126433c77f9e14644d714e9803e6a11b39c0553c1354a523e3f18316e8a21b610fe18604471557f779825ca4b0b27cd3e4d46f9747c4680305 SHA512 9aae19d11f1b502599a8c4279729da7d63b50dbf7877e95eb2dccb32640edeae7c78d484bbfd4605dacbbbc24d0c4ceff7a485c898d570a64efb0da17806e148
 EBUILD hadolint-1.7.4.ebuild 1137 BLAKE2B 67e11fc0f94683b2382fe875c4b3626531bb3d8d2c054e04da76b1cf9734ee63f7936332fb1ac53af2e8ee6fca0bce4c6ee6c88beb53f8d2ec2a0b0efdef70f0 SHA512 b3feca48b6a4342417513789c7aefd02f5ef3676e467a4889a639a7279c90aa1ef2336d5d1f4c3a84c05c12a85b66e42cd811a69eb382a613599a8f6a549ba4b
 MISC metadata.xml 364 BLAKE2B 960f838518131ef8088bd574862e5ee91f7d57f7b6925718a1249d46ffcb84a70200a160915284073e24b54fd8fdbc3a479cac5d91c03d5ddeb1b55c570f995f SHA512 2d359c79cbc3ed17c447453c06cf92026edbbcd3da98108b560b25c9d69b8f576a9645ddeef02e05c3e492729a9c7a78746a69aac319213b32d5037c2be23247
diff --git a/dev-util/hadolint/hadolint-1.7.2.ebuild b/dev-util/hadolint/hadolint-1.10.2.ebuild
index 7e0e70f87627..51581f0faaa0 100644
--- a/dev-util/hadolint/hadolint-1.7.2.ebuild
+++ b/dev-util/hadolint/hadolint-1.10.2.ebuild
@@ -19,7 +19,7 @@ IUSE=""
 
 RDEPEND="dev-haskell/aeson:=[profile?]
 	>=dev-haskell/gitrev-1.3.1:=[profile?]
-	>=dev-haskell/language-docker-6.0.1:=[profile?] <dev-haskell/language-docker-7:=[profile?]
+	>=dev-haskell/language-docker-6.0.3:=[profile?] <dev-haskell/language-docker-7:=[profile?]
 	>=dev-haskell/megaparsec-6.4:=[profile?]
 	dev-haskell/mtl:=[profile?]
 	>=dev-haskell/optparse-applicative-0.14.0:=[profile?]
diff --git a/dev-util/hadolint/hadolint-1.5.0.ebuild b/dev-util/hadolint/hadolint-1.5.0.ebuild
deleted file mode 100644
index c9776ba1bdce..000000000000
--- a/dev-util/hadolint/hadolint-1.5.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Dockerfile Linter JavaScript API"
-HOMEPAGE="https://github.com/hadolint/hadolint"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/dlist:=[profile?]
-	>=dev-haskell/gitrev-1.3.1:=[profile?]
-	>=dev-haskell/language-docker-2.0.0:=[profile?]
-	<=dev-haskell/optparse-applicative-0.14.0.0:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/yaml:=[profile?]
-	>=dev-lang/ghc-8.0.2:=
-	>=dev-util/shellcheck-0.4.7:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.2.0
-	test? ( dev-haskell/hspec
-		>=dev-haskell/hunit-1.2 )
-"
-
-src_prepare() {
-	default
-	sed -i -e "s/-static//" ${PN}.cabal || die
-}