gentoo resync : 18.11.2019

17 files changed, 15 insertions, 396 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 9f0a0b1168df..bb6834cf29b7 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index c463a9bfaf50..6857c98a631a 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -1,7 +1,7 @@
 DIST borgbackup-1.1.10.tar.gz 3610011 BLAKE2B 9c13d89a0441b5403019ed24b2f36fd55f4d133219b68802b79c76f5086324f4a249124a89c67049fecbadb78d5dae64b007ed6c53a579c115ce248db3e83054 SHA512 9315335208f10427e3105e10819817d15fd05171479252903bd51eaacb016bc3ff792d505b9203ce0b9b41ec350472bdb9a23b0128e7fe156aaa47c1608451c0
 DIST borgbackup-1.1.8.tar.gz 3456058 BLAKE2B cad55216f92025418e1a427f4b578d6b7eafa03f6b3e9c4fccb148dd3856c4f6649928fb4227249c534add125f9b3a2a0b6ed808ae12c5e60a28f9df4fb0031a SHA512 1455e68bcedab8f35f9426dc73958c6a6565ad1f1cc274ce59d34a12e3a7bfa1d12fa2b8e8dd3e71824e1cd0927babf79f4e99d4e516454ed12dbd3970d0e921
 DIST borgbackup-1.1.9.tar.gz 3468259 BLAKE2B 91c89304cf22328a0bd74583c22370343915209a204f52c65290dbec0cb688392c2e80b946a55317f8c58ef23099e710c16a34c6bfbbfb547a3e4b38c3c81c37 SHA512 466288258700fb0b3dae936c79fd423d26bea2d721dd70112b3cfd0f8e2bb335144a00de76743c31d336f6c19793775260d154326ec70d6d6d0a4e5ad6a59e59
-EBUILD borgbackup-1.1.10-r1.ebuild 1168 BLAKE2B 4e52665dc7d0528d5803205543f9e8eccb620a45d8d843c80af67051cc62089929576666dd91699bbde010234e89d7a98ac88d6402370929f4db23663095ecd4 SHA512 d13bae6850a120269a4744b3beee3948759d6304126486e219c6adb3075fdaafbc3ce2155ef7bc74e20d9643c7cada906d1dcfb9ffe2f6a2f85fee038a716bbf
+EBUILD borgbackup-1.1.10-r1.ebuild 1166 BLAKE2B 57526ef5bed691aacab640d6df502a8ed647f440104519cdc0a0c8e4deea805e52a4958d7474efa795d6532dfd149ee0b4928d667e7b2a86bd578f8f857d2a7d SHA512 5b2c73d4c8aa1df5420c14b3e4f2b01b9585ad2cd8416d49c57331bc6b647e3f9b87eb61152c6b49ee8de4ae6eeac2a9835b980820799b1a1a3dbb3153794c20
 EBUILD borgbackup-1.1.10.ebuild 1105 BLAKE2B f44a4ce67b66d92c93f292076300033a68f9eb7cac4b22ee8f73926d366cc503283bac05423d4b0f6bbfd4773af66cc85105bc4f30171e37145ae02962dfe25d SHA512 29542266432fc3a13e0df8845a177ee8773f422320a2f030fb812eb067d0c8d16456104ae43df1ba7ed959213aa668dc8bd14f1afeda5562d9691f5067c00901
 EBUILD borgbackup-1.1.8.ebuild 1103 BLAKE2B e190ec23ed8f61a795c48a5754b33b01b31afe3e12f90dedd757476e0364a12dcea9968e84c69c206680767364c74eef4ae0da795098fa823589d2bae17787d5 SHA512 2283bbd7d91e5caf2e46d935c7f5caa4dac432a722516954224987129182ebdecdcd53fb7504c5f6f35d84acfea9eefb01912d6bb13d2c7ddf523c5e8f47c78e
 EBUILD borgbackup-1.1.9.ebuild 1103 BLAKE2B bde3f74d6c6005f31f2d62263233501a124e0ded9231c3d555a9a99558333df17080bd72190bfbf1c167cb08b2500ebbf7ba873f52c502283aa243ba59f3f09f SHA512 d2dc1e3f4a72f18641754e634a4ec9d9dcda2c9852694b7fe5afa7d913ecadaf077899e467ee6155e7ca4df0305b8a795ddc753314fabea00fe6a1c16ba3c20b
