gentoo resync : 15.12.2019

5 files changed, 50 insertions, 3 deletions

diff --git a/dev-haskell/shakespeare/Manifest b/dev-haskell/shakespeare/Manifest
index f21b89490c56..36e42bd57a51 100644
--- a/dev-haskell/shakespeare/Manifest
+++ b/dev-haskell/shakespeare/Manifest
@@ -1,9 +1,11 @@
 DIST shakespeare-1.0.5.1.tar.gz 10773 BLAKE2B 5a234732a88b390914936e635884ed9befe10fc4b42d72d034aaf0d96099a9f8d9f136a7669307eea60cec7d773f3e7cd02a5ff2a37c73336bd4a3927625d71f SHA512 1b012cdfc90c930365633868e9714793bbbdf2fd276c578459495fe57531f4d3fb401db930880ab96eecdc95c60383a52ec8aa0cfa08b17bc099acee241192e7
 DIST shakespeare-1.2.1.1.tar.gz 11053 BLAKE2B 7c2b43f260740ddd364831f8bb991f052be8df014869bf29a1839d43f6cdcaf184fdc691ee4cecbd349dc68b848910a90399b5a48d48ed639180e609df36ba0c SHA512 559e77735c96edb551d85127e68af1aebfba383a6c67999ed86d4a93dc5dd7cedc8b7ca841219c0b7912cfc8509150733a7ba34fcb71d8e7a080fe34527b49e5
 DIST shakespeare-2.0.12.1.tar.gz 65156 BLAKE2B 0351f9453331a6aea8a346759902256ee1424a92ae5b0e655ed71567b0351449eff1c45ce675abd16556d9f09a4d31c8fdf11b8b28784171f50292b30da4a677 SHA512 01591844b51ab93a8021646ad15350d9682aa3e12c5017c32b89ca3b8de1cc46a01eb0096a35585297558d25c7a641a43f2766ad04766b2e033e8d02bdbc330e
+DIST shakespeare-2.0.21.tar.gz 65752 BLAKE2B fdcaf27cc9f9346b93b3f1eb8b215ee75c4751427be279574c93929f4f5f521c01091bbff81a849bef3f98d97cf662b725ab99da709437b98ac85afc34f74d99 SHA512 ca796206aafffb5a96c75d305e90bad48f17d213b24dce8c8adcc9c94299ed78b0a2b48b5116d18b0ee26b413e845df53d387d3ca1b3d4c127e9b02b9f124af7
 DIST shakespeare-2.0.7.tar.gz 62913 BLAKE2B a1e4f7c05123ad28cec27d07e491af4a86847ca0cf9fc85cca821b3c80a246508370e7c985fd27339601a5a4b500ab2ef437852c4746481cfb00b5aa45e24946 SHA512 5d682c2a4c36b7c8b5c8b87a3d0e509eb84e9e0a0e00a691cb9687c6f335c9ad895b81115a4e6fe8f4087ac6febe3e3e26d39ec305267228b1c9f295f9cf6d16
 EBUILD shakespeare-1.0.5.1.ebuild 826 BLAKE2B 337299f2597bb23296ab7ba14e558225c84556c9fa409b47cade7874f479faa0a2bcba352293d8485bc63657c68acd2dbda96910a3fc465378823d8b212dd71c SHA512 a845f7c3d92ce22f0f98095464cd557ae7de46ad7612a0486c34ac35ba03396ebd94930b9f3884bd43e16d79be3f06eb601631ebd017f18b42fa1ffc81589508
