gentoo resync : 13.10.2019

15 files changed, 67 insertions, 123 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index a7bb56670bf9..88f88d5283c4 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/bacula/files/newscripts/bacula-dir.initd b/app-backup/bacula/files/newscripts/bacula-dir.initd
index d717f07f7926..d717f07f7926 100755..100644
--- a/app-backup/bacula/files/newscripts/bacula-dir.initd
+++ b/app-backup/bacula/files/newscripts/bacula-dir.initd
diff --git a/app-backup/bacula/files/newscripts/bacula-fd.initd b/app-backup/bacula/files/newscripts/bacula-fd.initd
index fe6a8815b9fd..fe6a8815b9fd 100755..100644
--- a/app-backup/bacula/files/newscripts/bacula-fd.initd
+++ b/app-backup/bacula/files/newscripts/bacula-fd.initd
diff --git a/app-backup/bacula/files/newscripts/bacula-sd.initd b/app-backup/bacula/files/newscripts/bacula-sd.initd
index 07facefbb4a4..07facefbb4a4 100755..100644
--- a/app-backup/bacula/files/newscripts/bacula-sd.initd
+++ b/app-backup/bacula/files/newscripts/bacula-sd.initd
diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest
index 82eadf47fe08..d916152b6856 100644
--- a/app-backup/burp/Manifest
+++ b/app-backup/burp/Manifest
@@ -3,9 +3,7 @@ AUX burp-2.1.20-no_mkdir_run.patch 238 BLAKE2B 44ba927f8ca97386d70d52411f2fe5ca2
 AUX burp-2.1.20-protocol1_by_default.patch 943 BLAKE2B 430c1c13deabab35731f2610dd918b583455fda6d13eef6292a7eeaac0d14266bf21f97caf6dba65f0a46b1534695e7b72b91c6958d86f70ac63e356b5e05691 SHA512 249a426a76a81a2582f824d2d767695bfd848a04190ee9a2f1d4296bed03f93d4eaa86c13b4b755700b1b552bb584f9b0031ec60a705f2b27b20d62eb58aef8c
 AUX burp.initd 1083 BLAKE2B ae26457422dcb3b80400b78faf930e0df86b9873ffc8665281ef3fc3d42249e23a97555f9ce67d13a94565d0f3f61a7f4fd5c71300e7988b9d666f220122e0f1 SHA512 dc06be1e5433973f6bbabd86671ea20f12bf57d91871b4664bd7fbae32a561967f139b99674ac93a3a9ec56380e090500c118b45917f884b69395e3f03f9a311
 AUX burp.service 193 BLAKE2B fa9a00f32999834afaf84db9d28f2e8b65688e784e32f78bc019069649c50b4c17f1cc48db3b0a62e2e269db801182321e5daccc169eaa560677bd3ff52b5ffe SHA512 5ccb7fc0535d15afca1afe21b3bb937f53203b8a893730a2745e88a5effb1add73c0f109c3419e22244def1bf978378889d47953e68586a7da8909286ccf5dcd
-DIST burp-2.1.32.tar.gz 591737 BLAKE2B fd525bff32348f1dbc37b1c065d262ff8af1d999d19f63711ebcff3fb55e90a7440cc6cfc0b7eefe6f8e250672c799d86e65ed599f0b8d7dd80bebcb99888987 SHA512 2477b7a9a2123b227a27519f7f3d9facca7173a9e63d66f6a8fb2ae5408d8af4ad5bfdd0a14efd6cf80e7bc8e91907f7c293a3d621b86bafdbf163bfa08d0c81
 DIST burp-2.2.18.tar.gz 632805 BLAKE2B 6106aa4bd96db035ad5893c2fe314537e620a67519295fdf99efaf2c5a639bedd15b4c8d95caa3daa3072dfac28a1ba7fd7bb4f949d9ea2b70bd13060a22f2c6 SHA512 beb14c61ace6d61b98a10fc4e6709eec9722e28990de862eef6a75984f9fbd0f903c5fe64d20ed84c95528a9889bc22618ba6d2318318cf5d515b35688db0a4d
