gentoo resync : 16.06.2018

3 files changed, 51 insertions, 7 deletions

diff --git a/dev-util/hadolint/Manifest b/dev-util/hadolint/Manifest
index ce8245568f3a..28337844bb04 100644
--- a/dev-util/hadolint/Manifest
+++ b/dev-util/hadolint/Manifest
@@ -1,5 +1,7 @@
 DIST hadolint-1.5.0.tar.gz 31002 BLAKE2B 889885192f8ae12c468b90923948970d617bb5dc0156efa615e8ef750b3940b66d84215a21d0dca11ee7176f12b32c47a35a763035c9c2023bb8dc83b2b0af69 SHA512 19e246d82670e27751729394ba73ef03260525eedb0dbe26a605dd2c30e95386bafb85f9063a94d3a3e8b47fb05c248bdd6fda0ef9cf95285b1ec0ef54ad6d15
-DIST hadolint-1.6.1.tar.gz 32674 BLAKE2B b7b3bc664848806d2316053724a91d0276e8af8c0324b31c2b3c2ae48b247e2092473170bc0f8ffcd76cf3b91e3c17e0e9b7b5f47c1eb416d23d01b29b454182 SHA512 ed79861d0938327ebeac8a8162d3a76257a22829d6188512bb43d5312327e39f31ff960d85e7d5c367a377c0a21e7df637e6d40448415752f132cf385ab8bfa2
+DIST hadolint-1.7.1.tar.gz 33520 BLAKE2B e66b76135c0b69a906e8a4cb0f08b9eb53e8c5d15140f20c31894155cfdc97cdc2899f1bbf575fdbed9feea99884d88b604d0bdfd2daeed4efd6064a9e28e453 SHA512 44e952665a3fbd592397cfb251935f0129900c5c87f34dc884cdb83e668e369848c0c0c403f8d7f31fd786de84e64b5e8df4d3935309acfe8266d5621f7966de
+DIST hadolint-1.7.2.tar.gz 34960 BLAKE2B db1ff9df439e3dbc0e36a47749d0013e76abadfecfb87abfce9e4e41f654a3955bdff2804c92a60e1e399b0e74601c80a7a96012de93bed48e0425afee359e39 SHA512 1562ca9e2b81d6840bd89b98ce706372e32e93505efd6eecef613ddcb089306653da09ef09f8876fe19c6effd1520784ae05c83bb2460975628389ef80f5df93
 EBUILD hadolint-1.5.0.ebuild 1064 BLAKE2B a4001c12da3c75c033a7efb686005e9fc7fdbf532dad9bc36db569371c82a604b4563cd24b7c2130f13ccbd7612ae344ae8c50443d7828d89156de04d00c7658 SHA512 9934c3ac41e0764c87b5ea4ca0c88853751662a84a7f24e5aa6357e92edb6cb8ee23e6416cd67ef400897f39bcbb9f47ea4802de6b8884def844db8562b6a88c
-EBUILD hadolint-1.6.1.ebuild 1053 BLAKE2B 80699fb7ccbb094072eb3ba83cb0ee6e591e3092310cfd3e03d504eb63ffefdb4102eb0cff0ba83a61af4ea5ff4734e3a55e50d2cb483d283a7968092ddd415c SHA512 4c3b68251cabb19fa184828824e2c6dc9861dc84cdd3300f689583cb4f19dad3b5a24e31df55e81163d551189485b8d1edec4480827692c0db932e4207059cd7
+EBUILD hadolint-1.7.1.ebuild 1106 BLAKE2B a6742842b4e7215a627d1d4602a65b21ef2b9212174589b5f43c3a06bb7f5f0acc226ba3d8b7eb12beb183d4613754c7baafd8ccf79d1a727a9942273527300f SHA512 4d7ab4a23ca0f17dd0bfedb75c61937006002bd6a403f686c800f1dc8e512cfa49c80e8d6bd52749ba96326ff658ca9f7a97fca79bc26715cec52e6e879f6d33
+EBUILD hadolint-1.7.2.ebuild 1137 BLAKE2B 67e11fc0f94683b2382fe875c4b3626531bb3d8d2c054e04da76b1cf9734ee63f7936332fb1ac53af2e8ee6fca0bce4c6ee6c88beb53f8d2ec2a0b0efdef70f0 SHA512 b3feca48b6a4342417513789c7aefd02f5ef3676e467a4889a639a7279c90aa1ef2336d5d1f4c3a84c05c12a85b66e42cd811a69eb382a613599a8f6a549ba4b
 MISC metadata.xml 364 BLAKE2B 960f838518131ef8088bd574862e5ee91f7d57f7b6925718a1249d46ffcb84a70200a160915284073e24b54fd8fdbc3a479cac5d91c03d5ddeb1b55c570f995f SHA512 2d359c79cbc3ed17c447453c06cf92026edbbcd3da98108b560b25c9d69b8f576a9645ddeef02e05c3e492729a9c7a78746a69aac319213b32d5037c2be23247
diff --git a/dev-util/hadolint/hadolint-1.6.1.ebuild b/dev-util/hadolint/hadolint-1.7.1.ebuild
index 9a011ff9f34e..ee88be7b441a 100644
--- a/dev-util/hadolint/hadolint-1.6.1.ebuild
+++ b/dev-util/hadolint/hadolint-1.7.1.ebuild
@@ -18,16 +18,16 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/dlist:=[profile?]
 	>=dev-haskell/gitrev-1.3.1:=[profile?]
-	>=dev-haskell/language-docker-3.0.0:=[profile?]
-	dev-haskell/optparse-applicative:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?]
+	>=dev-haskell/language-docker-6.0.1:=[profile?] <dev-haskell/language-docker-7:=[profile?]
+	>=dev-haskell/megaparsec-6.4:=[profile?]
+	>=dev-haskell/optparse-applicative-0.14:=[profile?]
 	>=dev-haskell/split-0.2:=[profile?]
 	dev-haskell/text:=[profile?]
+	dev-haskell/void:=[profile?]
 	dev-haskell/yaml:=[profile?]
 	>=dev-lang/ghc-8.0.2:=
-	>=dev-util/shellcheck-0.4.7:=[profile?]
+	>=dev-util/shellcheck-0.5.0:=[profile?]
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.24.2.0
diff --git a/dev-util/hadolint/hadolint-1.7.2.ebuild b/dev-util/hadolint/hadolint-1.7.2.ebuild
new file mode 100644
index 000000000000..7e0e70f87627
--- /dev/null
+++ b/dev-util/hadolint/hadolint-1.7.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5
+
+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/gitrev-1.3.1:=[profile?]
+	>=dev-haskell/language-docker-6.0.1:=[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?]
+	>=dev-haskell/split-0.2:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/void:=[profile?]
+	dev-haskell/yaml:=[profile?]
+	>=dev-lang/ghc-8.0.2:=
+	>=dev-util/shellcheck-0.5.0:=[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
+}