gentoo resync : 15.12.2019

4 files changed, 53 insertions, 71 deletions

diff --git a/dev-util/shelltestrunner/Manifest b/dev-util/shelltestrunner/Manifest
index 375d0e2a3a64..c3a507937645 100644
--- a/dev-util/shelltestrunner/Manifest
+++ b/dev-util/shelltestrunner/Manifest
@@ -1,6 +1,5 @@
-DIST shelltestrunner-1.3.4.tar.gz 21331 BLAKE2B 8530bb93680e678d7b3b439cdcf06817a1054e6c99cbcd028a19b0fb13db5b4e0e9150993348f5dffd7d0dc0dd82acc7a7331e44caf5086df28940e2f739a63c SHA512 b46e5e2456573b06f6958076a001be3fd65471dc6c89b78700f1d77870bb3844e89e9cec98ad2a146554f19550891c2f3c6bd150b8ee8d0b20d9cd3b34f55753
 DIST shelltestrunner-1.3.5.tar.gz 21428 BLAKE2B af7573a16159baf5dbcbedc10a454b1f09875031cc9d619b287aeaf507744a2a1dc5cde8ea509949097b5364b5b9ac9438705e58d2d08647e5fa6c4eccceec37 SHA512 f0cc03c41fe176ddfd0e498121f5ebafda721b93e9a84f320b445bf797022545e1046ffb3814e2eaac72f0975a2a11fb1de5e0a007c5700de028e57ee66fa093
-EBUILD shelltestrunner-1.3.4.ebuild 970 BLAKE2B 300c7d7ef8bc792f40020ddbaae70471d81adb905e961d797f412056311da912e4f3f34924c6f07550f18e48ed1f8b5a826890720bc257c6520d1c8b8e1a2fd8 SHA512 94009c2c937230570df816b8877114180048f5ca463e743608fd5ca38053ae678edf32a5945305988f314e99fe29b6daba91783a9b2be552b9063ad0918d05ce
+DIST shelltestrunner-1.9.tar.gz 39538 BLAKE2B 45dc5acbfd35d65a818938382e62eacc7aa3798e8f0ab9cdd4d4a358f470de9854bedbd2335bae6b4195ea05b2305de84e0b13c86206ac0e53039726fbc59354 SHA512 bdb5476e30189f0997f3a9505d954a828475a5d95e1220dc9ed342e96100f4dfa0cfadc1afd9a5758223cf1a659d1f77d7d0a0533c32bd80b325c9a7ad48178d
 EBUILD shelltestrunner-1.3.5-r1.ebuild 1194 BLAKE2B b5199777a70dc10e1b11d9bb8d94dc4cb20831dd395a281b110956f262a02775fbd484f849756a538ef42726ca3e560abce959ec9b3b9684fe6693f656f80536 SHA512 d1b0ad30f0b273476358b255e6fe22336a2875334592de5a03fa185ddd3af8e8a51715b43ff028eea1a13f0acfcb91cb729b4a2c2e1f2517632080489b8fe132
-EBUILD shelltestrunner-1.3.5.ebuild 1060 BLAKE2B 613efe45e085fa2c57c9ca591908eaa900bfa960356cc160585fad69b8c72afe5cb3f0fee98a7d5627358ea753fa2fb159418a2716c06ed923cabd98fb94a4ea SHA512 fbb24dcb8675c3fd7fb54c73a2b0303d2d462284a23c821f4fba9f89cf543e6fb5d5cbbb98b70fcbc27270fac9c1f08e53b70511523cfadba3a16fb50175d7d6
+EBUILD shelltestrunner-1.9.ebuild 1397 BLAKE2B b59eb984a85b37accd82f6817c93feb7186308913a1d0c79ea70c08e6c49637832b92df7b72d66b1bcf760abdbe28250ec236161e9a41b10de01453c92326ef6 SHA512 2578e83aea10803e869f4fcc35006db208c088fe81dd73e64a29df330774715e1fd03ddc2d68a8efa28d05b991b87f25f9d39ad87e9817513cbd8f9f5985850d
 MISC metadata.xml 635 BLAKE2B d6582231d4828a390bf96dd9c75dfebc87ef599a2e659f281bee36ac2a1ca3cd73702e38518e47343753766caf772180f19c97b1805f236993d4486d2f15ea2a SHA512 a398308f38fffe954bdcb052e6b22997442c2a303896790c643e3e95cc38976f2d5b8fb9d08a713411fd5ec0aca2d2904a5a388276d69ad132e8780115bac6f8