-EBUILD burp-2.1.32-r1.ebuild 2841 BLAKE2B aa96c385aee446cb39191f067eb7896bed961a0711372a8db1aee2209a692286d64ad63cd6cf9551497f00cba8e570b9f46f54d1fb39b08b3982464c8df47457 SHA512 b5405cae46b2991827adf6fb152a12cfb8ef382f07575882f81f73e88a13ab0af93f122fc551293e8e5fa0d6063832eef0cb30dd8f3b9b8cfcfb8082e24780d9
-EBUILD burp-2.2.18-r1.ebuild 2806 BLAKE2B 1cea6fda2ab3bae884f149ed1a2e26cfb8715eb010390d8b264bbd318e44eb873df1bb6c96440b0f01191eff3613117f2be486948dd11ca3699b3fa31195cb01 SHA512 5c331c155b0a807e18ebc26a8c0bf2847a39b0d65b1dc2a08bf4e338500e026f7699ef7dd3f735d43ce70186b14105ab33148522f0becec500f57e0e34f98b2a
-EBUILD burp-2.2.18.ebuild 2846 BLAKE2B ec0ad61b2b7502cf0462315e7e515ff285a0d231ee9d4fe98adc0fe38f1397bace971c12f48e27a4205c42465da3993fa8bdac3836b98105c378713ac8f5d411 SHA512 f8b0235a5e77ec0f4911b699dff22c77f022acfc2d2931f9723aff2974aef6fbe4cfeed4e915770306ff819d77a2ffc40c7d624589fa2901d639895de4f294ed
+EBUILD burp-2.2.18-r1.ebuild 2834 BLAKE2B 43c82ad416be2cfa689f037d0c61dec3fd88e752f2697653e348f57a2875af09292ad46f4bac9c7d0f7d45e7c4d6c37b47c38a70635df881b7be8b540357e976 SHA512 012a20f640b6999d91e47aec6d85da3cf9146b826a91f4f06a450a229eb7b1ba6c02a52983b919b531386faf34750c2c75fe44c39797d5362a440ff2072d26d2
+EBUILD burp-2.2.18.ebuild 2874 BLAKE2B f6c253a5adfc5e945a9f9b8e919556c124fd0205b269409680f3ba3b7aed79ff420859ab574fb69e2364071232fd87eeacdf73263c9401bfc617284b40be9d29 SHA512 7b4b21657a6cc4abb6bee9bd2e86160e7620cc4df4ab9e42c502b26df265eed89c7da2fa7f10a26c80b7913f7261e754e9802f1842589f59f1491ed9f9a33477
 MISC metadata.xml 684 BLAKE2B 3b4511a62d65ec23ef3b1311f57d703154f08e8d82d189a5ea0b555b5d7d686c54365d2992b85c6e5dffa0ee93f7331367925766ea1bfe349446c23d73dba392 SHA512 3752a2b8e2fb49d44d8fe431768ab1b4bc9995099e9bbe4f957677b39ca038a75874bfb0781b1cd1bd4bd79186c0994f2ce5654921a58c9645ffd6dc553f3c9f
