Version bump.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

4 files changed, 122 insertions, 6 deletions

diff --git a/dev-vcs/darcs/ChangeLog b/dev-vcs/darcs/ChangeLog
index 0da3bed87883..f5cf2aafaa0a 100644
--- a/dev-vcs/darcs/ChangeLog
+++ b/dev-vcs/darcs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/darcs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/ChangeLog,v 1.61 2015/07/18 13:14:48 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/ChangeLog,v 1.62 2015/08/01 11:22:28 slyfox Exp $
+
+*darcs-2.10.0-r1 (01 Aug 2015)
+
+  01 Aug 2015; Sergei Trofimovich <slyfox@gentoo.org> +darcs-2.10.0-r1.ebuild,
+  metadata.xml:
+  Version bump.
 
   18 Jul 2015; Sergei Trofimovich <slyfox@gentoo.org> darcs-2.8.4-r6.ebuild:
   alpha/amd64/ia64/ppc/ppc64/sparc/x86 stable wrt bug #554768
diff --git a/dev-vcs/darcs/Manifest b/dev-vcs/darcs/Manifest
index 65d4da3befa4..9218090ba941 100644
--- a/dev-vcs/darcs/Manifest
+++ b/dev-vcs/darcs/Manifest
@@ -7,19 +7,21 @@ AUX darcs-2.8.4-ghc-7.8-part-2.patch 449 SHA256 1f8fcdc2c2c0b40d5062cbb45ec4a58f
 AUX darcs-2.8.4-issue2364-part-2.patch 1787 SHA256 f4468cdad4a344f48e3cefcf977d3423f4a5a98bce04326d6578d11b022cc19f SHA512 54594052d5492d98472da7aee611314bd08e3dfd3bfbe55b082cf3071048b4a066ddcdbbf445be6774255f406c8f67a6c9a76e536817354b89902ee30eeed02b WHIRLPOOL b07f0d58c06d44691e4a5ac907d35903fa80aeddb13d3c18cbd9368cbc270ae5baf77e90326a1b569b39db08505dd8d3cd14e0a8d31e325b32377c131f58fec9
 AUX darcs-2.8.4-issue2364.patch 2955 SHA256 82a427123f74a288bad08a23189be94b2137c5a264faa8e96e12ec527174b53c SHA512 01c70841c53bfdc8d047bd91609a30e37dee9def3c52930709a990ad4918461f01d5467ff9a0c0771def5151fdc5198c9a883c2f25ff2a16be756f60029f1e2e WHIRLPOOL f7f6cc4dfe2458a038cf1df5f8d72e1d0acd4245d297221fdf3d08c00576fbb0f7040e7498b0f21f0a43ef55298ada4e14eb46943566f901fd6450a73a67af5e
 AUX darcs-2.8.5-ghc-7.10.patch 4824 SHA256 bf3f70b1e2a43aa252c9b4e62d4e2ac92db27875e7e1f016bef098702a4bc6bc SHA512 f26d65a30b416dccdbc24990ea9148ab862d3b83b7e6659fd8e7ed426cccc79ef3fa3cb9f29a09e8f17aad7ce00605237faf1d923b8306748ead4f1fabd84bba WHIRLPOOL d9d1b492f217773bfac2055be7b10fcff0947f8bb211be08ec5b322ab69478a5f92e7fb61e827a4fa85d4373f5a83f7f02c651f0a6befc329aab0d7d64cdc2f9
