summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-haskell/base-compat-batteries')
-rw-r--r--dev-haskell/base-compat-batteries/Manifest4
-rw-r--r--dev-haskell/base-compat-batteries/base-compat-batteries-0.11.1.ebuild35
-rw-r--r--dev-haskell/base-compat-batteries/base-compat-batteries-0.12.1.ebuild46
-rw-r--r--dev-haskell/base-compat-batteries/base-compat-batteries-0.13.0.ebuild30
-rw-r--r--dev-haskell/base-compat-batteries/metadata.xml27
5 files changed, 84 insertions, 58 deletions
diff --git a/dev-haskell/base-compat-batteries/Manifest b/dev-haskell/base-compat-batteries/Manifest
index 43b7be06991d..a1e3a81f5046 100644
--- a/dev-haskell/base-compat-batteries/Manifest
+++ b/dev-haskell/base-compat-batteries/Manifest
@@ -1 +1,3 @@
-DIST base-compat-batteries-0.11.1.tar.gz 16748 BLAKE2B bd24a8fb165b8056023f7280745ce972d2036df33cd72f2824055455899d2643b4ca90d116d1692795ea504f0c03a97bc256eaeba7db491f35961061d28d0aba SHA512 a0149db9fae3664507c715e569209a9b996084cfb1f4dc125914eea57c2142ba8ddad559257dbf405c2b91d78d10c570c25e5a3c80bf50eb6bf5d31dfe65c217
+DIST base-compat-batteries-0.12.1-rev2.cabal 8891 BLAKE2B b7d6ebe0a100757dc6b95b3dcc25b5922b7a5c781c726fe69549d21631be0339dd08a0017427830e35c36dd2074b5be55b6f71d6555c6ca0050e7b825b2cb1b0 SHA512 38d81b3d72e9cb731d5c25310e71a5f73b004a37a4211315fb750c29e3bbccca40daeae175d25f8c602d1b2d13eee899cf5b2dea401d1aa5bf821b588b93572a
+DIST base-compat-batteries-0.12.1.tar.gz 17623 BLAKE2B c5bd92d32b4dbd67e28fc355a06c6e431be28f52db08f7ae9ba5fb067ac9536cbbf6c1315bf09417278856f1402bbc8376b51b34d564f0d0d15e21d0f317b4f1 SHA512 346ad1e53e4712017e610d1883e91371c1bbdefdce35b2830b8807e207f6fbd2233e2be153d85b6632059f58d3d9c74435537719823533ddddd47d96b231b0cf
+DIST base-compat-batteries-0.13.0.tar.gz 19320 BLAKE2B 20935aefca4709eef035de8fd8538b9be1f926e62571629949458c48028c68b51fb8ed7e58862225355273576f18baadc9be4f2d2262efe93592b2765b0ad804 SHA512 3f509034ea6ef1de86985082dd949abefa6570a2c14338571a263221d1a3f9da17a77918174aecb8d7fb83970da2a362f1d3ac0f3c5a5bca76edbcac368edeef
diff --git a/dev-haskell/base-compat-batteries/base-compat-batteries-0.11.1.ebuild b/dev-haskell/base-compat-batteries/base-compat-batteries-0.11.1.ebuild
deleted file mode 100644
index f4b6f1ce6ff5..000000000000
--- a/dev-haskell/base-compat-batteries/base-compat-batteries-0.11.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="base-compat with extra batteries"
-HOMEPAGE="http://hackage.haskell.org/package/base-compat-batteries"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~dev-haskell/base-compat-0.11.1:=[profile?]
- >=dev-haskell/bifunctors-5.5.2:=[profile?] <dev-haskell/bifunctors-5.6:=[profile?]
- >=dev-haskell/contravariant-1.5:=[profile?] <dev-haskell/contravariant-1.6:=[profile?]
- >=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?]
- >=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?]
- >=dev-haskell/semigroups-0.18.4:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
- >=dev-haskell/transformers-compat-0.6:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
- >=dev-haskell/type-equality-1:=[profile?] <dev-haskell/type-equality-1.1:=[profile?]
- >=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hspec-1.8
- dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/base-compat-batteries/base-compat-batteries-0.12.1.ebuild b/dev-haskell/base-compat-batteries/base-compat-batteries-0.12.1.ebuild
new file mode 100644
index 000000000000..2e6a2be81b5c
--- /dev/null
+++ b/dev-haskell/base-compat-batteries/base-compat-batteries-0.12.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 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="2"
+inherit haskell-cabal
+
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
+DESCRIPTION="base-compat with extra batteries"
+HOMEPAGE="https://hackage.haskell.org/package/base-compat-batteries"
+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="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="~dev-haskell/base-compat-0.12.1:=[profile?]
+ >=dev-haskell/contravariant-1.5:=[profile?] <dev-haskell/contravariant-1.6:=[profile?]
+ >=dev-haskell/onetuple-0.3:=[profile?] <dev-haskell/onetuple-0.4:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/hspec-1.8
+ dev-haskell/quickcheck )
+"
+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
+}
diff --git a/dev-haskell/base-compat-batteries/base-compat-batteries-0.13.0.ebuild b/dev-haskell/base-compat-batteries/base-compat-batteries-0.13.0.ebuild
new file mode 100644
index 000000000000..b4df2533f1c3
--- /dev/null
+++ b/dev-haskell/base-compat-batteries/base-compat-batteries-0.13.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="base-compat with extra batteries"
+HOMEPAGE="https://hackage.haskell.org/package/base-compat-batteries"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ ~dev-haskell/base-compat-0.13.0:=[profile?]
+ >=dev-haskell/foldable1-classes-compat-0.1:=[profile?] <dev-haskell/foldable1-classes-compat-0.2:=[profile?]
+ >=dev-haskell/onetuple-0.4:=[profile?] <dev-haskell/onetuple-0.5:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+ test? (
+ >=dev-haskell/hspec-1.8
+ dev-haskell/quickcheck
+ )
+"
diff --git a/dev-haskell/base-compat-batteries/metadata.xml b/dev-haskell/base-compat-batteries/metadata.xml
index 012220248aca..b019d00e8863 100644
--- a/dev-haskell/base-compat-batteries/metadata.xml
+++ b/dev-haskell/base-compat-batteries/metadata.xml
@@ -1,29 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- Provides functions available in later versions of @base@ to
- a wider range of compilers, without requiring you to use CPP
- pragmas in your code.
-
- This package provides the same API as the
- @&lt;http://hackage.haskell.org/package/base-compat base-compat&gt;@
- library, but depends on compatibility packages
- (such as @semigroups@) to offer a wider support window than
- @base-compat@, which has no dependencies. Most of the modules
- in this library have the same names as in @base-compat@
- to make it easier to switch between the two. There also exist
- versions of each module with the suffix @.Repl.Batteries@,
- which are distinct from anything in @base-compat@, to allow
- for easier use in GHCi.
-
- See
- @&lt;https://github.com/haskell-compat/base-compat/blob/master/base-compat/README.markdown#dependencies here&gt;@
- for a more comprehensive list of differences between
- @base-compat@ and @base-compat-batteries@.
- </longdescription>
+ <upstream>
+ <remote-id type="hackage">base-compat-batteries</remote-id>
+ <remote-id type="github">haskell-compat/base-compat</remote-id>
+ </upstream>
</pkgmetadata>