gentoo resync : 16.06.2018

11 files changed, 127 insertions, 24 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 602a6da2941e..69e103697a4e 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index 2fb4a6f6e014..dee82e0d6f18 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -1,8 +1,10 @@
 DIST borgbackup-1.1.3.tar.gz 2942183 BLAKE2B c7ca37459d35e06694cf9fdbef7328806cf03e6a4290368d47a2c06e1b6a0700d9dbba3efb170e130c7e59951d65ff8ca677955782150154f0ad2d12b93fe57b SHA512 8378e4f805bfb3e9a4e454f5ccfa58eef0517f13a2e8a2c3c6cbdb0304b763fa67152963b17d677daff09590eb777f12fbe1f3f69c3459bcc68781e5a747cb49
 DIST borgbackup-1.1.4.tar.gz 3390046 BLAKE2B 27d1743718b9fdd303dbc7a01a586b9f87c119ed7f2464582a229bf2357c3f7d929bdf614689be7d7306a707e7332b8ae0ce5bd9898cea5af2311ca2210c5f41 SHA512 0853033f72406a2913dd74c6ebb8b33a318179843255c92481f5e4fdd0f436de6e4c77eed259a422e00bfadcf260facdfd00c813bb0628b82b8ff63a87e1bcfb
 DIST borgbackup-1.1.5.tar.gz 3392774 BLAKE2B 7eaa3dee548748b4b741607934c9344203e318f4558cf9497938caf5ae5af7dfac075748a2c78a767de618d5ca07c80d7dcd2f5c61e7314d643e2974c4eb4b29 SHA512 22071e4b37059d816592baff852772720769b3d86eb1d071abba67f9d13de809066aa29cdf18f1aaef127d1f24288913a7b0b63d157fb98840b1a71606dc0554
+DIST borgbackup-1.1.6.tar.gz 3441523 BLAKE2B 13b1892774e857432a77d1f67d981046a0670b4ba2f3665502f7b729a211fc47e10a87feca308d5089c984cfe4665e7e70ca68bb9aa6e188893a0d088e84df93 SHA512 5741c48bdb70a26d40bd583f207460e35bb7dd560424889d37eb4d90ee96947457faf09bae0fa2b26b42ec71ef6eeaec1b770ba3257223a2637fcb55266e4a17
 EBUILD borgbackup-1.1.3-r1.ebuild 1089 BLAKE2B 227958b734a324262ec7e2b5cd68ed388bed8919a0ade56d357e7d21a7558ac7c8c0467bec06d96cdd4e6d63ae73677e9d9209462beab44c0faf512fb3aef0e3 SHA512 8b4863da598d8a1b198ea2e6e40326051a867fc0671bf5e660aa5c5aac9f4838620f48e9a4787aad463b342fb6e68d04ea0fe93f160a8261f450d4ec629eea82
 EBUILD borgbackup-1.1.4-r1.ebuild 1090 BLAKE2B 54321c9dadf7b6bf077a286375c3ebc84b5f8e545e6d103d0af24253fed071f67a547b6a33af03b00bf72b765122125c16041fe6668d42f99d4809a74f87047e SHA512 c135ae63d7fa35c806fd9ffb0bcf4be28fb935a539843253054c4169d38affaefa1dce2d9388def85022bcbe4b232f4e0e762abe5715b5e87d18fb70d7cb64a9
 EBUILD borgbackup-1.1.5.ebuild 1090 BLAKE2B 54321c9dadf7b6bf077a286375c3ebc84b5f8e545e6d103d0af24253fed071f67a547b6a33af03b00bf72b765122125c16041fe6668d42f99d4809a74f87047e SHA512 c135ae63d7fa35c806fd9ffb0bcf4be28fb935a539843253054c4169d38affaefa1dce2d9388def85022bcbe4b232f4e0e762abe5715b5e87d18fb70d7cb64a9
