Bump git-annex to 3.20120522

Package-Manager: portage-2.1.10.63/cvs/Linux x86_64

3 files changed, 91 insertions, 6 deletions

diff --git a/dev-vcs/git-annex/ChangeLog b/dev-vcs/git-annex/ChangeLog
index e7e0bd9e3265..d2cf0e32f2d6 100644
--- a/dev-vcs/git-annex/ChangeLog
+++ b/dev-vcs/git-annex/ChangeLog
@@ -1,6 +1,11 @@
 # 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.4 2012/03/24 14:28:51 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.5 2012/06/02 08:49:44 gienah Exp $
+
+*git-annex-3.20120522 (02 Jun 2012)
+
+  02 Jun 2012; Mark Wright <gienah@gentoo.org> +git-annex-3.20120522.ebuild:
+  Bump git-annex to 3.20120522
 
 *git-annex-3.20120315 (24 Mar 2012)
 
diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index a949e4e812c5..081cac205ef1 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 DIST git-annex-3.20111203.tar.gz 442974 RMD160 b5f06d6cbffc3cab1dca5f53f2b41ef748ae6d26 SHA1 3aea68b9e00fdfcc08d6f55f7879e21b6d4844df SHA256 3b7361c9d27302f23136266ff1223b2a82c280988b3c706d518539eb577af244
 DIST git-annex-3.20120315.tar.gz 622433 RMD160 4bdfd530aafc0e4fb016f0904babb9600b8018c5 SHA1 7e6008cf9dfb5b1e0c0528858841fea0a83957bb SHA256 742f37f04d94a97086ffdb0ad7e903b1729f7fb40bdd580fe500a859ffca1762
+DIST git-annex-3.20120522.tar.gz 638849 RMD160 fdd1018d9dceee3bbae04c6818abdef3e0ca1653 SHA1 01d00ca65599b5450333fb67f4072c956010a8d6 SHA256 694e59c93e8049172a54e6898c274b200c62d62b9b3064687a76c318727b5925
 EBUILD git-annex-3.20111203-r1.ebuild 1470 RMD160 06fc27ce37631cbfb492af7ebd34b9c05d1ce5c0 SHA1 60967accb40185eeb3f1e177b836270ad6c3b931 SHA256 374be6894bcbc51c5150fdd715dcaec9d536f5daae16d30aab9f1b82f2021676
 EBUILD git-annex-3.20111203.ebuild 986 RMD160 96a04cbb14982b36eb8f859915b531622c4f2064 SHA1 e1d21993456c8d866ac281814caea209a25e0d19 SHA256 3fe88d21f2bd09150b69fed9624ca794f8b14e7effc979968719891021054cfe
 EBUILD git-annex-3.20120315.ebuild 1832 RMD160 02d745c5bcd8dbe1898f508a2c24e7cf9bb5c079 SHA1 ba4c5de91048bb0ec42201e5a0bea3b0afd9442e SHA256 481825ef0a2cf0178a2468f6543744df856b44ada4c3ab2f11328205d0983989
-MISC ChangeLog 1039 RMD160 90b888d15c7b892fe21378bca8a0afe0f4ca7a19 SHA1 c2907cfb26f5545a929a4548301aa52da3a3af06 SHA256 47a7dade04e69b6cb8ce607be03de32e2154a1ca5617ab3a7ebbc78a97f967d7
+EBUILD git-annex-3.20120522.ebuild 1951 RMD160 a29befa83280317bc1f17b165a08c946a697e3f0 SHA1 0349f3c1cc04ee809a19413cf00e8820970c3cbd SHA256 9fc9ec33a0251803a0bef7cdc477e8893ebd9819b879e6cdec4c6a7b4b025ca5
+MISC ChangeLog 1185 RMD160 3c62407e01a255a156386966d5bccd39ba457f85 SHA1 57f0bbe4c1ab845a0ec734f7493670ead55c12e6 SHA256 ee5e41c293c21c4d9f0a5a4f6540c75c7837295c0fb9be760f5d46ecb5d720b8
 MISC metadata.xml 1020 RMD160 81b37c15cbdd25d6dcb65d45e5ba706c8674d6c7 SHA1 4d4ea625f0309ea23886699dc3c0a0b556d8f89f SHA256 adb6331810d079ace08d3df7e88a56839b86d9656b42a6212f641a462d34b4c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk9t20UACgkQcaHudmEf86rVUQCfU54cTGMU8HM67xbgTgyVVkS3
-cAEAn01pYnHyOJF8eVRx0rK0ULghKoYz
-=3w5u
+iF4EAREIAAYFAk/J07IACgkQoBEVQmGOlx+c6QEAplvES3l+kK1KDtz3832PrOm9
++9uQlVKYDMvKxlSN3HUA/1lCFG7r0kvlSh+doUa3dmCdeXM2+9orSeA9MVQ9HAPK
+=mRlB
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-annex/git-annex-3.20120522.ebuild b/dev-vcs/git-annex/git-annex-3.20120522.ebuild
new file mode 100644
index 000000000000..9c7084769fc3
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-3.20120522.ebuild
@@ -0,0 +1,78 @@
+# 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.1 2012/06/02 08:49:44 gienah 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="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}
+		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
+		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/time
+		dev-haskell/transformers-base
+		dev-haskell/utf8-string
+		>=dev-lang/ghc-6.12.3
+		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
+}