+DIST darcs-2.10.0.tar.gz 1502347 SHA256 52b3db3f7b64a4306585b96af7b5887f62ba54f6e9c3bdbed9b6a18d97f16b36 SHA512 216fb69aeed03c56cc7773eb92b8de3ec60be0526826a15a05230b7a66f9804e492be230c82c6475faa46e49ffed1531a9b03ea0d9c60e8de802cb9cdd421dcb WHIRLPOOL 3c62966ee5ab933471f8c42ff8be622ed8d6d0f8c392528906288f0da8a0d8dacb512c8645b82fba4ca4a03f628fc361630079b0bd6d6d09bce640cf03fd322c
 DIST darcs-2.8.4.tar.gz 1301464 SHA256 3fab4dbb2d5dd9f381d49f4730c12e1534b5c484b0dde9712614a7151f659f98 SHA512 c60531bacea43bdd5a18ae461dd390fe64682cac56fa4e6b5153a5da3c003b59d8fb24827bd42b4b30f0d2c61877d36b58eb98317644f9f8a200ab7c5961c48e WHIRLPOOL 128e8e58e219d427928eb8725d9566c1b6b3bb478b3cda69b30ded8798fa104eb8dec0fda8a32701f5d074babf9f11f1b3036388cd15a82118853a566c832430
 DIST darcs-2.8.5.tar.gz 1306525 SHA256 064310ed589c89500e224ad5254ab88de815c349f14f9aef9513720eb857e399 SHA512 810fd8d2df2f8703891e85dc512b0185257dc84a35590aecb2077e14a78096b4fac57dbd7f89218987d04df846992d51c5d5c4deb8cc9f441ce9195ab202223b WHIRLPOOL 78cb6d20d8bd0af5eea71e3e737c12ef7063eb71f1788c2eb173abd5813930862b2e8f078243f2f650e4a65a4405b2d1d1539aef05a193e85521f367ec3ddd80
+EBUILD darcs-2.10.0-r1.ebuild 4866 SHA256 8427b5764c3db04c8ed8f8015bb3e4dd831ebb9d5aa87b25bb90828148cf9bc7 SHA512 8a1f452085770980462fc8993f2c6cd9a2b33b2f354863a366a760da1609985cfd421cdb24a17e895e362cfdd2b6a0c1ed6297263de58d1f3981e7a4e3e92994 WHIRLPOOL ede8197e5ac7f3e61b1783ae0b60f5573d9a0ad08b474bd573b915107bb043665807d6ff30e48f373049320358691ffe5bf80f1c1669a954222ad2b4996838e8
 EBUILD darcs-2.8.4-r3.ebuild 4518 SHA256 02f691062bdd148c0bc42bd9b805de612f05cc53354a73e063542814e2926498 SHA512 6adbf8b0217e1d7e2b0455896b194e256cbc019962037f592491d77bf338167277093ccc66ef359f9e7edc84c2629159406c0a91af93bdbc4f4a58bcfe24bb89 WHIRLPOOL 270679efd2794d8322c85f56dcc8c40021bd2eaba5d6fea89e792bc1be6786733f78c1069025cad6b034c57f4055261674e70b05fc95d348b46dbd6ece72e739
 EBUILD darcs-2.8.4-r6.ebuild 4850 SHA256 f7721d08027234e2468cb9b9e5ea59714dadb76c5d033253c824c495d223eed6 SHA512 ec8178ad5ca26960cff148953e9e6b9af9d07889d14087acf7cb9156d640c0d4571b0c2aa3ba986a579fb6e170e5636b5b35617b9451868bddf561e4b234b891 WHIRLPOOL 1c8712d9d1bb92c675e7a049ac9a23f0f0769a5aa49079b9c20792a4c838729fc900378f04d44c6fd16fc73201bb1936435dce67eea9d76b31525693ebd1cf5b
 EBUILD darcs-2.8.4.ebuild 4007 SHA256 da954f2190488bf79281f4fb886e4905449b4558f60fb011702eb4c13a2f6166 SHA512 c4a5ffc93b719eb33cf43f869a4b2db67b3bc96a6296188900c15020fe536670f1eee4ff33605fb6a193ac0a0d533a6d47dd6bb79edf266065f50405634c31ba WHIRLPOOL ed40c3cc1e73a2bcc87d59a645e99f107387d104e553ccc515ab7c11aa5dc06473395ac6753ea20c0fc5bd2c667ed777b39a6939a20f6c730f6cb7223dda544b
 EBUILD darcs-2.8.5-r3.ebuild 3954 SHA256 814dfc1db175d16f6a73f72ea0fe535b7a8c031b3a2d565bc97633d83b41f454 SHA512 20ef49f37f806fa0dcb38873f731d97b3a92a1e9b530f08949f715da6c9daacb4445b9eb391fd3b8655fb16b27edeb920301c02ac27bbd35da1a3fa31b102ce0 WHIRLPOOL 5829fe4c681a1443cf83a54ccf871416faf0c99ae92b5cbe1dd9e69aa8089e8f3c454c29b439b8e8e682f82875056ffd22b95e0fce8f6829d59f58ef5b740218
 EBUILD darcs-2.8.5-r4.ebuild 4023 SHA256 c577259182200fd1daf0bc3d37036cf753b30a4fc0a1ea653c6882f8d8e4f004 SHA512 19dbd5340a26848e7d091cb6c81c2a33198eb253ceb492db47f4aae7ee6a0fead6565e6797c6591edb8e160409b481dcae358cf8f3489aae05f72d99f113e347 WHIRLPOOL 96028f76f6ae1ce9162a8626822de86dd2805c9c1b4e265ab6a94dbaff86a410cb581cbc5f89b6bc2c889641b71249a0d00b11190a470b534edabe15def0671e
