9 files changed, 49 insertions, 204 deletions
diff --git a/app-backup/backuppc/Manifest b/app-backup/backuppc/Manifest
index 143c55d7f687..9857b8ce8727 100644
--- a/app-backup/backuppc/Manifest
+++ b/app-backup/backuppc/Manifest
@@ -8,8 +8,7 @@ AUX backuppc-3.3.1-perl522.patch 607 SHA256 39e5b941705920f2a8f2ec73523d920861af
 AUX backuppc-3.3.1-perl526.patch 969 SHA256 c3a9ecbd526268b4610025455467ff594f8a9bc3bc94ea602616253760b1d485 SHA512 da626131a3253bbc6fe46a06f74462a2d356a71ae369e8de88acca2d85376be0d6ad16c8c566f7c80b93e794808f8b1c09a75707d5031dc64b93ab0f698faced WHIRLPOOL bbf89cf615cb0e2db781589e41e27256d0cc4827028fca45423fbc61c625f23f8117011b9928f6f324efcf2a40bd8b48c08d08e1453de3824f9763bcbbd36124
 AUX backuppc.service 231 SHA256 64114b3ba85c4f6fe313734523c5c2f53f269bf69aea71b85d8f2a8fad7f80f8 SHA512 9a7cb7ac7da2851cfaf90fafe082800fbac34a5a40a9f6aed1ea817b6f9aeb5be60cb3cfb35c263997c2ac1d22f3384752a23f44158572a9efc8f2c48e99c969 WHIRLPOOL 73d966f11ee9070c73016a77373bc80cf90b746fe67f53a178f439767c72b6d2efcfc16b66d4771e11a5862006e26bcff433da1dc4668635ea3e8f1254b28ef9
 DIST BackupPC-3.3.1.tar.gz 556461 SHA256 c9cc4aec28a7474a68d40f4bc460ff15140e05c96900c7f98ff3ef06c4f6ae4c SHA512 b6bb9de3103c5062098d80755055b7461ae9133a4a46a66b3d0af89d081086571694db1898e7d85880defa15b030bad522812116ae5361c0fbde90b877d139c6 WHIRLPOOL 1d895f530932fc1287cde9db584befc6ca0850b5841cc4e60927442d0db662ec092bda4efa4953650d3bfa13deb6e9fafa25c10f82e19b39c67969bb4e143bac
