Undo ghc-6.6-specific changes to darcs ebuild, hopefully fixing bug #150326

Package-Manager: portage-2.1.1

4 files changed, 30 insertions, 24 deletions

diff --git a/dev-util/darcs/ChangeLog b/dev-util/darcs/ChangeLog
index 033a9b3acbee..72bdad53136f 100644
--- a/dev-util/darcs/ChangeLog
+++ b/dev-util/darcs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/darcs
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/ChangeLog,v 1.59 2006/10/06 18:11:37 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/ChangeLog,v 1.60 2006/10/07 10:08:46 kosmikus Exp $
+
+  07 Oct 2006; Andres Loeh <kosmikus@gentoo.org> darcs-1.0.8-r1.ebuild:
+  Undo ghc-6.6-specific changes to darcs ebuild, hopefully fixing bug #150326
 
 *darcs-1.0.8-r1 (06 Oct 2006)
 
diff --git a/dev-util/darcs/Manifest b/dev-util/darcs/Manifest
index 586734765e67..881604b16dea 100644
--- a/dev-util/darcs/Manifest
+++ b/dev-util/darcs/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST darcs-1.0.4.tar.gz 950528
+DIST darcs-1.0.4.tar.gz 950528 RMD160 5b8e4b2396c1cd7a373e103aa90d8a47802a43de SHA1 71ab71a9fa94db74ba3b79fa65b797a129a652f2 SHA256 a75d9a4eaf4a4993d733b742238ab0a2b4e79359ba9a9e695c8c7de6c9d8a9df
 DIST darcs-1.0.5.tar.gz 944888 RMD160 453dc7282d2751c0b862cf74bd095b63b927e5d7 SHA1 49512ba28c1724adba9eef4a9e3f7e104b7634f9 SHA256 9e71bfdab2be413b43219bdd10f8e79a3b496d542eb447d910b2708f8a6663a9
 DIST darcs-1.0.6.tar.gz 963609 RMD160 271f5f965a1ccd7428877a06349c8d9d39d74658 SHA1 d45bb51718225525b92b0efc57000ce4c50f49ce SHA256 8296f91934cfff4721356549db0d2f403fcc796ae424307c76afd33101090752
 DIST darcs-1.0.7.tar.gz 1009946 RMD160 01cbde260718b5e16475047b3ed801c8d52507df SHA1 31e9048b223c9cf3bd33102419a63034255071b0 SHA256 8d9e60f67e937f344332458cd58f46545d1348c8427b76ece2f3541661732e94
@@ -22,21 +22,25 @@ EBUILD darcs-1.0.7.ebuild 1547 RMD160 8b1ca044013ad1f76d7cbda11525ffd921e9aedb S
 MD5 9bf8b4019c1523d56beb9b2bdf127a7f darcs-1.0.7.ebuild 1547
 RMD160 8b1ca044013ad1f76d7cbda11525ffd921e9aedb darcs-1.0.7.ebuild 1547
 SHA256 a06b1fbbf1d0981867168ee5141e6401583d61d23f0c5721f58431f55d3490dc darcs-1.0.7.ebuild 1547