-MISC ChangeLog 27920 SHA256 3e0663180a3689594fd394d03d333e0aba1f66ce1eb680bfd5870be6af6d80b4 SHA512 a6a7b295028aa0080fde81f6b935b330ec7805cecaa0925115fa322210381432b456ba5ecd9342ed5dfa3804c5e1d7cb033dd04286e03c19229acaf3ca0f8a11 WHIRLPOOL 6de6e3c0fb9a66d2cd8cd3af15425d82957af6218b932e7ac1eaf6d5fe88a6eac148d198605252d1467d4e4d137afd6cbb122028ab2a1d9081883b2c68ead689
-MISC metadata.xml 658 SHA256 2b88dfa6478c987c89bea68395e3aaae3e2c27da154fdeecb8d42666a4216d0d SHA512 dc02d85ca156604f7de0fc1c8669e6333a6d5f6bd24d16609a4308724d10bec51ab1b454de682657cc68e0d97a29897a64c34afa5c9b7ebf87c9a7c54f6bfb73 WHIRLPOOL 1c3abd8bf0177497c1f51372ab45df732639a8ffe244a0c30268e4a431c29ab3172156de5803600c013d6507677cfe433625c451794342acbc71decf977636c2
+MISC ChangeLog 28064 SHA256 cfffb77c5b60ad37671bb1449c826aadc233ee21201cd0351481ebaf6fcb60b2 SHA512 2753f9264a2447e715dbd6d2594b4058403f34ce28bd4452ff02290e9b7c30feb1a7ed8bbe0ab7566bc444d6a38192fd6e8da374c1d9912dd3fa21f1ede85b98 WHIRLPOOL 6a209389f2af7a5bc9d92e3b5c4ed1fd505eaf0f20e1ff8e9908a0fea4f400efd37d1701e62d05b22e800b3b2e2fbf801084c38cc6e9d2c1311500bb137f0dbc
+MISC metadata.xml 714 SHA256 8a40ca9ddfe3e420d23600b2c92ce7ee499047b04341e1a00a10d860db03836e SHA512 8cdb8b97ffd11ff6517ac897d210b4977a9201bc6b6a0455a6d5941d792d74cc3850ff7591b068cc28921ad43530ec5c2da2be6e07c0b181187fb4beb8a8600a WHIRLPOOL 5815d22a103b6757be4955a588d8996e4ac41400a9bf4ef3711e2a8dadd83eb40b9602213876a0ef07a552786efe8ccbc89f9b6dc51e05ef4498a1916be3f691
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlWqUUoACgkQcaHudmEf86rypACeJxVEnlNhmtuy4PCirzslQiAt
-AP8AnigVeWHvsllo0cZqVz6buQzhZBoh
-=WiPA
+iEYEAREIAAYFAlW8q/cACgkQcaHudmEf86pOZgCdEwsdikDM2FfscJCjDBLuRnAm
+0oEAnR+Q1LJWGUDc6D5fypzNT1ub02iq
+=zSFY
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/darcs/darcs-2.10.0-r1.ebuild b/dev-vcs/darcs/darcs-2.10.0-r1.ebuild
new file mode 100644
index 000000000000..7b1e7105e640
--- /dev/null
+++ b/dev-vcs/darcs/darcs-2.10.0-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.10.0-r1.ebuild,v 1.1 2015/08/01 11:22:28 slyfox Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+#hackport: flags: +library,+executable,-hpc,-warn-as-error,+pkgconfig,-rts,-static,-optimize
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+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/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+curl diff +http +terminfo +threaded"
+
+RESTRICT=test # some files are missing
+
+RDEPEND=">=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+	>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
+	>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?]
+	>=dev-haskell/cryptohash-0.4:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
+	>=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?]
+	>=dev-haskell/dataenc-0.11:=[profile?] <dev-haskell/dataenc-0.15:=[profile?]
+	>=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
+	>=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?]
+	>=dev-haskell/html-1.0:=[profile?] <dev-haskell/html-1.1:=[profile?]
+	>=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?]
+	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+	>=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?]
+	>=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?]
+	>=dev-haskell/tar-0.4:=[profile?] <dev-haskell/tar-0.5:=[profile?]
+	>=dev-haskell/text-0.11.2.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?]
+	>=dev-haskell/unix-compat-0.1.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?]
+	>=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.11:=[profile?]
+	>=dev-haskell/zip-archive-0.2.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
+	>=dev-haskell/zlib-0.5.3.0:=[profile?] <dev-haskell/zlib-0.6.0.0:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	virtual/libiconv
+	|| ( ( >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.4.0.0:=[profile?] )
+		( >dev-haskell/transformers-0.4.0.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?] ) )
+	curl? ( net-misc/curl )
+	diff? ( dev-haskell/lcs:=[profile?] )
+	http? ( >=dev-haskell/http-4000.2.3:=[profile?] <dev-haskell/http-4000.3:=[profile?]
+		>=dev-haskell/network-2.6:=[profile?]
+		dev-haskell/network-uri:=[profile?]
+		)
+	terminfo? ( >=dev-haskell/terminfo-0.3:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	dev-lang/ghc
+	test? ( >=dev-haskell/cmdargs-0.10 <dev-haskell/cmdargs-0.11
+		>=dev-haskell/findbin-0.0 <dev-haskell/findbin-0.1
+		>=dev-haskell/hunit-1.0 <dev-haskell/hunit-1.3
+		>=dev-haskell/quickcheck-2.3 <dev-haskell/quickcheck-2.8
+		>=dev-haskell/shelly-1.6 <dev-haskell/shelly-1.7
+		>=dev-haskell/split-0.1.4.1 <dev-haskell/split-0.3
+		>=dev-haskell/test-framework-0.4.0 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2.2 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
+	curl? ( virtual/pkgconfig )
+"
+
+src_prepare() {
+	cabal_chdeps \
+		'terminfo == 0.3.*' 'terminfo >= 0.3' \
+		'network >= 2.3 && < 2.5' 'network >= 2.6, network-uri' \
+		'QuickCheck   >= 2.3 && < 2.8' 'QuickCheck   >= 2.3' \
+		'attoparsec   >= 0.11 && < 0.13' 'attoparsec   >= 0.11 && < 0.14'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag curl curl) \
+		--flag=executable \
+		$(cabal_flag diff hashed-storage-diff) \
+		--flag=-hpc \
+		$(cabal_flag http http) \
+		--flag=library \
+		--flag=-optimize \
+		--flag=pkgconfig \
+		--flag=-rts \
+		--flag=-static \
+		$(cabal_flag terminfo terminfo) \
+		$(cabal_flag threaded threaded) \
+		--flag=-warn-as-error
+}
+
+src_install() {
+	haskell-cabal_src_install
+
+	# 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"
+}
diff --git a/dev-vcs/darcs/metadata.xml b/dev-vcs/darcs/metadata.xml
index d469a3f04348..91743df1aec2 100644
--- a/dev-vcs/darcs/metadata.xml
+++ b/dev-vcs/darcs/metadata.xml
@@ -7,6 +7,7 @@
 </maintainer>
 <use>
   <flag name="color">Use ansi color escapes.</flag>
+  <flag name="diff">Use 'lcs' for diff building.</flag>
   <flag name="http">Use the pure Haskell HTTP package for HTTP support.</flag>
   <flag name="optimize">Build with optimizations (-O2).</flag>
   <flag name="network-uri">Get Network.URI from the network-uri package.</flag>