diff options
author | Sergei Trofimovich <slyfox@gentoo.org> | 2012-12-24 21:39:48 +0000 |
---|---|---|
committer | Sergei Trofimovich <slyfox@gentoo.org> | 2012-12-24 21:39:48 +0000 |
commit | 9d45294f1aea979d7f8de9ce2edb5db61c1ccbdb (patch) | |
tree | 08dad73281fae83f4b4cb12e49285b79c585643e /dev-vcs/darcs | |
parent | Migrate to distutils-r1. Restrict python2.5 as reported by dol-sen. (diff) | |
download | historical-9d45294f1aea979d7f8de9ce2edb5db61c1ccbdb.tar.gz historical-9d45294f1aea979d7f8de9ce2edb5db61c1ccbdb.tar.bz2 historical-9d45294f1aea979d7f8de9ce2edb5db61c1ccbdb.zip |
Removed old.
Package-Manager: portage-2.2.0_alpha149_p1/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA
Diffstat (limited to 'dev-vcs/darcs')
-rw-r--r-- | dev-vcs/darcs/ChangeLog | 13 | ||||
-rw-r--r-- | dev-vcs/darcs/Manifest | 22 | ||||
-rw-r--r-- | dev-vcs/darcs/darcs-2.4.4-r1.ebuild | 146 | ||||
-rw-r--r-- | dev-vcs/darcs/darcs-2.5.2-r1.ebuild | 126 | ||||
-rw-r--r-- | dev-vcs/darcs/darcs-2.5.2-r2.ebuild | 127 | ||||
-rw-r--r-- | dev-vcs/darcs/files/darcs-1.0.9-bashcomp.patch | 18 | ||||
-rw-r--r-- | dev-vcs/darcs/files/darcs-2.4.4-issue1770-curl_multi_perform-no-running-handles.patch | 38 | ||||
-rw-r--r-- | dev-vcs/darcs/files/darcs-2.4.4-tests-emailformat.patch | 39 | ||||
-rw-r--r-- | dev-vcs/darcs/files/darcs-2.5.2-ghc-7.2.patch | 142 | ||||
-rw-r--r-- | dev-vcs/darcs/files/darcs-2.5.2-ghc-7.4.patch | 139 | ||||
-rw-r--r-- | dev-vcs/darcs/files/darcs-2.5.2-mtl-2.1.patch | 38 | ||||
-rw-r--r-- | dev-vcs/darcs/files/darcs-2.5.2-relax-http-libs-deps.patch | 38 | ||||
-rw-r--r-- | dev-vcs/darcs/files/darcs-2.5.2-relax-regex-libs-deps.patch | 69 | ||||
-rw-r--r-- | dev-vcs/darcs/files/darcs-2.5.2-tests-ghc-7.2.patch | 26 |
14 files changed, 16 insertions, 965 deletions
diff --git a/dev-vcs/darcs/ChangeLog b/dev-vcs/darcs/ChangeLog index 4bbbdfb46109..90bbff78eeeb 100644 --- a/dev-vcs/darcs/ChangeLog +++ b/dev-vcs/darcs/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for dev-vcs/darcs # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/ChangeLog,v 1.41 2012/12/10 21:53:53 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/ChangeLog,v 1.42 2012/12/24 21:39:39 slyfox Exp $ + + 24 Dec 2012; Sergei Trofimovich <slyfox@gentoo.org> -darcs-2.4.4-r1.ebuild, + -darcs-2.5.2-r1.ebuild, -darcs-2.5.2-r2.ebuild, + -files/darcs-1.0.9-bashcomp.patch, + -files/darcs-2.4.4-issue1770-curl_multi_perform-no-running-handles.patch, + -files/darcs-2.4.4-tests-emailformat.patch, -files/darcs-2.5.2-ghc-7.2.patch, + -files/darcs-2.5.2-ghc-7.4.patch, -files/darcs-2.5.2-mtl-2.1.patch, + -files/darcs-2.5.2-relax-http-libs-deps.patch, + -files/darcs-2.5.2-relax-regex-libs-deps.patch, + -files/darcs-2.5.2-tests-ghc-7.2.patch: + Removed old. 10 Dec 2012; Sergei Trofimovich <slyfox@gentoo.org> darcs-2.8.0.ebuild: stable on alpha/ia64/sparc (bug #421351) diff --git a/dev-vcs/darcs/Manifest b/dev-vcs/darcs/Manifest index 4c600ceac19b..5bd5952005d8 100644 --- a/dev-vcs/darcs/Manifest +++ b/dev-vcs/darcs/Manifest @@ -1,34 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX darcs-1.0.9-bashcomp.patch 510 SHA256 39a7e531f68ee4b71958d52557e6c6ace0c7717d546dcddccc4a5e7fb5daeff6 SHA512 9704c62d3a12ad6d9d9504e83106ecd46c87db51f1374821e202e7afdf1c5586fd62a65400602b10b3def8636da2eb2cd142759dfa66cb1b81b897a43b37b173 WHIRLPOOL 2591d788a57ff5f84ba05c4b73aeb11384840ad5f8043143a7eac2a3fad1a6958f5a5992cabbd97e0e38d8d298f387b6a829243ac7717197ba137871e3b22dfc -AUX darcs-2.4.4-issue1770-curl_multi_perform-no-running-handles.patch 1617 SHA256 9716fad28813bae04e06c8a039c9e5cb094cbd0c4907855142e14c49334d387e SHA512 611ae6be4040bb0bb667df41a2cc8a83bcc7060ef265a96890017dc983c048cfd4b1e95adf8734bc4c93cb1d4e57ae40d52b30fef26a778496ad29da40398b76 WHIRLPOOL dc532a1135ac88a065a825f024fe4abc42be835d6d96132df6af197caf0c3167c013760ab29de42c7d6ebea162f79be390e17663cdc9fd8ce60d8343b9a694dc -AUX darcs-2.4.4-tests-emailformat.patch 1177 SHA256 6bd35d0c790d4fc583f650cccc433f5005036c06f4de3f139f685e5957b35835 SHA512 131d79b2a70ae90a85d8a8d5f3ed149a1354718e4dbd098b399d79e390c3f4021428a47688ad1cfa3352a6c9fea5897e6747361df7b8f001aac1ac48bfc3915c WHIRLPOOL a14d663a1fcb9ca5ca7bfdd7deb125292f28f692e0531221aa57a19e3119a88daa27290f418ca3abf8c4f8a1914333dea0d231884dab5009bd3f47884621d45d -AUX darcs-2.5.2-ghc-7.2.patch 5084 SHA256 7c5d189ba1377e881a500852cb823a10672ee3eac0b04fc6d6888f5f3fda3ba4 SHA512 619b4f91e4590520023f700540010960455fb2b4a2b92ef1b836615fc21c3349d64b0b28377776c06c81afaa9f552418cf416e6fdf17ba4d7eeb7406b4fe4c1c WHIRLPOOL 6b42be11db35fb51970ee75fb01b8a8be0451631dd879d6553dbd0ed5ca9711a79d14bf738d812304c4749589b15710aed0148156d924e929a33ffd506e6d939 -AUX darcs-2.5.2-ghc-7.4.patch 5501 SHA256 5927b96f6ff827e55c2afa43c92ba4dc1af91c470925c2e93b5962210e64584f SHA512 52c09cafbaf4930728d630056a4e8799fafcbbfee8b561ec9a27aad4429177bfabfd1aba0c4b5ff1efd8d42bf37368d0fd440ee4c9bdb9ee6c0c0fd807e93a9c WHIRLPOOL a3598344eeac4f666cce9aa6ec7ff1338cefd006e7da303743362fef0616d82d3a8361f7499f680271d5732a7a1564c005d9d1852224713ee103a3bcc8ab77f8 -AUX darcs-2.5.2-mtl-2.1.patch 1865 SHA256 887c64bbed82302e46d322efcd26a6c3a1d284a09cbf066eb94bf7ef53194845 SHA512 d57f31a796b50e9727558d3ce5b0a20be38228ad664af8cfe02f2209dca5ad7f22f7959820e19d0608aaafcb8fa70536a41035d4b04b84fa5d3d2dc6a7ee4701 WHIRLPOOL da855cfb0efdd3a85df8d28810cc5baa52ddc220464f0429263f26a3c5d151a403141080c6e57d28bceb85ad9cce0df90fc0c298f3c230a1e5593a4c913487ef -AUX darcs-2.5.2-relax-http-libs-deps.patch 1237 SHA256 300450943c78c12929ea7a5005b9927d9d9fa33a70aea8634709442652880736 SHA512 575c00c8bfc3cdd4e7790f0c69a3028bde247a7afd8017b99da78d303c6989a4d5f2b9d2d727020e01f05781969eb5616b2e4ddfdb207c608123631b7c8e0f37 WHIRLPOOL 78826634efeb7fe3ecc6117ff71924d0360d1d35eb289f32f681e30415768e2c3df7e70cb65acf205c8d0003db6f869a90099acb77ee807cfbcc399540ba8c27 -AUX darcs-2.5.2-relax-regex-libs-deps.patch 2840 SHA256 fe32930704bbd411b0a65a6a378c7a9700257f165e8edad889b53ad227620b1a SHA512 ee0510a0c971a5f15266ac070b608bc8fc2997e4a164115a0f7bec2b50ffb2614011d668c1a50c830d6049f2e03a8f35d1e67c7b93834f73756a0dd96c0f9500 WHIRLPOOL f3a94ee4bf5d61d8669eff7034843a5325f1ab5c43dd0cd8f0b039a7c5b944e26bfc5e326d7519c3f64024f33774b2c3f67579020deb5ecf7ddc6e9875ca1e0a -AUX darcs-2.5.2-tests-ghc-7.2.patch 708 SHA256 f54f02114b5ca6477f750d0fb1712d79de61712e97480e54a94b35b6fa660104 SHA512 0b2323830a3089fb6310eded9a2e8ab3dcc184cd3df750ca370aeb0840c4614b482f3fdd95f2227486064be4b3dce7d36e8d64e1d2728a9f332e694c5a420aea WHIRLPOOL 9ec8e3a248ddea9cdde5dd539ce4fb044256aca367474ecbc16d54bdd54a8a0114bc9925f8cfaa39248a6333c5f24df0a00cd955d5a1248019137b26f20bdd19 AUX darcs-2.8.0-mtl-2.1.patch 1289 SHA256 50798b5d69b4600c3c9d15acdf4476b8a3764afb4d746e28eb79c9381bc3ae7b SHA512 bf3694cf774083a64c25038dd38be80e23125d4e41e34fda1b56b629e3c54152a5f781e252ab8187cd8c67480892a75624c77fc81e6a0e1927b8efacc3840cb9 WHIRLPOOL c5cc78e8feaa144dda546678e753d5102a92735af59c5455fe79db77207cece791093729f460c319d0d167d7b0506dedfeeb89c04d987cae17e646372e43dbcb AUX darcs-2.8.1-tar-0.4.patch 1329 SHA256 feccf9f2e149aa672fa6f32eb61400340a3e2a05013f355a04ce6057746bdb62 SHA512 0e9cc2650dc3b013935ea8db4d1dd9fd7f375c538f636ed5cfa4bdf9851ee4fd857efe4792bf76564b16ac9f93b46652c433d8f63affe29981bd154a40e43970 WHIRLPOOL 54d7e4fb5e89da7e6375144d1cb7741278c765bcd96cb58e5d4fe4b8193cfe35bca118ef205d8f8e93354f5f4be34762b7d49f884a12ec51b7deeea80ccabc50 AUX darcs-2.8.3-ghc-7.6.patch.bz2 9380 SHA256 edcbcc3d5d0d5c51d5938b4926338241a551a2ccf4bbeb5cd781e36e8353f56e SHA512 c566a11ea08e9b88e24876aaabe08cd4e82dc1f6d2e6e6da24c969f0d3097493bfea6628641b216e3b184946b42032569760fe54a2b5dfb6508707b062248a2b WHIRLPOOL 03cdcd1a496ad9890d45a0bca921fde32d6a213435aafc5478d45490774f2d732255ae6221974d690e337087871dbb0182e4e71041cb00a01da6951759ed678e AUX darcs-2.8.3-hack-for-haskeline-0.7-breaks-non-utf8.patch 2425 SHA256 9fbb97f7437fca405c496937463f54cb0a78a0923da04887d05ff03083196a3a SHA512 60d17ca7b620979be0b45dcdec2f9590a86fa4042c5e30d7f9f623cb6653d6e8a2f5ee0541b45184c761a6516d76fc21a74001f1ac5165e0c8b2ab040aa1b456 WHIRLPOOL 8a7bc95bdf903c2531993414ad8fff39aacac9f304d17a466c4494bc59ed0148ba2465dd1d4a56984861cbf618b7adecae0af4185672e01abb753700a92c9b82 -DIST darcs-2.4.4.tar.gz 1193126 SHA256 97cde35ae4b74488f8b98b487bc0498069eaa74fe035903394f3d4aff1da9f9e SHA512 6b611b80c8d14b5784fc11efbf1da6a8377f9d8eca8a1607073fc751d35d42f5097556497c970da1b22900a1c80d76303538223803f4fd6699bb847dc2c4cc36 WHIRLPOOL 5ce62a807bfc8795fc3a4ead6edcea464e55f8ae092b26fff3f761ca416e0db1eeac2ea48b50f2d493f858dcac68806e16d1b7e277de5702a50f0fa53ae838ba -DIST darcs-2.5.2.tar.gz 1231903 SHA256 8953f9d64f8013876466b8ad5474a212ee4e164f419ba4012b5dcc9e590fb386 SHA512 6203f7280436a15e94dc0744d8a7d24bc61f9c2f4bc32a7f29d38172b3e3c093aedf19b6931330d0aeb0a9aa907f4de6ba88ff01968fc5f86858ff9468f9d237 WHIRLPOOL f92bf86caffcc296f8ac4bcaf9fe7772f0c41050417b1b6143706af7c36cb9f31665cdfa87ef1af522800e6d659a9cc0c1d6a25e757be7d81c66ac42eaaa2813 DIST darcs-2.8.0.tar.gz 1297733 SHA256 1415c2a1a99db8cf76d5f31f6a3490a2a9d3e13f2abfcc67fc108885cf52ce83 SHA512 a944afad043a4ec21a88f090c7678dfc6790c1fd3ee07e8a10a63e0ee23de05460c585a0b542bf47c2fe1a007125da86c1a45db198b425f866b198eb6b4dcf64 WHIRLPOOL 10eba204757ec859b764cab4f4e2260d67d948f97d2b01c7b4bfc2952f218b9dc0575760e27ce02ba0844e1193a987036a69e6696a7e725ac66a44779bc718d7 DIST darcs-2.8.3.tar.gz 1289187 SHA256 90750842926750cd60a97c61f8ba08e90faffdcb11478d10617a3d5d62216f59 SHA512 2cb997146077668b082e1302a54f728539c33088a42c034de10b0a87f00b49a95405feeaff58f601265c880f92d5b5fb37a041bb4fbf26c36f6964c0a3a40996 WHIRLPOOL 895a46c8a6d6dae8da9f094f881f830e17613359f3bddfb6d6f08bd11112c796a1139671795729c6e1c58f19f353f35172de5ccc89553698a882d266b1d4e90f -EBUILD darcs-2.4.4-r1.ebuild 4872 SHA256 feacaf6aaedaeb93771e61c691ef451445b9fb0a313a7b836872c2c2717d4361 SHA512 ac336de11496571542fc86179bdf3377fd4078233d6221b94b90399f2d6aec30f893029bbb1c488146878904073e66cccec2ccf7d7b590bde89fa6e1f757e913 WHIRLPOOL a4fb14bed147231864836648c08ddf4925e089c6c9e2d039114f39e86d6c1e3a82535aae604a729438a7ded8665a70143605e955a8fbf23cd808993971cf019d -EBUILD darcs-2.5.2-r1.ebuild 4197 SHA256 f348cb65e81491f050e51d8e3ee7e996c28586cbe4cff96f1ccf44a2639f9ec0 SHA512 43ba5ed5f0ed0d8857b7e08ecbadb47e2ebef87e8785b269865df54415f2b822d3b31a33a2e9a2802b308441ce54dde746c948d3c52cfa8a96113270145c9303 WHIRLPOOL 5861d5c33f6fd192100717dbdb7a8d4bedd2197b27c8736ad501b460247233f4ef43e0bdd3e9124cd9ef65b911183e3725dd7a3b351b5d27941a99863c90a570 -EBUILD darcs-2.5.2-r2.ebuild 4245 SHA256 49aa67c60cb2077ad36ab962bbc3fecc0cea866ebcd18f614afe878b7021bfdc SHA512 b5bbd4c5558a12cb5fb7e3f06cb3c9a6f07dd9e1dac9f59d07bdd9df0c7eac4ed248ce064a6ee535bf61d1211cfb7b3732dcd04b93f198bf420cd4b50e174de7 WHIRLPOOL e91b75eb82dbc37809687638c79ecbb530973eb12513167109a9c283990eceb6c90544fa0eabd9123ac3c1390c3727cfc0af00e62cebccc259ee78d70c238f0b EBUILD darcs-2.8.0.ebuild 4054 SHA256 9227dbddf1d0167b768ea4ef82ffdf4a81e3e1da7b81ff6af04429f6e92eb654 SHA512 88a7b2bd3e9aec2c2ccf81778cb002fe0135d3302ca26446d86f67b1215959e20e3786cd052643a8c81624451afd8a8a537458ebc10e9d89a63f1f973c4a0477 WHIRLPOOL 9f909b7b5fa4ca4b7f01c24b1b75f22616748d20499a1915a0213d5d542d0f869d2427bc928e598a943293014a9d1e90aed29e86dda5cde0d6ef39a033ebf9f9 EBUILD darcs-2.8.3-r1.ebuild 4714 SHA256 2dcf99391c6b502f81d94bee46d50b8da5eec92282746da649a79291a242c0fa SHA512 8d953e9bbc2d13f87c4a6b609ab2096d9c80762d72e484ce58f72a4c082eb26fb68b0038a78c43cba96e48a1866c8a556a2545350d784669963e57152fb07632 WHIRLPOOL 89536bb48d49951330dabb2603eccfec9b566bba131480cebf5218022649fc998e84294284b7c30b661ea91d4915d2502ee8e7a0a24e5b3ea6eb049e437bff57 -MISC ChangeLog 24409 SHA256 3425e1dd332ba851fa2f560bc508cd776b6ab1e0c005f9d09533f906283a91d4 SHA512 bbe7472401cb94f4fb5b154a4462f3bdfc67d87f942493594b9c15fc7204a34a163e5622419cf5cc4204edfa33befb2622dd9549d0805292af1f3656e1d342fb WHIRLPOOL 48c840d61f63f4ab074c2ed3007391357b953931fe2ee95efcaa9d2033cf82e3e18f6d963851c23bef45e64fe8694d75e89d9a2585ceceb900ceb6939229e4c4 +MISC ChangeLog 24957 SHA256 97b51ed3bdaca3b654ee69adf58f9b3f8cb8748309d30309c64c3c6775b10c63 SHA512 639324e6164607179cbdbfde62f483edb17c630fa8111f5e04005d94d58d737e7337ba7e789bf1ec8e6f352b5090a6b5dd40706688142b257c5980353168b98a WHIRLPOOL 8959cb29dbd80db575bfed1dd7bd37689a58ed67d0c5d9f3f8cb9c2efd68e9bf0ba7978e09f11bda7bb803f497b456f4e43ca8b6735957848521054bd669db99 MISC metadata.xml 223 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 SHA512 24765bbf1cb187cd262aa7fb3824c1cec65e2bf3f2198099de688916d96401a26458265b15408f22b1fbd6d6a2842df814a57ceda80dfa00d130b24423b7544f WHIRLPOOL 8fd6700f6198db6540eb51edf11372faeb6eb8a542a692e515badf236f62444f2c180f7d08e0f98e9fdfa23de14631b31af50543469aaa27084d6b637e2644c7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlDGWecACgkQcaHudmEf86o0gQCfam5JQjgxxx8vA5pRC6Fy8/pz -B3MAoIKiNnUivq+/x3aCr5gfuEM/sehu -=TwIC +iEYEAREIAAYFAlDYy4oACgkQcaHudmEf86qqfACcCn9BGs9UlQAJaUFFH1Ac1khj +SCUAn3z+ZXMWN0dJEGNASegaYbiv3ZAU +=Ev5Y -----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 deleted file mode 100644 index 2f06cfb9968f..000000000000 --- a/dev-vcs/darcs/darcs-2.4.4-r1.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2012 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.18 2012/09/12 16:10:06 qnikst Exp $ - -EAPI="3" -CABAL_FEATURES="bin lib profile haddock hscolour" -inherit haskell-cabal eutils bash-completion-r1 - -DESCRIPTION="a distributed, interactive, smart revision control system" -HOMEPAGE="http://darcs.net/" -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" -IUSE="doc test" - -# Dependency notes: -# 1) Use a cunning trick for hashed-storage, haskeline, regex-compat -# where the min bound is the lowest version available. -# 2) Do the opposite for zlib: highest not available. -# 3) Prefer curl over HTTP since darcs uses an old version of HTTP. -# 4) Use the same bounds for mmap as hashed-storage. - -COMMONDEPS=">=dev-lang/ghc-6.8 - >=dev-haskell/hashed-storage-0.4.13[profile?] - =dev-haskell/haskeline-0.6*[profile?] - =dev-haskell/html-1.0*[profile?] - =dev-haskell/mmap-0.4*[profile?] - <dev-haskell/mtl-1.2[profile?] - >=dev-haskell/network-2.2[profile?] - >=dev-haskell/parsec-2.0[profile?] - <dev-haskell/regex-compat-0.94[profile?] - =dev-haskell/terminfo-0.3*[profile?] - =dev-haskell/utf8-string-0.3*[profile?] - <dev-haskell/zlib-0.6.0.0[profile?] - net-misc/curl" - -DEPEND="${COMMONDEPS} - >=dev-haskell/cabal-1.6 - virtual/pkgconfig - doc? ( virtual/latex-base - dev-tex/latex2html ) - test? ( dev-haskell/test-framework[profile?] - dev-haskell/test-framework-hunit[profile?] - dev-haskell/test-framework-quickcheck2[profile?] ) - " - -# darcs also has a library version; we thus need $DEPEND -RDEPEND="${COMMONDEPS} - virtual/mta" - -pkg_setup() { - if use doc && ! built_with_use -o dev-tex/latex2html png gif; then - eerror "Building darcs with USE=\"doc\" requires that" - eerror "dev-tex/latex2html is built with at least one of" - eerror "USE=\"png\" and USE=\"gif\"." - die "USE=doc requires dev-tex/latex2html with USE=\"png\" or USE=\"gif\"" - fi -} - -src_prepare() { - pushd "contrib" - epatch "${FILESDIR}/${PN}-1.0.9-bashcomp.patch" - popd - - epatch "${FILESDIR}/${P}-issue1770-curl_multi_perform-no-running-handles.patch" - epatch "${FILESDIR}/${P}-tests-emailformat.patch" - - # Loosen dependency on hashed-storage - sed -i -e "s/hashed-storage == 0.4.13/hashed-storage == 0.4.*/" \ - "${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" || die - rm "${S}/tests/external.sh" || die # relies on example.com layout bug #392647 -} - -src_configure() { - # checking whether ghc supports -threaded flag - # Beware: http://www.haskell.org/ghc/docs/latest/html/users_guide/options-phases.html#options-linker - # contains: 'The ability to make a foreign call that does not block all other Haskell threads.' - # It might have interactivity impact. - - threaded_flag="" - if $(ghc-getghc) --info | grep "Support SMP" | grep -q "YES"; then - threaded_flag="--flags=threaded" - einfo "$P will be built with threads support" - else - threaded_flag="--flags=-threaded" - einfo "$P will be built without threads support" - fi - - # Use curl for net stuff to avoid strict version dep on HTTP and network - cabal_src_configure \ - --flags=curl \ - --flags=-http \ - --flags=curl-pipelining \ - --flags=color \ - --flags=terminfo \ - --flags=mmap \ - $threaded_flag \ - $(cabal_flag test) -} - -src_test() { - # run cabal test from haskell-cabal - haskell-cabal_src_test || die "cabal test failed" - - # run the unit tests (not part of cabal test for some reason...) - # breaks the cabal abstraction a bit... - "${S}/dist/build/unit/unit" || die "unit tests failed" -} - -src_install() { - cabal_src_install - newbashcomp "${S}/contrib/darcs_completion" "${PN}" - - rm "${ED}/usr/bin/unit" 2> /dev/null - - # fixup perms in such an an awkward way - mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found" - doman "${S}/darcs.1" || die "failed to register darcs.1 as a manpage" - - # if tests were enabled, make sure the unit test driver is deleted - rm -rf "${ED}/usr/bin/unit" -} - -pkg_postinst() { - ghc-package_pkg_postinst - - ewarn "NOTE: in order for the darcs send command to work properly," - ewarn "you must properly configure your mail transport agent to relay" - ewarn "outgoing mail. For example, if you are using ssmtp, please edit" - ewarn "${EPREFIX}/etc/ssmtp/ssmtp.conf with appropriate values for your site." -} diff --git a/dev-vcs/darcs/darcs-2.5.2-r1.ebuild b/dev-vcs/darcs/darcs-2.5.2-r1.ebuild deleted file mode 100644 index feb1ff9215a8..000000000000 --- a/dev-vcs/darcs/darcs-2.5.2-r1.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2012 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-r1.ebuild,v 1.6 2012/09/12 16:10:06 qnikst Exp $ - -EAPI="4" -CABAL_FEATURES="bin lib profile haddock hscolour" -inherit haskell-cabal eutils bash-completion-r1 - -DESCRIPTION="a distributed, interactive, smart revision control system" -HOMEPAGE="http://darcs.net/" -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" -IUSE="doc test" - -RDEPEND="=dev-haskell/hashed-storage-0.5*[profile?] - =dev-haskell/haskeline-0.6*[profile?] - =dev-haskell/html-1.0*[profile?] - <dev-haskell/http-4000.3[profile?] - =dev-haskell/mmap-0.5*[profile?] - <dev-haskell/mtl-2.1[profile?] - >=dev-haskell/network-2.2[profile?] - <dev-haskell/parsec-3.2[profile?] - =dev-haskell/random-1.0*[profile?] - <dev-haskell/regex-compat-0.96[profile?] - =dev-haskell/tar-0.3*[profile?] - =dev-haskell/terminfo-0.3*[profile?] - =dev-haskell/text-0.11*[profile?] - <dev-haskell/zlib-0.6.0.0[profile?] - >=dev-lang/ghc-6.10.1 - net-misc/curl - virtual/mta" - -# darcs also has a library version; we thus need $DEPEND -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.8 - doc? ( virtual/latex-base - || ( dev-tex/latex2html[png] - dev-tex/latex2html[gif] - ) - ) - test? ( dev-haskell/test-framework[profile?] - dev-haskell/test-framework-hunit[profile?] - dev-haskell/test-framework-quickcheck2[profile?] - ) - " - -src_prepare() { - cd "${S}/contrib" - epatch "${FILESDIR}/${PN}-1.0.9-bashcomp.patch" - cd .. - - epatch "${FILESDIR}/${PN}-2.5.2-relax-regex-libs-deps.patch" - epatch "${FILESDIR}/${PN}-2.5.2-ghc-7.2.patch" - epatch "${FILESDIR}/${PN}-2.5.2-tests-ghc-7.2.patch" - epatch "${FILESDIR}/${PN}-2.5.2-relax-http-libs-deps.patch" - epatch "${FILESDIR}/${PN}-2.5.2-ghc-7.4.patch" - - # 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" -} - -src_configure() { - # checking whether ghc supports -threaded flag - # Beware: http://www.haskell.org/ghc/docs/latest/html/users_guide/options-phases.html#options-linker - # contains: 'The ability to make a foreign call that does not block all other Haskell threads.' - # It might have interactivity impact. - - threaded_flag="" - if $(ghc-getghc) --info | grep "Support SMP" | grep -q "YES"; then - threaded_flag="--flags=threaded" - einfo "$P will be built with threads support" - else - threaded_flag="--flags=-threaded" - einfo "$P will be built without threads support" - fi - - # Use curl for net stuff to avoid strict version dep on HTTP and network - cabal_src_configure \ - --flags=curl \ - --flags=-http \ - --flags=curl-pipelining \ - --flags=color \ - --flags=terminfo \ - --flags=mmap \ - $threaded_flag \ - $(cabal_flag test) -} - -src_test() { - # run cabal test from haskell-cabal - haskell-cabal_src_test || die "cabal test failed" - - # run the unit tests (not part of cabal test for some reason...) - # breaks the cabal abstraction a bit... - "${S}/dist/build/unit/unit" || die "unit tests failed" -} - -src_install() { - cabal_src_install - newbashcomp "${S}/contrib/darcs_completion" "${PN}" - - rm "${ED}/usr/bin/unit" 2> /dev/null - - # fixup perms in such an an awkward way - mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found" - doman "${S}/darcs.1" || die "failed to register darcs.1 as a manpage" - - # if tests were enabled, make sure the unit test driver is deleted - rm -rf "${ED}/usr/bin/unit" -} - -pkg_postinst() { - ghc-package_pkg_postinst - - ewarn "NOTE: in order for the darcs send command to work properly," - ewarn "you must properly configure your mail transport agent to relay" - ewarn "outgoing mail. For example, if you are using ssmtp, please edit" - ewarn "${EPREFIX}/etc/ssmtp/ssmtp.conf with appropriate values for your site." -} diff --git a/dev-vcs/darcs/darcs-2.5.2-r2.ebuild b/dev-vcs/darcs/darcs-2.5.2-r2.ebuild deleted file mode 100644 index 7356f9c07c07..000000000000 --- a/dev-vcs/darcs/darcs-2.5.2-r2.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2012 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-r2.ebuild,v 1.3 2012/09/12 16:10:06 qnikst Exp $ - -EAPI="4" -CABAL_FEATURES="bin lib profile haddock hscolour" -inherit haskell-cabal eutils bash-completion-r1 - -DESCRIPTION="a distributed, interactive, smart revision control system" -HOMEPAGE="http://darcs.net/" -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" -IUSE="doc test" - -RDEPEND="=dev-haskell/hashed-storage-0.5*[profile?] - =dev-haskell/haskeline-0.6*[profile?] - =dev-haskell/html-1.0*[profile?] - <dev-haskell/http-4000.3[profile?] - =dev-haskell/mmap-0.5*[profile?] - <dev-haskell/mtl-2.2[profile?] - >=dev-haskell/network-2.2[profile?] - <dev-haskell/parsec-3.2[profile?] - =dev-haskell/random-1.0*[profile?] - <dev-haskell/regex-compat-0.96[profile?] - =dev-haskell/tar-0.3*[profile?] - =dev-haskell/terminfo-0.3*[profile?] - =dev-haskell/text-0.11*[profile?] - <dev-haskell/zlib-0.6.0.0[profile?] - >=dev-lang/ghc-6.10.1 - net-misc/curl - virtual/mta" - -# darcs also has a library version; we thus need $DEPEND -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.8 - doc? ( virtual/latex-base - || ( dev-tex/latex2html[png] - dev-tex/latex2html[gif] - ) - ) - test? ( dev-haskell/test-framework[profile?] - dev-haskell/test-framework-hunit[profile?] - dev-haskell/test-framework-quickcheck2[profile?] - ) - " - -src_prepare() { - cd "${S}/contrib" - epatch "${FILESDIR}/${PN}-1.0.9-bashcomp.patch" - cd .. - - epatch "${FILESDIR}/${PN}-2.5.2-relax-regex-libs-deps.patch" - epatch "${FILESDIR}/${PN}-2.5.2-ghc-7.2.patch" - epatch "${FILESDIR}/${PN}-2.5.2-tests-ghc-7.2.patch" - epatch "${FILESDIR}/${PN}-2.5.2-relax-http-libs-deps.patch" - epatch "${FILESDIR}/${PN}-2.5.2-ghc-7.4.patch" - epatch "${FILESDIR}/${PN}-2.5.2-mtl-2.1.patch" - - # 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" -} - -src_configure() { - # checking whether ghc supports -threaded flag - # Beware: http://www.haskell.org/ghc/docs/latest/html/users_guide/options-phases.html#options-linker - # contains: 'The ability to make a foreign call that does not block all other Haskell threads.' - # It might have interactivity impact. - - threaded_flag="" - if $(ghc-getghc) --info | grep "Support SMP" | grep -q "YES"; then - threaded_flag="--flags=threaded" - einfo "$P will be built with threads support" - else - threaded_flag="--flags=-threaded" - einfo "$P will be built without threads support" - fi - - # Use curl for net stuff to avoid strict version dep on HTTP and network - cabal_src_configure \ - --flags=curl \ - --flags=-http \ - --flags=curl-pipelining \ - --flags=color \ - --flags=terminfo \ - --flags=mmap \ - $threaded_flag \ - $(cabal_flag test) -} - -src_test() { - # run cabal test from haskell-cabal - haskell-cabal_src_test || die "cabal test failed" - - # run the unit tests (not part of cabal test for some reason...) - # breaks the cabal abstraction a bit... - "${S}/dist/build/unit/unit" || die "unit tests failed" -} - -src_install() { - cabal_src_install - newbashcomp "${S}/contrib/darcs_completion" "${PN}" - - rm "${ED}/usr/bin/unit" 2> /dev/null - - # fixup perms in such an an awkward way - mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found" - doman "${S}/darcs.1" || die "failed to register darcs.1 as a manpage" - - # if tests were enabled, make sure the unit test driver is deleted - rm -rf "${ED}/usr/bin/unit" -} - -pkg_postinst() { - ghc-package_pkg_postinst - - ewarn "NOTE: in order for the darcs send command to work properly," - ewarn "you must properly configure your mail transport agent to relay" - ewarn "outgoing mail. For example, if you are using ssmtp, please edit" - ewarn "${EPREFIX}/etc/ssmtp/ssmtp.conf with appropriate values for your site." -} diff --git a/dev-vcs/darcs/files/darcs-1.0.9-bashcomp.patch b/dev-vcs/darcs/files/darcs-1.0.9-bashcomp.patch deleted file mode 100644 index 2c5e34521e45..000000000000 --- a/dev-vcs/darcs/files/darcs-1.0.9-bashcomp.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -urwpN darcs-1.0.9-orig/darcs_completion darcs-1.0.9/darcs_completion ---- darcs-1.0.9-orig/darcs_completion 2007-06-07 21:42:57.000000000 +0200 -+++ darcs-1.0.9/darcs_completion 2007-06-07 21:43:12.000000000 +0200 -@@ -3,7 +3,6 @@ - # darcs command line completion. - # Copyright 2002 "David Roundy" <droundy@abridgegame.org> - # --have darcs && - _darcs() - { - local cur -@@ -48,5 +47,5 @@ _darcs() - return 0 - - } --[ "$have" ] && complete -F _darcs -o default darcs -+complete -F _darcs -o default darcs - diff --git a/dev-vcs/darcs/files/darcs-2.4.4-issue1770-curl_multi_perform-no-running-handles.patch b/dev-vcs/darcs/files/darcs-2.4.4-issue1770-curl_multi_perform-no-running-handles.patch deleted file mode 100644 index dd61a027d4d5..000000000000 --- a/dev-vcs/darcs/files/darcs-2.4.4-issue1770-curl_multi_perform-no-running-handles.patch +++ /dev/null @@ -1,38 +0,0 @@ -Fri Apr 16 00:47:39 CEST 2010 Dmitry Kurochkin <dmitry.kurochkin@gmail.com> - * Fix hscurl.c when URL is downloaded during the first call to curl_multi_perform. - Turns out that the first call to curl_multi_perform() can fetch the URL or - result in error. I can easily reproduce this using HTTP server on localhost. - This means that situation when running_handles is zero is valid, so remove the - error and handle it correctly. -diff -rN -u old-darcs.net/src/hscurl.c new-darcs.net/src/hscurl.c ---- old-darcs.net/src/hscurl.c 2010-06-28 19:35:56.382397912 +0200 -+++ new-darcs.net/src/hscurl.c 2010-06-28 19:35:57.544398155 +0200 -@@ -19,7 +19,6 @@ - RESULT_MULTI_INIT_FAIL, - RESULT_EASY_INIT_FAIL, - RESULT_SLIST_APPEND_FAIL, -- RESULT_NO_RUNNING_HANDLES, - RESULT_MULTI_INFO_READ_FAIL, - RESULT_UNKNOWN_MESSAGE, - RESULT_FILE_OPEN_FAIL -@@ -33,7 +32,6 @@ - "curl_multi_init() failed", - "curl_easy_init() failed", - "curl_slist_append() failed", -- "curl_multi_perform() - no running handles", - "curl_multi_info_read() failed", - "curl_multi_info_read() returned unknown message", - "fopen() failed" -@@ -67,11 +65,9 @@ - error = curl_multi_perform(multi, &running_handles); - if (error != CURLM_OK && error != CURLM_CALL_MULTI_PERFORM) - return curl_multi_strerror(error); -- if (running_handles == 0) -- return error_strings[RESULT_NO_RUNNING_HANDLES]; - - running_handles_last = running_handles; -- while (1) -+ while (running_handles_last > 0) - { - while (error == CURLM_CALL_MULTI_PERFORM) - error = curl_multi_perform(multi, &running_handles); diff --git a/dev-vcs/darcs/files/darcs-2.4.4-tests-emailformat.patch b/dev-vcs/darcs/files/darcs-2.4.4-tests-emailformat.patch deleted file mode 100644 index e1fe5dfe8f1d..000000000000 --- a/dev-vcs/darcs/files/darcs-2.4.4-tests-emailformat.patch +++ /dev/null @@ -1,39 +0,0 @@ -Tue Nov 16 23:36:37 EET 2010 Sergei Trofimovich <slyfox@community.haskell.org> - * tests/emailformat.sh: use ghc --make instead of ghci - - linux-alpha and linux-ia64 don't have ghci support. - No need to fail there. -diff -rN -u old-darcs.net/tests/emailformat.sh new-darcs.net/tests/emailformat.sh ---- old-darcs.net/tests/emailformat.sh 2010-11-16 23:40:10.207480789 +0200 -+++ new-darcs.net/tests/emailformat.sh 2010-11-16 23:40:10.706480789 +0200 -@@ -6,8 +6,10 @@ - switch_to_latin9_locale - rm -rf temp1 - rm -rf temp2 -+rm -rf temp3 - mkdir temp1 - mkdir temp2 -+mkdir temp3 - cd temp1 - - seventysevenaddy="<aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@bbbbbbbbbb.cccccccccc.abrasoft.com>" -@@ -34,10 +36,17 @@ - grep $seventysevenaddy mail_as_file - - # Check that there are no non-ASCII characters in the mail --ghc -e 'getContents >>= return . not . any (> Data.Char.chr 127)' < mail_as_file | grep '^True$' -+cd ../temp3 -+cat > is_ascii.hs <<EOF -+import Data.Char (chr) - -+main = getContents >>= print . not . any (> Data.Char.chr 127) -+EOF -+ -+ghc --make is_ascii.hs -o is_ascii -+./is_ascii < ../temp1/mail_as_file | grep '^True$' - - cd .. - rm -rf temp1 - rm -rf temp2 -- -+rm -rf temp3 diff --git a/dev-vcs/darcs/files/darcs-2.5.2-ghc-7.2.patch b/dev-vcs/darcs/files/darcs-2.5.2-ghc-7.2.patch deleted file mode 100644 index 22dfea864e33..000000000000 --- a/dev-vcs/darcs/files/darcs-2.5.2-ghc-7.2.patch +++ /dev/null @@ -1,142 +0,0 @@ -diff --git a/Distribution/ShellHarness.hs b/Distribution/ShellHarness.hs -index 78a8a9b..949b752 100644 ---- a/Distribution/ShellHarness.hs -+++ b/Distribution/ShellHarness.hs -@@ -12,10 +12,9 @@ import System.Environment ( getEnv, getEnvironment ) - import System.Exit ( ExitCode (..) ) - import System.FilePath - import System.IO --import System( system ) - import System.Process ( ProcessHandle, - runInteractiveProcess, waitForProcess, -- getProcessExitCode ) -+ getProcessExitCode, system ) - import Data.Maybe - import Data.List ( isInfixOf, isPrefixOf, (\\), nubBy, isSuffixOf ) - import Control.Concurrent -diff --git a/darcs.cabal b/darcs.cabal -index 887a27b..56e36fa 100644 ---- a/darcs.cabal -+++ b/darcs.cabal -@@ -124,7 +124,7 @@ Executable witnesses - else - buildable: True - -- build-tools: ghc >= 6.10 && < 7.2 -+ build-tools: ghc >= 6.10 && < 7.4 - - hs-source-dirs: src - include-dirs: src -@@ -182,7 +182,7 @@ Executable witnesses - text == 0.11.*, - old-time == 1.0.*, - directory >= 1.0.0.0 && < 1.2.0.0, -- process == 1.0.*, -+ process >= 1.0 && < 1.2, - containers >= 0.1 && < 0.5, - array >= 0.1 && < 0.4, - random == 1.0.*, -@@ -192,7 +192,7 @@ Executable witnesses - test-framework >= 0.2.2, - test-framework-quickcheck2 >= 0.2.2 - if !os(windows) -- build-depends: unix >= 1.0 && < 2.5 -+ build-depends: unix >= 1.0 && < 2.6 - if flag(http) - build-depends: network >= 2.2 && < 2.4, - HTTP >= 3000.0 && < 4000.2 -@@ -208,7 +208,7 @@ Library - else - buildable: True - -- build-tools: ghc >= 6.10 && < 7.2 -+ build-tools: ghc >= 6.10 && < 7.4 - - hs-source-dirs: src - include-dirs: src -@@ -385,14 +385,14 @@ Library - tar == 0.3.* - - if !os(windows) -- build-depends: unix >= 1.0 && < 2.5 -+ build-depends: unix >= 1.0 && < 2.6 - - build-depends: base >= 3, - bytestring >= 0.9.0 && < 0.10, - text == 0.11.*, - old-time == 1.0.*, - directory >= 1.0.0.0 && < 1.2.0.0, -- process == 1.0.*, -+ process >= 1.0 && < 1.2, - containers >= 0.1 && < 0.5, - array >= 0.1 && < 0.4, - random == 1.0.* -@@ -483,7 +483,7 @@ Executable darcs - src/umask.c - src/Crypt/sha2.c - -- build-tools: ghc >= 6.10 && < 7.2 -+ build-tools: ghc >= 6.10 && < 7.4 - - -- We need optimizations, regardless of what Hackage says - -- Note: "if true" works around a cabal bug with order of flag composition -@@ -533,14 +533,14 @@ Executable darcs - tar == 0.3.* - - if !os(windows) -- build-depends: unix >= 1.0 && < 2.5 -+ build-depends: unix >= 1.0 && < 2.6 - - build-depends: base >= 3, - bytestring >= 0.9.0 && < 0.10, - text == 0.11.*, - old-time == 1.0.*, - directory >= 1.0.0.0 && < 1.2.0.0, -- process == 1.0.*, -+ process >= 1.0 && < 1.2, - containers >= 0.1 && < 0.5, - array >= 0.1 && < 0.4, - random == 1.0.* -@@ -615,7 +615,7 @@ Executable unit - else - buildable: True - -- build-tools: ghc >= 6.10 && < 7.2 -+ build-tools: ghc >= 6.10 && < 7.4 - - build-depends: base < 5, - extensible-exceptions >= 0.1 && < 0.2, -@@ -678,7 +678,7 @@ Executable unit - cc-options: -DHAVE_SIGINFO_H - - if !os(windows) -- build-depends: unix >= 1.0 && < 2.5 -+ build-depends: unix >= 1.0 && < 2.6 - - build-depends: base >= 3, - bytestring >= 0.9.0 && < 0.10, -@@ -686,7 +686,7 @@ Executable unit - text == 0.11.*, - old-time == 1.0.*, - directory >= 1.0.0.0 && < 1.2.0.0, -- process == 1.0.*, -+ process >= 1.0 && < 1.2, - containers >= 0.1 && < 0.5, - array >= 0.1 && < 0.4, - hashed-storage >= 0.5.2 && < 0.6, -diff --git a/src/Darcs/RepoPath.hs b/src/Darcs/RepoPath.hs -index aa00156..8c5432b 100644 ---- a/src/Darcs/RepoPath.hs -+++ b/src/Darcs/RepoPath.hs -@@ -60,11 +60,9 @@ import qualified Darcs.Patch.FileName as PatchFileName ( FileName, fp2fn, fn2fp - #include "impossible.h" - - class FilePathOrURL a where -- {-# INLINE toPath #-} - toPath :: a -> String - - class FilePathOrURL a => FilePathLike a where -- {-# INLINE toFilePath #-} - toFilePath :: a -> FilePath - - -- | Paths which are relative to the local darcs repository and normalized. diff --git a/dev-vcs/darcs/files/darcs-2.5.2-ghc-7.4.patch b/dev-vcs/darcs/files/darcs-2.5.2-ghc-7.4.patch deleted file mode 100644 index 3b51fea4a953..000000000000 --- a/dev-vcs/darcs/files/darcs-2.5.2-ghc-7.4.patch +++ /dev/null @@ -1,139 +0,0 @@ ---- darcs-2.5.2-orig/darcs.cabal 2011-12-19 20:44:08.644140399 +1100 -+++ darcs-2.5.2/darcs.cabal 2011-12-24 10:03:14.325396692 +1100 -@@ -124,7 +124,7 @@ - else - buildable: True - -- build-tools: ghc >= 6.10 && < 7.4 -+ build-tools: ghc >= 6.10 && < 7.6 - - hs-source-dirs: src - include-dirs: src -@@ -174,17 +174,17 @@ - mtl >= 1.0 && < 2.1, - parsec >= 2.0 && < 3.2, - html == 1.0.*, -- filepath >= 1.1.0.0 && < 1.3.0.0, -+ filepath >= 1.1.0.0 && < 1.5.0.0, - haskeline >= 0.6.2.2 && < 0.7, - hashed-storage >= 0.5.2 && < 0.6, - base >= 3, - bytestring >= 0.9.0 && < 0.10, - text == 0.11.*, -- old-time == 1.0.*, -+ old-time >= 1.0 && < 1.2, - directory >= 1.0.0.0 && < 1.2.0.0, - process >= 1.0 && < 1.2, - containers >= 0.1 && < 0.5, -- array >= 0.1 && < 0.4, -+ array >= 0.1 && < 0.5, - random == 1.0.*, - tar == 0.3.*, - zlib >= 0.5.1.0 && < 0.6.0.0, -@@ -208,7 +208,7 @@ - else - buildable: True - -- build-tools: ghc >= 6.10 && < 7.4 -+ build-tools: ghc >= 6.10 && < 7.6 - - hs-source-dirs: src - include-dirs: src -@@ -379,7 +379,7 @@ - mtl >= 1.0 && < 2.1, - parsec >= 2.0 && < 3.2, - html == 1.0.*, -- filepath >= 1.1.0.0 && < 1.3.0.0, -+ filepath >= 1.1.0.0 && < 1.5.0.0, - haskeline >= 0.6.2.2 && < 0.7, - hashed-storage >= 0.5.2 && < 0.6, - tar == 0.3.* -@@ -390,11 +390,11 @@ - build-depends: base >= 3, - bytestring >= 0.9.0 && < 0.10, - text == 0.11.*, -- old-time == 1.0.*, -+ old-time >= 1.0 && < 1.2, - directory >= 1.0.0.0 && < 1.2.0.0, - process >= 1.0 && < 1.2, - containers >= 0.1 && < 0.5, -- array >= 0.1 && < 0.4, -+ array >= 0.1 && < 0.5, - random == 1.0.* - - -@@ -483,7 +483,7 @@ - src/umask.c - src/Crypt/sha2.c - -- build-tools: ghc >= 6.10 && < 7.4 -+ build-tools: ghc >= 6.10 && < 7.6 - - -- We need optimizations, regardless of what Hackage says - -- Note: "if true" works around a cabal bug with order of flag composition -@@ -527,7 +527,7 @@ - mtl >= 1.0 && < 2.1, - parsec >= 2.0 && < 3.2, - html == 1.0.*, -- filepath >= 1.1.0.0 && < 1.3.0.0, -+ filepath >= 1.1.0.0 && < 1.5.0.0, - haskeline >= 0.6.2.2 && < 0.7, - hashed-storage >= 0.5.2 && < 0.6, - tar == 0.3.* -@@ -538,11 +538,11 @@ - build-depends: base >= 3, - bytestring >= 0.9.0 && < 0.10, - text == 0.11.*, -- old-time == 1.0.*, -+ old-time >= 1.0 && < 1.2, - directory >= 1.0.0.0 && < 1.2.0.0, - process >= 1.0 && < 1.2, - containers >= 0.1 && < 0.5, -- array >= 0.1 && < 0.4, -+ array >= 0.1 && < 0.5, - random == 1.0.* - - if flag(curl) -@@ -615,7 +615,7 @@ - else - buildable: True - -- build-tools: ghc >= 6.10 && < 7.4 -+ build-tools: ghc >= 6.10 && < 7.6 - - build-depends: base < 5, - extensible-exceptions >= 0.1 && < 0.2, -@@ -623,7 +623,7 @@ - mtl >= 1.0 && < 2.1, - parsec >= 2.0 && < 3.2, - html == 1.0.*, -- filepath >= 1.1.0.0 && < 1.3.0.0, -+ filepath >= 1.1.0.0 && < 1.5.0.0, - QuickCheck >= 2.1.0.0, - HUnit >= 1.0, - test-framework >= 0.2.2, -@@ -684,11 +684,11 @@ - bytestring >= 0.9.0 && < 0.10, - haskeline >= 0.6.2.2 && < 0.7, - text == 0.11.*, -- old-time == 1.0.*, -+ old-time >= 1.0 && < 1.2, - directory >= 1.0.0.0 && < 1.2.0.0, - process >= 1.0 && < 1.2, - containers >= 0.1 && < 0.5, -- array >= 0.1 && < 0.4, -+ array >= 0.1 && < 0.5, - hashed-storage >= 0.5.2 && < 0.6, - random == 1.0.* - ---- darcs-2.5.2-orig/src/Darcs/Utils.hs 2011-03-14 09:40:46.000000000 +1100 -+++ darcs-2.5.2/src/Darcs/Utils.hs 2011-12-24 10:07:16.125342597 +1100 -@@ -62,7 +62,7 @@ - , TreeMonad, tree ) - import Storage.Hashed.Tree( Tree, listImmediate, findTree ) - --showHexLen :: (Integral a) => Int -> a -> String -+showHexLen :: (Integral a, Show a) => Int -> a -> String - showHexLen n x = let s = showHex x "" - in replicate (n - length s) ' ' ++ s - diff --git a/dev-vcs/darcs/files/darcs-2.5.2-mtl-2.1.patch b/dev-vcs/darcs/files/darcs-2.5.2-mtl-2.1.patch deleted file mode 100644 index 2718e9ec0368..000000000000 --- a/dev-vcs/darcs/files/darcs-2.5.2-mtl-2.1.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- darcs-2.5.2-orig/darcs.cabal 2012-04-12 00:35:07.075608173 +1000 -+++ darcs-2.5.2/darcs.cabal 2012-04-12 00:40:06.173429235 +1000 -@@ -171,7 +171,7 @@ - build-depends: base < 5, - extensible-exceptions >= 0.1 && < 0.2, - regex-compat >= 0.71 && < 0.96, -- mtl >= 1.0 && < 2.1, -+ mtl >= 1.0 && < 2.2, - parsec >= 2.0 && < 3.2, - html == 1.0.*, - filepath >= 1.1.0.0 && < 1.5.0.0, -@@ -376,7 +376,7 @@ - build-depends: base < 5, - extensible-exceptions >= 0.1 && < 0.2, - regex-compat >= 0.71 && < 0.96, -- mtl >= 1.0 && < 2.1, -+ mtl >= 1.0 && < 2.2, - parsec >= 2.0 && < 3.2, - html == 1.0.*, - filepath >= 1.1.0.0 && < 1.5.0.0, -@@ -524,7 +524,7 @@ - build-depends: base < 5, - extensible-exceptions >= 0.1 && < 0.2, - regex-compat >= 0.71 && < 0.96, -- mtl >= 1.0 && < 2.1, -+ mtl >= 1.0 && < 2.2, - parsec >= 2.0 && < 3.2, - html == 1.0.*, - filepath >= 1.1.0.0 && < 1.5.0.0, -@@ -620,7 +620,7 @@ - build-depends: base < 5, - extensible-exceptions >= 0.1 && < 0.2, - regex-compat >= 0.71 && < 0.96, -- mtl >= 1.0 && < 2.1, -+ mtl >= 1.0 && < 2.2, - parsec >= 2.0 && < 3.2, - html == 1.0.*, - filepath >= 1.1.0.0 && < 1.5.0.0, diff --git a/dev-vcs/darcs/files/darcs-2.5.2-relax-http-libs-deps.patch b/dev-vcs/darcs/files/darcs-2.5.2-relax-http-libs-deps.patch deleted file mode 100644 index 05b1ea20e6a7..000000000000 --- a/dev-vcs/darcs/files/darcs-2.5.2-relax-http-libs-deps.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- darcs-2.5.2-orig/darcs.cabal 2011-12-19 20:43:28.551322710 +1100 -+++ darcs-2.5.2/darcs.cabal 2011-12-19 20:44:08.644140399 +1100 -@@ -195,7 +195,7 @@ - build-depends: unix >= 1.0 && < 2.6 - if flag(http) - build-depends: network >= 2.2 && < 2.4, -- HTTP >= 3000.0 && < 4000.2 -+ HTTP >= 3000.0 && < 4000.3 - - - -- ---------------------------------------------------------------------- -@@ -420,7 +420,7 @@ - - if flag(http) - build-depends: network >= 2.2 && < 2.4, -- HTTP >= 3000.0 && < 4000.2 -+ HTTP >= 3000.0 && < 4000.3 - cpp-options: -DHAVE_HTTP - x-have-http: - -@@ -554,7 +554,7 @@ - - if flag(http) - build-depends: network >= 2.2 && < 2.4, -- HTTP >= 3000.0 && < 4000.2 -+ HTTP >= 3000.0 && < 4000.3 - cpp-options: -DHAVE_HTTP - x-have-http: - -@@ -705,7 +705,7 @@ - - if flag(http) - build-depends: network >= 2.2 && < 2.4, -- HTTP >= 3000.0 && < 4000.2 -+ HTTP >= 3000.0 && < 4000.3 - - if flag(color) - x-use-color: diff --git a/dev-vcs/darcs/files/darcs-2.5.2-relax-regex-libs-deps.patch b/dev-vcs/darcs/files/darcs-2.5.2-relax-regex-libs-deps.patch deleted file mode 100644 index 1b6a37d75d37..000000000000 --- a/dev-vcs/darcs/files/darcs-2.5.2-relax-regex-libs-deps.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -rN -u old-darcs-2.5.2/darcs.cabal new-darcs-2.5.2/darcs.cabal ---- old-darcs-2.5.2/darcs.cabal 2011-06-03 20:24:32.079482374 +0200 -+++ new-darcs-2.5.2/darcs.cabal 2011-06-03 20:24:32.080482374 +0200 -@@ -166,11 +166,11 @@ - cpp-options: -DWIN32 - c-sources: src/win32/send_email.c - build-depends: unix-compat >= 0.1.2, -- regex-posix >= 0.94.4 && < 0.95 -+ regex-posix >= 0.94.4 && < 0.96 - - build-depends: base < 5, - extensible-exceptions >= 0.1 && < 0.2, -- regex-compat >= 0.71 && < 0.94, -+ regex-compat >= 0.71 && < 0.96, - mtl >= 1.0 && < 2.1, - parsec >= 2.0 && < 3.2, - html == 1.0.*, -@@ -368,14 +368,14 @@ - cpp-options: -DWIN32 - c-sources: src/win32/send_email.c - build-depends: unix-compat >= 0.1.2, -- regex-posix >= 0.94.4 && < 0.95 -+ regex-posix >= 0.94.4 && < 0.96 - - if os(solaris) - cc-options: -DHAVE_SIGINFO_H - - build-depends: base < 5, - extensible-exceptions >= 0.1 && < 0.2, -- regex-compat >= 0.71 && < 0.94, -+ regex-compat >= 0.71 && < 0.96, - mtl >= 1.0 && < 2.1, - parsec >= 2.0 && < 3.2, - html == 1.0.*, -@@ -516,14 +516,14 @@ - cpp-options: -DWIN32 - c-sources: src/win32/send_email.c - build-depends: unix-compat >= 0.1.2, -- regex-posix >= 0.94.4 && < 0.95 -+ regex-posix >= 0.94.4 && < 0.96 - - if os(solaris) - cc-options: -DHAVE_SIGINFO_H - - build-depends: base < 5, - extensible-exceptions >= 0.1 && < 0.2, -- regex-compat >= 0.71 && < 0.94, -+ regex-compat >= 0.71 && < 0.96, - mtl >= 1.0 && < 2.1, - parsec >= 2.0 && < 3.2, - html == 1.0.*, -@@ -619,7 +619,7 @@ - - build-depends: base < 5, - extensible-exceptions >= 0.1 && < 0.2, -- regex-compat >= 0.71 && < 0.94, -+ regex-compat >= 0.71 && < 0.96, - mtl >= 1.0 && < 2.1, - parsec >= 2.0 && < 3.2, - html == 1.0.*, -@@ -672,7 +672,7 @@ - cpp-options: -DWIN32 - c-sources: src/win32/send_email.c - build-depends: unix-compat >= 0.1.2, -- regex-posix >= 0.94.4 && < 0.95 -+ regex-posix >= 0.94.4 && < 0.96 - - if os(solaris) - cc-options: -DHAVE_SIGINFO_H diff --git a/dev-vcs/darcs/files/darcs-2.5.2-tests-ghc-7.2.patch b/dev-vcs/darcs/files/darcs-2.5.2-tests-ghc-7.2.patch deleted file mode 100644 index c43df9a9328a..000000000000 --- a/dev-vcs/darcs/files/darcs-2.5.2-tests-ghc-7.2.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/tests/hspwd.hs b/tests/hspwd.hs -index b93a7d5..f6fe2dd 100644 ---- a/tests/hspwd.hs -+++ b/tests/hspwd.hs -@@ -1,5 +1,5 @@ - module Main where - --import Directory ( getCurrentDirectory ) -+import System.Directory ( getCurrentDirectory ) - - main = getCurrentDirectory >>= putStr -diff --git a/tests/trackdown-bisect-helper.hs b/tests/trackdown-bisect-helper.hs -index 5c325c4..7fcb4a4 100644 ---- a/tests/trackdown-bisect-helper.hs -+++ b/tests/trackdown-bisect-helper.hs -@@ -15,8 +15,9 @@ patches with the linear implementation. - - - import Control.Monad -+import System.Environment - import System.IO --import System -+import System.Process - import System.Random - import Data.List - import Control.Exception |