-EBUILD darcs-1.0.8-r1.ebuild 2063 RMD160 00e8934eb420e8b8170ae003b557bb2377da8884 SHA1 5c416311b71bfff38fa14bf0bb05081137f729ec SHA256 afaf86b8f164fd9ff50f066671b4e66b3bd3ccbd00a4a6bc61e93af9d4a9aef1
-MD5 5b14257b0282fbe7d265839dab7acb69 darcs-1.0.8-r1.ebuild 2063
-RMD160 00e8934eb420e8b8170ae003b557bb2377da8884 darcs-1.0.8-r1.ebuild 2063
-SHA256 afaf86b8f164fd9ff50f066671b4e66b3bd3ccbd00a4a6bc61e93af9d4a9aef1 darcs-1.0.8-r1.ebuild 2063
-MISC ChangeLog 8333 RMD160 6df8e7c2079e03ccba975f990a5b7a1da8929915 SHA1 4cd6422e953d7d24986b3c623c4a0373aa8e6412 SHA256 2ee9311c2deefddfe3db510e708e901113cd12dab3c7892089ed733a83fb45bf
-MD5 3d868e122791925ee2ae7cbf646a20ec ChangeLog 8333
-RMD160 6df8e7c2079e03ccba975f990a5b7a1da8929915 ChangeLog 8333
-SHA256 2ee9311c2deefddfe3db510e708e901113cd12dab3c7892089ed733a83fb45bf ChangeLog 8333
+EBUILD darcs-1.0.8-r1.ebuild 1949 RMD160 0dd5d8f9769457ed109ccac45e93cc74f56e84c9 SHA1 7843d0e525665bc452909fd31da888932a222aa4 SHA256 cefb2745ba5eb94ee1fe7d3b3452072f2dbca269564101e3a4bf2ec532df8192
+MD5 44851ad90f8d7490832796da47e88ec8 darcs-1.0.8-r1.ebuild 1949
+RMD160 0dd5d8f9769457ed109ccac45e93cc74f56e84c9 darcs-1.0.8-r1.ebuild 1949
+SHA256 cefb2745ba5eb94ee1fe7d3b3452072f2dbca269564101e3a4bf2ec532df8192 darcs-1.0.8-r1.ebuild 1949
+EBUILD darcs-1.0.8.ebuild 1548 RMD160 c3187d513464599809fd316470c50802a65f2e4b SHA1 37678e56738cc3731bdf7862732d5439f9f8b530 SHA256 4fb1da88eff362959e90a87583d74024b9b33b4dbebf6367fc46ebeba8f0822d
+MD5 b62bb7eccbffdcf5c69c28da9b6a4dc6 darcs-1.0.8.ebuild 1548
+RMD160 c3187d513464599809fd316470c50802a65f2e4b darcs-1.0.8.ebuild 1548
+SHA256 4fb1da88eff362959e90a87583d74024b9b33b4dbebf6367fc46ebeba8f0822d darcs-1.0.8.ebuild 1548
+MISC ChangeLog 8486 RMD160 d29ae5a96f446275608e44957abf7cc8890448b3 SHA1 513b485cdbc55189a8bdb7566c59ebea8cdc155e SHA256 582e344424ed46526c2cc127fb6300b7005b4e826ae8a3092165e115fa6f9c17
+MD5 cd8f36718612faa549133ac922b7dc02 ChangeLog 8486
+RMD160 d29ae5a96f446275608e44957abf7cc8890448b3 ChangeLog 8486
+SHA256 582e344424ed46526c2cc127fb6300b7005b4e826ae8a3092165e115fa6f9c17 ChangeLog 8486
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 metadata.xml 223
-MD5 da9a5baba3176cbc6ba4df0190fc4b00 files/digest-darcs-1.0.4 63
-RMD160 7a965f23f82e487b5f0b7c6201b49415acad6c46 files/digest-darcs-1.0.4 63
-SHA256 e594931d5eefc8d761090c701b769e80a803882313a564f50a36bba79f76de0f files/digest-darcs-1.0.4 63
+MD5 ecedd24bd20a95b1420dedd94380ec65 files/digest-darcs-1.0.4 235
+RMD160 a473bfc61c2e598d029d979b994123deb35ab313 files/digest-darcs-1.0.4 235
+SHA256 6203c83f9664b280ed431fef9655fe121c39e86d643ff91b430fb7654fec4636 files/digest-darcs-1.0.4 235
 MD5 dbaaee27c0e5da1ed7c38beb2bb7bde2 files/digest-darcs-1.0.5 235
 RMD160 8d4336ed3ea5d3e9837408851fefdbb5374d2ab6 files/digest-darcs-1.0.5 235
 SHA256 e0114817178b86370733e1e205b954eb02dfa7e12d7e914f22909cfaa1d8c496 files/digest-darcs-1.0.5 235
