summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatoro <matoro@users.noreply.github.com>2022-07-24 00:49:40 -0400
committerSam James <sam@gentoo.org>2022-07-30 06:57:29 +0100
commite29bec6d159aae242580989a897941e47a9dd9ef (patch)
tree15f96c559d23adcfb06783131973ca4cb3fafd08 /dev-haskell/io-streams-haproxy
parentdev-haskell/snap-core: add 1.0.5.0, drop 1.0.4.2 (diff)
downloadgentoo-e29bec6d159aae242580989a897941e47a9dd9ef.tar.gz
gentoo-e29bec6d159aae242580989a897941e47a9dd9ef.tar.bz2
gentoo-e29bec6d159aae242580989a897941e47a9dd9ef.zip
dev-haskell/io-streams-haproxy: revbump 1.0.1.0-r2
https://github.com/gentoo-haskell/gentoo-haskell/commit/a65a092b9cfffe2d03ba51439397b844ba9e8258 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-haskell/io-streams-haproxy')
-rw-r--r--dev-haskell/io-streams-haproxy/Manifest1
-rw-r--r--dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.1.0-r1.ebuild40
-rw-r--r--dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.1.0-r2.ebuild51
-rw-r--r--dev-haskell/io-streams-haproxy/metadata.xml7
4 files changed, 52 insertions, 47 deletions
diff --git a/dev-haskell/io-streams-haproxy/Manifest b/dev-haskell/io-streams-haproxy/Manifest
index 9683ccaf0c4b..68727fe319c7 100644
--- a/dev-haskell/io-streams-haproxy/Manifest
+++ b/dev-haskell/io-streams-haproxy/Manifest
@@ -1 +1,2 @@
+DIST io-streams-haproxy-1.0.1.0-rev3.cabal 3084 BLAKE2B fafef1a4200d013fa97b674929b9529f09ddf63d004a63ea2941ed1ab0caa53d820fde2103208b8b1bf40b3f1a501f637029699a563cb5ad81e421c774e9e062 SHA512 34dc8cd1b371aefe81a4416b5cf3a19d2cd89ecd2e01594707d21346a6011c64d9522e38343bc8f80fc97b371079cc5c034fade773cfd9ac42ad51842e4ea9fe
DIST io-streams-haproxy-1.0.1.0.tar.gz 10348 BLAKE2B 6c2268cacdfbe73561b8f753594fa39a4027ddf5d22696c7487e8b4c74c330627feec748789389f9f942c14412ecd030c80e779ef0031905d2fe681d7a1bff66 SHA512 6d9f2da6b014a9f2ee894237af56376b94616af1c1795681adac4bfd10edfb851cbe1a37295025c6ebf7e77fe7b5d2abba3557ac1a9ed594deabaee05151572a
diff --git a/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.1.0-r1.ebuild b/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.1.0-r1.ebuild
deleted file mode 100644
index 8dbbfe09f058..000000000000
--- a/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.1.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 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="HAProxy protocol 1.5 support for io-streams"
-HOMEPAGE="http://snapframework.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # two tests require network access
-
-RDEPEND=">=dev-haskell/attoparsec-0.7:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
- >=dev-haskell/io-streams-1.3:=[network,profile?] <dev-haskell/io-streams-1.6:=[network,profile?]
- >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
- >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9
- >=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.5 && < 4.13' 'base >= 4.5' \
- 'network >= 2.3 && < 3.1' 'network >= 2.3 && < 3.2'
-}
diff --git a/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.1.0-r2.ebuild b/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.1.0-r2.ebuild
new file mode 100644
index 000000000000..22bc397b0345
--- /dev/null
+++ b/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.1.0-r2.ebuild
@@ -0,0 +1,51 @@
+# 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="HAProxy protocol 1.5 support for io-streams"
+HOMEPAGE="https://snapframework.com/"
+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/attoparsec-0.7:=[profile?]
+ >=dev-haskell/io-streams-1.3:=[network,profile?] <dev-haskell/io-streams-1.6:=[network,profile?]
+ >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
+ >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9
+ >=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 )
+"
+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
+
+ cabal_chdeps \
+ 'attoparsec >= 0.7 && < 0.14' 'attoparsec >=0.7' \
+ 'base >= 4.5 && < 4.15' 'base >=4.5'
+}
diff --git a/dev-haskell/io-streams-haproxy/metadata.xml b/dev-haskell/io-streams-haproxy/metadata.xml
index 297f2aa02cbf..937381521944 100644
--- a/dev-haskell/io-streams-haproxy/metadata.xml
+++ b/dev-haskell/io-streams-haproxy/metadata.xml
@@ -5,11 +5,4 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- HAProxy protocol version 1.5 support (see
- &lt;http://haproxy.1wt.eu/download/1.5/doc/proxy-protocol.txt&gt;) for applications
- using io-streams. The proxy protocol allows information about a networked
- peer (like remote address and port) to be propagated through a forwarding
- proxy that is configured to speak this protocol.
- </longdescription>
</pkgmetadata>