diff --git a/app-backup/borgbackup/borgbackup-1.1.10-r1.ebuild b/app-backup/borgbackup/borgbackup-1.1.10-r1.ebuild
index 6b88a3e3c19c..01bf2c50bda1 100644
--- a/app-backup/borgbackup/borgbackup-1.1.10-r1.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.1.10-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
diff --git a/app-backup/bup/Manifest b/app-backup/bup/Manifest
index 2e7813694ead..c091fc640399 100644
--- a/app-backup/bup/Manifest
+++ b/app-backup/bup/Manifest
@@ -1,6 +1,4 @@
 AUX bup-0.29.2-sitedir.patch 1186 BLAKE2B ae56baf75e32994afc6dfad386f19edfeed6d02918c572dfef2f4ecbe6c13c9e4e9a78819dbeae21c32fba1f7914b1ea43f41f52c2770c738e724ebe52031ff8 SHA512 1d1848bc24cc1216fde35ed3eabef52a0cef0a6c7c0be7d51d3829f413e0a26abd3441fc958e3461bbc5faad8b97e903e6f86f1de418b4d211996f213db5e37e
-DIST bup-0.28.1.tar.gz 377712 BLAKE2B b469af7b40807e1462c603c03078fc4e048fc300f74dccba9db4ee9d5b1cd385b3092c2bcc08b60ba798e4f401953ccb3217275c6afb3ebf8040e6e507fde9fd SHA512 b27a94eeee86366f9f97081611d8e0443686ed8c4070d45729ad4efe1d48ee9f528d3257bfd5d37d6243927f5b63d6b613bf5ae2c39117012979ccd5ccecf9d2
 DIST bup-0.29.2.tar.gz 389145 BLAKE2B 1a54cb68b2c68ecf4902a7f1ee940711b62e413c69d17ba1515f24e115484bac1b4919947f2214ffff784389839f633fbb13dea69c186246426e57c33a148c4c SHA512 10c433d6779b1fd7e1935c587676492d96a330dc3280556332bb55b6e5c62de8631fd755d07d2eaf80cb9fa209dc25b241d5ecf3a6fe2b8210a3d0e1ce4fa4bf
-EBUILD bup-0.28.1.ebuild 1196 BLAKE2B 10a8e8e74be17ab9fa5cf7b1274065729c1372429092e53b7864b945413b83b70362fffcb7ab0043f265861e066e7ebf689e5b0516f86e71a455d57a01f85db7 SHA512 43b4b54ebf455d2c8604cb734af209586102e6f28041fe98b303087a2a128fc376ee88558536eb38db6ed5e7ce412aef0ebb0297fe5cf01345e969606c0f472e
 EBUILD bup-0.29.2.ebuild 1243 BLAKE2B d291de78398bde7d4884a9d125d157db092f4ca5d21fdfedfc7a6278f20fc9ea39b6fcb04184214a735129b146257eb90db0d1065c87dddb983ce74971b51806 SHA512 cdee0ec7fbffc2a4bcccc6de0456a361eb6c9c189da936678b50cfbaa198638419fcf0d240494afc2ce29f04ed905e48cc953753fbd47e75015d70a0f2581af1