diff --git a/dev-util/shelltestrunner/shelltestrunner-1.3.4.ebuild b/dev-util/shelltestrunner/shelltestrunner-1.3.4.ebuild
deleted file mode 100644
index 564c9894e257..000000000000
--- a/dev-util/shelltestrunner/shelltestrunner-1.3.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="A tool for testing command-line programs"
-HOMEPAGE="http://joyful.com/shelltestrunner"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-	>=dev-haskell/cmdargs-0.7 <dev-haskell/cmdargs-0.11
-	>=dev-haskell/diff-0.2.0 <dev-haskell/diff-0.4
-	>=dev-haskell/filemanip-0.3 <dev-haskell/filemanip-0.4
-	<dev-haskell/hunit-1.3
-	<dev-haskell/parsec-3.2
-	>=dev-haskell/regex-tdfa-1.1 <dev-haskell/regex-tdfa-1.3
-	>=dev-haskell/test-framework-0.3.2 <dev-haskell/test-framework-0.9
-	>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
-	>=dev-haskell/utf8-string-0.3.5 <dev-haskell/utf8-string-0.4
-	>=dev-lang/ghc-7.4.1
-"
diff --git a/dev-util/shelltestrunner/shelltestrunner-1.3.5.ebuild b/dev-util/shelltestrunner/shelltestrunner-1.3.5.ebuild
deleted file mode 100644
index 791eeecd1932..000000000000
--- a/dev-util/shelltestrunner/shelltestrunner-1.3.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="A tool for testing command-line programs"
-HOMEPAGE="http://joyful.com/shelltestrunner"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cmdargs-0.7:= <dev-haskell/cmdargs-0.11:=
-	>=dev-haskell/diff-0.2.0:= <dev-haskell/diff-0.4:=
-	>=dev-haskell/filemanip-0.3:= <dev-haskell/filemanip-0.4:=
-	<dev-haskell/hunit-1.3:=
-	<dev-haskell/parsec-3.2:=
-	>=dev-haskell/pretty-show-1.6.5:=
-	>=dev-haskell/regex-tdfa-1.1:= <dev-haskell/regex-tdfa-1.3:=
-	dev-haskell/safe:=
-	>=dev-haskell/test-framework-0.3.2:= <dev-haskell/test-framework-0.9:=
-	>=dev-haskell/test-framework-hunit-0.2:= <dev-haskell/test-framework-hunit-0.4:=
-	>=dev-haskell/utf8-string-0.3.5:= <dev-haskell/utf8-string-1.1:=
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-util/shelltestrunner/shelltestrunner-1.9.ebuild b/dev-util/shelltestrunner/shelltestrunner-1.9.ebuild
new file mode 100644
index 000000000000..59969639f34d
--- /dev/null
+++ b/dev-util/shelltestrunner/shelltestrunner-1.9.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal
+
+DESCRIPTION="A tool for testing command-line programs"
+HOMEPAGE="https://github.com/simonmichael/shelltestrunner"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-haskell/cmdargs-0.7:=
+	>=dev-haskell/diff-0.2.0:=
+	>=dev-haskell/filemanip-0.3:=
+	dev-haskell/hunit:=
+	dev-haskell/parsec:=
+	>=dev-haskell/pretty-show-1.6.5:=
+	>=dev-haskell/regex-tdfa-1.1:=
+	dev-haskell/safe:=
+	>=dev-haskell/test-framework-0.3.2:=
+	>=dev-haskell/test-framework-hunit-0.2:=
+	>=dev-haskell/utf8-string-0.3.5:=
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+
+"
+
+src_test() {
+	# First we have to prepend "dist/build/shelltest" to the PATH, so
+	# that when the tests themselves run "shelltest", they get the
+	# recently-built executable and not an already-installed one. Then
+	# we exclude the Windows tests, leaving (for now...) only the Unix
+	# and generic ones.
+	#
+	# We also skip the macro tests for now because the sdist is missing
+	# some files:
+	#
+	#   https://github.com/simonmichael/shelltestrunner/issues/13
+	#
+	LANGUAGE=en \
+	PATH="dist/build/shelltest:${PATH}" \
+		shelltest -x .windows -x macros.test tests/ || die 'test suite failed'
+}