diff --git a/app-backup/burp/burp-2.1.32-r1.ebuild b/app-backup/burp/burp-2.1.32-r1.ebuild
deleted file mode 100644
index 18bb33408e5d..000000000000
--- a/app-backup/burp/burp-2.1.32-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd user versionator
-
-DESCRIPTION="Network backup and restore client and server for Unix and Windows"
-HOMEPAGE="https://burp.grke.org/"
-SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="acl ipv6 libressl test xattr"
-
-CDEPEND="dev-libs/uthash
-	net-libs/librsync
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	acl? ( sys-apps/acl )
-	xattr? ( sys-apps/attr )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	virtual/logger"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.20-no_mkdir_run.patch
-	"${FILESDIR}"/${PN}-2.1.20-protocol1_by_default.patch
-	"${FILESDIR}"/${PN}-2.0.54-server_user.patch
-)
-
-pkg_setup() {
-	enewgroup "${PN}"
-	enewuser "${PN}" -1 "" "" "${PN}"
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir=/var
-		--sysconfdir=/etc/burp
-		--enable-largefile
-		$(use_enable acl)
-		$(use_enable ipv6)
-		$(use_enable xattr)
-	)
-	# --runstatedir option will only work from autoconf-2.70 onwards
-	runstatedir='/run' \
-		econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	fowners -R root:${PN} /var/spool/burp
-	fperms 0770 /var/spool/burp
-
-	emake DESTDIR="${D}" install-configs
-	fowners -R root:${PN} /etc/burp
-	fperms 0750 /etc/burp
-	fperms 0640 /etc/burp/burp-server.conf
-	fperms 0750 /etc/burp/clientconfdir
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	elog "Burp ebuilds now support the autoupgrade mechanism in both"
-	elog "client and server mode. In both cases it is disabled by"
-	elog "default. You almost certainly do NOT want to enable it in"
-	elog "client mode because upgrades obtained this way will not be"
-	elog "managed by Portage."
-
-	if [[ ! -e /etc/burp/CA/index.txt ]]; then
-		elog ""
-		elog "At first run burp server will generate DH parameters and SSL"
-		elog "certificates.  You should adjust configuration before."
-		elog "Server configuration is located at"
-		elog ""
-		elog "  /etc/burp/burp-server.conf"
-		elog ""
-	fi
-
-	# According to PMS this can be a space-separated list of version
-	# numbers, even though in practice it is typically just one.
-	local oldver
-	for oldver in ${REPLACING_VERSIONS}; do
-		if [[ $(get_major_version ${oldver}) -lt 2 ]]; then
-			ewarn "Starting with version 2.0.54 we no longer patch bedup to use"
-			ewarn "the server config file by default. If you use bedup, please"
-			ewarn "update your scripts to invoke it as"
-			ewarn ""
-			ewarn "  bedup -c /etc/burp/burp-server.conf"
-			ewarn ""
-			ewarn "Otherwise deduplication will not work!"
-			break
-		fi
-	done
-}
diff --git a/app-backup/burp/burp-2.2.18-r1.ebuild b/app-backup/burp/burp-2.2.18-r1.ebuild
index fdfa715eed61..14448982e6d5 100644
--- a/app-backup/burp/burp-2.2.18-r1.ebuild
+++ b/app-backup/burp/burp-2.2.18-r1.ebuild
@@ -14,6 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="acl ipv6 libressl test xattr"
 
+RESTRICT="!test? ( test )"
+
 CDEPEND=" acct-group/burp
 	acct-user/burp
 	dev-libs/uthash
diff --git a/app-backup/burp/burp-2.2.18.ebuild b/app-backup/burp/burp-2.2.18.ebuild
index cf4ac612bd2b..0d5a5cd5cd47 100644
--- a/app-backup/burp/burp-2.2.18.ebuild
+++ b/app-backup/burp/burp-2.2.18.ebuild
@@ -14,6 +14,8 @@ SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 IUSE="acl ipv6 libressl test xattr"
 
+RESTRICT="!test? ( test )"
+
 CDEPEND="dev-libs/uthash
 	net-libs/librsync
 	sys-libs/ncurses:0=
diff --git a/app-backup/cpdup/Manifest b/app-backup/cpdup/Manifest
index 87ff68758623..097cc7b66b68 100644
--- a/app-backup/cpdup/Manifest
+++ b/app-backup/cpdup/Manifest
@@ -1,5 +1,5 @@
 AUX Makefile.linux 304 BLAKE2B afeb5a8233955b43ff84e8c79fbf0ab09cc85849b4c771a72dcae7834bc68da0ade3be52743fcad2dfa0a38a775037d9fd82cab8fe5da3a7e1726a045b67a538 SHA512 595d56d4b25168e2426176c36cece12edc5388c58251d3c235611c40349a16f098ab7a17e0ad55435a499ded1cdad9b328f6ad3193bf09eadf5bd6778710b0d8
 AUX cpdup-1.11-unused.patch 252 BLAKE2B b2b3b7f008921342ff35bed0256a9f9681e4a2eb9840398b21bd8347172b2a78e626569211c42a97b0f0b5340d037f0aa80f33cedc449fe63232f8adb836c2e2 SHA512 1041685c7762a113e38ac8420bfa961bad3987318432140092702847571ebad082a7bea0e485b3a08349eb1d2844d171caf4e17e69d273e4ada2aaf847c37ce7
 DIST cpdup-1.18.tgz 42841 BLAKE2B ebf18fd13b465be8483b9aad7af5353343e89e6960da967ddf59e7186bd199604a0d2b2d637efbb4d4d4f57611a3c600c5586861ef9780342d0ebed5de1ca3c8 SHA512 5c57be20951005d731866629a601b6dae91e112067f103d6cfc3f668fbd88b3b7b65990d9fad55f18c0e8238c2642a7b85aea543a0787f21084bda35e0da0e26