-MISC metadata.xml 404 BLAKE2B be0a8a5d858a23520e0927be152c1defea7c2df55d7f7d83a28652eeee7d0c0762f6b0d0671b0ec684cee2b1efdea864ca5a20167fb1d4396d427a9ae75f1185 SHA512 62266b2c5b320859e4283c23aac6c325036f1a83b51a314078ccad2b0e9b9360690e34d87f387bea86e8b98ecf1b9851744a57744c478bd7040b42adea517b81
+MISC metadata.xml 325 BLAKE2B 02b15157395396dd68b8020bfe90ee4c1a3f8dd6a093ee6a9873a34320bddb32a937d91bf509b363e4207fe361fee0115311656872d49523b55703d6ebf9704d SHA512 00eda495637d81b12b965a3890437a35030e3ea246d81615b6e4b598bcbe991343e5abf03cfae5072d0b0a58ec2ad9d4f1591a12907563b537c62c3f9119b177
diff --git a/app-backup/bup/bup-0.28.1.ebuild b/app-backup/bup/bup-0.28.1.ebuild
deleted file mode 100644
index f1071883fb22..000000000000
--- a/app-backup/bup/bup-0.28.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="A highly efficient backup system based on the git packfile format"
-HOMEPAGE="https://bup.github.io/ https://github.com/bup/bup"
-SRC_URI="https://github.com/bup/bup/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test web"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-arch/par2cmdline
-	dev-python/fuse-python[${PYTHON_USEDEP}]
-	dev-python/pylibacl[${PYTHON_USEDEP}]
-	dev-python/pyxattr[${PYTHON_USEDEP}]
-	web? ( www-servers/tornado[${PYTHON_USEDEP}] )
-	sys-libs/readline:0
-	dev-vcs/git"
-DEPEND="${RDEPEND}
-	test? (
-		dev-lang/perl
-		net-misc/rsync
-	)
-	app-text/pandoc
-"
-
-# unresolved sandbox issues
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	sed -e "/^CFLAGS :=/s/-O2 -Werror//" \
-		-i Makefile || die
-}
-
-src_configure() {
-	./configure || die
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr LIBDIR="/usr/$(get_libdir)/bup" DOCDIR="/usr/share/${PF}" install
-	python_fix_shebang "${ED}"
-	python_optimize "${ED}"
-}
diff --git a/app-backup/bup/metadata.xml b/app-backup/bup/metadata.xml
index 958844441602..1d0a6394f969 100644
--- a/app-backup/bup/metadata.xml
+++ b/app-backup/bup/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="web">Support browsing backups via a web interface</flag>
 	</use>
diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest
index fba7b7e55dcd..54f74b24b794 100644
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@@ -1,20 +1,8 @@
 AUX duplicity-0.6.24-skip-test.patch 477 BLAKE2B f4f55a8f7634005c965f79cc6cd2998965fe142b5f3312bd5b90881c33de75e3e532885408af71479b0045001987c6f3adb6fac6432336d2e721a3f850945ad4 SHA512 37f7f3cc774ad15301449c580f23347fbc1cd4fe6903e641abe2497242c0a9d31152a59d886c87a84fbcf0e9b390eb0a5652d63d0367f73529465c927ee30933
 DIST duplicity-0.7.10.tar.gz 1543523 BLAKE2B a38c5310d6949d36f74620ef617f790943284d7219168e0e49ed13834ab72f5c0d057ef59454e58a25be3a9e28d9627d60c007aab373e150afca08248d79aab6 SHA512 d04273384749c88d0a4f46bc1dcdcbb945ec1a78fb21064f12f0ca6c92cc73ad36fc3149461dbe0a660cd752a1147b2fa5d2b4056a5414c7790747eb5983e0bd
-DIST duplicity-0.7.11.tar.gz 1550197 BLAKE2B d3a7a109614bfd51d2a6343e89a7e7b420bb172134eef1b9dc362210879db01611edd7b15f977d9640f9851b5a592686d45abb470ebf5e1c6d8da9dfb719192d SHA512 81ccb868625b261356b9cb2439659eb7574343c0a15ea7db099746216689a881d9a37b05711c232103ae0e7660b5cdc7dff6475eda81ecbdcfc28bced0eabe75
 DIST duplicity-0.7.12.tar.gz 1552442 BLAKE2B 4a7d0609748bffa147994a4abdb88bc0d62905c1423dc91caa4b8e5bb0c5953e26df72f647697685cfa3caed3741658d00d1a2b62b8c47bb1ac61da8973df9ca SHA512 8a532e7bb548c170184666a0ba2b41a15f3002c14edd64b1b1eb4df862647fc6dfde797d6ecf38e326d7c160c31ff521baf351e520835495e1d0e2ddbdb19f0f