-EBUILD shakespeare-1.2.1.1.ebuild 925 BLAKE2B 3fe02558366b2966276cd038d3de01f2f5246d978d094bec4eb11360c561e4b7bfcdfeb2592a6fc25512050eec3505827400069cc01f0deb321c85852c3165a7 SHA512 1705bba7898dee61a79119c212b52c413f783be166716183a2c99138c95b6ecefd5ae1a466b37b0442534784d536053e33cc7f8b4cbd0101bd6a11fb508a8672
-EBUILD shakespeare-2.0.12.1.ebuild 1236 BLAKE2B 42d3915b2b9d735f204cc7db05321c416b507aeb9e256f9d79516b54570ae1dedbd78b632c6e53a236a67f0779bfb67c9fbf115beb46ca2b72e7f7e806eaf6ef SHA512 5b521460a3fce0cd7255be8fd9a957c5e14faf2f46e55cec0de36b2831d95cf57baa0c9ad19292f09f66e9cb4d31700eb44408dfd2df13bf4f3b21457b1ee485
-EBUILD shakespeare-2.0.7.ebuild 1262 BLAKE2B 5f6757cac1cfee77935b5b66faeb7699a876bda438ca2e6cad89a8ef26b1f6d7837624348d98f18cff896873e46eacf4aabc516aea80d9c66e7f8aa6dafc1882 SHA512 12d33ac2abd0be4582a3f129aa93339ab47312d815b83397450f5b5bb3200de4f73ae5acf2734a42ed3bb490324fdf3e07f0a616f74975f4310ec143cab88355
+EBUILD shakespeare-1.2.1.1.ebuild 952 BLAKE2B e9d5ad696aba573f9c98cceb0425b8be64e2fc190dcbe33fc1a10dab1a440d8093f21d6bc793da0b7a9dcbdef776e6c178cfa7f37a9cf3b1b30ba59ea5e92bc6 SHA512 25c69ea051e40afabc3326d13e49a66dda6fe1eb299b5d26e2b501bf16eb0b4efb6ef018fa02f9cce3ffa837414b6bf83cc37472e5ec348fa372f3ceadfd29ad
+EBUILD shakespeare-2.0.12.1.ebuild 1263 BLAKE2B ebba6080a32f521022638edbe46b1a666e779e4439e8e70ff060d81fd0fdfc469bcdab341e43b924719491a6092cd30cb0b9f37037408d29e24516cb86848971 SHA512 82d5f56e4b7f82a4c1fb74cbf4cdce38d24408458361a1ad7366810ecc26e9386b1626ba33780acb95f4b7e7d3a38713fc428374e3ce287e07286da23950d645
+EBUILD shakespeare-2.0.21.ebuild 1233 BLAKE2B 1e79f5e5770daba0453f2efcec4dfbf482dc02c730071783c045608630b81d8e8167269979ddf534eff7d201c09863bb59dc2a099eb6b514a9de7728a5223907 SHA512 07f557234cb1f2f21afcda33e022542aa537f0c4fb91e667f8db7b8ad4f3fcd76b44f86bdb505294596018283e370b05d4c31dba0f3c52ec7a33cabff58603c3
+EBUILD shakespeare-2.0.7.ebuild 1289 BLAKE2B 48fc73bfe05bbe0827f9fb634590d952fb575a81ea69badcf89fce76f043735914b3b85c02597691130a10a6b0dc2caab349f32240aa891e1894e500e46303cd SHA512 f968bfe208ee7b575d21a46246b7275d68d807d133f60fe6f59bb7715e76e9a5ee7b4e6d1dbeb9350671125e53d2e8612e827028a5e30c0c2a0040150ff95031
 MISC metadata.xml 1034 BLAKE2B 122bdf19c088484e3cb66f4f98a7946af84a742deb782bc8bbde17add33ec4eed1f4241bada666748ff5ddd5063aa3b20997b89fbd80b6ae3a414cfa8b54677c SHA512 3ad916e35105e916a43f2ab37c30ab7a2daebf813691743a8bd88306cce96c1474056838451396b451424b5f960b168ad07f6aac3bd155a89aa6af37f89826d9
diff --git a/dev-haskell/shakespeare/shakespeare-1.2.1.1.ebuild b/dev-haskell/shakespeare/shakespeare-1.2.1.1.ebuild
index a2f710a4e83b..03a6d544135d 100644
--- a/dev-haskell/shakespeare/shakespeare-1.2.1.1.ebuild
+++ b/dev-haskell/shakespeare/shakespeare-1.2.1.1.ebuild
@@ -16,6 +16,7 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="test-export"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?]
 	>=dev-haskell/system-fileio-0.3:=[profile?]
diff --git a/dev-haskell/shakespeare/shakespeare-2.0.12.1.ebuild b/dev-haskell/shakespeare/shakespeare-2.0.12.1.ebuild
index 2e557a0bc710..d4caa18cff8f 100644
--- a/dev-haskell/shakespeare/shakespeare-2.0.12.1.ebuild
+++ b/dev-haskell/shakespeare/shakespeare-2.0.12.1.ebuild
@@ -16,6 +16,7 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="test-coffee test-export test-roy"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-haskell/aeson:=[profile?]
 	dev-haskell/blaze-html:=[profile?]
diff --git a/dev-haskell/shakespeare/shakespeare-2.0.21.ebuild b/dev-haskell/shakespeare/shakespeare-2.0.21.ebuild
new file mode 100644
index 000000000000..4909bfb0bb06
--- /dev/null
+++ b/dev-haskell/shakespeare/shakespeare-2.0.21.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A toolkit for making compile-time interpolated templates"
+HOMEPAGE="http://www.yesodweb.com/book/shakespearean-templates"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="test-coffee test-export test-roy"
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	dev-haskell/blaze-html:=[profile?]
+	dev-haskell/blaze-markup:=[profile?]
+	dev-haskell/exceptions:=[profile?]
+	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?]
+	>=dev-haskell/scientific-0.3.0.0:=[profile?]
+	>=dev-haskell/text-0.7:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3
+		dev-haskell/hunit )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag test-coffee test_coffee) \
+		$(cabal_flag test-export test_export) \
+		$(cabal_flag test-roy test_roy)
+}
diff --git a/dev-haskell/shakespeare/shakespeare-2.0.7.ebuild b/dev-haskell/shakespeare/shakespeare-2.0.7.ebuild
index 06fc6879b383..f143a726ac13 100644
--- a/dev-haskell/shakespeare/shakespeare-2.0.7.ebuild
+++ b/dev-haskell/shakespeare/shakespeare-2.0.7.ebuild
@@ -16,6 +16,7 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="test-coffee test-export test-roy"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-haskell/aeson:=[profile?]
 	dev-haskell/blaze-html:=[profile?]