-EBUILD cpdup-1.18.ebuild 935 BLAKE2B e1b3bc1f48983ded6631837796aa2c9b3ecf5e298aa80915e92e679d75a8bda79aad5f046e363a21c46bf33d684a58c92503d4aad4c968139a0265a56b382853 SHA512 caaba8bc42d07d5c332e0b9e6853176482d24cef00dd23bace993803362f2bf97acbd307d7d800b83b0e793226defbbaef413cb85c7aabb6253253953e37344b
-MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
+EBUILD cpdup-1.18.ebuild 925 BLAKE2B 1246a8bd8a026eed85d2b11b476eb102bb7dc3e9040641c47105742f604267a0a78f4a4c00c065463a06b256dc60c8e37ef07bb3afd3a9e08d5c9ac7ce292527 SHA512 5448f99f835b1662747de3dc322032fc1d59185b705676fea3c31b533de0cdd7d736c9c5825662d37cd708cbce92c5fb6c92af398ec5cd7900feebb3b78034da
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-backup/cpdup/cpdup-1.18.ebuild b/app-backup/cpdup/cpdup-1.18.ebuild
index 72f12debac0b..87a80a519dd7 100644
--- a/app-backup/cpdup/cpdup-1.18.ebuild
+++ b/app-backup/cpdup/cpdup-1.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://apollo.backplane.com/FreeSrc/${P}.tgz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86-fbsd"
+KEYWORDS="~amd64"
 IUSE="userland_GNU threads"
 
 DEPEND=""
diff --git a/app-backup/cpdup/metadata.xml b/app-backup/cpdup/metadata.xml
index a00f3aeb1f81..6f49eba8f496 100644
--- a/app-backup/cpdup/metadata.xml
+++ b/app-backup/cpdup/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>bsd@gentoo.org</email>
-	<name>BSD Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest
index 7bd7e65940a6..fba7b7e55dcd 100644
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@@ -7,6 +7,7 @@ DIST duplicity-0.7.14.tar.gz 1556110 BLAKE2B 32d4d7f941a09e85915724352ec14d6ed1b
 DIST duplicity-0.7.15.tar.gz 1563272 BLAKE2B 1a5487d863253298ecab0bf328bc7e4aa7ac7df4e2b2dd47fd60b674310bcb9046e96546860fb6f299cddeb3ad384abae615a065759798e7215addb064d4582b SHA512 7cdcf1c707e9bdbbc250afcd359978607454b1614128d2b7f09403867195795606794c5f193dc869579ae8c3a9251d7ef8f9acd66d4e69bce91344d7c046ca90
 DIST duplicity-0.7.16.tar.gz 1563676 BLAKE2B 67e1a205a880b2658ed265efa46590553537881d82af21f538fe0b524338ed8450ded1dcc30089ecf13892f5cccc284fe2acd3dbb1a17597557640ccbb1376cd SHA512 552f63848ce90ccd8481136df6c0918bbf2463dde00d4e54f0af3693dc5439551ac086dc43b7b7191d1dcf0b710d7391b6c627ce0effd14a59beb0b5fa06a804
 DIST duplicity-0.7.17.tar.gz 1719145 BLAKE2B fb5b3b3319305e63aaabcf4feef89d8a9c7b84d8e1ff09082cbfb49ebb7129a88afe6c85f6db892c0fdc8a27ca2b247e903e20a2f7b7fd9d6ced0aa77f15a2d4 SHA512 a7fa3f26709bcb25be519a20d65a196072a49ca468ace84b4876a815efea23fc1ed5b77abf765475fb8a08e3138349bf1d48e0ce22816ef66526463b646e12a3
+DIST duplicity-0.7.19.tar.gz 1727321 BLAKE2B 6441a2ce777b3b08c52ede8602a73080be372dec1c1788441c7e7135533aeeb3be48012db4bdfc2a78c7ca23d368637ccc7aa0f0361369ac9f42c00a1541e023 SHA512 26d1724a635c368e04f2a94f974ef6962c52b23345db59af3343e7221295caa0215ae119fff6ab44daa4622236683eb9d3dae742bf0d4cf08c02e3f63071001b
 EBUILD duplicity-0.7.10.ebuild 1242 BLAKE2B 6c0ec022f98a61a0308910f5077e562e171e8f7e22a6add2f230c3c9e3fdcbbf766542cef9ec7d0b0e907d4b396cb25d70e01ec783047bc60ea6b904b699f253 SHA512 d8d9f170e05036b2fb9a0eb70429529cf22ab9e818d50270e429533aefa1c77c642b8ffd676c8271a2b84a9477b04aa622bf9aac2e2046323880011ffce10064
 EBUILD duplicity-0.7.11.ebuild 1245 BLAKE2B 56bcf675983f66f7a01f46ab909d608935d5f2a4c75fad798da78558351ff0cde6b3fa242a4e95c22a398918317423075c36c79612f6a2159b648344b40583c1 SHA512 2c57e4f235e7a5478645b98fe7750768e36eb73009a430cb1f1b54ece440972d6f8e39965e6b4c1d765b610fb88d25ac35fad2269160e02369bc0f51cf302073
 EBUILD duplicity-0.7.12.ebuild 1245 BLAKE2B 56bcf675983f66f7a01f46ab909d608935d5f2a4c75fad798da78558351ff0cde6b3fa242a4e95c22a398918317423075c36c79612f6a2159b648344b40583c1 SHA512 2c57e4f235e7a5478645b98fe7750768e36eb73009a430cb1f1b54ece440972d6f8e39965e6b4c1d765b610fb88d25ac35fad2269160e02369bc0f51cf302073
