gentoo resync : 30.12.2017

26 files changed, 344 insertions, 151 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index dc25826091c9..b45df0e9f7ba 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/ccollect/Manifest b/app-backup/ccollect/Manifest
index f139246f700c..194eddb5cde9 100644
--- a/app-backup/ccollect/Manifest
+++ b/app-backup/ccollect/Manifest
@@ -1,3 +1,3 @@
 DIST ccollect-0.8.tar.bz2 60376 BLAKE2B e3580aa6d1438b106c372e5b4abc77b9e19a8e057b93cfbd5882b3e9a899d5fa02c31c030c933c6e3e254687423cc51d0d86787365d40e4f5635aab3aa6dd954 SHA512 dc4b2a8687c636938154f8a4a4048c3f0ef13f6d6e3f6e66d8dcc8f544f3a390a98a8dbfb3ba2ba9019decbec5d628f07461dd3f803e14b2203972936ebf96f3
-EBUILD ccollect-0.8.ebuild 2197 BLAKE2B f07bdf6e9555965af43be6a77e42cba0e4e5a012a1743be0e1578bdb347a16bb54838edddc4891886bc00854f87232d90208862f421abe30c4b38db3a2c16fb4 SHA512 1a06b65dd77c84f118c7f9409fb51f56dd6dd3bc2add24ea130bf918fce2636194a2e3f686e5f4838071191b0f589652ab396ea08df839776973cdb99d13b0a8
+EBUILD ccollect-0.8.ebuild 2209 BLAKE2B c245ee9ee911eb007e5bb3d9992cba79d1778aeffb9a7ae4fbd1a741ac755f4eef382fe6492a04422e634b6d8e3b5f8e7fb3c4337bea8df27d911af438049c14 SHA512 0258656ab9b00506d1a2fb4e841c91945263d692811cb609b6f222fef947eddd37eb6b284e8332a96c09939f9835024fd9ad0ff49b481cd154471a3605c95126
 MISC metadata.xml 219 BLAKE2B 3c2cd05bc68548ac484a4867fe08096d464a904a994babae6b67e953b25fcd50e14a38ea3a45b8a29b8542bf84f31455742f4cff34c491c07d2dfe732c0c6868 SHA512 deccbe684f92cee0cda5253fd564994d5718143e047d6ce61fea68c3f061dc566e88288e13d98df5e68769ea347724bc39b7a466d3f1028498b4b66bc545ca9e
diff --git a/app-backup/ccollect/ccollect-0.8.ebuild b/app-backup/ccollect/ccollect-0.8.ebuild
index 8cd9780edb4b..b5a9a055b4ac 100644
--- a/app-backup/ccollect/ccollect-0.8.ebuild
+++ b/app-backup/ccollect/ccollect-0.8.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
 DESCRIPTION="Pseudo incremental backup with different exclude lists using hardlinks and rsync"
 HOMEPAGE="http://www.nico.schottelius.org/software/ccollect/"
@@ -12,64 +12,67 @@ SLOT="0"
 KEYWORDS="amd64 hppa ppc ~sparc x86"
 IUSE="doc examples"
 