-DIST duplicity-0.7.13.1.tar.gz 1553736 BLAKE2B 607a469abc7f152f564628fda444d0c30aa5d40ee1bc6d461d76c5e7fb5f1b22fa30168b5a7bfc77e03fc0597a05f4ac8f5aaa634a7925aae833a482b70a13bf SHA512 08672910e61a089086992a1106ffc1e161ae3173514d35ae854eac719a095e48efaf7e298c1329ba3b439c0e97236644e88c615a013bd0e8ea9d956b38346ca6
-DIST duplicity-0.7.14.tar.gz 1556110 BLAKE2B 32d4d7f941a09e85915724352ec14d6ed1bdb6a36f55e2160fe4a272868ab6c92f4917f4672183f38dbb3f38a1fa188eedd62ed9063b89b6c31d240ca268fabf SHA512 d814a4da2b23fb586bf2a7a29532ba082756470786f883d9b8cfcd856eabf0db0cdd8e9af5557fe861e439ab058e7586652f91c82c9b99c123cd14c7598b8fc2
-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
-EBUILD duplicity-0.7.13.1.ebuild 1252 BLAKE2B aacaec8e96367279d050700dab7dbaa64df94bff29bf7f7aa28488c2032c0f7656574be8815f49877f9a7b986aceb3f1c39d7badeebac6ee368612108f82ba33 SHA512 19aa6bb381f9ffa1a8a01a8cefa917c3103ff2c08a943bcc5b1cb33fdf90170eebd09a1d16fdf2d417d801fdbe5cefd57a79eeca691d6a6158d57c8828f4677c
-EBUILD duplicity-0.7.14.ebuild 1252 BLAKE2B aacaec8e96367279d050700dab7dbaa64df94bff29bf7f7aa28488c2032c0f7656574be8815f49877f9a7b986aceb3f1c39d7badeebac6ee368612108f82ba33 SHA512 19aa6bb381f9ffa1a8a01a8cefa917c3103ff2c08a943bcc5b1cb33fdf90170eebd09a1d16fdf2d417d801fdbe5cefd57a79eeca691d6a6158d57c8828f4677c
-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
+EBUILD duplicity-0.7.10.ebuild 1267 BLAKE2B cdd85dc1c3e0aa64c95f74f24ff7001856b455505ae51e1fa6f2a3abcc22ee1fabcabc28c9b3295f8aab1b710e9c4562e6014614a335c71971920ca4f83b70d6 SHA512 0d54e0a7573eb24f9a5d687605dea86db8ea341a64a3a1c3b9c6e633ea41e126d9ca73709e49f6c40b73aef1cea27b8ba964194010fd0ed28b0204c1ff658355
+EBUILD duplicity-0.7.12.ebuild 1273 BLAKE2B a50c92e242971f614628e35f7a5aae330da3135b90cef0f6c9aea6a757b25754786b2d77b5ef1fce553b23a73a3a53b537250ede4dc5efd6dcf5c60fd9dc0a45 SHA512 ed81b75b9f407f33dd75450bcde00b94a5dc17ab6cb51808fef872d4d4d19b29f676aef440ba69b24835e1eab5e2b69196b8d8deb983f36916863be12b099cc7
+EBUILD duplicity-0.7.19.ebuild 1268 BLAKE2B dc3546c00b5d333b9675d8d75bdfdb7ed5043f7909bc814be17b3f49328facd92d75aa30aaddcd50a6630327a85e0d5d1c5434282dafd3aa0045279130272d28 SHA512 e7b5ce1870df96a4a0a5fe0e4a78057afdea70966a478d5156a48254d6b6fbe2ff77b770919e870e0bb36984e724b97548d78a58ddf1bf8e7c01a86a5aebb1d6
+MISC metadata.xml 331 BLAKE2B 16d79a36ff3ea61821cee414d23ffd529912bb5d983e1c4229cc476077023c2cc672916fe87655d776bb4ee7c7133b47c1e6d9b378eb31b4f3ba33b8a49e43c1 SHA512 01bd526169862afeb5c7cfdbcce5f990c7eb35b29280e9e01de76b06b557645065bb7a40d1994ec8ef601443a21ac40446881f684961e335c26b26698718c813
diff --git a/app-backup/duplicity/duplicity-0.7.10.ebuild b/app-backup/duplicity/duplicity-0.7.10.ebuild
index 084f57576353..d686f7ae3a5b 100644
--- a/app-backup/duplicity/duplicity-0.7.10.ebuild
+++ b/app-backup/duplicity/duplicity-0.7.10.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
@@ -32,6 +32,8 @@ RDEPEND="${CDEPEND}
 	s3? ( dev-python/boto[${PYTHON_USEDEP}] )
 "
 
