Bump ghc requirement to 6.8 in version 2.1.0-r1 and 2.2.1, they have a ghc that inclu...

This makes the dev-haskell/filepath dependency unneeded, thus it has been removed. See bug #324411.
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/dev-vcs/darcs/ChangeLog b/dev-vcs/darcs/ChangeLog
index feccb7c32f6d03780ae2d5aeadc750c0b67158b4..af6b76b7d9ee30092c5d116ceab663d4ff5e9e4c 100644 (file)
--- a/dev-vcs/darcs/ChangeLog
+++ b/dev-vcs/darcs/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-vcs/darcs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/ChangeLog,v 1.4 2010/05/23 22:10:58 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/ChangeLog,v 1.5 2010/06/17 06:33:35 kolmodin Exp $
+
+  16 Jun 2010; Lennart Kolmodin <kolmodin@gentoo.org>
+  -darcs-1.1.0_pre1.ebuild, darcs-2.1.0-r1.ebuild, darcs-2.2.1.ebuild,
+  -darcs-2.4.ebuild:
+  Bump requirement in darcs-2.1.0-r1 and darcs-2.2.1 to >=ghc-6.8 from
+  >=ghc-6.2.2.
+  All arches that are keyworded in those darcs versions also have ghcs
+  either stable or keyworded.
+  This makes the dependency on dev-haskell/filepath unneeded, so it has been
+  removed, see bug #324411.
+  Also remove old or rudendant darcs versions.
 
 *darcs-2.4.4 (23 May 2010)
 

diff --git a/dev-vcs/darcs/Manifest b/dev-vcs/darcs/Manifest
index 4fc6abf1128d5ab4f01d4f176008ab2669b1d9ad..31edfedae8a3d512a7ce9218b529a71ecdfb6bb3 100644 (file)
--- a/dev-vcs/darcs/Manifest
+++ b/dev-vcs/darcs/Manifest
@@ -6,25 +6,21 @@ AUX darcs-1.0.9-bashcomp.patch 510 RMD160 73888c758f4a2ac93b83229115d23599162c0b
 AUX darcs-1.1.0pre1-ghc68.patch 1548 RMD160 bde8493cae0dd2fa9e21367ec5322252780209d5 SHA1 9f64935e8b4a44cab474352a0b8090192b3052e0 SHA256 252199c644163c24c09504c72a34cf750d065fab322a2c17bf4016d83b1b826e
 AUX darcs-2.0.2-add-dummy-base-dependency.diff 520 RMD160 b7206ef051d9be2df94d0c331dd029de6358106c SHA1 5c3dc86bcadfa51b452d0532d9cd45efec71a3a7 SHA256 a93ffcb918456fdb1514b02e7d1a3fc9498f8505f11d5f1d03cf9acd189a78b2
 DIST darcs-1.0.9.tar.gz 1059363 RMD160 3a971f778e4343d90e88f1ba8815ea3c880ac2a1 SHA1 b2d2238c01d530796c29db4b46fd4fd9c21be9b6 SHA256 f848a63363ad72d3217b1eb469c267c00ea6085a491172d385ab6eda210b30dc
-DIST darcs-1.1.0pre1.tar.gz 1116180 RMD160 4269f61695045e85f2b74eb124221c1e0ac449d6 SHA1 ec47136625c2a7c99030cdfa9738d09e77dbd517 SHA256 4c0cc05d251af94c86664bc2e4cdae7bf2a6cf10fcef2ebf5329b593d661a2f0
 DIST darcs-2.0.2.tar.gz 1800653 RMD160 e401bd2ab64e2df4c654bdc03355ce215a053195 SHA1 75a186b906ac8bbc1144c5124c215e4c57c06222 SHA256 164c87bb7e41d1e81c4423432804b634862269291fa495f25e7f67f1b95bf49e
 DIST darcs-2.1.0.tar.gz 1851395 RMD160 4f0073b7a879f5e357601f92320b902098258140 SHA1 738a063e67b90f5f831b7164969f285692250cee SHA256 d5a63e62bceb45905163d508c6b25158dab6aca367015566d8c539ec37107ab4
 DIST darcs-2.2.1.tar.gz 984160 RMD160 c26d27fa40efee05436b7f6c5ff7495175bb8f65 SHA1 9bf214898f895c72e5a9ba36b5d6f7e7ceb5d6dc SHA256 575beb35436685a3ede78e87ff225f04ca92eb24ff1eb45fe5d01b4d3169c447
 DIST darcs-2.4.4.tar.gz 1193126 RMD160 cec11127740f350d25de7d4f9c7d7df115ebed6a SHA1 96a1907d3b8fd5676074a860359484f251d36e2f SHA256 97cde35ae4b74488f8b98b487bc0498069eaa74fe035903394f3d4aff1da9f9e
