gentoo resync : 25.09.2019

8 files changed, 175 insertions, 9 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 56f0a3965595..ed473b6338fa 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index 15b2fc1c4573..339053c75ccd 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -4,5 +4,6 @@ AUX git-annex-6.20170101-crypto-api.patch 212 BLAKE2B 0e9e1fdda1a93ffd709955c472
 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-r1.ebuild 4432 BLAKE2B a11a47e9478c27d3929af73accc7b53f7e57b6c011554413cfca75a67d482ce37e3cff868d4b450dcb6929511709579cf9f2c8a0e9322433bf1ac68c06d0095b SHA512 c11f0b8dceb548f7e568ed6c14be06a8a93a0a155c682fffa3203d6eee2356bdd86bf75afc20dbb96e780c1e8623d859f3a18b41c6223c43c911fa71d9e61d1d
 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/git-annex-6.20170818-r1.ebuild b/dev-vcs/git-annex/git-annex-6.20170818-r1.ebuild
new file mode 100644
index 000000000000..2086bf8824d8
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-6.20170818-r1.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 +magic +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:= )
+	magic? ( 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 magic 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/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 04f54365038e..ebb87bac58b3 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,8 +1,8 @@
 DIST tortoisehg-4.9.1.tar.gz 7960667 BLAKE2B f8a6ed65967c6389b65fd9388b3e898bf4ce09e7f95dd88467a10c061b9454eab76d0308905fd417575bf6d75dd7129a2f303bc774fd8e68824b33c18fd8054c SHA512 aef1b0d6047114794bfe78de2c0def83748e238917ce44fb56d562d53c26666dbb385867da70c4625893b148e2affa3766e40292348b78aff428df5a77d8f902
 DIST tortoisehg-4.9.tar.gz 7960163 BLAKE2B bc13032ba1e36ed3e6aca978cb3917b2e5fdcf1b7dab2e66a34a0aca2e084960954f9ec135a1c2120e09931b876db7d1f3d0f3a8f69f950ff939eea9d7814523 SHA512 cc7b0360c6b362b0b9695a484b59eea879e1d4e28ed68e98ce6975342a22ddafc97976c5b0cdea289bfd78932dacf76c0b236e36bec48acd48ee361f2c09ff13
 DIST tortoisehg-5.0.2.tar.gz 8002109 BLAKE2B 3ac66a0b0f943bccc1e9d38f6fb1a788de0e5b538fdf42d59da26de641913802116a73039a2c3516245c1b6abe325b0dd9ca5b2f1c2b60e2dcc6a600e5f1fb97 SHA512 d33916cf3215360cada06de62db46e70c555b1f4cd509f0b863e2baa633e2c5df99f09f3a103444c30aa0a6e15e2acd7134f045cb3846cccc7b727482d94e650
-EBUILD tortoisehg-4.9.1.ebuild 1954 BLAKE2B 9028aad0942af4da0ac5f8360882c442b666b30c5fa1b74ff512aff4b36ff0827621c6673d1d7e36335ebaeb787fbc6cbde21f561bbfa8c674a344015f021753 SHA512 6cdafa06ce1fa0d22e0db989604ee16f65bd5cfe9afb5c2bb6faa81bba67c347b41a54dad39e4522bd1c31ad3c1f3c11853bd78d9b517aa0f174dd17d6beec46
-EBUILD tortoisehg-4.9.ebuild 1953 BLAKE2B cbcbb7714905528371d0a43308a0b6336af836f276c1a8138399952b3fe0dcbcca09ca530be511cc00ef15a142c118fdb54edfbadf8e577d6071b5785e6bba06 SHA512 f58b4e1da76d552a98fb4e54006b1113c9e8309e75fbebfe531050e48a15fbef9722fef28e32982e29e9772866bd4c711ba8efae5770caff483bc050c091d2e2
-EBUILD tortoisehg-5.0.2.ebuild 1953 BLAKE2B 3e3e38c35b87bb9a28e880f61b6c895ea3842bd19f828b108911b11acfc4c1a59eaf222c6a59b4b2359911bc756e46ade2b0367e82058191aa868c3dc64d6dda SHA512 5a1266091a96b4ebb5b89ea1a290bad92ad56d0e385feadfdeab6705e6e8c368810be3358fe3168a3919dc3d9e51c4479dbecaea1c32e89640c1a6b2df9518ca
-EBUILD tortoisehg-9999.ebuild 1956 BLAKE2B 455f8582101c7862cecdba7d683a0fd4eb27c595435ca66819104d94763456c6c8dd4c68f941d9d40b9bc14ff1b73a6c986e4ecdc290d93cd2701b6e53721ae3 SHA512 530d586ce4e1157b10de3a08be0498191827510626e975448ba5dd6e084d5263b14f228043896fab0d87a107ff6f97aa9cfd78b7fe2a505f3f696251d68a56de
+EBUILD tortoisehg-4.9.1.ebuild 1969 BLAKE2B ff541757572e30cdc72fb69da7d62b7dd78d28db6e92e48ecd7b6b04176c71d521c4e42aff55834e9fa1d677b5994a5fe0be95647870975050cb7ed8ca7aa327 SHA512 d487200fbcbe84396376ad775fe3461c0096bb0734649e3230c86dd0b0b628ee5f2286f6415431628811e5e695387238d53dcde369d0bfd25a52b66ceb7ae26a
+EBUILD tortoisehg-4.9.ebuild 1968 BLAKE2B 852d22638a9369c028d1a017c059ee8a6ff8ef7c864dd9d16aff2c46f1e405b1f9f99ecde84159b2546587ac2feaf1aa802dbf6ea0a348ea2ff541a147d79331 SHA512 d3c785146240b0572de0e7776a6cb93d56983a5692c699827a776be7a04add1f085ca165a08b00a1ae3d74de1dfe4b172f4d6fa7ca3ca3451e714fd0bbc62bef
+EBUILD tortoisehg-5.0.2.ebuild 1968 BLAKE2B e0c39b086c76f073d6d968e5158d0e764974614f10af902fdacfc8ccd811e809029009ee58c4b2d332540e58aaec341c741b6e7db1c1ad9cdf9eba91512599eb SHA512 1a65dafa51246db60e167aa5a758937ac19925b66970c31efc56dfe816d0b7a7e5b563139887ab6e27691978d00f622fb56d640ebe7c50642f39852beebb7ebb
+EBUILD tortoisehg-9999.ebuild 1968 BLAKE2B ecd39018aac1e90b9b1811d77f6f61c13c6497095913d78386d5df43c7f06775eec96cdb3173740f8ad03fbe65c2a8053472b34b6de381bf667ee1df6fee02c7 SHA512 55c5e57b0f72a2487395b60252b7722b15fc9d79f663d262bf91ebc5d20590b67f3a3242c6e4dcb0e8af99a3d510b1759a0b71dfdc6a744756eb50467fc12f84
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/dev-vcs/tortoisehg/tortoisehg-4.9.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-4.9.1.ebuild
index ff2d174552da..ff68d5cb0046 100644
--- a/dev-vcs/tortoisehg/tortoisehg-4.9.1.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-4.9.1.ebuild
@@ -62,7 +62,8 @@ python_install_all() {
 	distutils-r1_python_install_all
 	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
 	if use doc ; then
-		dohtml -r doc/build/html/
+		docinto html
+		dodoc -r doc/build/html/.
 	fi
 	newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg
 	domenu contrib/thg.desktop
diff --git a/dev-vcs/tortoisehg/tortoisehg-4.9.ebuild b/dev-vcs/tortoisehg/tortoisehg-4.9.ebuild
index 1d00dabf1ce1..29130cae336a 100644
--- a/dev-vcs/tortoisehg/tortoisehg-4.9.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-4.9.ebuild
@@ -62,7 +62,8 @@ python_install_all() {
 	distutils-r1_python_install_all
 	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
 	if use doc ; then
-		dohtml -r doc/build/html/
+		docinto html
+		dodoc -r doc/build/html/.
 	fi
 	newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg
 	domenu contrib/thg.desktop
diff --git a/dev-vcs/tortoisehg/tortoisehg-5.0.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-5.0.2.ebuild
index b6640a72fdec..869a5571f9ff 100644
--- a/dev-vcs/tortoisehg/tortoisehg-5.0.2.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-5.0.2.ebuild
@@ -62,7 +62,8 @@ python_install_all() {
 	distutils-r1_python_install_all
 	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
 	if use doc ; then
-		dohtml -r doc/build/html/
+		docinto html
+		dodoc -r doc/build/html/.
 	fi
 	newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg
 	domenu contrib/thg.desktop
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
index 3e6b1f3db8cc..18e015fc174f 100644
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -62,7 +62,8 @@ python_install_all() {
 	distutils-r1_python_install_all
 	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
 	if use doc ; then
-		dohtml -r doc/build/html/
+		docinto html
+		dodoc -r doc/build/html/.
 	fi
 	newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg
 	domenu contrib/thg.desktop