-EBUILD backuppc-3.3.1-r4.ebuild 5477 SHA256 6a38cb3548b056d35fa06112f1b4a90144db7276dfb48145f3d71f9cc0656396 SHA512 baaa06ec3fad3743f213def8dada6ada60973068f9629d9508e561570567189736190aa7be557c6b3a917f238b331ce4ea79c1160e9e916e6c233ffe455f8e82 WHIRLPOOL 38361bed12d687eb8f7595afd3d33ff5d425146add36998d30c47f825a4076a23b70348b4ade37120b01bce396cacaf5bb7e9c4f47751926c1653529cb221e8a
-EBUILD backuppc-3.3.1-r5.ebuild 5527 SHA256 c11b158eeaf4533f47501332979c77c6deea69f94ba900467970cffe36f9035c SHA512 62674f0cbf192ccabcdf07c638949e97138229d63bf20fd785513a19f2612b3d2fc78a92010125bb509c23ca1f7aee4d68ff776af0c985732bf2db2d8ed34998 WHIRLPOOL 925f19a4572a28fe3f01a0b3ed9259cf79e6f172d06c06021627bd3044dd5eb908bb2860f7a2b4a535d80a3595cc777d348b5c35ac6189424ec550c9f5646746
+EBUILD backuppc-3.3.1-r5.ebuild 5526 SHA256 f8f7751ad652267a766b77327b085703109cf742f6f9507cde2f923c578d0f96 SHA512 c1c16a3cbb91dbd990165719591fd48fc6bdddc54c86e6d977f6e7cc3302b3e5e49ce1992f79b70e5c8edbde0b85919fcf4e8dcb2811af7dd725a5a1ab0d0ff6 WHIRLPOOL 0f8d24ef88f3438a98b73ae52f9a81fefb7e24a9e09e01d22597a049a00fb75327ded706dacdc5a9c5a0df15954efb888af09c2c90ac3946799867ca0aa92980
 MISC ChangeLog 5475 SHA256 3314e604fac7c9aa6f2aaeac3455267155348c8098410ab78036de0c9e1c9481 SHA512 9489dd75dd8d3a4293dfacca4e87cf8950caeb12bc1ffab6799e760595d11baededaa1ee539c5162284a1aeee727fefafb69761a3f6cc23073d877434cf6d0a7 WHIRLPOOL 38b1bd5d921381f44c3c5e5d32dccc4821075b963673efed1953210b0d59b5e72fe476d5a27601777bfe8b76b3569e9f0907ff4e38e6884f34401f08e8694eef
 MISC ChangeLog-2015 4969 SHA256 ff971ce4f576305d8716057a045d3e03ce91c11b911d53b654e818afeda89b28 SHA512 94f00aa13f98e63dc1ab372fd44430afd868d9e5c3353782ece3aa6d88d20677afa560d4cf9d0b741342f97d24253185913107b30773cba1a21e0bf36f24140e WHIRLPOOL 556015ae5a37c510febd7926ec277a1839bf6162e70ce246c1f966b79f82d67d6d797bcea4540650a2b80a19350bafa3aab3f37a36b14edd96ddc00820dbc700
 MISC metadata.xml 245 SHA256 2ed31d145dc2ab60b1831fb2907b6345be8646b5200997e2d2f8e2b3ef8cf6dc SHA512 4129c00f4fd37b4c2e051df35c98105ee97b74bc2a8af78e97f2cbc4c97d14740456fc01ed2ab5c6df3bab10a17ce1728de9e4b83cfee393a8841e8933232877 WHIRLPOOL 757f6848afff294f8f748273dc054a16758d724a506b103b87a5bdf0f0a2a4200637b456eb3d94b3b42e2439633c15387b2035a32d7fe4cef1f2b23cd17d2c87