-DIST darcs-2.4.tar.gz 1173703 RMD160 2982f0dff2703a9fff48d737acbb77948f4acd55 SHA1 c33e0e5ba9f4a179beba4ed047f5d56dff4a44e9 SHA256 38d10c3dc3590156ff6f73e93c3cd74eca03e5769813620e52586836622efd62
 EBUILD darcs-1.0.9.ebuild 3103 RMD160 abf5175636beace77fc07ef40caa13c45b4dd804 SHA1 103019661540089464064380f7bc424c3ac4b66d SHA256 865326b299c20cb9ba4e7e19bbd2936ccd68c1042e33c4d65a6fa86967e7ecf2
-EBUILD darcs-1.1.0_pre1.ebuild 3158 RMD160 5239fcf334bb0bd58594edb9a05632f488a8fdec SHA1 a6705aa4b3c44c629a4afc07cad9e4bf9c3f4191 SHA256 31e96a8bf8e24e31915cdb11fb06572fe73ad7ebbab983c6cdfc87b6a0c9e0ba
 EBUILD darcs-2.0.2.ebuild 3227 RMD160 665eb7b84866fce8a99fd0c93fb4ab3d56c2db78 SHA1 b850ecc4544c59092d81a9d95daebef51af2a17f SHA256 02777ab0a8e9ccf21b1b466b7090db02b66f5da3907ca8cabd8933ffa9ada1af
-EBUILD darcs-2.1.0-r1.ebuild 2805 RMD160 27b169ae95406d967445838bf3b50ebfe1792036 SHA1 e44ff459150db5cb1f7dac01cee0e62dc3944583 SHA256 880e1a615e1122523178696b05c8a8205e05aaac695eb60a521379d55110210e
-EBUILD darcs-2.2.1.ebuild 2387 RMD160 46364b38e35561a8392b4b26d7928fc1e34fc20b SHA1 18aad9953e008cd50c1d2618eb2e16b9965bd434 SHA256 6379bc494e8b1b4ad9ebc36b63a27a56397ed2b0df48c878ed4adbd6e0e40a14
+EBUILD darcs-2.1.0-r1.ebuild 2781 RMD160 f99d3a9cbdb220c624cc584db85a18bc446ad1de SHA1 b1ad1aad24262319859e9d166470369bc77d1903 SHA256 5f83a97f4c43216c9c975009fb1e5c6d94ed2a2640135e6023a65108160fb811
+EBUILD darcs-2.2.1.ebuild 2363 RMD160 1c4f98f7a7d5c57c5dbd9970ef40187915e7fbd4 SHA1 3603fb40c1836f75b87272460ca90495da167ef7 SHA256 ba6ed3fda9fa3fd27a029c50c93d0dfddf3933e76d4d31c9177883e787c218c7
 EBUILD darcs-2.4.4.ebuild 4054 RMD160 879d1474fb06c40ca4124816239f1a57b4aed61d SHA1 9e724b6de27a2d6928fe2c7ae94b71fb134343a2 SHA256 405b1c6af6fbc26df5099a218affcc268cc81edb452d62316e724ddcd143d17d
-EBUILD darcs-2.4.ebuild 3420 RMD160 aab36417f45cfc531cc8d218776d7cdb3930ded4 SHA1 598c42ab161e4e39b2e848481b440d5cba366e11 SHA256 3fc9bb7d6bb66b7684832aefe43525c41a2c40b5f0df801b4e2f3b838e2e56e3
-MISC ChangeLog 17435 RMD160 ba10824b95ceb378d3dd54328a6289dd62a56916 SHA1 81505f0ea9ecf91ea6ff88858824194f3fda28c4 SHA256 035fbff32159a63fd7fddc59957929be2cef1b1ea6ddac82558a9577116d16fa
+MISC ChangeLog 17921 RMD160 d2faf5c020a46f0e0d52dcbd892f12901be511a4 SHA1 8a7980a8fb11d5af8d6d061d0a909d4b43dfab9e SHA256 83eb6bd6240cfc5618c7cc5d0f54f47604b7e87643a5a0f0ba43e645bca94cdd
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkv5p/sACgkQ1n/CYbXjntK7sQCgk6shT4PlTCAX0FVJE8esadKE
-JygAn1BMYUsx3crLIcihSEZR2iRyIE9y
-=OHaI
+iEYEARECAAYFAkwZwc8ACgkQ1n/CYbXjntK1gACfWiNAJV6oLijXBlEj5OUNLmhu
+zGYAoKm1eKpZbaJswBzlxfVtur1J7+Vb
+=ZNbk
 -----END PGP SIGNATURE-----