-DEPEND="doc? ( >=app-text/asciidoc-8.1.0
+DEPEND="
+	doc? (
+		>=app-text/asciidoc-8.1.0
 		app-text/docbook-xsl-stylesheets
 		app-text/docbook-xml-dtd:4.2
-		dev-libs/libxslt )"
+		dev-libs/libxslt
+	)"
 RDEPEND="net-misc/rsync"
 
 # tests need ssh-access
 RESTRICT="test"
 
 src_compile() {
-	if use doc; then
-		emake XSL=/usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl documentation || die "building docs failed"
-	fi
+	use doc && emake XSL=/usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl documentation
 }
 
 src_install() {
 	dobin ccollect.sh
 	dosym ccollect.sh /usr/bin/ccollect
 
-	local tools="add_source analyse_logs archive_config check_config delete_source list_intervals logwrapper stats"
-	for t in ${tools} ; do
-		newbin tools/ccollect_${t}.sh ccollect_${t}
+	local i
+	for i in add_source analyse_logs archive_config check_config \
+	delete_source list_intervals logwrapper stats; do
+		newbin tools/ccollect_${i}.sh ccollect_${i}
 	done
 
 	insinto /usr/share/${PN}/tools
 	doins tools/config-pre* tools/{gnu-du-backup-size-compare,report_success}.sh
 
-	dodoc CREDITS README
-	pushd doc/changes
-	for n in * ; do
-		newdoc ${n} NEWS-${n}
-	done
-	popd
+	pushd doc/changes >/dev/null || die
+		for i in * ; do
+			newdoc ${i} NEWS-${i}
+		done
+	popd >/dev/null || die
 
 	if use doc; then
-		dohtml doc/*.htm doc/*.html
-		dohtml -r doc/man
 		doman doc/man/*.1
+
+		find doc/ \( -iname '*.1' -o -iname '*.text' \) -delete || die
+		HTML_DOCS=( doc/{*.htm{,l},man} )
 	fi
+	einstalldocs
 
 	if use examples ; then
-		# dodoc is not recursive. So do a workaround.
-		insinto /usr/share/doc/${PF}/examples/
-		doins -r conf/*
+		docinto examples
+		dodoc -r conf/.
 	fi
 }
 
 pkg_postinst() {
 	ewarn "If you're upgrading from 0.6.x or less, you'll have to"
 	ewarn "upgrade your existing configuration as follows:"
-	ewarn "1. Make the scripts in /usr/share/ccollect/scripts executable"
-	ewarn "2. Run all config-pre-\$VER-to-\$VER.sh in /usr/share/ccollect/scripts"
+	ewarn "1. Make the scripts in ${EROOT%/}/usr/share/ccollect/scripts executable"
+	ewarn "2. Run all config-pre-\$VER-to-\$VER.sh in ${EROOT%/}/usr/share/ccollect/scripts"
 	ewarn "   ascending order, where \$VER is greater or equal than the version"
 	ewarn "   you upgraded from."
 	ewarn "Example:"
 	ewarn "  You upgraded from 0.5, thus you have to run:"
-	ewarn "  /usr/share/ccollect/tools/config-pre-0.6-to-0.6.sh"
-	ewarn "  /usr/share/ccollect/tools/config-pre-0.7-to-0.7.sh"
-	elog "Please note that many tools are now installed directly to /usr/bin"
+	ewarn "  ${EROOT%/}/usr/share/ccollect/tools/config-pre-0.6-to-0.6.sh"
+	ewarn "  ${EROOT%/}/usr/share/ccollect/tools/config-pre-0.7-to-0.7.sh"
+
+	elog "Please note that many tools are now installed directly to ${EROOT%/}/usr/bin"
 	elog "as recommended by upstream."
 }
diff --git a/app-backup/cpdup/Manifest b/app-backup/cpdup/Manifest
index cb74df0fa96a..c9ca4f8aba9f 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 325 BLAKE2B 81dff5bb87b9e6b174efbc7f311270f54b892adce5d2c600151209461554a397e2ff5bbfdbfa89c50f3c34bb9f891c6d571289fffbc2154234abfe0b2ee0ed00 SHA512 55f410d3d849a08e90bb7a9b2a695adf1f351a413e0a0a977a98aa8dbd7f3b5afea9ff886310e632bb2f5e264e44ddafdf97a934121717cea08a85e41c1d53d1
+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 958 BLAKE2B 9a18cfbeb60cc79162b61b71ccb7d5086836eb111f5a99b765be3ada1e26f590ba170c46f21d9672cddd750970024e716653ff9355271bf4b02663693f438d28 SHA512 194fb0c3f844e315bf5d83254814da33a0774c9d4c0898c3d47249bb0135a4cbc7612e709288ffe49f35af25f88f16b119326cc8ed8eb07bc7ec2fde9b7977a2
+EBUILD cpdup-1.18.ebuild 938 BLAKE2B b840ebca830c4b3c18c15b17123f006eefd70efec4cd675da18ba559044a34845cc6cbdbad6561166f5b94fc887bd5615ad7c8120b4427c298c7eae8fd9279bb SHA512 1413eb8f9f8fa92bfe2e3a1551bfc76dcbdec12cefa60b8450aed2a372a23933bc38003efc85df69a40e50fd0f51d33f54aa770c5f430a7f853dfa014bf440af
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/app-backup/cpdup/cpdup-1.18.ebuild b/app-backup/cpdup/cpdup-1.18.ebuild
index b3cd0a45df5e..cf88a6bfd530 100644
--- a/app-backup/cpdup/cpdup-1.18.ebuild
+++ b/app-backup/cpdup/cpdup-1.18.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils toolchain-funcs
+EAPI=6
+
+inherit toolchain-funcs
 
 DESCRIPTION="A comprehensive filesystem mirroring program"
 HOMEPAGE="http://apollo.backplane.com/FreeSrc/"
@@ -16,30 +18,30 @@ DEPEND=""
 RDEPEND=""
 
 S="${WORKDIR}/${PN}"
+PATCHES=( "${FILESDIR}"/${PN}-1.11-unused.patch )
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-1.11-unused.patch
+src_prepare() {
+	default
 
 	if use userland_GNU; then
-		cp "${FILESDIR}"/Makefile.linux Makefile
+		cp "${FILESDIR}"/Makefile.linux Makefile || die
 		# bits/stat.h has __unused too
-		sed -i 's/__unused/__cpdup_unused/' *.c
-		echo "#define strlcpy(a,b,c) strncpy(a,b,c)" >> cpdup.h
+		sed -i 's/__unused/__cpdup_unused/' *.c || die
+		echo "#define strlcpy(a,b,c) strncpy(a,b,c)" >> cpdup.h || die
 	fi
 }
 
-src_compile() {
+src_configure() {
 	tc-export CC
-	use threads || MAKEOPTS="$MAKEOPTS NOPTHREADS=1"
-	MAKE=make emake || die "emake failed"
+	use threads || EXTRA_MAKE_OPTS="NOPTHREADS=1"
+}
+
+src_compile() {
+	MAKE=make emake ${EXTRA_MAKE_OPTS}
 }
 
 src_install() {
-	dobin cpdup || die "cannot install cpdup"
+	dobin cpdup
 	doman cpdup.1
-	docinto scripts
-	dodoc scripts/*
+	dodoc -r scripts
 }
diff --git a/app-backup/cpdup/files/cpdup-1.11-unused.patch b/app-backup/cpdup/files/cpdup-1.11-unused.patch
index 1757cb441adc..5544afbeddf9 100644
--- a/app-backup/cpdup/files/cpdup-1.11-unused.patch
+++ b/app-backup/cpdup/files/cpdup-1.11-unused.patch
@@ -1,5 +1,5 @@
---- cpdup.c.orig	2009-02-05 12:22:10.000000000 +0100
-+++ cpdup.c	2009-02-05 12:23:23.000000000 +0100
+--- a/cpdup.c
++++ b/cpdup.c
 @@ -1543,7 +1543,11 @@
   */
  
diff --git a/app-backup/dirvish/Manifest b/app-backup/dirvish/Manifest
index 4024ad66bd3a..9da079da18dc 100644
--- a/app-backup/dirvish/Manifest
+++ b/app-backup/dirvish/Manifest
@@ -1,4 +1,4 @@
 AUX master.conf.example 639 BLAKE2B dede249d8a96a5f7c655b35a1e5087ddc224a009611fb07dc4a5548b3bbe7d949c12d577ccf6abbf63580578e564dc5db988a05e03772e834734ae777f420d55 SHA512 37107271ce39de9aa744e31c1abff9871eb3e58ac48e9c6470abea2742783aeedcc4dd5a698b74f83cfa23a987a3d97dee260502d883367e707edef6b99f636a
 DIST dirvish-1.2.1.tgz 49132 BLAKE2B c5ba8fee055216602fa9f645d4f797b1b5e30a9acf850e3e9c8df64760348ba89dcaf1f0a61e497b03db4a5c7bdc30b5765c0b9949218572244f896feb80b51d SHA512 3618d4e73a19ed9bffa1d68561292f8d61948ab914cf0503771fe6f058af52d02707caaf73ef8b06ddbbeef72817712ab0312c3ab086f8da036c02c1fa22d0a4
-EBUILD dirvish-1.2.1.ebuild 925 BLAKE2B 51abb1fbcd8df286bd08413de580b3fc3e8811563ba5c64712f113fefcc24d0596dad1b4ed6d318099b18d04e59dc096975873015423c3aed8644986fcae95ef SHA512 9b5c68b14258552adb70f9952733bd5226c58cf89a7007d6cd415f553318a88b3dd79b0d27033dc3910c9934c77f1f6f5eacdb3c141ba38ccff5b5ff3ada05c3
+EBUILD dirvish-1.2.1.ebuild 961 BLAKE2B 72c7cdc2ff9bcc17607da288fedf0cb0211fc599dcbbf30346208d5c56c617bf0c0f18c5aebf45e8a28109322eb17f5521ea7c398138ed19650f8b039f9ada33 SHA512 6dabdb4a13ecc8e5522eaccc55284411abec74a6cd0855deed0b2593819b42b7024da87097145ca74658b04a288282b78da00f61bffa6396e50b6cceb5b1d6fb
 MISC metadata.xml 463 BLAKE2B 1af6853a016edac5d0ea68bcf6127ae52a6d799141659fd7dc82e1da79a21c9a73ee48d2707ba3b76776c6999d9b1ef105c59bfa8ab7c05b49285b111b620d61 SHA512 924bc0fcb516c7a91c81e36bb32423d82e08c255aa4a3f16a8df649720b9f14641877ad3cbd3dc1862b1c5f0df19d30b85c4aab4ff41d34dc4586137cd235475
diff --git a/app-backup/dirvish/dirvish-1.2.1.ebuild b/app-backup/dirvish/dirvish-1.2.1.ebuild
index 57629ae47577..13f3e8b769af 100644
--- a/app-backup/dirvish/dirvish-1.2.1.ebuild
+++ b/app-backup/dirvish/dirvish-1.2.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 DESCRIPTION="Dirvish is a fast, disk based, rotating network backup system"
 HOMEPAGE="http://www.dirvish.org/"
 SRC_URI="http://dirvish.org/${P}.tgz"
@@ -15,24 +17,29 @@ RDEPEND="dev-perl/Time-ParseDate
 	dev-perl/Time-Period
 	>=net-misc/rsync-2.5.7"
 
-src_compile() {
-	for f in dirvish dirvish-runall dirvish-expire dirvish-locate ; do
-		cat > $f  <<-EOF
+src_prepare() {
+	default
+
+	local f
+	for f in dirvish dirvish-runall dirvish-expire dirvish-locate; do
+		cat > $f  <<-EOF || die
 		#!/usr/bin/perl
 
 		\$CONFDIR = "/etc/dirvish";
 
 		EOF
-		cat $f.pl >> $f
-		cat loadconfig.pl >> $f
+		cat $f.pl >> $f || die
+		cat loadconfig.pl >> $f || die
 	done
 }
 
 src_install() {
 	dosbin dirvish dirvish-runall dirvish-expire dirvish-locate
 	doman dirvish.8 dirvish-runall.8 dirvish-expire.8 dirvish-locate.8 dirvish.conf.5
-	dohtml FAQ.html INSTALL RELEASE.html TODO.html
-	dodoc CHANGELOG
 
-	insinto /etc/dirvish; doins "${FILESDIR}"/master.conf.example
+	HTML_DOCS=( {FAQ,RELEASE,TODO}.html )
+	einstalldocs
+
+	insinto /etc/dirvish
+	doins "${FILESDIR}"/master.conf.example
 }
diff --git a/app-backup/hdup/Manifest b/app-backup/hdup/Manifest
index dd5c0e6a40be..394a7607c986 100644
--- a/app-backup/hdup/Manifest
+++ b/app-backup/hdup/Manifest
@@ -1,3 +1,4 @@
+AUX hdup-2.0.14-fix-build-system.patch 1237 BLAKE2B 491b4138e237bf90d6fee8165e28c4281a2be9b76d790b8d531f7327b01f7c49ed228b851745a14a22f690e6b51de10348f1ef791c8094187f174129c2da1f19 SHA512 5caaec6fc990249a1198a05d50bdf18af9bb82a66dd9dac763f1414b908a183d7e78fc7bed4c779da6e9afd6a894daf9c04975188848c4d604fd5ff39a2344b2
 DIST hdup-2.0.14.tar.bz2 87803 BLAKE2B 28e65596e4a278f3895986ef97f5557b875adb4bab5e22bae96d58caf64526e63fc2207fc920b59c915b35133f2c66d9280dfd44e5c81b01e87842ee1d19e86f SHA512 076876345d58bc6a1b987adc3ea10b1e82652504f52579d62c3f9f97c120fd56f3177deb4fe810b1579ab473061d2ab38b0ab97b83427ec84d5141f7043897f8
-EBUILD hdup-2.0.14.ebuild 1288 BLAKE2B 184221bc55496f31a3fe8ebd7e9dc590a29ef6bb1f29ae12e31d45158c254c493f5baa6d4ff3a0d5337a1030747c0063e69fef9ff4641a489c173565e478d498 SHA512 b3f3cedac1b47ddb1722f67069f5b802ac104928e9b38741e68b4edebaeb013fe516effdccb0e96042865bb0da5ad399ab38eff83863bdcd225150d928cf3689
+EBUILD hdup-2.0.14.ebuild 966 BLAKE2B eef84b761bdc418e7c1496a7d905033ebb3548c56aab8fb6300f381ea94eb4d63cc4ef02581bac9d2ca907dcc737096ce1a85f53a86641af7816b910af55efdb SHA512 95ef811d17e7d6f9a62124863a6817505f19e55b5d6973500162557f1605376b565d28e3b95edc8f3136d5d8e580de7e982ca6b00df051ed79b98b692a3b2cd9
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-backup/hdup/files/hdup-2.0.14-fix-build-system.patch b/app-backup/hdup/files/hdup-2.0.14-fix-build-system.patch
new file mode 100644
index 000000000000..75ed0254c4ed
--- /dev/null
+++ b/app-backup/hdup/files/hdup-2.0.14-fix-build-system.patch
@@ -0,0 +1,53 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -11,7 +11,7 @@
+ 
+ hdup:	
+ 	@echo hdup version: ${VERSION}
+-	@(cd src ; $(MAKE) all)
++	$(MAKE) -C src all
+ 	
+ clean: tarclean docclean
+ 	@rm -f Makefile
+@@ -32,7 +32,7 @@
+ 	@echo "done"
+ 
+ uninstall:
+-	@(cd src ; make uninstall )
++	$(MAKE) -C src uninstall
+ 
+ install: 
+-	@(cd src ; make install )
++	$(MAKE) -C src install
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -11,9 +11,9 @@
+ sysconfdir = @sysconfdir@
+ hdup_config = $(sysconfdir)/hdup/hdup.conf
+ 
+-GCC = @CC@
++CC = @CC@
+ GLIB_CFLAGS     = @GLIB_CFLAGS@
+-GLIB_LIBS       = @GLIB_LIBS@
++LDLIBS = @GLIB_LIBS@
+ CFLAGS =-Wall @CFLAGS@ @DEFS@ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -Wpointer-arith -Wstrict-prototypes -DETCFILE=\"$(hdup_config)\"
+ INSTALL = ../install-sh -c
+ INSTALL_PROG = $(INSTALL) 
+@@ -22,14 +22,12 @@
+ ######################################
+ ######################################
+ .PHONY:	clean install all uninstall
+-%.o:    %.c ${HDR}
+-	${GCC} ${CFLAGS} ${GLIB_CFLAGS} -c $<
++.c.o:
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(GLIB_CFLAGS) -c $< -o $@
+ 
+ all:	hdup Makefile.in
+ 
+-hdup:	${OBJ} ${HDR} Makefile.in
+-	${GCC} ${GLIB_LIBS} ${OBJ} -o hdup
+-	${STRIP}
++hdup:	$(OBJ) 
+ 
+ hdup.h:	hdup.h.in Makefile.in
+ 	@(cd .. ; ./configure)
diff --git a/app-backup/hdup/hdup-2.0.14.ebuild b/app-backup/hdup/hdup-2.0.14.ebuild
index 296408761b4c..87d941b00336 100644
--- a/app-backup/hdup/hdup-2.0.14.ebuild
+++ b/app-backup/hdup/hdup-2.0.14.ebuild
@@ -1,55 +1,41 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-KEYWORDS="~amd64 ~ppc ~x86"
+EAPI=6
+
 DESCRIPTION="Hdup is backup program using tar, find, gzip/bzip2, mcrypt and ssh"
 HOMEPAGE="http://www.miek.nl/projects/hdup2/index.html"
 SRC_URI="http://www.miek.nl/projects/${PN}2/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="crypt"
 
-CDEPEND="app-arch/bzip2
-		app-arch/gzip
-		app-arch/tar
-		>=dev-libs/glib-2.0"
-
-RDEPEND="${CDEPEND}
-		net-misc/openssh
-		sys-apps/coreutils
-		sys-apps/findutils
-		crypt? ( app-crypt/mcrypt )"
-
-DEPEND="${CDEPEND}
-		virtual/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-
-	sed -i \
-		-e '/hdup:/s|${HDR}.*||' \
-		-e 's:GLIB_LIBS *=:LDLIBS =:' \
-		-e '/-o hdup/,+1d' \
-		"${S}"/src/Makefile.in || die "Makefile fix failed"
-}
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
+CDEPEND="
+	app-arch/bzip2
+	app-arch/gzip
+	app-arch/tar
+	>=dev-libs/glib-2.0"
+RDEPEND="
+	${CDEPEND}
+	net-misc/openssh
+	sys-apps/coreutils
+	sys-apps/findutils
+	crypt? ( app-crypt/mcrypt )"
+DEPEND="
+	${CDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0.14-fix-build-system.patch )
 
 src_install() {
-	dodir /usr/sbin
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dohtml doc/FAQ.html
-	dodoc ChangeLog Credits README
-
-	insinto /usr/share/${PN}/contrib/
-	doins contrib/*
+	HTML_DOCS=( doc/FAQ.html )
+	default
+	dodoc Credits
 
-	insinto /usr/share/${PN}/examples/
-	doins examples/*
+	insinto /usr/share/${PN}
+	doins -r contrib examples
 }
 
 pkg_postinst() {
diff --git a/app-backup/mylvmbackup/Manifest b/app-backup/mylvmbackup/Manifest
index 046318d684f2..f38338fca813 100644
--- a/app-backup/mylvmbackup/Manifest
+++ b/app-backup/mylvmbackup/Manifest
@@ -1,3 +1,5 @@
+AUX mylvmbackup-0.14-fix-build-system.patch 381 BLAKE2B 02c0af3b1809145bec8c48b4dceee08c78691b97e3a8df0e260cb2ea16e263bf01c6cc5d9a59217b09daa3e9ab5a2ca14ccbe3e154dad73c35eca5dda49d0c97 SHA512 aff25a3828187de79ccaa3b43189a2d2d89381f1628d47bb2fb6b9fe347009e34f2e26697f57ec08c62083596b0fc49dd59c130b1ceb40bf60012608aa09d306
+AUX mylvmbackup-0.14-fix-config.patch 160 BLAKE2B aa9fd816d76743131b59478acf6b7a0b0f1f735b5ec95c011fb0ff2f25452317766e780c0d051ac1c1b46a42e08342791c10748ed55d532e9adfb2f8c1dd37a8 SHA512 b79b0338563459e757ebf7a8b0cadb59847ab085d224904df3730d1c15827214b26246c27b05d098bfc2a0a8c0339cbcb69cf13407408e3befd5c25c26bdfd04
 DIST mylvmbackup-0.14.tar.gz 57338 BLAKE2B 2f3e85d73a08d8877f84c04e8a7368500fd10dd9ee5172110589175918c10d0e80dce17b842286aacb111d088c275138a87fcf46fb4b416d0697221735cc36b3 SHA512 e61f0c4e24b5482b2f7f4213e810a32776d1b39f589e27c309a4940943f3a9519041e53cf85a089a94100e2cc81715a033682bbe071220d755c14211b4177bfa
-EBUILD mylvmbackup-0.14.ebuild 820 BLAKE2B b3f9d112130a376101c45d865246d509bfa4a2c1ef24946ded10725d9129c9aa7702fb69b8e1ad4e9dcccff66d61f5ac29659abfa74dd15fc4214cb15abe19b7 SHA512 3a90bd402c6c762516354c2465b8d2d399b5c40e43dec703970f93ec8fa2425c58b93d228556df027f97bf8e1a6d07b0deac60860e183250c04e6dc99d8e7c4b
+EBUILD mylvmbackup-0.14.ebuild 678 BLAKE2B b879f2a7701675784b211f3586f929246cdb45dcd2a205578a941f8b5a9f937cfdc39d6788ebc72e36ebef417a6fbffa6c07737dc981ab8659b85c424aa52d48 SHA512 0393f91e96ee75b9320e7b6ec4aa3d040b48a00542e3448f5a666d7a7bca512772b082d986f4796ee477baf2e99bc373c84aced40af433e28f1f45be7d8b3684
 MISC metadata.xml 298 BLAKE2B c8bd6ba1156ac9e53365acb57e9a58584abd5a8de30c8d1c4a5104c3585b8a20d39a950d9a7a5592bce17742f112e7dea832aad3b682c042ffcfae4e5138b78a SHA512 4d3effe7eeee87ea1ceecebf4f29dcd62e520e3c081ab58926441be0841a70f4065fa3031744c337d00faf20b1367e4d951d4443a4c4de76a7ef1f74c4f43923
diff --git a/app-backup/mylvmbackup/files/mylvmbackup-0.14-fix-build-system.patch b/app-backup/mylvmbackup/files/mylvmbackup-0.14-fix-build-system.patch
new file mode 100644
index 000000000000..ebfeee6225e4
--- /dev/null
+++ b/app-backup/mylvmbackup/files/mylvmbackup-0.14-fix-build-system.patch
@@ -0,0 +1,17 @@
+--- a/Makefile
++++ b/Makefile
+@@ -45,12 +45,12 @@
+ 	README \
+ 	TODO
+ CLEANFILES = $(NAME).spec $(NAME) $(MAN1) $(MAN1).html
+-prefix = /usr/local
++prefix = /usr
+ sysconfdir = /etc
+ bindir = $(prefix)/bin
+ datadir = $(prefix)/share/mylvmbackup
+ distdir = $(NAME)-$(VERSION)
+-mandir = $(prefix)/man
++mandir = $(prefix)/share/man
+ man1dir = $(mandir)/man1
+ 
+ all: $(DISTFILES) $(MAN1)
diff --git a/app-backup/mylvmbackup/files/mylvmbackup-0.14-fix-config.patch b/app-backup/mylvmbackup/files/mylvmbackup-0.14-fix-config.patch
new file mode 100644
index 000000000000..ed9ff25d6d20
--- /dev/null
+++ b/app-backup/mylvmbackup/files/mylvmbackup-0.14-fix-config.patch
@@ -0,0 +1,11 @@
+--- a/mylvmbackup.conf
++++ b/mylvmbackup.conf
+@@ -18,7 +18,7 @@
+ host=
+ port=
+ socket=
+-mycnf=/etc/my.cnf
++mycnf=/etc/mysql/my.cnf
+ 
+ #
+ # LVM-specific options
diff --git a/app-backup/mylvmbackup/mylvmbackup-0.14.ebuild b/app-backup/mylvmbackup/mylvmbackup-0.14.ebuild
index 0c9c3e32e542..77f80942fdf2 100644
--- a/app-backup/mylvmbackup/mylvmbackup-0.14.ebuild
+++ b/app-backup/mylvmbackup/mylvmbackup-0.14.ebuild
@@ -1,31 +1,33 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 DESCRIPTION="Tool for creating backups of MySQL server's data files using LVM snapshots"
 HOMEPAGE="http://lenzg.net/mylvmbackup/"
 SRC_URI="http://lenzg.net/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
+
 DEPEND=""
-RDEPEND="dev-perl/Config-IniFiles
-		>=sys-fs/lvm2-2.02.06
-		dev-perl/DBD-mysql
-		virtual/mysql
-		dev-perl/TimeDate"
+RDEPEND="
+	dev-perl/Config-IniFiles
+	dev-perl/DBD-mysql
+	dev-perl/TimeDate
+	>=sys-fs/lvm2-2.02.06
+	virtual/mysql"
 
-src_unpack() {
-	unpack ${A}
-	sed -i \
-		-e '/^prefix/s,/usr/local,/usr,' \
-		"${S}"/Makefile
-	sed -i 's|mycnf=/etc/my.cnf|mycnf=/etc/mysql/my.cnf|' "${S}"/mylvmbackup.conf
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.14-fix-build-system.patch
+	"${FILESDIR}"/${PN}-0.14-fix-config.patch
+)
 
 src_install() {
-	emake install DESTDIR="${D}" mandir="/usr/share/man" || die
-	dodoc ChangeLog README TODO
+	default
+
 	keepdir /var/tmp/${PN}/{backup,mnt}
 	fperms 0700 /var/tmp/${PN}/
 }
diff --git a/app-backup/restic/Manifest b/app-backup/restic/Manifest
index 537ada7a19db..e5bc2b28157c 100644
--- a/app-backup/restic/Manifest
+++ b/app-backup/restic/Manifest
@@ -1,5 +1,7 @@
 DIST restic-0.7.3.tar.gz 37062625 BLAKE2B 0a50c1c6c1ffc8f5d5c0698341bfd1715faee0ab3392ddb065b75143babb45dcfee355f2a369771b4c256cafcb839dc401ad827e194b52d27a1c7582b9c3a1c3 SHA512 2d44b4fc363c7f6389c1f06469cf30ebeff4d6ade0bd4fcae1d7d9def3922936b45043b04f4072284b773df2c6487c58db6aea41c7de5c8184ca33ca3c44d44a
 DIST restic-0.8.0.tar.gz 37309494 BLAKE2B 0c50ccbdabca2057a5d1f8a7326a3e143101daed7cf9eabf0deb2d4452bbd63fd57c3edc8be106c0123f3c4e01195e8042a8f70477c999b00069ffe3d4fcb1d5 SHA512 5f2205ac5caf91f119f1705dc1f8340c481fd27d809cdadbd8ff39ebbc910d98452626c2a9564300935746550a2604ed59aa095f3137788bd0dce87c0dcb14f9
+DIST restic-0.8.1.tar.gz 40330154 BLAKE2B 6758ae4cd7b3caf1bb58b9b95ddd9b99422f2a5997f37317381ec2714a4bc369331e1ba5accb791a2733eddcebdb056256a25b837cad6926f86ec61265d95324 SHA512 02d45b70b94514d3491297dcd34f26db854b6153a1aa297aaa9c938e09d65429fbe0dedb3c028ad38c769049f814c7a923481adfe9962a35dc39a7477a80fdab
 EBUILD restic-0.7.3.ebuild 1276 BLAKE2B 13a79b91735acd188bee1f60303d3237b69fa85af4f37de021b60ca942b0fe2ae06a695720e268f2076eb3c860336a163cb9279d037fbe6a597b621028866531 SHA512 d7bfd4df6620cba9400e6b6c484864a0a5fae4953744cef7e1979f234a3c7d40a53e8750a572d414c98090f99734bc8243aac6353493c845b710190915f52cfe
 EBUILD restic-0.8.0.ebuild 1589 BLAKE2B 9ecc5384646c5227e7557e0a0f4ece8928e70e6491ff90549162223d6aea1b56e57271666491251122ebce01c274a80208010a9647e74a3f33e54ac91f28623e SHA512 3232fcffcf1ced52759125c00f3380f90e263e0e84d1a5da24f3f225ad49c1476e2d979cad85781a7c66bdb89460fa59e7d3b04b7b08bed29b59ea8e008c79f6
+EBUILD restic-0.8.1.ebuild 1589 BLAKE2B 9ecc5384646c5227e7557e0a0f4ece8928e70e6491ff90549162223d6aea1b56e57271666491251122ebce01c274a80208010a9647e74a3f33e54ac91f28623e SHA512 3232fcffcf1ced52759125c00f3380f90e263e0e84d1a5da24f3f225ad49c1476e2d979cad85781a7c66bdb89460fa59e7d3b04b7b08bed29b59ea8e008c79f6
 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.8.1.ebuild
new file mode 100644
index 000000000000..3cd921c0f6dc
--- /dev/null
+++ b/app-backup/restic/restic-0.8.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot bash-completion-r1
+
+DESCRIPTION="A backup program that is fast, efficient and secure"
+HOMEPAGE="https://restic.github.io/"
+SRC_URI="https://github.com/restic/restic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+EGO_PN="github.com/restic/restic"
+
+LICENSE="BSD-2"
+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"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_compile() {
+	local mygoargs=(
+		-v
+		-work
+		-x
+		-tags release
+		-ldflags "-s -w -X main.version=${PV}"
+		-asmflags "-trimpath=${S}"
+		-gcflags "-trimpath=${S}"
+		-o restic ${EGO_PN}/cmd/restic
+	)
+
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+		go build "${mygoargs[@]}" || die
+}
+
+src_test() {
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+		go test -timeout 30m -v -work -x ${EGO_PN}/cmd/... ${EGO_PN}/internal/... || die
+}
+
+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
+}
diff --git a/app-backup/sarab/Manifest b/app-backup/sarab/Manifest
index be22863d958a..fdae0a5bfb16 100644
--- a/app-backup/sarab/Manifest
+++ b/app-backup/sarab/Manifest
@@ -1,5 +1,5 @@
 AUX 1.0.0-better-defaults-gentoo.patch 809 BLAKE2B 4c06df38ee68c612ebf671334d99c30d21bcea5bc16ad1b1e9c38e2824e503a12aa189f2aae254c991bf71de96244374ee1ef7ed180454905bba316705ed7676 SHA512 733484580782296c344d9c2ec69d4948359fef9c7513d9d481756c9f80fb4a369919dbbae01489dfba4b560d6c8077c755a31fcc74ba01f99148f3f63824fcee
-AUX README.Gentoo 443 BLAKE2B 6a7eada85c0ae10ee4e186e3c8895e206dbccca941d5ae7b650907af450ba510adfabac76cc72b64d18fbaf3db5f9fa9f3c557f4890624f46fc6b5ab92699db2 SHA512 8eba4144634e324bf59adbcbf0dac44c7ed4ae5a89dde7f201da47dca55969d59040f0cf3ba9d632f22a92f7e3aa1d44c0d0be2061bd3facb9d3057267ebf7ae
+AUX README.gentoo 443 BLAKE2B 6a7eada85c0ae10ee4e186e3c8895e206dbccca941d5ae7b650907af450ba510adfabac76cc72b64d18fbaf3db5f9fa9f3c557f4890624f46fc6b5ab92699db2 SHA512 8eba4144634e324bf59adbcbf0dac44c7ed4ae5a89dde7f201da47dca55969d59040f0cf3ba9d632f22a92f7e3aa1d44c0d0be2061bd3facb9d3057267ebf7ae
 DIST sarab-1.0.0.tar.gz 24738 BLAKE2B b89a19f3b68345a4c0b7c70fe41d6a50fe99358167da797faa223549b70d7433a4d478b11f1de794e778f8e0537bca335333789176e14d3273d69a4071aa2a5c SHA512 246abd1893127a8aaf73537b9eb0d43921da37ddee97a02513916db2d6abdde6dd45715fbe56c53809c5442531e8172467de1b05af264a50054ecbecaa8d319f
-EBUILD sarab-1.0.0.ebuild 975 BLAKE2B e7bbc1ea45d12d93150ee1e5275e3b3d4a613bbe23d8168b1ee3eb8ad17f24c29c4462f30c95e7664271c0c96ff5062d57763164f869ef2467fccfea87e74ad1 SHA512 26a62a60d3aa3be19fe79f5d84c115c5d4110536e3e57c61fa389f820743c75583d97e335a98f4c4f88dc0a2bfdd412d5489f40f5d12e195568ac4add5721bae
+EBUILD sarab-1.0.0.ebuild 955 BLAKE2B dcf58aefc12cbbbbdcc76fcc1adbdff349d5282b348e54f477f22221b18ee207046b758c4219f26bf6d9c115e6e0c5902a6faf77b526afe70ad7c7c881a4aa6c SHA512 77e8deaac5fa43aead91a0a431ae9816e5e6b98db08815645ef4d901e74e7cd8fef7854daf6c6cba658e9a20f44b5695ae979644e1c3b7f6371045d8a35e7a9d
 MISC metadata.xml 545 BLAKE2B 87704a0d959232fe1644ced86be57804036dee9f61af88d07ca4f356dfb023f862c4bf792bddfc6b9c67c02bdf57b7eaec7b4050a3b21472ac3a96a0de5cf89f SHA512 fc6b600c6047c1f2216964ae23abbe5de1516fa7b72d531eb9ddddd1d3feac2dcb30c3c769032046f225e8770483a76e01464ead26082369fba0d53f330da30f
diff --git a/app-backup/sarab/files/README.Gentoo b/app-backup/sarab/files/README.gentoo
index 46359913c729..46359913c729 100644
--- a/app-backup/sarab/files/README.Gentoo
+++ b/app-backup/sarab/files/README.gentoo
diff --git a/app-backup/sarab/sarab-1.0.0.ebuild b/app-backup/sarab/sarab-1.0.0.ebuild
index 6c426c2c9cbd..896edbcc95c8 100644
--- a/app-backup/sarab/sarab-1.0.0.ebuild
+++ b/app-backup/sarab/sarab-1.0.0.ebuild
@@ -1,38 +1,41 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils
+EAPI=6
+
+inherit readme.gentoo-r1
 
 DESCRIPTION="SaraB is a powerful and automated backup scheduling system based on DAR"
 HOMEPAGE="http://sarab.sourceforge.net/"
 SRC_URI="mirror://sourceforge/sarab/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND="app-backup/dar
+RDEPEND="
+	app-backup/dar
 	virtual/mailx"
 
-src_unpack() {
-	cd "${S}"
-	unpack ${A}
-
-	epatch "${FILESDIR}"/${PV}-better-defaults-gentoo.patch
-}
+PATCHES=( "${FILESDIR}"/${PV}-better-defaults-gentoo.patch )
 
 src_install() {
 	dobin sarab.sh
+	einstalldocs
+
 	insinto /etc/sarab
-	doins -r etc/*
+	doins -r etc/.
 	# sarab.conf could contain passphrase information
 	fperms 600 /etc/sarab/sarab.conf
-	dodoc CHANGELOG FAQ INSTALL README
-	dodoc "${FILESDIR}"/README.Gentoo
+
+	readme.gentoo_create_doc
 }
 
-pkg_postinstl() {
+pkg_postinst() {
+	readme.gentoo_print_elog
+
 	ewarn "The configuration format for DAR encryption has changed in Sarab 0.2.4."
 	ewarn "Replace DAR_ENCRYPTION_OPTIONS=\"--key blowfish:PASSPHRASE\""
 	ewarn "by SARAB_KEY=\"blowfish:PASSPHRASE\" in /etc/sarab/sarab.conf"
diff --git a/app-backup/vzdump/Manifest b/app-backup/vzdump/Manifest
index 7d9963623011..2baf74810601 100644
--- a/app-backup/vzdump/Manifest
+++ b/app-backup/vzdump/Manifest
@@ -1,3 +1,3 @@
 DIST vzdump-1.2.tar.gz 20296 BLAKE2B adbf4c8a51b9d87f022f6c415db566b5df41c33ca6fca800f362d4eb6b25de53bcc7106b54790e59fe22091e9b519d467750e20e467656ed0ec6d9ac90e66ff4 SHA512 c24bf785704ca3a624127b322a87fee5436fa272e42db159bd08b575405a9ec427d9ad3c82bb0a839495ece4f53b7dafcadc0430b8074368bb8cd844eb31b6cc
-EBUILD vzdump-1.2.ebuild 754 BLAKE2B 8ccd5a901a6cf1bfe31d6b0ad387b44db8c2956d4d45c3e4f6de15dc41c193f5d2bbca843442ea12eb341f9c098d6adac346c085246360091c3a0c700265ff82 SHA512 2f3f1811ba0aa7905fac76b23c3deb3465846c7a4d49a692fc1b022c551d799dddad9356250b8c11da5360fcecfbb67841d40e99f1d5a00ec6c46e532b1d65ad
-MISC metadata.xml 568 BLAKE2B 9c630366107de1df38d2e5eccad455afbd7b2c4c1b90ed1da7081c05766c44e241a04cf65b69a83e965f4424107269de1475bfc09d74fe3c70d4934c668e984c SHA512 a3b126c86aa2b924f258a9077248a0381a118f8083432138b4e634c91bfb2d69994f779b947501fddf76e51caf578b9488f1a53b2f10d7db75be6993acf5ad43
+EBUILD vzdump-1.2.ebuild 706 BLAKE2B 6d3b82ae5921b0675a49fb9ca9b045113b3bc2e8c67dfc9006b1e7f00f765bcb8c4121afd8f51e22cb1eebfa8075cba7e9245cc3be14a8133ed8b23444d7fa47 SHA512 0e54a475a22da82b4981f4151bc977e12cffc8a641a0c24fba8eff26f4576e386a8892ea6f40d43503750376842fa4284122a5510f3377fcf98959dac5c8aff6
+MISC metadata.xml 576 BLAKE2B 0b8dd9f78be1968ca2bfd9c7575929d62e58a1d2da883d7c9f7a349512b0b2c727e453b06ea7c7a3e962c3a5bcc01814a3f5414c43fbba54462259fae810bb2d SHA512 fb26f6fd4b243369db5d037e3027d197150e10e81eccc41880638c5454b822aaf9f2f78c8719cfc6eec4150c0ed7ce7e06438950b2d5a72f9b807bd42199ed4a
diff --git a/app-backup/vzdump/metadata.xml b/app-backup/vzdump/metadata.xml
index 1c2b9403b157..da366eec9b75 100644
--- a/app-backup/vzdump/metadata.xml
+++ b/app-backup/vzdump/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription lang="en">
-vzdump is a utility to make consistent snapshots of running OpenVZ VEs. It basically creates a tar archive of the VE private area, which also includes the VE configuration files.
-There are several ways to provide consistency:
- - stop the VE during backup (very long downtime) 
- - use rsync and suspend/resume (minimal downtime) 
- - use LVM2 (no downtime)
-</longdescription>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		vzdump is a utility to make consistent snapshots of running OpenVZ VEs. It basically creates a tar archive of the VE private area, which also includes the VE configuration files.
+		There are several ways to provide consistency:
+		- stop the VE during backup (very long downtime)
+		- use rsync and suspend/resume (minimal downtime)
+		- use LVM2 (no downtime)
+	</longdescription>
 </pkgmetadata>
diff --git a/app-backup/vzdump/vzdump-1.2.ebuild b/app-backup/vzdump/vzdump-1.2.ebuild
index eb385bda0694..7027a1cd9fe0 100644
--- a/app-backup/vzdump/vzdump-1.2.ebuild
+++ b/app-backup/vzdump/vzdump-1.2.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
+
+inherit perl-functions
 
 DESCRIPTION="A utility to make consistent snapshots of running OpenVZ containers"
 HOMEPAGE="http://pve.proxmox.com/wiki/VZDump"
@@ -12,22 +14,21 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-RDEPEND="dev-lang/perl
+DEPEND="dev-lang/perl:="
+RDEPEND="${DEPEND}
+	app-misc/cstream
 	dev-perl/LockFile-Simple
-	virtual/perl-Getopt-Long
-	sys-cluster/vzctl
 	net-misc/rsync
-	app-misc/cstream
+	sys-cluster/vzctl
+	sys-fs/lvm2
 	virtual/mta
-	sys-fs/lvm2"
+	virtual/perl-Getopt-Long"
 
 src_compile() {
-	:;
+	return
 }
 
 src_install() {
-	local installvendorlib
-	eval "$(perl -V:installvendorlib )"
-	make PERLLIBDIR="${installvendorlib}/PVE" DESTDIR="${D}" install || die "make install failed"
-	dodoc ChangeLog TODO
+	emake PERLLIBDIR="$(perl_get_vendorlib)/PVE" DESTDIR="${D}" install
+	einstalldocs
 }
diff --git a/app-backup/zbackup/Manifest b/app-backup/zbackup/Manifest
index 0e2576ba6e42..855c30bf8755 100644
--- a/app-backup/zbackup/Manifest
+++ b/app-backup/zbackup/Manifest
@@ -1,6 +1,7 @@
 AUX zbackup-1.4.4-tartool.patch 277 BLAKE2B 612cf1a5b6faf753829a859582ccd9cc741028f6a14a85d1a7465c218ae7044519f13d9266e70c270d5f33a65846fcc3f747c53847fdc34fc3f3c2cac9488f48 SHA512 79a7c9e7a929b5b9ed2cb472e96c21a4db9e369590744be4e84335ae428273a9d1c2f28a57f09f571ee99af0c6274e535b25f7494f0dc8c4d2c391428a064d8a
 AUX zbackup-9999-tartool.patch 283 BLAKE2B 227d8a478ab9bdb67208a493b1f06225e3ecf7a6595ba4a41be1d8647df4a7a46645421ce9dd6b7fa5f9af191bbc73ca16cce6a31ea040bd3cf9bd4065c0c142 SHA512 53724bf11c6219e494a77090de34105eb87732a6f6b671bb950ac3d86d8c188544b25e06bd49b9df00cfd471e7de976a37ec8ce60dbbc55dd4ba0d0e21e3d61c
 DIST zbackup-1.4.4.tar.gz 87118 BLAKE2B b51727dfdd756109498acbfe19c9bbe541856a5424f86e664a124cd4042f81a42cd48f14542fbf278444666ce20539fdb6571cce8aeacfcafac9a44c3ee6e789 SHA512 96f0984be71e521b2a188448bb2801996701be6e96b1dac4672cabc9f6bcb6631fdb8d03f5dde4bbdbb0050d9bd1409d468fcba15f93730d69e6c55271aba575
+EBUILD zbackup-1.4.4-r1.ebuild 773 BLAKE2B e3736ff92beb0847675549bbb6504278b06c002f3fecf005725439c8f3bedff8eb41cd3498c974e3dd4f727a5d9f78542525f619e03071bb1fe86fe8a4047c43 SHA512 992cdd5eee2c7ccf264617f6c42069db7a4eedcc33f99f0c579b6110e68e7f8188f6b7689b70dd0d027858f202a2683b892a07ba278aa9006cd91ba9439f2de9
 EBUILD zbackup-1.4.4.ebuild 776 BLAKE2B 0182262abe2cd83b4bb38e2cfed0c75b69f8e4454751a0becfba088bf751be711630bdd5ca11762d99cff06c6468742b0a6e57955b4d58c773f444b52afdbc0f SHA512 611bf46435444ff81a5b139721c1a1498db36cfe7135836418c996a0253317f8ed638269838a88bb011e1ea73e38b0b3eaf380a371596a496f1a40c0c78736d6
-EBUILD zbackup-9999.ebuild 779 BLAKE2B 71a2aa08a44f9196218eb90c7456775f01c46746d47113cafc673004edc7830103e84b6c5824570c19ce81775edd3855d69c86ed20eb0f83248b9fb29744be54 SHA512 7ce0ed34fc1863b1ac0b0051ab154dae6ae2486d48fb005c05644d910e002ca852b47573e3e3beabf1b38621207f0f2d8ece7b9ea6b0f4e21754709f51566a8b
+EBUILD zbackup-9999.ebuild 776 BLAKE2B b54cadd2af1da601fdd9aff31468b9294c2461eb086ff5be4d24d03d1d42035b51f79a66f29f9d464b66b162760b7c650c1b27ed70bce819fe247011e0d89765 SHA512 a83157f48f1457114527b38f28a7f74159b7173d5f3891aed6d5fdd9f98ddcfd08dc5c0196c74321c2841f52af138dcdbd35cba3959c297399507ac99868ae3d
 MISC metadata.xml 868 BLAKE2B 2ca9b107e5d3351ff15030e11d7da82a1b029fcdbcd24c6e0d67bd63b173fe7403c6642b11022253ba735fe70ba085c276dcfbf5dfd01e56d8c91be8144ee82d SHA512 d452d2e94449e05f0d2f99d223587560380999c7afd1396e3c7e3ed8a3792d4abd0bb717d078053cec0cd397df4cb2cf00949b24ab407fc966705bfe6911b524
diff --git a/app-backup/zbackup/zbackup-1.4.4-r1.ebuild b/app-backup/zbackup/zbackup-1.4.4-r1.ebuild
new file mode 100644
index 000000000000..1371f7e56cf4
--- /dev/null
+++ b/app-backup/zbackup/zbackup-1.4.4-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="A versatile deduplicating backup tool"
+HOMEPAGE="http://zbackup.org/ https://github.com/zbackup/zbackup"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="libressl tartool"
+
+DEPEND="app-arch/lzma
+	dev-libs/lzo:2
+	dev-libs/protobuf:0=
+	sys-libs/zlib
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}"
+
+# Add tartool build
+PATCHES=( "${FILESDIR}/${P}-tartool.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TARTOOL="$(usex tartool)"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/app-backup/zbackup/zbackup-9999.ebuild b/app-backup/zbackup/zbackup-9999.ebuild
index e199603c64d9..7b648c0e2b3f 100644
--- a/app-backup/zbackup/zbackup-9999.ebuild
+++ b/app-backup/zbackup/zbackup-9999.ebuild
@@ -17,7 +17,7 @@ IUSE="libressl tartool"
 
 DEPEND="app-arch/lzma
 	dev-libs/lzo:2
-	<dev-libs/protobuf-3:0=
+	dev-libs/protobuf:0=
 	sys-libs/libunwind:7
 	sys-libs/zlib
 	!libressl? ( dev-libs/openssl:0= )