@@ -15,4 +16,5 @@ EBUILD duplicity-0.7.14.ebuild 1252 BLAKE2B aacaec8e96367279d050700dab7dbaa64df9
 EBUILD duplicity-0.7.15.ebuild 1275 BLAKE2B 617c99dd058f1037a4c84df4d8d8e62d7612b255315902f265a6932309b2dbd341702875aa1144d2716d215b773f16cfeb6a3b26e657508527afac1c924e27ab SHA512 5a08f43b7894582b728004a99134f87a57136ace034994d7a3e9ebfc6ea7eab471e2fdd93b60605035e29dbdfa5c6ae3fca8b0f284977f6e94a5efc17703acf8
 EBUILD duplicity-0.7.16.ebuild 1275 BLAKE2B 617c99dd058f1037a4c84df4d8d8e62d7612b255315902f265a6932309b2dbd341702875aa1144d2716d215b773f16cfeb6a3b26e657508527afac1c924e27ab SHA512 5a08f43b7894582b728004a99134f87a57136ace034994d7a3e9ebfc6ea7eab471e2fdd93b60605035e29dbdfa5c6ae3fca8b0f284977f6e94a5efc17703acf8
 EBUILD duplicity-0.7.17.ebuild 1275 BLAKE2B 617c99dd058f1037a4c84df4d8d8e62d7612b255315902f265a6932309b2dbd341702875aa1144d2716d215b773f16cfeb6a3b26e657508527afac1c924e27ab SHA512 5a08f43b7894582b728004a99134f87a57136ace034994d7a3e9ebfc6ea7eab471e2fdd93b60605035e29dbdfa5c6ae3fca8b0f284977f6e94a5efc17703acf8
+EBUILD duplicity-0.7.19.ebuild 1240 BLAKE2B f2cf601228f0a4e107f9bb5e4e05b61893cb19a0de737c1fb52bdbae22bc3a466f05d449391c7d554ff689fca6970330aff1f1479018b1dfdeb69ec4e74f8348 SHA512 b5bd44071f27b3813c59d12360c0b648750c2a1c005f9b16f779f23b71b0471cdd464fc76e52d2cef76279267209e881b214473466aef735bb7b8b4c470fbd52
 MISC metadata.xml 438 BLAKE2B 2ff1bcc823e556bb5371994032c2db75021b8d32d4e4d67ec89d0c1c92aea9cc8a50b01bce6a09dc5b9f0cbfe741267b40a6749b1d5ccb5258f31b3ccda233fb SHA512 d21a61eaada281cf520260d2868ef1dd3ddffa5d1dc6bc2feaf5c2daa8f8fda977d3527de0b5a7b862b18df7f0bbf6371bcb736fe751e5979ec95a66640e4756
