gentoo resync : 25.08.2020

3 files changed, 42 insertions, 10 deletions

diff --git a/dev-haskell/nats/Manifest b/dev-haskell/nats/Manifest
index b2958da6eeef..237a1c8b0ff4 100644
--- a/dev-haskell/nats/Manifest
+++ b/dev-haskell/nats/Manifest
@@ -1,7 +1,9 @@
 DIST nats-0.1.2.tar.gz 3954 BLAKE2B f20f839d3aa4ac0a06f873d87ac5a691a7eeb62489904875918dd395302cee021cd59bbb0cafb88fd8554c99e14ba7dc9dff5a3704a394b5d342133560347fd3 SHA512 11903b123d0ed27af9fccc8bb7c343dcf42ac8d58768e628460153b0bf6f27bf1f1271890b26a48eb234b3b89bb7b9e48266a4b39742f56bcf8913e0c3751ab1
 DIST nats-0.2.tar.gz 4740 BLAKE2B 9300e1834feec441d35246377314c7c302c16c76548498352c08f07262bb491dd68ea9303cc22e67416c349e224153c484977d14491eabcb6ce22a2991f7c0cb SHA512 419f2b4f938b7d590f45a25be163e25f29d47ec0fe7cf5d1f69cb9624c5617dfc25a0b14daf1b31ac590c021120eb5cd93bdf902d27136e3019e30ce2b5d3188
+DIST nats-1.1.2.tar.gz 7776 BLAKE2B ae2012e1e8a433c3802b7470f95a7e4b391f9c7ee50f41b94d2ee9d20b630820e550efa76fb5d64926942e87e761db0702ae4310573d0bca38f52fa419a93390 SHA512 596f11e98fe57893279ddd1f5af11a12e747e0d5e87000c7e20d0f5c2da0f0be9a6b8d19c8d5759716a7fb9a3e77d0e999380af3d5a350fe32a5492dc6077450
 DIST nats-1.tar.gz 5768 BLAKE2B 1c8e08ce3cefade9103d4d16202d68eb1efae526ec1a4595768b121b15ee55ae5e071cfe6a1923219422a33278d53b290ec0aeee47c4eb8a7c6aed319dec0628 SHA512 a53b8890d3b9f9f799d0af25626d23a570b7d3f227968d4a1033385d87e4502120e26f8623a3c5c0c21dc0db98a000ff79565cbab0298fd9c17a917ea8e11edf
 EBUILD nats-0.1.2.ebuild 543 BLAKE2B 1f569c2d079ebf66bf12f83a94c7c49dc48b3f55bcbce981f4da8949e41f7c07a054ec85a4ec87716888adbf2697d921d70ee2ce84c2e0cb5f43a74b9d6994f2 SHA512 bc7896c15609b96520e7a1051c0074391326ad2d9625679b3525d2ad3475d5e072ba44d5b62dc8ddcf8caa87d18d74f1a8ae12a1accc112804cdf1c9fb1e68a2
 EBUILD nats-0.2.ebuild 717 BLAKE2B 4c9cea91e739cb2b8541a84ee651ad07620c26315d6f7126093b9ec43266c8a45973ee97ba92597ca204c1b65bdc02c46d19a857eda9e9a69922edeb797e3d80 SHA512 473d3ed753b9ae472ecd71d609fe3b3efe8b075b840659c1954945f437137cbeffce4d47565cfbbbe1f44bbaf498c6c0f2a0de431d81b5fd1c5f257986f1267c
+EBUILD nats-1.1.2.ebuild 1052 BLAKE2B f9e93ddc09b9693f23dc8c544be6d59c65ad1192ce2f04db5e9344b70bb500dbe7e0e5ff1a9872a086020a328a8d16f702d2025b8e65ae7802c5c59ab3d17129 SHA512 f85baf0fae68121af3396c33fcbcbcb5513bd88bd34fd51a893a3104f506b96a1f1d23755962a9ea8164de532ef923126ee96575f7b9fc7ca01082568e6101a6
 EBUILD nats-1.ebuild 725 BLAKE2B 4ac86b59bfe91b8d761f207f55ecd83d8f53fd51c769c3ada619d4a4d67a6174e985da1bcc9024a7f9419ad2aad967839aae1e693568d85c77fc0694bb78ac8e SHA512 65f7b5c9854f712fabaca4dc0fb79a09892af952f5c37ba5706f0a1ab4131e586ba982fbd1e6963e75227561a188c335350f2c6a84a3fb8a170460488cd38796
-MISC metadata.xml 703 BLAKE2B a3434d123064ec0470602448e541cf91d65d32c06dbb25bb1287b43a606792789cd6be1942d7558a35297a4a31da86e082343541ec39d9c58946544f33550c64 SHA512 533f3697500bc5cc931743a82562816555c0b6f17a9e552f394c2f0286d12c1a4e8e0447b708785d2413f2945e4432ad3853d49190ad11a0a8632bffeb1915d7
+MISC metadata.xml 505 BLAKE2B 7c7f0d247b1ddb56fd7b5e6f920bf429c083b4648a1f02b84b25360cf3c40f1c01d277ae988fe669be69dddab117a6517c86a51372a402d0148b5c082b9831fb SHA512 8bc2a5bd043b6389a0630f1e60d2e360e8f78156dc3c8ee85a7ac3c940b28901a550e11f9f8f4bd6f68bcb8da6579f372f4a2e9953c86f7901095e640635a992
diff --git a/dev-haskell/nats/metadata.xml b/dev-haskell/nats/metadata.xml
index 1c6077508d48..dc01d7df7855 100644
--- a/dev-haskell/nats/metadata.xml
+++ b/dev-haskell/nats/metadata.xml
@@ -9,14 +9,8 @@
 		Haskell 98 natural numbers
 	</longdescription>
 	<use>
-		<flag name="hashable">
-			You can disable the use of the `hashable` package using
-			USE=-hashable. Disabling this is an unsupported configuration, but it may be
-			useful for accelerating builds in sandboxes for expert users. If set we will
-			not supply an instance of `Hashable`.
-		</flag>
+		<flag name="binary">enable binary instances</flag>
+		<flag name="hashable">enable hashable instances</flag>
+		<flag name="template-haskell">enable template_haskell</flag>
 	</use>
-	<upstream>
-		<remote-id type="github">ekmett/nats</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/nats/nats-1.1.2.ebuild b/dev-haskell/nats/nats-1.1.2.ebuild
new file mode 100644
index 000000000000..0ffa621e1a6a
--- /dev/null
+++ b/dev-haskell/nats/nats-1.1.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5.9999
+
+CABAL_FEATURES="lib profile"
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Natural numbers"
+HOMEPAGE="https://github.com/ekmett/nats/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+binary +hashable +template-haskell"
+
+RESTRICT=test # avoid circular dep: nats[hashable]->hashable[test]->quickcheck->nats
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+	binary? ( >=dev-haskell/binary-0.2:=[profile?] <dev-haskell/binary-0.9:=[profile?] )
+	hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag binary binary) \
+		$(cabal_flag hashable hashable) \
+		$(cabal_flag template-haskell template-haskell)
+}