Version bump (bug #444010 by Ivan S. Titov and Manuel Rüger).

(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)

5 files changed, 53 insertions, 124 deletions

diff --git a/dev-vcs/git-annex/ChangeLog b/dev-vcs/git-annex/ChangeLog
index a03f315daa80..755fd156510a 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.11 2012/12/07 10:39:18 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.12 2012/12/16 12:42:31 slyfox Exp $
+
+*git-annex-3.20121211-r2 (16 Dec 2012)
+
+  16 Dec 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +git-annex-3.20121211-r2.ebuild, -git-annex-3.20111203.ebuild,
+  -git-annex-3.20120315.ebuild, -git-annex-3.20120522.ebuild, metadata.xml:
+  Version bump (bug #444010 by Ivan S. Titov and Manuel Rüger).
 
   07 Dec 2012; Sergei Trofimovich <slyfox@gentoo.org>
   git-annex-3.20111203-r1.ebuild, git-annex-3.20111203.ebuild,
diff --git a/dev-vcs/git-annex/git-annex-3.20111203.ebuild b/dev-vcs/git-annex/git-annex-3.20111203.ebuild
deleted file mode 100644
index dbcfe5d60dea..000000000000
--- a/dev-vcs/git-annex/git-annex-3.20111203.ebuild
+++ /dev/null
@@ -1,36 +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.ebuild,v 1.4 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=""
-
-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
-		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"
diff --git a/dev-vcs/git-annex/git-annex-3.20120315.ebuild b/dev-vcs/git-annex/git-annex-3.20120315.ebuild
deleted file mode 100644
index 902a21fb11e0..000000000000
--- a/dev-vcs/git-annex/git-annex-3.20120315.ebuild
+++ /dev/null
@@ -1,73 +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.20120315.ebuild,v 1.3 2012/12/07 10:39:18 slyfox Exp $
-
-# ebuild generated by hackport 0.2.17.9999
-
-EAPI=4
-
-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"
-
-RESTRICT=test # don't seem to like our git environment much
-
-RDEPEND=">=dev-vcs/git-1.7.7" # TODO: add more deps?
-DEPEND="${RDEPEND}
-		dev-haskell/bloomfilter
-		>=dev-haskell/cabal-1.6
-		dev-haskell/dataenc
-		dev-haskell/hs3
-		dev-haskell/hslogger
-		dev-haskell/http
-		dev-haskell/ifelse
-		dev-haskell/json
-		dev-haskell/lifted-base
-		dev-haskell/missingh
-		dev-haskell/monad-control
-		>=dev-haskell/mtl-2
-		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-3.20120522.ebuild b/dev-vcs/git-annex/git-annex-3.20121211-r2.ebuild
index b8fc45d8ebd6..358c28a1a264 100644
--- a/dev-vcs/git-annex/git-annex-3.20120522.ebuild
+++ b/dev-vcs/git-annex/git-annex-3.20121211-r2.ebuild
@@ -1,12 +1,12 @@
 # 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.20120522.ebuild,v 1.6 2012/12/07 10:39:18 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-3.20121211-r2.ebuild,v 1.1 2012/12/16 12:42:31 slyfox Exp $
 
-EAPI=4
+EAPI=5
 
-# ebuild generated by hackport 0.2.18.9999
+# ebuild generated by hackport 0.3.1.9999
 
-CABAL_FEATURES="bin"
+CABAL_FEATURES="bin" # test-suite" broken
 inherit haskell-cabal
 
 DESCRIPTION="manage files with git, without checking their contents into git"
@@ -16,20 +16,19 @@ 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
+IUSE="dbus doc inotify s3 test"
+RESTRICT=test # don't seem to like our git environment much, does not ship all files
 
 RDEPEND=">=dev-vcs/git-1.7.7" # TODO: add more deps?
 DEPEND="${RDEPEND}
-		test? ( dev-haskell/extensible-exceptions
-			dev-haskell/hunit
+		test? ( 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/extensible-exceptions
 		dev-haskell/hslogger
 		dev-haskell/http
 		dev-haskell/ifelse
@@ -37,22 +36,47 @@ DEPEND="${RDEPEND}
 		dev-haskell/lifted-base
 		dev-haskell/missingh
 		dev-haskell/monad-control
-		dev-haskell/mtl
-		dev-haskell/network
+		>=dev-haskell/mtl-2.1.1
+		>=dev-haskell/network-2.0
 		dev-haskell/pcre-light
 		>=dev-haskell/quickcheck-2.1
+		dev-haskell/safesemaphore
 		dev-haskell/sha
 		dev-haskell/text
 		dev-haskell/transformers-base
 		dev-haskell/utf8-string
-		>=dev-lang/ghc-7.4
+		>=dev-lang/ghc-7.4.1
+
+		dbus? ( >=dev-haskell/dbus-0.10.3 )
+		inotify? ( dev-haskell/hinotify )
+		s3? ( dev-haskell/hs3 )
+
 		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() {
+	#epatch "${FILESDIR}"/${P}-no-tf.patch
 	echo 'mans: $(mans)' >>"${S}"/Makefile
+
+	# there is no kqueue on linux, but should be on freebsd and solaris(?)
+	cabal_chdeps \
+		'testpack' 'testpack, SafeSemaphore' \
+		'if (! os(windows) && ! os(solaris))' 'if (! os(windows) && ! os(linux))'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-Assistant \
+		$(cabal_flag dbus Dbus) \
+		--flag=-DNS \
+		$(cabal_flag inotify Inotify) \
+		--flag=-Pairing \
+		$(cabal_flag s3 S3) \
+		--flag=-Webapp \
+		--flag=-WebDAV \
+		--flag=-XMPP
 }
 
 src_compile() {
@@ -70,8 +94,11 @@ src_test() {
 }
 
 src_install() {
-	#haskell-cabal_src_install
-	emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
+	haskell-cabal_src_install
+	dosym git-annex /usr/bin/git-annex-shell # standard make install does more, than needed
+
+	emake install-mans DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
+	use doc && emake install-docs DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
 	mv "${ED}"/usr/share/doc/{${PN},${PF}}
 	dodoc CHANGELOG README
 }
diff --git a/dev-vcs/git-annex/metadata.xml b/dev-vcs/git-annex/metadata.xml
index 19222bedf181..3c6377554ae5 100644
--- a/dev-vcs/git-annex/metadata.xml
+++ b/dev-vcs/git-annex/metadata.xml
@@ -19,4 +19,8 @@
 		etc that are associated with annexed files but that benefit from full
 		revision control.
 	</longdescription>
+	<use>
+		<flag name="inotify">Enable inotify support (<pkg>dev-haskell/hinotify</pkg>)</flag>
+		<flag name="s3">Enable S3 support (<pkg>dev-haskell/hs3</pkg>)</flag>
+	</use>
 </pkgmetadata>