diff --git a/app-backup/duplicity/duplicity-0.7.19.ebuild b/app-backup/duplicity/duplicity-0.7.19.ebuild
new file mode 100644
index 000000000000..96eaf6101875
--- /dev/null
+++ b/app-backup/duplicity/duplicity-0.7.19.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Secure backup system using gnupg to encrypt data"
+HOMEPAGE="http://www.nongnu.org/duplicity/"
+SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="s3 test"
+
+CDEPEND="
+	net-libs/librsync
+	app-crypt/gnupg
+	dev-python/fasteners[${PYTHON_USEDEP}]
+"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		app-arch/par2cmdline
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	s3? ( dev-python/boto[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	# workaround until failing test is fixed
+	local PATCHES=( "${FILESDIR}"/${PN}-0.6.24-skip-test.patch )
+
+	distutils-r1_python_prepare_all
+
+	sed -i "s/'COPYING',//" setup.py || die
+}
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	elog "Duplicity has many optional dependencies to support various backends."
+	elog "Currently it's up to you to install them as necessary."
+}
diff --git a/app-backup/restic/Manifest b/app-backup/restic/Manifest
index 8592c265779b..0bf2313dc057 100644
--- a/app-backup/restic/Manifest
+++ b/app-backup/restic/Manifest
@@ -1,5 +1,5 @@
 DIST restic-0.9.4.tar.gz 26211163 BLAKE2B 950a8da8217500a910f0e5966787b668417f1168e81365ecda70469ef42c24fed876e97b6a44ed9dda89c07760db4678d791960d78760d68c8f1846c827cf340 SHA512 8e75a1da6ee9a364c2bf53ce8f9b014549e7065eae349dc6baf68b0e8a8e9736f83c0495b822aac87480751f448bd42da34c440290b5f0967aea7becda5c448b
 DIST restic-0.9.5.tar.gz 26933971 BLAKE2B 7e6cb87c7ce0f860ed884a631b791d0dc44e770ffabf298f20c60197b32961a2a78380e2933ce3851215ec2e32bee95da67566bf7d2d30c3bb0dddda2c6ca804 SHA512 2541b4d70d23d28360c4398427d65ed08a5eea8c171b93be7b7d54baa7b06099f5473ff2fbe3d6b3d6691592300062ba1b240cc03772868d2a0adb1217c8a85f
 EBUILD restic-0.9.4.ebuild 1152 BLAKE2B 64261a07bf725579fdd371250afaa9336e19c3ab6fb2c974f0a89461739bcafc0858f7b1742b539b9ee8c947eb0f027c0f71ccd0b2989185cae5552369a9feea SHA512 ea2c5668f69220e55234e3cc89b3da800d7538b15a499178da13ecccda0330e7a0477cfb1afcb30f345ec97362c00c5147568b3bcf43b6e57848eebdf6d664a9
-EBUILD restic-0.9.5.ebuild 1148 BLAKE2B 14fae046226e772afcb67000ffa6c54e39d5ce251ba1e603e56a6c2a4fd89d56bfb1f8582192c7dc4839f33629f45667fcdcb236d062d25588bdde426f66409c SHA512 bd0eaa951a0dbb79eac37d7e149c4d1a02ee89027f6f74b7fa250d9ff8525b6cd1a5813ca88759a0236b9fb0726a7e907dbff464d0cfcd64ade0c7533682e702
+EBUILD restic-0.9.5.ebuild 1180 BLAKE2B 06e71c51e4500e197680508c63d271bdad9986f99d7b466de52d72f5b8761d9855302971dcf76cf1ecab3be5ac75bc26dd1b30f5dca0a9a9d386a97bef689f39 SHA512 98d50429d039e67e87ce4209e7afd7f3134173a5e7b485a3e65ff89c0b565e7e4f7c62c2553a2f01d6cbe813e3bd6d8af17e7ac43cfc272155e080faa447bddd
 MISC metadata.xml 444 BLAKE2B f9cc0e8188fbd02a7bacc258eac4052b88fcd3d3b878ce336f7f4635bd4fa94abdfa5112b35bbf6913dcbbfb64833d5f3a4d372c202b2f2488d5d0c750ce2f52 SHA512 8dbd7df10769ff8d0271588be8c97402d5917a4c0dbafa5daad2090245ee4b022193a6c271f71c342540d7599b029998c91c10364eae7d55de0275276342c0f4
diff --git a/app-backup/restic/restic-0.9.5.ebuild b/app-backup/restic/restic-0.9.5.ebuild
index 6b97caddd1d5..538885775d0b 100644
--- a/app-backup/restic/restic-0.9.5.ebuild
+++ b/app-backup/restic/restic-0.9.5.ebuild
@@ -32,12 +32,12 @@ src_compile() {
 		-o restic ${EGO_PN}/cmd/restic
 	)
 
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+	GO111MODULE=off GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
 		go build "${mygoargs[@]}" || die
 }
 
 src_test() {
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+	GO111MODULE=off GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
 		go test -timeout 30m -v -work -x ${EGO_PN}/cmd/... ${EGO_PN}/internal/... || die
 }