diff --git a/app-backup/backuppc/backuppc-3.3.1-r4.ebuild b/app-backup/backuppc/backuppc-3.3.1-r4.ebuild
deleted file mode 100644
index 62d816fa2e8a..000000000000
--- a/app-backup/backuppc/backuppc-3.3.1-r4.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit depend.apache eutils user systemd
-
-MY_P="BackupPC-${PV}"
-
-DESCRIPTION="High-performance backups to a server's disk"
-HOMEPAGE="http://backuppc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-IUSE="rss samba"
-
-# The CGI modules are handled in $RDEPEND.
-APACHE_MODULES="apache2_modules_alias," # RedirectMatch
-APACHE_MODULES+="apache2_modules_authn_core," # AuthType
-APACHE_MODULES+="apache2_modules_authz_core," # Require
-APACHE_MODULES+="apache2_modules_authz_host," # Require host
-APACHE_MODULES+="apache2_modules_authz_user" # Require valid-user
-
-DEPEND="dev-lang/perl
-	app-admin/apache-tools
-	app-admin/makepasswd"
-
-# Older versions of mod_perl think they're compatibile with apache-2.4,
-# so we require the new one explicitly.
-RDEPEND="${DEPEND}
-	virtual/perl-IO-Compress
-	dev-perl/Archive-Zip
-	dev-perl/CGI
-	dev-perl/libwww-perl
-	app-arch/tar
-	app-arch/par2cmdline
-	app-arch/gzip
-	app-arch/bzip2
-	virtual/mta
-	>=www-apache/mod_perl-2.0.9
-	www-apache/mpm_itk
-	|| ( >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgi]
-		 >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgid]
-		 >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_fcgid] )
-	net-misc/rsync
-	dev-perl/File-RsyncP
-	rss? ( dev-perl/XML-RSS )
-	samba? ( net-fs/samba )"
-
-need_apache2_4
-
-SLOT="0"
-
-S="${WORKDIR}/${MY_P}"
-
-CGIDIR="/usr/lib/backuppc/htdocs"
-CONFDIR="/etc/BackupPC"
-DATADIR="/var/lib/backuppc"
-DOCDIR="/usr/share/doc/${PF}"
-LOGDIR="/var/log/BackupPC"
-
-pkg_setup() {
-	enewgroup backuppc
-	enewuser backuppc -1 /bin/bash /var/lib/backuppc backuppc
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/3.3.0/01-fix-configure.pl.patch"
-	epatch "${FILESDIR}/3.3.0/02-fix-config.pl-formatting.patch"
-	epatch "${FILESDIR}/3.3.0/03-reasonable-config.pl-defaults.patch"
-
-	epatch "${FILESDIR}/3.2.0/04-add-docdir-marker.patch"
-	epatch "${FILESDIR}/3.2.0/05-nicelevel.patch"
-
-	epatch "${FILESDIR}"/${P}-perl522.patch #580254
-
-	# Fix docs location using the marker that we've patched in.
-	sed -i "s+__DOCDIR__+${DOCDIR}+" "lib/BackupPC/CGI/View.pm" \
-		|| die "failed to sed the documentation location"
-}
-
-src_install() {
-	local myconf
-	myconf=""
-	if use samba ; then
-		myconf="--bin-path smbclient=$(type -p smbclient)"
-		myconf="${myconf} --bin-path nmblookup=$(type -p nmblookup)"
-	fi
-
-	/usr/bin/env perl ./configure.pl \
-		--batch \
-		--bin-path perl=$(type -p perl) \
-		--bin-path tar=$(type -p tar) \
-		--bin-path rsync=$(type -p rsync) \
-		--bin-path ping=$(type -p ping) \
-		--bin-path df=$(type -p df) \
-		--bin-path ssh=$(type -p ssh) \
-		--bin-path sendmail=$(type -p sendmail) \
-		--bin-path hostname=$(type -p hostname) \
-		--bin-path gzip=$(type -p gzip) \
-		--bin-path bzip2=$(type -p bzip2) \
-		--config-dir "${CONFDIR}" \
-		--install-dir /usr \
-		--data-dir "${DATADIR}" \
-		--hostname 127.0.0.1 \
-		--uid-ignore \
-		--dest-dir "${D%/}" \
-		--html-dir "${CGIDIR}"/image \
-		--html-dir-url /image \
-		--cgi-dir "${CGIDIR}" \
-		--fhs \
-		${myconf} || die "failed the configure.pl script"
-
-	ebegin "Installing documentation"
-
-	pod2man \
-		-errors=none \
-		--section=8 \
-		--center="BackupPC manual" \
-		"${S}"/doc/BackupPC.pod backuppc.8 \
-		|| die "failed to generate man page"
-
-	doman backuppc.8
-
-	# Place the documentation in the correct location
-	dodoc "${D}/usr/doc/BackupPC.html"
-	dodoc "${D}/usr/doc/BackupPC.pod"
-	rm -rf "${D}/usr/doc" || die
-
-	eend 0
-
-	# Setup directories
-	dodir "${CONFDIR}/pc"
-
-	keepdir "${CONFDIR}"
-	keepdir "${CONFDIR}/pc"
-	keepdir "${DATADIR}"/{trash,pool,pc,cpool}
-	keepdir "${LOGDIR}"
-
-	ebegin "Setting up init.d/conf.d/systemd scripts"
-	newinitd "${S}"/init.d/gentoo-backuppc backuppc
-	newconfd "${S}"/init.d/gentoo-backuppc.conf backuppc
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	insinto "${APACHE_MODULES_CONFDIR}"
-	doins "${FILESDIR}"/99_backuppc.conf
-
-	# Make sure that the ownership is correct
-	chown -R backuppc:backuppc "${D}${CONFDIR}" || die
-	chown -R backuppc:backuppc "${D}${DATADIR}" || die
-	chown -R backuppc:backuppc "${D}${LOGDIR}"  || die
-}
-
-pkg_postinst() {
-	elog "Installation finished, you may now start using BackupPC."
-	elog
-	elog "- Read the documentation in /usr/share/doc/${PF}/BackupPC.html"
-	elog "  Please pay special attention to the security section."
-	elog
-	elog "- You can launch backuppc by running:"
-	elog
-	elog "    # /etc/init.d/backuppc start"
-	elog
-	elog "- To enable the GUI, first edit ${ROOT}etc/conf.d/apache2 and add,"
-	elog
-	elog "    \"-D BACKUPPC -D PERL -D MPM_ITK\""
-	elog
-	elog "  to the APACHE2_OPTS line."
-	elog
-	elog "  Then you must edit ${ROOT}etc/apache2/modules.d/00_mpm_itk.conf"
-	elog "  and adjust the values of LimitUIDRange/LimitGIDRange to include"
-	elog "  the UID and GID of the backuppc user."
-	elog
-	elog "  Finally, start apache:"
-	elog
-	elog "    # /etc/init.d/apache2 start"
-	elog
-	elog "  The web interface should now be running on,"
-	elog
-	elog "    http://127.0.0.1:8080/"
-	elog
-
-	# Generate a new password if there's no auth file
-	if [[ ! -f "${CONFDIR}/users.htpasswd" ]]; then
-		adminuser="backuppc"
-		adminpass=$( makepasswd --chars=12 )
-		htpasswd -bc "${CONFDIR}/users.htpasswd" $adminuser $adminpass
-
-		elog ""
-		elog "- Created admin user $adminuser with password $adminpass"
-		elog "  To add new users, run: "
-		elog ""
-		elog "  # htpasswd ${CONFDIR}/users.htpasswd newUser"
-	fi
-}
diff --git a/app-backup/backuppc/backuppc-3.3.1-r5.ebuild b/app-backup/backuppc/backuppc-3.3.1-r5.ebuild
index 879139e9d5e9..932f8a9640d5 100644
--- a/app-backup/backuppc/backuppc-3.3.1-r5.ebuild
+++ b/app-backup/backuppc/backuppc-3.3.1-r5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://backuppc.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="rss samba"
 
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index 93f3fea02203..bd50d7c16815 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -2,10 +2,12 @@ DIST borgbackup-1.0.10.tar.gz 563363 SHA256 978f28f144924005219da989b1b436a32b27
 DIST borgbackup-1.0.11.tar.gz 603381 SHA256 fc6efd2d19454625532e0defac90cd8e8737665e10ae59edb15356ee5a99d291 SHA512 438d39557a4ebc936f606a880b7f1c915fd5497b11663f03b8a767af7cca522a1b235be0f81c4310d8f12e19d147b438481b7ac82e7371588237de8f1e229525 WHIRLPOOL b998593db3487c0d533820054ff63ca30f0975481fa33f8aacf0d0552c21d37e26879c8a01ca611792b09946d09f82d602685fe2317f701faa015c96ea916f3d
 DIST borgbackup-1.0.9.tar.gz 541796 SHA256 35860840e0429d4bb3acc8b9dd33aa5996a42fb2b678813a982b321a7dba3cb2 SHA512 5623916b143a3d39cab41bc5cca82589a612035d9be0bfd0d211656a975b986bc0c04133bdd1ba44b628fffd84f2c4294530a7c37b9c874e878b77d6105ff0ad WHIRLPOOL 76d740c07bc9767c80e3a725cdbba3f0c990d0e67643089e38f020aa611248f3d3694b07605c12d17645e7af5c1ba7ce7b86a458496350c8c798ab6b97cd0cde
 DIST borgbackup-1.1.0.tar.gz 2912847 SHA256 b40c1120c480a8235ce403b8e6e7abf1377458896f438eafce60f54916789e6f SHA512 052c9780ede503d0ace18ceea2f7d323027c553418c09e7c2202bb3a72d9ff7d34cfd35e2beab42e5cc65d9c28748d469060799c8dd87dcc3fdd9bfa9ba8e9f2 WHIRLPOOL b12bf0086256dd73a30c904fb9883787eef9cd5c4ace1fb2a5791ad8eb37ecd8bf0738b44c793db799f90fffb1e9f23f26d1270dbb80c7eb3265325e079c1a2d
