Bump git-annex to 5.20131130

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

5 files changed, 204 insertions, 9 deletions

diff --git a/dev-vcs/git-annex/ChangeLog b/dev-vcs/git-annex/ChangeLog
index 4ceb60a6c921..0f3c90e957de 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.17 2013/09/30 02:42:30 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.18 2013/12/11 13:26:21 gienah Exp $
+
+*git-annex-5.20131130 (11 Dec 2013)
+
+  11 Dec 2013; Mark Wright <gienah@gentoo.org> +files/git-annex.xpm,
+  +git-annex-5.20131130.ebuild, git-annex-4.20130815-r1.ebuild, metadata.xml:
+  Bump git-annex to 5.20131130
 
   30 Sep 2013; Patrick Lauer <patrick@gentoo.org> metadata.xml:
   Drop unneeded useflag description from metadata.xml
diff --git a/dev-vcs/git-annex/files/git-annex.xpm b/dev-vcs/git-annex/files/git-annex.xpm
new file mode 100644
index 000000000000..781f21c5e9dc
--- /dev/null
+++ b/dev-vcs/git-annex/files/git-annex.xpm
@@ -0,0 +1,47 @@
+/* XPM */
+static char * git_annex_42x42_xpm[] = {
+"42 40 4 1",
+" 	c None",
+".	c #40BF4C",
+"+	c #D8382D",
+"@	c #666666",
+"   .                                  .   ",
+"  ...                                ...  ",
+"  ...                                ...  ",
+" .....                              ..... ",
+".......                            .......",
+"  ...                                ...  ",
+"  .                                    .  ",
+"     .                              .     ",
+"   ..                                ..   ",
+"   .               ....               .   ",
+"     ..            ....            ..     ",
+"    ....           ....           ....    ",
+"     .....         ....         .....     ",
+"      .... . ................ . ....      ",
+"       ..  . ................ .  ..       ",
+"          .. ................ ..          ",
+"                   ....                   ",
+"                   ....                   ",
+"                   ....                   ",
+"                   ....                   ",
+"                                          ",
+"             ++++++++++++++++             ",
+"             ++++++++++++++++             ",
+"             ++++++++++++++++             ",
+"             ++++++++++++++++             ",
+"                                          ",
+"                 @@  @@@@@@@@             ",
+"               @@@@  @@@@@@@@             ",
+"               @@@@  @@@@@@               ",
+"              @@@@@  @@@@@@@              ",
+"              @@@    @@  @@@              ",
+"             @@@@    @@  @@@@             ",
+"             @@@     @@   @@@             ",
+"             @@@@         @@@             ",
+"              @@@        @@@@             ",
+"              @@@@       @@@              ",
+"              @@@@@@  @@@@@@              ",
+"               @@@@@@@@@@@@               ",
+"                @@@@@@@@@@                ",
+"                  @@@@@@                  "};
diff --git a/dev-vcs/git-annex/git-annex-4.20130815-r1.ebuild b/dev-vcs/git-annex/git-annex-4.20130815-r1.ebuild
index a9ef7ae886ac..09e5969e1b44 100644
--- a/dev-vcs/git-annex/git-annex-4.20130815-r1.ebuild
+++ b/dev-vcs/git-annex/git-annex-4.20130815-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-4.20130815-r1.ebuild,v 1.1 2013/09/29 05:55:25 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-4.20130815-r1.ebuild,v 1.2 2013/12/11 13:26:21 gienah Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ RESTRICT="test"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="+assistant +dbus +dns doc +feed +inotify +pairing +production +s3 +tdfa +testsuite +webapp +webdav +xmpp"
 
 RDEPEND=">=dev-vcs/git-1.7.7
