dev-util/shellcheck: Import changes from haskell overlay

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 73 insertions, 45 deletions

diff --git a/dev-util/shellcheck/ChangeLog b/dev-util/shellcheck/ChangeLog
index 0923ccbe9ed2..effba682b16b 100644
--- a/dev-util/shellcheck/ChangeLog
+++ b/dev-util/shellcheck/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/shellcheck
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/shellcheck/ChangeLog,v 1.1 2015/02/06 14:25:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/shellcheck/ChangeLog,v 1.2 2015/02/06 15:10:39 jlec Exp $
+
+*shellcheck-0.3.5-r1 (06 Feb 2015)
+
+  06 Feb 2015; Justin Lecher <jlec@gentoo.org> -shellcheck-0.3.5.ebuild,
+  +shellcheck-0.3.5-r1.ebuild:
+  Import changes from haskell overlay
 
 *shellcheck-0.3.5 (06 Feb 2015)
 
diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest
index 4aea24de58dc..1a1240df0e0a 100644
--- a/dev-util/shellcheck/Manifest
+++ b/dev-util/shellcheck/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-DIST shellcheck-0.3.5.tar.gz 77508 SHA256 6596e98f50d2a4a98d159a2a79bf52f3a3158f21261d037f123dee3b46939ed8 SHA512 069cec4b9e2cdd8bc9eb7356ef5c6e1023bfea164842458b9895133bd8eec59d157a7ff35a63343144049d8d794ba0db4fea6a5b5e487a0a0034b889635524ce WHIRLPOOL d753b9ab5f23b69aa9a3ecd994e11637cbf69e158b1fa72106f9100ef8147090133ffe8833e48193f1f8db1afad1ff812ba2d05a54ace34b1c12f1d6cd346b51
-EBUILD shellcheck-0.3.5.ebuild 677 SHA256 2d9e557662da16dd1a0c699146355235f6c1ff03919acd760ff1f08be99aa1b9 SHA512 2d7fcc307e7f9b2ac5575ea7e7e723834e0d59ede849b4f660d1ac8eceadf8e82d7aeae5aade57a5099d05187550023abd56bb051660409d291013b6b22ee167 WHIRLPOOL 550c74f32b06e0b0681eb060dbb0c49d4730bf02b73c0e572b04f523e6eb764e71e0b700ccb2fd5cc5cef8cb4ca1cd09514dffd4eb526b9f640a4607abea5c91
-MISC ChangeLog 348 SHA256 69d896a0060002bba0877b8045abdb7ca7ac3588b7cf006fdd6a404aeba6acf9 SHA512 e60ad2e4fc4eacd2b2141c735fd13a549fa52580fc57db4d043041e487b3f87a65e3a8215f80a549338bcbc2b184c4e8de947e11cd9b887c86c78ca6ac293466 WHIRLPOOL deee464f1137c00b6cc16a6a8cbe1689e38cb3d633d580419e823ddaacf4fe93acbe0fae2e4e9d06207c786dfa8f6c46b9387b6dff9168a5e22f785b55b9204b
+DIST ShellCheck-0.3.5.tar.gz 77173 SHA256 9289fda0b3683f4e7c2c003f875a9e308897368fe956ed924a76cafc2fdc9974 SHA512 b140d5907cec743fb31809fcf4e01481e2a6c6bf97394e521a191427d30358a995565d2fb9d99ed5b943ca33654cfe7014b042a41bf2da4fd20ea0227d6af06c WHIRLPOOL 6ee0c38a741b65d957f7ed422f879ddd3563dbf602d2477e301b4fb0404473b6082b7f4aba97e320c6f994063f6ccb789389a58116deb75519cccdc0935d73e1
+DIST shellcheck-man-0.3.5.tar.xz 1876 SHA256 5b3f940fd8760676c40787b25b7c950a5ae7fa25e882dea6b11dfeabb1b712ee SHA512 974b7bae0a927151819a14eef2be40d76c2eb50fadfd966bef79908b7faab958ecd42a1584cbe1fb25e2e59f1593d89b8632684d655490c83e246502d9680d26 WHIRLPOOL 622968777ce5387abe6e5f068bff5eb9879d8a990d7680fe2acba1ee89114ec5aca3cf402e579222af2941b0d99b1df95415ad17e9ef973a7b7e74fcd6acbee5
+EBUILD shellcheck-0.3.5-r1.ebuild 1124 SHA256 9eee735317c2432d78cc3e8b7b4831e334794d21324edffe8e99647d3ca1aea9 SHA512 2cec123829fb682c42787ce2dbd51b666d8caae243cf28652518abae4c3ea4a9355af8c9c3f7384a97e359b2447f97e5ef5f01995ad2f0bdb123f3bc17ea4bf2 WHIRLPOOL 0f87efc9d4dccd7a8b66d11cd7c09558978be5bbfac5a5800e0c01a204c10209b124984a6a773333d98758eae09ee02428a55bdd5693ccd9f7916e2f30a9122a
+MISC ChangeLog 527 SHA256 bec76401aa957f0e215b9c6d80add02c316740781553a3404115327ca6bcc4dd SHA512 605966ae0446dbe5d9400b84b6f7a503c3962eeb36ba161ac99cf40e31018c753f65a3aeefcd19b504163e89c9fc3d5bfcb86056b40b35e178c3443e4c1dbc8f WHIRLPOOL a386d96cefd95effa6e0aa936403842c7c8b477ac9d4e24275f0141955609c14df270f323ca22a4fba0eb46e0d84947244dbcd7f178549f42c25ff505185b310
 MISC metadata.xml 236 SHA256 feedd499ae6ddebc364ebb0f38d08bfbcc6b5d499f805a307a9367fb82dd12e8 SHA512 02882c2ecdf4fe400bf3e4455df1feae173e12b6fbb09181ea50541bb9dbf43780a0ab00fa799ccf5b7f2c27dcf9d854e16146cfb336ff3270a7b4369e451860 WHIRLPOOL b6580a9428931142ea961e985e6b5c736ab716eefb85706692c780c11f97d6019be488493c2e2a51b7ae8b480be80276edddb2858fe19684d48df64433475e06
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJU1M7yXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJU1NlwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirGuYP/A06Gu3cKyM9htCCyHfiQAuJ
-iBs913Rh6wRuhec0turXBsmfvc8x5lAT+reG7F3upoID2A27aNo2hPipqoXMj2nl
-8P6wZ7I62P+gbmAcfji/tiKuu5Rcw1zEGX0kOB323v5JUGwKrwtDnb2p5ksCDgD0
-Wqy8d1Xp/FbF4d9AbXKLmd4VqvhWAD++FAyKgMR/hxwatipx/UoflSJcz8vANxzt
-/6rEPN11QxrZP7ZIGsC37HZgBoToh1xi6llHzigzjftj/GhimsNq2YqivWBIibUq
-7TwvNcGZ0alhPUFVhp+B3IFuDYSmAAY8XKp8IuuPq32Wm7/taZo0DNNFyXQSUjrG
-x+X8qi2AR4SUXt1ebNuS5WM5XlhEc1NrW6HtTYxhhqMpXLv32e2fiJouYzaIjCcP
-5QumV1JF1UbR6jsm1v2855IgVl5wSlBY2j5Jkz9KoO4PPIhnoBxEVlIoQHWNxPbf
-hWGbA7NTqdDqCJCvDqNFukpNOJpVXGOdBbVAnD7t0N4NQhTCyrLr6VIIUFowsJ1E
-YZhN70ccCeqvjXr68ypu5pYmrCnsDj+7yiATjJDpVnYkCWzHtZP9T6khbqO/eUCY
-7KSROdLSudGT+DP+m9OGYEN5+MXlu8EwnKq6IZkNlfJRwiTSV8A5BpNM10vfH2Rb
-993AD5MjylXjnAFScFX5
-=HxxV
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FViry9AP/iL/nUoVJMv+wR5QdsyBLiK+
+6IiX005gOYXamL0Bocj1nVcI4XlzU0MwSC8q0+HQO6aXHiD4FWX7Skiseq2fNZh0
+UrFJvmfPnOod9tbnnrkaASrf83DEhR/QnOJbVhKXno2rxPuSuW6r9qchPcgVZg9a
+AQBNVRnkFjcyhUJfSIT4jAHsImT5igMvpRXUjl4KaOsiA1fUeatlX1KlWZrkB27E
+DwwRZMCMHt5xJ0841+wmeyI941XvyU/o0W4sHzwmBnEudBpn99flW8FjXsDcueHO
+3Y/LiT7ktuvF3HSY63gsGr3jGWgLwGfao2gyIZSD6BU72npOpI4Qr66ECu0DJ/gO
+CeuL6gVtbHtoUTSkBrtFyu8YPIWAx0d1Yuhsn6pijKyKA7Nqt+1pTO9IpZ5NuRze
+dNf3zMwskI08+E2iVcaBtMTSZRjAE0FXohRMhhwI2efbW48hMExltltyJwXRfu4L
+x9qf2WICcRKP+wx5ElPMYlAyOJoyGbDUJp/1vlO7pwXRFNtleu07XQOsQapHUHio
+F/AHmFLUhyXsVg1YrVgvoRFyG2SIQ0eDSFUA8wghh3ILsrlfRjXhE5APD0BqVT8y
+bMiH9WH8X3O7Y3mMI9E21MswrGHxG1/zKUsd4aVyZEY6pO1PcwfcXXhS92RdqW3L
+yijd0S1DSZC4hxe8kUCS
+=l4qA
 -----END PGP SIGNATURE-----