+DIST borgbackup-1.1.1.tar.gz 2988023 SHA256 a5092cfdc57b7f85ce192d64642f94dc0c09ee152a735ae341942532302d3346 SHA512 07e716556fd3edd6d7cdca6045a6eb49a92cdc6d6e37a6999bbd1bc09e00134862081df0d9046c46f867cb4b45ab6ed98f3783eb4e27e4330fc48f0e4dd53272 WHIRLPOOL 8e40b111463e7e338f3c7974fcb8896586b4d640b9bde216fec2e64a8cdd41c89bda6081cc9b2a8819a384a69507b139e4101faa6f917d87155c983d12fecc29
 EBUILD borgbackup-1.0.10.ebuild 920 SHA256 bdf054eec73a0bced4ca0d973cef01a08e8008802f26267bcb4d350f3f5ac6a2 SHA512 7422ea0b80900d17c15c785aecced12742a1725a5133b71a2db5cf904a31fcdb0a519f9b53b7bed20a9095077237b0e91ae3609c1f778eb148b509097907c9f5 WHIRLPOOL f2ecd3f3eb07bdb6981f50db079e112f52b6ac053ccb1f4b220631dbcae82e6a8108f67b24433293ce0cb5a34fc4d694a40edd778b7c799a95ad4b91b9435fc6
 EBUILD borgbackup-1.0.11.ebuild 920 SHA256 bdf054eec73a0bced4ca0d973cef01a08e8008802f26267bcb4d350f3f5ac6a2 SHA512 7422ea0b80900d17c15c785aecced12742a1725a5133b71a2db5cf904a31fcdb0a519f9b53b7bed20a9095077237b0e91ae3609c1f778eb148b509097907c9f5 WHIRLPOOL f2ecd3f3eb07bdb6981f50db079e112f52b6ac053ccb1f4b220631dbcae82e6a8108f67b24433293ce0cb5a34fc4d694a40edd778b7c799a95ad4b91b9435fc6
 EBUILD borgbackup-1.0.9.ebuild 920 SHA256 5b1df0422af525c1056ba16768302b9bbe255ba75608beed1f5a14c404f6bfc6 SHA512 c13be8e551540b87792d2d76a8358f2bbdb5a608eed565f6df312dfa16b0bd19bded17007feb1e43746a35b8adb99f302f1e58000f8ce59383b63cc339dd1373 WHIRLPOOL ebf54c3eac6253e5bbd3ac1169a3770863c0a6303d5c0529b4df1991d7ddd28eeaf318442367e99a4b4747a25d285b280b59c44b69ba36a1a1a0886716e809ae
 EBUILD borgbackup-1.1.0.ebuild 942 SHA256 cefc723a05dc65c970fadc9d9cf74feb910866cf8c8ac424dbbdba2af634da8a SHA512 1891afff5a9e5b87cb05fce1d1c5fc5a3b7b28ff30da260ceb3de5086b4bf7e8a9c26db6c7227edae4a024ed561dad0ece87365ffd034641e6ad5516cd2a4a09 WHIRLPOOL 8499057f385bb797c7992f995f9650b2222c9632a6d30f7fe53c7f11a18b1b88286683cd10ffcd419612b274d8ee23a437f6897c0938315d829b83eea063ce3d
