Drop tests/external.sh from tests as it reloes on ecample.com layout. Partially fixes bug #392647 by Paweł Hajdan, Jr.

(Portage version: 2.2.0_alpha79_p23/cvs/Linux x86_64)

3 files changed, 23 insertions, 7 deletions

diff --git a/dev-vcs/darcs/ChangeLog b/dev-vcs/darcs/ChangeLog
index 9601e449bfd5..48e89f48f1ff 100644
--- a/dev-vcs/darcs/ChangeLog
+++ b/dev-vcs/darcs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/darcs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/ChangeLog,v 1.22 2011/08/04 21:04:18 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/ChangeLog,v 1.23 2011/12/08 20:42:47 slyfox Exp $
+
+  08 Dec 2011; Sergei Trofimovich <slyfox@gentoo.org> darcs-2.4.4-r1.ebuild,
+  darcs-2.5.2.ebuild:
+  Drop tests/external.sh from tests as it reloes on ecample.com layout.
+  Partially fixes bug #392647 by Paweł Hajdan, Jr.
 
 *darcs-2.5.2 (04 Aug 2011)
 
diff --git a/dev-vcs/darcs/darcs-2.4.4-r1.ebuild b/dev-vcs/darcs/darcs-2.4.4-r1.ebuild
index ddcde6b42ea1..0df0f85a5ad3 100644
--- a/dev-vcs/darcs/darcs-2.4.4-r1.ebuild
+++ b/dev-vcs/darcs/darcs-2.4.4-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.4.4-r1.ebuild,v 1.13 2011/06/05 12:10:57 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.4.4-r1.ebuild,v 1.14 2011/12/08 20:42:47 slyfox Exp $
 
 EAPI="3"
-CABAL_FEATURES="bin lib profile haddock"
+CABAL_FEATURES="bin lib profile haddock hscolour"
 inherit haskell-cabal eutils bash-completion
 
 DESCRIPTION="a distributed, interactive, smart revision control system"
@@ -28,8 +28,8 @@ COMMONDEPS=">=dev-lang/ghc-6.8
 		=dev-haskell/html-1.0*
 		=dev-haskell/mmap-0.4*
 		<dev-haskell/mtl-1.2
-		=dev-haskell/network-2.2*
-		dev-haskell/parsec:0
+		>=dev-haskell/network-2.2
+		>=dev-haskell/parsec-2.0
 		<dev-haskell/regex-compat-0.94
 		=dev-haskell/terminfo-0.3*
 		=dev-haskell/utf8-string-0.3*
@@ -72,8 +72,18 @@ src_prepare() {
 		"${S}/${PN}.cabal" \
 		|| die "Could not loosen deps on hashed-storage"
 
+	# Loosen dependency on parsec
+	sed -i -e "s/parsec       >= 2.0 && < 3.1/parsec       >= 2.0/" \
+		"${S}/${PN}.cabal" \
+		|| die "Could not loosen deps on parsec"
+
+	# and on network
+	sed -i -e 's/network == 2\.2\.\*/network >= 2.2/' \
+		"${S}/${PN}.cabal"
+
 	# hlint tests tend to break on every newly released hlint
-	rm "${S}/tests/haskell_policy.sh"
+	rm "${S}/tests/haskell_policy.sh" || die
+	rm "${S}/tests/external.sh" || die # relies on example.com layout bug #392647
 }
 
 src_configure() {
diff --git a/dev-vcs/darcs/darcs-2.5.2.ebuild b/dev-vcs/darcs/darcs-2.5.2.ebuild
index 2c76b746341c..fca1343234bb 100644
--- a/dev-vcs/darcs/darcs-2.5.2.ebuild
+++ b/dev-vcs/darcs/darcs-2.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.5.2.ebuild,v 1.1 2011/08/04 21:04:18 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.5.2.ebuild,v 1.2 2011/12/08 20:42:47 slyfox Exp $
 
 EAPI="3"
 CABAL_FEATURES="bin lib profile haddock hscolour"
@@ -57,6 +57,7 @@ src_prepare() {
 
 	# hlint tests tend to break on every newly released hlint
 	rm "${S}/tests/haskell_policy.sh"
+	rm "${S}/tests/external.sh" || die # relies on example.com layout bug #392647
 
 	# use a more recent API, and thus depend on a more recent package
 	sed -i -e "s/findBy/find/" "${S}/src/Darcs/Test/Patch/Info.hs" || die "sed s/findBy/find/ not necessary"