Add new version, drop old #500688

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xEAD50D64D8D3571A!)

5 files changed, 45 insertions, 155 deletions

diff --git a/dev-vcs/git-annex/ChangeLog b/dev-vcs/git-annex/ChangeLog
index 3426dd988c29..05265a2505c8 100644
--- a/dev-vcs/git-annex/ChangeLog
+++ b/dev-vcs/git-annex/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-vcs/git-annex
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.20 2014/02/10 09:01:13 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.21 2014/03/12 21:33:28 qnikst Exp $
+
+*git-annex-5.20140306 (12 Mar 2014)
+
+  12 Mar 2014; Alexander Vershilov <qnikst@gentoo.org>
+  +git-annex-5.20140306.ebuild, -git-annex-3.20111203-r1.ebuild,
+  -git-annex-3.20120605.ebuild, -git-annex-5.20131130.ebuild, metadata.xml:
+  Add new version, drop old #500688
 
   10 Feb 2014; Alexander Vershilov <qnikst@gentoo.org>
   git-annex-5.20131130.ebuild:
diff --git a/dev-vcs/git-annex/git-annex-3.20111203-r1.ebuild b/dev-vcs/git-annex/git-annex-3.20111203-r1.ebuild
deleted file mode 100644
index 395fa9904f73..000000000000
--- a/dev-vcs/git-annex/git-annex-3.20111203-r1.ebuild
+++ /dev/null
@@ -1,57 +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/git-annex/git-annex-3.20111203-r1.ebuild,v 1.5 2012/12/07 10:39:18 slyfox Exp $
-
-# ebuild generated by hackport 0.2.13
-
-EAPI="3"
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="manage files with git, without checking their contents into git"
-HOMEPAGE="http://git-annex.branchable.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-vcs/git-1.7.7" # TODO: add more deps?
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6
-		dev-haskell/dataenc
-		dev-haskell/hs3
-		dev-haskell/hslogger
-		dev-haskell/http
-		dev-haskell/json[generic]
-		dev-haskell/missingh
-		dev-haskell/monad-control
-		>=dev-haskell/mtl-2
-		dev-haskell/network
-		dev-haskell/pcre-light
-		dev-haskell/sha
-		dev-haskell/utf8-string
-		>=dev-lang/ghc-6.10.1
-		dev-lang/perl
-		doc? ( www-apps/ikiwiki net-misc/rsync )"
-# dev-lang/perl is to build the manpages
-# www-apps/ikiwiki and net-misc/rsync used to build the rest of the docs
-
-src_prepare() {
-	echo 'mans: $(mans)' >>"${S}"/Makefile
-}
-
-src_compile() {
-	haskell-cabal_src_compile
-	use doc && emake docs
-	emake mans
-}
-
-src_install() {
-	#haskell-cabal_src_install
-	emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
-	mv "${ED}"/usr/share/doc/{${PN},${PF}}
-	dodoc CHANGELOG README
-}
diff --git a/dev-vcs/git-annex/git-annex-3.20120605.ebuild b/dev-vcs/git-annex/git-annex-3.20120605.ebuild
deleted file mode 100644
index a4678a560257..000000000000
--- a/dev-vcs/git-annex/git-annex-3.20120605.ebuild
+++ /dev/null
@@ -1,77 +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/git-annex/git-annex-3.20120605.ebuild,v 1.5 2012/12/07 10:39:18 slyfox Exp $
-
-EAPI=4
-
-# ebuild generated by hackport 0.2.18.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="manage files with git, without checking their contents into git"
-HOMEPAGE="http://git-annex.branchable.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT=test # don't seem to like our git environment much
-
-RDEPEND=">=dev-vcs/git-1.7.7" # TODO: add more deps?
-DEPEND="${RDEPEND}
-		test? ( dev-haskell/extensible-exceptions
-			dev-haskell/hunit
-			dev-haskell/testpack
-		)
-		dev-haskell/bloomfilter
-		>=dev-haskell/cabal-1.8
-		dev-haskell/dataenc
-		dev-haskell/edit-distance
-		dev-haskell/hs3
-		dev-haskell/hslogger
-		dev-haskell/http
-		dev-haskell/ifelse
-		dev-haskell/json[generic]
-		dev-haskell/lifted-base
-		dev-haskell/missingh
-		dev-haskell/monad-control
-		dev-haskell/mtl
-		dev-haskell/network
-		dev-haskell/pcre-light
-		>=dev-haskell/quickcheck-2.1
-		dev-haskell/sha
-		dev-haskell/text
-		dev-haskell/transformers-base
-		dev-haskell/utf8-string
-		>=dev-lang/ghc-7.4
-		dev-lang/perl
-		doc? ( www-apps/ikiwiki net-misc/rsync )"
-# dev-lang/perl is to build the manpages
-# www-apps/ikiwiki and net-misc/rsync used to build the rest of the docs
-
-src_prepare() {
-	echo 'mans: $(mans)' >>"${S}"/Makefile
-}
-
-src_compile() {
-	haskell-cabal_src_compile
-	use doc && emake docs
-	emake mans
-}
-
-src_test() {
-	export GIT_CONFIG=${T}/temp-git-config
-	git config user.email "git@src_test"
-	git config user.name "Mr. ${P} The Test"
-
-	emake test
-}
-
-src_install() {
-	#haskell-cabal_src_install
-	emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
-	mv "${ED}"/usr/share/doc/{${PN},${PF}}
-	dodoc CHANGELOG README
-}
diff --git a/dev-vcs/git-annex/git-annex-5.20131130.ebuild b/dev-vcs/git-annex/git-annex-5.20140306.ebuild
index 5ab13257f327..dbf5778d8aa7 100644
--- a/dev-vcs/git-annex/git-annex-5.20131130.ebuild
+++ b/dev-vcs/git-annex/git-annex-5.20140306.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-5.20131130.ebuild,v 1.3 2014/02/10 09:01:13 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-5.20140306.ebuild,v 1.1 2014/03/12 21:33:28 qnikst Exp $
 
 EAPI=5
 
