Permalink
Browse files

net-p2p/combinatorrent: patch gone upstream

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
  • Loading branch information...
1 parent 7c7d4ce commit 76e02067540e8a80fc8053d1456fefcf235b56ab @trofi trofi committed Dec 10, 2012
@@ -7,7 +7,7 @@ EAPI=5
# ebuild generated by hackport 0.3
CABAL_FEATURES="bin"
-inherit eutils haskell-cabal git-2
+inherit haskell-cabal git-2
MY_PN="Combinatorrent"
MY_P="${MY_PN}-${PV}"
@@ -16,7 +16,6 @@ DESCRIPTION="A concurrent bittorrent client"
HOMEPAGE="http://hackage.haskell.org/package/Combinatorrent"
# SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
EGIT_REPO_URI="git://github.com/jlouis/combinatorrent.git"
-EGIT_REPACK="1"
LICENSE="BSD"
SLOT="0"
@@ -48,10 +47,3 @@ DEPEND="${RDEPEND}
>=dev-lang/ghc-6.12.1"
S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-bs-0.10.patch
-
- CABAL_FILE=${MY_PN}.cabal cabal_chdeps \
- 'QuickCheck == 2.4.*' 'QuickCheck >= 2.4 && <2.6'
-}
@@ -1,22 +0,0 @@
-diff --git a/src/Digest.hs b/src/Digest.hs
-index 836fdff..6a057d4 100644
---- a/src/Digest.hs
-+++ b/src/Digest.hs
-@@ -1,5 +1,5 @@
- -- | Simple abstraction for message digests
--{-# LANGUAGE TypeSynonymInstances #-}
-+{-# LANGUAGE TypeSynonymInstances, CPP #-}
- module Digest
- ( Digest
- , digest
-@@ -17,7 +17,10 @@ import qualified Crypto.Hash.SHA1 as SHA1
- -- Consider newtyping this
- type Digest = B.ByteString
-
-+#if ! MIN_VERSION_bytestring(0,10,0)
-+-- instance was introduced
- instance NFData Digest
-+#endif
-
- digest :: L.ByteString -> B.ByteString
- digest bs = {-# SCC "sha1_digest" #-} SHA1.hashlazy bs

0 comments on commit 76e0206

Please sign in to comment.