@@ -46,13 +50,16 @@ SHA256 eada088f6174c90239d3df11a18728a2a5924c8244365600c6ebc43454d2ea13 files/di
 MD5 09aa6cf36df74b25968244a6248e4501 files/digest-darcs-1.0.7 238
 RMD160 af6d866f974191db72db2235e2b1195a05fc3e55 files/digest-darcs-1.0.7 238
 SHA256 f60ab21abc29fb110593b246c79dfc211e38c9bfa02f0e0d2b9f78f43fc389b4 files/digest-darcs-1.0.7 238
+MD5 83f45e19da5d23604c31048791a460e5 files/digest-darcs-1.0.8 238
+RMD160 1f85d2e7120631f84465e1aca08b5b71a38df228 files/digest-darcs-1.0.8 238
+SHA256 89551bc6771ab740ee0edfa2a2648e105bc5b20cb61386a46d20e15b38a62b0e files/digest-darcs-1.0.8 238
 MD5 83f45e19da5d23604c31048791a460e5 files/digest-darcs-1.0.8-r1 238
 RMD160 1f85d2e7120631f84465e1aca08b5b71a38df228 files/digest-darcs-1.0.8-r1 238
 SHA256 89551bc6771ab740ee0edfa2a2648e105bc5b20cb61386a46d20e15b38a62b0e files/digest-darcs-1.0.8-r1 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFJp00aTNpke9pJcURAg4DAJ9OrLGvLK4xaXiuMqilqDY/v+hVjACfRJtx
-W+661Iq57M+VlwMiJOB83Gw=
-=1wYV
+iD8DBQFFJ315OKSBj1ObwosRAlDMAKCCCDpsL41STBVnlXVuA2FSCChNMACeNjTL
+X3Xe/juJYwpBW/1nqZd01G4=
+=c60r
 -----END PGP SIGNATURE-----
diff --git a/dev-util/darcs/darcs-1.0.8-r1.ebuild b/dev-util/darcs/darcs-1.0.8-r1.ebuild
index a733986f12d9..3241bb5d230e 100644
--- a/dev-util/darcs/darcs-1.0.8-r1.ebuild
+++ b/dev-util/darcs/darcs-1.0.8-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-1.0.8-r1.ebuild,v 1.1 2006/10/06 18:11:37 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-1.0.8-r1.ebuild,v 1.2 2006/10/07 10:08:46 kosmikus Exp $
 
-inherit base autotools
+inherit base
 
 DESCRIPTION="David's Advanced Revision Control System is yet another replacement for CVS"
 HOMEPAGE="http://abridgegame.org/darcs"
@@ -29,9 +29,6 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
 	base_src_unpack
 
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-ghc66.patch"
-
 	# If we're going to use the CFLAGS with GHC's -optc flag then we'd better
 	# use it with -opta too or it'll break with some CFLAGS, eg -mcpu on sparc
 	sed -i 's:\($(addprefix -optc,$(CFLAGS))\):\1 $(addprefix -opta,$(CFLAGS)):' \
@@ -43,9 +40,6 @@ src_unpack() {
 }
 
 src_compile() {
-	# Since we've patched the build system:
-	eautoreconf
-
 	econf $(use_with doc docs) \
 		|| die "configure failed"
 	emake all || die "make failed"
diff --git a/dev-util/darcs/files/digest-darcs-1.0.4 b/dev-util/darcs/files/digest-darcs-1.0.4
index c7cf8f0e8e0e..4f0227d1d1ad 100644
--- a/dev-util/darcs/files/digest-darcs-1.0.4
+++ b/dev-util/darcs/files/digest-darcs-1.0.4
@@ -1 +1,3 @@
 MD5 0be693b00e4b1bd24906d4f479e78923 darcs-1.0.4.tar.gz 950528
+RMD160 5b8e4b2396c1cd7a373e103aa90d8a47802a43de darcs-1.0.4.tar.gz 950528
+SHA256 a75d9a4eaf4a4993d733b742238ab0a2b4e79359ba9a9e695c8c7de6c9d8a9df darcs-1.0.4.tar.gz 950528