-# ebuild generated by hackport 0.3.4.9999
+# ebuild generated by hackport 0.3.5
 
 CABAL_FEATURES="bin"
 inherit haskell-cabal
@@ -17,9 +17,7 @@ RESTRICT="test"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="android +assistant +cryptohash +dbus +dns doc +feed +inotify +pairing +production +quvi +s3 +tdfa +testsuite +webapp +webdav +xmpp"
-
-# hackport-args: --extra-dep='doc? ( www-apps/ikiwiki )'
+IUSE="android androidsplice +assistant +cryptohash +dbus +dns doc ekg +feed +inotify +pairing tahoe +production +quvi +s3 +tdfa +testsuite +webapp +webdav +xmpp"
 
 RDEPEND="dev-vcs/git
 "
@@ -27,7 +25,9 @@ DEPEND="${RDEPEND}
 	dev-haskell/async
 	dev-haskell/bloomfilter
 	>=dev-haskell/cabal-1.8
+	dev-haskell/case-insensitive
 	dev-haskell/dataenc
+	dev-haskell/data-default
 	dev-haskell/dlist
 	dev-haskell/edit-distance
 	dev-haskell/extensible-exceptions
@@ -44,48 +44,52 @@ DEPEND="${RDEPEND}
 	dev-haskell/random
 	dev-haskell/safesemaphore
 	dev-haskell/sha
+	>=dev-haskell/stm-2.3
 	dev-haskell/text
 	dev-haskell/unix-compat
 	dev-haskell/utf8-string
 	dev-haskell/uuid
 	>=dev-lang/ghc-7.4.1
 	android? ( dev-haskell/data-endian )
-	quvi? ( dev-haskell/aeson )
-	assistant? ( >=dev-haskell/stm-2.3
-			inotify? ( dev-haskell/hinotify ) )
+	assistant? ( inotify? ( dev-haskell/hinotify ) )
 	cryptohash? ( >=dev-haskell/cryptohash-0.10.0 )
 	dbus? ( >=dev-haskell/dbus-0.10.3 )
 	dns? ( dev-haskell/dns )
-	doc? ( www-apps/ikiwiki )
+	ekg? ( dev-haskell/aeson
+		dev-haskell/ekg
+		dev-haskell/http-types )
 	feed? ( dev-haskell/feed )
 	pairing? ( dev-haskell/network-info
 			dev-haskell/network-multicast )
-	s3? ( dev-haskell/aeson
-		dev-haskell/hs3
-		webapp? ( !webdav? ( dev-haskell/http-types ) ) )
+	s3? ( dev-haskell/hs3 )
+	tahoe? ( dev-haskell/aeson )
 	tdfa? ( dev-haskell/regex-tdfa )