diff --git a/dev-vcs/darcs/darcs-1.1.0_pre1.ebuild b/dev-vcs/darcs/darcs-1.1.0_pre1.ebuild
deleted file mode 100644 (file)
index 2f1b9a3..0000000
--- a/dev-vcs/darcs/darcs-1.1.0_pre1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-1.1.0_pre1.ebuild,v 1.1 2010/03/14 12:29:26 kolmodin Exp $
-
-inherit base autotools eutils
-
-DESCRIPTION="David's Advanced Revision Control System is yet another replacement for CVS"
-HOMEPAGE="http://darcs.net"
-MY_P0="${P/_rc/rc}"
-MY_P="${MY_P0/_pre/pre}"
-SRC_URI="http://darcs.net/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="doc"
-
-DEPEND=">=net-misc/curl-7.10.2
-       >=dev-lang/ghc-6.2.2
-       =dev-haskell/quickcheck-1*
-       dev-haskell/mtl
-       dev-haskell/html
-       dev-haskell/parsec
-       dev-haskell/regex-compat
-       sys-apps/diffutils
-       doc?  ( virtual/latex-base
-               >=dev-tex/latex2html-2002.2.1_pre20041025-r1 )"
-
-RDEPEND=">=net-misc/curl-7.10.2
-       virtual/mta
-       dev-libs/gmp"
-
-S=${WORKDIR}/${MY_P}
-
-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_unpack() {
-       base_src_unpack
-
-       # For GHC 6.8* compatibility, make sure
-       #  * the new openFd/fdToHandle API is found
-       #  * to use the containers package, if it exists
-       # Works with all GHC versions
-       cd "${S}"
-       epatch "${FILESDIR}/${PN}-1.1.0pre1-ghc68.patch"
-
-       pushd tools
-       epatch "${FILESDIR}/${PN}-1.0.9-bashcomp.patch"
-       popd
-
-       # 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) $(CPPFLAGS))\):\1 $(addprefix -opta,$(CFLAGS)):' \
-               "${S}/autoconf.mk.in"
-
-       # On ia64 we need to tone down the level of inlining so we don't break some
-       # of the low level ghc/gcc interaction gubbins.
-       use ia64 && sed -i 's/-funfolding-use-threshold20//' "${S}/GNUmakefile"
-
-       # Since we've patched the build system:
-       cd "${S}"
-       eautoreconf
-}
-
-src_compile() {
-
-       econf $(use_with doc docs) \
-               || die "configure failed"
-       emake all || die "make failed"
-}
-
-src_test() {
-       make test
-}
-
-src_install() {
-       make DESTDIR="${D}" installbin || die "installation failed"
-       # The bash completion should be installed in /usr/share/bash-completion/
-       # rather than /etc/bash_completion.d/ . Fixes bug #148038.
-       insinto "/usr/share/bash-completion" \
-               && doins "${D}/etc/bash_completion.d/darcs" \
-               && rm    "${D}/etc/bash_completion.d/darcs" \
-               && rmdir "${D}/etc/bash_completion.d" \
-               && rmdir "${D}/etc" \
-               || die "fixing location of darcs bash completion failed"
-       if use doc; then
-               dodoc "${S}/doc/manual/darcs.ps" || die "installing darcs.ps failed"
-               dohtml -r "${S}/doc/manual/"* || die "installing darcs manual failed"
-       fi
-}
-
-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 "/etc/ssmtp/ssmtp.conf with appropriate values for your site."
-}

diff --git a/dev-vcs/darcs/darcs-2.1.0-r1.ebuild b/dev-vcs/darcs/darcs-2.1.0-r1.ebuild
index 70b8c70da6f696b5467afa1cb4f00c8145b925e4..a8934f0a57ae5902ea9cc11bf61773e936bf5ef5 100644 (file)
--- a/dev-vcs/darcs/darcs-2.1.0-r1.ebuild
+++ b/dev-vcs/darcs/darcs-2.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.1.0-r1.ebuild,v 1.1 2010/03/14 12:29:26 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.1.0-r1.ebuild,v 1.2 2010/06/17 06:33:35 kolmodin Exp $
 
 inherit base autotools eutils
 