+RESTRICT="!test? ( test )"
+
 python_prepare_all() {
 	# workaround until failing test is fixed
 	local PATCHES=( "${FILESDIR}"/${PN}-0.6.24-skip-test.patch )
diff --git a/app-backup/duplicity/duplicity-0.7.11.ebuild b/app-backup/duplicity/duplicity-0.7.11.ebuild
deleted file mode 100644
index c4137e57f2f0..000000000000
--- a/app-backup/duplicity/duplicity-0.7.11.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 versionator
-
-DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="http://www.nongnu.org/duplicity/"
-SRC_URI="https://code.launchpad.net/${PN}/$(get_version_component_range 1-2)-series/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="s3 test"
-
-CDEPEND="
-	net-libs/librsync
-	app-crypt/gnupg
-	dev-python/lockfile
-"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		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/duplicity/duplicity-0.7.12.ebuild b/app-backup/duplicity/duplicity-0.7.12.ebuild
index c4137e57f2f0..f23738bd29bc 100644
--- a/app-backup/duplicity/duplicity-0.7.12.ebuild
+++ b/app-backup/duplicity/duplicity-0.7.12.ebuild
@@ -32,6 +32,8 @@ RDEPEND="${CDEPEND}
 	s3? ( dev-python/boto[${PYTHON_USEDEP}] )
 "
 
+RESTRICT="!test? ( test )"
+
 python_prepare_all() {
 	# workaround until failing test is fixed
 	local PATCHES=( "${FILESDIR}"/${PN}-0.6.24-skip-test.patch )
diff --git a/app-backup/duplicity/duplicity-0.7.13.1.ebuild b/app-backup/duplicity/duplicity-0.7.13.1.ebuild
deleted file mode 100644
index 8b00a732be67..000000000000
--- a/app-backup/duplicity/duplicity-0.7.13.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 versionator
-
-DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="http://www.nongnu.org/duplicity/"
-SRC_URI="https://code.launchpad.net/${PN}/$(get_version_component_range 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? (
-		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/duplicity/duplicity-0.7.14.ebuild b/app-backup/duplicity/duplicity-0.7.14.ebuild
deleted file mode 100644
index 8b00a732be67..000000000000
--- a/app-backup/duplicity/duplicity-0.7.14.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 versionator
-
-DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="http://www.nongnu.org/duplicity/"
-SRC_URI="https://code.launchpad.net/${PN}/$(get_version_component_range 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? (
-		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/duplicity/duplicity-0.7.15.ebuild b/app-backup/duplicity/duplicity-0.7.15.ebuild
deleted file mode 100644
index 0e550a7c893c..000000000000
--- a/app-backup/duplicity/duplicity-0.7.15.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 versionator
-
-DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="http://www.nongnu.org/duplicity/"
-SRC_URI="https://code.launchpad.net/${PN}/$(get_version_component_range 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/duplicity/duplicity-0.7.16.ebuild b/app-backup/duplicity/duplicity-0.7.16.ebuild
deleted file mode 100644
index 0e550a7c893c..000000000000
--- a/app-backup/duplicity/duplicity-0.7.16.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 versionator
-
-DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="http://www.nongnu.org/duplicity/"
-SRC_URI="https://code.launchpad.net/${PN}/$(get_version_component_range 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/duplicity/duplicity-0.7.17.ebuild b/app-backup/duplicity/duplicity-0.7.17.ebuild
deleted file mode 100644
index 0e550a7c893c..000000000000
--- a/app-backup/duplicity/duplicity-0.7.17.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 versionator
-
-DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="http://www.nongnu.org/duplicity/"
-SRC_URI="https://code.launchpad.net/${PN}/$(get_version_component_range 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/duplicity/duplicity-0.7.19.ebuild b/app-backup/duplicity/duplicity-0.7.19.ebuild
index 96eaf6101875..ba996e73ba79 100644
--- a/app-backup/duplicity/duplicity-0.7.19.ebuild
+++ b/app-backup/duplicity/duplicity-0.7.19.ebuild
@@ -33,6 +33,8 @@ RDEPEND="${CDEPEND}
 	s3? ( dev-python/boto[${PYTHON_USEDEP}] )
 "
 
+RESTRICT="!test? ( test )"
+
 python_prepare_all() {
 	# workaround until failing test is fixed
 	local PATCHES=( "${FILESDIR}"/${PN}-0.6.24-skip-test.patch )
diff --git a/app-backup/duplicity/metadata.xml b/app-backup/duplicity/metadata.xml
index b9ff658008bc..6efa6d440510 100644
--- a/app-backup/duplicity/metadata.xml
+++ b/app-backup/duplicity/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>rich0@gentoo.org</email>
 		<name>Rich Freeman</name>
 	</maintainer>