diff --git a/dev-vcs/git-annex/git-annex-5.20131130.ebuild b/dev-vcs/git-annex/git-annex-5.20131130.ebuild
new file mode 100644
index 000000000000..fa3886053efe
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-5.20131130.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2013 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.1 2013/12/11 13:26:21 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.4.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"
+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"
+
+RDEPEND="dev-vcs/git
+"
+DEPEND="${RDEPEND}
+	dev-haskell/async
+	dev-haskell/bloomfilter
+	>=dev-haskell/cabal-1.8
+	dev-haskell/dataenc
+	dev-haskell/dlist
+	dev-haskell/edit-distance
+	dev-haskell/extensible-exceptions
+	dev-haskell/hslogger
+	dev-haskell/http
+	dev-haskell/ifelse
+	dev-haskell/json[generic]
+	dev-haskell/missingh
+	dev-haskell/monad-control
+	dev-haskell/monadcatchio-transformers
+	>=dev-haskell/mtl-2
+	>=dev-haskell/network-2.0
+	>=dev-haskell/quickcheck-2.1
+	dev-haskell/random
+	dev-haskell/safesemaphore
+	dev-haskell/sha
+	dev-haskell/text
+	dev-haskell/unix-compat
+	dev-haskell/utf8-string
+	dev-haskell/uuid
+	>=dev-lang/ghc-7.4.1
+	www-apps/ikiwiki
+	android? ( dev-haskell/data-endian )
+	assistant? ( >=dev-haskell/stm-2.3
+			inotify? ( dev-haskell/hinotify ) )
+	cryptohash? ( >=dev-haskell/cryptohash-0.10.0 )
+	dbus? ( >=dev-haskell/dbus-0.10.3 )
+	dns? ( dev-haskell/dns )
+	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 ) ) )
+	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/case-insensitive
+			dev-haskell/clientsession
+			dev-haskell/crypto-api
+			dev-haskell/data-default
+			dev-haskell/hamlet
+			dev-haskell/transformers
+			dev-haskell/wai
+			dev-haskell/wai-logger
+			dev-haskell/warp
+			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-conduit
+			dev-haskell/xml-conduit )
+	xmpp? ( >=dev-haskell/gnutls-0.1.4
+		dev-haskell/network-protocol-xmpp
+		dev-haskell/xml-types )
+		dev-lang/perl
+		doc? ( www-apps/ikiwiki net-misc/rsync )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag android android) \
+		$(cabal_flag assistant assistant) \
+		$(cabal_flag cryptohash cryptohash) \
+		$(cabal_flag dbus dbus) \
+		$(cabal_flag dns dns) \
+		$(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 tdfa tdfa) \
+		$(cabal_flag testsuite testsuite) \
+		$(cabal_flag webapp webapp) \
+		$(cabal_flag webdav webdav) \
+		$(cabal_flag xmpp xmpp)
+}
+
+src_compile() {
+	haskell-cabal_src_compile
+	use doc && emake docs
+}
+
+src_test() {
+	if use webapp; then
+		export GIT_CONFIG=${T}/temp-git-config
+		git config user.email "git@src_test"
+		git config user.name "Mr. ${P} The Test"
+
+		emake test
+	fi
+}
+
+src_install() {
+	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
+	if use webapp ; then
+		doicon "${FILESDIR}"/${PN}.xpm
+		make_desktop_entry "${PN} webapp" "git-annex" ${PN}.xpm "Office"
+	fi
+}
diff --git a/dev-vcs/git-annex/metadata.xml b/dev-vcs/git-annex/metadata.xml
index d61d87397bea..b69c7d8ed6e1 100644
--- a/dev-vcs/git-annex/metadata.xml
+++ b/dev-vcs/git-annex/metadata.xml
@@ -20,15 +20,18 @@
 		revision control.
 	</longdescription>
 	<use>
-		<flag name="s3">Enable Amazon S3 remote</flag>
-		<flag name="webdav">Enable webdav remote</flag>
-		<flag name="dns">Enable the haskell DNS library for DNS lookup</flag>
 		<flag name="assistant">Enable git-annex assistant and watch command</flag>
+		<flag name="android">Building 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="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="tdfa">Use regex-tdfa for wildcards</flag>
 		<flag name="testsuite">Embed the test suite into git-annex</flag>
-		<flag name="pairing"> Enable pairing of git annex repositories</flag>
 		<flag name="webapp">Enable git-annex webapp</flag>
-		<flag name="tdfa">Use regex-tdfa for wildcards</flag>
-		<flag name="feed">Enable podcast feed support</flag>
+		<flag name="webdav">Enable webdav remote</flag>
 	</use>
 </pkgmetadata>