Drop tests/external.sh from tests as it reloes on ecample.com layout. Partially fixes...

Package-Manager: portage-2.2.0_alpha79_p23/cvs/Linux x86_64

diff --git a/dev-vcs/darcs/ChangeLog b/dev-vcs/darcs/ChangeLog
index 9601e449bfd5a977f698322054e4c49c6ed6a5fd..48e89f48f1ffd76a75935e1ce7a905d456fe4782 100644 (file)
--- 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/Manifest b/dev-vcs/darcs/Manifest
index 348b159157b6b2353d422cdea6e0a4c438dcabe1..1e583256d75a8d768bcf206ecf514bdc90b007e4 100644 (file)
--- a/dev-vcs/darcs/Manifest
+++ b/dev-vcs/darcs/Manifest
@@ -9,14 +9,14 @@ AUX darcs-2.5.2-relax-regex-libs-deps.patch 2840 RMD160 48319d80de4e55709d238e69
 AUX darcs-2.5.2-tests-ghc-7.2.patch 708 RMD160 406b9caddc080596eee52276f0ae445cdc01a1e9 SHA1 edda5d6a60d10f4b669126a790f7817f6439a42f SHA256 f54f02114b5ca6477f750d0fb1712d79de61712e97480e54a94b35b6fa660104
 DIST darcs-2.4.4.tar.gz 1193126 RMD160 cec11127740f350d25de7d4f9c7d7df115ebed6a SHA1 96a1907d3b8fd5676074a860359484f251d36e2f SHA256 97cde35ae4b74488f8b98b487bc0498069eaa74fe035903394f3d4aff1da9f9e
 DIST darcs-2.5.2.tar.gz 1231903 RMD160 53e357fb802a72f4b787bf1ca4a6e95e118b08af SHA1 da43ebf64ca4f41b456d5b1fd2038ae0ec5a36da SHA256 8953f9d64f8013876466b8ad5474a212ee4e164f419ba4012b5dcc9e590fb386
-EBUILD darcs-2.4.4-r1.ebuild 4418 RMD160 69b28895a982cff4820a765f5d5482e6dd987404 SHA1 e2c064baaa766d083dce0f12a2eec11d9753af7c SHA256 b1446af2a49ce939769df9f9c623eb1d926c489f9f199834f9a8144035a2f896
-EBUILD darcs-2.5.2.ebuild 3812 RMD160 661bea8197a90a4fb72fe18250c74115ae10c999 SHA1 8b7ffae31dfd4d96a1ba61d1b6f16a426f576133 SHA256 c5882f1d13b81a7dcefae495bbc062dd80d503931835224d94d95df2b1f563a4
-MISC ChangeLog 21041 RMD160 1b7b4956509bbebe1ae54bb29e00b152f252c88b SHA1 81f304724106788165ec28bb4063aeb3a109a426 SHA256 b70f6b40477432970ad9b30b5ba082f5e41cc5588566fe4a8bed05a9afd7821a
+EBUILD darcs-2.4.4-r1.ebuild 4775 RMD160 293be07e6fa79157d11e42bc0a4794ca080b958f SHA1 0b92034508b0f529dddcaabd7997671a066db4f5 SHA256 f557d2fd7f898d3aeaf40205fdd5dfdf6355b6326086245fafbe31154f2c9a6a
+EBUILD darcs-2.5.2.ebuild 3891 RMD160 217419e560220d9f7b65fc362758f27affdf564f SHA1 50382500c41dd09293e75430e54d2f432ed09f78 SHA256 7476c310a812a41b03a44a9cd509bdf28aeb8ea72cf4665d9fac8c711bcc236e
+MISC ChangeLog 21265 RMD160 4b6cc072cff99e8f5f1a40379e0522f7e7e549e3 SHA1 3efa9a5162e8fa8f64aaa51aa16f651d7601ed1e SHA256 11ed4f577f1072c0521cd61ffce635cc63b1673d908b8c03f004163f526b22a0
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk47CiMACgkQcaHudmEf86oh5QCeOYyYlr9XQUU8rSJBotfnR5vt
-f8sAoIjZGVs3/Hw2qWpGMPeT1glcq2mv
-=8n6Q
+iEYEARECAAYFAk7hIkoACgkQcaHudmEf86oHtQCbBk/19I9CE3dO7HVQBKs+Hr9h
+pl8AnjFYfRYsXi1PJNCUs0/FAlf0/Xvi
+=J0Rv
 -----END PGP SIGNATURE-----

diff --git a/dev-vcs/darcs/darcs-2.4.4-r1.ebuild b/dev-vcs/darcs/darcs-2.4.4-r1.ebuild
index ddcde6b42ea1ed855c73857a831aafa779c6a452..0df0f85a5ad3829867f715a865d39d42d9d79eea 100644 (file)
--- 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 2c76b746341c66a3bc468c1efb1e6a6b9a876062..fca1343234bb0ef652ca95d92be5953388e6734e 100644 (file)
--- 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"