+EBUILD borgbackup-1.1.1.ebuild 942 SHA256 cefc723a05dc65c970fadc9d9cf74feb910866cf8c8ac424dbbdba2af634da8a SHA512 1891afff5a9e5b87cb05fce1d1c5fc5a3b7b28ff30da260ceb3de5086b4bf7e8a9c26db6c7227edae4a024ed561dad0ece87365ffd034641e6ad5516cd2a4a09 WHIRLPOOL 8499057f385bb797c7992f995f9650b2222c9632a6d30f7fe53c7f11a18b1b88286683cd10ffcd419612b274d8ee23a437f6897c0938315d829b83eea063ce3d
 EBUILD borgbackup-9999.ebuild 942 SHA256 cefc723a05dc65c970fadc9d9cf74feb910866cf8c8ac424dbbdba2af634da8a SHA512 1891afff5a9e5b87cb05fce1d1c5fc5a3b7b28ff30da260ceb3de5086b4bf7e8a9c26db6c7227edae4a024ed561dad0ece87365ffd034641e6ad5516cd2a4a09 WHIRLPOOL 8499057f385bb797c7992f995f9650b2222c9632a6d30f7fe53c7f11a18b1b88286683cd10ffcd419612b274d8ee23a437f6897c0938315d829b83eea063ce3d
 MISC ChangeLog 2481 SHA256 f10f2f0cc9530bbc7e7c787c3cc64a12943eea4f0e264cfe4b48fb3578e5d4e1 SHA512 c32e758e363ee4dd55e40c46d0a7de447db6f038419a2f5d2b2d99d581644c0b01a54dabd6bc66f766891aa0478adbe5d1114de601f7c0a3912c2762ec8c8984 WHIRLPOOL eb0927e130dd2a1ae019e73413086d88bb5a5dd5993c68a61fd2b2c9845b4c5a3893771b62fc0bc24b4443e5506a87714f49b9769e49f9f4c6451b132e0aff6f
 MISC metadata.xml 458 SHA256 9ab202d2b1824b39716842005cebb62da19fdee18672ddfde42109bee74a10bc SHA512 46eb78c0bb1233efee20254c9424a62dff31aa258273044342623da9af407a6b667e3d36bf3d1cc10f032766ec808c3afee59171f6c5b1eaeae006d77fd132be WHIRLPOOL 576b41837319050ed4dcd232ac9625b19bbcf55368bf94d62f8afdd3043564d262fe5cbad929e1e8d216c70da20a77c88a2ae57da72a83450357974a5f624ab7