+EBUILD borgbackup-1.1.6.ebuild 1090 BLAKE2B 54321c9dadf7b6bf077a286375c3ebc84b5f8e545e6d103d0af24253fed071f67a547b6a33af03b00bf72b765122125c16041fe6668d42f99d4809a74f87047e SHA512 c135ae63d7fa35c806fd9ffb0bcf4be28fb935a539843253054c4169d38affaefa1dce2d9388def85022bcbe4b232f4e0e762abe5715b5e87d18fb70d7cb64a9
 EBUILD borgbackup-9999.ebuild 1090 BLAKE2B 54321c9dadf7b6bf077a286375c3ebc84b5f8e545e6d103d0af24253fed071f67a547b6a33af03b00bf72b765122125c16041fe6668d42f99d4809a74f87047e SHA512 c135ae63d7fa35c806fd9ffb0bcf4be28fb935a539843253054c4169d38affaefa1dce2d9388def85022bcbe4b232f4e0e762abe5715b5e87d18fb70d7cb64a9
 MISC metadata.xml 380 BLAKE2B 2ac9cd2f49c605955fb4133ff30d52e578bb45b0717348e6909cf7cd172ce9a7436d30394466ece7d889d02802f500f86297072a755b24905c17342cd7aee5e4 SHA512 4160c5674dbb51e9e3fa3c0d29fca6b7ab4073f2e2be1a2eca88ff049b4b5f066d04c747130c45d31a9c63ee2fe3bcb5f521017a581e7f6b69eb07fb94b83661