@@ -16,7 +16,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 IUSE="doc"
 
 DEPEND=">=net-misc/curl-7.10.2
-       >=dev-lang/ghc-6.2.2
+       >=dev-lang/ghc-6.8
        =dev-haskell/quickcheck-1*
        dev-haskell/mtl
        dev-haskell/html
@@ -24,7 +24,6 @@ DEPEND=">=net-misc/curl-7.10.2
        dev-haskell/regex-compat
        sys-apps/diffutils
        dev-haskell/network
-       dev-haskell/filepath
        sys-libs/zlib
        doc?  ( virtual/latex-base
                >=dev-tex/latex2html-2002.2.1_pre20041025-r1 )"

diff --git a/dev-vcs/darcs/darcs-2.2.1.ebuild b/dev-vcs/darcs/darcs-2.2.1.ebuild
index 896408d63a86863bb5358c03c90c22541dc44d2a..921c5313489137fbd89ce2d9815657597ef44f73 100644 (file)
--- a/dev-vcs/darcs/darcs-2.2.1.ebuild
+++ b/dev-vcs/darcs/darcs-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.2.1.ebuild,v 1.1 2010/03/14 12:29:26 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.2.1.ebuild,v 1.2 2010/06/17 06:33:35 kolmodin Exp $
 
 CABAL_FEATURES="bin lib haddock"
 inherit haskell-cabal eutils bash-completion
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linu
 IUSE="doc"
 
 DEPEND=">=net-misc/curl-7.10.2
-       >=dev-lang/ghc-6.2.2
+       >=dev-lang/ghc-6.8
        >=dev-haskell/cabal-1.6
        =dev-haskell/quickcheck-1*
        dev-haskell/mtl
@@ -25,7 +25,6 @@ DEPEND=">=net-misc/curl-7.10.2
        dev-haskell/regex-compat
        sys-apps/diffutils
        dev-haskell/network
-       dev-haskell/filepath
        doc?  ( virtual/latex-base
                >=dev-tex/latex2html-2002.2.1_pre20041025-r1
                >=dev-haskell/haddock-2.4.1 )"

diff --git a/dev-vcs/darcs/darcs-2.4.ebuild b/dev-vcs/darcs/darcs-2.4.ebuild
deleted file mode 100644 (file)
index cfe2462..0000000
--- a/dev-vcs/darcs/darcs-2.4.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.4.ebuild,v 1.1 2010/03/28 21:40:12 kolmodin Exp $
-
-EAPI="2"
-CABAL_FEATURES="bin lib profile haddock"
-inherit haskell-cabal eutils bash-completion
-
-DESCRIPTION="a distributed, interactive, smart revision control system"
-HOMEPAGE="http://darcs.net/"
-SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="doc"
-
-# keywording notes:
-# many packages needs extensible-exceptions, thus ghc 6.10 or higher.
-# the result is that we had to drop a few arches from KEYWORDS until we have
-# arranged ghc binaries for those arches.
-
-# 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.6.1
-               =dev-haskell/hashed-storage-0.4*
-               =dev-haskell/haskeline-0.6*
-               =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/regex-compat-0.94
-               =dev-haskell/terminfo-0.3*
-               =dev-haskell/utf8-string-0.3*
-               <dev-haskell/zlib-0.6.0.0
-               net-misc/curl"
-
-DEPEND="${COMMONDEPS}
-               >=dev-haskell/cabal-1.6
-               doc?  ( virtual/latex-base
-                               dev-tex/latex2html )"
-
-# 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
-
-       # We don't have threaded ghc builds at least for those platforms,
-       # so it won't just work.
-       # 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.
-       if use alpha || use hppa || use ppc64 ; then
-               sed -i 's/-threaded//g' "${S}/darcs.cabal" || die "Unable to sed -threaded out."
-       fi
-}
-
-src_configure() {
-       # 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
-}
-
-src_install() {
-       cabal_src_install
-       dobashcompletion "${S}/contrib/darcs_completion" "${PN}"
-
-       # fixup perms in such an an awkward way
-       mv "${D}/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"
-}
-
-pkg_postinst() {
-       ghc-package_pkg_postinst
-       bash-completion_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 "/etc/ssmtp/ssmtp.conf with appropriate values for your site."
-}