diff --git a/app-backup/borgbackup/borgbackup-1.1.1.ebuild b/app-backup/borgbackup/borgbackup-1.1.1.ebuild
new file mode 100644
index 000000000000..664c1f81223c
--- /dev/null
+++ b/app-backup/borgbackup/borgbackup-1.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 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}
+"
diff --git a/app-backup/flexbackup/Manifest b/app-backup/flexbackup/Manifest
index 28e42125b8ad..d93080f41730 100644
--- a/app-backup/flexbackup/Manifest
+++ b/app-backup/flexbackup/Manifest
@@ -12,7 +12,7 @@ AUX flexbackup-1.2.1-spaces-in-filenames.patch 11037 SHA256 4dde33d92ff0e97a6148
 AUX flexbackup-1.2.1-tar-1.29.patch 514 SHA256 f52a1593e97c8355a3e876a217846c42c17c89df2b5baf39de49732032d1ebb4 SHA512 b8a28c93db2b8f04bcf7c56406fd0457b837e9afea30a5a1cf37bdd64554bbb4ee665b5c15af24701eeab10a1b1c2d31371b7c0ce32cbfb29223ac34956cc962 WHIRLPOOL 1c5e109905617eadb564bcc0ec213b78f0d512b9a0b9083c3ea2139a021011d2d09ad387aedb61fde0b8b23b4d7b93766ee9dc77a0b25dbd9c4fc2b83990012b
 DIST flexbackup-1.2.1.tar.gz 80158 SHA256 58282b21985be75f1219c5ff4906d217055ed8627ea3e2ffdfe7a2393bc9d2c3 SHA512 17630bc46657becdf5d5bde4852fd6cebe189fe54d381bda6471aa2e1db1ff082ba24461e2c22ba5805c2d93ac7f9805ffbdc4904da017f1b163cc21b5a3974b WHIRLPOOL 0beb123986579b5f5c9add2e1ccc02b11e687dfce7a093d550239aec50cf5a35cf15da066a6b0f23819a001dce222d5167874527411bb31bca405b55c8f2d171
 EBUILD flexbackup-1.2.1-r12.ebuild 2606 SHA256 f3e543097e8fc465635b57a83a41077760532bd7bf5f8f85c4853b10c0ef2a40 SHA512 2ca29183f1305b765bf78d2c626f5d645769fdb8a8bf532d85bb24a78c5e8873bbb539b7ebd2deeb7dfc8bc18e57389c628b7f7c5abfab06a7a49951d8eb68e9 WHIRLPOOL 90c4fddbb5ba2d139f79f3925974b36480e806a443f8ff29fe759b9687378b5938f061eda02099850eff701c16715049b0c52ad1774540827f5ec47dcaf2301b