-	testsuite? ( >=dev-haskell/tasty-0.5.1
-			>=dev-haskell/tasty-hunit-0.4.1
-			>=dev-haskell/tasty-quickcheck-0.3.1 )
-	webapp? ( dev-haskell/blaze-builder
-		    dev-haskell/aeson
-			dev-haskell/case-insensitive
+	testsuite? ( dev-haskell/tasty
+			dev-haskell/tasty-hunit
+			dev-haskell/tasty-quickcheck
+			dev-haskell/tasty-rerun )
+	webapp? ( dev-haskell/aeson
+			dev-haskell/blaze-builder
 			dev-haskell/clientsession
 			dev-haskell/crypto-api
-			dev-haskell/data-default
 			dev-haskell/hamlet
+			dev-haskell/http-types
+			dev-haskell/network-conduit
 			dev-haskell/transformers
 			dev-haskell/wai
 			dev-haskell/wai-logger
 			dev-haskell/warp
+			dev-haskell/warp-tls
 			dev-haskell/yesod
 			dev-haskell/yesod-core
 			dev-haskell/yesod-default
 			dev-haskell/yesod-form
 			dev-haskell/yesod-static )
 	webdav? ( >=dev-haskell/dav-0.3
+		    dev-haskell/http-client
 			dev-haskell/http-conduit
-			dev-haskell/xml-conduit )
+			dev-haskell/http-types
+			dev-haskell/lifted-base )
 	xmpp? ( >=dev-haskell/gnutls-0.1.4
 		dev-haskell/network-protocol-xmpp
 		dev-haskell/xml-types )
@@ -93,19 +97,29 @@ DEPEND="${RDEPEND}
 		doc? ( www-apps/ikiwiki net-misc/rsync )
 "
 
+src_prepare() {
+	# at least USE="cryptohash dbus dns inotify pairing production quvi s3 tdfa testsuite -xmpp -webdav -webapp -feed -assistant"
+	# need STM via Remote.External
+	cabal_chdeps \
+		'MissingH, hslogger, directory, filepath,' 'MissingH, hslogger, directory, filepath, stm,'
+}
+
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag android android) \
+		$(cabal_flag androidsplice androidsplice) \
 		$(cabal_flag assistant assistant) \
 		$(cabal_flag cryptohash cryptohash) \
 		$(cabal_flag dbus dbus) \
 		$(cabal_flag dns dns) \
+		$(cabal_flag ekg ekg) \
 		$(cabal_flag feed feed) \
 		$(cabal_flag inotify inotify) \
 		$(cabal_flag pairing pairing) \
 		$(cabal_flag production production) \
 		$(cabal_flag quvi quvi) \
 		$(cabal_flag s3 s3) \
+		$(cabal_flag tahoe tahoe) \
 		$(cabal_flag tdfa tdfa) \
 		$(cabal_flag testsuite testsuite) \
 		$(cabal_flag webapp webapp) \
diff --git a/dev-vcs/git-annex/metadata.xml b/dev-vcs/git-annex/metadata.xml
index b69c7d8ed6e1..a60b8e4989c3 100644
--- a/dev-vcs/git-annex/metadata.xml
+++ b/dev-vcs/git-annex/metadata.xml
@@ -22,13 +22,16 @@
 	<use>
 		<flag name="assistant">Enable git-annex assistant and watch command</flag>
 		<flag name="android">Building for Android</flag>
+		<flag name="androidsplice">Get TH splices for Android.</flag>
 		<flag name="cryptohash">Enable use of cryptohash for checksumming</flag>
 		<flag name="dns">Enable the haskell DNS library for DNS lookup</flag>
+		<flag name="ekg">Enable use of EKG to monitor git-annex as it runs.</flag>
 		<flag name="feed">Enable podcast feed support</flag>
 		<flag name="production">Enable production build (slower build; faster binary)</flag>
 		<flag name="pairing">Enable pairing of git annex repositories</flag>
 		<flag name="quvi">Enable use of quvi to download videos</flag>
 		<flag name="s3">Enable Amazon S3 remote</flag>
+		<flag name="tahoe">Enable the tahoe special remote</flag>
 		<flag name="tdfa">Use regex-tdfa for wildcards</flag>
 		<flag name="testsuite">Embed the test suite into git-annex</flag>
 		<flag name="webapp">Enable git-annex webapp</flag>