gentoo resync : 14.07.2018

8 files changed, 302 insertions, 0 deletions

diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
new file mode 100644
index 000000000000..15b2fc1c4573
--- /dev/null
+++ b/dev-vcs/git-annex/Manifest
@@ -0,0 +1,8 @@
+AUX git-annex-6.20160114-QC-2.8.2.patch 509 BLAKE2B 2d84231d59a062bbe3e5a2c970f8c01e7da5cea0e42ff40bedffcfea079e3e131a395a033a3c1d012bda31af2c2326dc4d75c929e8e47b2e198a7ebcc2efadc6 SHA512 2df4f294bd8e39a067cdf7adf0f44d08a7910d7954529d053fd35d35b263dc891ecb1390427783c3448d660e918b6076c86e6c01145f272226c20c8d7688cd1c
+AUX git-annex-6.20161210-directory-1.3.patch 279 BLAKE2B 7d85392d72f146c4fb7545c19b362c6f1915925570f69697f612defdcf811596e2b339d2d9a6ed4038f5fc73bf887ecea464a768d40d4616a8fc1992836b279a SHA512 6247c9d8221ec3c1090d6cd66fbf525ea429e64ade0820a54d5116d69c36ba69f7f7ce1ec46d26afdacd24ffdad813ad540abbecd50fca318c7439bd347a6533
+AUX git-annex-6.20170101-crypto-api.patch 212 BLAKE2B 0e9e1fdda1a93ffd709955c472052aa507e364c94095b6acf94f94693c23681a145f808b17c98bb5d40ddc111bb2de43f594e4333e2f6322c93ff711268916f0 SHA512 c0b69ef8dffd9df06663513233f7848e3f8abfec5f6f93656cbfc466887ac5d2bbbbe65bb07088a488616593a44456fa9aa459a1404352afa66b2b7cdc937dfe
+AUX git-annex.bash 440 BLAKE2B af7b2b47e98386cef417051a11ae4baff07ea8cd96177c95b6b49095f5b7724ecbc1c4f13a6f351afe66f0d015c7355b6a56b77c06cb1e9e5cf155268312c619 SHA512 89b6520e4be14af9032638c1153df936a7e5707d6453b4251fe762712b8956ba1d39a4623b06910e5ac5724e33e157e654b724e070b6893f6f26578df730d326
+AUX git-annex.xpm 1961 BLAKE2B 0fe6e0cf9c43b1b16db1e8394ccda5eef2fdc41727aa3aa97fef8f955e8fdd71336c29f439ed2ad46553f8d67ef8be9d3dbcc6a93c81686f5e746a08b1113c6d SHA512 4a22ac448852160d66838c272f41b8c7599aa1b904e35ac03ea294d9ed15b855bde24b7e5407a2578937bfd51d482837ed6680af680166d030f71666316ae4d3
+DIST git-annex-6.20170818.tar.gz 1111837 BLAKE2B ff18ffd101b3f9dc2b74caaed57c8f8f568fc51beeedddccf7f76ef5a27a99801cb994a52f09e5467be2f030842f4fa3b38bfd0a19a207057ffe269dfc8f240c SHA512 06587bf0d3056e4b94d4c40aaae820efda133dcbc876a2ac3db3183fb511ec20aae4c495323b4886868a3e66b5b1f53a04c5f3abb0362c718bbadc8e2f6e15d0
+EBUILD git-annex-6.20170818.ebuild 4444 BLAKE2B d02fff7a8112f721b41a85cd4f57dcc35103e891bc494cec0130b449215cdc18b6b1cb529222561ad582deead7e9375a720862d13ecf740ce27ee1c0abaeaffa SHA512 219ceefb167332eff7c24aa3733b0ca05ca3b5eef843f65b9526df73de49d67cee243835ed9613beafeb5bbef4f698799b154fd1c9d5da57137fadd61731c56f
+MISC metadata.xml 1735 BLAKE2B 7722b62eae4ad8f3859262d67f6ed9223b6eb86962fa52a4d53ed9f9569dfd6045be8bd7c975fe8719a25fc13ae7c64d7be2fbd5993f77583f2b5d8a77d83c20 SHA512 33e68df57c88e73f1d1b88d051a0f9a22a84dea82e26b8b552a36f213c63680fd780bbc8c2cdf1f1c9e57b47d982218a4b096ac59e8137b019af7164fe72ea69
diff --git a/dev-vcs/git-annex/files/git-annex-6.20160114-QC-2.8.2.patch b/dev-vcs/git-annex/files/git-annex-6.20160114-QC-2.8.2.patch
new file mode 100644
index 000000000000..2f232782de02
--- /dev/null
+++ b/dev-vcs/git-annex/files/git-annex-6.20160114-QC-2.8.2.patch
@@ -0,0 +1,16 @@
+diff --git a/Utility/QuickCheck.hs b/Utility/QuickCheck.hs
+index cd408dd..9f60f23 100644
+--- a/Utility/QuickCheck.hs
++++ b/Utility/QuickCheck.hs
+@@ -9,2 +9,3 @@
+ {-# LANGUAGE TypeSynonymInstances #-}
++{-# LANGUAGE CPP #-}
+ 
+@@ -23,2 +24,3 @@ import Prelude
+ 
++#if ! MIN_VERSION_QuickCheck(2,8,2)
+ instance (Arbitrary k, Arbitrary v, Eq k, Ord k) => Arbitrary (M.Map k v) where
+@@ -28,2 +30,3 @@ instance (Arbitrary v, Eq v, Ord v) => Arbitrary (S.Set v) where
+ 	arbitrary = S.fromList <$> arbitrary
++#endif
+ 
diff --git a/dev-vcs/git-annex/files/git-annex-6.20161210-directory-1.3.patch b/dev-vcs/git-annex/files/git-annex-6.20161210-directory-1.3.patch
new file mode 100644
index 000000000000..1e9bb57f9eec
--- /dev/null
+++ b/dev-vcs/git-annex/files/git-annex-6.20161210-directory-1.3.patch
@@ -0,0 +1,9 @@
+diff --git a/Common.hs b/Common.hs
+index 5213863..74b054e 100644
+--- a/Common.hs
++++ b/Common.hs
+@@ -27,3 +27,3 @@ import Utility.Process as X
+ import Utility.Path as X
+-import Utility.Directory as X
++import Utility.Directory as X hiding (getFileSize)
+ import Utility.Monad as X
diff --git a/dev-vcs/git-annex/files/git-annex-6.20170101-crypto-api.patch b/dev-vcs/git-annex/files/git-annex-6.20170101-crypto-api.patch
new file mode 100644
index 000000000000..c517c651ce47
--- /dev/null
+++ b/dev-vcs/git-annex/files/git-annex-6.20170101-crypto-api.patch
@@ -0,0 +1,8 @@
+diff --git a/git-annex.cabal b/git-annex.cabal
+index 5b95a16..f03024d 100644
+--- a/git-annex.cabal
++++ b/git-annex.cabal
+@@ -326,2 +326,3 @@ Executable git-annex
+    case-insensitive,
++   crypto-api,
+    random,
diff --git a/dev-vcs/git-annex/files/git-annex.bash b/dev-vcs/git-annex/files/git-annex.bash
new file mode 100644
index 000000000000..309b221f0157
--- /dev/null
+++ b/dev-vcs/git-annex/files/git-annex.bash
@@ -0,0 +1,19 @@
+_git_annex()
+{
+    local cmdline
+    local IFS=$'
+'
+    CMDLINE=(--bash-completion-index $COMP_CWORD)
+
+    if [[ "${COMP_WORDS[@]:0:2}" == "git annex" ]]; then
+        unset COMP_WORDS[0]
+        COMP_WORDS[1]="git-annex"
+    fi
+    for arg in ${COMP_WORDS[@]}; do
+        CMDLINE=(${CMDLINE[@]} --bash-completion-word $arg)
+    done
+
+    COMPREPLY=( $(/usr/bin/git-annex "${CMDLINE[@]}") )
+}
+
+complete -o filenames -F _git_annex git-annex
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-6.20170818.ebuild b/dev-vcs/git-annex/git-annex-6.20170818.ebuild
new file mode 100644
index 000000000000..29375595e8d4
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-6.20170818.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.3.9999
+#hackport: flags: -production,-android,-androidsplice,-testsuite
+
+CABAL_FEATURES=""
+inherit haskell-cabal bash-completion-r1
+
+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="+assistant benchmark +concurrentoutput +dbus doc +magicmime +network-uri +pairing s3 +torrentparser +webapp +webdav"
+
+RDEPEND="dev-haskell/aeson:=
+	dev-haskell/async:=
+	dev-haskell/bloomfilter:=
+	dev-haskell/byteable:=
+	dev-haskell/case-insensitive:=
+	dev-haskell/crypto-api:=
+	dev-haskell/cryptonite:=
+	dev-haskell/data-default:=
+	dev-haskell/disk-free-space:=
+	dev-haskell/dlist:=
+	dev-haskell/edit-distance:=
+	dev-haskell/esqueleto:=
+	>=dev-haskell/exceptions-0.6:=
+	>=dev-haskell/feed-0.3.9:=
+	dev-haskell/free:=
+	dev-haskell/hslogger:=
+	dev-haskell/http-client:=
+	>=dev-haskell/http-conduit-2.0:=
+	>=dev-haskell/http-types-0.7:=
+	dev-haskell/ifelse:=
+	dev-haskell/memory:=
+	dev-haskell/monad-control:=
+	dev-haskell/monad-logger:=
+	>=dev-haskell/mtl-2:=
+	dev-haskell/old-locale:=
+	>=dev-haskell/optparse-applicative-0.11.0:=
+	dev-haskell/persistent:=
+	dev-haskell/persistent-sqlite:=
+	dev-haskell/persistent-template:=
+	>=dev-haskell/quickcheck-2.1:2=
+	dev-haskell/random:=
+	dev-haskell/regex-tdfa:=
+	dev-haskell/resourcet:=
+	dev-haskell/safesemaphore:=
+	dev-haskell/sandi:=
+	dev-haskell/securemem:=
+	dev-haskell/socks:=
+	dev-haskell/split:=
+	>=dev-haskell/stm-2.3:=
+	dev-haskell/stm-chans:=
+	dev-haskell/text:=
+	dev-haskell/unix-compat:=
+	dev-haskell/unordered-containers:=
+	dev-haskell/utf8-string:=
+	>=dev-haskell/uuid-1.2.6:=
+	>=dev-lang/ghc-7.8.2:=
+	assistant? ( >=dev-haskell/dns-1.0.0:=
+			dev-haskell/hinotify:=
+			dev-haskell/mountpoints:=
+			sys-process/lsof )
+	benchmark? ( dev-haskell/criterion:= )
+	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
+	dbus? ( >=dev-haskell/dbus-0.10.7:=
+		>=dev-haskell/fdo-notify-0.3:= )
+	magicmime? ( dev-haskell/magic:= )
+	network-uri? ( >=dev-haskell/network-2.6:=
+			>=dev-haskell/network-uri-2.6:= )
+	!network-uri? ( >=dev-haskell/network-2.4:= <dev-haskell/network-2.6:= )
+	pairing? ( dev-haskell/network-info:=
+			dev-haskell/network-multicast:= )
+	s3? ( >=dev-haskell/aws-0.9.2:=
+		dev-haskell/conduit:=
+		dev-haskell/conduit-extra:= )
+	torrentparser? ( >=dev-haskell/torrent-10000.0.0:= )
+	webapp? ( dev-haskell/blaze-builder:=
+			dev-haskell/clientsession:=
+			>=dev-haskell/path-pieces-0.1.4:=
+			>=dev-haskell/shakespeare-2.0.0:=
+			dev-haskell/wai:=
+			dev-haskell/wai-extra:=
+			>=dev-haskell/warp-3.0.0.5:=
+			>=dev-haskell/warp-tls-1.4:=
+			>=dev-haskell/yesod-1.2.6:=
+			>=dev-haskell/yesod-core-1.2.19:=
+			>=dev-haskell/yesod-default-1.2.0:=
+			>=dev-haskell/yesod-form-1.3.15:=
+			>=dev-haskell/yesod-static-1.2.4:= )
+	webdav? ( >=dev-haskell/dav-1.0:= )
+"
+# not generated by hackport:
+RDEPEND="${RDEPEND}
+	dev-vcs/git
+"
+
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+# not generated by hackport:
+DEPEND="${DEPEND}
+	dev-lang/perl
+	doc? ( www-apps/ikiwiki net-misc/rsync )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.20160114-QC-2.8.2.patch
+	"${FILESDIR}"/${PN}-6.20161210-directory-1.3.patch
+	"${FILESDIR}"/${PN}-6.20170101-crypto-api.patch
+)
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-android \
+		--flag=-androidsplice \
+		$(cabal_flag assistant assistant) \
+		$(cabal_flag benchmark benchmark) \
+		$(cabal_flag concurrentoutput concurrentoutput) \
+		$(cabal_flag dbus dbus) \
+		$(cabal_flag magicmime magicmime) \
+		$(cabal_flag network-uri network-uri) \
+		$(cabal_flag pairing pairing) \
+		--flag=-production \
+		$(cabal_flag s3 s3) \
+		--flag=-testsuite \
+		$(cabal_flag torrentparser torrentparser) \
+		$(cabal_flag webapp webapp) \
+		$(cabal_flag webdav webdav)
+}
+
+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
+
+	newbashcomp "${FILESDIR}"/${PN}.bash ${PN}
+
+	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
new file mode 100644
index 000000000000..e35251395d35
--- /dev/null
+++ b/dev-vcs/git-annex/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		git-annex allows managing files with git, without checking the file
+		contents into git. While that may seem paradoxical, it is useful when
+		dealing with files larger than git can currently easily handle, whether due
+		to limitations in memory, checksumming time, or disk space.
+		
+		Even without file content tracking, being able to manage files with git,
+		move files around and delete files with versioned directory trees, and use
+		branches and distributed clones, are all very handy reasons to use git. And
+		annexed files can co-exist in the same git repository with regularly
+		versioned files, which is convenient for maintaining documents, Makefiles,
+		etc that are associated with annexed files but that benefit from full
+		revision control.
+	</longdescription>
+	<use>
+		<flag name="assistant">Enable git-annex assistant and watch command</flag>
+		<flag name="benchmark">Enable benchmarking</flag>
+		<flag name="concurrentoutput">Use concurrent-output library (experimental)</flag>
+		<flag name="magicmime">Use libmagic to determine file MIME types</flag>
+		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
+		<flag name="pairing">Enable pairing of git annex repositories</flag>
+		<flag name="s3">Enable Amazon S3 remote</flag>
+		<flag name="torrentparser">Use haskell torrent library to parse torrent files</flag>
+		<flag name="webapp">Enable git-annex webapp</flag>
+		<flag name="webdav">Enable webdav remote</flag>
+	</use>
+</pkgmetadata>