-EBUILD flexbackup-1.2.1-r13.ebuild 2795 SHA256 db5c55ad89d286dfc846e527e61f5cd016939b30f2946151ba49627e3e3d1df5 SHA512 f60b9a5bd354633c94158b593fbf3e40ee32b579764d053ee13f138bf9f3ea61bf47481e4945a1e2d770b5930cdbd8a91a789a209a94043b64c85a759349fed2 WHIRLPOOL 4ef3cb4dfc5e6c932494fd2dc4d675c7c46c3a05d861a6680e767974f24fec3af1cadf0a43ba48211ccc607bbe6f362853dfd97b035413245537021130a89822
+EBUILD flexbackup-1.2.1-r13.ebuild 2792 SHA256 104c530aac19bc60842edb7b79dd4aae0b154e32a97ea05c9e7a8981e7402e3a SHA512 285832cc7ce730b942f21297c1b804edefabf4c2bc59de076f08355c20d258585665e9c9fdbeb7aa95921bbe0ab8c2f47a7bed8081d04427b6703fc77f6276ff WHIRLPOOL 8a398354173e7e22149472dce81a23ff1de5af4612ff902ad3b0a47d2a9f2232cd461b18631869f901e27860e33ab3415a8a22a3b6842c8256df041dd4fa137d
 MISC ChangeLog 3284 SHA256 fdbf252c8f5ed7fd57c076f11b4894818fa9609596de7a5400226bf39993a416 SHA512 50d45872acfd1fc90dd8c932011c9df8d83ec0026a2f096348cbf8a74123ca798a8f5ba83159d410ab1db6e52c8d1cc1c5b2f64f64b425228154acc664231601 WHIRLPOOL 9c9ab3a38b7f177e9359502047e02dd2f0dbe0299b3ae6c7c5d75e6754f05b26c77b1d0941b077c946adae25143c651a0b55aacabb7138f49ff6c4d7860f476e
 MISC ChangeLog-2015 10208 SHA256 1305eacdc53c71c785e4a4fd3dc0b345b75a829b32c6b1bdc9ed6c6d24bbd44e SHA512 f8ae697645bdf546be4dbbc9e846b268e397aaa09ffe13a2b6eca0fbf46c9e9bf1e7d6cadc6f1ce41b099f7ba2c1d0f646367fb6fa1d71dfc1b0321aedfa54a4 WHIRLPOOL 5a0f2caf5d765acd764dbddd4b387a1c6cf4526436728128f29a312c0575f765bf39537de630c8fde59ceddfdb93990084b7147146c79056b148270168ffd04f
 MISC metadata.xml 297 SHA256 3ce3e95d0bea1cc0143e47f0e392ace0d523b426f7ba1b79a992a6ad13a3f82e SHA512 a2fd29aba380cb3b9322131f97beed0d432569ab612118bf1a9a428a93602c859014face05fc8582c8dfdf6858296a36ae6754fdc45a78715058d779df3f7e0a WHIRLPOOL 9cdd49618cd91688347db268b6da4a62f784efd9a89ba5d7dc8604e1ece6d12c22769f805632cbfde830f8935f4face3c677aeec9d4762c18e38049c15c1d1fa
diff --git a/app-backup/flexbackup/flexbackup-1.2.1-r13.ebuild b/app-backup/flexbackup/flexbackup-1.2.1-r13.ebuild
index 8aff19cd8b55..464ac95033b1 100644
--- a/app-backup/flexbackup/flexbackup-1.2.1-r13.ebuild
+++ b/app-backup/flexbackup/flexbackup-1.2.1-r13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ppc x86"
 IUSE=""
 
 RDEPEND="app-arch/mt-st"
