[gentoo-commits] repo/gentoo:master commit in: dev-haskell/network-conduit/

[Sergei Trofimovich]

commit:     d6fd8c45c23ab16b657d1bfa5bded4320084d4f9
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 25 09:51:27 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Oct 25 09:51:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6fd8c45

dev-haskell/network-conduit: update to EAPI=7

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-haskell/network-conduit/metadata.xml                 |  3 ---
 dev-haskell/network-conduit/network-conduit-1.1.0.ebuild | 15 ++++++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/dev-haskell/network-conduit/metadata.xml b/dev-haskell/network-conduit/metadata.xml
index b22e8f68da8..b7878815d80 100644
--- a/dev-haskell/network-conduit/metadata.xml
+++ b/dev-haskell/network-conduit/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@g.o</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">snoyberg/conduit</remote-id>
-	</upstream>
 </pkgmetadata>

diff --git a/dev-haskell/network-conduit/network-conduit-1.1.0.ebuild b/dev-haskell/network-conduit/network-conduit-1.1.0.ebuild
index 3fdab3fde1f..688fb814118 100644
--- a/dev-haskell/network-conduit/network-conduit-1.1.0.ebuild
+++ b/dev-haskell/network-conduit/network-conduit-1.1.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-# ebuild generated by hackport 0.3.6.9999
+# ebuild generated by hackport 0.6.6.9999
 #hackport: flags: -network-bytestring
 
-CABAL_FEATURES="lib profile"
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Stream socket data using conduits. (deprecated)"
@@ -19,8 +19,13 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
 "
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-network-bytestring
+}