diff --git a/dev-util/shellcheck/shellcheck-0.3.5-r1.ebuild b/dev-util/shellcheck/shellcheck-0.3.5-r1.ebuild
new file mode 100644
index 000000000000..6f27b2470413
--- /dev/null
+++ b/dev-util/shellcheck/shellcheck-0.3.5-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/shellcheck/shellcheck-0.3.5-r1.ebuild,v 1.1 2015/02/06 15:10:39 jlec Exp $
+
+EAPI=5
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+
+inherit haskell-cabal
+
+MY_PN="ShellCheck"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Shell script analysis tool"
+HOMEPAGE="http://www.shellcheck.net/"
+SRC_URI="
+	mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz
+	http://dev.gentoo.org/~mjo/distfiles/${PN}-man-${PV}.tar.xz"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-haskell/json:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	>=dev-haskell/quickcheck-2.7.4:2=[profile?]
+	dev-haskell/regex-compat:=[profile?]
+	dev-haskell/transformers:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_test() {
+	# See bug #537500 for this beauty.
+	runghc Setup.hs test || die 'test suite failed'
+}
+
+src_install() {
+	cabal_src_install
+	doman "${PN}.1"
+}
diff --git a/dev-util/shellcheck/shellcheck-0.3.5.ebuild b/dev-util/shellcheck/shellcheck-0.3.5.ebuild
deleted file mode 100644
index 932294e41c10..000000000000
--- a/dev-util/shellcheck/shellcheck-0.3.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/shellcheck/shellcheck-0.3.5.ebuild,v 1.1 2015/02/06 14:25:53 jlec Exp $
-
-EAPI=5
-
-CABAL_FEATURES="bin"
-
-inherit haskell-cabal
-
-DESCRIPTION="a static analysis tool for shell scripts"
-HOMEPAGE="http://www.shellcheck.net"
-SRC_URI="https://github.com/koalaman/shellcheck/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="AGPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-haskell/json
-	dev-haskell/mtl
-	dev-haskell/parsec
-	dev-haskell/regex-compat
-	dev-haskell/quickcheck:2
-"