diff --git a/app-backup/untangle-https-backup/Manifest b/app-backup/untangle-https-backup/Manifest
index ec363bcdedf3..ebf02318fb1d 100644
--- a/app-backup/untangle-https-backup/Manifest
+++ b/app-backup/untangle-https-backup/Manifest
@@ -1,4 +1,4 @@
-DIST untangle-https-backup-0.0.6.tar.gz 15730 SHA256 91f5a308557d89de50d4f741c623b3b2073878bae44d2efa64b9237b06d18baa SHA512 a7854fe23faba88ee21e3bc9aaaedc54aefc58d8cd844d200d184ddffcff3cc5c90ff429464914e89cbfc4651057007ad328a665ed706d65ba3e1bda87965da1 WHIRLPOOL 913bec9d3bd291798688aa9a1cda9af8fbd746574401d3387f42e7f32bcd817e34702e498594012db19b06ff214b997bd06b0a0712e4690d9549cb5df5a06770
-EBUILD untangle-https-backup-0.0.6.ebuild 579 SHA256 ce5ffab417bd50f5d0a4777a29ed2f8458d2bb1816dca12a403ebfa3cc689cd6 SHA512 1605b1593d8fad6a25c8a424a2ef31a1365f7797c18b5d63499b718c198aea4ab38b306596e31f12b8ffcc804f5cd9d065d05982003df6b31debeb619f80b6dc WHIRLPOOL ad01f1902f22bb09027cc8b594edb580003b1c285e24f25d12ae1516814b7ec606dac9f6875f5f6a77d2e6164602ca1dbff0301068a85ca4b6e40e657b14e8ac
+DIST untangle-https-backup-0.0.7.tar.gz 15846 SHA256 c12d0735a60fa147b1943514af4e4627cb1766e7ac9598a0073944db423c62be SHA512 0b5cd7962340492ea8dd3d63b4d4bf38906c3b0de73456f80c8fd678708777d159b60cb1d58ef13f0e51b6dc97b16823ddaf8de60d21373160df0e735b54420a WHIRLPOOL 4ef4f9148f59921d663e553261badcf0bc53370d022cb4a8f4b8cdc8c173bb3d4704b24f1e094a7a96fb31e19433f31b67ffa39d606c8d80fd9180fcebe33278
+EBUILD untangle-https-backup-0.0.7.ebuild 579 SHA256 ce5ffab417bd50f5d0a4777a29ed2f8458d2bb1816dca12a403ebfa3cc689cd6 SHA512 1605b1593d8fad6a25c8a424a2ef31a1365f7797c18b5d63499b718c198aea4ab38b306596e31f12b8ffcc804f5cd9d065d05982003df6b31debeb619f80b6dc WHIRLPOOL ad01f1902f22bb09027cc8b594edb580003b1c285e24f25d12ae1516814b7ec606dac9f6875f5f6a77d2e6164602ca1dbff0301068a85ca4b6e40e657b14e8ac
 MISC ChangeLog 522 SHA256 6958a7b7582f4780b4d95bc5b272ee1158bd07b930fc75a17f66fc1bf2431347 SHA512 345c9998fc97b3dbe9121f882ac434e773fb06b1ca6e44d7a1669392487ac0f0e909a38cfb4c7db8205d2ac3feba8248b87f87f1548bc629b43d7dcb0cb27e8f WHIRLPOOL 60c88b2fbc51ac7977c4878e274e28c31472ff5f4582ede85592c7624fc56c51608ec80f5dc980f2ac41913b0f2b9ca1dd9df22492b4de6bc5dd218567d41178
 MISC metadata.xml 252 SHA256 f12a15b7cc3ce0ff76c3dbbeba9d162cac9771fb6ecc0f965a34e93f73e67d52 SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742 WHIRLPOOL b7954a2a1cbccce0641aaf3dd273bf6dc64e7b5d39097eefe4d0c06eacc0b5f310db23e93a0a2fff7c8c735193acb1c5c8d4210bf77e78d457d50d05412796e0
diff --git a/app-backup/untangle-https-backup/untangle-https-backup-0.0.6.ebuild b/app-backup/untangle-https-backup/untangle-https-backup-0.0.7.ebuild
index 5c11e34be8d4..5c11e34be8d4 100644
--- a/app-backup/untangle-https-backup/untangle-https-backup-0.0.6.ebuild
+++ b/app-backup/untangle-https-backup/untangle-https-backup-0.0.7.ebuild