gentoo auto-resync : 30:07:2022 - 09:09:33

3 files changed, 49 insertions, 41 deletions

diff --git a/dev-haskell/microstache/Manifest b/dev-haskell/microstache/Manifest
index 5d7f9ffa8a48..3b57448f43b4 100644
--- a/dev-haskell/microstache/Manifest
+++ b/dev-haskell/microstache/Manifest
@@ -1,3 +1,4 @@
-DIST microstache-1.0.1.1.tar.gz 20449 BLAKE2B b4f0a6b13e5597ba2c90377032a8b248570977a35bb07d7f8b360add87eff6ea80ee8cbd40cee8e110ff913833b798234d0189e65e4c4964367b3643c15e6837 SHA512 28e0ad58a9724259df176092c125a4ba51fd2278cb0ab2e29bc24bf1e0f1c57a53e5983ff640569e3416fc7cda31b6ba0ae8ad832840a3040ba55fb85fb7f1a1
-EBUILD microstache-1.0.1.1.ebuild 1260 BLAKE2B 520809860f07c71763bf38a579576d51b8465996053a0816a668eaecce290fbe9829e36b7d841feef434962421912d9be4ab1311599429087565cedd50a84f35 SHA512 ba2b3b954769a23e585bcba98e8a24b933f9e06419019a94215abb2c5557057b3a25f973f8d69cfce50d33ee75b991b11d7efb11208b607b857d15155bc44260
+DIST microstache-1.0.2-rev3.cabal 2873 BLAKE2B 8d389ffbb9216b19f0d91fa690230e9bb2a79a74f4742394a8d7fe8ec2e0344c7485ebcd40b516dcdce25dd275ff16eae67bdc22bba0c60da54f7ff1199623ba SHA512 2c952588bbd355f313ae63eba4bb0cea38f36da8e0a7f29be6a841836e32cf05ef86d1bbc2b21bc871b218778ca521484ca146cf0f83e9053e0b00d821258e10
+DIST microstache-1.0.2.tar.gz 21333 BLAKE2B 05f726b88c96e47157e76705bf6961bf27f81cdee8f3c7860e9f24f368e450862d854a6a47492da179ed6830006059100470e029183f11164e1042766111cb6d SHA512 bbf1de864c88809cfd159a679ec1709c7fb523e2b3ac91232e2cabb9a4bf2eda0913666b3a6ab81b6ba9c2488ce1200cb6b43e21a7f475d2dc20f9854c47a61e
+EBUILD microstache-1.0.2.ebuild 1371 BLAKE2B 3e811b5b10f6ce9924a440a9c3ce15ba1f51daadb989348f5e49ec733b91f04fee14d58d7f6f7497d399ef90a2a374cde8c0b6d12aa7102590eb38cfd8165037 SHA512 d33d463ef67d0825fef1b68f3e7d5a85b3c2754eb24c6a0da959dfd68832b75ca56be2c6d8b82e464a41e56b0d4eb085cc867c1eaf53524156bec390ca2c8555
 MISC metadata.xml 440 BLAKE2B c504b582dc362e6d196c5c8380224c59f4d4187e897c088db94fdfbb8c6f30b8b52845febe124f3ec1a2f69e9e86f9b682cf92ca0b2ae258253918bb42441e80 SHA512 e18c02839a5758c8b5ceebc1d08d50d7f01ced758d93c38ed0396b1baa0547451f744ae5fa3f4f4fcfda8a02addf5437603b11f16d45bbe662c5decd2db3da36
diff --git a/dev-haskell/microstache/microstache-1.0.1.1.ebuild b/dev-haskell/microstache/microstache-1.0.1.1.ebuild
deleted file mode 100644
index 29864b976b06..000000000000
--- a/dev-haskell/microstache/microstache-1.0.1.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Mustache templates for Haskell"
-HOMEPAGE="https://github.com/phadej/microstache"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.11:=[profile?]
-	>=dev-haskell/parsec-3.1.11:=[profile?] <dev-haskell/parsec-6.0:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.5:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'aeson                  >=0.11    && < 1.3' 'aeson                  >=0.11' \
-		'containers             >=0.4.2.1 && < 0.6' 'containers             >=0.4.2.1'
-}
diff --git a/dev-haskell/microstache/microstache-1.0.2.ebuild b/dev-haskell/microstache/microstache-1.0.2.ebuild
new file mode 100644
index 000000000000..860ca461c704
--- /dev/null
+++ b/dev-haskell/microstache/microstache-1.0.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_HACKAGE_REVISION="3"
+inherit haskell-cabal
+
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
+DESCRIPTION="Mustache templates for Haskell"
+HOMEPAGE="https://github.com/haskellari/microstache"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+		-> ${CABAL_DISTFILE}"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND=">=dev-haskell/aeson-0.11:=[profile?] <dev-haskell/aeson-2.1:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.5:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/aeson
+		>=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 )
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
+
+	# Convert to unix line endings
+	dos2unix "${CABAL_FILE}" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}