Version bump (ghc-7.4 support). Restore prefix support.

(Portage version: 2.2.0_alpha91/cvs/Linux x86_64)

3 files changed, 84 insertions, 4 deletions

diff --git a/dev-vcs/git-annex/ChangeLog b/dev-vcs/git-annex/ChangeLog
index f17c83050bb1..e7e0bd9e3265 100644
--- a/dev-vcs/git-annex/ChangeLog
+++ b/dev-vcs/git-annex/ChangeLog
@@ -1,6 +1,12 @@
 # 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.3 2012/02/09 05:48:59 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.4 2012/03/24 14:28:51 slyfox Exp $
+
+*git-annex-3.20120315 (24 Mar 2012)
+
+  24 Mar 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +git-annex-3.20120315.ebuild, git-annex-3.20111203-r1.ebuild:
+  Version bump (ghc-7.4 support). Restore prefix support.
 
 *git-annex-3.20111203-r1 (09 Feb 2012)
 
diff --git a/dev-vcs/git-annex/git-annex-3.20111203-r1.ebuild b/dev-vcs/git-annex/git-annex-3.20111203-r1.ebuild
index 3277d026a3a4..bba0ecb1fc09 100644
--- a/dev-vcs/git-annex/git-annex-3.20111203-r1.ebuild
+++ b/dev-vcs/git-annex/git-annex-3.20111203-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2012/02/09 05:48:59 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-3.20111203-r1.ebuild,v 1.2 2012/03/24 14:28:51 slyfox Exp $
 
 # ebuild generated by hackport 0.2.13
 
@@ -52,7 +52,7 @@ src_compile() {
 
 src_install() {
 	#haskell-cabal_src_install
-	emake install DESTDIR="${D}"
-	mv "${D}"/usr/share/doc/{${PN},${PF}}
+	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.20120315.ebuild b/dev-vcs/git-annex/git-annex-3.20120315.ebuild
new file mode 100644
index 000000000000..b0e7f22912d9
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-3.20120315.ebuild
@@ -0,0 +1,74 @@
+# 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.1 2012/03/24 14:28:51 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="http://hackage.haskell.org/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/time
+		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
+}