diff --git a/app-backup/borgbackup/borgbackup-1.1.6.ebuild b/app-backup/borgbackup/borgbackup-1.1.6.ebuild
new file mode 100644
index 000000000000..fdd80a89ecd9
--- /dev/null
+++ b/app-backup/borgbackup/borgbackup-1.1.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/borg.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
+HOMEPAGE="https://borgbackup.readthedocs.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="libressl"
+
+# Unfortunately we have a file conflict with app-office/borg, bug #580402
+RDEPEND="
+	!!app-office/borg
+	app-arch/lz4
+	dev-python/llfuse[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+
+DEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	${RDEPEND}
+"
+
+python_prepare_all() {
+	# allow use of new (renamed) msgpack
+	sed -i "s|'msgpack-python.*',||g" setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest
index af2855e67db6..4c8fd685632f 100644
--- a/app-backup/burp/Manifest
+++ b/app-backup/burp/Manifest
@@ -4,5 +4,5 @@ AUX burp-2.1.20-protocol1_by_default.patch 943 BLAKE2B 430c1c13deabab35731f2610d
 AUX burp.initd 1086 BLAKE2B 7946355a6de36f956e953e59b216ea1807eabcee1a1631fc4f0e3d1bb7165adfba99c2d3c1c47631a5d4fdccca81171106583ba3a994263e08ff73a7b5d7125c SHA512 cb78acab82a919d9dd9eb21dc525f62d3443a690efbf77a695f7d3bc9e2245aafd025977a6f08084c6db545f460ee3d32d83b6f7f5641eae19e2e92d4e0d0850
 AUX burp.service 193 BLAKE2B fa9a00f32999834afaf84db9d28f2e8b65688e784e32f78bc019069649c50b4c17f1cc48db3b0a62e2e269db801182321e5daccc169eaa560677bd3ff52b5ffe SHA512 5ccb7fc0535d15afca1afe21b3bb937f53203b8a893730a2745e88a5effb1add73c0f109c3419e22244def1bf978378889d47953e68586a7da8909286ccf5dcd
 DIST burp-2.1.32.tar.gz 591737 BLAKE2B fd525bff32348f1dbc37b1c065d262ff8af1d999d19f63711ebcff3fb55e90a7440cc6cfc0b7eefe6f8e250672c799d86e65ed599f0b8d7dd80bebcb99888987 SHA512 2477b7a9a2123b227a27519f7f3d9facca7173a9e63d66f6a8fb2ae5408d8af4ad5bfdd0a14efd6cf80e7bc8e91907f7c293a3d621b86bafdbf163bfa08d0c81
-EBUILD burp-2.1.32.ebuild 2843 BLAKE2B d834957f4e98d3114919e53f5d25cf344949b2e8f4bf48ad99f4865e8c9f020e8c8b9748f628310666cae5f079e2082c3f0003bb5ed83a94a5d70fa8d9660919 SHA512 a5510ec771bc4a2ca1d80a1e821d8fb4ff145ec25451aa850c663255a032451fcecc9e167e9fb066da4c6b893d590865ebb2fd1f4a7f01b80a1ef737b8701a7d
+EBUILD burp-2.1.32.ebuild 2844 BLAKE2B b8c61593b365e83955e09ed19d220c497c3df2cb07ecc4a42a1e5fdef79a9723e96129c156acff9be20b2064c2f6a08bad5930db2f924188f3934e783d30cfa1 SHA512 d9b034f9c1885b9ce00a9428d263b99d71a2676478cc25f52e5167600a926c9bb61b7012e204ef0f3b12a17d7d659b5a8f161b349d03f2617a24646fcf3b4e47
 MISC metadata.xml 684 BLAKE2B 3b4511a62d65ec23ef3b1311f57d703154f08e8d82d189a5ea0b555b5d7d686c54365d2992b85c6e5dffa0ee93f7331367925766ea1bfe349446c23d73dba392 SHA512 3752a2b8e2fb49d44d8fe431768ab1b4bc9995099e9bbe4f957677b39ca038a75874bfb0781b1cd1bd4bd79186c0994f2ce5654921a58c9645ffd6dc553f3c9f
diff --git a/app-backup/burp/burp-2.1.32.ebuild b/app-backup/burp/burp-2.1.32.ebuild
index c3a8457cedaa..9f8399e8ca19 100644
--- a/app-backup/burp/burp-2.1.32.ebuild
+++ b/app-backup/burp/burp-2.1.32.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools systemd user versionator
 
 DESCRIPTION="Network backup and restore client and server for Unix and Windows"
-HOMEPAGE="http://burp.grke.org/"
+HOMEPAGE="https://burp.grke.org/"
 SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AGPL-3"
diff --git a/app-backup/mkstage4/Manifest b/app-backup/mkstage4/Manifest
new file mode 100644
index 000000000000..36d4a27f6a8c
--- /dev/null
+++ b/app-backup/mkstage4/Manifest
@@ -0,0 +1,4 @@
+DIST mkstage4-0.1.tar.gz 15220 BLAKE2B 43f091615d4fbb19495c2103729556ec307501f93c60bd0df676f710868d932dc7bb7e0a1c2f6613d0cc2edc266f9b9f7b74e534e84a7d41a4bf4f66c09f98e4 SHA512 e42d23ffe214c9fef8dde94f8b8faa32490e9e553f182f042a2c4d713a72031c9560e291b6231a0ced812e43f80a58cb3fa5bfdc4ad7e132d7ea7c74525d64c5
+EBUILD mkstage4-0.1.ebuild 459 BLAKE2B 7bfa3edfb99837f99eec51dee1e70fc6754097c01e05afae9cae5721fecc285d3c8d503769062a60f28d631e3d709ef0b6495e70d0134da861507ba335a5ac97 SHA512 2568f56448c7a430a4df279550821c55ad50b5f46bd7b17d1188e411393949c557cab846975d09f1c4fbf09896408e0c34dad4df53ba0e2d6045575532b0b05d
+EBUILD mkstage4-9999.ebuild 440 BLAKE2B 9663bbe0c3a0bbf346fb91345a647ec2d9597f4890f625424ba8efbbad4a2835233590cca543ef68763ed6b4e8d416ac0e36e8a736084902488b6191f1864b31 SHA512 ce683de171866c996a6d3ae269cd3e74adc11203bc42d03f15e79935ee3315dc8c4795fc36ebdabfe4329b1ffadc93ea9ba680bf890b2b43d5fa24d9357f079a
+MISC metadata.xml 707 BLAKE2B 03820bb993e66eae180233f519ace9f0eb69fa4dc9e6202967a54f87931d104d0d1c67f4c00256ebb969712347b4e49384fc7a12003772ea8f5e96bcefdda574 SHA512 a3271d39d05e3c63a703bfe268b1094545cd3900cf0e04fa196d1c611bbb2376fed3c7b61f7626810d794eb0cce8b2bf73c380b81b79e0ff91cfcfec3e34025e
diff --git a/app-backup/mkstage4/metadata.xml b/app-backup/mkstage4/metadata.xml
new file mode 100644
index 000000000000..352e903207e7
--- /dev/null
+++ b/app-backup/mkstage4/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>horea.christ@gmail.com</email>
+		<name>Horea Christian</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		This is a bash script to create stage 4 tarballs either for the 
+		running system, or a system at a specified mount point. It is 
+		highly parameterized allowing the exclusion of sensitive user
+		data.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">TheChymera/mkstage4</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-backup/mkstage4/mkstage4-0.1.ebuild b/app-backup/mkstage4/mkstage4-0.1.ebuild
new file mode 100644
index 000000000000..10464eafc25b
--- /dev/null
+++ b/app-backup/mkstage4/mkstage4-0.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Bash Utility for Creating Stage 4 Tarballs"
+HOMEPAGE="https://github.com/TheChymera/mkstage4"
+SRC_URI="https://github.com/TheChymera/mkstage4/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-shells/bash
+	app-arch/tar"
+
+src_install() {
+	newbin mkstage4.sh mkstage4
+}
diff --git a/app-backup/mkstage4/mkstage4-9999.ebuild b/app-backup/mkstage4/mkstage4-9999.ebuild
new file mode 100644
index 000000000000..6cb479448e6a
--- /dev/null
+++ b/app-backup/mkstage4/mkstage4-9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit git-r3
+
+DESCRIPTION="Bash Utility for Creating Stage 4 Tarballs"
+HOMEPAGE="https://github.com/TheChymera/mkstage4"
+EGIT_REPO_URI="https://github.com/TheChymera/${PN}.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-shells/bash
+	app-arch/tar"
+
+src_install() {
+	newbin mkstage4.sh mkstage4
+}
diff --git a/app-backup/restic/Manifest b/app-backup/restic/Manifest
index 3464e6fd3f35..6a1e92aded1a 100644
--- a/app-backup/restic/Manifest
+++ b/app-backup/restic/Manifest
@@ -1,7 +1,7 @@
-DIST restic-0.8.1.tar.gz 40330154 BLAKE2B 6758ae4cd7b3caf1bb58b9b95ddd9b99422f2a5997f37317381ec2714a4bc369331e1ba5accb791a2733eddcebdb056256a25b837cad6926f86ec61265d95324 SHA512 02d45b70b94514d3491297dcd34f26db854b6153a1aa297aaa9c938e09d65429fbe0dedb3c028ad38c769049f814c7a923481adfe9962a35dc39a7477a80fdab
 DIST restic-0.8.3.tar.gz 48746281 BLAKE2B 4161326068165b5ba19e9ee0e6386aa1df29a961a42509a2cb7924958100b9412abd1dd27d299d1eef76fdd4731d4a56f0a68e796a46071229a3e6767d3a6bb7 SHA512 758b2c69af8aad6bb62dc750141d5f5a1954ca2b51350ef59c35fd10afefaddc4d8d0cdd5914f249594946db6138124a48fba531b8a24353f022ccea773a240c
 DIST restic-0.9.0.tar.gz 51049118 BLAKE2B 4089a0eafe0f3778d540ffb87d5d773f1bb4296c3cb7a085a38cc1ac54742392790ccf61145ed3ff19a7e35b358e0b40c7f3edf6ee661e22ffd00efafa2bdee1 SHA512 c01e8450c7afbea59d86a53a5491e562ba5d1ab7fe3e96e0e5b53d96f4df2cf051d7abaef742ff2ecce759e2cd97386566e1c19260f0d74ae678edbe200aa885
-EBUILD restic-0.8.1.ebuild 1589 BLAKE2B 9ecc5384646c5227e7557e0a0f4ece8928e70e6491ff90549162223d6aea1b56e57271666491251122ebce01c274a80208010a9647e74a3f33e54ac91f28623e SHA512 3232fcffcf1ced52759125c00f3380f90e263e0e84d1a5da24f3f225ad49c1476e2d979cad85781a7c66bdb89460fa59e7d3b04b7b08bed29b59ea8e008c79f6
+DIST restic-0.9.1.tar.gz 51056544 BLAKE2B eb66381e284c94b17b0fa31f824f41b24a52d04555af6798fa9ac2f1dd0ca168d5e8a9fde922b205c420288002743b86a49a16a939c07a0f3fd942348f0348b6 SHA512 9d365bdcb561255e2103d7170d02e850e5cf767bc2e02e099d57ec9aad719ebd4319446f5162e64437ca9a8e1fdca273fd1c6cc4314013ca07b5ebdbeef93c2a
 EBUILD restic-0.8.3.ebuild 1190 BLAKE2B b67c12c01ad4f69c281ffeeee90eff0dc1eaba5341ff18c519b2183ef1460843a50d7adb9ec518f8affbe3546328f9f488d274ae99071799e7e3d1ef5415fd3a SHA512 980f1040b4f6b2c46598dd6ba70bd3e9bff8d89274002dad12e497f82ff2c0eb362a43e91473da05f982c1b4aad3e19e1124c8fd753fc371eb5f73f7a43f7b17
 EBUILD restic-0.9.0.ebuild 1155 BLAKE2B 2370d9923040125cab0b8831850d5c997638669eb1a1939e3f59a51d27f131b2631ea5866d77ac1ef85e73fd74c54cd3d49aafc619924e7afdc4c888c08f0864 SHA512 5cdd3cff4ff86b0502f8d6e31f647e144a84db086c43d33fd53cdadcebe4f440a84f82f5bc478f2043adc4ac007a1800a33bf97f9c8b4d43fc11ca5d287572bf
+EBUILD restic-0.9.1.ebuild 1155 BLAKE2B 2370d9923040125cab0b8831850d5c997638669eb1a1939e3f59a51d27f131b2631ea5866d77ac1ef85e73fd74c54cd3d49aafc619924e7afdc4c888c08f0864 SHA512 5cdd3cff4ff86b0502f8d6e31f647e144a84db086c43d33fd53cdadcebe4f440a84f82f5bc478f2043adc4ac007a1800a33bf97f9c8b4d43fc11ca5d287572bf
 MISC metadata.xml 444 BLAKE2B f9cc0e8188fbd02a7bacc258eac4052b88fcd3d3b878ce336f7f4635bd4fa94abdfa5112b35bbf6913dcbbfb64833d5f3a4d372c202b2f2488d5d0c750ce2f52 SHA512 8dbd7df10769ff8d0271588be8c97402d5917a4c0dbafa5daad2090245ee4b022193a6c271f71c342540d7599b029998c91c10364eae7d55de0275276342c0f4
diff --git a/app-backup/restic/restic-0.8.1.ebuild b/app-backup/restic/restic-0.9.1.ebuild
index 3cd921c0f6dc..89515ce18d02 100644
--- a/app-backup/restic/restic-0.8.1.ebuild
+++ b/app-backup/restic/restic-0.9.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit golang-vcs-snapshot bash-completion-r1
+inherit bash-completion-r1 golang-vcs-snapshot
 
 DESCRIPTION="A backup program that is fast, efficient and secure"
 HOMEPAGE="https://restic.github.io/"
@@ -15,19 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test"
 
-DOCS=(
-	README.rst CONTRIBUTING.md doc/010_introduction.rst doc/020_installation.rst
-	doc/030_preparing_a_new_repo.rst doc/040_backup.rst doc/045_working_with_repos.rst
-	doc/050_restore.rst doc/060_forget.rst doc/070_encryption.rst doc/080_examples.rst
-	doc/090_participating.rst doc/100_references.rst doc/cache.rst doc/faq.rst
-	doc/index.rst doc/manual_rest.rst
-)
-
-DEPEND="
-	dev-lang/go
-	test? ( sys-fs/fuse:0 )"
-
 RDEPEND="sys-fs/fuse:0"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${P}/src/${EGO_PN}"
 
@@ -37,7 +26,7 @@ src_compile() {
 		-work
 		-x
 		-tags release
-		-ldflags "-s -w -X main.version=${PV}"
+		-ldflags "-X main.version=${PV}"
 		-asmflags "-trimpath=${S}"
 		-gcflags "-trimpath=${S}"
 		-o restic ${EGO_PN}/cmd/restic
@@ -54,15 +43,12 @@ src_test() {
 
 src_install() {
 	dobin restic
-	einstalldocs
 
 	newbashcomp doc/bash-completion.sh "${PN}"
 
 	insinto /usr/share/zsh/site-functions
 	newins doc/zsh-completion.zsh _restic
 
-	local i
-	for i in doc/man/*; do
-		doman "$i"
-	done
+	doman doc/man/*
+	dodoc doc/*.rst
 }