gentoo resync : 14.07.2018

460 files changed, 15155 insertions, 1497 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 56f9eb82b37c..2257dc6863a5 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/amanda-3.3.9 b/app-backup/amanda-3.3.9
deleted file mode 100644
index 6888582af39f..000000000000
--- a/app-backup/amanda-3.3.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd dev-libs/libxslt >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl:=[-build(-)] virtual/pkgconfig
-DESCRIPTION=The Advanced Maryland Automatic Network Disk Archiver
-EAPI=5
-HOMEPAGE=http://www.amanda.org/
-IUSE=curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs
-KEYWORDS=amd64 ppc ppc64 ~sparc x86
-LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
-RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://sourceforge/amanda/amanda-3.3.9.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=14b6086f4145a8f490461f6fc7f16a3f
diff --git a/app-backup/amanda-3.4.1 b/app-backup/amanda-3.4.1
deleted file mode 100644
index 87f1ace9f941..000000000000
--- a/app-backup/amanda-3.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd dev-libs/libxslt dev-lang/swig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl:= virtual/pkgconfig
-DESCRIPTION=The Advanced Maryland Automatic Network Disk Archiver
-EAPI=6
-HOMEPAGE=http://www.amanda.org/
-IUSE=curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
-RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://sourceforge/amanda/amanda-3.4.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=6961b9e46f6783ff1bd8d046f4b6fef3
diff --git a/app-backup/amanda-3.4.2 b/app-backup/amanda-3.4.2
deleted file mode 100644
index 81da1aec20fe..000000000000
--- a/app-backup/amanda-3.4.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd dev-libs/libxslt dev-lang/swig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl:= virtual/pkgconfig
-DESCRIPTION=The Advanced Maryland Automatic Network Disk Archiver
-EAPI=6
-HOMEPAGE=http://www.amanda.org/
-IUSE=curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
-RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://sourceforge/amanda/amanda-3.4.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=49a9a05b83981c45785dc8662ddabd58
diff --git a/app-backup/amanda-3.4.3 b/app-backup/amanda-3.4.3
deleted file mode 100644
index 7c558cbdec66..000000000000
--- a/app-backup/amanda-3.4.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd dev-libs/libxslt dev-lang/swig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl:= virtual/pkgconfig
-DESCRIPTION=The Advanced Maryland Automatic Network Disk Archiver
-EAPI=6
-HOMEPAGE=http://www.amanda.org/
-IUSE=curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
-RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://sourceforge/amanda/amanda-3.4.3.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=49a9a05b83981c45785dc8662ddabd58
diff --git a/app-backup/amanda-3.4.4 b/app-backup/amanda-3.4.4
deleted file mode 100644
index 4283aa059f84..000000000000
--- a/app-backup/amanda-3.4.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd dev-libs/libxslt dev-lang/swig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl:= virtual/pkgconfig
-DESCRIPTION=The Advanced Maryland Automatic Network Disk Archiver
-EAPI=6
-HOMEPAGE=http://www.amanda.org/
-IUSE=curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
-RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://sourceforge/amanda/amanda-3.4.4.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=49a9a05b83981c45785dc8662ddabd58
diff --git a/app-backup/amanda-3.4.5 b/app-backup/amanda-3.4.5
deleted file mode 100644
index 18740f7f9e18..000000000000
--- a/app-backup/amanda-3.4.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd dev-libs/libxslt dev-lang/swig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl:= virtual/pkgconfig
-DESCRIPTION=The Advanced Maryland Automatic Network Disk Archiver
-EAPI=6
-HOMEPAGE=http://www.amanda.org/
-IUSE=curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
-RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://sourceforge/amanda/amanda-3.4.5.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=49a9a05b83981c45785dc8662ddabd58
diff --git a/app-backup/amanda-3.5-r1 b/app-backup/amanda-3.5-r1
deleted file mode 100644
index f94caed89910..000000000000
--- a/app-backup/amanda-3.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd dev-libs/libxslt dev-lang/swig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl:= virtual/pkgconfig
-DESCRIPTION=The Advanced Maryland Automatic Network Disk Archiver
-EAPI=6
-HOMEPAGE=http://www.amanda.org/
-IUSE=curl gnuplot ipv6 kerberos minimal ndmp nls readline s3 samba systemd xfs
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
-RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://sourceforge/amanda/amanda-3.5.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=a27d9fc5ef1307e28f4a4917c21df8f4
diff --git a/app-backup/amanda-3.5.1-r1 b/app-backup/amanda-3.5.1-r1
deleted file mode 100644
index ff8fb3d20b7b..000000000000
--- a/app-backup/amanda-3.5.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd dev-libs/libxslt dev-lang/swig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl:= virtual/pkgconfig
-DESCRIPTION=The Advanced Maryland Automatic Network Disk Archiver
-EAPI=6
-HOMEPAGE=http://www.amanda.org/
-IUSE=curl gnuplot ipv6 kerberos minimal ndmp nls readline s3 samba systemd xfs
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
-RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://sourceforge/amanda/amanda-3.5.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=c045a67244ad50c520e0cc5d02256e07
diff --git a/app-backup/amanda/Manifest b/app-backup/amanda/Manifest
new file mode 100644
index 000000000000..d7e4a0108492
--- /dev/null
+++ b/app-backup/amanda/Manifest
@@ -0,0 +1,34 @@
+AUX amanda-3.3.9-stuck.patch 422 BLAKE2B e7eec8e49a61869f08ca19b913783204914c99dcb2b28465c30f5e5ac230ca3c043944f0a08477304aa7047c98846a6df113ad3daa513c11a084a2d90c13baca SHA512 8028505fd3f1946f13dae631bfd6a74f6d7688c658148a250e473ed85fd1268fae18278ede5f0499200cd84a2bc5481edb2d0f4fec2bab7a57528b9957396c42
+AUX amanda-3.4.1-labelstr.patch 6224 BLAKE2B b1555f4356ad8f12259cad7bba7245d10b53cfbba88a75ead6cf73593996ae7d9fc2cf1e2f4dbebc381f20bc194b281e997d96a3a02b9bb2cb9094a5e3ace8a4 SHA512 337a5fd0eef9521932842248414f4402e8623122f4fb401e909750ec690019daf75b3018cc1c7b50a682bae7cd96187e1406fc7767a8b34297546abe70f0f035
+AUX amanda-3.4.1-slots.patch 512 BLAKE2B 62f48e893a8683e4206a5123227a9745c6002dad1b82e02040ace26df7c0322db5616a27686fba4b1e2eb462b3a07433d8ba004cd3ff90702de0ea8567f8af6b SHA512 ce4fb2184b58c303ce785d661c740dfe25160f2ac1d87283414f4b8bbe6a464e123eea663f5505a3edc9d1542551fe06b744460ce395a4de14b679817a8a74b4
+AUX amanda-amandahosts-client-2.5.1_p3-r1 343 BLAKE2B 9aca710f5a94a4acf625ecc3e78007826797dc74102a8df3f03b0113b15b9dc588a2e82192f0e3a70ffbd51e2be2597a98218c93b316382a978768cf551afa95 SHA512 7c0c4fc6d18b37ee8c11e64f98074b93f52f1bdcb97949648ced82d83ada2ea688f79531efa4c3e596f7390770540f45a7b122bba862cbd5218f1b870594f751
+AUX amanda-amandahosts-server-2.5.1_p3-r1 340 BLAKE2B 67f5de50dcf25204df2ff92b228aa76303ac69b07b31ff373fc644685f278f3e898e4e3a8e43e666ac0b64ebd61a41bb0e73db22d728a9988a93c6ea983ba29f SHA512 b11076634608c16cec4350364d60bcf3d22c12f07c0d8fab53d854e4fb21197eb016fb7f75d8153295ef9f997a3850fcd56b9fe268fa8dde5fd39d9dcbabb08b
+AUX amanda-cron 419 BLAKE2B ecfff0377fd47fb6765fd98310b1c7d16d3caccada79503f8bb6e7ae0685bd08f38f526b32be12dd5c6c7ed71b8ada4e6b6c48ebff8fdc29e08e9fcf77ea0df9 SHA512 93aa1a6bcc66bc5147210bd0dd52ae664064cc708cbe59969a5bc9e783e4972841ad7cb89f3ae111ac7695c42e1b91f727890b8e58c4f8757f08e5eae90fb505
+AUX amanda-devfs 349 BLAKE2B 8134b0d3f654349a1386a0a1a87318c7933c9cf5da3ee93e6a53f68fa6e442107a6b8904a8070b002e2059154f5a6cb25cbaebdfb8e05bdf89ee86904a5901d1 SHA512 44ff6ec5793f6a271e7315b4c45b894fd86e54b4cc6a063c79e69732db9347d45d9a30fb169759de124e568c19f281dba928c7b1696589d43aa83caad6e4836a
+AUX amanda-inetd.amanda.sample-2.6.0_p2-r2 326 BLAKE2B bbd01913ec99fb3a5de8c41f68e8b2da99ecbad00bbd0c38d5d3b1b706d2bdb16c5fec5e99e4c548a23a17c1d75b0487396f35facdaa26ca2cb1f3e2dc262c7d SHA512 8d5c6896f05bb66c2c524d6a9b547008dc218ddd4866b6ce7d8e0e0099c8cd5e6b6f05c9fd7fa1035a2627200ef2becc2981c4d213c9695ffed76af4de82dfd1
+AUX amanda-profile 49 BLAKE2B 945eb68d12056857adf1731f962d1c2fe095fa6267d17ed19213560f7d8546a4eb65cff21a8eda5393509047fbe8b25117be031a65c7b3fb0df61156a24bdb85 SHA512 a7125e77858f22ed7c27ef9a070314c174e15ae530f871b1cfa27f9dd5c1f9a97029b30a6265e825c5e0a05428a04d41d41afe557eb01fcd40fdc50df3799ca8
+AUX amanda-xinetd-2.6.1_p1-client 640 BLAKE2B aaeaae46d28e163b3cfec3f4ba0e2e64f6d6d169942672f71ca18992679191c0e8e884dda36577f9715dda2635cddfae2febbf0fd7034ef36a3441cfc52c6b34 SHA512 1c8ad07bfe79a20cb17208255a327b0ceb0f47834ceeedc97df23a2987816169988f9df0432e7df70dc7ebccf35628c0b38f00a0ec210ddec558190df89b1191
+AUX amanda-xinetd-2.6.1_p1-server 660 BLAKE2B f6bf392e428f4cc55663f4f40b040da16a0335ec15ff476ccd8bd13a39c19193b8653f255e8c6031e39da971f7d1f0cd2ec21d67360d8cd7d41bbdd1e7fc6d67 SHA512 ae0bf03a446becb54e7cbe3e39db990125f2d67a91bb59deaccbb112a0855c45a7840ac68e5e1c6543c03890c7e3e929b0e94527686d678de78044fa0d316c26
+AUX amanda.service 199 BLAKE2B d67926d912010cefe841da364ec935468498b25257dd2d0b61666864b452700494ba7bfdab4f4d7c2c01299159c593f6ec3579e931b86dda79feaf067e3335f1 SHA512 cc54f9423a6f88d2393c96c871d59e8e1f4bbc027ee3cf1cd865609fcf469f1aa3807a5e942efd5ffa77dc7d1d9b657698a8b9ed8c418cc40fd5267610606c0e
+AUX amanda.service-r1 219 BLAKE2B c3dfef35f66fa8c37e2948a47cf8659d1ead77495a6a6515b3a6c1006938e69d7d2f9f9155573f070fecbba2b9f4ece5ffc0c509c7aa8a8a58f46caad2f92091 SHA512 81ebe6f7d1005533d459fde64f7d5f43b06da785c8983bb5a6ed0b9c1abfb4b5106e1050166cc8e34acdf9890df6a6afe605fa3cd0310964ce17b8db1eb8206c
+AUX amanda.socket 107 BLAKE2B ff67fec7a3477b27ed182666dcd5f82329e57a8916ae585345f61485885dc9f506d68fec6025a974b64ad2d58836e3ca088db8408257e138ee7e612427094448 SHA512 4017590985a4e194174cf2ea16ccac5600aaee0d874144a9a28121bcf607d8a116d1f6fe50e10a54330777ccac39b703865b486c7d4e9cca363d8b53c715ee4f
+AUX example_amanda.conf 635 BLAKE2B c02539af8d0692d8ebf80fae47979845a872bd15159616c0be84cba4c24e1f6bc9689c0cf47201fdbfd341ee5124e4b34b7c8aca3b2a8c2a9bd6fa1bc6246a7d SHA512 c025aeba89ae686a7bdc5211d9f9b52663cbf8d90fc293f8e3b7ec4b86810d0098e125f4d41bd76af4f3a451bf98b292aa062760c40efba226e15a06bb3a85a9
+AUX example_disklist-2.5.1_p3-r1 177 BLAKE2B 3060151252a44a4abf02764c19db8349ea63691495bda0ca2db4112844c5aea60e4f8b13e668d9a9ac3707f4f52407c8639ed8cca353eac72e8ca7d9cf38dcd5 SHA512 43fd73b55d48396e1863b23b20b84781aaa7e38200ee4fdbcb898c9a8c5479e24b8448a68ceac01bd6339202935bbf32f02e70a779ee989eeb368ec88d890ae3
+AUX example_global.conf 1377 BLAKE2B 712a3ce480b2cc5e0e47a168ac178621b1e655e9d9880c278dfd5aad9627db14f1f3f6be410c3abc4ce4bd33b0728db14d7832149c1643929bd1c53f27d2987a SHA512 c432bdfb97ceb1005bc004d12208f90b09d4c41c8562b8bba0f7b43bbe510672038ca1658a764cff7c6f8e56fa1439a7c15c69714773438e602a693a4f8195a5
+DIST amanda-3.3.9.tar.gz 4673301 BLAKE2B 8123a4f0d1fd961562a1ae6b97c2bddc4d9cb735b994c3c5f2359fa8a475a20658fc7e94c86307ab11710f23989a98c77b320e34d881b38d56a51ab0ab2f1bbd SHA512 345670a20cff335453e8dcbf457d1fcdb9f266e4a03d729c2b1ba762f4fac323de4a87713d0fd54c11ca244a08dc97fb8c641625f7fa81cb241b3c17748b1b7e
+DIST amanda-3.4.1.tar.gz 5338575 BLAKE2B 286ca826cf80253fd4491b4e94db08cdeea9b13d115021859398ac940b55fb452561baa7545a5c8f3f973a0d595a220056e383a79577d1e9113a00960c9ba038 SHA512 245bf334e36fe8b4361d9fc27ea7e7ef5bd2ecec74719caa16cc94d1ebb3abbef058e28d9afd85851654aaae0984531593a35c079d1ba4aed0fc5177e907ec16
+DIST amanda-3.4.2.tar.gz 5353734 BLAKE2B b7c2bc78a1900d0c87f93ff9eea5cd8a9cb5ad8484475424a6a05d951d9ea543e936bec2fab1624f8ee512dc0a3f87228e07c1720b9a6ddf37f5525ca54260c4 SHA512 dea44ffa5eb30318336395ccbd582df2f83da9a4cf91def2834a2e65b2e0f36cafc1911f6b73c3afb63be256484a78b006bdeb1db5b3ecf87dc59d34754987fd
+DIST amanda-3.4.3.tar.gz 5355137 BLAKE2B 920e34c50a624aeab8ed1e6a4555d6b6e34ede45a8d896892a562a5b82ebf4be17acc49ba688238bae0e374bed0c2be8e683974de574038565cf1e7ad1cb65f0 SHA512 5fa7a8c59961f87568d3459e6b5368e50c6cf74e1a6c7599faf5f85d537e72668775acc11009d1d5699ab92d1c21553b5b86e06b804c6a1ae04500889726694a
+DIST amanda-3.4.4.tar.gz 5363929 BLAKE2B a3da69f63c43ba4821a28d380262b99444c45dbfaa5ff748c6e4d0d452c1ad3e1d6a254dd27fec7afc7f4f8ba0a56c56d90192f1a5ba714ed83e26e52700f397 SHA512 e73ee29a6074396a885b08d9b1160b1e379423596dde872a14a8c8cf5845c9fcf3ea08038007a99063169a863d8b9f3ca9c23b8f5609d463a5b1f2ddcd44be96
+DIST amanda-3.4.5.tar.gz 5365381 BLAKE2B 61c18603d48c4e9c647cfc7e185292e8764d62bd1ea9212da04958029cc87472872fa2e4a45ec52bb15f6342d2f3e41e486a6618024f775dbedffcc762190ae4 SHA512 441efef6a34a1cb645c8c5d1e909f25230322ceb38d1efa0a104de2d9051640f7032255c8d8c7391a918102aceeb5073048070471fb642e185a2a113c817e00c
+DIST amanda-3.5.1.tar.gz 5402093 BLAKE2B 4c342fb55b2b5fc0d338a1616bf26b1d844b0ecd6627432b849996c0072756090e1f695050605af0a5c3eda2daeb63131fbe16b5ac728af9137699f4d916b8e8 SHA512 8d5451b6b3f18f9a705592ba6baf8ffb7fb4fe62261eac8a4f4fae4eded3f7f447f547ac6f016bcb57ea43f116cf87fdc48f8e77b117bbdecf00d3e37dd0f39f
+DIST amanda-3.5.tar.gz 5386719 BLAKE2B 93a382a9091ec7cfc5f21fe7131a6bf0c1aceb169a2274ce66c1f77a08b594beeca430687a6a28403d8cc35e85beecce99fde9c2d7d34c8460999a3ca63937f1 SHA512 31340eb250972b2d7b2ad5e51c4f3fafb9de15b9f51f688447214174c77ea89d344f50709ca51d6ba965f8ed6977608f22d7bc6811cc97b63207f7a7cec8219c
+EBUILD amanda-3.3.9.ebuild 16110 BLAKE2B a35ec544433978b786f4f5a0889f9d68fa8ef1e5993d3ab881adeaf3860fa94b1558b93021013b98539463e584990d240f3740fdfb4bac5e87143db4a5aeb0d7 SHA512 d3d0523405799ea6c07df9a794c8f79fef780c0e367b595d61d25ed6a76a402fa85586268bfc490116e4363238f8d6c330614c252a02000d859c63d67a2220de
+EBUILD amanda-3.4.1.ebuild 16572 BLAKE2B ccb66acf67b1b1586c2f08c68ef30dcf6913846ac2d41e99ed86d166a7e70a15de86775e4902c68acb158b1b20c9987ceeaa4f5c632e4b85d65a3b6958858ce1 SHA512 f23b802ce76b9f91295921747fd0985e3befed5ec7743feffba4f9d96346c2fb6b4010af27598fd07d3a7e97bbe5fa615a8f65ca0b83851e905e09077f8d9372
+EBUILD amanda-3.4.2.ebuild 16478 BLAKE2B b13edc4eca457ceb5a60141ed0956e1465dc0e634ab84e6df53cae85c9fb278a0372bd6d3af13f8d4b8dbdcd79bdc5aac806392dc6019f88ac76f98e4dfdce03 SHA512 02dc61995f38cf2e5dd038f638f510de42040ac8319311ea548055bd304abb07bdad15120807b4a077a8e4c52e0ecef1f57bad3567162d04fd77dbe6b82c257f
+EBUILD amanda-3.4.3.ebuild 16478 BLAKE2B b13edc4eca457ceb5a60141ed0956e1465dc0e634ab84e6df53cae85c9fb278a0372bd6d3af13f8d4b8dbdcd79bdc5aac806392dc6019f88ac76f98e4dfdce03 SHA512 02dc61995f38cf2e5dd038f638f510de42040ac8319311ea548055bd304abb07bdad15120807b4a077a8e4c52e0ecef1f57bad3567162d04fd77dbe6b82c257f
+EBUILD amanda-3.4.4.ebuild 16478 BLAKE2B b13edc4eca457ceb5a60141ed0956e1465dc0e634ab84e6df53cae85c9fb278a0372bd6d3af13f8d4b8dbdcd79bdc5aac806392dc6019f88ac76f98e4dfdce03 SHA512 02dc61995f38cf2e5dd038f638f510de42040ac8319311ea548055bd304abb07bdad15120807b4a077a8e4c52e0ecef1f57bad3567162d04fd77dbe6b82c257f
+EBUILD amanda-3.4.5.ebuild 16478 BLAKE2B b13edc4eca457ceb5a60141ed0956e1465dc0e634ab84e6df53cae85c9fb278a0372bd6d3af13f8d4b8dbdcd79bdc5aac806392dc6019f88ac76f98e4dfdce03 SHA512 02dc61995f38cf2e5dd038f638f510de42040ac8319311ea548055bd304abb07bdad15120807b4a077a8e4c52e0ecef1f57bad3567162d04fd77dbe6b82c257f
+EBUILD amanda-3.5-r1.ebuild 16938 BLAKE2B 8f3babd9023dcde42c315e4f37429ac880dfc5741796fec65cb8d66c92a3ea2dd1285efba960320d7809dc3cf17b5493a806ee18edcc8b7724daaa27363a2127 SHA512 a59b3f14fec406868d2f9ff1de19e3f8ed3eda4348675f084ae6cd8b92f52108788a1527e6772463b98a61dfbd89cacd06fd40d721f5e23eb8ffe9a5c770c07d
+EBUILD amanda-3.5.1-r1.ebuild 16885 BLAKE2B 25046097ecb3c74e6a5232985af728345f95da95ed27d78a4eaf9220a05ff4db9e464ae6537ee0e56ca9e7b68eef3f716fbbd42d2c042844d02bbe68fac58b7d SHA512 c456f5a1b97a949fd6b2ed9e31cb519b6f4e45b3ab963b9dd3342612c444b9fc60b64ed6a9a8c07ed38fe3c8d04fb2f9edf466dc8c14f761c89f92ce93070730
+MISC metadata.xml 951 BLAKE2B 8d3f922a8e395fab343e60d31525a3faa386aebdc2b0548e37037855aab88df4b27f639672e290540bc4746024f43e2da7db853b1d9446d13744c3161a293848 SHA512 0485a881c4592e201c4130ca9bc62499a8933f77a4a4431148c647b420c022404b218896c525ab062cc40f4c386082eed25f2d38ee5bcb5cdeacc0b21c1f8230
diff --git a/app-backup/amanda/amanda-3.3.9.ebuild b/app-backup/amanda/amanda-3.3.9.ebuild
new file mode 100644
index 000000000000..968e236abaa5
--- /dev/null
+++ b/app-backup/amanda/amanda-3.3.9.ebuild
@@ -0,0 +1,480 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils perl-module user systemd
+
+DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
+HOMEPAGE="http://www.amanda.org/"
+SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
+
+LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
+
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+RDEPEND="sys-libs/readline:=
+	virtual/awk
+	app-arch/tar
+	dev-lang/perl:=
+	app-arch/dump
+	net-misc/openssh
+	>=dev-libs/glib-2.26.0
+	nls? ( virtual/libintl )
+	s3? ( >=net-misc/curl-7.10.0 )
+	!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
+	samba? ( net-fs/samba:= )
+	kerberos? ( app-crypt/mit-krb5 )
+	xfs? ( sys-fs/xfsdump )
+	!minimal? (
+		dev-perl/XML-Simple
+		virtual/mailx
+		app-arch/mt-st:=
+		sys-block/mtx
+		gnuplot? ( sci-visualization/gnuplot )
+		app-crypt/aespipe
+		app-crypt/gnupg
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	>=app-text/docbook-xsl-stylesheets-1.72.0
+	app-text/docbook-xml-dtd
+	dev-libs/libxslt
+	"
+
+MYFILESDIR="${T}/files"
+ENVDIR="/etc/env.d"
+ENVDFILE="97amanda"
+TMPENVFILE="${T}/${ENVDFILE}"
+
+# This is a complete list of Amanda settings that the ebuild takes from the
+# build environment. This allows users to alter the behavior of the package as
+# upstream intended, but keeping with Gentoo style. We store a copy of them in
+# /etc/env.d/97amanda during the install, so that they are preserved for future
+# installed. This variable name must not start with AMANDA_, as we do not want
+# it captured into the env file.
+ENV_SETTINGS_AMANDA="
+AMANDA_GROUP_GID AMANDA_GROUP_NAME
+AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS
+AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_INDEX
+AMANDA_TAR_LISTDIR AMANDA_TAR
+AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
+AMANDA_CONFIG_NAME AMANDA_TMPDIR"
+
+amanda_variable_setup() {
+
+	# Setting vars
+	local currentamanda
+
+	# Grab the current settings
+	currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
+
+	# First we set the defaults
+	[ -z "${AMANDA_GROUP_GID}" ] && AMANDA_GROUP_GID=87
+	[ -z "${AMANDA_GROUP_NAME}" ] && AMANDA_GROUP_NAME=amanda
+	[ -z "${AMANDA_USER_NAME}" ] && AMANDA_USER_NAME=amanda
+	[ -z "${AMANDA_USER_UID}" ] && AMANDA_USER_UID=87
+	[ -z "${AMANDA_USER_SH}" ] && AMANDA_USER_SH=/bin/bash
+	[ -z "${AMANDA_USER_HOMEDIR}" ] && AMANDA_USER_HOMEDIR=/var/spool/amanda
+	[ -z "${AMANDA_USER_GROUPS}" ] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
+
+	# This installs Amanda, with the server. However, it could be a client,
+	# just specify an alternate server name in AMANDA_SERVER.
+	[ -z "${AMANDA_SERVER}" ] && AMANDA_SERVER="${HOSTNAME}"
+	[ -z "${AMANDA_SERVER_TAPE}" ] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
+	[ -z "${AMANDA_SERVER_INDEX}" ] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
+	[ -z "${AMANDA_TAR_LISTDIR}" ] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
+	[ -z "${AMANDA_CONFIG_NAME}" ] && AMANDA_CONFIG_NAME=DailySet1
+	[ -z "${AMANDA_TMPDIR}" ] && AMANDA_TMPDIR=/var/tmp/amanda
+	[ -z "${AMANDA_DBGDIR}" ] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
+	# These are left empty by default
+	[ -z "${AMANDA_PORTS_UDP}" ] && AMANDA_PORTS_UDP=
+	[ -z "${AMANDA_PORTS_TCP}" ] && AMANDA_PORTS_TCP=
+	[ -z "${AMANDA_PORTS_BOTH}" ] && AMANDA_PORTS_BOTH=
+	[ -z "${AMANDA_PORTS}" ] && AMANDA_PORTS=
+
+	# What tar to use
+	[ -z "${AMANDA_TAR}" ] && AMANDA_TAR=/bin/tar
+
+	# Now pull in the old stuff
+	if [ -f "${ROOT}${ENVDIR}/${ENVDFILE}" ]; then
+		# We don't just source it as we don't want everything in there.
+		eval $(egrep "^AMANDA_" "${ROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
+	fi
+
+	# Re-apply the new settings if any
+	[ -n "${currentamanda}" ] && eval `echo "${currentamanda}"`
+
+}
+
+pkg_setup() {
+	amanda_variable_setup
+
+	# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
+	# another host than HOSTNAME.
+	if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then
+		elog "You are installing a client-only version of Amanda."
+		elog "You should set the variable \$AMANDA_SERVER to point at your"
+		elog "Amanda-tape-server, otherwise you will have to specify its name"
+		elog "when using amrecover on the client."
+		elog "For example: Use something like"
+		elog "AMANDA_SERVER=\"myserver\" emerge amanda"
+		elog
+	fi
+
+	enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
+	enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
+}
+
+src_unpack() {
+	# we do not want the perl src_unpack
+	default_src_unpack
+}
+
+src_prepare() {
+	# gentoo bug #331111
+	sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am
+	sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am
+
+	# bug with glibc-2.16.0
+	sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h
+
+	eautoreconf
+
+	# places for us to work in
+	mkdir -p "${MYFILESDIR}"
+	# Now we store the settings we just created
+	set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}"
+
+	# Prepare our custom files
+	einfo "Building custom configuration files"
+	local i # our iterator
+	local sedexpr # var for sed expr
+	sedexpr=''
+	for i in ${ENV_SETTINGS_AMANDA} ; do
+		local val
+		eval "val=\"\${${i}}\""
+		sedexpr="${sedexpr}s|__${i}__|${val}|g;"
+	done
+
+	# now apply the sed expr
+	for i in "${FILESDIR}"/amanda-* ; do
+		sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`"
+	done
+
+	(
+		cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1
+		use minimal || cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1
+	) > "${T}"/amandahosts
+
+	if ! use minimal; then
+		sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
+			server-src/am{addclient,serverconfig}.pl || die
+	fi
+
+	epatch "${FILESDIR}"/${P}-stuck.patch
+}
+
+src_configure() {
+	# fix bug #36316
+	addpredict /var/cache/samba/gencache.tdb
+	# fix bug #376169
+	addpredict /run/blkid
+	addpredict /etc/blkid.tab
+
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source "${TMPENVFILE}"
+	local myconf
+
+	einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
+	myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
+	einfo "Using ${AMANDA_SERVER_INDEX} for index server."
+	myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
+	einfo "Using ${AMANDA_USER_NAME} for amanda user."
+	myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
+	einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
+	myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
+	einfo "Using ${AMANDA_TAR} as Tar implementation."
+	myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
+	einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
+	myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
+	einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
+	myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
+	einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
+	myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
+
+	if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
+		eerror "If you want _both_ UDP and TCP ports, please use only the"
+		eerror "AMANDA_PORTS environment variable for identical ports, or set"
+		eerror "AMANDA_PORTS_BOTH."
+		die "Bad port setup!"
+	fi
+	if [ -n "${AMANDA_PORTS_UDP}" ]; then
+		einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
+		myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
+	fi
+	if [ -n "${AMANDA_PORTS_TCP}" ]; then
+		einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
+		myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
+	fi
+	if [ -n "${AMANDA_PORTS}" ]; then
+		einfo "Using ports ${AMANDA_PORTS/,/-}"
+		myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
+	fi
+
+	# Extras
+	# Speed option
+	myconf="${myconf} --with-buffered-dump"
+	# "debugging" in the configuration is NOT debug in the conventional sense.
+	# It is actually just useful output in the application, and should remain
+	# enabled. There are some cases of breakage with MTX tape changers as of
+	# 2.5.1p2 that it exposes when turned off as well.
+	myconf="${myconf} --with-debugging"
+	# Where to put our files
+	myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
+
+	# Samba support
+	myconf="${myconf} `use_with samba smbclient /usr/bin/smbclient`"
+
+	# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
+	# default
+	myconf="${myconf} --with-bsd-security"
+	myconf="${myconf} --with-ssh-security"
+	myconf="${myconf} --with-bsdudp-security"
+	myconf="${myconf} --with-bsdtcp-security"
+
+	# kerberos-security mechanism version 5
+	myconf="${myconf} `use_with kerberos krb5-security`"
+
+	# Amazon S3 support
+	myconf="${myconf} `use_enable s3 s3-device`"
+
+	# libcurl is required for S3 but otherwise optional
+	if ! use s3; then
+		myconf="${myconf} $(use_with curl libcurl)"
+	fi
+
+	# Client only, as requested in bug #127725
+	if use minimal ; then
+		myconf="${myconf} --without-server"
+	else
+		# amplot
+		myconf="${myconf} $(use_with gnuplot)"
+	fi
+
+	# IPv6 fun.
+	myconf="${myconf} `use_with ipv6`"
+	# This is to prevent the IPv6-is-working test
+	# As the test fails on binpkg build hosts with no IPv6.
+	use ipv6 && export amanda_cv_working_ipv6=yes
+
+	# I18N
+	myconf="${myconf} `use_enable nls`"
+
+	# Bug #296634: Perl location
+	perl_set_version
+	myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
+
+	# Bug 296633: --disable-syntax-checks
+	# Some tests are not safe for production systems
+	myconf="${myconf} --disable-syntax-checks"
+
+	# build manpages
+	myconf="${myconf} --enable-manpage-build"
+
+	# bug #483120
+	tc-export AR
+
+	econf \
+		$(use_with readline) \
+		${myconf}
+}
+
+src_compile() {
+	# Again, do not want the perl-module src_compile
+	default_src_compile
+}
+
+src_install() {
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source ${TMPENVFILE}
+
+	einfo "Doing stock install"
+	emake DESTDIR="${D}" install || die
+
+	# Build the envdir file
+	# Don't forget this..
+	einfo "Building environment file"
+	(
+		echo "# These settings are what was present in the environment when this"
+		echo "# Amanda was compiled.  Changing anything below this comment will"
+		echo "# have no effect on your application, but it merely exists to"
+		echo "# preserve them for your next emerge of Amanda"
+		cat "${TMPENVFILE}" | sed "s,=\$,='',g"
+	) >> "${MYFILESDIR}/${ENVDFILE}"
+
+	# Env.d
+	einfo "Installing environment config file"
+	doenvd "${MYFILESDIR}/${ENVDFILE}"
+
+	# Lock down next section (up until docs).
+	insopts -m0640
+	# Installing Amanda Xinetd Services Definition
+	einfo "Installing xinetd service file"
+	insinto /etc/xinetd.d
+	if use minimal ; then
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
+	else
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
+	fi
+
+	if ! use minimal; then
+		einfo "Installing Sample Daily Cron Job for Amanda"
+		insinto /etc/cron.daily
+		newins "${MYFILESDIR}/amanda-cron" amanda
+	fi
+
+	einfo "Installing systemd service and socket files for Amanda"
+	systemd_dounit "${FILESDIR}"/amanda.socket || die
+	systemd_newunit "${FILESDIR}"/amanda.service-r1 'amanda@.service' || die
+
+	insinto /etc/amanda
+	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
+	doins "${T}/amandahosts"
+	fperms 600 /etc/amanda/amandahosts
+
+	dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts"
+	insinto "${AMANDA_USER_HOMEDIR}"
+	einfo "Installing .profile for ${AMANDA_USER_NAME} user"
+	newins "${MYFILESDIR}/amanda-profile" .profile
+
+	insinto /etc/amanda
+	doins "${S}/example/amanda-client.conf"
+	if ! use minimal ; then
+		insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
+		doins "${S}/example/amanda.conf"
+		doins "${S}/example/disklist"
+		keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
+	fi
+
+	keepdir "${AMANDA_TAR_LISTDIR}"
+	keepdir "${AMANDA_USER_HOMEDIR}/amanda"
+	keepdir "${AMANDA_TMPDIR}/dumps"
+	# Just make sure it exists for XFS to work...
+	use xfs && keepdir /var/xfsdump/inventory
+
+	local i
+	for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
+		"${AMANDA_TMPDIR}" /etc/amanda; do
+		einfo "Securing directory (${i})"
+		fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
+	done
+	# Do NOT use -R
+	fperms 0700 \
+		"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
+		"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
+		 "${AMANDA_USER_HOMEDIR}/amanda" \
+		 /etc/amanda
+
+	if ! use minimal ; then
+		fperms 0700 \
+			 "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
+	         /etc/amanda/${AMANDA_CONFIG_NAME}
+	fi
+
+	einfo "Setting setuid permissions"
+	amanda_permissions_fix "${D}"
+
+	# Relax permissions again
+	insopts -m0644
+
+	# docs
+	einfo "Installing documentation"
+	dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING
+	# our inetd sample
+	einfo "Installing standard inetd sample"
+	newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample
+	# Amanda example configs
+	einfo "Installing example configurations"
+	rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes}
+	mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/"
+	docinto example1
+	newdoc "${FILESDIR}/example_amanda.conf" amanda.conf
+	newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist
+	newdoc "${FILESDIR}/example_global.conf" global.conf
+
+	einfo "Cleaning up dud .la files"
+	perl_set_version
+	find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f
+}
+
+pkg_postinst() {
+	[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
+		TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source "${TMPENVFILE}"
+
+	# Migration of amandates from /etc to $localstatedir/amanda
+	if [ -f "${ROOT}/etc/amandates" -a \
+		! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then
+		einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda"
+		einfo "A backup is also placed at /etc/amandates.orig"
+		cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig"
+		mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/"
+		cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates"
+	fi
+	if [ -f "${ROOT}/etc/amandates" ]; then
+		einfo "If you have migrated safely, please delete /etc/amandates"
+	fi
+
+	einfo "Checking setuid permissions"
+	amanda_permissions_fix "${ROOT}"
+
+	elog "You should configure Amanda in /etc/amanda now."
+	elog
+	elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
+	elog "and restart xinetd afterwards!"
+	elog
+	elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample"
+	elog "as an example of how to configure your inetd."
+	elog
+	elog "systemd-users: enable and start amanda.socket or the relevant services"
+	elog "regarding what auth method you use."
+	elog
+	elog "NOTICE: If you need raw access to partitions you need to add the"
+	elog "amanda user to the 'disk' group."
+	elog
+	elog "NOTICE: If you have a tape changer, you need to add the amanda user"
+	elog "to the 'tape' group."
+	elog
+	elog "If you use localhost in your disklist your restores may break."
+	elog "You should replace it with the actual hostname!"
+	elog "Please also see the syntax changes to amandahosts."
+	elog "The only exception is when you use the authentication method 'local'."
+
+	elog "Please note that this package no longer explicitly depends on"
+	elog "virtual/inetd, as it supports modes where an inetd is not needed"
+	elog "(see bug #506028 for details)."
+}
+
+# We have had reports of amanda file permissions getting screwed up.
+# Losing setuid, becoming too lax etc.
+# ONLY root and users in the amanda group should be able to run these binaries!
+amanda_permissions_fix() {
+	local root="$1"
+	[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
+	local le="/usr/libexec/amanda"
+	for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \
+		"${le}"/rundump "${le}"/runtar "${le}"/dumper \
+		"${le}"/planner ; do
+		chown root:${AMANDA_GROUP_NAME} "${root}"/${i}
+		chmod u=srwx,g=rx,o= "${root}"/${i}
+	done
+}
+
+# We do not want the perl-module tests.
+src_test() {
+	default_src_test
+}
diff --git a/app-backup/amanda/amanda-3.4.1.ebuild b/app-backup/amanda/amanda-3.4.1.ebuild
new file mode 100644
index 000000000000..aa6f63879983
--- /dev/null
+++ b/app-backup/amanda/amanda-3.4.1.ebuild
@@ -0,0 +1,487 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools perl-module user systemd
+
+DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
+HOMEPAGE="http://www.amanda.org/"
+SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
+
+LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+RDEPEND="sys-libs/readline:=
+	virtual/awk
+	app-arch/tar
+	dev-lang/perl:=
+	app-arch/dump
+	net-misc/openssh
+	>=dev-libs/glib-2.26.0
+	dev-perl/JSON
+	dev-perl/Encode-Locale
+	nls? ( virtual/libintl )
+	s3? ( >=net-misc/curl-7.10.0 )
+	!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
+	samba? ( net-fs/samba:= )
+	kerberos? ( app-crypt/mit-krb5 )
+	xfs? ( sys-fs/xfsdump )
+	!minimal? (
+		dev-perl/XML-Simple
+		virtual/mailx
+		app-arch/mt-st:=
+		sys-block/mtx
+		gnuplot? ( sci-visualization/gnuplot )
+		app-crypt/aespipe
+		app-crypt/gnupg
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	>=app-text/docbook-xsl-stylesheets-1.72.0
+	app-text/docbook-xml-dtd
+	dev-libs/libxslt
+	dev-lang/swig
+	"
+
+MYFILESDIR="${T}/files"
+ENVDIR="/etc/env.d"
+ENVDFILE="97amanda"
+TMPENVFILE="${T}/${ENVDFILE}"
+
+# This is a complete list of Amanda settings that the ebuild takes from the
+# build environment. This allows users to alter the behavior of the package as
+# upstream intended, but keeping with Gentoo style. We store a copy of them in
+# /etc/env.d/97amanda during the install, so that they are preserved for future
+# installed. This variable name must not start with AMANDA_, as we do not want
+# it captured into the env file.
+ENV_SETTINGS_AMANDA="
+AMANDA_GROUP_GID AMANDA_GROUP_NAME
+AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS
+AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_TAPE_DEVICE AMANDA_SERVER_INDEX
+AMANDA_TAR_LISTDIR AMANDA_TAR
+AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
+AMANDA_CONFIG_NAME AMANDA_TMPDIR"
+
+amanda_variable_setup() {
+
+	# Setting vars
+	local currentamanda
+
+	# Grab the current settings
+	currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
+
+	# First we set the defaults
+	[[ -z "${AMANDA_GROUP_GID}" ]] && AMANDA_GROUP_GID=87
+	[[ -z "${AMANDA_GROUP_NAME}" ]] && AMANDA_GROUP_NAME=amanda
+	[[ -z "${AMANDA_USER_NAME}" ]] && AMANDA_USER_NAME=amanda
+	[[ -z "${AMANDA_USER_UID}" ]] && AMANDA_USER_UID=87
+	[[ -z "${AMANDA_USER_SH}" ]] && AMANDA_USER_SH=/bin/bash
+	[[ -z "${AMANDA_USER_HOMEDIR}" ]] && AMANDA_USER_HOMEDIR=/var/spool/amanda
+	[[ -z "${AMANDA_USER_GROUPS}" ]] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
+
+	# This installs Amanda, with the server. However, it could be a client,
+	# just specify an alternate server name in AMANDA_SERVER.
+	[[ -z "${AMANDA_SERVER}" ]] && AMANDA_SERVER="${HOSTNAME}"
+	[[ -z "${AMANDA_SERVER_TAPE}" ]] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
+	[[ -z "${AMANDA_SERVER_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0"
+	[[ -z "${AMANDA_SERVER_INDEX}" ]] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
+	[[ -z "${AMANDA_TAR_LISTDIR}" ]] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
+	[[ -z "${AMANDA_CONFIG_NAME}" ]] && AMANDA_CONFIG_NAME=DailySet1
+	[[ -z "${AMANDA_TMPDIR}" ]] && AMANDA_TMPDIR=/var/tmp/amanda
+	[[ -z "${AMANDA_DBGDIR}" ]] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
+	# These are left empty by default
+	[[ -z "${AMANDA_PORTS_UDP}" ]] && AMANDA_PORTS_UDP=
+	[[ -z "${AMANDA_PORTS_TCP}" ]] && AMANDA_PORTS_TCP=
+	[[ -z "${AMANDA_PORTS_BOTH}" ]] && AMANDA_PORTS_BOTH=
+	[[ -z "${AMANDA_PORTS}" ]] && AMANDA_PORTS=
+
+	# What tar to use
+	[[ -z "${AMANDA_TAR}" ]] && AMANDA_TAR=/bin/tar
+
+	# Now pull in the old stuff
+	if [[ -f "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then
+		# We don't just source it as we don't want everything in there.
+		eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
+	fi
+
+	# Re-apply the new settings if any
+	[ -n "${currentamanda}" ] && eval $(echo "${currentamanda}")
+
+}
+
+pkg_setup() {
+	amanda_variable_setup
+
+	# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
+	# another host than HOSTNAME.
+	if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then
+		elog "You are installing a client-only version of Amanda."
+		elog "You should set the variable \$AMANDA_SERVER to point at your"
+		elog "Amanda-tape-server, otherwise you will have to specify its name"
+		elog "when using amrecover on the client."
+		elog "For example: Use something like"
+		elog "AMANDA_SERVER=\"myserver\" emerge amanda"
+		elog
+	fi
+
+	enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
+	enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
+}
+
+src_unpack() {
+	# we do not want the perl src_unpack
+	default_src_unpack
+}
+
+src_prepare() {
+	# gentoo bug #331111
+	sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am || die
+	sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am || die
+
+	# bug with glibc-2.16.0
+	sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die
+
+	eautoreconf
+
+	# places for us to work in
+	mkdir -p "${MYFILESDIR}" || die
+	# Now we store the settings we just created
+	set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die
+
+	# Prepare our custom files
+	einfo "Building custom configuration files"
+	local i # our iterator
+	local sedexpr # var for sed expr
+	sedexpr=''
+	for i in ${ENV_SETTINGS_AMANDA} ; do
+		local val
+		eval "val=\"\${${i}}\""
+		sedexpr="${sedexpr}s|__${i}__|${val}|g;"
+	done
+
+	# now apply the sed expr
+	for i in "${FILESDIR}"/amanda-* ; do
+		sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`" || die
+	done
+
+	if use minimal; then
+		cat "${MYFILESDIR}"/amanda-amandahosts-server.5.1_p3-r1 > "${T}"/amandahosts || die
+	else
+		sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
+			server-src/am{addclient,serverconfig}.pl || die
+		cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	fi
+
+	eapply "${FILESDIR}"/${P}-slots.patch || die
+	eapply "${FILESDIR}"/${P}-labelstr.patch || die
+
+	eapply_user
+}
+
+src_configure() {
+	# fix bug #36316
+	addpredict /var/cache/samba/gencache.tdb
+	# fix bug #376169
+	addpredict /run/blkid
+	addpredict /etc/blkid.tab
+
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source "${TMPENVFILE}"
+	local myconf
+
+	einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
+	myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
+	einfo "Using ${AMANDA_SERVER_TAPE_DEVICE} for tape server."
+	myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}"
+	einfo "Using ${AMANDA_SERVER_INDEX} for index server."
+	myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
+	einfo "Using ${AMANDA_USER_NAME} for amanda user."
+	myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
+	einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
+	myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
+	einfo "Using ${AMANDA_TAR} as Tar implementation."
+	myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
+	einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
+	myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
+	einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
+	myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
+	einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
+	myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
+
+	if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
+		eerror "If you want _both_ UDP and TCP ports, please use only the"
+		eerror "AMANDA_PORTS environment variable for identical ports, or set"
+		eerror "AMANDA_PORTS_BOTH."
+		die "Bad port setup!"
+	fi
+	if [ -n "${AMANDA_PORTS_UDP}" ]; then
+		einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
+		myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
+	fi
+	if [ -n "${AMANDA_PORTS_TCP}" ]; then
+		einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
+		myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
+	fi
+	if [ -n "${AMANDA_PORTS}" ]; then
+		einfo "Using ports ${AMANDA_PORTS/,/-}"
+		myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
+	fi
+
+	# Extras
+	# Speed option
+	myconf="${myconf} --with-buffered-dump"
+	# "debugging" in the configuration is NOT debug in the conventional sense.
+	# It is actually just useful output in the application, and should remain
+	# enabled. There are some cases of breakage with MTX tape changers as of
+	# 2.5.1p2 that it exposes when turned off as well.
+	myconf="${myconf} --with-debugging"
+	# Where to put our files
+	myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
+
+	# Samba support
+	myconf="${myconf} $(use_with samba smbclient /usr/bin/smbclient)"
+
+	# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
+	# default
+	myconf="${myconf} --with-bsd-security"
+	myconf="${myconf} --with-ssh-security"
+	myconf="${myconf} --with-bsdudp-security"
+	myconf="${myconf} --with-bsdtcp-security"
+
+	# kerberos-security mechanism version 5
+	myconf="${myconf} $(use_with kerberos krb5-security)"
+
+	# Amazon S3 support
+	myconf="${myconf} `use_enable s3 s3-device`"
+
+	# libcurl is required for S3 but otherwise optional
+	if ! use s3; then
+		myconf="${myconf} $(use_with curl libcurl)"
+	fi
+
+	# Client only, as requested in bug #127725
+	if use minimal ; then
+		myconf="${myconf} --without-server"
+	else
+		# amplot
+		myconf="${myconf} $(use_with gnuplot)"
+	fi
+
+	# IPv6 fun.
+	myconf="${myconf} `use_with ipv6`"
+	# This is to prevent the IPv6-is-working test
+	# As the test fails on binpkg build hosts with no IPv6.
+	use ipv6 && export amanda_cv_working_ipv6=yes
+
+	# I18N
+	myconf="${myconf} `use_enable nls`"
+
+	# Bug #296634: Perl location
+	perl_set_version
+	myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
+
+	# Bug 296633: --disable-syntax-checks
+	# Some tests are not safe for production systems
+	myconf="${myconf} --disable-syntax-checks"
+
+	# build manpages
+	myconf="${myconf} --enable-manpage-build"
+
+	# bug #483120
+	tc-export AR
+
+	econf \
+		$(use_with readline) \
+		${myconf}
+}
+
+src_compile() {
+	# Again, do not want the perl-module src_compile
+	default_src_compile
+}
+
+src_install() {
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source ${TMPENVFILE}
+
+	einfo "Doing stock install"
+	emake DESTDIR="${D}" install || die
+
+	# Build the envdir file
+	# Don't forget this..
+	einfo "Building environment file"
+	(
+		echo "# These settings are what was present in the environment when this"
+		echo "# Amanda was compiled.  Changing anything below this comment will"
+		echo "# have no effect on your application, but it merely exists to"
+		echo "# preserve them for your next emerge of Amanda"
+		cat "${TMPENVFILE}" | sed "s,=\$,='',g"
+	) >> "${MYFILESDIR}/${ENVDFILE}"
+
+	# Env.d
+	einfo "Installing environment config file"
+	doenvd "${MYFILESDIR}/${ENVDFILE}"
+
+	# Lock down next section (up until docs).
+	insopts -m0640
+	# Installing Amanda Xinetd Services Definition
+	einfo "Installing xinetd service file"
+	insinto /etc/xinetd.d
+	if use minimal ; then
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
+	else
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
+	fi
+
+	if ! use minimal; then
+		einfo "Installing Sample Daily Cron Job for Amanda"
+		insinto /etc/cron.daily
+		newins "${MYFILESDIR}/amanda-cron" amanda
+	fi
+
+	einfo "Installing systemd service and socket files for Amanda"
+	systemd_dounit "${FILESDIR}"/amanda.socket || die
+	systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service' || die
+
+	insinto /etc/amanda
+	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
+	doins "${T}/amandahosts"
+	fperms 600 /etc/amanda/amandahosts
+
+	dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts"
+	insinto "${AMANDA_USER_HOMEDIR}"
+	einfo "Installing .profile for ${AMANDA_USER_NAME} user"
+	newins "${MYFILESDIR}/amanda-profile" .profile
+
+	insinto /etc/amanda
+	doins "${S}/example/amanda-client.conf"
+	if ! use minimal ; then
+		insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
+		doins "${S}/example/amanda.conf"
+		doins "${S}/example/disklist"
+		keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
+	fi
+
+	keepdir "${AMANDA_TAR_LISTDIR}"
+	keepdir "${AMANDA_USER_HOMEDIR}/amanda"
+	keepdir "${AMANDA_TMPDIR}/dumps"
+	# Just make sure it exists for XFS to work...
+	use xfs && keepdir /var/xfsdump/inventory
+
+	local i
+	for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
+		"${AMANDA_TMPDIR}" /etc/amanda; do
+		einfo "Securing directory (${i})"
+		fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
+	done
+	# Do NOT use -R
+	fperms 0700 \
+		"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
+		"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
+		 "${AMANDA_USER_HOMEDIR}/amanda" \
+		 /etc/amanda
+
+	if ! use minimal ; then
+		fperms 0700 \
+			 "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
+	         /etc/amanda/${AMANDA_CONFIG_NAME}
+	fi
+
+	einfo "Setting setuid permissions"
+	amanda_permissions_fix "${D}"
+
+	# Relax permissions again
+	insopts -m0644
+
+	# docs
+	einfo "Installing documentation"
+	dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING
+	# our inetd sample
+	einfo "Installing standard inetd sample"
+	newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample
+	# Amanda example configs
+	einfo "Installing example configurations"
+	rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes}
+	mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/"
+	docinto example1
+	newdoc "${FILESDIR}/example_amanda.conf" amanda.conf
+	newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist
+	newdoc "${FILESDIR}/example_global.conf" global.conf
+
+	einfo "Cleaning up dud .la files"
+	perl_set_version
+	find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f
+}
+
+pkg_postinst() {
+	[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
+		TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source "${TMPENVFILE}"
+
+	# Migration of amandates from /etc to $localstatedir/amanda
+	if [ -f "${ROOT}/etc/amandates" -a \
+		! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then
+		einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda"
+		einfo "A backup is also placed at /etc/amandates.orig"
+		cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig"
+		mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/"
+		cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates"
+	fi
+	if [ -f "${ROOT}/etc/amandates" ]; then
+		einfo "If you have migrated safely, please delete /etc/amandates"
+	fi
+
+	einfo "Checking setuid permissions"
+	amanda_permissions_fix "${ROOT}"
+
+	elog "You should configure Amanda in /etc/amanda now."
+	elog
+	elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
+	elog "and restart xinetd afterwards!"
+	elog
+	elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample"
+	elog "as an example of how to configure your inetd."
+	elog
+	elog "systemd-users: enable and start amanda.socket or the relevant services"
+	elog "regarding what auth method you use."
+	elog
+	elog "NOTICE: If you need raw access to partitions you need to add the"
+	elog "amanda user to the 'disk' group."
+	elog
+	elog "NOTICE: If you have a tape changer, you need to add the amanda user"
+	elog "to the 'tape' group."
+	elog
+	elog "If you use localhost in your disklist your restores may break."
+	elog "You should replace it with the actual hostname!"
+	elog "Please also see the syntax changes to amandahosts."
+	elog "The only exception is when you use the authentication method 'local'."
+	elog
+	elog "Please note that this package no longer explicitly depends on"
+	elog "virtual/inetd, as it supports modes where an inetd is not needed"
+	elog "(see bug #506028 for details)."
+}
+
+# We have had reports of amanda file permissions getting screwed up.
+# Losing setuid, becoming too lax etc.
+# ONLY root and users in the amanda group should be able to run these binaries!
+amanda_permissions_fix() {
+	local root="$1"
+	[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
+	local le="/usr/libexec/amanda"
+	for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \
+		"${le}"/rundump "${le}"/runtar "${le}"/dumper \
+		"${le}"/planner ; do
+		chown root:${AMANDA_GROUP_NAME} "${root}"/${i}
+		chmod u=srwx,g=rx,o= "${root}"/${i}
+	done
+}
+
+# We do not want the perl-module tests.
+src_test() {
+	default_src_test
+}
diff --git a/app-backup/amanda/amanda-3.4.2.ebuild b/app-backup/amanda/amanda-3.4.2.ebuild
new file mode 100644
index 000000000000..aec64fedec3e
--- /dev/null
+++ b/app-backup/amanda/amanda-3.4.2.ebuild
@@ -0,0 +1,484 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools perl-module user systemd
+
+DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
+HOMEPAGE="http://www.amanda.org/"
+SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
+
+LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+RDEPEND="sys-libs/readline:=
+	virtual/awk
+	app-arch/tar
+	dev-lang/perl:=
+	app-arch/dump
+	net-misc/openssh
+	>=dev-libs/glib-2.26.0
+	dev-perl/JSON
+	dev-perl/Encode-Locale
+	nls? ( virtual/libintl )
+	s3? ( >=net-misc/curl-7.10.0 )
+	!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
+	samba? ( net-fs/samba:= )
+	kerberos? ( app-crypt/mit-krb5 )
+	xfs? ( sys-fs/xfsdump )
+	!minimal? (
+		dev-perl/XML-Simple
+		virtual/mailx
+		app-arch/mt-st:=
+		sys-block/mtx
+		gnuplot? ( sci-visualization/gnuplot )
+		app-crypt/aespipe
+		app-crypt/gnupg
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	>=app-text/docbook-xsl-stylesheets-1.72.0
+	app-text/docbook-xml-dtd
+	dev-libs/libxslt
+	dev-lang/swig
+	"
+
+MYFILESDIR="${T}/files"
+ENVDIR="/etc/env.d"
+ENVDFILE="97amanda"
+TMPENVFILE="${T}/${ENVDFILE}"
+
+# This is a complete list of Amanda settings that the ebuild takes from the
+# build environment. This allows users to alter the behavior of the package as
+# upstream intended, but keeping with Gentoo style. We store a copy of them in
+# /etc/env.d/97amanda during the install, so that they are preserved for future
+# installed. This variable name must not start with AMANDA_, as we do not want
+# it captured into the env file.
+ENV_SETTINGS_AMANDA="
+AMANDA_GROUP_GID AMANDA_GROUP_NAME
+AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS
+AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_TAPE_DEVICE AMANDA_SERVER_INDEX
+AMANDA_TAR_LISTDIR AMANDA_TAR
+AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
+AMANDA_CONFIG_NAME AMANDA_TMPDIR"
+
+amanda_variable_setup() {
+
+	# Setting vars
+	local currentamanda
+
+	# Grab the current settings
+	currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
+
+	# First we set the defaults
+	[[ -z "${AMANDA_GROUP_GID}" ]] && AMANDA_GROUP_GID=87
+	[[ -z "${AMANDA_GROUP_NAME}" ]] && AMANDA_GROUP_NAME=amanda
+	[[ -z "${AMANDA_USER_NAME}" ]] && AMANDA_USER_NAME=amanda
+	[[ -z "${AMANDA_USER_UID}" ]] && AMANDA_USER_UID=87
+	[[ -z "${AMANDA_USER_SH}" ]] && AMANDA_USER_SH=/bin/bash
+	[[ -z "${AMANDA_USER_HOMEDIR}" ]] && AMANDA_USER_HOMEDIR=/var/spool/amanda
+	[[ -z "${AMANDA_USER_GROUPS}" ]] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
+
+	# This installs Amanda, with the server. However, it could be a client,
+	# just specify an alternate server name in AMANDA_SERVER.
+	[[ -z "${AMANDA_SERVER}" ]] && AMANDA_SERVER="${HOSTNAME}"
+	[[ -z "${AMANDA_SERVER_TAPE}" ]] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
+	[[ -z "${AMANDA_SERVER_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0"
+	[[ -z "${AMANDA_SERVER_INDEX}" ]] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
+	[[ -z "${AMANDA_TAR_LISTDIR}" ]] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
+	[[ -z "${AMANDA_CONFIG_NAME}" ]] && AMANDA_CONFIG_NAME=DailySet1
+	[[ -z "${AMANDA_TMPDIR}" ]] && AMANDA_TMPDIR=/var/tmp/amanda
+	[[ -z "${AMANDA_DBGDIR}" ]] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
+	# These are left empty by default
+	[[ -z "${AMANDA_PORTS_UDP}" ]] && AMANDA_PORTS_UDP=
+	[[ -z "${AMANDA_PORTS_TCP}" ]] && AMANDA_PORTS_TCP=
+	[[ -z "${AMANDA_PORTS_BOTH}" ]] && AMANDA_PORTS_BOTH=
+	[[ -z "${AMANDA_PORTS}" ]] && AMANDA_PORTS=
+
+	# What tar to use
+	[[ -z "${AMANDA_TAR}" ]] && AMANDA_TAR=/bin/tar
+
+	# Now pull in the old stuff
+	if [[ -f "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then
+		# We don't just source it as we don't want everything in there.
+		eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
+	fi
+
+	# Re-apply the new settings if any
+	[ -n "${currentamanda}" ] && eval $(echo "${currentamanda}")
+
+}
+
+pkg_setup() {
+	amanda_variable_setup
+
+	# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
+	# another host than HOSTNAME.
+	if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then
+		elog "You are installing a client-only version of Amanda."
+		elog "You should set the variable \$AMANDA_SERVER to point at your"
+		elog "Amanda-tape-server, otherwise you will have to specify its name"
+		elog "when using amrecover on the client."
+		elog "For example: Use something like"
+		elog "AMANDA_SERVER=\"myserver\" emerge amanda"
+		elog
+	fi
+
+	enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
+	enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
+}
+
+src_unpack() {
+	# we do not want the perl src_unpack
+	default_src_unpack
+}
+
+src_prepare() {
+	# gentoo bug #331111
+	sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am || die
+	sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am || die
+
+	# bug with glibc-2.16.0
+	sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die
+
+	eautoreconf
+
+	# places for us to work in
+	mkdir -p "${MYFILESDIR}" || die
+	# Now we store the settings we just created
+	set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die
+
+	# Prepare our custom files
+	einfo "Building custom configuration files"
+	local i # our iterator
+	local sedexpr # var for sed expr
+	sedexpr=''
+	for i in ${ENV_SETTINGS_AMANDA} ; do
+		local val
+		eval "val=\"\${${i}}\""
+		sedexpr="${sedexpr}s|__${i}__|${val}|g;"
+	done
+
+	# now apply the sed expr
+	for i in "${FILESDIR}"/amanda-* ; do
+		sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`" || die
+	done
+
+	if use minimal; then
+		cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	else
+		sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
+			server-src/am{addclient,serverconfig}.pl || die
+		cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	# fix bug #36316
+	addpredict /var/cache/samba/gencache.tdb
+	# fix bug #376169
+	addpredict /run/blkid
+	addpredict /etc/blkid.tab
+
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source "${TMPENVFILE}"
+	local myconf
+
+	einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
+	myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
+	einfo "Using ${AMANDA_SERVER_TAPE_DEVICE} for tape server."
+	myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}"
+	einfo "Using ${AMANDA_SERVER_INDEX} for index server."
+	myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
+	einfo "Using ${AMANDA_USER_NAME} for amanda user."
+	myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
+	einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
+	myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
+	einfo "Using ${AMANDA_TAR} as Tar implementation."
+	myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
+	einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
+	myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
+	einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
+	myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
+	einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
+	myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
+
+	if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
+		eerror "If you want _both_ UDP and TCP ports, please use only the"
+		eerror "AMANDA_PORTS environment variable for identical ports, or set"
+		eerror "AMANDA_PORTS_BOTH."
+		die "Bad port setup!"
+	fi
+	if [ -n "${AMANDA_PORTS_UDP}" ]; then
+		einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
+		myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
+	fi
+	if [ -n "${AMANDA_PORTS_TCP}" ]; then
+		einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
+		myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
+	fi
+	if [ -n "${AMANDA_PORTS}" ]; then
+		einfo "Using ports ${AMANDA_PORTS/,/-}"
+		myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
+	fi
+
+	# Extras
+	# Speed option
+	myconf="${myconf} --with-buffered-dump"
+	# "debugging" in the configuration is NOT debug in the conventional sense.
+	# It is actually just useful output in the application, and should remain
+	# enabled. There are some cases of breakage with MTX tape changers as of
+	# 2.5.1p2 that it exposes when turned off as well.
+	myconf="${myconf} --with-debugging"
+	# Where to put our files
+	myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
+
+	# Samba support
+	myconf="${myconf} $(use_with samba smbclient /usr/bin/smbclient)"
+
+	# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
+	# default
+	myconf="${myconf} --with-bsd-security"
+	myconf="${myconf} --with-ssh-security"
+	myconf="${myconf} --with-bsdudp-security"
+	myconf="${myconf} --with-bsdtcp-security"
+
+	# kerberos-security mechanism version 5
+	myconf="${myconf} $(use_with kerberos krb5-security)"
+
+	# Amazon S3 support
+	myconf="${myconf} `use_enable s3 s3-device`"
+
+	# libcurl is required for S3 but otherwise optional
+	if ! use s3; then
+		myconf="${myconf} $(use_with curl libcurl)"
+	fi
+
+	# Client only, as requested in bug #127725
+	if use minimal ; then
+		myconf="${myconf} --without-server"
+	else
+		# amplot
+		myconf="${myconf} $(use_with gnuplot)"
+	fi
+
+	# IPv6 fun.
+	myconf="${myconf} `use_with ipv6`"
+	# This is to prevent the IPv6-is-working test
+	# As the test fails on binpkg build hosts with no IPv6.
+	use ipv6 && export amanda_cv_working_ipv6=yes
+
+	# I18N
+	myconf="${myconf} `use_enable nls`"
+
+	# Bug #296634: Perl location
+	perl_set_version
+	myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
+
+	# Bug 296633: --disable-syntax-checks
+	# Some tests are not safe for production systems
+	myconf="${myconf} --disable-syntax-checks"
+
+	# build manpages
+	myconf="${myconf} --enable-manpage-build"
+
+	# bug #483120
+	tc-export AR
+
+	econf \
+		$(use_with readline) \
+		${myconf}
+}
+
+src_compile() {
+	# Again, do not want the perl-module src_compile
+	default_src_compile
+}
+
+src_install() {
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source ${TMPENVFILE}
+
+	einfo "Doing stock install"
+	emake DESTDIR="${D}" install || die
+
+	# Build the envdir file
+	# Don't forget this..
+	einfo "Building environment file"
+	(
+		echo "# These settings are what was present in the environment when this"
+		echo "# Amanda was compiled.  Changing anything below this comment will"
+		echo "# have no effect on your application, but it merely exists to"
+		echo "# preserve them for your next emerge of Amanda"
+		cat "${TMPENVFILE}" | sed "s,=\$,='',g"
+	) >> "${MYFILESDIR}/${ENVDFILE}"
+
+	# Env.d
+	einfo "Installing environment config file"
+	doenvd "${MYFILESDIR}/${ENVDFILE}"
+
+	# Lock down next section (up until docs).
+	insopts -m0640
+	# Installing Amanda Xinetd Services Definition
+	einfo "Installing xinetd service file"
+	insinto /etc/xinetd.d
+	if use minimal ; then
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
+	else
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
+	fi
+
+	if ! use minimal; then
+		einfo "Installing Sample Daily Cron Job for Amanda"
+		insinto /etc/cron.daily
+		newins "${MYFILESDIR}/amanda-cron" amanda
+	fi
+
+	einfo "Installing systemd service and socket files for Amanda"
+	systemd_dounit "${FILESDIR}"/amanda.socket || die
+	systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service' || die
+
+	insinto /etc/amanda
+	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
+	doins "${T}/amandahosts"
+	fperms 600 /etc/amanda/amandahosts
+
+	dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts"
+	insinto "${AMANDA_USER_HOMEDIR}"
+	einfo "Installing .profile for ${AMANDA_USER_NAME} user"
+	newins "${MYFILESDIR}/amanda-profile" .profile
+
+	insinto /etc/amanda
+	doins "${S}/example/amanda-client.conf"
+	if ! use minimal ; then
+		insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
+		doins "${S}/example/amanda.conf"
+		doins "${S}/example/disklist"
+		keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
+	fi
+
+	keepdir "${AMANDA_TAR_LISTDIR}"
+	keepdir "${AMANDA_USER_HOMEDIR}/amanda"
+	keepdir "${AMANDA_TMPDIR}/dumps"
+	# Just make sure it exists for XFS to work...
+	use xfs && keepdir /var/xfsdump/inventory
+
+	local i
+	for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
+		"${AMANDA_TMPDIR}" /etc/amanda; do
+		einfo "Securing directory (${i})"
+		fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
+	done
+	# Do NOT use -R
+	fperms 0700 \
+		"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
+		"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
+		 "${AMANDA_USER_HOMEDIR}/amanda" \
+		 /etc/amanda
+
+	if ! use minimal ; then
+		fperms 0700 \
+			 "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
+	         /etc/amanda/${AMANDA_CONFIG_NAME}
+	fi
+
+	einfo "Setting setuid permissions"
+	amanda_permissions_fix "${D}"
+
+	# Relax permissions again
+	insopts -m0644
+
+	# docs
+	einfo "Installing documentation"
+	dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING
+	# our inetd sample
+	einfo "Installing standard inetd sample"
+	newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample
+	# Amanda example configs
+	einfo "Installing example configurations"
+	rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes}
+	mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/"
+	docinto example1
+	newdoc "${FILESDIR}/example_amanda.conf" amanda.conf
+	newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist
+	newdoc "${FILESDIR}/example_global.conf" global.conf
+
+	einfo "Cleaning up dud .la files"
+	perl_set_version
+	find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f
+}
+
+pkg_postinst() {
+	[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
+		TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source "${TMPENVFILE}"
+
+	# Migration of amandates from /etc to $localstatedir/amanda
+	if [ -f "${ROOT}/etc/amandates" -a \
+		! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then
+		einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda"
+		einfo "A backup is also placed at /etc/amandates.orig"
+		cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig"
+		mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/"
+		cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates"
+	fi
+	if [ -f "${ROOT}/etc/amandates" ]; then
+		einfo "If you have migrated safely, please delete /etc/amandates"
+	fi
+
+	einfo "Checking setuid permissions"
+	amanda_permissions_fix "${ROOT}"
+
+	elog "You should configure Amanda in /etc/amanda now."
+	elog
+	elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
+	elog "and restart xinetd afterwards!"
+	elog
+	elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample"
+	elog "as an example of how to configure your inetd."
+	elog
+	elog "systemd-users: enable and start amanda.socket or the relevant services"
+	elog "regarding what auth method you use."
+	elog
+	elog "NOTICE: If you need raw access to partitions you need to add the"
+	elog "amanda user to the 'disk' group."
+	elog
+	elog "NOTICE: If you have a tape changer, you need to add the amanda user"
+	elog "to the 'tape' group."
+	elog
+	elog "If you use localhost in your disklist your restores may break."
+	elog "You should replace it with the actual hostname!"
+	elog "Please also see the syntax changes to amandahosts."
+	elog "The only exception is when you use the authentication method 'local'."
+	elog
+	elog "Please note that this package no longer explicitly depends on"
+	elog "virtual/inetd, as it supports modes where an inetd is not needed"
+	elog "(see bug #506028 for details)."
+}
+
+# We have had reports of amanda file permissions getting screwed up.
+# Losing setuid, becoming too lax etc.
+# ONLY root and users in the amanda group should be able to run these binaries!
+amanda_permissions_fix() {
+	local root="$1"
+	[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
+	local le="/usr/libexec/amanda"
+	for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \
+		"${le}"/rundump "${le}"/runtar "${le}"/dumper \
+		"${le}"/planner ; do
+		chown root:${AMANDA_GROUP_NAME} "${root}"/${i}
+		chmod u=srwx,g=rx,o= "${root}"/${i}
+	done
+}
+
+# We do not want the perl-module tests.
+src_test() {
+	default_src_test
+}
diff --git a/app-backup/amanda/amanda-3.4.3.ebuild b/app-backup/amanda/amanda-3.4.3.ebuild
new file mode 100644
index 000000000000..aec64fedec3e
--- /dev/null
+++ b/app-backup/amanda/amanda-3.4.3.ebuild
@@ -0,0 +1,484 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools perl-module user systemd
+
+DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
+HOMEPAGE="http://www.amanda.org/"
+SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
+
+LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+RDEPEND="sys-libs/readline:=
+	virtual/awk
+	app-arch/tar
+	dev-lang/perl:=
+	app-arch/dump
+	net-misc/openssh
+	>=dev-libs/glib-2.26.0
+	dev-perl/JSON
+	dev-perl/Encode-Locale
+	nls? ( virtual/libintl )
+	s3? ( >=net-misc/curl-7.10.0 )
+	!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
+	samba? ( net-fs/samba:= )
+	kerberos? ( app-crypt/mit-krb5 )
+	xfs? ( sys-fs/xfsdump )
+	!minimal? (
+		dev-perl/XML-Simple
+		virtual/mailx
+		app-arch/mt-st:=
+		sys-block/mtx
+		gnuplot? ( sci-visualization/gnuplot )
+		app-crypt/aespipe
+		app-crypt/gnupg
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	>=app-text/docbook-xsl-stylesheets-1.72.0
+	app-text/docbook-xml-dtd
+	dev-libs/libxslt
+	dev-lang/swig
+	"
+
+MYFILESDIR="${T}/files"
+ENVDIR="/etc/env.d"
+ENVDFILE="97amanda"
+TMPENVFILE="${T}/${ENVDFILE}"
+
+# This is a complete list of Amanda settings that the ebuild takes from the
+# build environment. This allows users to alter the behavior of the package as
+# upstream intended, but keeping with Gentoo style. We store a copy of them in
+# /etc/env.d/97amanda during the install, so that they are preserved for future
+# installed. This variable name must not start with AMANDA_, as we do not want
+# it captured into the env file.
+ENV_SETTINGS_AMANDA="
+AMANDA_GROUP_GID AMANDA_GROUP_NAME
+AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS
+AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_TAPE_DEVICE AMANDA_SERVER_INDEX
+AMANDA_TAR_LISTDIR AMANDA_TAR
+AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
+AMANDA_CONFIG_NAME AMANDA_TMPDIR"
+
+amanda_variable_setup() {
+
+	# Setting vars
+	local currentamanda
+
+	# Grab the current settings
+	currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
+
+	# First we set the defaults
+	[[ -z "${AMANDA_GROUP_GID}" ]] && AMANDA_GROUP_GID=87
+	[[ -z "${AMANDA_GROUP_NAME}" ]] && AMANDA_GROUP_NAME=amanda
+	[[ -z "${AMANDA_USER_NAME}" ]] && AMANDA_USER_NAME=amanda
+	[[ -z "${AMANDA_USER_UID}" ]] && AMANDA_USER_UID=87
+	[[ -z "${AMANDA_USER_SH}" ]] && AMANDA_USER_SH=/bin/bash
+	[[ -z "${AMANDA_USER_HOMEDIR}" ]] && AMANDA_USER_HOMEDIR=/var/spool/amanda
+	[[ -z "${AMANDA_USER_GROUPS}" ]] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
+
+	# This installs Amanda, with the server. However, it could be a client,
+	# just specify an alternate server name in AMANDA_SERVER.
+	[[ -z "${AMANDA_SERVER}" ]] && AMANDA_SERVER="${HOSTNAME}"
+	[[ -z "${AMANDA_SERVER_TAPE}" ]] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
+	[[ -z "${AMANDA_SERVER_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0"
+	[[ -z "${AMANDA_SERVER_INDEX}" ]] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
+	[[ -z "${AMANDA_TAR_LISTDIR}" ]] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
+	[[ -z "${AMANDA_CONFIG_NAME}" ]] && AMANDA_CONFIG_NAME=DailySet1
+	[[ -z "${AMANDA_TMPDIR}" ]] && AMANDA_TMPDIR=/var/tmp/amanda
+	[[ -z "${AMANDA_DBGDIR}" ]] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
+	# These are left empty by default
+	[[ -z "${AMANDA_PORTS_UDP}" ]] && AMANDA_PORTS_UDP=
+	[[ -z "${AMANDA_PORTS_TCP}" ]] && AMANDA_PORTS_TCP=
+	[[ -z "${AMANDA_PORTS_BOTH}" ]] && AMANDA_PORTS_BOTH=
+	[[ -z "${AMANDA_PORTS}" ]] && AMANDA_PORTS=
+
+	# What tar to use
+	[[ -z "${AMANDA_TAR}" ]] && AMANDA_TAR=/bin/tar
+
+	# Now pull in the old stuff
+	if [[ -f "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then
+		# We don't just source it as we don't want everything in there.
+		eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
+	fi
+
+	# Re-apply the new settings if any
+	[ -n "${currentamanda}" ] && eval $(echo "${currentamanda}")
+
+}
+
+pkg_setup() {
+	amanda_variable_setup
+
+	# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
+	# another host than HOSTNAME.
+	if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then
+		elog "You are installing a client-only version of Amanda."
+		elog "You should set the variable \$AMANDA_SERVER to point at your"
+		elog "Amanda-tape-server, otherwise you will have to specify its name"
+		elog "when using amrecover on the client."
+		elog "For example: Use something like"
+		elog "AMANDA_SERVER=\"myserver\" emerge amanda"
+		elog
+	fi
+
+	enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
+	enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
+}
+
+src_unpack() {
+	# we do not want the perl src_unpack
+	default_src_unpack
+}
+
+src_prepare() {
+	# gentoo bug #331111
+	sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am || die
+	sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am || die
+
+	# bug with glibc-2.16.0
+	sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die
+
+	eautoreconf
+
+	# places for us to work in
+	mkdir -p "${MYFILESDIR}" || die
+	# Now we store the settings we just created
+	set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die
+
+	# Prepare our custom files
+	einfo "Building custom configuration files"
+	local i # our iterator
+	local sedexpr # var for sed expr
+	sedexpr=''
+	for i in ${ENV_SETTINGS_AMANDA} ; do
+		local val
+		eval "val=\"\${${i}}\""
+		sedexpr="${sedexpr}s|__${i}__|${val}|g;"
+	done
+
+	# now apply the sed expr
+	for i in "${FILESDIR}"/amanda-* ; do
+		sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`" || die
+	done
+
+	if use minimal; then
+		cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	else
+		sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
+			server-src/am{addclient,serverconfig}.pl || die
+		cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	# fix bug #36316
+	addpredict /var/cache/samba/gencache.tdb
+	# fix bug #376169
+	addpredict /run/blkid
+	addpredict /etc/blkid.tab
+
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source "${TMPENVFILE}"
+	local myconf
+
+	einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
+	myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
+	einfo "Using ${AMANDA_SERVER_TAPE_DEVICE} for tape server."
+	myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}"
+	einfo "Using ${AMANDA_SERVER_INDEX} for index server."
+	myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
+	einfo "Using ${AMANDA_USER_NAME} for amanda user."
+	myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
+	einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
+	myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
+	einfo "Using ${AMANDA_TAR} as Tar implementation."
+	myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
+	einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
+	myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
+	einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
+	myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
+	einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
+	myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
+
+	if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
+		eerror "If you want _both_ UDP and TCP ports, please use only the"
+		eerror "AMANDA_PORTS environment variable for identical ports, or set"
+		eerror "AMANDA_PORTS_BOTH."
+		die "Bad port setup!"
+	fi
+	if [ -n "${AMANDA_PORTS_UDP}" ]; then
+		einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
+		myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
+	fi
+	if [ -n "${AMANDA_PORTS_TCP}" ]; then
+		einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
+		myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
+	fi
+	if [ -n "${AMANDA_PORTS}" ]; then
+		einfo "Using ports ${AMANDA_PORTS/,/-}"
+		myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
+	fi
+
+	# Extras
+	# Speed option
+	myconf="${myconf} --with-buffered-dump"
+	# "debugging" in the configuration is NOT debug in the conventional sense.
+	# It is actually just useful output in the application, and should remain
+	# enabled. There are some cases of breakage with MTX tape changers as of
+	# 2.5.1p2 that it exposes when turned off as well.
+	myconf="${myconf} --with-debugging"
+	# Where to put our files
+	myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
+
+	# Samba support
+	myconf="${myconf} $(use_with samba smbclient /usr/bin/smbclient)"
+
+	# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
+	# default
+	myconf="${myconf} --with-bsd-security"
+	myconf="${myconf} --with-ssh-security"
+	myconf="${myconf} --with-bsdudp-security"
+	myconf="${myconf} --with-bsdtcp-security"
+
+	# kerberos-security mechanism version 5
+	myconf="${myconf} $(use_with kerberos krb5-security)"
+
+	# Amazon S3 support
+	myconf="${myconf} `use_enable s3 s3-device`"
+
+	# libcurl is required for S3 but otherwise optional
+	if ! use s3; then
+		myconf="${myconf} $(use_with curl libcurl)"
+	fi
+
+	# Client only, as requested in bug #127725
+	if use minimal ; then
+		myconf="${myconf} --without-server"
+	else
+		# amplot
+		myconf="${myconf} $(use_with gnuplot)"
+	fi
+
+	# IPv6 fun.
+	myconf="${myconf} `use_with ipv6`"
+	# This is to prevent the IPv6-is-working test
+	# As the test fails on binpkg build hosts with no IPv6.
+	use ipv6 && export amanda_cv_working_ipv6=yes
+
+	# I18N
+	myconf="${myconf} `use_enable nls`"
+
+	# Bug #296634: Perl location
+	perl_set_version
+	myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
+
+	# Bug 296633: --disable-syntax-checks
+	# Some tests are not safe for production systems
+	myconf="${myconf} --disable-syntax-checks"
+
+	# build manpages
+	myconf="${myconf} --enable-manpage-build"
+
+	# bug #483120
+	tc-export AR
+
+	econf \
+		$(use_with readline) \
+		${myconf}
+}
+
+src_compile() {
+	# Again, do not want the perl-module src_compile
+	default_src_compile
+}
+
+src_install() {
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source ${TMPENVFILE}
+
+	einfo "Doing stock install"
+	emake DESTDIR="${D}" install || die
+
+	# Build the envdir file
+	# Don't forget this..
+	einfo "Building environment file"
+	(
+		echo "# These settings are what was present in the environment when this"
+		echo "# Amanda was compiled.  Changing anything below this comment will"
+		echo "# have no effect on your application, but it merely exists to"
+		echo "# preserve them for your next emerge of Amanda"
+		cat "${TMPENVFILE}" | sed "s,=\$,='',g"
+	) >> "${MYFILESDIR}/${ENVDFILE}"
+
+	# Env.d
+	einfo "Installing environment config file"
+	doenvd "${MYFILESDIR}/${ENVDFILE}"
+
+	# Lock down next section (up until docs).
+	insopts -m0640
+	# Installing Amanda Xinetd Services Definition
+	einfo "Installing xinetd service file"
+	insinto /etc/xinetd.d
+	if use minimal ; then
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
+	else
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
+	fi
+
+	if ! use minimal; then
+		einfo "Installing Sample Daily Cron Job for Amanda"
+		insinto /etc/cron.daily
+		newins "${MYFILESDIR}/amanda-cron" amanda
+	fi
+
+	einfo "Installing systemd service and socket files for Amanda"
+	systemd_dounit "${FILESDIR}"/amanda.socket || die
+	systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service' || die
+
+	insinto /etc/amanda
+	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
+	doins "${T}/amandahosts"
+	fperms 600 /etc/amanda/amandahosts
+
+	dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts"
+	insinto "${AMANDA_USER_HOMEDIR}"
+	einfo "Installing .profile for ${AMANDA_USER_NAME} user"
+	newins "${MYFILESDIR}/amanda-profile" .profile
+
+	insinto /etc/amanda
+	doins "${S}/example/amanda-client.conf"
+	if ! use minimal ; then
+		insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
+		doins "${S}/example/amanda.conf"
+		doins "${S}/example/disklist"
+		keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
+	fi
+
+	keepdir "${AMANDA_TAR_LISTDIR}"
+	keepdir "${AMANDA_USER_HOMEDIR}/amanda"
+	keepdir "${AMANDA_TMPDIR}/dumps"
+	# Just make sure it exists for XFS to work...
+	use xfs && keepdir /var/xfsdump/inventory
+
+	local i
+	for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
+		"${AMANDA_TMPDIR}" /etc/amanda; do
+		einfo "Securing directory (${i})"
+		fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
+	done
+	# Do NOT use -R
+	fperms 0700 \
+		"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
+		"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
+		 "${AMANDA_USER_HOMEDIR}/amanda" \
+		 /etc/amanda
+
+	if ! use minimal ; then
+		fperms 0700 \
+			 "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
+	         /etc/amanda/${AMANDA_CONFIG_NAME}
+	fi
+
+	einfo "Setting setuid permissions"
+	amanda_permissions_fix "${D}"
+
+	# Relax permissions again
+	insopts -m0644
+
+	# docs
+	einfo "Installing documentation"
+	dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING
+	# our inetd sample
+	einfo "Installing standard inetd sample"
+	newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample
+	# Amanda example configs
+	einfo "Installing example configurations"
+	rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes}
+	mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/"
+	docinto example1
+	newdoc "${FILESDIR}/example_amanda.conf" amanda.conf
+	newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist
+	newdoc "${FILESDIR}/example_global.conf" global.conf
+
+	einfo "Cleaning up dud .la files"
+	perl_set_version
+	find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f
+}
+
+pkg_postinst() {
+	[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
+		TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source "${TMPENVFILE}"
+
+	# Migration of amandates from /etc to $localstatedir/amanda
+	if [ -f "${ROOT}/etc/amandates" -a \
+		! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then
+		einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda"
+		einfo "A backup is also placed at /etc/amandates.orig"
+		cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig"
+		mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/"
+		cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates"
+	fi
+	if [ -f "${ROOT}/etc/amandates" ]; then
+		einfo "If you have migrated safely, please delete /etc/amandates"
+	fi
+
+	einfo "Checking setuid permissions"
+	amanda_permissions_fix "${ROOT}"
+
+	elog "You should configure Amanda in /etc/amanda now."
+	elog
+	elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
+	elog "and restart xinetd afterwards!"
+	elog
+	elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample"
+	elog "as an example of how to configure your inetd."
+	elog
+	elog "systemd-users: enable and start amanda.socket or the relevant services"
+	elog "regarding what auth method you use."
+	elog
+	elog "NOTICE: If you need raw access to partitions you need to add the"
+	elog "amanda user to the 'disk' group."
+	elog
+	elog "NOTICE: If you have a tape changer, you need to add the amanda user"
+	elog "to the 'tape' group."
+	elog
+	elog "If you use localhost in your disklist your restores may break."
+	elog "You should replace it with the actual hostname!"
+	elog "Please also see the syntax changes to amandahosts."
+	elog "The only exception is when you use the authentication method 'local'."
+	elog
+	elog "Please note that this package no longer explicitly depends on"
+	elog "virtual/inetd, as it supports modes where an inetd is not needed"
+	elog "(see bug #506028 for details)."
+}
+
+# We have had reports of amanda file permissions getting screwed up.
+# Losing setuid, becoming too lax etc.
+# ONLY root and users in the amanda group should be able to run these binaries!
+amanda_permissions_fix() {
+	local root="$1"
+	[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
+	local le="/usr/libexec/amanda"
+	for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \
+		"${le}"/rundump "${le}"/runtar "${le}"/dumper \
+		"${le}"/planner ; do
+		chown root:${AMANDA_GROUP_NAME} "${root}"/${i}
+		chmod u=srwx,g=rx,o= "${root}"/${i}
+	done
+}
+
+# We do not want the perl-module tests.
+src_test() {
+	default_src_test
+}
diff --git a/app-backup/amanda/amanda-3.4.4.ebuild b/app-backup/amanda/amanda-3.4.4.ebuild
new file mode 100644
index 000000000000..aec64fedec3e
--- /dev/null
+++ b/app-backup/amanda/amanda-3.4.4.ebuild
@@ -0,0 +1,484 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools perl-module user systemd
+
+DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
+HOMEPAGE="http://www.amanda.org/"
+SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
+
+LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+RDEPEND="sys-libs/readline:=
+	virtual/awk
+	app-arch/tar
+	dev-lang/perl:=
+	app-arch/dump
+	net-misc/openssh
+	>=dev-libs/glib-2.26.0
+	dev-perl/JSON
+	dev-perl/Encode-Locale
+	nls? ( virtual/libintl )
+	s3? ( >=net-misc/curl-7.10.0 )
+	!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
+	samba? ( net-fs/samba:= )
+	kerberos? ( app-crypt/mit-krb5 )
+	xfs? ( sys-fs/xfsdump )
+	!minimal? (
+		dev-perl/XML-Simple
+		virtual/mailx
+		app-arch/mt-st:=
+		sys-block/mtx
+		gnuplot? ( sci-visualization/gnuplot )
+		app-crypt/aespipe
+		app-crypt/gnupg
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	>=app-text/docbook-xsl-stylesheets-1.72.0
+	app-text/docbook-xml-dtd
+	dev-libs/libxslt
+	dev-lang/swig
+	"
+
+MYFILESDIR="${T}/files"
+ENVDIR="/etc/env.d"
+ENVDFILE="97amanda"
+TMPENVFILE="${T}/${ENVDFILE}"
+
+# This is a complete list of Amanda settings that the ebuild takes from the
+# build environment. This allows users to alter the behavior of the package as
+# upstream intended, but keeping with Gentoo style. We store a copy of them in
+# /etc/env.d/97amanda during the install, so that they are preserved for future
+# installed. This variable name must not start with AMANDA_, as we do not want
+# it captured into the env file.
+ENV_SETTINGS_AMANDA="
+AMANDA_GROUP_GID AMANDA_GROUP_NAME
+AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS
+AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_TAPE_DEVICE AMANDA_SERVER_INDEX
+AMANDA_TAR_LISTDIR AMANDA_TAR
+AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
+AMANDA_CONFIG_NAME AMANDA_TMPDIR"
+
+amanda_variable_setup() {
+
+	# Setting vars
+	local currentamanda
+
+	# Grab the current settings
+	currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
+
+	# First we set the defaults
+	[[ -z "${AMANDA_GROUP_GID}" ]] && AMANDA_GROUP_GID=87
+	[[ -z "${AMANDA_GROUP_NAME}" ]] && AMANDA_GROUP_NAME=amanda
+	[[ -z "${AMANDA_USER_NAME}" ]] && AMANDA_USER_NAME=amanda
+	[[ -z "${AMANDA_USER_UID}" ]] && AMANDA_USER_UID=87
+	[[ -z "${AMANDA_USER_SH}" ]] && AMANDA_USER_SH=/bin/bash
+	[[ -z "${AMANDA_USER_HOMEDIR}" ]] && AMANDA_USER_HOMEDIR=/var/spool/amanda
+	[[ -z "${AMANDA_USER_GROUPS}" ]] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
+
+	# This installs Amanda, with the server. However, it could be a client,
+	# just specify an alternate server name in AMANDA_SERVER.
+	[[ -z "${AMANDA_SERVER}" ]] && AMANDA_SERVER="${HOSTNAME}"
+	[[ -z "${AMANDA_SERVER_TAPE}" ]] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
+	[[ -z "${AMANDA_SERVER_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0"
+	[[ -z "${AMANDA_SERVER_INDEX}" ]] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
+	[[ -z "${AMANDA_TAR_LISTDIR}" ]] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
+	[[ -z "${AMANDA_CONFIG_NAME}" ]] && AMANDA_CONFIG_NAME=DailySet1
+	[[ -z "${AMANDA_TMPDIR}" ]] && AMANDA_TMPDIR=/var/tmp/amanda
+	[[ -z "${AMANDA_DBGDIR}" ]] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
+	# These are left empty by default
+	[[ -z "${AMANDA_PORTS_UDP}" ]] && AMANDA_PORTS_UDP=
+	[[ -z "${AMANDA_PORTS_TCP}" ]] && AMANDA_PORTS_TCP=
+	[[ -z "${AMANDA_PORTS_BOTH}" ]] && AMANDA_PORTS_BOTH=
+	[[ -z "${AMANDA_PORTS}" ]] && AMANDA_PORTS=
+
+	# What tar to use
+	[[ -z "${AMANDA_TAR}" ]] && AMANDA_TAR=/bin/tar
+
+	# Now pull in the old stuff
+	if [[ -f "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then
+		# We don't just source it as we don't want everything in there.
+		eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
+	fi
+
+	# Re-apply the new settings if any
+	[ -n "${currentamanda}" ] && eval $(echo "${currentamanda}")
+
+}
+
+pkg_setup() {
+	amanda_variable_setup
+
+	# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
+	# another host than HOSTNAME.
+	if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then
+		elog "You are installing a client-only version of Amanda."
+		elog "You should set the variable \$AMANDA_SERVER to point at your"
+		elog "Amanda-tape-server, otherwise you will have to specify its name"
+		elog "when using amrecover on the client."
+		elog "For example: Use something like"
+		elog "AMANDA_SERVER=\"myserver\" emerge amanda"
+		elog
+	fi
+
+	enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
+	enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
+}
+
+src_unpack() {
+	# we do not want the perl src_unpack
+	default_src_unpack
+}
+
+src_prepare() {
+	# gentoo bug #331111
+	sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am || die
+	sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am || die
+
+	# bug with glibc-2.16.0
+	sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die
+
+	eautoreconf
+
+	# places for us to work in
+	mkdir -p "${MYFILESDIR}" || die
+	# Now we store the settings we just created
+	set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die
+
+	# Prepare our custom files
+	einfo "Building custom configuration files"
+	local i # our iterator
+	local sedexpr # var for sed expr
+	sedexpr=''
+	for i in ${ENV_SETTINGS_AMANDA} ; do
+		local val
+		eval "val=\"\${${i}}\""
+		sedexpr="${sedexpr}s|__${i}__|${val}|g;"
+	done
+
+	# now apply the sed expr
+	for i in "${FILESDIR}"/amanda-* ; do
+		sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`" || die
+	done
+
+	if use minimal; then
+		cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	else
+		sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
+			server-src/am{addclient,serverconfig}.pl || die
+		cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	# fix bug #36316
+	addpredict /var/cache/samba/gencache.tdb
+	# fix bug #376169
+	addpredict /run/blkid
+	addpredict /etc/blkid.tab
+
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source "${TMPENVFILE}"
+	local myconf
+
+	einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
+	myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
+	einfo "Using ${AMANDA_SERVER_TAPE_DEVICE} for tape server."
+	myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}"
+	einfo "Using ${AMANDA_SERVER_INDEX} for index server."
+	myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
+	einfo "Using ${AMANDA_USER_NAME} for amanda user."
+	myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
+	einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
+	myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
+	einfo "Using ${AMANDA_TAR} as Tar implementation."
+	myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
+	einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
+	myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
+	einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
+	myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
+	einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
+	myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
+
+	if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
+		eerror "If you want _both_ UDP and TCP ports, please use only the"
+		eerror "AMANDA_PORTS environment variable for identical ports, or set"
+		eerror "AMANDA_PORTS_BOTH."
+		die "Bad port setup!"
+	fi
+	if [ -n "${AMANDA_PORTS_UDP}" ]; then
+		einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
+		myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
+	fi
+	if [ -n "${AMANDA_PORTS_TCP}" ]; then
+		einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
+		myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
+	fi
+	if [ -n "${AMANDA_PORTS}" ]; then
+		einfo "Using ports ${AMANDA_PORTS/,/-}"
+		myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
+	fi
+
+	# Extras
+	# Speed option
+	myconf="${myconf} --with-buffered-dump"
+	# "debugging" in the configuration is NOT debug in the conventional sense.
+	# It is actually just useful output in the application, and should remain
+	# enabled. There are some cases of breakage with MTX tape changers as of
+	# 2.5.1p2 that it exposes when turned off as well.
+	myconf="${myconf} --with-debugging"
+	# Where to put our files
+	myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
+
+	# Samba support
+	myconf="${myconf} $(use_with samba smbclient /usr/bin/smbclient)"
+
+	# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
+	# default
+	myconf="${myconf} --with-bsd-security"
+	myconf="${myconf} --with-ssh-security"
+	myconf="${myconf} --with-bsdudp-security"
+	myconf="${myconf} --with-bsdtcp-security"
+
+	# kerberos-security mechanism version 5
+	myconf="${myconf} $(use_with kerberos krb5-security)"
+
+	# Amazon S3 support
+	myconf="${myconf} `use_enable s3 s3-device`"
+
+	# libcurl is required for S3 but otherwise optional
+	if ! use s3; then
+		myconf="${myconf} $(use_with curl libcurl)"
+	fi
+
+	# Client only, as requested in bug #127725
+	if use minimal ; then
+		myconf="${myconf} --without-server"
+	else
+		# amplot
+		myconf="${myconf} $(use_with gnuplot)"
+	fi
+
+	# IPv6 fun.
+	myconf="${myconf} `use_with ipv6`"
+	# This is to prevent the IPv6-is-working test
+	# As the test fails on binpkg build hosts with no IPv6.
+	use ipv6 && export amanda_cv_working_ipv6=yes
+
+	# I18N
+	myconf="${myconf} `use_enable nls`"
+
+	# Bug #296634: Perl location
+	perl_set_version
+	myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
+
+	# Bug 296633: --disable-syntax-checks
+	# Some tests are not safe for production systems
+	myconf="${myconf} --disable-syntax-checks"
+
+	# build manpages
+	myconf="${myconf} --enable-manpage-build"
+
+	# bug #483120
+	tc-export AR
+
+	econf \
+		$(use_with readline) \
+		${myconf}
+}
+
+src_compile() {
+	# Again, do not want the perl-module src_compile
+	default_src_compile
+}
+
+src_install() {
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source ${TMPENVFILE}
+
+	einfo "Doing stock install"
+	emake DESTDIR="${D}" install || die
+
+	# Build the envdir file
+	# Don't forget this..
+	einfo "Building environment file"
+	(
+		echo "# These settings are what was present in the environment when this"
+		echo "# Amanda was compiled.  Changing anything below this comment will"
+		echo "# have no effect on your application, but it merely exists to"
+		echo "# preserve them for your next emerge of Amanda"
+		cat "${TMPENVFILE}" | sed "s,=\$,='',g"
+	) >> "${MYFILESDIR}/${ENVDFILE}"
+
+	# Env.d
+	einfo "Installing environment config file"
+	doenvd "${MYFILESDIR}/${ENVDFILE}"
+
+	# Lock down next section (up until docs).
+	insopts -m0640
+	# Installing Amanda Xinetd Services Definition
+	einfo "Installing xinetd service file"
+	insinto /etc/xinetd.d
+	if use minimal ; then
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
+	else
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
+	fi
+
+	if ! use minimal; then
+		einfo "Installing Sample Daily Cron Job for Amanda"
+		insinto /etc/cron.daily
+		newins "${MYFILESDIR}/amanda-cron" amanda
+	fi
+
+	einfo "Installing systemd service and socket files for Amanda"
+	systemd_dounit "${FILESDIR}"/amanda.socket || die
+	systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service' || die
+
+	insinto /etc/amanda
+	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
+	doins "${T}/amandahosts"
+	fperms 600 /etc/amanda/amandahosts
+
+	dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts"
+	insinto "${AMANDA_USER_HOMEDIR}"
+	einfo "Installing .profile for ${AMANDA_USER_NAME} user"
+	newins "${MYFILESDIR}/amanda-profile" .profile
+
+	insinto /etc/amanda
+	doins "${S}/example/amanda-client.conf"
+	if ! use minimal ; then
+		insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
+		doins "${S}/example/amanda.conf"
+		doins "${S}/example/disklist"
+		keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
+	fi
+
+	keepdir "${AMANDA_TAR_LISTDIR}"
+	keepdir "${AMANDA_USER_HOMEDIR}/amanda"
+	keepdir "${AMANDA_TMPDIR}/dumps"
+	# Just make sure it exists for XFS to work...
+	use xfs && keepdir /var/xfsdump/inventory
+
+	local i
+	for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
+		"${AMANDA_TMPDIR}" /etc/amanda; do
+		einfo "Securing directory (${i})"
+		fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
+	done
+	# Do NOT use -R
+	fperms 0700 \
+		"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
+		"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
+		 "${AMANDA_USER_HOMEDIR}/amanda" \
+		 /etc/amanda
+
+	if ! use minimal ; then
+		fperms 0700 \
+			 "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
+	         /etc/amanda/${AMANDA_CONFIG_NAME}
+	fi
+
+	einfo "Setting setuid permissions"
+	amanda_permissions_fix "${D}"
+
+	# Relax permissions again
+	insopts -m0644
+
+	# docs
+	einfo "Installing documentation"
+	dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING
+	# our inetd sample
+	einfo "Installing standard inetd sample"
+	newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample
+	# Amanda example configs
+	einfo "Installing example configurations"
+	rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes}
+	mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/"
+	docinto example1
+	newdoc "${FILESDIR}/example_amanda.conf" amanda.conf
+	newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist
+	newdoc "${FILESDIR}/example_global.conf" global.conf
+
+	einfo "Cleaning up dud .la files"
+	perl_set_version
+	find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f
+}
+
+pkg_postinst() {
+	[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
+		TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source "${TMPENVFILE}"
+
+	# Migration of amandates from /etc to $localstatedir/amanda
+	if [ -f "${ROOT}/etc/amandates" -a \
+		! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then
+		einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda"
+		einfo "A backup is also placed at /etc/amandates.orig"
+		cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig"
+		mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/"
+		cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates"
+	fi
+	if [ -f "${ROOT}/etc/amandates" ]; then
+		einfo "If you have migrated safely, please delete /etc/amandates"
+	fi
+
+	einfo "Checking setuid permissions"
+	amanda_permissions_fix "${ROOT}"
+
+	elog "You should configure Amanda in /etc/amanda now."
+	elog
+	elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
+	elog "and restart xinetd afterwards!"
+	elog
+	elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample"
+	elog "as an example of how to configure your inetd."
+	elog
+	elog "systemd-users: enable and start amanda.socket or the relevant services"
+	elog "regarding what auth method you use."
+	elog
+	elog "NOTICE: If you need raw access to partitions you need to add the"
+	elog "amanda user to the 'disk' group."
+	elog
+	elog "NOTICE: If you have a tape changer, you need to add the amanda user"
+	elog "to the 'tape' group."
+	elog
+	elog "If you use localhost in your disklist your restores may break."
+	elog "You should replace it with the actual hostname!"
+	elog "Please also see the syntax changes to amandahosts."
+	elog "The only exception is when you use the authentication method 'local'."
+	elog
+	elog "Please note that this package no longer explicitly depends on"
+	elog "virtual/inetd, as it supports modes where an inetd is not needed"
+	elog "(see bug #506028 for details)."
+}
+
+# We have had reports of amanda file permissions getting screwed up.
+# Losing setuid, becoming too lax etc.
+# ONLY root and users in the amanda group should be able to run these binaries!
+amanda_permissions_fix() {
+	local root="$1"
+	[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
+	local le="/usr/libexec/amanda"
+	for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \
+		"${le}"/rundump "${le}"/runtar "${le}"/dumper \
+		"${le}"/planner ; do
+		chown root:${AMANDA_GROUP_NAME} "${root}"/${i}
+		chmod u=srwx,g=rx,o= "${root}"/${i}
+	done
+}
+
+# We do not want the perl-module tests.
+src_test() {
+	default_src_test
+}
diff --git a/app-backup/amanda/amanda-3.4.5.ebuild b/app-backup/amanda/amanda-3.4.5.ebuild
new file mode 100644
index 000000000000..aec64fedec3e
--- /dev/null
+++ b/app-backup/amanda/amanda-3.4.5.ebuild
@@ -0,0 +1,484 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools perl-module user systemd
+
+DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
+HOMEPAGE="http://www.amanda.org/"
+SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
+
+LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+RDEPEND="sys-libs/readline:=
+	virtual/awk
+	app-arch/tar
+	dev-lang/perl:=
+	app-arch/dump
+	net-misc/openssh
+	>=dev-libs/glib-2.26.0
+	dev-perl/JSON
+	dev-perl/Encode-Locale
+	nls? ( virtual/libintl )
+	s3? ( >=net-misc/curl-7.10.0 )
+	!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
+	samba? ( net-fs/samba:= )
+	kerberos? ( app-crypt/mit-krb5 )
+	xfs? ( sys-fs/xfsdump )
+	!minimal? (
+		dev-perl/XML-Simple
+		virtual/mailx
+		app-arch/mt-st:=
+		sys-block/mtx
+		gnuplot? ( sci-visualization/gnuplot )
+		app-crypt/aespipe
+		app-crypt/gnupg
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	>=app-text/docbook-xsl-stylesheets-1.72.0
+	app-text/docbook-xml-dtd
+	dev-libs/libxslt
+	dev-lang/swig
+	"
+
+MYFILESDIR="${T}/files"
+ENVDIR="/etc/env.d"
+ENVDFILE="97amanda"
+TMPENVFILE="${T}/${ENVDFILE}"
+
+# This is a complete list of Amanda settings that the ebuild takes from the
+# build environment. This allows users to alter the behavior of the package as
+# upstream intended, but keeping with Gentoo style. We store a copy of them in
+# /etc/env.d/97amanda during the install, so that they are preserved for future
+# installed. This variable name must not start with AMANDA_, as we do not want
+# it captured into the env file.
+ENV_SETTINGS_AMANDA="
+AMANDA_GROUP_GID AMANDA_GROUP_NAME
+AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS
+AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_TAPE_DEVICE AMANDA_SERVER_INDEX
+AMANDA_TAR_LISTDIR AMANDA_TAR
+AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
+AMANDA_CONFIG_NAME AMANDA_TMPDIR"
+
+amanda_variable_setup() {
+
+	# Setting vars
+	local currentamanda
+
+	# Grab the current settings
+	currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
+
+	# First we set the defaults
+	[[ -z "${AMANDA_GROUP_GID}" ]] && AMANDA_GROUP_GID=87
+	[[ -z "${AMANDA_GROUP_NAME}" ]] && AMANDA_GROUP_NAME=amanda
+	[[ -z "${AMANDA_USER_NAME}" ]] && AMANDA_USER_NAME=amanda
+	[[ -z "${AMANDA_USER_UID}" ]] && AMANDA_USER_UID=87
+	[[ -z "${AMANDA_USER_SH}" ]] && AMANDA_USER_SH=/bin/bash
+	[[ -z "${AMANDA_USER_HOMEDIR}" ]] && AMANDA_USER_HOMEDIR=/var/spool/amanda
+	[[ -z "${AMANDA_USER_GROUPS}" ]] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
+
+	# This installs Amanda, with the server. However, it could be a client,
+	# just specify an alternate server name in AMANDA_SERVER.
+	[[ -z "${AMANDA_SERVER}" ]] && AMANDA_SERVER="${HOSTNAME}"
+	[[ -z "${AMANDA_SERVER_TAPE}" ]] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
+	[[ -z "${AMANDA_SERVER_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0"
+	[[ -z "${AMANDA_SERVER_INDEX}" ]] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
+	[[ -z "${AMANDA_TAR_LISTDIR}" ]] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
+	[[ -z "${AMANDA_CONFIG_NAME}" ]] && AMANDA_CONFIG_NAME=DailySet1
+	[[ -z "${AMANDA_TMPDIR}" ]] && AMANDA_TMPDIR=/var/tmp/amanda
+	[[ -z "${AMANDA_DBGDIR}" ]] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
+	# These are left empty by default
+	[[ -z "${AMANDA_PORTS_UDP}" ]] && AMANDA_PORTS_UDP=
+	[[ -z "${AMANDA_PORTS_TCP}" ]] && AMANDA_PORTS_TCP=
+	[[ -z "${AMANDA_PORTS_BOTH}" ]] && AMANDA_PORTS_BOTH=
+	[[ -z "${AMANDA_PORTS}" ]] && AMANDA_PORTS=
+
+	# What tar to use
+	[[ -z "${AMANDA_TAR}" ]] && AMANDA_TAR=/bin/tar
+
+	# Now pull in the old stuff
+	if [[ -f "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then
+		# We don't just source it as we don't want everything in there.
+		eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
+	fi
+
+	# Re-apply the new settings if any
+	[ -n "${currentamanda}" ] && eval $(echo "${currentamanda}")
+
+}
+
+pkg_setup() {
+	amanda_variable_setup
+
+	# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
+	# another host than HOSTNAME.
+	if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then
+		elog "You are installing a client-only version of Amanda."
+		elog "You should set the variable \$AMANDA_SERVER to point at your"
+		elog "Amanda-tape-server, otherwise you will have to specify its name"
+		elog "when using amrecover on the client."
+		elog "For example: Use something like"
+		elog "AMANDA_SERVER=\"myserver\" emerge amanda"
+		elog
+	fi
+
+	enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
+	enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
+}
+
+src_unpack() {
+	# we do not want the perl src_unpack
+	default_src_unpack
+}
+
+src_prepare() {
+	# gentoo bug #331111
+	sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am || die
+	sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am || die
+
+	# bug with glibc-2.16.0
+	sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die
+
+	eautoreconf
+
+	# places for us to work in
+	mkdir -p "${MYFILESDIR}" || die
+	# Now we store the settings we just created
+	set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die
+
+	# Prepare our custom files
+	einfo "Building custom configuration files"
+	local i # our iterator
+	local sedexpr # var for sed expr
+	sedexpr=''
+	for i in ${ENV_SETTINGS_AMANDA} ; do
+		local val
+		eval "val=\"\${${i}}\""
+		sedexpr="${sedexpr}s|__${i}__|${val}|g;"
+	done
+
+	# now apply the sed expr
+	for i in "${FILESDIR}"/amanda-* ; do
+		sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`" || die
+	done
+
+	if use minimal; then
+		cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	else
+		sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
+			server-src/am{addclient,serverconfig}.pl || die
+		cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	# fix bug #36316
+	addpredict /var/cache/samba/gencache.tdb
+	# fix bug #376169
+	addpredict /run/blkid
+	addpredict /etc/blkid.tab
+
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source "${TMPENVFILE}"
+	local myconf
+
+	einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
+	myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
+	einfo "Using ${AMANDA_SERVER_TAPE_DEVICE} for tape server."
+	myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}"
+	einfo "Using ${AMANDA_SERVER_INDEX} for index server."
+	myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
+	einfo "Using ${AMANDA_USER_NAME} for amanda user."
+	myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
+	einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
+	myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
+	einfo "Using ${AMANDA_TAR} as Tar implementation."
+	myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
+	einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
+	myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
+	einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
+	myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
+	einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
+	myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
+
+	if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
+		eerror "If you want _both_ UDP and TCP ports, please use only the"
+		eerror "AMANDA_PORTS environment variable for identical ports, or set"
+		eerror "AMANDA_PORTS_BOTH."
+		die "Bad port setup!"
+	fi
+	if [ -n "${AMANDA_PORTS_UDP}" ]; then
+		einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
+		myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
+	fi
+	if [ -n "${AMANDA_PORTS_TCP}" ]; then
+		einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
+		myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
+	fi
+	if [ -n "${AMANDA_PORTS}" ]; then
+		einfo "Using ports ${AMANDA_PORTS/,/-}"
+		myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
+	fi
+
+	# Extras
+	# Speed option
+	myconf="${myconf} --with-buffered-dump"
+	# "debugging" in the configuration is NOT debug in the conventional sense.
+	# It is actually just useful output in the application, and should remain
+	# enabled. There are some cases of breakage with MTX tape changers as of
+	# 2.5.1p2 that it exposes when turned off as well.
+	myconf="${myconf} --with-debugging"
+	# Where to put our files
+	myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
+
+	# Samba support
+	myconf="${myconf} $(use_with samba smbclient /usr/bin/smbclient)"
+
+	# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
+	# default
+	myconf="${myconf} --with-bsd-security"
+	myconf="${myconf} --with-ssh-security"
+	myconf="${myconf} --with-bsdudp-security"
+	myconf="${myconf} --with-bsdtcp-security"
+
+	# kerberos-security mechanism version 5
+	myconf="${myconf} $(use_with kerberos krb5-security)"
+
+	# Amazon S3 support
+	myconf="${myconf} `use_enable s3 s3-device`"
+
+	# libcurl is required for S3 but otherwise optional
+	if ! use s3; then
+		myconf="${myconf} $(use_with curl libcurl)"
+	fi
+
+	# Client only, as requested in bug #127725
+	if use minimal ; then
+		myconf="${myconf} --without-server"
+	else
+		# amplot
+		myconf="${myconf} $(use_with gnuplot)"
+	fi
+
+	# IPv6 fun.
+	myconf="${myconf} `use_with ipv6`"
+	# This is to prevent the IPv6-is-working test
+	# As the test fails on binpkg build hosts with no IPv6.
+	use ipv6 && export amanda_cv_working_ipv6=yes
+
+	# I18N
+	myconf="${myconf} `use_enable nls`"
+
+	# Bug #296634: Perl location
+	perl_set_version
+	myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
+
+	# Bug 296633: --disable-syntax-checks
+	# Some tests are not safe for production systems
+	myconf="${myconf} --disable-syntax-checks"
+
+	# build manpages
+	myconf="${myconf} --enable-manpage-build"
+
+	# bug #483120
+	tc-export AR
+
+	econf \
+		$(use_with readline) \
+		${myconf}
+}
+
+src_compile() {
+	# Again, do not want the perl-module src_compile
+	default_src_compile
+}
+
+src_install() {
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source ${TMPENVFILE}
+
+	einfo "Doing stock install"
+	emake DESTDIR="${D}" install || die
+
+	# Build the envdir file
+	# Don't forget this..
+	einfo "Building environment file"
+	(
+		echo "# These settings are what was present in the environment when this"
+		echo "# Amanda was compiled.  Changing anything below this comment will"
+		echo "# have no effect on your application, but it merely exists to"
+		echo "# preserve them for your next emerge of Amanda"
+		cat "${TMPENVFILE}" | sed "s,=\$,='',g"
+	) >> "${MYFILESDIR}/${ENVDFILE}"
+
+	# Env.d
+	einfo "Installing environment config file"
+	doenvd "${MYFILESDIR}/${ENVDFILE}"
+
+	# Lock down next section (up until docs).
+	insopts -m0640
+	# Installing Amanda Xinetd Services Definition
+	einfo "Installing xinetd service file"
+	insinto /etc/xinetd.d
+	if use minimal ; then
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
+	else
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
+	fi
+
+	if ! use minimal; then
+		einfo "Installing Sample Daily Cron Job for Amanda"
+		insinto /etc/cron.daily
+		newins "${MYFILESDIR}/amanda-cron" amanda
+	fi
+
+	einfo "Installing systemd service and socket files for Amanda"
+	systemd_dounit "${FILESDIR}"/amanda.socket || die
+	systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service' || die
+
+	insinto /etc/amanda
+	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
+	doins "${T}/amandahosts"
+	fperms 600 /etc/amanda/amandahosts
+
+	dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts"
+	insinto "${AMANDA_USER_HOMEDIR}"
+	einfo "Installing .profile for ${AMANDA_USER_NAME} user"
+	newins "${MYFILESDIR}/amanda-profile" .profile
+
+	insinto /etc/amanda
+	doins "${S}/example/amanda-client.conf"
+	if ! use minimal ; then
+		insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
+		doins "${S}/example/amanda.conf"
+		doins "${S}/example/disklist"
+		keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
+	fi
+
+	keepdir "${AMANDA_TAR_LISTDIR}"
+	keepdir "${AMANDA_USER_HOMEDIR}/amanda"
+	keepdir "${AMANDA_TMPDIR}/dumps"
+	# Just make sure it exists for XFS to work...
+	use xfs && keepdir /var/xfsdump/inventory
+
+	local i
+	for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
+		"${AMANDA_TMPDIR}" /etc/amanda; do
+		einfo "Securing directory (${i})"
+		fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
+	done
+	# Do NOT use -R
+	fperms 0700 \
+		"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
+		"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
+		 "${AMANDA_USER_HOMEDIR}/amanda" \
+		 /etc/amanda
+
+	if ! use minimal ; then
+		fperms 0700 \
+			 "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
+	         /etc/amanda/${AMANDA_CONFIG_NAME}
+	fi
+
+	einfo "Setting setuid permissions"
+	amanda_permissions_fix "${D}"
+
+	# Relax permissions again
+	insopts -m0644
+
+	# docs
+	einfo "Installing documentation"
+	dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING
+	# our inetd sample
+	einfo "Installing standard inetd sample"
+	newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample
+	# Amanda example configs
+	einfo "Installing example configurations"
+	rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes}
+	mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/"
+	docinto example1
+	newdoc "${FILESDIR}/example_amanda.conf" amanda.conf
+	newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist
+	newdoc "${FILESDIR}/example_global.conf" global.conf
+
+	einfo "Cleaning up dud .la files"
+	perl_set_version
+	find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f
+}
+
+pkg_postinst() {
+	[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
+		TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source "${TMPENVFILE}"
+
+	# Migration of amandates from /etc to $localstatedir/amanda
+	if [ -f "${ROOT}/etc/amandates" -a \
+		! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then
+		einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda"
+		einfo "A backup is also placed at /etc/amandates.orig"
+		cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig"
+		mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/"
+		cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates"
+	fi
+	if [ -f "${ROOT}/etc/amandates" ]; then
+		einfo "If you have migrated safely, please delete /etc/amandates"
+	fi
+
+	einfo "Checking setuid permissions"
+	amanda_permissions_fix "${ROOT}"
+
+	elog "You should configure Amanda in /etc/amanda now."
+	elog
+	elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
+	elog "and restart xinetd afterwards!"
+	elog
+	elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample"
+	elog "as an example of how to configure your inetd."
+	elog
+	elog "systemd-users: enable and start amanda.socket or the relevant services"
+	elog "regarding what auth method you use."
+	elog
+	elog "NOTICE: If you need raw access to partitions you need to add the"
+	elog "amanda user to the 'disk' group."
+	elog
+	elog "NOTICE: If you have a tape changer, you need to add the amanda user"
+	elog "to the 'tape' group."
+	elog
+	elog "If you use localhost in your disklist your restores may break."
+	elog "You should replace it with the actual hostname!"
+	elog "Please also see the syntax changes to amandahosts."
+	elog "The only exception is when you use the authentication method 'local'."
+	elog
+	elog "Please note that this package no longer explicitly depends on"
+	elog "virtual/inetd, as it supports modes where an inetd is not needed"
+	elog "(see bug #506028 for details)."
+}
+
+# We have had reports of amanda file permissions getting screwed up.
+# Losing setuid, becoming too lax etc.
+# ONLY root and users in the amanda group should be able to run these binaries!
+amanda_permissions_fix() {
+	local root="$1"
+	[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
+	local le="/usr/libexec/amanda"
+	for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \
+		"${le}"/rundump "${le}"/runtar "${le}"/dumper \
+		"${le}"/planner ; do
+		chown root:${AMANDA_GROUP_NAME} "${root}"/${i}
+		chmod u=srwx,g=rx,o= "${root}"/${i}
+	done
+}
+
+# We do not want the perl-module tests.
+src_test() {
+	default_src_test
+}
diff --git a/app-backup/amanda/amanda-3.5-r1.ebuild b/app-backup/amanda/amanda-3.5-r1.ebuild
new file mode 100644
index 000000000000..058d9b9ccb9d
--- /dev/null
+++ b/app-backup/amanda/amanda-3.5-r1.ebuild
@@ -0,0 +1,498 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools perl-module user systemd
+
+DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
+HOMEPAGE="http://www.amanda.org/"
+SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
+
+LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="curl gnuplot ipv6 kerberos minimal ndmp nls readline s3 samba systemd xfs"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+RDEPEND="sys-libs/readline:=
+	virtual/awk
+	app-arch/tar
+	dev-lang/perl:=
+	app-arch/dump
+	net-misc/openssh
+	>=dev-libs/glib-2.26.0
+	dev-perl/JSON
+	dev-perl/Encode-Locale
+	nls? ( virtual/libintl )
+	s3? ( >=net-misc/curl-7.10.0 )
+	!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
+	samba? ( net-fs/samba:= )
+	kerberos? ( app-crypt/mit-krb5 )
+	xfs? ( sys-fs/xfsdump )
+	!minimal? (
+		dev-perl/XML-Simple
+		virtual/mailx
+		app-arch/mt-st:=
+		sys-block/mtx
+		gnuplot? ( sci-visualization/gnuplot )
+		app-crypt/aespipe
+		app-crypt/gnupg
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	>=app-text/docbook-xsl-stylesheets-1.72.0
+	app-text/docbook-xml-dtd
+	dev-libs/libxslt
+	dev-lang/swig
+	"
+
+MYFILESDIR="${T}/files"
+ENVDIR="/etc/env.d"
+ENVDFILE="97amanda"
+TMPENVFILE="${T}/${ENVDFILE}"
+
+# This is a complete list of Amanda settings that the ebuild takes from the
+# build environment. This allows users to alter the behavior of the package as
+# upstream intended, but keeping with Gentoo style. We store a copy of them in
+# /etc/env.d/97amanda during the install, so that they are preserved for future
+# installed. This variable name must not start with AMANDA_, as we do not want
+# it captured into the env file.
+ENV_SETTINGS_AMANDA="
+AMANDA_GROUP_GID AMANDA_GROUP_NAME
+AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS
+AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_TAPE_DEVICE AMANDA_SERVER_INDEX
+AMANDA_TAR_LISTDIR AMANDA_TAR
+AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
+AMANDA_CONFIG_NAME AMANDA_TMPDIR"
+
+amanda_variable_setup() {
+
+	# Setting vars
+	local currentamanda
+
+	# Grab the current settings
+	currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
+
+	# First we set the defaults
+	[[ -z "${AMANDA_GROUP_GID}" ]] && AMANDA_GROUP_GID=87
+	[[ -z "${AMANDA_GROUP_NAME}" ]] && AMANDA_GROUP_NAME=amanda
+	[[ -z "${AMANDA_USER_NAME}" ]] && AMANDA_USER_NAME=amanda
+	[[ -z "${AMANDA_USER_UID}" ]] && AMANDA_USER_UID=87
+	[[ -z "${AMANDA_USER_SH}" ]] && AMANDA_USER_SH=/bin/bash
+	[[ -z "${AMANDA_USER_HOMEDIR}" ]] && AMANDA_USER_HOMEDIR=/var/spool/amanda
+	[[ -z "${AMANDA_USER_GROUPS}" ]] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
+
+	# This installs Amanda, with the server. However, it could be a client,
+	# just specify an alternate server name in AMANDA_SERVER.
+	[[ -z "${AMANDA_SERVER}" ]] && AMANDA_SERVER="${HOSTNAME}"
+	[[ -z "${AMANDA_SERVER_TAPE}" ]] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
+	[[ -z "${AMANDA_SERVER_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0"
+	[[ -z "${AMANDA_SERVER_INDEX}" ]] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
+	[[ -z "${AMANDA_TAR_LISTDIR}" ]] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
+	[[ -z "${AMANDA_CONFIG_NAME}" ]] && AMANDA_CONFIG_NAME=DailySet1
+	[[ -z "${AMANDA_TMPDIR}" ]] && AMANDA_TMPDIR=/var/tmp/amanda
+	[[ -z "${AMANDA_DBGDIR}" ]] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
+	# These are left empty by default
+	[[ -z "${AMANDA_PORTS_UDP}" ]] && AMANDA_PORTS_UDP=
+	[[ -z "${AMANDA_PORTS_TCP}" ]] && AMANDA_PORTS_TCP=
+	[[ -z "${AMANDA_PORTS_BOTH}" ]] && AMANDA_PORTS_BOTH=
+	[[ -z "${AMANDA_PORTS}" ]] && AMANDA_PORTS=
+
+	# What tar to use
+	[[ -z "${AMANDA_TAR}" ]] && AMANDA_TAR=/bin/tar
+
+	# Now pull in the old stuff
+	if [[ -f "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then
+		# We don't just source it as we don't want everything in there.
+		eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
+	fi
+
+	# Re-apply the new settings if any
+	[ -n "${currentamanda}" ] && eval $(echo "${currentamanda}")
+
+}
+
+pkg_setup() {
+	amanda_variable_setup
+
+	# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
+	# another host than HOSTNAME.
+	if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then
+		elog "You are installing a client-only version of Amanda."
+		elog "You should set the variable \$AMANDA_SERVER to point at your"
+		elog "Amanda-tape-server, otherwise you will have to specify its name"
+		elog "when using amrecover on the client."
+		elog "For example: Use something like"
+		elog "AMANDA_SERVER=\"myserver\" emerge amanda"
+		elog
+	fi
+
+	enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
+	enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
+}
+
+src_unpack() {
+	# we do not want the perl src_unpack
+	default_src_unpack
+}
+
+src_prepare() {
+	# gentoo bug #331111
+	sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am || die
+	sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am || die
+
+	# bug with glibc-2.16.0
+	sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die
+
+	eautoreconf
+
+	# places for us to work in
+	mkdir -p "${MYFILESDIR}" || die
+	# Now we store the settings we just created
+	set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die
+
+	# Prepare our custom files
+	einfo "Building custom configuration files"
+	local i # our iterator
+	local sedexpr # var for sed expr
+	sedexpr=''
+	for i in ${ENV_SETTINGS_AMANDA} ; do
+		local val
+		eval "val=\"\${${i}}\""
+		sedexpr="${sedexpr}s|__${i}__|${val}|g;"
+	done
+
+	# now apply the sed expr
+	for i in "${FILESDIR}"/amanda-* ; do
+		sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`" || die
+	done
+
+	if use minimal; then
+		cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	else
+		sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
+			server-src/am{addclient,serverconfig}.pl || die
+		cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	# fix bug #36316
+	addpredict /var/cache/samba/gencache.tdb
+	# fix bug #376169
+	addpredict /run/blkid
+	addpredict /etc/blkid.tab
+
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source "${TMPENVFILE}"
+	local myconf
+
+	einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
+	myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
+	einfo "Using ${AMANDA_SERVER_TAPE_DEVICE} for tape server."
+	myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}"
+	einfo "Using ${AMANDA_SERVER_INDEX} for index server."
+	myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
+	einfo "Using ${AMANDA_USER_NAME} for amanda user."
+	myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
+	einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
+	myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
+	einfo "Using ${AMANDA_TAR} as Tar implementation."
+	myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
+	einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
+	myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
+	einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
+	myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
+	einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
+	myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
+
+	if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
+		eerror "If you want _both_ UDP and TCP ports, please use only the"
+		eerror "AMANDA_PORTS environment variable for identical ports, or set"
+		eerror "AMANDA_PORTS_BOTH."
+		die "Bad port setup!"
+	fi
+	if [ -n "${AMANDA_PORTS_UDP}" ]; then
+		einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
+		myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
+	fi
+	if [ -n "${AMANDA_PORTS_TCP}" ]; then
+		einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
+		myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
+	fi
+	if [ -n "${AMANDA_PORTS}" ]; then
+		einfo "Using ports ${AMANDA_PORTS/,/-}"
+		myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
+	fi
+
+	# Extras
+	# Speed option
+	myconf="${myconf} --with-buffered-dump"
+	# "debugging" in the configuration is NOT debug in the conventional sense.
+	# It is actually just useful output in the application, and should remain
+	# enabled. There are some cases of breakage with MTX tape changers as of
+	# 2.5.1p2 that it exposes when turned off as well.
+	myconf="${myconf} --with-debugging"
+	# Where to put our files
+	myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
+
+	# Samba support
+	myconf="${myconf} $(use_with samba smbclient /usr/bin/smbclient)"
+
+	# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
+	# default
+	myconf="${myconf} --with-bsd-security"
+	myconf="${myconf} --with-ssh-security"
+	myconf="${myconf} --with-bsdudp-security"
+	myconf="${myconf} --with-bsdtcp-security"
+
+	# kerberos-security mechanism version 5
+	myconf="${myconf} $(use_with kerberos krb5-security)"
+
+	# Amazon S3 support
+	myconf="${myconf} `use_enable s3 s3-device`"
+
+	# libcurl is required for S3 but otherwise optional
+	if ! use s3; then
+		myconf="${myconf} $(use_with curl libcurl)"
+	fi
+
+	# Client only, as requested in bug #127725
+	if use minimal ; then
+		myconf="${myconf} --without-server"
+	else
+		# amplot
+		myconf="${myconf} $(use_with gnuplot)"
+	fi
+
+	# IPv6 fun.
+	myconf="${myconf} `use_with ipv6`"
+	# This is to prevent the IPv6-is-working test
+	# As the test fails on binpkg build hosts with no IPv6.
+	use ipv6 && export amanda_cv_working_ipv6=yes
+
+	# I18N
+	myconf="${myconf} `use_enable nls`"
+
+	# Bug #296634: Perl location
+	perl_set_version
+	myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
+
+	# Bug 296633: --disable-syntax-checks
+	# Some tests are not safe for production systems
+	myconf="${myconf} --disable-syntax-checks"
+
+	# build manpages
+	myconf="${myconf} --enable-manpage-build"
+
+	# Bug #636262
+	myconf="${myconf} $(use_with ndmp ndmp)"
+
+	# bug #483120
+	tc-export AR
+
+	econf \
+		$(use_with readline) \
+		${myconf}
+}
+
+src_compile() {
+	# Again, do not want the perl-module src_compile
+	default_src_compile
+}
+
+src_install() {
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source ${TMPENVFILE}
+
+	einfo "Doing stock install"
+	emake DESTDIR="${D}" install
+
+	# Build the envdir file
+	# Don't forget this..
+	einfo "Building environment file"
+	(
+		echo "# These settings are what was present in the environment when this"
+		echo "# Amanda was compiled.  Changing anything below this comment will"
+		echo "# have no effect on your application, but it merely exists to"
+		echo "# preserve them for your next emerge of Amanda"
+		cat "${TMPENVFILE}" | sed "s,=\$,='',g"
+	) >> "${MYFILESDIR}/${ENVDFILE}"
+
+	# Env.d
+	einfo "Installing environment config file"
+	doenvd "${MYFILESDIR}/${ENVDFILE}"
+
+	einfo "Installing systemd service and socket files for Amanda"
+	systemd_dounit "${FILESDIR}"/amanda.socket
+	systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service'
+
+	# Lock down next section (up until docs).
+	insopts -m0640
+	# Installing Amanda Xinetd Services Definition
+	einfo "Installing xinetd service file"
+	insinto /etc/xinetd.d
+	if use minimal ; then
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
+	else
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
+	fi
+
+	if ! use minimal; then
+		einfo "Installing Sample Daily Cron Job for Amanda"
+		insinto /etc/cron.daily
+		newins "${MYFILESDIR}/amanda-cron" amanda
+	fi
+
+	insinto /etc/amanda
+	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
+	doins "${T}/amandahosts"
+	fperms 600 /etc/amanda/amandahosts
+
+	dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts"
+	insinto "${AMANDA_USER_HOMEDIR}"
+	einfo "Installing .profile for ${AMANDA_USER_NAME} user"
+	newins "${MYFILESDIR}/amanda-profile" .profile
+
+	insinto /etc/amanda
+	doins "${S}/example/amanda-client.conf"
+	if ! use minimal ; then
+		insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
+		doins "${S}/example/amanda.conf"
+		doins "${S}/example/disklist"
+		keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
+	fi
+
+	keepdir "${AMANDA_TAR_LISTDIR}"
+	keepdir "${AMANDA_USER_HOMEDIR}/amanda"
+	keepdir "${AMANDA_TMPDIR}/dumps"
+	# Just make sure it exists for XFS to work...
+	use xfs && keepdir /var/xfsdump/inventory
+
+	local i
+	for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
+		"${AMANDA_TMPDIR}" /etc/amanda; do
+		einfo "Securing directory (${i})"
+		fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
+	done
+	# Do NOT use -R
+	fperms 0700 \
+		"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
+		"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
+		 "${AMANDA_USER_HOMEDIR}/amanda" \
+		 /etc/amanda
+
+	if ! use minimal ; then
+		fperms 0700 \
+			 "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
+	         /etc/amanda/${AMANDA_CONFIG_NAME}
+	fi
+
+	einfo "Setting setuid permissions"
+	amanda_permissions_fix "${D}"
+
+	# Relax permissions again
+	insopts -m0644
+
+	# docs
+	einfo "Installing documentation"
+	dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING
+	# our inetd sample
+	einfo "Installing standard inetd sample"
+	newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample
+	# Amanda example configs
+	einfo "Installing example configurations"
+	rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes} || die
+	mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/" || die
+	docinto example1
+	newdoc "${FILESDIR}/example_amanda.conf" amanda.conf
+	newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist
+	newdoc "${FILESDIR}/example_global.conf" global.conf
+
+	einfo "Cleaning up dud .la files"
+	perl_set_version
+	find "${D}"/"${VENDOR_LIB}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
+		TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source "${TMPENVFILE}"
+
+	# Migration of amandates from /etc to $localstatedir/amanda
+	if [ -f "${ROOT}/etc/amandates" -a \
+		! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then
+		einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda"
+		einfo "A backup is also placed at /etc/amandates.orig"
+		cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig" || die
+		mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/" || die
+		cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" || die
+	fi
+	if [ -f "${ROOT}/etc/amandates" ]; then
+		einfo "If you have migrated safely, please delete /etc/amandates"
+	fi
+
+	einfo "Checking setuid permissions"
+	amanda_permissions_fix "${ROOT}"
+
+	elog "You should configure Amanda in /etc/amanda now."
+	elog
+	elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
+	elog "and restart xinetd afterwards!"
+	elog
+	elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample"
+	elog "as an example of how to configure your inetd."
+	elog
+	elog "systemd-users: enable and start amanda.socket or the relevant services"
+	elog "regarding what auth method you use."
+	elog
+	elog "NOTICE: If you need raw access to partitions you need to add the"
+	elog "amanda user to the 'disk' group."
+	elog
+	elog "NOTICE: If you have a tape changer, you need to add the amanda user"
+	elog "to the 'tape' group."
+	elog
+	elog "If you use localhost in your disklist your restores may break."
+	elog "You should replace it with the actual hostname!"
+	elog "Please also see the syntax changes to amandahosts."
+	elog "The only exception is when you use the authentication method 'local'."
+	elog
+	elog "Please note that this package no longer explicitly depends on"
+	elog "virtual/inetd, as it supports modes where an inetd is not needed"
+	elog "(see bug #506028 for details)."
+}
+
+# We have had reports of amanda file permissions getting screwed up.
+# Losing setuid, becoming too lax etc.
+# ONLY root and users in the amanda group should be able to run these binaries!
+amanda_permissions_fix() {
+	local root="$1"
+	[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
+	local le="/usr/libexec/amanda"
+	local i
+	for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \
+		"${le}"/rundump "${le}"/runtar "${le}"/dumper \
+		"${le}"/planner ; do
+	    [ -e "${root}"/${i} ] || continue
+		chown root:${AMANDA_GROUP_NAME} "${root}"/${i} || die
+		chmod u=srwx,g=rx,o= "${root}"/${i} || die
+	done
+
+	# amanda-security.conf is a config file with similar requirements:
+	# writable only by root
+	# world-readable
+	# 3.3.9: introduced in /etc/amanda-security.conf
+	# 3.4.2: moved to /etc/amanda/amanda-security.conf
+	f=/etc/amanda/amanda-security.conf
+	chown root:root "${root}""${f}" || die
+	chmod u=rw,go=r "${root}""${f}" || die
+}
+
+# We do not want the perl-module tests.
+src_test() {
+	default_src_test
+}
diff --git a/app-backup/amanda/amanda-3.5.1-r1.ebuild b/app-backup/amanda/amanda-3.5.1-r1.ebuild
new file mode 100644
index 000000000000..997834b00aae
--- /dev/null
+++ b/app-backup/amanda/amanda-3.5.1-r1.ebuild
@@ -0,0 +1,497 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools perl-module user systemd
+
+DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
+HOMEPAGE="http://www.amanda.org/"
+SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
+
+LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="curl gnuplot ipv6 kerberos minimal ndmp nls readline s3 samba systemd xfs"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+RDEPEND="sys-libs/readline:=
+	virtual/awk
+	app-arch/tar
+	dev-lang/perl:=
+	app-arch/dump
+	net-misc/openssh
+	>=dev-libs/glib-2.26.0
+	dev-perl/JSON
+	dev-perl/Encode-Locale
+	nls? ( virtual/libintl )
+	s3? ( >=net-misc/curl-7.10.0 )
+	!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
+	samba? ( net-fs/samba:= )
+	kerberos? ( app-crypt/mit-krb5 )
+	xfs? ( sys-fs/xfsdump )
+	!minimal? (
+		dev-perl/XML-Simple
+		virtual/mailx
+		app-arch/mt-st:=
+		sys-block/mtx
+		gnuplot? ( sci-visualization/gnuplot )
+		app-crypt/aespipe
+		app-crypt/gnupg
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	>=app-text/docbook-xsl-stylesheets-1.72.0
+	app-text/docbook-xml-dtd
+	dev-libs/libxslt
+	dev-lang/swig
+	"
+
+MYFILESDIR="${T}/files"
+ENVDIR="/etc/env.d"
+ENVDFILE="97amanda"
+TMPENVFILE="${T}/${ENVDFILE}"
+
+# This is a complete list of Amanda settings that the ebuild takes from the
+# build environment. This allows users to alter the behavior of the package as
+# upstream intended, but keeping with Gentoo style. We store a copy of them in
+# /etc/env.d/97amanda during the install, so that they are preserved for future
+# installed. This variable name must not start with AMANDA_, as we do not want
+# it captured into the env file.
+ENV_SETTINGS_AMANDA="
+AMANDA_GROUP_GID AMANDA_GROUP_NAME
+AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS
+AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_TAPE_DEVICE AMANDA_SERVER_INDEX
+AMANDA_TAR_LISTDIR AMANDA_TAR
+AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
+AMANDA_CONFIG_NAME AMANDA_TMPDIR"
+
+amanda_variable_setup() {
+
+	# Setting vars
+	local currentamanda
+
+	# Grab the current settings
+	currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
+
+	# First we set the defaults
+	[[ -z "${AMANDA_GROUP_GID}" ]] && AMANDA_GROUP_GID=87
+	[[ -z "${AMANDA_GROUP_NAME}" ]] && AMANDA_GROUP_NAME=amanda
+	[[ -z "${AMANDA_USER_NAME}" ]] && AMANDA_USER_NAME=amanda
+	[[ -z "${AMANDA_USER_UID}" ]] && AMANDA_USER_UID=87
+	[[ -z "${AMANDA_USER_SH}" ]] && AMANDA_USER_SH=/bin/bash
+	[[ -z "${AMANDA_USER_HOMEDIR}" ]] && AMANDA_USER_HOMEDIR=/var/spool/amanda
+	[[ -z "${AMANDA_USER_GROUPS}" ]] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
+
+	# This installs Amanda, with the server. However, it could be a client,
+	# just specify an alternate server name in AMANDA_SERVER.
+	[[ -z "${AMANDA_SERVER}" ]] && AMANDA_SERVER="${HOSTNAME}"
+	[[ -z "${AMANDA_SERVER_TAPE}" ]] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
+	[[ -z "${AMANDA_SERVER_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0"
+	[[ -z "${AMANDA_SERVER_INDEX}" ]] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
+	[[ -z "${AMANDA_TAR_LISTDIR}" ]] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
+	[[ -z "${AMANDA_CONFIG_NAME}" ]] && AMANDA_CONFIG_NAME=DailySet1
+	[[ -z "${AMANDA_TMPDIR}" ]] && AMANDA_TMPDIR=/var/tmp/amanda
+	[[ -z "${AMANDA_DBGDIR}" ]] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
+	# These are left empty by default
+	[[ -z "${AMANDA_PORTS_UDP}" ]] && AMANDA_PORTS_UDP=
+	[[ -z "${AMANDA_PORTS_TCP}" ]] && AMANDA_PORTS_TCP=
+	[[ -z "${AMANDA_PORTS_BOTH}" ]] && AMANDA_PORTS_BOTH=
+	[[ -z "${AMANDA_PORTS}" ]] && AMANDA_PORTS=
+
+	# What tar to use
+	[[ -z "${AMANDA_TAR}" ]] && AMANDA_TAR=/bin/tar
+
+	# Now pull in the old stuff
+	if [[ -f "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then
+		# We don't just source it as we don't want everything in there.
+		eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
+	fi
+
+	# Re-apply the new settings if any
+	[ -n "${currentamanda}" ] && eval $(echo "${currentamanda}")
+
+}
+
+pkg_setup() {
+	amanda_variable_setup
+
+	# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
+	# another host than HOSTNAME.
+	if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then
+		elog "You are installing a client-only version of Amanda."
+		elog "You should set the variable \$AMANDA_SERVER to point at your"
+		elog "Amanda-tape-server, otherwise you will have to specify its name"
+		elog "when using amrecover on the client."
+		elog "For example: Use something like"
+		elog "AMANDA_SERVER=\"myserver\" emerge amanda"
+		elog
+	fi
+
+	enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
+	enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
+}
+
+src_unpack() {
+	# we do not want the perl src_unpack
+	default_src_unpack
+}
+
+src_prepare() {
+	# gentoo bug #331111
+	sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am || die
+	sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am || die
+
+	# bug with glibc-2.16.0
+	sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die
+
+	eautoreconf
+
+	# places for us to work in
+	mkdir -p "${MYFILESDIR}" || die
+	# Now we store the settings we just created
+	set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die
+
+	# Prepare our custom files
+	einfo "Building custom configuration files"
+	local i # our iterator
+	local sedexpr # var for sed expr
+	sedexpr=''
+	for i in ${ENV_SETTINGS_AMANDA} ; do
+		local val
+		eval "val=\"\${${i}}\""
+		sedexpr="${sedexpr}s|__${i}__|${val}|g;"
+	done
+
+	# now apply the sed expr
+	for i in "${FILESDIR}"/amanda-* ; do
+		sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`" || die
+	done
+
+	if use minimal; then
+		cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	else
+		sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
+			server-src/am{addclient,serverconfig}.pl || die
+		cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	# fix bug #36316
+	addpredict /var/cache/samba/gencache.tdb
+	# fix bug #376169
+	addpredict /run/blkid
+	addpredict /etc/blkid.tab
+
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source "${TMPENVFILE}"
+	local myconf
+
+	einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
+	myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
+	einfo "Using ${AMANDA_SERVER_TAPE_DEVICE} for tape server."
+	myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}"
+	einfo "Using ${AMANDA_SERVER_INDEX} for index server."
+	myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
+	einfo "Using ${AMANDA_USER_NAME} for amanda user."
+	myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
+	einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
+	myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
+	einfo "Using ${AMANDA_TAR} as Tar implementation."
+	myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
+	einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
+	myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
+	einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
+	myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
+	einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
+	myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
+
+	if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
+		eerror "If you want _both_ UDP and TCP ports, please use only the"
+		eerror "AMANDA_PORTS environment variable for identical ports, or set"
+		eerror "AMANDA_PORTS_BOTH."
+		die "Bad port setup!"
+	fi
+	if [ -n "${AMANDA_PORTS_UDP}" ]; then
+		einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
+		myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
+	fi
+	if [ -n "${AMANDA_PORTS_TCP}" ]; then
+		einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
+		myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
+	fi
+	if [ -n "${AMANDA_PORTS}" ]; then
+		einfo "Using ports ${AMANDA_PORTS/,/-}"
+		myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
+	fi
+
+	# Extras
+	# Speed option
+	myconf="${myconf} --with-buffered-dump"
+	# "debugging" in the configuration is NOT debug in the conventional sense.
+	# It is actually just useful output in the application, and should remain
+	# enabled. There are some cases of breakage with MTX tape changers as of
+	# 2.5.1p2 that it exposes when turned off as well.
+	myconf="${myconf} --with-debugging"
+	# Where to put our files
+	myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
+
+	# Samba support
+	myconf="${myconf} $(use_with samba smbclient /usr/bin/smbclient)"
+
+	# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
+	# default
+	myconf="${myconf} --with-bsd-security"
+	myconf="${myconf} --with-ssh-security"
+	myconf="${myconf} --with-bsdudp-security"
+	myconf="${myconf} --with-bsdtcp-security"
+
+	# kerberos-security mechanism version 5
+	myconf="${myconf} $(use_with kerberos krb5-security)"
+
+	# Amazon S3 support
+	myconf="${myconf} `use_enable s3 s3-device`"
+
+	# libcurl is required for S3 but otherwise optional
+	if ! use s3; then
+		myconf="${myconf} $(use_with curl libcurl)"
+	fi
+
+	# Client only, as requested in bug #127725
+	if use minimal ; then
+		myconf="${myconf} --without-server"
+	else
+		# amplot
+		myconf="${myconf} $(use_with gnuplot)"
+	fi
+
+	# IPv6 fun.
+	myconf="${myconf} `use_with ipv6`"
+	# This is to prevent the IPv6-is-working test
+	# As the test fails on binpkg build hosts with no IPv6.
+	use ipv6 && export amanda_cv_working_ipv6=yes
+
+	# I18N
+	myconf="${myconf} `use_enable nls`"
+
+	# Bug #296634: Perl location
+	perl_set_version
+	myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
+
+	# Bug 296633: --disable-syntax-checks
+	# Some tests are not safe for production systems
+	myconf="${myconf} --disable-syntax-checks"
+
+	# build manpages
+	myconf="${myconf} --enable-manpage-build"
+
+	# Bug #636262
+	myconf="${myconf} $(use_with ndmp ndmp)"
+
+	# bug #483120
+	tc-export AR
+
+	econf \
+		$(use_with readline) \
+		${myconf}
+}
+
+src_compile() {
+	# Again, do not want the perl-module src_compile
+	default_src_compile
+}
+
+src_install() {
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source ${TMPENVFILE}
+
+	einfo "Doing stock install"
+	emake DESTDIR="${D}" install
+
+	# Build the envdir file
+	# Don't forget this..
+	einfo "Building environment file"
+	(
+		echo "# These settings are what was present in the environment when this"
+		echo "# Amanda was compiled.  Changing anything below this comment will"
+		echo "# have no effect on your application, but it merely exists to"
+		echo "# preserve them for your next emerge of Amanda"
+		cat "${TMPENVFILE}" | sed "s,=\$,='',g"
+	) >> "${MYFILESDIR}/${ENVDFILE}"
+
+	# Env.d
+	einfo "Installing environment config file"
+	doenvd "${MYFILESDIR}/${ENVDFILE}"
+
+	einfo "Installing systemd service and socket files for Amanda"
+	systemd_dounit "${FILESDIR}"/amanda.socket
+	systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service'
+
+	# Lock down next section (up until docs).
+	insopts -m0640
+	# Installing Amanda Xinetd Services Definition
+	einfo "Installing xinetd service file"
+	insinto /etc/xinetd.d
+	if use minimal ; then
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
+	else
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
+	fi
+
+	if ! use minimal; then
+		einfo "Installing Sample Daily Cron Job for Amanda"
+		insinto /etc/cron.daily
+		newins "${MYFILESDIR}/amanda-cron" amanda
+	fi
+
+	insinto /etc/amanda
+	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
+	doins "${T}/amandahosts"
+	fperms 600 /etc/amanda/amandahosts
+
+	dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts"
+	insinto "${AMANDA_USER_HOMEDIR}"
+	einfo "Installing .profile for ${AMANDA_USER_NAME} user"
+	newins "${MYFILESDIR}/amanda-profile" .profile
+
+	insinto /etc/amanda
+	doins "${S}/example/amanda-client.conf"
+	if ! use minimal ; then
+		insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
+		doins "${S}/example/amanda.conf"
+		doins "${S}/example/disklist"
+		keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
+	fi
+
+	keepdir "${AMANDA_TAR_LISTDIR}"
+	keepdir "${AMANDA_USER_HOMEDIR}/amanda"
+	keepdir "${AMANDA_TMPDIR}/dumps"
+	# Just make sure it exists for XFS to work...
+	use xfs && keepdir /var/xfsdump/inventory
+
+	local i
+	for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
+		"${AMANDA_TMPDIR}" /etc/amanda; do
+		einfo "Securing directory (${i})"
+		fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
+	done
+	# Do NOT use -R
+	fperms 0700 \
+		"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
+		"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
+		 "${AMANDA_USER_HOMEDIR}/amanda" \
+		 /etc/amanda
+
+	if ! use minimal ; then
+		fperms 0700 \
+			 "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
+	         /etc/amanda/${AMANDA_CONFIG_NAME}
+	fi
+
+	einfo "Setting setuid permissions"
+	amanda_permissions_fix "${D}"
+
+	# Relax permissions again
+	insopts -m0644
+
+	# docs
+	einfo "Installing documentation"
+	dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING
+	# our inetd sample
+	einfo "Installing standard inetd sample"
+	newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample
+	# Amanda example configs
+	einfo "Installing example configurations"
+	rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes} || die
+	mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/" || die
+	docinto example1
+	newdoc "${FILESDIR}/example_amanda.conf" amanda.conf
+	newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist
+	newdoc "${FILESDIR}/example_global.conf" global.conf
+
+	einfo "Cleaning up dud .la files"
+	perl_set_version
+	find "${D}"/"${VENDOR_LIB}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
+		TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source "${TMPENVFILE}"
+
+	# Migration of amandates from /etc to $localstatedir/amanda
+	if [ -f "${ROOT}/etc/amandates" -a \
+		! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then
+		einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda"
+		einfo "A backup is also placed at /etc/amandates.orig"
+		cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig" || die
+		mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/" || die
+		cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" || die
+	fi
+	if [ -f "${ROOT}/etc/amandates" ]; then
+		einfo "If you have migrated safely, please delete /etc/amandates"
+	fi
+
+	einfo "Checking setuid permissions"
+	amanda_permissions_fix "${ROOT}"
+
+	elog "You should configure Amanda in /etc/amanda now."
+	elog
+	elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
+	elog "and restart xinetd afterwards!"
+	elog
+	elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample"
+	elog "as an example of how to configure your inetd."
+	elog
+	elog "systemd-users: enable and start amanda.socket or the relevant services"
+	elog "regarding what auth method you use."
+	elog
+	elog "NOTICE: If you need raw access to partitions you need to add the"
+	elog "amanda user to the 'disk' group."
+	elog
+	elog "NOTICE: If you have a tape changer, you need to add the amanda user"
+	elog "to the 'tape' group."
+	elog
+	elog "If you use localhost in your disklist your restores may break."
+	elog "You should replace it with the actual hostname!"
+	elog "Please also see the syntax changes to amandahosts."
+	elog "The only exception is when you use the authentication method 'local'."
+	elog
+	elog "Please note that this package no longer explicitly depends on"
+	elog "virtual/inetd, as it supports modes where an inetd is not needed"
+	elog "(see bug #506028 for details)."
+}
+
+# We have had reports of amanda file permissions getting screwed up.
+# Losing setuid, becoming too lax etc.
+# ONLY root and users in the amanda group should be able to run these binaries!
+amanda_permissions_fix() {
+	local root="$1"
+	[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
+	local le="/usr/libexec/amanda"
+	local i
+	for i in "${le}"/calcsize "${le}"/killpgrp \
+		"${le}"/rundump "${le}"/runtar ; do
+	    [ -e "${root}"/${i} ] || continue
+		chown root:${AMANDA_GROUP_NAME} "${root}"/${i} || die
+		chmod u=srwx,g=rx,o= "${root}"/${i} || die
+	done
+
+	# amanda-security.conf is a config file with similar requirements:
+	# writable only by root
+	# world-readable
+	# 3.3.9: introduced in /etc/amanda-security.conf
+	# 3.4.2: moved to /etc/amanda/amanda-security.conf
+	f=/etc/amanda/amanda-security.conf
+	chown root:root "${root}""${f}" || die
+	chmod u=rw,go=r "${root}""${f}" || die
+}
+
+# We do not want the perl-module tests.
+src_test() {
+	default_src_test
+}
diff --git a/app-backup/amanda/files/amanda-3.3.9-stuck.patch b/app-backup/amanda/files/amanda-3.3.9-stuck.patch
new file mode 100644
index 000000000000..88892e41be3b
--- /dev/null
+++ b/app-backup/amanda/files/amanda-3.3.9-stuck.patch
@@ -0,0 +1,11 @@
+--- a/amanda/server-src/driver.c

++++ b/amanda/server-src/driver.c

+@@ -3957,6 +3957,8 @@

+     driver_debug(2, _("new_data: %lld\n"), (long long)new_data);

+     driver_debug(2, _("data_free: %lld\n"), (long long)data_free);

+ ;

++    tapeq_size -= data_free;

++    tapeq_size += new_data;

+     driver_debug(2, _("tapeq_size: %lld\n"), (long long)tapeq_size);

+ 

+     sched_size = runq_size + tapeq_size + dumpers_size;
\ No newline at end of file
diff --git a/app-backup/amanda/files/amanda-3.4.1-labelstr.patch b/app-backup/amanda/files/amanda-3.4.1-labelstr.patch
new file mode 100644
index 000000000000..b169c8ae6472
--- /dev/null
+++ b/app-backup/amanda/files/amanda-3.4.1-labelstr.patch
@@ -0,0 +1,164 @@
+diff --git a/installcheck/Amanda_Rest_Storages.pl b/installcheck/Amanda_Rest_Storages.pl
+index f3c699b..3e4e889 100644
+--- a/installcheck/Amanda_Rest_Storages.pl
++++ b/installcheck/Amanda_Rest_Storages.pl
+@@ -308,6 +308,7 @@ is_deeply (Installcheck::Rest::remove_source_line($reply),
+ 		'inventory' => [
+ 				 {'current' => 1,
+ 				  'label' => "DISKFLAT-001",
++				  'label_match' => '1',
+ 				  'device_status' => '0',
+ 				  'reserved' => 0,
+ 				  'f_type' => '1',
+@@ -467,6 +468,7 @@ is_deeply (Installcheck::Rest::remove_source_line($reply),
+ 		'label' => 'DISKFLAT-001',
+ 		'datestamp' => '20140509113436',
+ 		'write_protected' => '',
++		'label_match' => '1',
+ 		'process' => 'Amanda::Rest::Storages',
+ 		'running_on' => 'amanda-server',
+ 		'component' => 'rest-server',
+diff --git a/installcheck/amtape.pl b/installcheck/amtape.pl
+index 1a3527f..700c5a2 100644
+--- a/installcheck/amtape.pl
++++ b/installcheck/amtape.pl
+@@ -177,13 +177,13 @@ like($Installcheck::Run::stderr,
+ ok(run('amtape', 'TESTCONF', 'show'),
+     "'amtape TESTCONF show'");
+ like($Installcheck::Run::stderr,
+-    qr/slot +2:.*label MyTape\nslot +3/,
++    qr/slot +2:.*label MyTape \(label do not match labelstr\)\nslot +3/,
+     "'amtape TESTCONF show' ..result correct");
+ 
+ ok(run('amtape', 'TESTCONF', 'show', '2'),
+     "'amtape TESTCONF show'");
+ like($Installcheck::Run::stderr,
+-    qr/^slot +2:.*label MyTape$/,
++    qr/^slot +2:.*label MyTape \(label do not match labelstr\)$/,
+     "'amtape TESTCONF show 2' ..result correct");
+ 
+ ok(run('amtape', 'TESTCONF', 'show', '1,3'),
+@@ -252,13 +252,13 @@ like(run_err('amtape', 'TESTCONF', 'update'),
+ ok(run('amtape', 'TESTCONF', 'show'),
+     "'amtape TESTCONF show'");
+ like($Installcheck::Run::stderr,
+-    qr/slot +2:.*label MyTape\nslot +3/,
++    qr/slot +2:.*label MyTape \(label do not match labelstr\)\nslot +3/,
+     "..result correct");
+ 
+ ok(run('amtape', 'TESTCONF', 'inventory'),
+     "'amtape TESTCONF inventory'");
+ like($Installcheck::Run::stdout,
+-    qr/slot +1: blank\nslot +2: label MyTape \(current\)\nslot +3/,
++    qr/slot +1: blank\nslot +2: label MyTape \(current\) \(label do not match labelstr\)\nslot +3/,
+     "..result correct");
+ 
+ ok(run('amtape', 'TESTCONF', 'taper'),
+diff --git a/perl/Amanda/Changer.pm b/perl/Amanda/Changer.pm
+index 92ed9b6..4b4aad4 100644
+--- a/perl/Amanda/Changer.pm
++++ b/perl/Amanda/Changer.pm
+@@ -60,9 +60,10 @@ sub local_message {
+     } elsif ($self->{'code'} == 1100014) {
+ 	return "$self->{'err'}";
+     } elsif ($self->{'code'} == 1100015) {
+-	return sprintf("slot %3s: date %-14s label %s%s", $self->{'slot'},
++	return sprintf("slot %3s: date %-14s label %s%s%s", $self->{'slot'},
+ 			$self->{'datestamp'}, $self->{'label'},
+-			$self->{'write_protected'}?" (Write protected)":"");
++			$self->{'write_protected'}?" (Write protected)":"",
++			$self->{'label_match'}?"":" (label do not match labelstr)");
+     } elsif ($self->{'code'} == 1100016) {
+ 	return sprintf("slot %3s: unlabeled volume%s", $self->{'slot'},
+ 			 $self->{'write_protected'}?" (Write protected)":"");
+@@ -2014,6 +2015,13 @@ sub show {
+ 	    my $st = $dev->read_label();
+ 	    my $write_protected = !$dev->check_writable();
+ 	    if ($st == $DEVICE_STATUS_SUCCESS) {
++		my $label_match = match_labelstr(
++					$self->{'storage'}->{'labelstr'},
++					$self->{'storage'}->{'autolabel'},
++					$dev->volume_label(),
++					$res->{'barcode'},
++					$res->{'meta'},
++					$self->{'storage'}->{'storage_name'});
+ 		$params{'user_msg'}->(Amanda::Changer::Message->new(
+ 					source_filename => __FILE__,
+ 					source_line => __LINE__,
+@@ -2022,7 +2030,8 @@ sub show {
+ 					slot   => $last_slot,
+ 					datestamp  => $dev->volume_time(),
+ 					label  => $dev->volume_label(),
+-					write_protected => $write_protected));
++					write_protected => $write_protected,
++					label_match => $label_match));
+ 	    } elsif ($st == $DEVICE_STATUS_VOLUME_UNLABELED) {
+ 		$params{'user_msg'}->(Amanda::Changer::Message->new(
+ 					source_filename => __FILE__,
+diff --git a/perl/Amanda/Rest/Storages.pm b/perl/Amanda/Rest/Storages.pm
+index 680115b..b1b59d2 100644
+--- a/perl/Amanda/Rest/Storages.pm
++++ b/perl/Amanda/Rest/Storages.pm
+@@ -436,6 +436,17 @@ sub inventory {
+ 		    $inv->{'retention_type'} = $tl->get_retention_name($retention_type);
+ 		}
+ 	    }
++	    for my $inv (@$inventory) {
++		if ($inv->{label}) {
++		    $inv->{'label_match'} = Amanda::Util::match_labelstr(
++				$storage->{'labelstr'},
++				$storage->{'autolabel'},
++				$inv->{'label'},
++				$inv->{'barcode'},
++				$inv->{'metae'},
++				$storage->{'storage_name'});
++		}
++	    }
+ 	    push @result_messages, Amanda::Changer::Message->new(
+ 				source_filename => __FILE__,
+ 				source_line     => __LINE__,
+diff --git a/server-src/amtape.pl b/server-src/amtape.pl
+index b63607e..d06eefe 100644
+--- a/server-src/amtape.pl
++++ b/server-src/amtape.pl
+@@ -30,7 +30,7 @@ use Text::Wrap;
+ use Amanda::Device qw( :constants );
+ use Amanda::Debug qw( :logging );
+ use Amanda::Config qw( :init :getconf config_dir_relative );
+-use Amanda::Util qw( :constants );
++use Amanda::Util qw( :constants match_labelstr );
+ use Amanda::Storage;
+ use Amanda::Changer;
+ use Amanda::Constants;
+@@ -219,6 +219,7 @@ sub {
+ 	for my $sl (@$inv) {
+ 	    my $line = "slot $sl->{slot}:";
+ 	    my $tle;
++	    my $meta;
+ 	    if ($sl->{'state'} == Amanda::Changer::SLOT_EMPTY) {
+ 		$line .= " empty";
+ 	    } elsif (!defined($sl->{device_status}) && !defined($sl->{label})) {
+@@ -230,6 +231,7 @@ sub {
+ 		    if (defined $tle) {
+ 			if ($tle->{'meta'}) {
+ 				$line .= " ($tle->{'meta'})";
++				$meta = $tle->{'meta'};
+ 			}
+ 		    }
+ 		} elsif ($sl->{'device_status'} == $DEVICE_STATUS_VOLUME_UNLABELED) {
+@@ -263,6 +265,15 @@ sub {
+ 		    $line .= " [device error]";
+ 		}
+ 	    }
++	    if ($sl->{'label'}) {
++		if (!match_labelstr($storage->{'labelstr'},
++				    $storage->{'autolabel'},
++				    $sl->{label},
++				    $sl->{'barcode'}, $meta,
++				    $storage->{'storage_name'})) {
++		    $line .= " (label do not match labelstr)";
++		}
++	    }
+ 	    if (defined $tle) {
+ 		my $retention_type = Amanda::Tapelist::get_retention_type($tle->{pool}, $tle->{label});
+ 		$line .= " [" . $tl->get_retention_name($retention_type) . "]";
diff --git a/app-backup/amanda/files/amanda-3.4.1-slots.patch b/app-backup/amanda/files/amanda-3.4.1-slots.patch
new file mode 100644
index 000000000000..1e4e583ecc26
--- /dev/null
+++ b/app-backup/amanda/files/amanda-3.4.1-slots.patch
@@ -0,0 +1,16 @@
+diff --git a/perl/Amanda/Changer/aggregate.pm b/perl/Amanda/Changer/aggregate.pm
+index a2bd962..ecf9d28 100644
+--- a/perl/Amanda/Changer/aggregate.pm
++++ b/perl/Amanda/Changer/aggregate.pm
+@@ -391,7 +391,10 @@ sub info_key {
+ 	    my $kid = 0;
+ 	    for (@$kid_results) {
+ 		my ($err, %kid_info) = @$_;
+-		next unless exists($kid_info{'slots'});
++		if (!exists($kid_info{'slots'})){
++		    $kid++;
++		    next;
++		}
+ 		my $kid_slots = $kid_info{'slots'};
+ 		push @slots, map "$kid:$_", @{$kid_slots};
+ 		$kid++;
diff --git a/app-backup/amanda/files/amanda-amandahosts-client-2.5.1_p3-r1 b/app-backup/amanda/files/amanda-amandahosts-client-2.5.1_p3-r1
new file mode 100644
index 000000000000..570a71056b47
--- /dev/null
+++ b/app-backup/amanda/files/amanda-amandahosts-client-2.5.1_p3-r1
@@ -0,0 +1,8 @@
+# vim: ts=4 sts=4 sw=4 noexpandtab:
+# Machine-name for those hosts which are permitted to back up (fully-qualified
+# is best).  An entry in /etc/hosts adds fail-safe against DNS death :-)
+# |
+# |                                     permitted user-name
+# |                                     |
+
+__AMANDA_SERVER__			__AMANDA_USER_NAME__ amdump
diff --git a/app-backup/amanda/files/amanda-amandahosts-server-2.5.1_p3-r1 b/app-backup/amanda/files/amanda-amandahosts-server-2.5.1_p3-r1
new file mode 100644
index 000000000000..4951d4a9bf7d
--- /dev/null
+++ b/app-backup/amanda/files/amanda-amandahosts-server-2.5.1_p3-r1
@@ -0,0 +1,8 @@
+# vim: ts=4 sts=4 sw=4 noexpandtab:
+# Machine-name for those hosts which are permitted to back up (fully-qualified
+# is best).  An entry in /etc/hosts adds fail-safe against DNS death :-)
+# |
+# |                                     permitted user-name
+# |                                     |
+
+__AMANDA_SERVER__			root amindexd amidxtaped
diff --git a/app-backup/amanda/files/amanda-cron b/app-backup/amanda/files/amanda-cron
new file mode 100644
index 000000000000..a5524dc2e3a1
--- /dev/null
+++ b/app-backup/amanda/files/amanda-cron
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# This is a sample cron job to kick off backups with amanda.
+
+# Run the tape tests on DailySet first, and if ok, then kick off backups
+# Mail error reports to root
+
+# Ensure TAPE is set to your tape drive for mt to work, ie. TAPE="/dev/st0"
+
+ADMIN_EMAIL="root@localhost"
+
+/usr/sbin/amcheck -t -m -M"${ADMIN_EMAIL}" __AMANDA_CONFIG_NAME__ && \
+( /usr/sbin/amdump __AMANDA_CONFIG_NAME__ ; /usr/sbin/mt eject )
diff --git a/app-backup/amanda/files/amanda-devfs b/app-backup/amanda/files/amanda-devfs
new file mode 100644
index 000000000000..f02eb3ffc477
--- /dev/null
+++ b/app-backup/amanda/files/amanda-devfs
@@ -0,0 +1,7 @@
+# raw access to partitions for amanda
+#REGISTER   ^scsi/host.*/bus.*/target.*/lun.*/part[0-9]    PERMISSIONS root.disk 660"
+#REGISTER   ^ide/host.*/bus.*/target.*/lun.*/part[0-9]    PERMISSIONS root.disk 660"
+
+# allow amanda to have access to tape changers
+#REGISTER   ^scsi/host.*/bus.*/target.*/lun.*/generic      PERMISSIONS root.disk 660
+						
diff --git a/app-backup/amanda/files/amanda-inetd.amanda.sample-2.6.0_p2-r2 b/app-backup/amanda/files/amanda-inetd.amanda.sample-2.6.0_p2-r2
new file mode 100644
index 000000000000..e2aa3429d4a4
--- /dev/null
+++ b/app-backup/amanda/files/amanda-inetd.amanda.sample-2.6.0_p2-r2
@@ -0,0 +1,3 @@
+amanda	dgram	udp	wait	amanda	/usr/libexec/amanda/amandad	amandad -auth=bsd amdump amindexd amidxtaped
+amandaidx	stream	tcp	nowait	amanda	/usr/libexec/amanda/amindexd	amindexd -auth=bsd amdump amindexd amidxtaped
+amidxtape	stream	tcp	nowait	amanda	/usr/libexec/amanda/amidxtaped	amidxtaped -auth=bsd amdump amindexd amidxtaped
diff --git a/app-backup/amanda/files/amanda-profile b/app-backup/amanda/files/amanda-profile
new file mode 100644
index 000000000000..d8e132bf10f8
--- /dev/null
+++ b/app-backup/amanda/files/amanda-profile
@@ -0,0 +1 @@
+export PATH=/sbin:/usr/sbin:/usr/libexec:${PATH}
diff --git a/app-backup/amanda/files/amanda-xinetd-2.6.1_p1-client b/app-backup/amanda/files/amanda-xinetd-2.6.1_p1-client
new file mode 100644
index 000000000000..ed73c03cd14f
--- /dev/null
+++ b/app-backup/amanda/files/amanda-xinetd-2.6.1_p1-client
@@ -0,0 +1,19 @@
+# These are the services needed for amanda.
+# Default is to talk to localhost only unless 
+# AMANDA_SERVER was specified at build time.
+
+service amanda
+{
+        socket_type     = dgram
+        protocol        = udp
+        wait            = yes
+        user            = __AMANDA_USER_NAME__
+        group           = __AMANDA_GROUP_NAME__
+        groups          = yes
+        server          = /usr/libexec/amanda/amandad
+        server_args     = -auth=bsd amdump
+        # You need to ensure this points to your Amanda server!
+        # Don't just remove it!
+        only_from       = __AMANDA_SERVER__
+        disable         = yes
+}
diff --git a/app-backup/amanda/files/amanda-xinetd-2.6.1_p1-server b/app-backup/amanda/files/amanda-xinetd-2.6.1_p1-server
new file mode 100644
index 000000000000..269198e0379b
--- /dev/null
+++ b/app-backup/amanda/files/amanda-xinetd-2.6.1_p1-server
@@ -0,0 +1,19 @@
+# These are the services needed for amanda.
+# Default is to talk to localhost only unless 
+# AMANDA_SERVER was specified at build time.
+
+service amanda
+{
+        socket_type     = dgram
+        protocol        = udp
+        wait            = yes
+        user            = __AMANDA_USER_NAME__
+        group           = __AMANDA_GROUP_NAME__
+        groups          = yes
+        server          = /usr/libexec/amanda/amandad
+        server_args     = -auth=bsd amdump amindexd amidxtaped
+        # You need to ensure this points to your Amanda server!
+        # Don't just remove it!
+        only_from       = __AMANDA_SERVER__
+        disable         = yes
+}
diff --git a/app-backup/amanda/files/amanda.service b/app-backup/amanda/files/amanda.service
new file mode 100644
index 000000000000..b1f67dbc5d63
--- /dev/null
+++ b/app-backup/amanda/files/amanda.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Amanda Backup System
+After=local-fs.target
+
+[Service]
+User=amanda
+Group=amanda
+ExecStart=/usr/libexec/amanda/amandad -auth=bsdtcp amdump
+StandardInput=socket
+StandardOutput=socket
diff --git a/app-backup/amanda/files/amanda.service-r1 b/app-backup/amanda/files/amanda.service-r1
new file mode 100644
index 000000000000..a605eb487bf0
--- /dev/null
+++ b/app-backup/amanda/files/amanda.service-r1
@@ -0,0 +1,10 @@
+[Unit]
+Description=Amanda Backup System
+After=local-fs.target
+
+[Service]
+User=amanda
+Group=amanda
+ExecStart=/usr/libexec/amanda/amandad -auth=bsdtcp amdump amindexd amidxtaped
+StandardInput=socket
+StandardOutput=socket
diff --git a/app-backup/amanda/files/amanda.socket b/app-backup/amanda/files/amanda.socket
new file mode 100644
index 000000000000..baf807915c0d
--- /dev/null
+++ b/app-backup/amanda/files/amanda.socket
@@ -0,0 +1,7 @@
+[Unit]
+Description=Amanda Socket
+[Socket]
+ListenStream=10080
+Accept=true
+[Install]
+WantedBy=sockets.target
diff --git a/app-backup/amanda/files/example_amanda.conf b/app-backup/amanda/files/example_amanda.conf
new file mode 100644
index 000000000000..947625e8ebbc
--- /dev/null
+++ b/app-backup/amanda/files/example_amanda.conf
@@ -0,0 +1,44 @@
+# type "man amanda" 
+
+org		"example"
+mailto		"root@localhost"
+
+dumpcycle	7
+runspercycle	-1
+tapecycle	7
+
+dumpuser	"amanda"
+printer		"lp"
+
+#tpchanger	"chg-manual"
+tapedev		"/dev/nst0"
+
+runtapes	1
+labelstr	"^EXAMPLE-[0-9][0-9]*$"
+tapetype	DDS4-PRINT
+
+ctimeout	60
+dtimeout	3600
+etimeout	600
+
+netusage	2000
+inparallel	10
+
+dumporder	"tttTTTTTTT"
+maxdumps	10
+bumpsize	10
+bumpmult	1.5
+bumpdays	1
+
+diskfile	"/etc/amanda/example/disklist"
+infofile	"/etc/amanda/example/curinfo"
+logdir		"/etc/amanda/example"
+indexdir	"/etc/amanda/example/index"
+tapelist	"tapelist"
+
+tapebufs	20
+reserve		100
+autoflush	off
+
+includefile	"/etc/amanda/global.conf"
+
diff --git a/app-backup/amanda/files/example_disklist-2.5.1_p3-r1 b/app-backup/amanda/files/example_disklist-2.5.1_p3-r1
new file mode 100644
index 000000000000..73bf0174ee23
--- /dev/null
+++ b/app-backup/amanda/files/example_disklist-2.5.1_p3-r1
@@ -0,0 +1,4 @@
+# Substitute <HOSTNAME> with the FQDN of your Amanda-client here.
+# The usage of localhost will *break* your restores.
+<HOSTNAME> hda1 normal local
+<HOSTNAME> hda3	normal local
diff --git a/app-backup/amanda/files/example_global.conf b/app-backup/amanda/files/example_global.conf
new file mode 100644
index 000000000000..728739850940
--- /dev/null
+++ b/app-backup/amanda/files/example_global.conf
@@ -0,0 +1,78 @@
+holdingdisk hd1 {
+    comment	"main holding disk"
+    directory	"/tmp/amanda/dumps"
+    use		-1 Gb
+    chunksize	500 Mb
+}
+
+define dumptype normal {
+    auth	BSD
+    comment	"Normal backup, compression"
+    comprate	0.50, 0.50
+    compress	client best
+    index	yes
+    priority	high
+    program	"GNUTAR"
+    record	yes
+    strategy	STANDARD
+    holdingdisk	yes
+}
+
+define dumptype compress-server {
+    auth	BSD
+    comment	"Normal backup, compression"
+    comprate	0.50, 0.50
+    compress	server best
+    index	yes
+    priority	high
+    program	"GNUTAR"
+    record	yes
+    strategy	STANDARD
+    holdingdisk	yes
+}
+
+define dumptype normal-no_hold {
+    normal
+    holdingdisk	no
+}
+
+define tapetype DDS4 {
+    comment "Seagate Scorpion 40"
+    length 16432 mbytes
+    filemark 0 kbytes
+    speed 2267 kps
+}
+
+define tapetype DDS4-PRINT {
+    comment "Seagate Scorpion 40 with printer"
+    length 16432 mbytes
+    filemark 0 kbytes
+    speed 2267 kps
+    lbl-templ "/etc/amanda/lbl/DIN-A4.ps"
+}
+
+define tapetype DDS2 {
+    comment "HP DAT C1533A"
+    length 1845 mbytes
+    filemark 0 kbytes
+    speed 480 kps
+}
+
+define tapetype DDS1 {
+    comment "HP DAT HP35480A"
+    length 1845 mbytes
+    filemark 32 kbytes
+    speed 174 kps
+}
+
+define interface local {
+    comment "local disk"
+    use 4000 kbps
+}
+
+define interface eth1 {
+    comment "100 Mbps ethernet"
+    use 1000 kbps
+}
+
+
diff --git a/app-backup/amanda/metadata.xml b/app-backup/amanda/metadata.xml
new file mode 100644
index 000000000000..5846584c7a1f
--- /dev/null
+++ b/app-backup/amanda/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>lists@xunil.at</email>
+		<name>Stefan G. Weichinger</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>dustin@v.igoro.us</email>
+		<description>Upstream. Please CC on bugs.</description>
+		<name>Dustin J. Mitchell</name>
+	</maintainer>
+	<use>
+		<flag name="xfs">Support for backing up raw XFS filesystems using xfsdump</flag>
+		<flag name="s3">Support for backing up to the Amazon S3 system</flag>
+		<flag name="ndmp">Support for the NDMP protocol</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">amanda</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-backup/attic-0.16-r1 b/app-backup/attic-0.16-r1
deleted file mode 100644
index 235e437ee916..000000000000
--- a/app-backup/attic-0.16-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/msgpack[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-python/llfuse[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Attic is a deduplicating backup program written in Python.
-EAPI=5
-HOMEPAGE=https://attic-backup.org/
-IUSE=libressl python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/msgpack[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-python/llfuse[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/jborg/attic/archive/0.16.tar.gz -> attic-0.16.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=90296cbf47dd1a633132271bdc18c50e
diff --git a/app-backup/attic-9999 b/app-backup/attic-9999
deleted file mode 100644
index 990bfd475c5d..000000000000
--- a/app-backup/attic-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/msgpack[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-python/llfuse[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Attic is a deduplicating backup program written in Python.
-EAPI=5
-HOMEPAGE=https://attic-backup.org/
-IUSE=libressl python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-LICENSE=BSD
-RDEPEND=dev-python/msgpack[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-python/llfuse[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=90296cbf47dd1a633132271bdc18c50e
diff --git a/app-backup/attic/Manifest b/app-backup/attic/Manifest
new file mode 100644
index 000000000000..af233a25094b
--- /dev/null
+++ b/app-backup/attic/Manifest
@@ -0,0 +1,4 @@
+DIST attic-0.16.tar.gz 87985 BLAKE2B cc801d8e3b28f6041c053f368c1d5ab00b1b419928d6a84647da7dccb7fb46b477898249873e90ba15c721468c09ae243d450fc978fe8cc3947b2c2e035f2aae SHA512 16139cd93bff59414cc1ce3fd68e2dd0aed4937a20bd1003880961ad2e239a1e982fd0d4f6b791165464213b88dea6ccd8e5e59d2087809be2e1bfdfd3b3186c
+EBUILD attic-0.16-r1.ebuild 930 BLAKE2B 95e95acd781abdab3aaacb913e49868b151eb6b75466d1afc8e821dab9c2147f80fa6129c78f220f96bc7a6475d0d98df804b3c5b4662f970080cc5689ebc0e6 SHA512 101fe0fde2f48e9ceecf21efca1735d6466deb3dde7c10c45f52f8f076f95858b1ea8adcfc432b4eda87bebf3d3dcf529646a1acf1074daeb17857def8bf135a
+EBUILD attic-9999.ebuild 930 BLAKE2B 95e95acd781abdab3aaacb913e49868b151eb6b75466d1afc8e821dab9c2147f80fa6129c78f220f96bc7a6475d0d98df804b3c5b4662f970080cc5689ebc0e6 SHA512 101fe0fde2f48e9ceecf21efca1735d6466deb3dde7c10c45f52f8f076f95858b1ea8adcfc432b4eda87bebf3d3dcf529646a1acf1074daeb17857def8bf135a
+MISC metadata.xml 328 BLAKE2B 4b8c33c80a1e860ec347a8735aad642c9dc441f87b20c588dde534be6d4f9b6981a07314f0643769537ce946f1397eee20801d381c2632d5c98a1d6db12a00cd SHA512 2c24d7eaef0da74758f5726e2b88d2dc11db8a2ea3999abee9305c5e66b236b50d56034d5fae9a7b1d9caa98c7fa3aa54dd06d5279b3a636532010130e40f36a
diff --git a/app-backup/attic/attic-0.16-r1.ebuild b/app-backup/attic/attic-0.16-r1.ebuild
new file mode 100644
index 000000000000..7734e651f958
--- /dev/null
+++ b/app-backup/attic/attic-0.16-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/jborg/attic.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/jborg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Attic is a deduplicating backup program written in Python."
+HOMEPAGE="https://attic-backup.org/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="libressl"
+
+RDEPEND="
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	dev-python/llfuse[${PYTHON_USEDEP}]"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	${RDEPEND}"
+
+python_prepare_all() {
+	# allow use of new (renamed) msgpack
+	sed -i '/msgpack/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/app-backup/attic/attic-9999.ebuild b/app-backup/attic/attic-9999.ebuild
new file mode 100644
index 000000000000..7734e651f958
--- /dev/null
+++ b/app-backup/attic/attic-9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/jborg/attic.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/jborg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Attic is a deduplicating backup program written in Python."
+HOMEPAGE="https://attic-backup.org/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="libressl"
+
+RDEPEND="
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	dev-python/llfuse[${PYTHON_USEDEP}]"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	${RDEPEND}"
+
+python_prepare_all() {
+	# allow use of new (renamed) msgpack
+	sed -i '/msgpack/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/app-backup/attic/metadata.xml b/app-backup/attic/metadata.xml
new file mode 100644
index 000000000000..3cefbbec9038
--- /dev/null
+++ b/app-backup/attic/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jborg/attic</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-backup/backintime-1.2.0_pre20180221 b/app-backup/backintime-1.2.0_pre20180221
deleted file mode 100644
index 9636d61a9fc8..000000000000
--- a/app-backup/backintime-1.2.0_pre20180221
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/keyring[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] net-misc/openssh net-misc/rsync[xattr,acl] >=sys-apps/sed-4
-DESCRIPTION=Backup system inspired by TimeVault and FlyBack
-EAPI=6
-HOMEPAGE=https://backintime.readthedocs.io/ https://github.com/bit-team/backintime/
-IUSE=qt5 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/keyring[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] net-misc/openssh net-misc/rsync[xattr,acl] qt5? ( dev-python/PyQt5 )
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/bit-team/backintime/archive/45ec81c185789b2dbafd7348d1af039b5183c9ff.tar.gz -> backintime-1.2.0_pre20180221.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e7b98f855fc94e558ff729f1f4add7fd
diff --git a/app-backup/backintime-9999 b/app-backup/backintime-9999
deleted file mode 100644
index 16d8d517c0cd..000000000000
--- a/app-backup/backintime-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/keyring[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] net-misc/openssh net-misc/rsync[xattr,acl] >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Backup system inspired by TimeVault and FlyBack
-EAPI=6
-HOMEPAGE=https://backintime.readthedocs.io/ https://github.com/bit-team/backintime/
-IUSE=qt5 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/keyring[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] net-misc/openssh net-misc/rsync[xattr,acl] qt5? ( dev-python/PyQt5 )
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=426ae716d3cd2c911eaf1ae3ce68c0f7
diff --git a/app-backup/backintime/Manifest b/app-backup/backintime/Manifest
new file mode 100644
index 000000000000..16341a967afe
--- /dev/null
+++ b/app-backup/backintime/Manifest
@@ -0,0 +1,4 @@
+DIST backintime-1.2.0_pre20180221.tar.gz 712330 BLAKE2B 9ba40c5f89b9fbdf0b1c381bf2e3edce13553b2c301792627fc037bd2de181804b2dc6cad6e78a02844f8835dcd6415a35590125e832d55187fa2ed1a5fa864b SHA512 ad1bb11ea411904027952809c577de1a5317f40430af9b91b16a2c157d560c72b65c879bb880b557e9b5e333e76a44977a26486f4ed4f45281a5e8b0d4583c2a
+EBUILD backintime-1.2.0_pre20180221.ebuild 1833 BLAKE2B dd1cb47f69f160df1ea0ae5cb60276001517cbc4647ede66d4bc55351c65012eb105fc63bbac81dd2f3321f90f7f078f75ecfaa07f1f4c9fd550902ecb90e059 SHA512 00f3dbace06bb8609dd14bc1253deb505f63a97685e32fa3ade6c89e226ebd52f7c3b0be97b8713e86f270517eaad284b9298c1b3cb3f90a885a2966ebb21305
+EBUILD backintime-9999.ebuild 1742 BLAKE2B 2f898508c8297374a05f3c5a69bd5cdc1ca306729a1ee79fed8d60d319b2f4ff788a882bc789fd1be6c9a8d61413a84b2b055b55dead2845f68c317960065867 SHA512 acbbee1a19b0c627cfe7268770e1c51d41059c375ed022d94983b530d06f83e5d05f53a189a0a3e844d8baf77fb1df2ef62312e583dcd94245215ae3ae6b2015
+MISC metadata.xml 716 BLAKE2B 469a4318ff5607d74bb1d2166feba52686891921e59c117e15d54057eeafc1d5d3a2c9232e434c3783b04716b8784fcd092bc2d77553e1e56d27939ffb89dd50 SHA512 377471e000a0cb8f034f7c6a20596e48f7fe380c7910f0a97b6a47b779eb466efb6a02b4eef10569a9b9baf7e3eca03d6e22f87e36e4f11836ffb05fa38f7f0a
diff --git a/app-backup/backintime/backintime-1.2.0_pre20180221.ebuild b/app-backup/backintime/backintime-1.2.0_pre20180221.ebuild
new file mode 100644
index 000000000000..1b1e607dc857
--- /dev/null
+++ b/app-backup/backintime/backintime-1.2.0_pre20180221.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+COMMIT=45ec81c185789b2dbafd7348d1af039b5183c9ff
+inherit python-single-r1 gnome2-utils vcs-snapshot
+
+DESCRIPTION="Backup system inspired by TimeVault and FlyBack"
+HOMEPAGE="https://backintime.readthedocs.io/ https://github.com/bit-team/backintime/"
+SRC_URI="https://github.com/bit-team/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="qt5"
+
+DEPEND="${PYTHON_DEPS}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	net-misc/openssh
+	net-misc/rsync[xattr,acl]"
+RDEPEND="${DEPEND}
+	qt5? ( dev-python/PyQt5 )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	#fix doc install location
+	sed -e "s:/doc/${PN}-common:/doc/${PF}:g" \
+		-i common/configure || die
+	sed -e "s:/doc/${PN}-qt:/doc/${PF}:g" \
+		-i qt/configure || die
+	sed -e "/addInstallFile \"..\/VERSION/d" \
+		-e "/addInstallFile \"..\/LICENSE/d" \
+		-e "/addInstallFile \"..\/debian\/copyright/d" \
+		-i {qt,common}/configure || die
+
+	if [ -n ${LINGUAS+x} ] ; then
+		cd common/po || die
+		for po in *.po ; do
+			if ! has ${po/.po} ${LINGUAS} ; then
+				rm ${po} || die
+			fi
+		done
+	fi
+
+	default
+}
+
+src_configure() {
+	cd "${S}"/common || die
+	./configure --python3 --no-fuse-group || die
+	if use qt5 ; then
+		cd "${S}"/qt || die
+		./configure --python3 || die
+	fi
+}
+
+src_compile() {
+	cd "${S}"/common || die
+	emake
+	if use qt5 ; then
+		cd "${S}"/qt || die
+		emake
+	fi
+}
+
+src_install() {
+	cd "${S}"/common || die
+	emake DESTDIR="${D}" install
+	if use qt5 ; then
+		cd "${S}"/qt || die
+		emake DESTDIR="${D}" install
+	fi
+
+	python_optimize "${D}"
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-backup/backintime/backintime-9999.ebuild b/app-backup/backintime/backintime-9999.ebuild
new file mode 100644
index 000000000000..9fcb400d83e9
--- /dev/null
+++ b/app-backup/backintime/backintime-9999.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit python-single-r1 gnome2-utils git-r3
+
+DESCRIPTION="Backup system inspired by TimeVault and FlyBack"
+HOMEPAGE="https://backintime.readthedocs.io/ https://github.com/bit-team/backintime/"
+EGIT_REPO_URI="https://github.com/bit-team/backintime/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="qt5"
+
+DEPEND="${PYTHON_DEPS}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	net-misc/openssh
+	net-misc/rsync[xattr,acl]"
+RDEPEND="${DEPEND}
+	qt5? ( dev-python/PyQt5 )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	#fix doc install location
+	sed -e "s:/doc/${PN}-common:/doc/${PF}:g" \
+		-i common/configure || die
+	sed -e "s:/doc/${PN}-qt:/doc/${PF}:g" \
+		-i qt/configure || die
+	sed -e "/addInstallFile \"..\/VERSION/d" \
+		-e "/addInstallFile \"..\/LICENSE/d" \
+		-e "/addInstallFile \"..\/debian\/copyright/d" \
+		-i {qt,common}/configure || die
+
+	if [ -n ${LINGUAS+x} ] ; then
+		cd common/po || die
+		for po in *.po ; do
+			if ! has ${po/.po} ${LINGUAS} ; then
+				rm ${po} || die
+			fi
+		done
+	fi
+
+	default
+}
+
+src_configure() {
+	cd "${S}"/common || die
+	./configure --python3 --no-fuse-group || die
+	if use qt5 ; then
+		cd "${S}"/qt || die
+		./configure --python3 || die
+	fi
+}
+
+src_compile() {
+	cd "${S}"/common || die
+	emake
+	if use qt5 ; then
+		cd "${S}"/qt || die
+		emake
+	fi
+}
+
+src_install() {
+	cd "${S}"/common || die
+	emake DESTDIR="${D}" install
+	if use qt5 ; then
+		cd "${S}"/qt || die
+		emake DESTDIR="${D}" install
+	fi
+
+	python_optimize "${D}"
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-backup/backintime/metadata.xml b/app-backup/backintime/metadata.xml
new file mode 100644
index 000000000000..1e5022f0fbce
--- /dev/null
+++ b/app-backup/backintime/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<longdescription lang="en">
+		Back In Time is a simple backup tool for Linux inspired from "flyback project" and "TimeVault". The backup is done by taking snapshots of a specified set of directories.
+		Currently there are two GUI available: Gnome and KDE 4 (&gt;= 4.1).
+
+		All you have to do is configure:
+		* Where to save snapshot
+		* What directories to backup
+		* When backup should be done (manual, every hour, every day, every week, every month)
+	</longdescription>
+</pkgmetadata>
diff --git a/app-backup/backup-manager-0.7.14 b/app-backup/backup-manager-0.7.14
deleted file mode 100644
index 48dadef8fdc2..000000000000
--- a/app-backup/backup-manager-0.7.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-lang/perl:= sys-devel/gettext
-DESCRIPTION=Backup Manager is a command line backup tool for GNU/Linux
-EAPI=6
-HOMEPAGE=https://github.com/sukria/Backup-Manager
-IUSE=s3
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl:= sys-devel/gettext s3? ( dev-perl/Net-Amazon-S3 dev-perl/File-Slurp )
-SLOT=0
-SRC_URI=https://github.com/sukria/Backup-Manager/archive/0.7.14.tar.gz -> backup-manager-0.7.14.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=38bfb5c9597534cd1bc958142f30abb8
diff --git a/app-backup/backup-manager/Manifest b/app-backup/backup-manager/Manifest
new file mode 100644
index 000000000000..c3979a788793
--- /dev/null
+++ b/app-backup/backup-manager/Manifest
@@ -0,0 +1,3 @@
+DIST backup-manager-0.7.14.tar.gz 144568 BLAKE2B 55447e3132996146935a0a46ce2786633a78ca4cc5db780348c1c0a34d429bf232c26685d660a60eca2b7ee6a2329f4b008b7ba995c9e0c16deaa9d85e642d3b SHA512 7956f39446ffcd39ec2baff0f5599f15e549abac570806905768bac09d431a88a9826a8e30e02e6f5c6186f19b02d50d5101ce5c22a91a43e6d0772e4db57f2f
+EBUILD backup-manager-0.7.14.ebuild 961 BLAKE2B 7f6becc16c797a72d242a09a4a5132f21ea7017489ef55a8b52288aaec0da3f6754cd696a61a65e1b65af7e21a63d204f80849330090832a040ce7d07a2da642 SHA512 795a27a6a3aee684e14f232ee52beb8d1d0c2bf6df6f0bc418f79879a1bcbeb844f193ae5ac88e76a99cce567188fe12ccec55d3969a87085752a1f091e6939c
+MISC metadata.xml 712 BLAKE2B 4cc19a2ccd6ad653a99aa14d101cb0ca3ecbb35eaef29383853750b6e54ad930b47f26022a88f77cc639d584e7994948f074d52401e74c872511a41954639477 SHA512 1b3d8f5cdfd07addebff36b791717228cedfa17fba5f00d142a0ce702c02644b98cfb9bfc04f3795758d91539ad645dd1fa376c54f95ebe42b5cd971cc5a669c
diff --git a/app-backup/backup-manager/backup-manager-0.7.14.ebuild b/app-backup/backup-manager/backup-manager-0.7.14.ebuild
new file mode 100644
index 000000000000..c6fc90f2cb0e
--- /dev/null
+++ b/app-backup/backup-manager/backup-manager-0.7.14.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+MY_P=Backup-Manager-${PV}
+DESCRIPTION="Backup Manager is a command line backup tool for GNU/Linux"
+HOMEPAGE="https://github.com/sukria/Backup-Manager"
+SRC_URI="https://github.com/sukria/Backup-Manager/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="s3"
+
+DEPEND="dev-lang/perl:=
+	sys-devel/gettext"
+
+RDEPEND="${DEPEND}
+	s3? ( dev-perl/Net-Amazon-S3
+		dev-perl/File-Slurp )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -e "/^PERL5DIR/s/sitelib/vendorlib/" \
+		-e "/sed/s:=\$(DESTDIR)/:=:" \
+		-i Makefile || die
+
+	default
+}
+
+src_compile() {
+	default
+	emake -C po
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+
+	dodir /etc
+	cp -a "${D}"/usr/share/backup-manager/backup-manager.conf.tpl "${D}"/etc/backup-manager.conf || die
+	chmod 0600 "${D}"/etc/backup-manager.conf || die
+}
diff --git a/app-backup/backup-manager/metadata.xml b/app-backup/backup-manager/metadata.xml
new file mode 100644
index 000000000000..3226a9a10578
--- /dev/null
+++ b/app-backup/backup-manager/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>command line backup tool, designed to help make daily archives of the file system. It can make archives in lots of open formats (tar, gzip, bzip2, lzma, dar, zip) and provides interesting features (such as network exports or CD/DVD automated-burning)</longdescription>
+	<use>
+		<flag name="s3">Support for backing up to the Amazon S3 system</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">sukria/Backup-Manager</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-backup/backupninja-1.0.1 b/app-backup/backupninja-1.0.1
deleted file mode 100644
index c1cc6e3b39d8..000000000000
--- a/app-backup/backupninja-1.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=lightweight, extensible meta-backup system
-EAPI=6
-HOMEPAGE=http://riseuplabs.org/backupninja/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-util/dialog
-SLOT=0
-SRC_URI=https://labs.riseup.net/code/attachments/download/275/backupninja-1.0.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=05772c7780f0467024e7b2180174d625
diff --git a/app-backup/backupninja-1.0.1-r1 b/app-backup/backupninja-1.0.1-r1
deleted file mode 100644
index bb3a244abc1a..000000000000
--- a/app-backup/backupninja-1.0.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=lightweight, extensible meta-backup system
-EAPI=6
-HOMEPAGE=http://riseuplabs.org/backupninja/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-util/dialog
-SLOT=0
-SRC_URI=https://labs.riseup.net/code/attachments/download/275/backupninja-1.0.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c5deed87a52e0f08feaba1ac69ab3920
diff --git a/app-backup/backupninja/Manifest b/app-backup/backupninja/Manifest
new file mode 100644
index 000000000000..5a97429fbbb2
--- /dev/null
+++ b/app-backup/backupninja/Manifest
@@ -0,0 +1,4 @@
+DIST backupninja-1.0.1.tar.gz 167991 BLAKE2B 736ded9f562e894ec74e78afb9677f61889c18310b5aabe76dab7aafd550653281fc8641b416c022d49062261d67f8e6ed2aeef9c9b7054b3538c5be983bf424 SHA512 24b898526c1efa91cde6b1a0f0f7c0820c7db5b11ea36f458b45a91e94adfc77636421d7ad2245c196999886a06a3be43253e52654bc07423b1ac5571275c580
+EBUILD backupninja-1.0.1-r1.ebuild 610 BLAKE2B ef6cbef8953b4eab113a272b6da06f24b9affaefd3135547b0a20ace6ebb085fbff642fbffee5a34416817dd52220f40abba44e11f8f0260217eb4200c274de2 SHA512 35ccd96ef2fa4d5fca4d675b8f722bc7f0b30ad3e04d9272578271d1cb3202514ecf325f84a76395710fab325f9fa420fa4381a719a3b698c07baed50ece42d0
+EBUILD backupninja-1.0.1.ebuild 551 BLAKE2B 8b190c3dd248dfa3e775c294ec8a5dbb533a847156640beedf4fee4ca5e098c8041969cd51a8a409d3080bed4cec13a2abea353646691ccb5fd9295d27733bd7 SHA512 98be990b26dabd570740bda02d06bb5b63acd633014918b866e58ddf963f002b319858cf03e17aa0dc5ed2a4f386b889c274c7d32885f4f6e6bff6a058aa616b
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-backup/backupninja/backupninja-1.0.1-r1.ebuild b/app-backup/backupninja/backupninja-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..793e1f9e1589
--- /dev/null
+++ b/app-backup/backupninja/backupninja-1.0.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+# This thing change with every release, how idiotic...
+NODE_NUMBER=275
+
+DESCRIPTION="lightweight, extensible meta-backup system"
+HOMEPAGE="http://riseuplabs.org/backupninja/"
+SRC_URI="https://labs.riseup.net/code/attachments/download/${NODE_NUMBER}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-util/dialog"
+DEPEND=""
+
+src_prepare() {
+	default
+	mv configure.in configure.ac
+	eautoreconf
+}
+
+src_configure() {
+	econf --localstatedir=/var #578614
+}
diff --git a/app-backup/backupninja/backupninja-1.0.1.ebuild b/app-backup/backupninja/backupninja-1.0.1.ebuild
new file mode 100644
index 000000000000..52c076b2fd1c
--- /dev/null
+++ b/app-backup/backupninja/backupninja-1.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+# This thing change with every release, how idiotic...
+NODE_NUMBER=275
+
+DESCRIPTION="lightweight, extensible meta-backup system"
+HOMEPAGE="http://riseuplabs.org/backupninja/"
+SRC_URI="https://labs.riseup.net/code/attachments/download/${NODE_NUMBER}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="dev-util/dialog"
+
+DOCS=( AUTHORS FAQ TODO README NEWS )
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/app-backup/backupninja/metadata.xml b/app-backup/backupninja/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-backup/backupninja/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-backup/backuppc-3.3.1-r5 b/app-backup/backuppc-3.3.1-r5
deleted file mode 100644
index c2b45188cfeb..000000000000
--- a/app-backup/backuppc-3.3.1-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=dev-lang/perl app-admin/apache-tools app-admin/makepasswd =www-servers/apache-2.4* virtual/pkgconfig
-DESCRIPTION=High-performance backups to a server's disk
-EAPI=5
-HOMEPAGE=http://backuppc.sourceforge.net/
-IUSE=rss samba
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl app-admin/apache-tools app-admin/makepasswd 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[apache2_modules_alias,apache2_modules_authn_core,apache2_modules_authz_core,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_cgi] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_authn_core,apache2_modules_authz_core,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_cgid] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_authn_core,apache2_modules_authz_core,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_fcgid] ) net-misc/rsync dev-perl/File-RsyncP rss? ( dev-perl/XML-RSS ) samba? ( net-fs/samba ) =www-servers/apache-2.4*
-SLOT=0
-SRC_URI=mirror://sourceforge/backuppc/BackupPC-3.3.1.tar.gz
-_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d8f94c6786f934899e2da3a3a53d97fa
diff --git a/app-backup/backuppc/Manifest b/app-backup/backuppc/Manifest
new file mode 100644
index 000000000000..c20220c71692
--- /dev/null
+++ b/app-backup/backuppc/Manifest
@@ -0,0 +1,12 @@
+AUX 3.2.0/04-add-docdir-marker.patch 470 BLAKE2B 29376a3f028411f3bb85f6f717de30c9dfe7efb6819ac7a513d1cf75dd0606f1a6fda3e1c262ee2dca1d9176428e4aa4a50732433cfe43c7babd43b09e9e4847 SHA512 82b3fbb9c86405f2d8ab12f0a8de21d4b793ec012bfb1cd0fb3a51b769c3d29cfda1adf1b701826fd3e36e0a8aaf10b84b75643620b6512bd2351bbe768fc636
+AUX 3.2.0/05-nicelevel.patch 756 BLAKE2B b689fd8ffd8ec7821f0922832f7ac06186d4d18a6bc55cbdb1bc6c339d0f962ac750b92aac3f93e96c454054c8e91129d14664cbdd332c3a3978f2540037d702 SHA512 b33fe04ba54c8d28c51a3c2d85b13e204db9a7f4f193d25888c168234f6fbe6f02a49403b7097f056d7ab8495cddaf457f1776d64bcc84188d2d67e8ea77c1f6
+AUX 3.3.0/01-fix-configure.pl.patch 1098 BLAKE2B 28ff909a8d2b002648912d97a02ba4a1d2b6fac58075c9c5f21f14e79a426d3f38a10a4c416f221d8aae20a4adc2bfdba0993f6064ac5eca67f1a6a4cfb0c579 SHA512 532b88689e50c0a399b42a3264975e1fc71a97b9edfd60faf5e94d0bfad972717c380b8925ca4d7df1e402b13f7104082a57bbecd3fbf74113c6f0e4d0990584
+AUX 3.3.0/02-fix-config.pl-formatting.patch 3900 BLAKE2B 7fdd0f12f9929bc7a54c04290f8f3bde73025a9108a2d0e1e887ceb1dd39502be4270e5a3a03b489211162f02b9bdd11e297e20afda53f1c9ea23254cdc02aa8 SHA512 e61e0bd445c57e1726411a5dec3a21f0d0f6ab6d394cc1882f0de467f9515d6299f3bf4955fbfaafd049097f0814665114e8453d750db19a063202af1378f394
+AUX 3.3.0/03-reasonable-config.pl-defaults.patch 1904 BLAKE2B 0a7ee19f20d4105a86ab612194f827a6da102512e5dcedd55ca1bf5d959ebd9797c281c8fe9b6d6cd6f4e8887d906a1d12024268bd3cb8070897a4961ed5e9ea SHA512 19033dfefa135cba82d7fef50e619916af710d40c46c214e508cd83cf9cbcf032b8fa54e960e5c685e428b3646777b1040c6d067e0d642d8ba9623ade0fb6d11
+AUX 99_backuppc.conf 718 BLAKE2B 3075731b3bd580e9e9f864391d8a65716f43826d801bdf95082dc2168120419346b09322292eecf9de0bac6708dcba606347142238a65f11676ec553ca278b75 SHA512 cb68dfbb635564740428850ea3f026ebc0b8e22b2bca52640b2f367e5487fa205b00ec82e4e192b311e2886686b81f9ea52de54886994c6cce1cd154937fa0ee
+AUX backuppc-3.3.1-perl522.patch 607 BLAKE2B 98c35bbcbe76cd5f7bbc04722f9d8f840c61a8a713cf147db84934702ca754dbd3e0b88e83fa12ecfd45a2aa4974600d21f5cc8bd87fb0fb802f97b2a0c36ae0 SHA512 4d33fff4df53ee885676d58f78984616bb413fcbfd16fdacff0656d70a7c70c012c25f2fd685b360d878ebd407e76fab23103617f2bde0007ad9fc6bf34128c0
+AUX backuppc-3.3.1-perl526.patch 969 BLAKE2B 0b56c1535d8993a71ed2d3330db2cc1d22c42c3c9ed92bc00294c7d2769fc7277546c74844d592086d0b782a4cc482945a20f9ce9cec3daca174e297d80368cc SHA512 da626131a3253bbc6fe46a06f74462a2d356a71ae369e8de88acca2d85376be0d6ad16c8c566f7c80b93e794808f8b1c09a75707d5031dc64b93ab0f698faced
+AUX backuppc.service 231 BLAKE2B 948543a9fc9accff40868e930680c4eb9c0ff89c291254091c8f48b788b1eacf6ba6aba317fd39d2958e8af2efd7194cbe26d3674ee055e8401c591ac27e2fa5 SHA512 9a7cb7ac7da2851cfaf90fafe082800fbac34a5a40a9f6aed1ea817b6f9aeb5be60cb3cfb35c263997c2ac1d22f3384752a23f44158572a9efc8f2c48e99c969
+DIST BackupPC-3.3.1.tar.gz 556461 BLAKE2B 91477196506291fb542a266aca4182ad727758ccf8379c135dcd5147d42b5f1f58d094473430fee64f67e0fc75e077fdf92bfcdaf2313dd53480737666746160 SHA512 b6bb9de3103c5062098d80755055b7461ae9133a4a46a66b3d0af89d081086571694db1898e7d85880defa15b030bad522812116ae5361c0fbde90b877d139c6
+EBUILD backuppc-3.3.1-r5.ebuild 5526 BLAKE2B 121793c6d0209b99a3104042181c3e85adec507aef4a69587c77329aa3d6822c6994b601b8b0c6302b33d3c0f1a84e4dd08f109b3b2f9a31f400d9da3bfac919 SHA512 c1c16a3cbb91dbd990165719591fd48fc6bdddc54c86e6d977f6e7cc3302b3e5e49ce1992f79b70e5c8edbde0b85919fcf4e8dcb2811af7dd725a5a1ab0d0ff6
+MISC metadata.xml 245 BLAKE2B 60b89e1b22df8b9bf236255a9563dea8017b658ba02811b0826ec33790245fbba9332bcfef37cfe1a0dfc5c15de494f7b6eab4b6fbc0f92c6b3c9bec34c2f5c3 SHA512 4129c00f4fd37b4c2e051df35c98105ee97b74bc2a8af78e97f2cbc4c97d14740456fc01ed2ab5c6df3bab10a17ce1728de9e4b83cfee393a8841e8933232877
diff --git a/app-backup/backuppc/backuppc-3.3.1-r5.ebuild b/app-backup/backuppc/backuppc-3.3.1-r5.ebuild
new file mode 100644
index 000000000000..932f8a9640d5
--- /dev/null
+++ b/app-backup/backuppc/backuppc-3.3.1-r5.ebuild
@@ -0,0 +1,197 @@
+# 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
+	epatch "${FILESDIR}"/${P}-perl526.patch #594128
+
+	# 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/files/3.2.0/04-add-docdir-marker.patch b/app-backup/backuppc/files/3.2.0/04-add-docdir-marker.patch
new file mode 100644
index 000000000000..0355aedf04b7
--- /dev/null
+++ b/app-backup/backuppc/files/3.2.0/04-add-docdir-marker.patch
@@ -0,0 +1,11 @@
+--- lib/BackupPC/CGI/View.pm.orig	2009-09-30 19:08:34.353577546 +0300
++++ lib/BackupPC/CGI/View.pm	2009-09-30 19:16:01.982412712 +0300
+@@ -86,7 +86,7 @@
+         $file = $bpc->ConfDir() . "/hosts";
+         $linkHosts = 1;
+     } elsif ( $type eq "docs" ) {
+-        $file = $bpc->InstallDir() . "/doc/BackupPC.html";
++        $file = "__DOCDIR__/BackupPC.html";
+     } elsif ( $host ne "" ) {
+         if ( !defined($In{num}) ) {
+             # get the latest LOG file
diff --git a/app-backup/backuppc/files/3.2.0/05-nicelevel.patch b/app-backup/backuppc/files/3.2.0/05-nicelevel.patch
new file mode 100644
index 000000000000..50938f60bcdc
--- /dev/null
+++ b/app-backup/backuppc/files/3.2.0/05-nicelevel.patch
@@ -0,0 +1,18 @@
+--- init.d/src/gentoo-backuppc.orig	2009-10-18 00:14:44.125346723 +0300
++++ init.d/src/gentoo-backuppc	2009-10-18 00:15:37.101346981 +0300
+@@ -21,7 +21,7 @@
+ start() {
+ 	checkconfig || return 1
+ 	ebegin "Starting BackupPC"
+-	start-stop-daemon --start --chuid ${USER} --user ${USER} --pidfile ${PID_FILE} --exec ${EXEC} -- ${EXEC_OPTIONS}
++	start-stop-daemon --start --chuid ${USER} --user ${USER} --nicelevel ${NICELEVEL} --pidfile ${PID_FILE} --exec ${EXEC} -- ${EXEC_OPTIONS}
+ 	eend $?
+ }
+ 
+--- init.d/src/gentoo-backuppc.conf.orig	2009-10-18 00:14:52.513347638 +0300
++++ init.d/src/gentoo-backuppc.conf	2009-10-18 00:16:03.457346630 +0300
+@@ -3,3 +3,4 @@
+ PID_FILE=__LOGDIR__/BackupPC.pid
+ EXEC=__INSTALLDIR__/bin/BackupPC
+ EXEC_OPTIONS=-d
++NICELEVEL=0
diff --git a/app-backup/backuppc/files/3.3.0/01-fix-configure.pl.patch b/app-backup/backuppc/files/3.3.0/01-fix-configure.pl.patch
new file mode 100644
index 000000000000..c943fdce68b1
--- /dev/null
+++ b/app-backup/backuppc/files/3.3.0/01-fix-configure.pl.patch
@@ -0,0 +1,30 @@
+--- configure.pl.dist	2013-09-23 23:01:19.524743747 +0300
++++ configure.pl	2013-09-23 23:01:37.344567459 +0300
+@@ -158,7 +158,7 @@
+ # config file to get all the defaults.
+ #
+ my $ConfigPath = "";
+-my $ConfigFileOK = 1;
++my $ConfigFileOK = 0;
+ while ( 1 ) {
+     if ( $ConfigFileOK && -f "/etc/BackupPC/config.pl" ) {
+         $ConfigPath = "/etc/BackupPC/config.pl";
+@@ -213,7 +213,8 @@
+         $bpc->{LogDir} = $Conf{LogDir}  = "$Conf{TopDir}/log"
+                     if ( $Conf{LogDir} eq '' );
+     }
+-    $bpc->{ConfDir} = $Conf{ConfDir} = $confDir;
++    # Disable this as it's not really neccessary for this ebuild
++    # $bpc->{ConfDir} = $Conf{ConfDir} = $confDir;
+     my $err = $bpc->ServerConnect($Conf{ServerHost}, $Conf{ServerPort}, 1);
+     if ( $err eq "" ) {
+         print <<EOF;
+@@ -729,7 +730,7 @@
+     if ( $Conf{CgiDir} =~ m{cgi-bin(/.*)} ) {
+ 	$Conf{CgiURL} = "'http://$Conf{ServerHost}/cgi-bin$1/BackupPC_Admin'";
+     } else {
+-	$Conf{CgiURL} = "'http://$Conf{ServerHost}/cgi-bin/BackupPC_Admin'";
++	$Conf{CgiURL} = "'http://$Conf{ServerHost}/BackupPC_Admin'";
+     }
+ }
+ 
diff --git a/app-backup/backuppc/files/3.3.0/02-fix-config.pl-formatting.patch b/app-backup/backuppc/files/3.3.0/02-fix-config.pl-formatting.patch
new file mode 100644
index 000000000000..79ad6547fa6f
--- /dev/null
+++ b/app-backup/backuppc/files/3.3.0/02-fix-config.pl-formatting.patch
@@ -0,0 +1,137 @@
+--- conf/config.pl.dist	2013-09-23 23:05:50.332064754 +0300
++++ conf/config.pl	2013-09-23 23:07:44.110943607 +0300
+@@ -355,7 +355,7 @@
+ # needs to be a full path and you can't include shell syntax like
+ # redirection and pipes; put that in a script if you need it.
+ #
+-$Conf{ServerInitdPath} = '';
++$Conf{ServerInitdPath} = undef;
+ $Conf{ServerInitdStartCmd} = '';
+ 
+ 
+@@ -373,7 +373,7 @@
+ # time taken for the backup, plus the granularity of $Conf{WakeupSchedule}
+ # will make the actual backup interval a bit longer.
+ #
+-$Conf{FullPeriod} = 6.97;
++$Conf{FullPeriod} = '6.97';
+ 
+ #
+ # Minimum period in days between incremental backups (a user requested
+@@ -383,7 +383,7 @@
+ # time taken for the backup, plus the granularity of $Conf{WakeupSchedule}
+ # will make the actual backup interval a bit longer.
+ #
+-$Conf{IncrPeriod} = 0.97;
++$Conf{IncrPeriod} = '0.97';
+ 
+ #
+ # Number of full backups to keep.  Must be >= 1.
+@@ -458,7 +458,7 @@
+ #    $Conf{FullKeepCnt} = 4;
+ #    $Conf{FullKeepCnt} = [4];
+ #
+-$Conf{FullKeepCnt} = 1;
++$Conf{FullKeepCnt} = [1];
+ 
+ #
+ # Very old full backups are removed after $Conf{FullAgeMax} days.  However,
+@@ -688,7 +688,7 @@
+ #       '*' => ['/myFiles', '/important'],      # these are other shares
+ #    };
+ #
+-$Conf{BackupFilesOnly} = undef;
++$Conf{BackupFilesOnly} = {};
+ 
+ #
+ # List of directories or files to exclude from the backup.  For Smb,
+@@ -749,7 +749,7 @@
+ #       '*' => ['/junk', '/dont_back_this_up'], # these are for other shares
+ #    };
+ #
+-$Conf{BackupFilesExclude} = undef;
++$Conf{BackupFilesExclude} = {};
+ 
+ #
+ # PCs that are always or often on the network can be backed up after
+@@ -932,7 +932,7 @@
+ #
+ # This setting only matters if $Conf{XferMethod} = 'smb'.
+ #
+-$Conf{SmbShareName} = 'C$';
++$Conf{SmbShareName} = ['C$'];
+ 
+ #
+ # Smbclient share user name.  This is passed to smbclient's -U argument.
+@@ -1054,7 +1054,7 @@
+ #
+ # This setting only matters if $Conf{XferMethod} = 'tar'.
+ #
+-$Conf{TarShareName} = '/';
++$Conf{TarShareName} = ['/'];
+ 
+ #
+ # Command to run tar on the client.  GNU tar is required.  You will
+@@ -1233,7 +1233,7 @@
+ #
+ #     $Conf{RsyncShareName} = ['/', '/var', '/data', '/boot'];
+ #
+-$Conf{RsyncShareName} = '/';
++$Conf{RsyncShareName} = ['/'];
+ 
+ #
+ # Rsync daemon port on the client, for $Conf{XferMethod} = "rsyncd".
+@@ -1285,7 +1285,7 @@
+ #   
+ # This setting has no effect unless checksum caching is turned on.
+ #   
+-$Conf{RsyncCsumCacheVerifyProb} = 0.01;
++$Conf{RsyncCsumCacheVerifyProb} = '0.01';
+ 
+ #
+ # Arguments to rsync for backup.  Do not edit the first set unless you
+@@ -1883,7 +1883,7 @@
+ # rounded up (ie: 2.5 means a user will never receive email more
+ # than once every 3 days).
+ #
+-$Conf{EMailNotifyMinDays} = 2.5;
++$Conf{EMailNotifyMinDays} = '2.5';
+ 
+ #
+ # Name to use as the "from" name for email.  Depending upon your mail
+@@ -1938,7 +1938,7 @@
+ # When there have been no backups in this number of days the user
+ # is sent an email.
+ #
+-$Conf{EMailNotifyOldBackupDays} = 7.0;
++$Conf{EMailNotifyOldBackupDays} = 7;
+ 
+ #
+ # This subject and message is sent to a user if their PC has not recently
+@@ -1965,7 +1965,7 @@
+ # How old the most recent backup of Outlook files has to be before
+ # notifying user.
+ #
+-$Conf{EMailNotifyOldOutlookDays} = 5.0;
++$Conf{EMailNotifyOldOutlookDays} = 5;
+ 
+ #
+ # This subject and message is sent to a user if their Outlook files have
+@@ -2102,14 +2102,17 @@
+     {
+         link  => "?action=view&type=docs",
+         lname => "Documentation",    # actually displays $Lang->{Documentation}
++        name  => undef,
+     },
+     {
+         link  => "http://backuppc.wiki.sourceforge.net",
+         name  => "Wiki",              # displays literal "Wiki"
++        lname => undef,
+     },
+     {
+         link  => "http://backuppc.sourceforge.net",
+         name  => "SourceForge",      # displays literal "SourceForge"
++        lname => undef,
+     },
+ ];
+ 
diff --git a/app-backup/backuppc/files/3.3.0/03-reasonable-config.pl-defaults.patch b/app-backup/backuppc/files/3.3.0/03-reasonable-config.pl-defaults.patch
new file mode 100644
index 000000000000..8b54fc87b050
--- /dev/null
+++ b/app-backup/backuppc/files/3.3.0/03-reasonable-config.pl-defaults.patch
@@ -0,0 +1,64 @@
+--- conf/config.pl.formatted	2013-09-23 23:12:30.708129365 +0300
++++ conf/config.pl	2013-09-23 23:12:39.448043656 +0300
+@@ -1305,7 +1305,7 @@
+             '--times',
+             '--block-size=2048',
+             '--recursive',
+-
++            '--specials',
+ 	    #
+ 	    # Rsync >= 2.6.3 supports the --checksum-seed option
+             # which allows rsync checksum caching on the server.
+@@ -1313,7 +1313,7 @@
+             # you have a recent client rsync version and you want
+             # to enable checksum caching.
+ 	    #
+-	    #'--checksum-seed=32761',
++	    '--checksum-seed=32761',
+ ];
+ 
+ #
+@@ -1383,6 +1383,7 @@
+ 	    '--relative',
+ 	    '--ignore-times',
+ 	    '--recursive',
++	    '--specials',
+ 
+ 	    #
+ 	    # Rsync >= 2.6.3 supports the --checksum-seed option
+@@ -1391,7 +1392,7 @@
+             # you have a recent client rsync version and you want
+             # to enable checksum caching.
+ 	    #
+-	    #'--checksum-seed=32761',
++	    '--checksum-seed=32761',
+ 
+ 	    #
+ 	    # Add additional arguments here
+@@ -2029,7 +2030,7 @@
+ #    --> administrative users are only craig and celia'.
+ #
+ $Conf{CgiAdminUserGroup} = '';
+-$Conf{CgiAdminUsers}     = '';
++$Conf{CgiAdminUsers}     = 'backuppc';
+ 
+ #
+ # URL of the BackupPC_Admin CGI script.  Used for email messages.
+@@ -2076,7 +2077,7 @@
+ # dates (MM/DD), a value of 2 uses full YYYY-MM-DD format, and zero
+ # for international dates (DD/MM).
+ #
+-$Conf{CgiDateFormatMMDD} = 1;
++$Conf{CgiDateFormatMMDD} = 2;
+ 
+ #
+ # If set, the complete list of hosts appears in the left navigation
+@@ -2262,7 +2263,7 @@
+         ClientTimeout             => 1,
+         MaxOldPerPCLogFiles       => 1,
+         CompressLevel             => 1,
+-        ClientNameAlias           => 1,
++        ClientNameAlias           => 0,
+         DumpPreUserCmd            => 0,
+         DumpPostUserCmd           => 0,
+         RestorePreUserCmd         => 0,
diff --git a/app-backup/backuppc/files/99_backuppc.conf b/app-backup/backuppc/files/99_backuppc.conf
new file mode 100644
index 000000000000..eae766e4fa75
--- /dev/null
+++ b/app-backup/backuppc/files/99_backuppc.conf
@@ -0,0 +1,32 @@
+<IfDefine BACKUPPC>
+
+
+Listen 8080
+<VirtualHost 127.0.0.1:8080>
+  AssignUserId backuppc backuppc
+  DocumentRoot "/usr/lib/backuppc/htdocs/"
+  RedirectMatch ^/$ /BackupPC_Admin
+
+  <Directory "/usr/lib/backuppc/htdocs">
+    AuthType Basic
+    AuthName "BackupPC Community Edition Administrative Interface"
+    AuthUserFile "/etc/BackupPC/users.htpasswd"
+    Options ExecCGI
+    Require valid-user
+    Require host 127.0.0.1
+  </Directory>
+
+  <Location "/BackupPC_Admin">
+    SetHandler perl-script
+    PerlResponseHandler ModPerl::Registry
+    PerlOptions +ParseHeaders
+  </Location>
+
+  <Directory "/usr/lib/backuppc/htdocs/image">
+    Require all granted
+    Options -ExecCGI
+  </Directory>
+</VirtualHost>
+
+
+</IfDefine>
diff --git a/app-backup/backuppc/files/backuppc-3.3.1-perl522.patch b/app-backup/backuppc/files/backuppc-3.3.1-perl522.patch
new file mode 100644
index 000000000000..fb7eeeef1e02
--- /dev/null
+++ b/app-backup/backuppc/files/backuppc-3.3.1-perl522.patch
@@ -0,0 +1,17 @@
+--- lib/BackupPC/CGI/Browse.pm	2016-11-22 20:52:03.622509160 +0100
++++ lib/BackupPC/CGI/Browse.pm	2016-11-22 20:50:35.871018400 +0100
+@@ -62,13 +62,13 @@ fix bug https://bugzilla.redhat.com/attachment.cgi?id=1104083
+     #
+     my @Backups = $bpc->BackupInfoRead($host);
+ 
+     #
+     # default to the newest backup
+     #
+-    if ( !defined($In{num}) && defined(@Backups) && @Backups > 0 ) {
++    if ( !defined($In{num}) && @Backups > 0 ) {
+         $i = @Backups - 1;
+         $num = $Backups[$i]{num};
+     }
+ 
+     for ( $i = 0 ; $i < @Backups ; $i++ ) {
+         last if ( $Backups[$i]{num} == $num );
diff --git a/app-backup/backuppc/files/backuppc-3.3.1-perl526.patch b/app-backup/backuppc/files/backuppc-3.3.1-perl526.patch
new file mode 100644
index 000000000000..3a04f94835c3
--- /dev/null
+++ b/app-backup/backuppc/files/backuppc-3.3.1-perl526.patch
@@ -0,0 +1,21 @@
+diff -ruN BackupPC-3.3.1.orig/lib/BackupPC/Lib.pm BackupPC-3.3.1/lib/BackupPC/Lib.pm
+--- BackupPC-3.3.1.orig/lib/BackupPC/Lib.pm	2015-01-12 01:19:53.000000000 +0100
++++ BackupPC-3.3.1/lib/BackupPC/Lib.pm	2017-07-08 00:31:52.100003197 +0200
+@@ -1261,7 +1261,7 @@
+         #
+         # Replace scalar variables first
+         #
+-        $arg =~ s[\${(\w+)}(\+?)]{
++        $arg =~ s[\$\{(\w+)}(\+?)]{
+             exists($vars->{$1}) && ref($vars->{$1}) ne "ARRAY"
+                 ? ($2 eq "+" ? $bpc->shellEscape($vars->{$1}) : $vars->{$1})
+                 : "\${$1}$2"
+@@ -1270,7 +1270,7 @@
+         # Now replicate any array arguments; this just works for just one
+         # array var in each argument.
+         #
+-        if ( $arg =~ m[(.*)\${(\w+)}(\+?)(.*)] && ref($vars->{$2}) eq "ARRAY" ) {
++        if ( $arg =~ m[(.*)\$\{(\w+)}(\+?)(.*)] && ref($vars->{$2}) eq "ARRAY" ) {
+             my $pre  = $1;
+             my $var  = $2;
+             my $esc  = $3;
diff --git a/app-backup/backuppc/files/backuppc.service b/app-backup/backuppc/files/backuppc.service
new file mode 100644
index 000000000000..7c4877a4ee24
--- /dev/null
+++ b/app-backup/backuppc/files/backuppc.service
@@ -0,0 +1,13 @@
+[Unit]
+Description= BackupPC server
+After=syslog.target local-fs.target remote-fs.target
+
+[Service]
+Type=oneshot
+User=backuppc
+Group=backuppc
+ExecStart=/usr/bin/BackupPC -d
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-backup/backuppc/metadata.xml b/app-backup/backuppc/metadata.xml
new file mode 100644
index 000000000000..13724624fa85
--- /dev/null
+++ b/app-backup/backuppc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">backuppc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-backup/bacula-5.2.13-r6 b/app-backup/bacula-5.2.13-r6
deleted file mode 100644
index 6d42813077d9..000000000000
--- a/app-backup/bacula-5.2.13-r6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=dev-libs/gmp:0 !bacula-clientonly? ( postgres? ( dev-db/postgresql:=[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !bacula-nodir? ( virtual/mta ) ) logwatch? ( sys-apps/logwatch ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) sys-libs/zlib dev-libs/lzo sys-libs/ncurses:= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) virtual/pkgconfig >=app-portage/elt-patches-20170422
-DESCRIPTION=Featureful client/server network backup suite
-EAPI=5
-HOMEPAGE=http://www.bacula.org/
-IUSE=acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 libressl logwatch mysql postgres python readline +sqlite ssl static tcpd vim-syntax X python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-libs/gmp:0 !bacula-clientonly? ( postgres? ( dev-db/postgresql:=[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !bacula-nodir? ( virtual/mta ) ) logwatch? ( sys-apps/logwatch ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) sys-libs/zlib dev-libs/lzo sys-libs/ncurses:= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) !bacula-clientonly? ( !bacula-nosd? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacula-clientonly ) python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/bacula/bacula-5.2.13.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d549fa6f13c2445245e31dac8e849433
diff --git a/app-backup/bacula-9.0.6-r2 b/app-backup/bacula-9.0.6-r2
deleted file mode 100644
index 2d47f57bc10c..000000000000
--- a/app-backup/bacula-9.0.6-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=dev-libs/gmp:0 !bacula-clientonly? ( postgres? ( dev-db/postgresql:=[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !bacula-nodir? ( virtual/mta ) ) qt5? ( dev-qt/qtsvg:5 x11-libs/qwt:6 ) logwatch? ( sys-apps/logwatch ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) sys-libs/zlib dev-libs/lzo sys-libs/ncurses:= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) virtual/pkgconfig >=app-portage/elt-patches-20170422
-DESCRIPTION=Featureful client/server network backup suite
-EAPI=6
-HOMEPAGE=http://www.bacula.org/
-IUSE=acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X
-KEYWORDS=amd64 ppc ~sparc x86
-LICENSE=AGPL-3
-RDEPEND=dev-libs/gmp:0 !bacula-clientonly? ( postgres? ( dev-db/postgresql:=[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !bacula-nodir? ( virtual/mta ) ) qt5? ( dev-qt/qtsvg:5 x11-libs/qwt:6 ) logwatch? ( sys-apps/logwatch ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) sys-libs/zlib dev-libs/lzo sys-libs/ncurses:= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) !bacula-clientonly? ( !bacula-nosd? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacula-clientonly )
-SLOT=0
-SRC_URI=mirror://sourceforge/bacula/bacula-9.0.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=6da2b5efbcddf75a3815e56b641146f5
diff --git a/app-backup/bacula-9.0.6-r3 b/app-backup/bacula-9.0.6-r3
deleted file mode 100644
index 99b3d38f6a99..000000000000
--- a/app-backup/bacula-9.0.6-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=dev-libs/gmp:0 !bacula-clientonly? ( postgres? ( dev-db/postgresql:=[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !bacula-nodir? ( virtual/mta ) ) qt5? ( dev-qt/qtsvg:5 x11-libs/qwt:6 ) logwatch? ( sys-apps/logwatch ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) sys-libs/zlib dev-libs/lzo sys-libs/ncurses:= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) virtual/pkgconfig >=app-portage/elt-patches-20170422
-DESCRIPTION=Featureful client/server network backup suite
-EAPI=6
-HOMEPAGE=http://www.bacula.org/
-IUSE=acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-libs/gmp:0 !bacula-clientonly? ( postgres? ( dev-db/postgresql:=[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !bacula-nodir? ( virtual/mta ) ) qt5? ( dev-qt/qtsvg:5 x11-libs/qwt:6 ) logwatch? ( sys-apps/logwatch ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) sys-libs/zlib dev-libs/lzo sys-libs/ncurses:= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) !bacula-clientonly? ( !bacula-nosd? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacula-clientonly )
-SLOT=0
-SRC_URI=mirror://sourceforge/bacula/bacula-9.0.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=629e81b96f275772fdbad9659c5a01ca
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
new file mode 100644
index 000000000000..20f64f3c95e2
--- /dev/null
+++ b/app-backup/bacula/Manifest
@@ -0,0 +1,32 @@
+AUX 5.2.10/bacula-5.2.10-fix-static.patch 2833 BLAKE2B 5ffdc18b616326aeb81b31124938622680752ae2d28fb7e8e296c4804f56a2f169c3f98a4061f6ce88ef21ab416d08e8419755f31b65f13047d2f6b3ed099c87 SHA512 9982373d39eae1d6e24468cb0c0019cd4ab846d0971a1929242e5d67c05cb172a37aa0125883e42545b3d388e0e35a26240d541ec8d88e691b2444eee691518f
+AUX 5.2.12/bacula-5.2.12-depend.patch 627 BLAKE2B e2d356a9c157c5ba3979c8008b36276d51646bf65e78695072885e0de980b4a683a3dd1c869e08078dfd386372478e5e792cf481942c8474d17b75dfe4a4c6f9 SHA512 c48d2ea36e378f8a985f7f8c4456ce380e684e8a66749e6f6a95162b7eecf0f6a26b793ed4ec127b8e35b4217fed30f58841589b8c9ef74d281d6255d9345174
+AUX 5.2.3/bacula-5.2.3-Makefile.patch 924 BLAKE2B ea4e413f5e1ddb5d23aa030e5d7a4e96b23cd987fc86d2958c5275994198f8aa3705b5554e545440f31cfaed45283e34a08aa4e27087d81edc192d1e9884d63f SHA512 f1b5da39d01f6b00851810c6a0cbcda9ac0561fb165054f6f2c4540943b41af9d524a6a8aca1ae87d55fa8624aecf44c3c0db03c2d7c22690a84c16994289eed
+AUX 5.2.3/bacula-5.2.3-as-needed.patch 765 BLAKE2B be4e29d48974afd31894535dc89c51094f50344609ed1525c46d39a600778df5b458ce5587500a3455cb6e4b601c24dfdd567ad1cd264d108b9852d34e47e64e SHA512 5e303c5c53d6cef8e875d32811d23a9b6f354c394a6dce11646ad3f4c827b03cf1bd3c0267ff8873e1a176eb0b33314b712d8c9dc3c4c4ba24306d80b3bae4c7
+AUX 5.2.3/bacula-5.2.3-doc.patch 464 BLAKE2B d91cb05c18167f0fb00cef5181af07bbe771332b081b9c19c05c3199ebb543f0011d06830048921de6a3a4380500fda3b8871745e744f17605223a2eddf78ff3 SHA512 c4127364c9472f2f7d51ed1b4753e1c539e88c91bf7d796f1594f6c5e193a366fe169ee35818fd21349c3218a3b5631bd7f5110e2674744eb13ba5bbcc82a341
+AUX 5.2.3/bacula-5.2.3-ldflags.patch 389 BLAKE2B 9e1d80037755eba2ae47951aa1e603ac3bac1b26f1cbc0681730ab7ba08846f4670989c517bfe02a6b869b880456e992d3e40fd0d7488d63494a547a902c3c24 SHA512 811fd6ffc2a1c4aeef3afd9001fd2bf01c70ef3f75ed6949ec6b064a9e6ce7a4893ffe464e5c9c67e33fdf92e00b0601500930165891b70d403d31a2ee347434
+AUX 5.2.3/bacula-5.2.3-lib-search-path.patch 631 BLAKE2B 6d7f724d96d3111a09290549dd573f34fbbc856b3eb29671c928b597ce0cdf280f26028e27501f32e312326d9cf1face699ea6e67214e3c2beb6009f6f92f9af SHA512 cad584561a0f1be761c1e5dfd1e777215630aa174d26479397844873dabc63fb717a0123747f532bfc868c4943c1c1e48f12e0c2d4e05fdc871c1c7d6d80f3a2
+AUX 5.2.3/bacula-5.2.3-openssl-1.patch 863 BLAKE2B 32d49a53c8f639e762bd964f4fa1426952ccb2fd595717e015ee9c060e182d9189cf1749cb5e9d90d8712a0b1c3800ad98ba175e48935e7b6d172e6474719456 SHA512 729f01b5e88230561482cbe87fd185707be28ba92252e54a5111f0154f7d3df9cec9e31ee932bbdb34fe8b5e212cf43dc74d46460f68579e5f953ffe565a7a2c
+AUX 7.0.2/bacula-7.0.2-depend.patch 599 BLAKE2B be676329434260e65f7dcbefbfa8d9a04998856ab6743e5f3577e9e316346a22eed45a02960ed8590c946e079ba1e9d814061f67d6ef25c0a72f8bcafe38a48e SHA512 0474e077d89c5b1552f8b1929209db380ac67ca29add78987ad1593b139647a2d1822a0d89c3b117ca93024bffd74da7da5a5f23bc5095492c0cc9e4eddb24f6
+AUX 7.2.0/bacula-7.2.0-doc.patch 435 BLAKE2B 65d528b337f9a3e2eaf456b6dad37ddc59bc1a3f6e54208899346a6bc285fe2b19a464b39cc0c9439c4266baf98c1b3a06afd235b3ee7c88373d3c890163e01a SHA512 27d2839658e3471487dce023c806261e5b5d03212f12eab75885b9b61eb22e57c96e85c07a5f81c812974963904ab81b6ce15abf5381647bd2188abd14139b34
+AUX 7.2.0/bacula-7.2.0-fix-static.patch 2599 BLAKE2B 8b9119b0d6f47cace3e77a93434bec735276ddc8295157aaca67778dad1bbd62603201c011d5457f36b92b0ba9e7975fc4d0d7ca06d33decf510dd805759d210 SHA512 12b241ca20e7d3eff3c4fdf495c3f4f2074e41196379ae3bf5d655299413c0dec263200644745d081e77253fe20b07845d567de71dedb7564a6f64f134c3c905
+AUX 9.0.2/bacula-9.0.2-fix-static.patch 3637 BLAKE2B 4119db6091fdaf7d8d103a166ce672c405da8093e2a04eef5e9bda1cc0e0cde997fef378d92e0fa1531c39281e877aa10f8dd939377924fc7252d6c228722c86 SHA512 218febc3ccbfeccea4a5b05f6086aeff7f4e0e88e3a6670a8a0406101e7276c35d254f4bfa6b6782ea5bdcd1ad8fc5080cff80bb9befcf4d7f968075eb850360
+AUX 9.0.2/bacula-9.0.2-lib-search-path.patch 1431 BLAKE2B f04bbf695a926424092dd974994967eefcd48407f2de43b9e94bff25403e66f4a49cde08d667e3b5fc4fb9f8d273a786c3422325db3f589278d16f136d4a9a0c SHA512 3863102d2f8db4158dede306b07297da6550bbad1c77aea49a75de412a7f4630216ef2ae28fc51ffa8d8f9c373510e58982f28e32fdbb142a3551eef7f112b7d
+AUX 9.0.6/bacula-9.0.6-bat-pro.patch 667 BLAKE2B b8987c244025f029a182d6b44f30e0e0a6835b9f6cadb6b43b2b55ea33113e20c20b6a367d965ea12358597e9807c79846e45571b31f9b66dc3ad83265fed4e7 SHA512 d521759cad65ef73fb674cd6b58f9540ef6e86842bcd45ece4730f71a408076b38faea2088bf6f2993fed9a88d727ff2ff8c3e3619e27fcaa1d5afe4506640cf
+AUX 9.0.6/bacula-9.0.6-fix-pages-h-qt-includes.patch 306 BLAKE2B a6bca03d7e61051046083f1773ce65035f695dd8d5de45d58e0488eb5047580db444cbb52ae5e93068ff60028220a9286da9d1323d141335be31ebfb9c9acb44 SHA512 86a869f10e512eac6aa4500f73ace1cfe3883cc4d176c26d275f6dc51320763cb55c2d139a7a0230c57c40f4996651a0de71788e3a7ef343a4290e56f9585a22
+AUX 9.0.6/bacula-9.0.6-libressl.patch 2318 BLAKE2B 6d918bbf3eb0af17b3d1ccc5fe70788de21aed8823178a36dc04ada1198fef99425bf0af55d86bfff8342ba7df635e05e813548d3469cf51edb1c813836f45c3 SHA512 c6d7a386a89eaeaa3281cfe4bc2d8c48a84762d4a6e01d1f327110efeada0168261d03b3ab1183fffa5456975ff475b12b286f360d7001cf459f0a10be6ba8be
+AUX bacula-dir.confd 629 BLAKE2B 85eb7131fe1735ea3af0075b26c88408a11ce7653b92e27198d6bbfdbe2bf4d4e157eb6685f2cac79a8de1e4d24d9c4eb25f9d64b1b956162718fe09633018c4 SHA512 85ed5317313721a7b3776a257c204e0ac45a5221c6bd0b5886944cbd1e4829fe146e7af52cdc604cbf5e3d8722c955da40cbf989dc9ea7466653c98bf8c7cfdf
+AUX bacula-dir.initd 505 BLAKE2B 385c24291c0a0108baf441d078054f70fd0346dfe4b6de7a236f9c1e7a4416b895c73075509dfcc03d1b58760668ca1fc5415033188f9dcb3acceea7f5e1044a SHA512 de0003d6c873ecf9609a6e1838772a29555b4e5e251369035746ede296f4b0f1c85dcbe8822d526d6a5489ba0921a8566f7f2b963682fddb3560f6f7e817c40a
+AUX bacula-fd.confd 241 BLAKE2B fe41e6376e46e674ef1aa32f02e2dee9721189fb56c4d25c2f49bd6bb0b9c8bcc811cd58db62b9b8bffd80514a24e9d60385a395dfdb93627d473ba7bbf05131 SHA512 0e5a21d8ed3cd39135c8db5b8c59e615161848aaca582851d3599fe0e6ad4f47c04fede13cdc648a2cbdc032de6ca00aa954111bbb2930eb006e7e0984cb882f
+AUX bacula-fd.initd 430 BLAKE2B f16aff397175de0f58dd0569dbc77f90a5d923dfeb22c5cbf360ca3e818e93c49f3568864ff18d84b1ed282bd5faa517c4130e179fb0aa939eb48fe34f838108 SHA512 e6bad66d11c3c82ba32e052bb2040205c4e1c5994c8dadc09a6235b9c2e5e3c49ea33ef9a9a76d3bcec0054488a14350f9963590c1834b15023735138adad48d
+AUX bacula-fix-sonames.patch 1041 BLAKE2B 9b2b91cf3c281c1899bf545f02b4a48723bcba05f0305e531bdefb0ca822e805979e67d1d2f5ac949248d1e976126236d31c885d4e911e78c24d4ed013c9792f SHA512 0b7a78915ff789988c9fa2bc8fcfcd3d76d3cb8350720134563ece63a97162db273c7d61eee45365c4de8b94b409a3cd4576d6b0239853c2a0d3a9dc8ebf888f
+AUX bacula-sd.confd 391 BLAKE2B 922ebff1772470f611661b03e6216d3bf11a09e9e552e5df59d9fcd5c14bde1b943e151892648e6176cef643ede01ec710f0aa892c35b51753331c96885cbe9e SHA512 ee7372582f6f8c7b4552ed5fd71293f712af22d0de30d02e3f5e08b3738da978eebc42dd601d88735f0412b1429be624a28d86e5f32aba2ddb127ca1ebd10e0d
+AUX bacula-sd.initd 437 BLAKE2B f3c86121dae447807e32e7966372c710728fe1747177738df0ce36235b1b05d5d5291bebb66cec6544e6941bb6b0269631d06ed4cdfb8159aba09a96aa54b6e5 SHA512 50603d6d5d5df95ac1752ecc7c3a48a0a5f42eca6c5af390a4f1af084861dbbcfa5d476d3f24ec473fd9b225f6ac78f3542e26cce5d499289d1ec44e22c5682f
+AUX newscripts/bacula-dir.initd 318 BLAKE2B f482ce3c49ff8106244b62946ab8bc4ab14d32f3b5442e9d803f5f372c8e2ae73760b497800161f075f1c40da2d385871a77f5aa774dc85d950cd1863860b70d SHA512 aa6fddd67237f6f16e89e04290bc3540a87fe8ebaba9c641a3277d0d2f627cadf49dffb032a0fe5c77ab8983f4d67891b643279bad0a2aa9de5a86e6d64f196a
+AUX newscripts/bacula-fd.initd 253 BLAKE2B 38b87d2868f7cc0afb3270f81445832bdf876d20919bf3f5a779595507e50185457464371878b3e18293302a0c1016bce3aca7e432837397bde64a0e6188be8a SHA512 8230bde8cbfdf2fc4892fb90891a85e36b2be42e4f2ea2140248f08f22bcfe3f1d8c3b419347a9b40143c3f2b4c75d7834cbadb3ed8b8372462580ffcf268bf7
+AUX newscripts/bacula-sd.initd 252 BLAKE2B c27f6635ca72c96fc74d1d27c252934ca516cf768a5fec5e043a19d14e7fa67ccfbd6bbbf5da8ee6b718ca7f232565b23216f8ef3adc372681ea4f6bf763f46e SHA512 f4e1252d3e106ebd842cb23c6994cbe29e48e07cff15726479628d1cc5695bd45a0102652203316efcf8a3b3454ad2ca08ee7c6a673880064d15f96c43c395d4
+DIST bacula-5.2.13.tar.gz 4243395 BLAKE2B 5cad5d2675f8a2dd28a76c1a4e4c649d1bf9b031e5e4febfb537a72a0481c2f7c3e80d39b84657238bc147b58174ce544749aed70882f66678edfaa2fb51ac2f SHA512 dfdff353f5b6ed4d85013dc292526706bbd67066f7057a114012172926c819c8df1eb8779166d5a90db3a49a5584f0a8daf7566cc93cf4fa3f1bdda245b55cf0
+DIST bacula-9.0.6.tar.gz 3984215 BLAKE2B 89d0c83ae1ffd2c2677f5882eebc0feac12780a78f9fcf6d30e44981a09f29dd8bd3f0e55ba963a0ed03099117f2d645cf0402cf528fe939d88210ed547ea157 SHA512 a85b8e089951eb9949c9906af45f204a69cd4a7d2e0f29439b74a29ade20c05a49a8c38665189a46c0ad07af0c97380485e10da6aa53dfc47a22934f589f265e
+EBUILD bacula-5.2.13-r6.ebuild 11653 BLAKE2B 440c77c8b85dc4f65ff10f3a7bfc09d471a6f9e344ac3722163b592f48c2af18951fc54541e8c7b3e75cc445a0ea8364729ad0a2e411892989fedfb79a08a182 SHA512 6b6f9a5b04d7e818fbe4f73928f6b00f393b82e0a1d36e0c4a700ec95b5049006d8b73d1c2cd7906d405f15511d63862fbf19e1b42bed484c8e285dc8b29b07e
+EBUILD bacula-9.0.6-r2.ebuild 12450 BLAKE2B 405b703434852e97b72a68392c19078c6f9fd93446fa81b152bc347ad6c8a1acee7fc65909179faab1352429956e3fd5f4153a6c5a9ab509b3ea58406a1447d1 SHA512 6d3f4ba7e0d2a47b52df08a726374ef0febf026b3d3e63e6ff1c22ddc0032988e187c69d0f8ed63057e5af4636935759a8debf840813eaeda9798e6b7127a171
+EBUILD bacula-9.0.6-r3.ebuild 12555 BLAKE2B 970c7dadba73cf531c7d68dc68381b36333f80a3166e7c02fca6533540d67c871914af19a72da7355c5cfc23eace65aa1704e2f7e96a8e4e61bc28d0ac68092c SHA512 883f41666bfcbeb795f11c4a134575aad426fca89599a52e52ef47ba0a67a8296ba15290423c37fe27f2167a6fc34f3fb06277a66ef44c2997f57d20b0ef34c4
+MISC metadata.xml 626 BLAKE2B 5794ff725aacf865d2f20f402d057e6358a2c68be16f760f1446b2de5292c9582247ab86417131063e181168f003e1d6f5d200ac0dc3d47da24a3bca688dd93c SHA512 69d63f22a63a53daada5561d751f9903932c9a4596c164894a9aa6465a0f4ac90af99548439545fff1cfbcac9a1eb266a91119cbf73cb13edebd16b440613e55
diff --git a/app-backup/bacula/bacula-5.2.13-r6.ebuild b/app-backup/bacula/bacula-5.2.13-r6.ebuild
new file mode 100644
index 000000000000..463523e8d36b
--- /dev/null
+++ b/app-backup/bacula/bacula-5.2.13-r6.ebuild
@@ -0,0 +1,397 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit eutils multilib python-single-r1 systemd user libtool
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="http://www.bacula.org/"
+SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 libressl logwatch mysql postgres python readline +sqlite ssl static tcpd vim-syntax X"
+
+DEPEND="
+	dev-libs/gmp:0
+	!bacula-clientonly? (
+		postgres? ( dev-db/postgresql:=[threads] )
+		mysql? ( virtual/mysql )
+		sqlite? ( dev-db/sqlite:3 )
+		!bacula-nodir? ( virtual/mta )
+	)
+	logwatch? ( sys-apps/logwatch )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		acl? ( virtual/acl[static-libs] )
+		sys-libs/zlib[static-libs]
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		ssl? (
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+		)
+	)
+	!static? (
+		acl? ( virtual/acl )
+		sys-libs/zlib
+		dev-libs/lzo
+		sys-libs/ncurses:=
+		ssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	python? ( ${PYTHON_DEPS} )
+	"
+RDEPEND="${DEPEND}
+	!bacula-clientonly? (
+		!bacula-nosd? (
+			sys-block/mtx
+			app-arch/mt-st
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+
+REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+				static? ( bacula-clientonly )
+				python? ( ${PYTHON_REQUIRED_USE} )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	#XOR and !bacula-clientonly controlled by REQUIRED_USE
+	use mysql && export mydbtype="mysql"
+	use postgres && export mydbtype="postgresql"
+	use sqlite && export mydbtype="sqlite3"
+
+	# create the daemon group and user
+	if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
+		enewgroup bacula
+		einfo
+		einfo "The group 'bacula' has been created. Any users you add to this"
+		einfo "group have access to files created by the daemons."
+		einfo
+	fi
+
+	if ! use bacula-clientonly; then
+		if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
+			enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw
+			einfo
+			einfo "The user 'bacula' has been created.  Please see the bacula manual"
+			einfo "for information about running bacula as a non-root user."
+			einfo
+		fi
+	fi
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bacula/<config> instead of ./<config>
+	pushd src >&/dev/null || die
+	for f in console/console.c dird/dird.c filed/filed.c \
+		stored/bcopy.c stored/bextract.c stored/bls.c \
+		stored/bscan.c stored/btape.c stored/stored.c \
+		qt-console/main.cpp; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# bug 466688 drop deprecated categories from Desktop file
+	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
+
+	# bug 466690 Use CXXFLAGS instead of CFLAGS
+	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
+	# drop automatic install of unneeded documentation (for bug 356499)
+	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-doc.patch
+
+	# bug #310087
+	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
+
+	# bug #311161
+	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-lib-search-path.patch
+
+	# stop build for errors in subdirs
+	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-Makefile.patch
+
+	# bat needs to respect LDFLAGS
+	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-ldflags.patch
+
+	# bug #328701
+	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
+
+	epatch "${FILESDIR}"/5.2.10/${PN}-5.2.10-fix-static.patch
+
+	# do not strip binaries
+	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
+	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+
+	# fix file not found error during make depend
+	epatch "${FILESDIR}"/5.2.12/${PN}-5.2.12-depend.patch
+
+	# Fix systemd unit files:
+	# bug 497748
+	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
+	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
+	# bug 504370
+	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
+	# bug 584442 and 504368
+	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
+
+	# Fix tmpfiles config for client-only (no bacula user) install
+	# NOTE: Change only first occurance (user) not second (group)
+	# bug 528398 and 577486
+	if use bacula-clientonly; then
+		sed -i -e 's/bacula/root/' platforms/systemd/bacula.conf.in || die
+	fi
+
+	# fix bundled libtool (bug 466696)
+	# But first move directory with M4 macros out of the way.
+	# It is only needed by autoconf and gives errors during elibtoolize.
+	mv autoconf/libtool autoconf/libtool1 || die
+	elibtoolize
+}
+
+src_configure() {
+	local myconf=''
+
+	if use bacula-clientonly; then
+		myconf="${myconf} \
+			$(use_enable bacula-clientonly client-only) \
+			$(use_enable !static libtool) \
+			$(use_enable static static-cons) \
+			$(use_enable static static-fd)"
+	else
+		myconf="${myconf} \
+			$(use_enable !bacula-nodir build-dird) \
+			$(use_enable !bacula-nosd build-stored)"
+		# bug #311099
+		# database support needed by dir-only *and* sd-only
+		# build as well (for building bscan, btape, etc.)
+		myconf="${myconf} \
+			--with-${mydbtype} \
+			--enable-batch-insert"
+	fi
+
+	myconf="${myconf} \
+		--disable-tray-monitor \
+		$(use_with X x) \
+		$(use_with python) \
+		$(use_enable !readline conio) \
+		$(use_enable readline) \
+		$(use_with readline readline /usr) \
+		$(use_with ssl openssl) \
+		$(use_enable ipv6) \
+		$(use_enable acl) \
+		$(use_with tcpd tcp-wrappers)"
+
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--with-pid-dir=/var/run \
+		--sysconfdir=/etc/bacula \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-working-dir=/var/lib/bacula \
+		--with-logdir=/var/lib/bacula \
+		--with-scriptdir=/usr/libexec/bacula \
+		--with-systemd=$(systemd_get_unitdir) \
+		--with-dir-user=bacula \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--enable-smartalloc \
+		--disable-afs \
+		--host=${CHOST} \
+		${myconf}
+}
+
+src_compile() {
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doicon scripts/bacula.png
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
+
+	# rename statically linked apps
+	if use bacula-clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bacula-fd bacula-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use bacula-clientonly; then
+	    # the database update scripts
+		diropts -m0750
+		insinto /usr/libexec/bacula/updatedb
+		insopts -m0754
+		doins "${S}"/updatedb/*
+		fperms 0640 /usr/libexec/bacula/updatedb/README
+
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bacula
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /etc/log.d/scripts/services
+			dodir /etc/log.d/scripts/shared
+			dodir /etc/log.d/conf/logfiles
+			dodir /etc/log.d/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	rm -vf "${D}"/usr/share/man/man1/bacula-bwxconsole.1*
+	rm -vf "${D}"/usr/share/man/man1/bat.1*
+	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
+	if use bacula-clientonly || use bacula-nodir; then
+		rm -vf "${D}"/usr/share/man/man8/bacula-dir.8*
+		rm -vf "${D}"/usr/share/man/man8/dbcheck.8*
+		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
+		rm -vf "${D}"/usr/libexec/bacula/create_*_database
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
+		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
+	fi
+	if use bacula-clientonly || use bacula-nosd; then
+		rm -vf "${D}"/usr/share/man/man8/bacula-sd.8*
+		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
+		rm -vf "${D}"/usr/share/man/man8/bextract.8*
+		rm -vf "${D}"/usr/share/man/man8/bls.8*
+		rm -vf "${D}"/usr/share/man/man8/bscan.8*
+		rm -vf "${D}"/usr/share/man/man8/btape.8*
+		rm -vf "${D}"/usr/libexec/bacula/disk-changer
+		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
+		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
+	fi
+
+	# documentation
+	dodoc ChangeLog ReleaseNotes SUPPORT technotes
+
+	# install examples (bug #457504)
+	if use examples; then
+		docinto examples/
+		dodoc -r examples/*
+	fi
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/bacula.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins scripts/filetype.vim bacula_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bacula-fd"
+	if ! use bacula-clientonly; then
+		if ! use bacula-nodir; then
+			myscripts="${myscripts} bacula-dir"
+		fi
+		if ! use bacula-nosd; then
+			myscripts="${myscripts} bacula-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependancy for the director init script
+		case "${script}" in
+			bacula-dir)
+				case "${mydbtype}" in
+					sqlite3)
+						# sqlite databases don't have a daemon
+						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
+						;;
+					*)
+						# all other databases have daemons
+						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
+						;;
+				esac
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
+	systemd_dotmpfilesd "${S}"/platforms/systemd/bacula.conf
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bacula
+
+	# make sure bacula group can execute bacula libexec scripts
+	fowners -R root:bacula /usr/libexec/bacula
+}
+
+pkg_postinst() {
+	if use bacula-clientonly; then
+		fowners root:bacula /var/lib/bacula
+	else
+		fowners bacula:bacula /var/lib/bacula
+	fi
+
+	einfo
+	einfo "This Revision 6 of bacula-5.2.13 dropped support for building 'bat' as"
+	einfo "Qt4 is not longer supported by Gentoo. Please use it only for installations"
+	einfo "requiring an old file demon."
+	einfo
+	if ! use bacula-clientonly && ! use bacula-nodir; then
+		einfo
+		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
+		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
+		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
+		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
+		einfo
+	fi
+
+	if use sqlite; then
+		einfo
+		einfo "Be aware that Bacula does not officially support SQLite database anymore."
+		einfo "Best use it only for a client-only installation. See Bug #445540."
+		einfo
+	fi
+
+	einfo "Please note that 'bconsole' will always be installed."
+	einfo
+}
diff --git a/app-backup/bacula/bacula-9.0.6-r2.ebuild b/app-backup/bacula/bacula-9.0.6-r2.ebuild
new file mode 100644
index 000000000000..879631e43da8
--- /dev/null
+++ b/app-backup/bacula/bacula-9.0.6-r2.ebuild
@@ -0,0 +1,427 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit qmake-utils desktop systemd user libtool
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="http://www.bacula.org/"
+SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+
+DEPEND="
+	dev-libs/gmp:0
+	!bacula-clientonly? (
+		postgres? ( dev-db/postgresql:=[threads] )
+		mysql? ( virtual/mysql )
+		sqlite? ( dev-db/sqlite:3 )
+		!bacula-nodir? ( virtual/mta )
+	)
+	qt5? (
+		dev-qt/qtsvg:5
+		x11-libs/qwt:6
+	)
+	logwatch? ( sys-apps/logwatch )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		acl? ( virtual/acl[static-libs] )
+		sys-libs/zlib[static-libs]
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		ssl? (
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+		)
+	)
+	!static? (
+		acl? ( virtual/acl )
+		sys-libs/zlib
+		dev-libs/lzo
+		sys-libs/ncurses:=
+		ssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)"
+RDEPEND="${DEPEND}
+	!bacula-clientonly? (
+		!bacula-nosd? (
+			sys-block/mtx
+			app-arch/mt-st
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+
+REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+				static? ( bacula-clientonly )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	#XOR and !bacula-clientonly controlled by REQUIRED_USE
+	use mysql && export mydbtype="mysql"
+	use postgres && export mydbtype="postgresql"
+	use sqlite && export mydbtype="sqlite3"
+
+	# create the daemon group and user
+	if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
+		enewgroup bacula
+		einfo
+		einfo "The group 'bacula' has been created. Any users you add to this"
+		einfo "group have access to files created by the daemons."
+		einfo
+	fi
+
+	if use bacula-clientonly && use static && use qt5; then
+		ewarn
+		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
+		ewarn
+	fi
+
+	if ! use bacula-clientonly; then
+		if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
+			enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw
+			einfo
+			einfo "The user 'bacula' has been created.  Please see the bacula manual"
+			einfo "for information about running bacula as a non-root user."
+			einfo
+		fi
+	fi
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bacula/<config> instead of ./<config>
+	pushd src >&/dev/null || die
+	for f in console/console.c dird/dird.c filed/filed.c \
+		stored/bcopy.c stored/bextract.c stored/bls.c \
+		stored/bscan.c stored/btape.c stored/stored.c \
+		qt-console/main.cpp; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# bug 466688 drop deprecated categories from Desktop file
+	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
+
+	# bug 466690 Use CXXFLAGS instead of CFLAGS
+	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
+	# drop automatic install of unneeded documentation (for bug 356499)
+	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
+
+	# bug #310087
+	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
+
+	# bug #311161
+	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
+
+	# bat needs to respect LDFLAGS and CFLAGS
+	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
+
+	# bug #328701
+	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
+
+	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-fix-static.patch
+
+	# fix soname in libbaccat.so bug #602952
+	eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
+
+	# do not strip binaries
+	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
+	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+
+	# fix file not found error during make depend
+	eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
+
+	# fix missing QtGlobal include in src/qt-console/pages.h for Qt5
+	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-fix-pages-h-qt-includes.patch
+	eapply_user
+
+	# Fix systemd unit files:
+	# bug 497748
+	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
+	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
+	# bug 504370
+	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
+	# bug 584442 and 504368
+	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
+
+	# build 'bat' for Qt5
+	export QMAKE="$(qt5_get_bindir)"/qmake
+
+	# adapt to >=Qt-5.9 (see bug #644566)
+	# qmake needs an existing target file to generate install instructions
+	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
+		src/qt-console/bat.pro.in || die
+	mkdir src/qt-console/.libs || die
+	touch src/qt-console/.libs/bat || die
+	chmod 755 src/qt-console/.libs/bat || die
+
+	# fix bundled libtool (bug 466696)
+	# But first move directory with M4 macros out of the way.
+	# It is only needed by autoconf and gives errors during elibtoolize.
+	mv autoconf/libtool autoconf/libtool1 || die
+	elibtoolize
+}
+
+src_configure() {
+	local myconf=''
+
+	if use bacula-clientonly; then
+		myconf="${myconf} \
+			$(use_enable bacula-clientonly client-only) \
+			$(use_enable !static libtool) \
+			$(use_enable static static-cons) \
+			$(use_enable static static-fd)"
+	else
+		myconf="${myconf} \
+			$(use_enable !bacula-nodir build-dird) \
+			$(use_enable !bacula-nosd build-stored)"
+		# bug #311099
+		# database support needed by dir-only *and* sd-only
+		# build as well (for building bscan, btape, etc.)
+		myconf="${myconf}
+			--with-${mydbtype}"
+		if use mysql; then
+		    myconf="${myconf} \
+			--disable-batch-insert"
+		else
+		    myconf="${myconf} \
+			--enable-batch-insert"
+		fi
+	fi
+
+	# do not build bat if 'static' clientonly
+	if ! use bacula-clientonly || ! use static; then
+		myconf="${myconf} \
+			$(use_enable qt5 bat)"
+	fi
+
+	myconf="${myconf} \
+		$(use_with X x) \
+		$(use_enable !readline conio) \
+		$(use_enable readline) \
+		$(use_with readline readline /usr) \
+		$(use_with ssl openssl) \
+		$(use_enable ipv6) \
+		$(use_enable acl) \
+		$(use_with tcpd tcp-wrappers)"
+
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--with-pid-dir=/var/run \
+		--sysconfdir=/etc/bacula \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-working-dir=/var/lib/bacula \
+		--with-logdir=/var/lib/bacula \
+		--with-scriptdir=/usr/libexec/bacula \
+		--with-systemd=$(systemd_get_systemunitdir) \
+		--with-dir-user=bacula \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--enable-smartalloc \
+		--disable-afs \
+		--host=${CHOST} \
+		${myconf}
+}
+
+src_compile() {
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doicon scripts/bacula.png
+
+	# install bat icon and desktop file when enabled
+	# (for some reason ./configure doesn't pick this up)
+	if use qt5 && ! use static ; then
+		doicon src/qt-console/images/bat_icon.png
+		domenu scripts/bat.desktop
+	fi
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
+
+	# rename statically linked apps
+	if use bacula-clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bacula-fd bacula-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use bacula-clientonly; then
+	    # the database update scripts
+		diropts -m0750
+		insinto /usr/libexec/bacula/updatedb
+		insopts -m0754
+		doins "${S}"/updatedb/*
+		fperms 0640 /usr/libexec/bacula/updatedb/README
+
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bacula
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /usr/share/logwatch/scripts/services
+			dodir /usr/share/logwatch/scripts/shared
+			dodir /etc/logwatch/conf/logfiles
+			dodir /etc/logwatch/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	if ! use qt5; then
+		rm -vf "${D}"/usr/share/man/man1/bat.1*
+	fi
+	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
+	if use bacula-clientonly || use bacula-nodir; then
+		rm -vf "${D}"/usr/share/man/man8/bacula-dir.8*
+		rm -vf "${D}"/usr/share/man/man8/dbcheck.8*
+		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
+		rm -vf "${D}"/usr/libexec/bacula/create_*_database
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
+		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
+	fi
+	if use bacula-clientonly || use bacula-nosd; then
+		rm -vf "${D}"/usr/share/man/man8/bacula-sd.8*
+		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
+		rm -vf "${D}"/usr/share/man/man8/bextract.8*
+		rm -vf "${D}"/usr/share/man/man8/bls.8*
+		rm -vf "${D}"/usr/share/man/man8/bscan.8*
+		rm -vf "${D}"/usr/share/man/man8/btape.8*
+		rm -vf "${D}"/usr/libexec/bacula/disk-changer
+		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
+		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
+	fi
+
+	# documentation
+	dodoc ChangeLog ReleaseNotes SUPPORT
+
+	# install examples (bug #457504)
+	if use examples; then
+		docinto examples/
+		dodoc -r examples/*
+	fi
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/bacula.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins scripts/filetype.vim bacula_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bacula-fd"
+	if ! use bacula-clientonly; then
+		if ! use bacula-nodir; then
+			myscripts="${myscripts} bacula-dir"
+		fi
+		if ! use bacula-nosd; then
+			myscripts="${myscripts} bacula-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependancy for the director init script
+		case "${script}" in
+			bacula-dir)
+				case "${mydbtype}" in
+					sqlite3)
+						# sqlite databases don't have a daemon
+						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
+						;;
+					*)
+						# all other databases have daemons
+						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
+						;;
+				esac
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bacula
+
+	# make sure bacula group can execute bacula libexec scripts
+	fowners -R root:bacula /usr/libexec/bacula
+}
+
+pkg_postinst() {
+	if use bacula-clientonly; then
+		fowners root:bacula /var/lib/bacula
+	else
+		fowners bacula:bacula /var/lib/bacula
+	fi
+
+	if ! use bacula-clientonly && ! use bacula-nodir; then
+		einfo
+		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
+		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
+		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
+		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
+		einfo
+
+		ewarn "ATTENTION!"
+		ewarn "The format of the database may have changed."
+		ewarn "If you just upgraded from a version below 9.0.0 you must run"
+		ewarn "'update_bacula_tables' now."
+		ewarn "Make sure to have a backup of your catalog before."
+		ewarn
+	fi
+
+	if use sqlite; then
+		einfo
+		einfo "Be aware that Bacula does not officially support SQLite database anymore."
+		einfo "Best use it only for a client-only installation. See Bug #445540."
+		einfo
+	fi
+
+	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
+	einfo "you have to enable 'USE=qt5'."
+	einfo
+}
diff --git a/app-backup/bacula/bacula-9.0.6-r3.ebuild b/app-backup/bacula/bacula-9.0.6-r3.ebuild
new file mode 100644
index 000000000000..f30acaa0b53f
--- /dev/null
+++ b/app-backup/bacula/bacula-9.0.6-r3.ebuild
@@ -0,0 +1,430 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit qmake-utils desktop systemd user libtool
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="http://www.bacula.org/"
+SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+
+DEPEND="
+	dev-libs/gmp:0
+	!bacula-clientonly? (
+		postgres? ( dev-db/postgresql:=[threads] )
+		mysql? ( virtual/mysql )
+		sqlite? ( dev-db/sqlite:3 )
+		!bacula-nodir? ( virtual/mta )
+	)
+	qt5? (
+		dev-qt/qtsvg:5
+		x11-libs/qwt:6
+	)
+	logwatch? ( sys-apps/logwatch )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		acl? ( virtual/acl[static-libs] )
+		sys-libs/zlib[static-libs]
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		ssl? (
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+		)
+	)
+	!static? (
+		acl? ( virtual/acl )
+		sys-libs/zlib
+		dev-libs/lzo
+		sys-libs/ncurses:=
+		ssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)"
+RDEPEND="${DEPEND}
+	!bacula-clientonly? (
+		!bacula-nosd? (
+			sys-block/mtx
+			app-arch/mt-st
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+
+REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+				static? ( bacula-clientonly )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	#XOR and !bacula-clientonly controlled by REQUIRED_USE
+	use mysql && export mydbtype="mysql"
+	use postgres && export mydbtype="postgresql"
+	use sqlite && export mydbtype="sqlite3"
+
+	# create the daemon group and user
+	if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
+		enewgroup bacula
+		einfo
+		einfo "The group 'bacula' has been created. Any users you add to this"
+		einfo "group have access to files created by the daemons."
+		einfo
+	fi
+
+	if use bacula-clientonly && use static && use qt5; then
+		ewarn
+		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
+		ewarn
+	fi
+
+	if ! use bacula-clientonly; then
+		if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
+			enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw
+			einfo
+			einfo "The user 'bacula' has been created.  Please see the bacula manual"
+			einfo "for information about running bacula as a non-root user."
+			einfo
+		fi
+	fi
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bacula/<config> instead of ./<config>
+	pushd src >&/dev/null || die
+	for f in console/console.c dird/dird.c filed/filed.c \
+		stored/bcopy.c stored/bextract.c stored/bls.c \
+		stored/bscan.c stored/btape.c stored/stored.c \
+		qt-console/main.cpp; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# bug 466688 drop deprecated categories from Desktop file
+	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
+
+	# bug 466690 Use CXXFLAGS instead of CFLAGS
+	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
+	# drop automatic install of unneeded documentation (for bug 356499)
+	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
+
+	# bug #310087
+	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
+
+	# bug #311161
+	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
+
+	# bat needs to respect LDFLAGS and CFLAGS
+	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
+
+	# bug #328701
+	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
+
+	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-fix-static.patch
+
+	# fix soname in libbaccat.so bug #602952
+	eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
+
+	# do not strip binaries
+	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
+	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+
+	# fix file not found error during make depend
+	eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
+
+	# fix missing QtGlobal include in src/qt-console/pages.h for Qt5
+	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-fix-pages-h-qt-includes.patch
+	eapply_user
+
+	# Fix systemd unit files:
+	# bug 497748
+	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
+	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
+	# bug 504370
+	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
+	# bug 584442 and 504368
+	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
+
+	# build 'bat' for Qt5
+	export QMAKE="$(qt5_get_bindir)"/qmake
+
+	# adapt to >=Qt-5.9 (see bug #644566)
+	# qmake needs an existing target file to generate install instructions
+	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
+		src/qt-console/bat.pro.in || die
+	mkdir src/qt-console/.libs || die
+	touch src/qt-console/.libs/bat || die
+	chmod 755 src/qt-console/.libs/bat || die
+
+	# fix wrong handling of libressl version
+	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-libressl.patch
+
+	# fix bundled libtool (bug 466696)
+	# But first move directory with M4 macros out of the way.
+	# It is only needed by autoconf and gives errors during elibtoolize.
+	mv autoconf/libtool autoconf/libtool1 || die
+	elibtoolize
+}
+
+src_configure() {
+	local myconf=''
+
+	if use bacula-clientonly; then
+		myconf="${myconf} \
+			$(use_enable bacula-clientonly client-only) \
+			$(use_enable !static libtool) \
+			$(use_enable static static-cons) \
+			$(use_enable static static-fd)"
+	else
+		myconf="${myconf} \
+			$(use_enable !bacula-nodir build-dird) \
+			$(use_enable !bacula-nosd build-stored)"
+		# bug #311099
+		# database support needed by dir-only *and* sd-only
+		# build as well (for building bscan, btape, etc.)
+		myconf="${myconf}
+			--with-${mydbtype}"
+		if use mysql; then
+		    myconf="${myconf} \
+			--disable-batch-insert"
+		else
+		    myconf="${myconf} \
+			--enable-batch-insert"
+		fi
+	fi
+
+	# do not build bat if 'static' clientonly
+	if ! use bacula-clientonly || ! use static; then
+		myconf="${myconf} \
+			$(use_enable qt5 bat)"
+	fi
+
+	myconf="${myconf} \
+		$(use_with X x) \
+		$(use_enable !readline conio) \
+		$(use_enable readline) \
+		$(use_with readline readline /usr) \
+		$(use_with ssl openssl) \
+		$(use_enable ipv6) \
+		$(use_enable acl) \
+		$(use_with tcpd tcp-wrappers)"
+
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--with-pid-dir=/var/run \
+		--sysconfdir=/etc/bacula \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-working-dir=/var/lib/bacula \
+		--with-logdir=/var/lib/bacula \
+		--with-scriptdir=/usr/libexec/bacula \
+		--with-systemd=$(systemd_get_systemunitdir) \
+		--with-dir-user=bacula \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--enable-smartalloc \
+		--disable-afs \
+		--host=${CHOST} \
+		${myconf}
+}
+
+src_compile() {
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doicon scripts/bacula.png
+
+	# install bat icon and desktop file when enabled
+	# (for some reason ./configure doesn't pick this up)
+	if use qt5 && ! use static ; then
+		doicon src/qt-console/images/bat_icon.png
+		domenu scripts/bat.desktop
+	fi
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
+
+	# rename statically linked apps
+	if use bacula-clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bacula-fd bacula-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use bacula-clientonly; then
+	    # the database update scripts
+		diropts -m0750
+		insinto /usr/libexec/bacula/updatedb
+		insopts -m0754
+		doins "${S}"/updatedb/*
+		fperms 0640 /usr/libexec/bacula/updatedb/README
+
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bacula
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /usr/share/logwatch/scripts/services
+			dodir /usr/share/logwatch/scripts/shared
+			dodir /etc/logwatch/conf/logfiles
+			dodir /etc/logwatch/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	if ! use qt5; then
+		rm -vf "${D}"/usr/share/man/man1/bat.1*
+	fi
+	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
+	if use bacula-clientonly || use bacula-nodir; then
+		rm -vf "${D}"/usr/share/man/man8/bacula-dir.8*
+		rm -vf "${D}"/usr/share/man/man8/dbcheck.8*
+		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
+		rm -vf "${D}"/usr/libexec/bacula/create_*_database
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
+		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
+	fi
+	if use bacula-clientonly || use bacula-nosd; then
+		rm -vf "${D}"/usr/share/man/man8/bacula-sd.8*
+		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
+		rm -vf "${D}"/usr/share/man/man8/bextract.8*
+		rm -vf "${D}"/usr/share/man/man8/bls.8*
+		rm -vf "${D}"/usr/share/man/man8/bscan.8*
+		rm -vf "${D}"/usr/share/man/man8/btape.8*
+		rm -vf "${D}"/usr/libexec/bacula/disk-changer
+		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
+		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
+	fi
+
+	# documentation
+	dodoc ChangeLog ReleaseNotes SUPPORT
+
+	# install examples (bug #457504)
+	if use examples; then
+		docinto examples/
+		dodoc -r examples/*
+	fi
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/bacula.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins scripts/filetype.vim bacula_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bacula-fd"
+	if ! use bacula-clientonly; then
+		if ! use bacula-nodir; then
+			myscripts="${myscripts} bacula-dir"
+		fi
+		if ! use bacula-nosd; then
+			myscripts="${myscripts} bacula-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependancy for the director init script
+		case "${script}" in
+			bacula-dir)
+				case "${mydbtype}" in
+					sqlite3)
+						# sqlite databases don't have a daemon
+						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
+						;;
+					*)
+						# all other databases have daemons
+						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
+						;;
+				esac
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bacula
+
+	# make sure bacula group can execute bacula libexec scripts
+	fowners -R root:bacula /usr/libexec/bacula
+}
+
+pkg_postinst() {
+	if use bacula-clientonly; then
+		fowners root:bacula /var/lib/bacula
+	else
+		fowners bacula:bacula /var/lib/bacula
+	fi
+
+	if ! use bacula-clientonly && ! use bacula-nodir; then
+		einfo
+		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
+		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
+		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
+		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
+		einfo
+
+		ewarn "ATTENTION!"
+		ewarn "The format of the database may have changed."
+		ewarn "If you just upgraded from a version below 9.0.0 you must run"
+		ewarn "'update_bacula_tables' now."
+		ewarn "Make sure to have a backup of your catalog before."
+		ewarn
+	fi
+
+	if use sqlite; then
+		einfo
+		einfo "Be aware that Bacula does not officially support SQLite database anymore."
+		einfo "Best use it only for a client-only installation. See Bug #445540."
+		einfo
+	fi
+
+	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
+	einfo "you have to enable 'USE=qt5'."
+	einfo
+}
diff --git a/app-backup/bacula/files/5.2.10/bacula-5.2.10-fix-static.patch b/app-backup/bacula/files/5.2.10/bacula-5.2.10-fix-static.patch
new file mode 100644
index 000000000000..458c188733a4
--- /dev/null
+++ b/app-backup/bacula/files/5.2.10/bacula-5.2.10-fix-static.patch
@@ -0,0 +1,56 @@
+--- src/console/Makefile.in.orig	2011-10-30 14:10:41.100802721 -0400
++++ src/console/Makefile.in	2011-10-30 14:14:42.330488174 -0400
+@@ -29,10 +29,11 @@
+ GETTEXT_LIBS = @LIBINTL@
+ 
+ CONS_INC=@CONS_INC@
+ CONS_LIBS=@CONS_LIBS@
+ CONS_LDFLAGS=@CONS_LDFLAGS@
++ZLIBS=@ZLIBS@
+ 
+ .SUFFIXES:	.c .o
+ .PHONY:
+ .DONTCARE:
+ 
+@@ -46,17 +47,17 @@
+ 	@echo " "
+ 
+ 
+ bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+ 	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
+-	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
+-	      $(OPENSSL_LIBS)
++	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
++	      $(OPENSSL_LIBS) $(LIBS)
+ 
+ static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+ 	$(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
+-	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
+-	      $(OPENSSL_LIBS)
++	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
++	      $(OPENSSL_LIBS) $(LIBS) $(ZLIBS)
+ 	strip $@
+ 
+ 
+ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
+ 	cd $(topdir) \
+--- src/filed/Makefile.in.orig	2012-06-28 16:52:03.000000000 +0200
++++ src/filed/Makefile.in	2012-08-16 11:08:09.000000000 +0200
+@@ -96,13 +96,13 @@
+ bacula-fd:  Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
+ 	@echo "Linking $@ ..."
+ 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
+-	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \
+-	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS)
++	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) \
++	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS)
+ 
+ static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
+ 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
+-	   $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \
+-	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS)
++	   $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) \
++	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS)
+ 	strip $@
+ 
+ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
diff --git a/app-backup/bacula/files/5.2.12/bacula-5.2.12-depend.patch b/app-backup/bacula/files/5.2.12/bacula-5.2.12-depend.patch
new file mode 100644
index 000000000000..8c419a3bdfac
--- /dev/null
+++ b/app-backup/bacula/files/5.2.12/bacula-5.2.12-depend.patch
@@ -0,0 +1,12 @@
+# fix file not found error during make depend
+--- src/tools/Makefile.in.orig	2012-09-20 20:42:54.000000000 +0200
++++ src/tools/Makefile.in	2012-09-20 20:35:46.000000000 +0200
+@@ -194,7 +194,7 @@
+ 	@$(MV) Makefile Makefile.bak
+ 	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
+ 	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
+-	@$(CXX) -S -M $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile
++	@$(CXX) -S -M $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) -I../filed -I../dird -I../stored *.c >> Makefile
+ 	@if test -f Makefile ; then \
+ 	    $(RMF) Makefile.bak; \
+ 	else \
diff --git a/app-backup/bacula/files/5.2.3/bacula-5.2.3-Makefile.patch b/app-backup/bacula/files/5.2.3/bacula-5.2.3-Makefile.patch
new file mode 100644
index 000000000000..3cdee15d4db7
--- /dev/null
+++ b/app-backup/bacula/files/5.2.3/bacula-5.2.3-Makefile.patch
@@ -0,0 +1,27 @@
+# stop build if there are errors in subdirs
+--- Makefile.in.orig	2010-07-20 16:53:44.000000000 +0000
++++ Makefile.in	2010-07-20 16:55:50.000000000 +0000
+@@ -44,9 +44,8 @@
+ 
+ all: Makefile
+ 	@for I in ${all_subdirs}; \
+-	  do (cd $$I; echo "==>Entering directory `pwd`"; \
+-	      $(MAKE) DESTDIR=$(DESTDIR) $@ || (echo ""; echo ""; echo "  ====== Error in `pwd` ======"; \
+-			    echo ""; echo ""; exit 1;)); \
++	  do \
++	      $(MAKE) DESTDIR=$(DESTDIR) -C $$I $@ || exit 1; \
+ 	done
+ 
+ depend:
+@@ -55,9 +54,8 @@
+ 	
+ bacula-fd: Makefile	   
+ 	@for I in ${fd_subdirs}; \
+-	  do (cd $$I; echo "==>Entering directory `pwd`"; \
+-	      $(MAKE) DESTDIR=$(DESTDIR) all || (echo ""; echo ""; echo "   ====== Error in `pwd` ======"; \
+-			    echo ""; echo ""; exit 1;)); \
++	  do \
++	        $(MAKE) DESTDIR=$(DESTDIR) -C $$I all ||  exit 1; \
+ 	done
+ 
+ #-------------------------------------------------------------------------
diff --git a/app-backup/bacula/files/5.2.3/bacula-5.2.3-as-needed.patch b/app-backup/bacula/files/5.2.3/bacula-5.2.3-as-needed.patch
new file mode 100644
index 000000000000..4b52d214cf76
--- /dev/null
+++ b/app-backup/bacula/files/5.2.3/bacula-5.2.3-as-needed.patch
@@ -0,0 +1,14 @@
+# see bug #310087 
+diff -urN bacula-5.2.1.orig/src/findlib/Makefile.in bacula-5.2.1/src/findlib/Makefile.in
+--- bacula-5.2.1.orig/src/findlib/Makefile.in	2010-02-24 16:33:48.000000000 +0100
++++ bacula-5.2.1/src/findlib/Makefile.in	2010-03-22 17:37:43.772805754 +0100
+@@ -59,7 +59,7 @@
+ 
+ libbacfind.la: Makefile $(LIBBACFIND_LOBJS) 
+ 	@echo "Making $@ ..."
+-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_RELEASE)
++	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_RELEASE) -L../lib -lbac $(LIBS) $(OPENSSL_LIBS)
+ 
+ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
+ 	cd $(topdir) \
+
diff --git a/app-backup/bacula/files/5.2.3/bacula-5.2.3-doc.patch b/app-backup/bacula/files/5.2.3/bacula-5.2.3-doc.patch
new file mode 100644
index 000000000000..98c6e6ce34be
--- /dev/null
+++ b/app-backup/bacula/files/5.2.3/bacula-5.2.3-doc.patch
@@ -0,0 +1,13 @@
+# drop automatic installation of doc files
+--- Makefile.in.orig	2011-02-26 09:05:21.000000000 +0000
++++ Makefile.in	2011-02-26 09:06:01.000000000 +0000
+@@ -34,8 +34,7 @@
+ 	autoconf/config.h.in  autoconf/acconfig.h  autoconf/Make.common.in \
+ 	autoconf/install-sh autoconf/mkinstalldirs
+ 
+-doc_files = VERIFYING technotes ChangeLog README ReleaseNotes LICENSE \
+-	    INSTALL
++doc_files = 
+ 
+ MKDIR = $(srcdir)/autoconf/mkinstalldirs
+ LIBTOOL_DEPS = @LIBTOOL_DEPS@
diff --git a/app-backup/bacula/files/5.2.3/bacula-5.2.3-ldflags.patch b/app-backup/bacula/files/5.2.3/bacula-5.2.3-ldflags.patch
new file mode 100644
index 000000000000..94d8fb60120e
--- /dev/null
+++ b/app-backup/bacula/files/5.2.3/bacula-5.2.3-ldflags.patch
@@ -0,0 +1,11 @@
+# bat needs to respect LDFLAGS
+--- src/qt-console/bat.pro.in.orig	2010-07-20 18:28:50.000000000 +0000
++++ src/qt-console/bat.pro.in	2010-07-20 18:29:25.000000000 +0000
+@@ -26,6 +26,7 @@
+ QMAKE_LINK   = $${LIBTOOL_LINK} $(CXX)
+ QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
+ QMAKE_CLEAN += .libs/* bat
++QMAKE_LFLAGS += @LDFLAGS@
+ 
+ qwt {
+   INCLUDEPATH += @QWT_INC@ 
diff --git a/app-backup/bacula/files/5.2.3/bacula-5.2.3-lib-search-path.patch b/app-backup/bacula/files/5.2.3/bacula-5.2.3-lib-search-path.patch
new file mode 100644
index 000000000000..c3bded40ad03
--- /dev/null
+++ b/app-backup/bacula/files/5.2.3/bacula-5.2.3-lib-search-path.patch
@@ -0,0 +1,12 @@
+# If upgrading the old libraries gets linked first. So fix order of lib search path.
+--- src/console/Makefile.in.orig	2010-03-29 11:35:00.000000000 +0000
++++ src/console/Makefile.in	2010-03-29 11:45:14.000000000 +0000
+@@ -47,7 +47,7 @@
+ 
+ 
+ bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+-	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
++	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
+ 	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
+ 	      $(OPENSSL_LIBS)
+ 
diff --git a/app-backup/bacula/files/5.2.3/bacula-5.2.3-openssl-1.patch b/app-backup/bacula/files/5.2.3/bacula-5.2.3-openssl-1.patch
new file mode 100644
index 000000000000..58d26316ca7d
--- /dev/null
+++ b/app-backup/bacula/files/5.2.3/bacula-5.2.3-openssl-1.patch
@@ -0,0 +1,25 @@
+http://bugs.gentoo.org/328701
+http://cvs.fedoraproject.org/viewvc/rpms/bacula/devel/bacula-5.0.2-openssl.patch?revision=1.3&view=markup
+
+--- src/lib/crypto.c
++++ src/lib/crypto.c
+@@ -51,7 +51,7 @@
+  * For OpenSSL version 1.x, EVP_PKEY_encrypt no longer
+  *  exists.  It was not an official API.
+  */
+-#ifdef HAVE_OPENSSLv1
++#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
+ #define EVP_PKEY_encrypt EVP_PKEY_encrypt_old
+ #define EVP_PKEY_decrypt EVP_PKEY_decrypt_old
+ #endif
+--- src/lib/tls.c
++++ src/lib/tls.c
+@@ -315,7 +315,7 @@ bool tls_postconnect_verify_host(JCR *jc
+          extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
+ 
+          if (strcmp(extname, "subjectAltName") == 0) {
+-#ifdef HAVE_OPENSSLv1
++#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
+             const X509V3_EXT_METHOD *method;
+ #else
+             X509V3_EXT_METHOD *method;
diff --git a/app-backup/bacula/files/7.0.2/bacula-7.0.2-depend.patch b/app-backup/bacula/files/7.0.2/bacula-7.0.2-depend.patch
new file mode 100644
index 000000000000..e076cd6478cc
--- /dev/null
+++ b/app-backup/bacula/files/7.0.2/bacula-7.0.2-depend.patch
@@ -0,0 +1,12 @@
+# fix file not found error during make depend
+--- src/tools/Makefile.in.orig	2012-09-20 20:42:54.000000000 +0200
++++ src/tools/Makefile.in	2012-09-20 20:35:46.000000000 +0200
+@@ -194,7 +194,7 @@
+ 	@$(MV) Makefile Makefile.bak
+ 	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
+ 	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
+-	@$(CXX) -S -M $(CPPFLAGS) -I$(srcdir) -I$(basedir) *.c >> Makefile
++	@$(CXX) -S -M $(CPPFLAGS) -I$(srcdir) -I$(basedir) -I../filed -I../dird -I../stored *.c >> Makefile
+ 	@if test -f Makefile ; then \
+ 	    $(RMF) Makefile.bak; \
+ 	else \
diff --git a/app-backup/bacula/files/7.2.0/bacula-7.2.0-doc.patch b/app-backup/bacula/files/7.2.0/bacula-7.2.0-doc.patch
new file mode 100644
index 000000000000..155746a876dd
--- /dev/null
+++ b/app-backup/bacula/files/7.2.0/bacula-7.2.0-doc.patch
@@ -0,0 +1,12 @@
+--- Makefile.in.orig	2015-09-03 20:03:22.000000000 +0200
++++ Makefile.in	2015-09-03 20:03:50.000000000 +0200
+@@ -35,8 +35,7 @@
+ 	autoconf/config.h.in  autoconf/acconfig.h  autoconf/Make.common.in \
+ 	autoconf/install-sh autoconf/mkinstalldirs
+ 
+-doc_files = VERIFYING ChangeLog README ReleaseNotes LICENSE \
+-	    LICENSE-FAQ LICENSE-FOSS INSTALL
++doc_files =
+ 
+ MKDIR = $(srcdir)/autoconf/mkinstalldirs
+ LIBTOOL_DEPS = @LIBTOOL_DEPS@
diff --git a/app-backup/bacula/files/7.2.0/bacula-7.2.0-fix-static.patch b/app-backup/bacula/files/7.2.0/bacula-7.2.0-fix-static.patch
new file mode 100644
index 000000000000..faf0d065b90f
--- /dev/null
+++ b/app-backup/bacula/files/7.2.0/bacula-7.2.0-fix-static.patch
@@ -0,0 +1,56 @@
+--- src/console/Makefile.in.orig	2011-10-30 14:10:41.100802721 -0400
++++ src/console/Makefile.in	2011-10-30 14:14:42.330488174 -0400
+@@ -29,10 +29,11 @@
+ GETTEXT_LIBS = @LIBINTL@
+ 
+ CONS_INC=@CONS_INC@
+ CONS_LIBS=@CONS_LIBS@
+ CONS_LDFLAGS=@CONS_LDFLAGS@
++ZLIBS=@ZLIBS@
+ 
+ .SUFFIXES:	.c .o
+ .PHONY:
+ .DONTCARE:
+ 
+@@ -46,17 +47,17 @@
+ 	@echo " "
+ 
+ 
+ bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+ 	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
+-	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
+-	      $(OPENSSL_LIBS)
++	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
++	      $(OPENSSL_LIBS) $(LIBS)
+ 
+ static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+ 	$(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
+-	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
+-	      $(OPENSSL_LIBS)
++	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
++	      $(OPENSSL_LIBS) $(LIBS) $(ZLIBS)
+ 	strip $@
+ 
+ 
+ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
+ 	cd $(topdir) \
+--- src/filed/Makefile.in.orig	2015-09-04 12:47:13.000000000 +0200
++++ src/filed/Makefile.in	2015-09-04 12:49:39.000000000 +0200
+@@ -66,13 +66,13 @@
+ bacula-fd:  Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+ 	@echo "Linking $@ ..."
+ 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
+-	  $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
+-	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
++	  $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
++	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
+ 
+ static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+ 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
+-	   $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
+-	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
++	   $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
++	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
+ 	strip $@
+ 
+ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
diff --git a/app-backup/bacula/files/9.0.2/bacula-9.0.2-fix-static.patch b/app-backup/bacula/files/9.0.2/bacula-9.0.2-fix-static.patch
new file mode 100644
index 000000000000..bf6630a74a29
--- /dev/null
+++ b/app-backup/bacula/files/9.0.2/bacula-9.0.2-fix-static.patch
@@ -0,0 +1,63 @@
+--- src/console/Makefile.in.orig	2017-07-25 19:03:05.664760298 +0200
++++ src/console/Makefile.in	2017-07-25 19:05:43.576706091 +0200
+@@ -24,6 +24,7 @@
+ CONSSRCS = console.c console_conf.c authenticate.c @CONS_SRC@
+ CONSOBJS = console.o console_conf.o authenticate.o @CONS_OBJ@
+ JSONOBJS = bbconsjson.o console_conf.o
++ZLIBS=@ZLIBS@
+ 
+ # these are the objects that are changed by the .configure process
+ EXTRAOBJS = @OBJLIST@
+@@ -50,18 +51,18 @@
+ 
+ bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+ 	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
+-	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
+-	      $(OPENSSL_LIBS)
++	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
++	      $(OPENSSL_LIBS) $(LIBS)
+ 
+ bbconsjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+ 	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(JSONOBJS) \
+-	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
+-	      $(OPENSSL_LIBS)
++	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
++	      $(OPENSSL_LIBS) $(LIBS)
+ 
+ static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+ 	$(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
+-	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
+-	      $(OPENSSL_LIBS)
++	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
++	      $(OPENSSL_LIBS) $(LIBS)
+ 	strip $@
+ 
+ 
+--- src/filed/Makefile.in.orig	2017-07-25 19:09:19.655852979 +0200
++++ src/filed/Makefile.in	2017-07-25 19:11:39.519558592 +0200
+@@ -69,19 +69,19 @@
+ bacula-fd:  Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+ 	@echo "Linking $@ ..."
+ 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
+-	  $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
+-	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
++	  $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
++	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
+ 
+ bfdjson:  Makefile $(JSONOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
+ 	@echo "Linking $@ ..."
+ 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(JSONOBJS) \
+-	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
+-	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
++	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
++	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
+ 
+ static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+ 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
+-	   $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
+-	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
++	   $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
++	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
+ 	strip $@
+ 
+ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
diff --git a/app-backup/bacula/files/9.0.2/bacula-9.0.2-lib-search-path.patch b/app-backup/bacula/files/9.0.2/bacula-9.0.2-lib-search-path.patch
new file mode 100644
index 000000000000..33cf83dcf150
--- /dev/null
+++ b/app-backup/bacula/files/9.0.2/bacula-9.0.2-lib-search-path.patch
@@ -0,0 +1,25 @@
+# If upgrading the old libraries gets linked first. So fix order of 
+# lib search path.
+--- src/console/Makefile.in.orig	2017-07-26 15:03:07.000000000 +0200
++++ src/console/Makefile.in	2017-07-23 18:31:57.000000000 +0200
+@@ -49,17 +49,17 @@
+ 
+ 
+ bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+-	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
++	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
+ 	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
+ 	      $(OPENSSL_LIBS)
+ 
+ bbconsjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+-	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(JSONOBJS) \
++	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(JSONOBJS) \
+ 	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
+ 	      $(OPENSSL_LIBS)
+ 
+ static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+-	$(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
++	$(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
+ 	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
+ 	      $(OPENSSL_LIBS)
+ 	strip $@
diff --git a/app-backup/bacula/files/9.0.6/bacula-9.0.6-bat-pro.patch b/app-backup/bacula/files/9.0.6/bacula-9.0.6-bat-pro.patch
new file mode 100644
index 000000000000..3d055b8c3077
--- /dev/null
+++ b/app-backup/bacula/files/9.0.6/bacula-9.0.6-bat-pro.patch
@@ -0,0 +1,21 @@
+--- src/qt-console/bat.pro.in.orig	2018-02-18 16:17:21.027921363 +0100
++++ src/qt-console/bat.pro.in	2018-02-18 16:18:12.554137528 +0100
+@@ -12,7 +12,7 @@
+ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+ 
+ bins.path = /$(DESTDIR)@sbindir@
+-bins.files = bat
++bins.files = .libs/bat
+ confs.path = /$(DESTDIR)@sysconfdir@
+ confs.commands = ./install_conf_file
+ help.path = /$(DESTDIR)@docdir@
+@@ -29,6 +29,9 @@
+ QMAKE_LINK   = $${LIBTOOL_LINK} $(CXX)
+ QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
+ QMAKE_CLEAN += .libs/* bat
++QMAKE_LFLAGS += @LDFLAGS@
++QMAKE_CFLAGS += @CFLAGS@
++QMAKE_CXXFLAGS += @CXXFLAGS@
+ 
+ qwt {
+   INCLUDEPATH += @QWT_INC@
diff --git a/app-backup/bacula/files/9.0.6/bacula-9.0.6-fix-pages-h-qt-includes.patch b/app-backup/bacula/files/9.0.6/bacula-9.0.6-fix-pages-h-qt-includes.patch
new file mode 100644
index 000000000000..9d6507c9c71a
--- /dev/null
+++ b/app-backup/bacula/files/9.0.6/bacula-9.0.6-fix-pages-h-qt-includes.patch
@@ -0,0 +1,15 @@
+--- src/qt-console/pages.h.orig 2017-11-21 12:37:16.000000000 -0500
++++ src/qt-console/pages.h      2018-02-07 13:11:46.223273248 -0500
+@@ -20,10 +20,11 @@
+ */
+ /*
+  *   Dirk Bartley, March 2007
+  */
+
++#include <QtGlobal>
+ #if QT_VERSION >= 0x050000
+ #include <QtWidgets>
+ #else
+ #include <QtGui>
+ #endif
+
diff --git a/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl.patch b/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl.patch
new file mode 100644
index 000000000000..3df4285c2e2e
--- /dev/null
+++ b/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl.patch
@@ -0,0 +1,62 @@
+--- src/lib/crypto.c.orig       2018-02-02 15:34:39.420489000 -0600
++++ src/lib/crypto.c    2018-02-02 15:35:44.000524000 -0600
+@@ -195,7 +195,7 @@
+ IMPLEMENT_ASN1_FUNCTIONS(SignatureData)
+ IMPLEMENT_ASN1_FUNCTIONS(CryptoData)
+
+-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
++#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) )
+ DEFINE_STACK_OF(SignerInfo);
+ DEFINE_STACK_OF(RecipientInfo);
+ #else
+--- src/lib/openssl-compat.h.orig       2018-02-02 15:26:04.182557000 -0600
++++ src/lib/openssl-compat.h    2018-02-02 15:27:50.229100000 -0600
+@@ -1,7 +1,7 @@
+ #ifndef __OPENSSL_COPMAT__H__
+ #define __OPENSSL_COPMAT__H__
+
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) )
+ static inline int EVP_PKEY_up_ref(EVP_PKEY *pkey)
+ {
+        CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY);
+--- src/lib/openssl.c.orig	2018-02-16 08:36:24.092583000 -0600
++++ src/lib/openssl.c	2018-02-16 08:37:23.795454000 -0600
+@@ -69,7 +69,7 @@
+    }
+ }
+ 
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) )
+ /* Array of mutexes for use with OpenSSL static locking */
+ static pthread_mutex_t *mutexes;
+ 
+@@ -263,7 +263,7 @@
+ {
+    int stat = 0;
+ 
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) )
+    if ((stat = openssl_init_threads()) != 0) {
+       berrno be;
+       Jmsg1(NULL, M_ABORT, 0,
+@@ -310,7 +310,7 @@
+       Jmsg0(NULL, M_ERROR, 0, _("Failed to save OpenSSL PRNG\n"));
+    }
+ 
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) )
+    openssl_cleanup_threads();
+ 
+    /* Free libssl and libcrypto error strings */
+--- src/lib/tls.c.orig	2017-11-21 18:37:16.000000000 +0100
++++ src/lib/tls.c	2018-04-16 20:00:54.082000000 +0200
+@@ -116,7 +116,7 @@
+    ctx = (TLS_CONTEXT *)malloc(sizeof(TLS_CONTEXT));
+ 
+    /* Allocate our OpenSSL TLS Context */
+-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
++#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) )
+    /* Allows SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols */
+    ctx->openssl = SSL_CTX_new(TLS_method());
+ 
diff --git a/app-backup/bacula/files/bacula-dir.confd b/app-backup/bacula/files/bacula-dir.confd
new file mode 100644
index 000000000000..59f684660cda
--- /dev/null
+++ b/app-backup/bacula/files/bacula-dir.confd
@@ -0,0 +1,16 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Config file for /etc/init.d/bacula-dir
+
+# If the database server where you store your bacula catalog
+# is on a different machine, please set this to 0.
+# Setting it to 1 makes bacula-dir depend on the corresponding
+# database service selected at package compile time.
+LOCAL_DB=1
+
+# Options for the director daemon.
+# The director can be run as a non-root user, however
+# please ensure that this user has proper permissions to
+# access your backup devices.
+DIR_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-dir.conf"
diff --git a/app-backup/bacula/files/bacula-dir.initd b/app-backup/bacula/files/bacula-dir.initd
new file mode 100644
index 000000000000..0601ca56e2c4
--- /dev/null
+++ b/app-backup/bacula/files/bacula-dir.initd
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+	if [ "${LOCAL_DB}" -eq 1 ]; then
+		need "%database%"
+	fi
+	use dns bacula-fd bacula-sd
+}
+
+start() {
+	ebegin "Starting bacula director"
+	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-dir \
+		-- ${DIR_OPTIONS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping bacula director"
+	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-dir.*.pid
+	eend $?
+}
diff --git a/app-backup/bacula/files/bacula-fd.confd b/app-backup/bacula/files/bacula-fd.confd
new file mode 100644
index 000000000000..eed82ccbc6f4
--- /dev/null
+++ b/app-backup/bacula/files/bacula-fd.confd
@@ -0,0 +1,7 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Config file for /etc/init.d/bacula-fd
+
+# Options for the file daemon.
+FD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-fd.conf"
diff --git a/app-backup/bacula/files/bacula-fd.initd b/app-backup/bacula/files/bacula-fd.initd
new file mode 100644
index 000000000000..1cc636edbf9c
--- /dev/null
+++ b/app-backup/bacula/files/bacula-fd.initd
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+	use dns
+}
+
+start() {
+	ebegin "Starting bacula file daemon"
+	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-fd \
+		-- ${FD_OPTIONS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping bacula file daemon"
+	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-fd.*.pid
+	eend $?
+}
diff --git a/app-backup/bacula/files/bacula-fix-sonames.patch b/app-backup/bacula/files/bacula-fix-sonames.patch
new file mode 100644
index 000000000000..d05b2b9a37fb
--- /dev/null
+++ b/app-backup/bacula/files/bacula-fix-sonames.patch
@@ -0,0 +1,36 @@
+=== modified file 'autoconf/ltmain.sh'
+--- autoconf/ltmain.sh	2011-11-06 20:34:58 +0000
++++ autoconf/ltmain.sh	2012-02-09 17:27:13 +0000
+@@ -2428,6 +2428,7 @@
+   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+   -shared           only do dynamic linking of libtool libraries
+   -shrext SUFFIX    override the standard shared library file extension
++  -soname SONAME    override the standard shared object name
+   -static           do not do any dynamic linking of uninstalled libtool libraries
+   -static-libtool-libs
+                     do not do any dynamic linking of libtool libraries
+@@ -5422,6 +5423,11 @@
+ 	  prev=
+ 	  continue
+ 	  ;;
++        soname)
++	  soname_spec="$arg"
++	  prev=
++	  continue
++	  ;;
+ 	weak)
+ 	  func_append weak_libs " $arg"
+ 	  prev=
+@@ -5741,6 +5747,11 @@
+ 	continue
+ 	;;
+ 
++      -soname)
++	prev=soname
++	continue
++	;;
++
+       -static | -static-libtool-libs)
+ 	# The effects of -static are defined in a previous loop.
+ 	# We used to do the same as -all-static on platforms that
+
diff --git a/app-backup/bacula/files/bacula-sd.confd b/app-backup/bacula/files/bacula-sd.confd
new file mode 100644
index 000000000000..8d6f7d2e60d4
--- /dev/null
+++ b/app-backup/bacula/files/bacula-sd.confd
@@ -0,0 +1,10 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Config file for /etc/init.d/bacula-sd
+
+# Options for the storage daemon.
+# The storage daemon can be run as a non-root user, however
+# please ensure that this user has proper permissions to
+# access your backup devices.
+SD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-sd.conf"
diff --git a/app-backup/bacula/files/bacula-sd.initd b/app-backup/bacula/files/bacula-sd.initd
new file mode 100644
index 000000000000..a18840242efa
--- /dev/null
+++ b/app-backup/bacula/files/bacula-sd.initd
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+	use dns
+}
+
+start() {
+	ebegin "Starting bacula storage daemon"
+	start-stop-daemon --start --quiet --exec /usr/sbin/bacula-sd \
+		-- ${SD_OPTIONS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping bacula storage daemon"
+	start-stop-daemon --stop --quiet --pidfile /var/run/bacula-sd.*.pid 
+	eend $?
+}
diff --git a/app-backup/bacula/files/newscripts/bacula-dir.initd b/app-backup/bacula/files/newscripts/bacula-dir.initd
new file mode 100755
index 000000000000..d717f07f7926
--- /dev/null
+++ b/app-backup/bacula/files/newscripts/bacula-dir.initd
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+command=/usr/sbin/bacula-dir
+command_args="${DIR_OPTIONS}"
+pidfile=/var/run/bacula-dir.9101.pid
+
+depend() {
+	need net
+	if [ "${LOCAL_DB}" -eq 1 ]; then
+		:
+	fi
+	use dns bacula-fd bacula-sd
+}
+
diff --git a/app-backup/bacula/files/newscripts/bacula-fd.initd b/app-backup/bacula/files/newscripts/bacula-fd.initd
new file mode 100755
index 000000000000..fe6a8815b9fd
--- /dev/null
+++ b/app-backup/bacula/files/newscripts/bacula-fd.initd
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command=/usr/sbin/bacula-fd
+command_args="${FD_OPTIONS}"
+pidfile=/var/run/bacula-fd.9102.pid
+
+depend() {
+	need net
+	use dns
+}
diff --git a/app-backup/bacula/files/newscripts/bacula-sd.initd b/app-backup/bacula/files/newscripts/bacula-sd.initd
new file mode 100755
index 000000000000..07facefbb4a4
--- /dev/null
+++ b/app-backup/bacula/files/newscripts/bacula-sd.initd
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+command=/usr/sbin/bacula-sd
+command_args="${SD_OPTIONS}"
+pidfile=/var/run/bacula-sd.9103.pid
+
+depend() {
+	need net
+	use dns
+}
diff --git a/app-backup/bacula/metadata.xml b/app-backup/bacula/metadata.xml
new file mode 100644
index 000000000000..1ebf5f232fac
--- /dev/null
+++ b/app-backup/bacula/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tomjbe@gentoo.org</email>
+		<name>Thomas Beierlein</name>
+	</maintainer>
+	<use>
+		<flag name="bacula-clientonly">Disable DB support, and just build a
+			client</flag>
+		<flag name="bacula-nodir">Disable building of director</flag>
+		<flag name="bacula-nosd">Disable building of storage daemon</flag>
+		<flag name="logwatch">Install support files for logwatch</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">bacula</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-backup/bareos-16.2.7-r1 b/app-backup/bareos-16.2.7-r1
deleted file mode 100644
index 5fe3f4f67942..000000000000
--- a/app-backup/bareos-16.2.7-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=!app-backup/bacula cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) gnutls? ( net-libs/gnutls[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls ) ) sys-libs/ncurses:= sys-libs/zlib ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
-DESCRIPTION=Featureful client/server network backup suite
-EAPI=5
-HOMEPAGE=http://www.bareos.org/
-IUSE=X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl logwatch mysql ndmp postgres python rados rados-striper readline scsi-crypto sql-pooling +sqlite ssl static +storage-daemon tcpd vim-syntax python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=!app-backup/bacula cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) gnutls? ( net-libs/gnutls[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls ) ) sys-libs/ncurses:= sys-libs/zlib ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-REQUIRED_USE=static? ( clientonly ) python? ( python_targets_python2_7 )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://github.com/bareos/bareos/archive/Release/16.2.7.tar.gz -> bareos-16.2.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cde531c76e1337ab71e3b5a3a3537ebb
diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
new file mode 100644
index 000000000000..716e251d7a5e
--- /dev/null
+++ b/app-backup/bareos/Manifest
@@ -0,0 +1,11 @@
+AUX bareos-12.4.5-Makefile.patch 924 BLAKE2B ea4e413f5e1ddb5d23aa030e5d7a4e96b23cd987fc86d2958c5275994198f8aa3705b5554e545440f31cfaed45283e34a08aa4e27087d81edc192d1e9884d63f SHA512 f1b5da39d01f6b00851810c6a0cbcda9ac0561fb165054f6f2c4540943b41af9d524a6a8aca1ae87d55fa8624aecf44c3c0db03c2d7c22690a84c16994289eed
+AUX bareos-12.4.5-bat-ldflags.patch 389 BLAKE2B 9e1d80037755eba2ae47951aa1e603ac3bac1b26f1cbc0681730ab7ba08846f4670989c517bfe02a6b869b880456e992d3e40fd0d7488d63494a547a902c3c24 SHA512 811fd6ffc2a1c4aeef3afd9001fd2bf01c70ef3f75ed6949ec6b064a9e6ce7a4893ffe464e5c9c67e33fdf92e00b0601500930165891b70d403d31a2ee347434
+AUX bareos-dir.confd-16 641 BLAKE2B d13945b9459a3900d1695815d4076f884b9269aa2ea0661aa9fb18345c6febff34154dce976fc467b60e339257d61e6d0403623fe44a2903b51cc44bfe0fb8a3 SHA512 f25d778958fc4081b54bd88a357cb8ba7bc3573c7e262e66996fdc9c05d184cb48e34941e7e1f5ee6c96605c7224ef475b72d6815d2ed5f72fd2ce0cf66c5776
+AUX bareos-dir.initd 491 BLAKE2B 8b937fedf288587f0180fd83ad4e13c383d476b62f9cc8a58cf1a75d8394de2ec2a1ff0314030577bc439ac1b7c1825a929c4d22df0599eccdd00b169d199d29 SHA512 044136eb9260001943d377f977ab913b7999374d9389c275744087cbd18d0a7311c87d96d05551e83a179dc82ab2d5151bf2c5945082eae4f9e6bf44cb5bf060
+AUX bareos-fd.confd-16 211 BLAKE2B bc1a36f5f2c1c42d2dbe0ae5bb922d01d2d26beabf3a890e8b8cec48521b73a14904dd3faba3e681fc03a4bd8ccfb0520e0d0ae28bbba45c9082c7e985953153 SHA512 e1e2d8784a7309acc93c4028a88770e642fa69261d1798e4a763ddcf92995916d29f199fad31d6fbb09209c5967fcc2fe6602ac0d28693213878692c634d837c
+AUX bareos-fd.initd 457 BLAKE2B b02399e5112673c94afcbca67399b5a4627d3e0c863a7e9a61255598bf5b846a344b1eaf8a59665bc9abd091b68d67fe4bacfd796a1b97beebe66e28ee6a6fba SHA512 444802b07cff09feb931795869e7cb50f3406a9f895c3baf69a16607ea7ae2da6553d6f819f7fca2ec4c7c86ebffbc9ba925513325b547fb12aab411ac4d68eb
+AUX bareos-sd.confd-16 361 BLAKE2B 3c5feb7e6615db5395f2895ed4ea3e0745c4da0ca68cbdd6c899da0be63db0a7ee561aa44404490ef227a08fe5f339c337fd4eadf43a384741d3071ef4332772 SHA512 1cd7a0a6b16d95db4ac39a4858caf0df35b3cd68e6ed87dff687c48008e4f31597e8510ac6a2e1442a80dec7e5608341832b55d3e2ae96793f203fd95700da22
+AUX bareos-sd.initd 481 BLAKE2B c14f2640be1685aaa0304dcfff2c272e37cb55cce92c7e2808eeaa94b20d4cfb4a705b53d06880f5b5c50b96162ea4d6cb23160b6e31ec34889b867c3aad09e1 SHA512 e094df3f44ed39207129bb86020b223037acc7bda408a69711b68376d1044dbe67001370395dd4442df6b4e78e92dc5125dd14dad6c4826716df2084fbd45916
+DIST bareos-16.2.7.tar.gz 4282998 BLAKE2B 9101a49d1178e0bcc4843cc4472a2082827a7bd7595389c0fa3699d36651ca70fce674509eeaddc8f806a5df1dba6afc89c05be183e7561e013d23bd157ef294 SHA512 028f38dd77fed5e3af6ee50aa44cb2f82349bd38e40eadebc552a95100166291ae0c68073daa2513919da330c66bb54a3050f1d99cbf3b5354f2450a789f6c00
+EBUILD bareos-16.2.7-r1.ebuild 11323 BLAKE2B 0abe24334ae68f7ef819d76cc03bce740158c0fa600850640eb907e33e32c07822e10633bf0d1bbb86d8acb5a0e2d0a37c228eb93544b256d68d43b32cea1748 SHA512 3c43211665dc550212218b87063d6094016db80ac9c620be9d88268d17141b9f08946faaf25ee1c90f2b58bb5519c6d96a4ce1960fdbf1c62664f94b9be55c44
+MISC metadata.xml 1440 BLAKE2B 588672b8975b109eb293f8a251ea5745cbcdab83acac5b1efb3318e2b06eeecfb48114974fd0854fc98480a8607ef7603e0882a2c74d3a301023cdafc67348ff SHA512 b76bc10f031dc5ab0abd71980706a3beebfb50a8e7d273bdfbf85124309ba98ab4542d6e273691a8105c8c5a078b3886d891131a79c587ab62f361e7bba7b5b7
diff --git a/app-backup/bareos/bareos-16.2.7-r1.ebuild b/app-backup/bareos/bareos-16.2.7-r1.ebuild
new file mode 100644
index 000000000000..efeb4ae84798
--- /dev/null
+++ b/app-backup/bareos/bareos-16.2.7-r1.ebuild
@@ -0,0 +1,398 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit eutils multilib python-single-r1 user
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="http://www.bareos.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl
+	logwatch mysql ndmp postgres python rados rados-striper readline scsi-crypto
+	sql-pooling +sqlite ssl static +storage-daemon tcpd vim-syntax"
+REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )"
+
+DEPEND="
+	!app-backup/bacula
+	cephfs? ( sys-cluster/ceph )
+	rados? ( sys-cluster/ceph )
+	rados-striper? ( >=sys-cluster/ceph-0.94.2 )
+	glusterfs? ( sys-cluster/glusterfs )
+	lmdb? ( dev-db/lmdb )
+	dev-libs/gmp:0
+	!clientonly? (
+		postgres? ( dev-db/postgresql:*[threads] )
+		mysql? ( virtual/mysql )
+		sqlite? ( dev-db/sqlite:3 )
+		director? (
+			virtual/mta
+			jansson? ( dev-libs/jansson )
+		)
+	)
+	fastlz? ( dev-libs/bareos-fastlzlib )
+	logwatch? ( sys-apps/logwatch )
+	tcpd? ( sys-apps/tcp-wrappers )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		acl? ( virtual/acl[static-libs] )
+		sys-libs/zlib[static-libs]
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		ssl? (
+			!gnutls? (
+				!libressl? ( dev-libs/openssl:0=[static-libs] )
+				libressl? ( dev-libs/libressl:0=[static-libs] )
+			)
+			gnutls? ( net-libs/gnutls[static-libs] )
+		)
+	)
+	!static? (
+		acl? ( virtual/acl )
+		dev-libs/lzo
+		ssl? (
+			!gnutls? (
+				!libressl? ( dev-libs/openssl:0= )
+				libressl? ( dev-libs/libressl:0= )
+			)
+			gnutls? ( net-libs/gnutls )
+		)
+		sys-libs/ncurses:=
+		sys-libs/zlib
+	)
+	python? ( ${PYTHON_DEPS} )
+	"
+RDEPEND="${DEPEND}
+	!clientonly? (
+		storage-daemon? (
+			sys-block/mtx
+			app-arch/mt-st
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+
+REQUIRED_USE="static? ( clientonly )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+S=${WORKDIR}/${PN}-Release-${PV}
+
+pkg_setup() {
+	use mysql && export mydbtypes+="mysql"
+	use postgres && export mydbtypes+=" postgresql"
+	use sqlite && export mydbtypes+=" sqlite"
+
+	# create the daemon group and user
+	if [ -z "$(egetent group bareos 2>/dev/null)" ]; then
+		enewgroup bareos
+		einfo
+		einfo "The group 'bareos' has been created. Any users you add to this"
+		einfo "group have access to files created by the daemons."
+		einfo
+	fi
+
+	if ! use clientonly; then
+		if [ -z "$(egetent passwd bareos 2>/dev/null)" ]; then
+			enewuser bareos -1 -1 /var/lib/bareos bareos,disk,tape,cdrom,cdrw
+			einfo
+			einfo "The user 'bareos' has been created.  Please see the bareos manual"
+			einfo "for information about running bareos as a non-root user."
+			einfo
+		fi
+	fi
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bareos/<config> instead of ./<config>
+	pushd src >&/dev/null || die
+	for f in console/console.c dird/dird.c filed/filed.c \
+		stored/bcopy.c stored/bextract.c stored/bls.c \
+		stored/bscan.c stored/btape.c stored/stored.c \
+		qt-console/main.cpp; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bareos/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# bug 466690 Use CXXFLAGS instead of CFLAGS
+	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
+	# stop build for errors in subdirs
+	epatch "${FILESDIR}"/${PN}-12.4.5-Makefile.patch
+
+	# bat needs to respect LDFLAGS
+	epatch "${FILESDIR}"/${PN}-12.4.5-bat-ldflags.patch
+
+	# do not strip binaries
+	for d in filed console dird stored; do
+		sed -i -e "s/strip /# strip /" src/$d/Makefile.in || die
+	done
+}
+
+src_configure() {
+	local myconf=''
+
+	addpredict /var/lib/logrotate.status
+
+	if use clientonly; then
+		myconf="${myconf} \
+			$(use_enable clientonly client-only) \
+			$(use_enable !static libtool) \
+			$(use_enable static static-cons) \
+			$(use_enable static static-fd)"
+	fi
+
+	# do not build bat and traymonitor if 'static' clientonly
+	if ! use clientonly || ! use static; then
+		myconf="${myconf} \
+			--disable-bat \
+			--disable-traymonitor"
+	fi
+
+	myconf="${myconf} \
+		$(use_with X x) \
+		$(use_enable acl) \
+		$(use_enable ipv6) \
+		$(use_enable ndmp) \
+		$(use_enable readline) \
+		$(use_enable !readline conio) \
+		$(use_enable scsi-crypto) \
+		$(use_enable sql-pooling) \
+		$(use_with fastlz) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with sqlite sqlite3) \
+		$(use sqlite || echo "--without-sqlite3") \
+		$(use_with ssl openssl) \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_enable lmdb) \
+		$(use_with glusterfs) \
+		$(use_with rados) \
+		$(use_with rados-striper) \
+		$(use_with cephfs) \
+		$(use_with jansson) \
+		"
+
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--with-pid-dir=/run/bareos \
+		--sysconfdir=/etc \
+		--with-subsys-dir=/run/lock/subsys \
+		--with-working-dir=/var/lib/bareos \
+		--with-logdir=/var/log/bareos \
+		--with-scriptdir=/usr/libexec/bareos \
+		--with-plugindir=/usr/$(get_libdir)/${PN}/plugin \
+		--with-backenddir=/usr/$(get_libdir)/${PN}/backend \
+		--with-dir-user=bareos \
+		--with-dir-group=bareos \
+		--with-sd-user=root \
+		--with-sd-group=bareos \
+		--with-fd-user=root \
+		--with-fd-group=bareos \
+		--with-sbin-perm=0755 \
+		--with-systemd \
+		--enable-dynamic-cats-backends \
+		--enable-dynamic-storage-backends \
+		--enable-batch-insert \
+		--disable-afs \
+		--host=${CHOST} \
+		${myconf}
+}
+
+src_compile() {
+	# workaround for build failing with high -j values
+	# if ndmp is enabled
+	use ndmp && MAKEOPTS="$MAKEOPTS -j1"
+
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	newicon src/images/bareos_logo_shadow.png bareos.png
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd,startmysql,stopmysql}
+	rm -f "${D}"/usr/sbin/bareos
+
+	# remove upstream init scripts
+	rm -f "${D}"/etc/init.d/bareos-*
+
+	# rename statically linked apps
+	if use clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bareos-fd bareos-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use clientonly; then
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bareos
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /etc/log.d/scripts/services
+			dodir /etc/log.d/scripts/shared
+			dodir /etc/log.d/conf/logfiles
+			dodir /etc/log.d/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1*
+	rm -vf "${D}"/usr/share/man/man1/bat.1*
+
+	if use clientonly || ! use director; then
+		rm -vf "${D}"/usr/share/man/man8/bareos-dir.8*
+		rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8*
+		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
+		rm -vf "${D}"/usr/share/man/man8/bwild.8*
+		rm -vf "${D}"/usr/share/man/man8/bregex.8*
+		rm -vf "${D}"/usr/share/man/man8/bpluginfo.8*
+		rm -vf "${D}"/usr/libexec/bareos/create_*_database
+		rm -vf "${D}"/usr/libexec/bareos/drop_*_database
+		rm -vf "${D}"/usr/libexec/bareos/make_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/update_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup
+	fi
+	if use clientonly || ! use storage-daemon; then
+		rm -vf "${D}"/usr/share/man/man8/bareos-sd.8*
+		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
+		rm -vf "${D}"/usr/share/man/man8/bextract.8*
+		rm -vf "${D}"/usr/share/man/man8/bls.8*
+		rm -vf "${D}"/usr/share/man/man8/bscan.8*
+		rm -vf "${D}"/usr/share/man/man8/btape.8*
+		rm -vf "${D}"/usr/libexec/bareos/disk-changer
+		rm -vf "${D}"/usr/libexec/bareos/mtx-changer
+		rm -vf "${D}"/usr/libexec/bareos/dvd-handler
+		rm -vf "${D}"/etc/bareos/mtx-changer.conf
+	fi
+	if ! use scsi-crypto; then
+		rm -vf "${D}"/usr/share/man/man8/bscrypto.8*
+	fi
+	rm -vf "${D}"/usr/share/man/man1/bareos-tray-monitor.1*
+
+	# documentation
+	dodoc README.md
+	use ndmp && dodoc README.NDMP
+	use scsi-crypto && dodoc README.scsicrypto
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/bareos.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins scripts/filetype.vim bareos_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bareos-fd"
+	if ! use clientonly; then
+		if use director; then
+			myscripts="${myscripts} bareos-dir"
+		fi
+		if use storage-daemon; then
+			myscripts="${myscripts} bareos-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd-16 "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependency for the director init script
+		case "${script}" in
+			bareos-dir)
+				sed -i -e "s:%databasetypes%:${mydbtypes}:" "${T}/${script}".confd || die
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bareos
+
+	# make sure bareos group can execute bareos libexec scripts
+	fowners -R root:bareos /usr/libexec/bareos
+}
+
+pkg_postinst() {
+	if use clientonly; then
+		fowners root:bareos /var/lib/bareos
+	else
+		fowners bareos:bareos /var/lib/bareos
+	fi
+
+	if ! use clientonly && use director; then
+		einfo
+		einfo "If this is a new install, you must create the databases with:"
+		if use postgres; then
+			einfo
+			einfo "For postgresql:"
+			einfo "  su postgres -c '/usr/libexec/bareos/create_bareos_database postgresql'"
+			einfo "  su postgres -c '/usr/libexec/bareos/make_bareos_tables postgresql'"
+			einfo "  su postgres -c '/usr/libexec/bareos/grant_bareos_privileges postgresql'"
+		fi
+		if use mysql; then
+			einfo
+			einfo "For mysql:"
+			einfo
+			einfo "  Make sure root has direct access to your mysql server. You may want to"
+			einfo "  create a /root/.my.cnf file with"
+			einfo "    [client]"
+			einfo "    user=root"
+			einfo "    password=YourPasswordForAccessingMysqlAsRoot"
+			einfo "  before running:"
+			einfo "  /usr/libexec/bareos/create_bareos_database mysql"
+			einfo "  /usr/libexec/bareos/make_bareos_tables mysql"
+			einfo "  /usr/libexec/bareos/grant_bareos_privileges mysql"
+		fi
+		einfo
+	fi
+
+	if use sqlite; then
+		einfo
+		einfo "Be aware that Bareos does not officially support SQLite database."
+		einfo "Best use it only for a client-only installation. See Bug #445540."
+		einfo
+		einfo "It is strongly recommended to use either postgresql or mysql as"
+		einfo "catalog database backend."
+		einfo
+	fi
+
+	einfo "Please note that 'bconsole' will always be installed."
+	einfo
+}
diff --git a/app-backup/bareos/files/bareos-12.4.5-Makefile.patch b/app-backup/bareos/files/bareos-12.4.5-Makefile.patch
new file mode 100644
index 000000000000..3cdee15d4db7
--- /dev/null
+++ b/app-backup/bareos/files/bareos-12.4.5-Makefile.patch
@@ -0,0 +1,27 @@
+# stop build if there are errors in subdirs
+--- Makefile.in.orig	2010-07-20 16:53:44.000000000 +0000
++++ Makefile.in	2010-07-20 16:55:50.000000000 +0000
+@@ -44,9 +44,8 @@
+ 
+ all: Makefile
+ 	@for I in ${all_subdirs}; \
+-	  do (cd $$I; echo "==>Entering directory `pwd`"; \
+-	      $(MAKE) DESTDIR=$(DESTDIR) $@ || (echo ""; echo ""; echo "  ====== Error in `pwd` ======"; \
+-			    echo ""; echo ""; exit 1;)); \
++	  do \
++	      $(MAKE) DESTDIR=$(DESTDIR) -C $$I $@ || exit 1; \
+ 	done
+ 
+ depend:
+@@ -55,9 +54,8 @@
+ 	
+ bacula-fd: Makefile	   
+ 	@for I in ${fd_subdirs}; \
+-	  do (cd $$I; echo "==>Entering directory `pwd`"; \
+-	      $(MAKE) DESTDIR=$(DESTDIR) all || (echo ""; echo ""; echo "   ====== Error in `pwd` ======"; \
+-			    echo ""; echo ""; exit 1;)); \
++	  do \
++	        $(MAKE) DESTDIR=$(DESTDIR) -C $$I all ||  exit 1; \
+ 	done
+ 
+ #-------------------------------------------------------------------------
diff --git a/app-backup/bareos/files/bareos-12.4.5-bat-ldflags.patch b/app-backup/bareos/files/bareos-12.4.5-bat-ldflags.patch
new file mode 100644
index 000000000000..94d8fb60120e
--- /dev/null
+++ b/app-backup/bareos/files/bareos-12.4.5-bat-ldflags.patch
@@ -0,0 +1,11 @@
+# bat needs to respect LDFLAGS
+--- src/qt-console/bat.pro.in.orig	2010-07-20 18:28:50.000000000 +0000
++++ src/qt-console/bat.pro.in	2010-07-20 18:29:25.000000000 +0000
+@@ -26,6 +26,7 @@
+ QMAKE_LINK   = $${LIBTOOL_LINK} $(CXX)
+ QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
+ QMAKE_CLEAN += .libs/* bat
++QMAKE_LFLAGS += @LDFLAGS@
+ 
+ qwt {
+   INCLUDEPATH += @QWT_INC@ 
diff --git a/app-backup/bareos/files/bareos-dir.confd-16 b/app-backup/bareos/files/bareos-dir.confd-16
new file mode 100644
index 000000000000..a11eba90a755
--- /dev/null
+++ b/app-backup/bareos/files/bareos-dir.confd-16
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Config file for /etc/init.d/bareos-dir
+
+# Bareos can use more than one catalog database and each one can 
+# be of any supported type.
+# If a database server where you store a bareos catalog
+# is on a different machine, you might want to remove the corresponding
+# type from the rc_need variable.
+rc_need="%databasetypes%"
+
+# Options for the director daemon.
+# The director can be run as a non-root user, however
+# please ensure that this user has proper permissions to
+# access your backup devices.
+DIR_OPTIONS="-u root -g bareos"
diff --git a/app-backup/bareos/files/bareos-dir.initd b/app-backup/bareos/files/bareos-dir.initd
new file mode 100644
index 000000000000..826d27a829c9
--- /dev/null
+++ b/app-backup/bareos/files/bareos-dir.initd
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use dns bareos-fd bareos-sd
+}
+
+start() {
+	ebegin "Starting bareos director"
+	checkpath -d -m 0750 -o bareos:bareos /run/bareos
+	start-stop-daemon --start --quiet --exec /usr/sbin/bareos-dir \
+		-- ${DIR_OPTIONS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping bareos director"
+	start-stop-daemon --stop --quiet --pidfile /run/bareos/bareos-dir.*.pid
+	eend $?
+}
diff --git a/app-backup/bareos/files/bareos-fd.confd-16 b/app-backup/bareos/files/bareos-fd.confd-16
new file mode 100644
index 000000000000..e3b8a1f576fd
--- /dev/null
+++ b/app-backup/bareos/files/bareos-fd.confd-16
@@ -0,0 +1,7 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Config file for /etc/init.d/bareos-fd
+
+# Options for the file daemon.
+FD_OPTIONS="-u root -g bareos"
diff --git a/app-backup/bareos/files/bareos-fd.initd b/app-backup/bareos/files/bareos-fd.initd
new file mode 100644
index 000000000000..e272daa88ecd
--- /dev/null
+++ b/app-backup/bareos/files/bareos-fd.initd
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use dns
+}
+
+start() {
+	ebegin "Starting bareos file daemon"
+	checkpath -d -m 0750 /run/bareos
+	start-stop-daemon --start --quiet --exec /usr/sbin/bareos-fd \
+		-- ${FD_OPTIONS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping bareos file daemon"
+	start-stop-daemon --stop --quiet --pidfile /run/bareos/bareos-fd.*.pid
+	eend $?
+}
diff --git a/app-backup/bareos/files/bareos-sd.confd-16 b/app-backup/bareos/files/bareos-sd.confd-16
new file mode 100644
index 000000000000..5d377b978dd5
--- /dev/null
+++ b/app-backup/bareos/files/bareos-sd.confd-16
@@ -0,0 +1,10 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Config file for /etc/init.d/bareos-sd
+
+# Options for the storage daemon.
+# The storage daemon can be run as a non-root user, however
+# please ensure that this user has proper permissions to
+# access your backup devices.
+SD_OPTIONS="-u root -g bareos"
diff --git a/app-backup/bareos/files/bareos-sd.initd b/app-backup/bareos/files/bareos-sd.initd
new file mode 100644
index 000000000000..f20be4ecf56e
--- /dev/null
+++ b/app-backup/bareos/files/bareos-sd.initd
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use dns
+}
+
+start() {
+	ebegin "Starting bareos storage daemon"
+	checkpath -d -m 0750 -o bareos:bareos /run/bareos
+	start-stop-daemon --start --quiet --exec /usr/sbin/bareos-sd \
+		-- ${SD_OPTIONS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping bareos storage daemon"
+	start-stop-daemon --stop --quiet --pidfile /run/bareos/bareos-sd.*.pid 
+	eend $?
+}
diff --git a/app-backup/bareos/metadata.xml b/app-backup/bareos/metadata.xml
new file mode 100644
index 000000000000..4f7694434a3e
--- /dev/null
+++ b/app-backup/bareos/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mschiff@gentoo.org</email>
+    <name>Marc Schiffbauer</name>
+  </maintainer>
+  <use>
+    <flag name="cephfs">Enable cephfs storage backend</flag>
+    <flag name="clientonly">Only install file-daemon (client)</flag>
+    <flag name="director">Install director</flag>
+    <flag name="fastlz">Enable support vor lz4, lz4hc and lzfast using dev-libs/bareos-fastlzlib</flag>
+    <flag name="glusterfs">Enable glusterfs storage backend</flag>
+    <flag name="gnutls">When ssl is enabled, use GnuTLS instead of OpenSSL</flag>
+    <flag name="jansson">JSON API support using JANSSON for director</flag>
+    <flag name="lmdb">enable build of LMDB support for faster accurate backup</flag>
+    <flag name="logwatch">Install support files for logwatch</flag>
+    <flag name="ndmp">Enable support for NDMP (Network Data Management Protocol)</flag>
+    <flag name="rados">Enable rados storage backend</flag>
+    <flag name="rados-striper">Enable use of rados-striper</flag>
+    <flag name="scsi-crypto">Enable low level SCSI crypto support</flag>
+    <flag name="sql-pooling">Enable SQL pooling support</flag>
+    <flag name="storage-daemon">Install storage daemon (bareos-sd)</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">bareos/bareos</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-backup/borgbackup-1.1.3-r1 b/app-backup/borgbackup-1.1.3-r1
deleted file mode 100644
index a72fde2f904c..000000000000
--- a/app-backup/borgbackup-1.1.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools_scm[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !!app-office/borg app-arch/lz4 dev-python/llfuse[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/msgpack[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Deduplicating backup program with compression and authenticated encryption
-EAPI=6
-HOMEPAGE=https://borgbackup.readthedocs.io/
-IUSE=libressl python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~x86
-LICENSE=BSD
-RDEPEND=!!app-office/borg app-arch/lz4 dev-python/llfuse[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/msgpack[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/b/borgbackup/borgbackup-1.1.3.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6e11a1269e3f832048900f7a6000af89
diff --git a/app-backup/borgbackup-1.1.4-r1 b/app-backup/borgbackup-1.1.4-r1
deleted file mode 100644
index 22a3ef838829..000000000000
--- a/app-backup/borgbackup-1.1.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools_scm[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !!app-office/borg app-arch/lz4 dev-python/llfuse[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/msgpack[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Deduplicating backup program with compression and authenticated encryption
-EAPI=6
-HOMEPAGE=https://borgbackup.readthedocs.io/
-IUSE=libressl python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=!!app-office/borg app-arch/lz4 dev-python/llfuse[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/msgpack[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/b/borgbackup/borgbackup-1.1.4.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9cd8723db4fbf25037cdb5c1ebc19d5c
diff --git a/app-backup/borgbackup-1.1.5 b/app-backup/borgbackup-1.1.5
deleted file mode 100644
index 6ed203375642..000000000000
--- a/app-backup/borgbackup-1.1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools_scm[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !!app-office/borg app-arch/lz4 dev-python/llfuse[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/msgpack[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Deduplicating backup program with compression and authenticated encryption
-EAPI=6
-HOMEPAGE=https://borgbackup.readthedocs.io/
-IUSE=libressl python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=!!app-office/borg app-arch/lz4 dev-python/llfuse[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/msgpack[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/b/borgbackup/borgbackup-1.1.5.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9cd8723db4fbf25037cdb5c1ebc19d5c
diff --git a/app-backup/borgbackup-1.1.6 b/app-backup/borgbackup-1.1.6
deleted file mode 100644
index 418d82c38e0f..000000000000
--- a/app-backup/borgbackup-1.1.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools_scm[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !!app-office/borg app-arch/lz4 dev-python/llfuse[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/msgpack[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Deduplicating backup program with compression and authenticated encryption
-EAPI=6
-HOMEPAGE=https://borgbackup.readthedocs.io/
-IUSE=libressl python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=!!app-office/borg app-arch/lz4 dev-python/llfuse[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/msgpack[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/b/borgbackup/borgbackup-1.1.6.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bdd313f000c21c27eeaa1baff33564b0
diff --git a/app-backup/borgbackup-9999 b/app-backup/borgbackup-9999
deleted file mode 100644
index 58f2dfaf49d5..000000000000
--- a/app-backup/borgbackup-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools_scm[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !!app-office/borg app-arch/lz4 dev-python/llfuse[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/msgpack[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Deduplicating backup program with compression and authenticated encryption
-EAPI=6
-HOMEPAGE=https://borgbackup.readthedocs.io/
-IUSE=libressl python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-LICENSE=BSD
-RDEPEND=!!app-office/borg app-arch/lz4 dev-python/llfuse[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/msgpack[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9cd8723db4fbf25037cdb5c1ebc19d5c
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
new file mode 100644
index 000000000000..52b0c4458661
--- /dev/null
+++ b/app-backup/borgbackup/Manifest
@@ -0,0 +1,10 @@
+DIST borgbackup-1.1.3.tar.gz 2942183 BLAKE2B c7ca37459d35e06694cf9fdbef7328806cf03e6a4290368d47a2c06e1b6a0700d9dbba3efb170e130c7e59951d65ff8ca677955782150154f0ad2d12b93fe57b SHA512 8378e4f805bfb3e9a4e454f5ccfa58eef0517f13a2e8a2c3c6cbdb0304b763fa67152963b17d677daff09590eb777f12fbe1f3f69c3459bcc68781e5a747cb49
+DIST borgbackup-1.1.4.tar.gz 3390046 BLAKE2B 27d1743718b9fdd303dbc7a01a586b9f87c119ed7f2464582a229bf2357c3f7d929bdf614689be7d7306a707e7332b8ae0ce5bd9898cea5af2311ca2210c5f41 SHA512 0853033f72406a2913dd74c6ebb8b33a318179843255c92481f5e4fdd0f436de6e4c77eed259a422e00bfadcf260facdfd00c813bb0628b82b8ff63a87e1bcfb
+DIST borgbackup-1.1.5.tar.gz 3392774 BLAKE2B 7eaa3dee548748b4b741607934c9344203e318f4558cf9497938caf5ae5af7dfac075748a2c78a767de618d5ca07c80d7dcd2f5c61e7314d643e2974c4eb4b29 SHA512 22071e4b37059d816592baff852772720769b3d86eb1d071abba67f9d13de809066aa29cdf18f1aaef127d1f24288913a7b0b63d157fb98840b1a71606dc0554
+DIST borgbackup-1.1.6.tar.gz 3441523 BLAKE2B 13b1892774e857432a77d1f67d981046a0670b4ba2f3665502f7b729a211fc47e10a87feca308d5089c984cfe4665e7e70ca68bb9aa6e188893a0d088e84df93 SHA512 5741c48bdb70a26d40bd583f207460e35bb7dd560424889d37eb4d90ee96947457faf09bae0fa2b26b42ec71ef6eeaec1b770ba3257223a2637fcb55266e4a17
+EBUILD borgbackup-1.1.3-r1.ebuild 1089 BLAKE2B 227958b734a324262ec7e2b5cd68ed388bed8919a0ade56d357e7d21a7558ac7c8c0467bec06d96cdd4e6d63ae73677e9d9209462beab44c0faf512fb3aef0e3 SHA512 8b4863da598d8a1b198ea2e6e40326051a867fc0671bf5e660aa5c5aac9f4838620f48e9a4787aad463b342fb6e68d04ea0fe93f160a8261f450d4ec629eea82
+EBUILD borgbackup-1.1.4-r1.ebuild 1090 BLAKE2B 54321c9dadf7b6bf077a286375c3ebc84b5f8e545e6d103d0af24253fed071f67a547b6a33af03b00bf72b765122125c16041fe6668d42f99d4809a74f87047e SHA512 c135ae63d7fa35c806fd9ffb0bcf4be28fb935a539843253054c4169d38affaefa1dce2d9388def85022bcbe4b232f4e0e762abe5715b5e87d18fb70d7cb64a9
+EBUILD borgbackup-1.1.5.ebuild 1090 BLAKE2B 54321c9dadf7b6bf077a286375c3ebc84b5f8e545e6d103d0af24253fed071f67a547b6a33af03b00bf72b765122125c16041fe6668d42f99d4809a74f87047e SHA512 c135ae63d7fa35c806fd9ffb0bcf4be28fb935a539843253054c4169d38affaefa1dce2d9388def85022bcbe4b232f4e0e762abe5715b5e87d18fb70d7cb64a9
+EBUILD borgbackup-1.1.6.ebuild 1088 BLAKE2B b89c1c7d27543d4b83d8c00b29e45b0602a6c6c27c5d04ed8309d0701bc37470b09befcaa33304124235ca37d83e84809f077027eb9eca333f78ade8e1bd63e6 SHA512 5a679f0db9dd1fb59f7c6c97c180e55289b3e175c3920e81956b34870a95349023d65165f1c7f3156df1dc8fc40801184a57380684d6fba18df42e018e063c71
+EBUILD borgbackup-9999.ebuild 1090 BLAKE2B 54321c9dadf7b6bf077a286375c3ebc84b5f8e545e6d103d0af24253fed071f67a547b6a33af03b00bf72b765122125c16041fe6668d42f99d4809a74f87047e SHA512 c135ae63d7fa35c806fd9ffb0bcf4be28fb935a539843253054c4169d38affaefa1dce2d9388def85022bcbe4b232f4e0e762abe5715b5e87d18fb70d7cb64a9
+MISC metadata.xml 380 BLAKE2B 2ac9cd2f49c605955fb4133ff30d52e578bb45b0717348e6909cf7cd172ce9a7436d30394466ece7d889d02802f500f86297072a755b24905c17342cd7aee5e4 SHA512 4160c5674dbb51e9e3fa3c0d29fca6b7ab4073f2e2be1a2eca88ff049b4b5f066d04c747130c45d31a9c63ee2fe3bcb5f521017a581e7f6b69eb07fb94b83661
diff --git a/app-backup/borgbackup/borgbackup-1.1.3-r1.ebuild b/app-backup/borgbackup/borgbackup-1.1.3-r1.ebuild
new file mode 100644
index 000000000000..b360607c770f
--- /dev/null
+++ b/app-backup/borgbackup/borgbackup-1.1.3-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/borg.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="amd64 ~x86"
+fi
+
+DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
+HOMEPAGE="https://borgbackup.readthedocs.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="libressl"
+
+# Unfortunately we have a file conflict with app-office/borg, bug #580402
+RDEPEND="
+	!!app-office/borg
+	app-arch/lz4
+	dev-python/llfuse[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+
+DEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	${RDEPEND}
+"
+
+python_prepare_all() {
+	# allow use of new (renamed) msgpack
+	sed -i "s|'msgpack-python.*',||g" setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/app-backup/borgbackup/borgbackup-1.1.4-r1.ebuild b/app-backup/borgbackup/borgbackup-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..fdd80a89ecd9
--- /dev/null
+++ b/app-backup/borgbackup/borgbackup-1.1.4-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/borg.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
+HOMEPAGE="https://borgbackup.readthedocs.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="libressl"
+
+# Unfortunately we have a file conflict with app-office/borg, bug #580402
+RDEPEND="
+	!!app-office/borg
+	app-arch/lz4
+	dev-python/llfuse[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+
+DEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	${RDEPEND}
+"
+
+python_prepare_all() {
+	# allow use of new (renamed) msgpack
+	sed -i "s|'msgpack-python.*',||g" setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/app-backup/borgbackup/borgbackup-1.1.5.ebuild b/app-backup/borgbackup/borgbackup-1.1.5.ebuild
new file mode 100644
index 000000000000..fdd80a89ecd9
--- /dev/null
+++ b/app-backup/borgbackup/borgbackup-1.1.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/borg.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
+HOMEPAGE="https://borgbackup.readthedocs.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="libressl"
+
+# Unfortunately we have a file conflict with app-office/borg, bug #580402
+RDEPEND="
+	!!app-office/borg
+	app-arch/lz4
+	dev-python/llfuse[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+
+DEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	${RDEPEND}
+"
+
+python_prepare_all() {
+	# allow use of new (renamed) msgpack
+	sed -i "s|'msgpack-python.*',||g" setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/app-backup/borgbackup/borgbackup-1.1.6.ebuild b/app-backup/borgbackup/borgbackup-1.1.6.ebuild
new file mode 100644
index 000000000000..c94a558657c3
--- /dev/null
+++ b/app-backup/borgbackup/borgbackup-1.1.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/borg.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+fi
+
+DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
+HOMEPAGE="https://borgbackup.readthedocs.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="libressl"
+
+# Unfortunately we have a file conflict with app-office/borg, bug #580402
+RDEPEND="
+	!!app-office/borg
+	app-arch/lz4
+	dev-python/llfuse[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+
+DEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	${RDEPEND}
+"
+
+python_prepare_all() {
+	# allow use of new (renamed) msgpack
+	sed -i "s|'msgpack-python.*',||g" setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/app-backup/borgbackup/borgbackup-9999.ebuild b/app-backup/borgbackup/borgbackup-9999.ebuild
new file mode 100644
index 000000000000..fdd80a89ecd9
--- /dev/null
+++ b/app-backup/borgbackup/borgbackup-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/borg.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
+HOMEPAGE="https://borgbackup.readthedocs.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="libressl"
+
+# Unfortunately we have a file conflict with app-office/borg, bug #580402
+RDEPEND="
+	!!app-office/borg
+	app-arch/lz4
+	dev-python/llfuse[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+
+DEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	${RDEPEND}
+"
+
+python_prepare_all() {
+	# allow use of new (renamed) msgpack
+	sed -i "s|'msgpack-python.*',||g" setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/app-backup/borgbackup/metadata.xml b/app-backup/borgbackup/metadata.xml
new file mode 100644
index 000000000000..7c11254ebfa2
--- /dev/null
+++ b/app-backup/borgbackup/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">borgbackup/borg</remote-id>
+		<remote-id type="pypi">borgbackup</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-backup/borgweb-0.2.0-r2 b/app-backup/borgweb-0.2.0-r2
deleted file mode 100644
index b82dbe414374..000000000000
--- a/app-backup/borgweb-0.2.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Browser-based user interface for BorgBackup
-EAPI=6
-HOMEPAGE=https://pypi.org/project/borgweb/
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-backup/borgbackup[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flask[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/b/borgweb/borgweb-0.2.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ee133713a142e6b15dd3fda5098941d9
diff --git a/app-backup/borgweb-0.3.0 b/app-backup/borgweb-0.3.0
deleted file mode 100644
index f30c03a691cf..000000000000
--- a/app-backup/borgweb-0.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Browser-based user interface for BorgBackup
-EAPI=6
-HOMEPAGE=https://pypi.org/project/borgweb/
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-backup/borgbackup[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flask[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/b/borgweb/borgweb-0.3.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=495450fc1695c33214dd7aca3d9e8841
diff --git a/app-backup/borgweb/Manifest b/app-backup/borgweb/Manifest
new file mode 100644
index 000000000000..1fd88739f3d8
--- /dev/null
+++ b/app-backup/borgweb/Manifest
@@ -0,0 +1,5 @@
+DIST borgweb-0.2.0.tar.gz 503852 BLAKE2B 6d37eeca4893f825486d46e03d8212fc3597a8704cee976429a7c55f7ab98b405038948ce7e407fa7c78a2a9f6c2b0ca4307144ffae3bf68ad6e582921989bfb SHA512 7898caf803b82e910eaa1672b892657038da6606777ecefd97c27698c14524094f0c1741621ad4ff9a230d66454de419558644ba185488b0fdb5e1aa604010a0
+DIST borgweb-0.3.0.tar.gz 512052 BLAKE2B a783a4d0528b0d501918b958facbfbee131e95a8219bf9608572e402f6e6e3010f6716c64e76ef72858e949b505ef8c4eefd5f6512dd1b0ef767a32d2c493fc5 SHA512 90867338f3678732ade97f9b595579cc5aabf6ee824b0bd4dec986ae04db94304dee1d8ae1275331d93a2b3a89916ed11e834ace8a92cf196f4050178bf96625
+EBUILD borgweb-0.2.0-r2.ebuild 519 BLAKE2B e7cdc87cba88166f1ba61d28c8a6101d0140a456f4b232f9ffc5e5c5402d273693fedbf3a3d3257da1e162cfca0f0206f13477a1c33a3469778cc71f15389a08 SHA512 16baf2b97219f353912ff5b58dbd153405d817d89d7cbb86a06e0acd8ebc25cc51d4afab258ef0a4bd028d5ede7d7e9abcbb17e316727b0126d14be46fbf9d6b
+EBUILD borgweb-0.3.0.ebuild 519 BLAKE2B b16eee1bff604dd9f0ad9872c4339cd364e5f81fa6ac9720d95bee42d4daac63193eb0822198421857be8f6c590668ec5e1f63671419fffeb35afbd3e065c096 SHA512 1252d39aada256f72e130f334045a289b49bbfbd568244b92a351052960bb3f53d9b418fa1d421bde579233b1a16b3cb5ea857f31ed48f63b74be7f53e0898aa
+MISC metadata.xml 332 BLAKE2B 92f900ce23301edc58aa8e3ddee5d733b060c16e8783721bedc6c7972deafde64f6aff446789f60e08ddae44135b2cae05950c4781a9502fc8cc475c9f6e43a3 SHA512 4a8daf7ccdafc221264a6fce41f8fca702ca101cfbfd113ea9f300b31c53bc1be89b89f5fa1b54b16af5c3e0f36e720cd862829fc3eabf4f27c0c80e7235347b
diff --git a/app-backup/borgweb/borgweb-0.2.0-r2.ebuild b/app-backup/borgweb/borgweb-0.2.0-r2.ebuild
new file mode 100644
index 000000000000..c63ce9708275
--- /dev/null
+++ b/app-backup/borgweb/borgweb-0.2.0-r2.ebuild
@@ -0,0 +1,21 @@
+# 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
+
+DESCRIPTION="Browser-based user interface for BorgBackup"
+HOMEPAGE="https://pypi.org/project/borgweb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="app-backup/borgbackup[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]"
diff --git a/app-backup/borgweb/borgweb-0.3.0.ebuild b/app-backup/borgweb/borgweb-0.3.0.ebuild
new file mode 100644
index 000000000000..557cdea733a2
--- /dev/null
+++ b/app-backup/borgweb/borgweb-0.3.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Browser-based user interface for BorgBackup"
+HOMEPAGE="https://pypi.org/project/borgweb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="app-backup/borgbackup[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]"
diff --git a/app-backup/borgweb/metadata.xml b/app-backup/borgweb/metadata.xml
new file mode 100644
index 000000000000..87b7e668d559
--- /dev/null
+++ b/app-backup/borgweb/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>blueness@gentoo.org</email>
+    <name>Anthony G. Basile</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">borgweb</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-backup/btrbk-0.24.0-r1 b/app-backup/btrbk-0.24.0-r1
deleted file mode 100644
index 76739582a3fc..000000000000
--- a/app-backup/btrbk-0.24.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
-EAPI=6
-HOMEPAGE=https://digint.ch/btrbk/
-IUSE=+pv
-KEYWORDS=amd64 arm x86
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl net-misc/openssh pv? ( sys-apps/pv ) >=sys-fs/btrfs-progs-3.18.2 <sys-fs/btrfs-progs-4.8.3
-SLOT=0
-SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.24.0.tar.xz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=20511e9e6d744790a67dab570d4274df
diff --git a/app-backup/btrbk-0.25.1-r1 b/app-backup/btrbk-0.25.1-r1
deleted file mode 100644
index 2ddc78b634da..000000000000
--- a/app-backup/btrbk-0.25.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
-EAPI=6
-HOMEPAGE=https://digint.ch/btrbk/
-IUSE=+pv
-KEYWORDS=amd64 arm x86
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl net-misc/openssh pv? ( sys-apps/pv ) >=sys-fs/btrfs-progs-3.18.2 <sys-fs/btrfs-progs-4.13.2
-SLOT=0
-SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.25.1.tar.xz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=e69ee30b7d6ac6ae1a8adc047bdde31c
diff --git a/app-backup/btrbk-0.26.0 b/app-backup/btrbk-0.26.0
deleted file mode 100644
index 46f0661aa3f9..000000000000
--- a/app-backup/btrbk-0.26.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst preinst
-DEPEND=>=app-text/asciidoc-8.6.0 app-text/xmlto virtual/pkgconfig
-DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
-EAPI=6
-HOMEPAGE=https://digint.ch/btrbk/
-IUSE=+pv
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl net-misc/openssh pv? ( sys-apps/pv ) >=sys-fs/btrfs-progs-3.18.2
-SLOT=0
-SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.26.0.tar.xz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=fb13222434ba7876b09885f4ece2b221
diff --git a/app-backup/btrbk-0.26.1 b/app-backup/btrbk-0.26.1
deleted file mode 100644
index 010ebfe17a35..000000000000
--- a/app-backup/btrbk-0.26.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst preinst
-DEPEND=>=app-text/asciidoc-8.6.0 app-text/xmlto virtual/pkgconfig
-DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
-EAPI=6
-HOMEPAGE=https://digint.ch/btrbk/
-IUSE=+pv
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl net-misc/openssh pv? ( sys-apps/pv ) >=sys-fs/btrfs-progs-3.18.2
-SLOT=0
-SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.26.1.tar.xz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d84c0089ee1d686a83ecc197f7743377
diff --git a/app-backup/btrbk-9999 b/app-backup/btrbk-9999
deleted file mode 100644
index efb022c6edfd..000000000000
--- a/app-backup/btrbk-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst preinst unpack
-DEPEND=>=app-text/asciidoc-8.6.0 app-text/xmlto virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
-EAPI=6
-HOMEPAGE=https://digint.ch/btrbk/
-IUSE=+pv
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl net-misc/openssh pv? ( sys-apps/pv ) >=sys-fs/btrfs-progs-3.18.2
-SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d84c0089ee1d686a83ecc197f7743377
diff --git a/app-backup/btrbk/Manifest b/app-backup/btrbk/Manifest
new file mode 100644
index 000000000000..09e5160ccdce
--- /dev/null
+++ b/app-backup/btrbk/Manifest
@@ -0,0 +1,10 @@
+DIST btrbk-0.24.0.tar.xz 72308 BLAKE2B 425811455087a5aec4443d8a7bc7ed23cd49813d839a17c818f3e61f4b162518f282da69aa0b1c100b24c47684a7c6d83765332cfbf1893496dbf7e0aeabff87 SHA512 fbe180743743ead1241968765b5ae6eff37b2925bee8379443568c126426f2098d280a3f62d13e5f5b63f967ac9889ad9331d73f354d0cd441c907ba92258267
+DIST btrbk-0.25.1.tar.xz 74904 BLAKE2B 12f0a1e9c383b1c736cba190bae6f948df5db608a689e2469af05716d2ed15f0206c9336148af1a09f29da44c44314d4d153c8d2e5eea8f7e425a185c9040d6d SHA512 6802e379f49c5433a811f6f844cf2663c752b23d8d678f001bb8cba9b099c7527983e23169814c7469ab8682b95fa0f742d1088415747ebebfe0fcc36425cd05
+DIST btrbk-0.26.0.tar.xz 82472 BLAKE2B 06effda16b2173e6d3dc3ea896ed9729d6f2840a29aebc0d271935a88fd54fbbc08bf0b257c8424976a2668907c74f1b34fe46465ba6457d60cacf0b15316052 SHA512 a08ec4e2e0d164b9a9a17b3d4b8417eb3890994c8aa2233ecda9d616659fce917311a94fdfd6762acacb40dc25a60fe8f6880703c980ccd4a176b14e24a2bb00
+DIST btrbk-0.26.1.tar.xz 83624 BLAKE2B a99c66dc16432edb1da38ac51e68ed939207ad8553108258346d4261c243a1a478a3e1dca1cf6d39d03e10a8a5c44e45a7784aec131246e060aded4fc24d708e SHA512 ee0043f468e11545ca28b5bd456aa9dab1b994ed6d8899ab0f53d455f78bb44f83bcf493e32fdecfec82b3029d5dabc2db72a2f32de80b709a12930df6d53b22
+EBUILD btrbk-0.24.0-r1.ebuild 755 BLAKE2B 1ee8bedbe3dd869c4afb8103763269906d4a75c5dccfebefebb851bdb4a1243d14eac3a35d5e8ac5d29660b96e7856e0421d2804f83c982c47d58f888e3b498c SHA512 2924123eeabd0b1e7a325d9b413c6ff9ee750184b85ea1f460f236aa74e978df1e5537ab77fc49e8f82148caff743724355d31cf60aa5e760d1615b60d22f7e5
+EBUILD btrbk-0.25.1-r1.ebuild 743 BLAKE2B bb707beaa6dd1dae7648262190ee05f76f70197982d6994386e9ee8bc8e885a88ba0c9f9eb33d2846f9f7b023d6a0c97a95d9bf04fbb6de72d8ff489da09d8b2 SHA512 452cdc0bbcba6b08e00bbccdc0332dc06aa59d746a0e8a608ee5da5bb5ac2047705380df2e7865fdd3a2e3d44fce6a4b1fda8e890f150a8a3d543d63fa2610eb
+EBUILD btrbk-0.26.0.ebuild 1078 BLAKE2B 9c92380e34d5005cc0d738c68e7b404a4db77fccc1a233ada610d7518e253cfaafa91135da7d9ce6cf6546150a6805f524b3a9302b680b84e63616a1f910b029 SHA512 0d22df7d376f96de76a19be8a3ce7a9e7773c02c6da7545949ce0083a32ea6e5aaeabf026ce91655af34109532fa06fbd8b074e494e591d529dbb9d6f0bd4a58
+EBUILD btrbk-0.26.1.ebuild 1086 BLAKE2B fc399e327dc380f2d8a6ba0afef6ed83fbd75b44e20cd1118e1d6bf554a01c1bbd9646cdd06141c5f2c6e20a51fa6dbb4a55c547ab7b4a67e52367f8df13a5c6 SHA512 a99fbb45829357f83e361a4e22cdbc38598d6dca808d7a84bbb0ec4c043f1ccba39dffd6c0c7c902de199a44106f6fbf6ff79066fad1a5781cefdb6a9cb4ae4e
+EBUILD btrbk-9999.ebuild 1086 BLAKE2B fc399e327dc380f2d8a6ba0afef6ed83fbd75b44e20cd1118e1d6bf554a01c1bbd9646cdd06141c5f2c6e20a51fa6dbb4a55c547ab7b4a67e52367f8df13a5c6 SHA512 a99fbb45829357f83e361a4e22cdbc38598d6dca808d7a84bbb0ec4c043f1ccba39dffd6c0c7c902de199a44106f6fbf6ff79066fad1a5781cefdb6a9cb4ae4e
+MISC metadata.xml 1076 BLAKE2B 38beb88fb33730c665430ce275d33b231a57f02c2644b3ff89974935f93d1f0cea8b53b908019eb7bcb0ad99dca49e69475d44a506e08719270c2f8524b5e096 SHA512 20141d3aeba7ebe743ed3101af70c3f6515f11aaed4d43a73d507c18a933d30e778d10cfc17b98e33c616e80c79edd157d64fb0f54e35ad64a7e3114b3fd667f
diff --git a/app-backup/btrbk/btrbk-0.24.0-r1.ebuild b/app-backup/btrbk/btrbk-0.24.0-r1.ebuild
new file mode 100644
index 000000000000..8f10060231fa
--- /dev/null
+++ b/app-backup/btrbk/btrbk-0.24.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://dev.tty0.ch/btrbk.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
+	KEYWORDS="amd64 arm x86"
+fi
+
+DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
+HOMEPAGE="https://digint.ch/btrbk/"
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+pv"
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+	net-misc/openssh
+	pv? ( sys-apps/pv )
+	>=sys-fs/btrfs-progs-3.18.2 <sys-fs/btrfs-progs-4.8.3"
+
+src_install() {
+	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" SYSTEMDDIR="$(systemd_get_systemunitdir)" install
+}
diff --git a/app-backup/btrbk/btrbk-0.25.1-r1.ebuild b/app-backup/btrbk/btrbk-0.25.1-r1.ebuild
new file mode 100644
index 000000000000..8b302fd3e61f
--- /dev/null
+++ b/app-backup/btrbk/btrbk-0.25.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://dev.tty0.ch/btrbk.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
+	KEYWORDS="amd64 arm x86"
+fi
+
+DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
+HOMEPAGE="https://digint.ch/btrbk/"
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+pv"
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+	net-misc/openssh
+	pv? ( sys-apps/pv )
+	>=sys-fs/btrfs-progs-3.18.2 <sys-fs/btrfs-progs-4.13.2"
+
+src_install() {
+	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" SYSTEMDDIR="$(systemd_get_systemunitdir)" install
+}
diff --git a/app-backup/btrbk/btrbk-0.26.0.ebuild b/app-backup/btrbk/btrbk-0.26.0.ebuild
new file mode 100644
index 000000000000..8588eb6d0e34
--- /dev/null
+++ b/app-backup/btrbk/btrbk-0.26.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://dev.tty0.ch/btrbk.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
+HOMEPAGE="https://digint.ch/btrbk/"
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+pv"
+
+DEPEND=">=app-text/asciidoc-8.6.0
+	app-text/xmlto"
+
+RDEPEND="dev-lang/perl
+	net-misc/openssh
+	pv? ( sys-apps/pv )
+	>=sys-fs/btrfs-progs-3.18.2"
+
+src_install() {
+	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" SYSTEMDDIR="$(systemd_get_systemunitdir)" install
+}
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
+		upgrade_0_26_0_warning="1"
+	fi
+}
+pkg_postinst() {
+	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
+		ewarn "If you are using raw targets, make sure to run the"
+		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
+	fi
+}
diff --git a/app-backup/btrbk/btrbk-0.26.1.ebuild b/app-backup/btrbk/btrbk-0.26.1.ebuild
new file mode 100644
index 000000000000..621ad7e2a0a0
--- /dev/null
+++ b/app-backup/btrbk/btrbk-0.26.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
+HOMEPAGE="https://digint.ch/btrbk/"
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+pv"
+
+DEPEND=">=app-text/asciidoc-8.6.0
+	app-text/xmlto"
+
+RDEPEND="dev-lang/perl
+	net-misc/openssh
+	pv? ( sys-apps/pv )
+	>=sys-fs/btrfs-progs-3.18.2"
+
+src_install() {
+	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" SYSTEMDDIR="$(systemd_get_systemunitdir)" install
+}
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
+		upgrade_0_26_0_warning="1"
+	fi
+}
+pkg_postinst() {
+	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
+		ewarn "If you are using raw targets, make sure to run the"
+		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
+	fi
+}
diff --git a/app-backup/btrbk/btrbk-9999.ebuild b/app-backup/btrbk/btrbk-9999.ebuild
new file mode 100644
index 000000000000..621ad7e2a0a0
--- /dev/null
+++ b/app-backup/btrbk/btrbk-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
+HOMEPAGE="https://digint.ch/btrbk/"
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+pv"
+
+DEPEND=">=app-text/asciidoc-8.6.0
+	app-text/xmlto"
+
+RDEPEND="dev-lang/perl
+	net-misc/openssh
+	pv? ( sys-apps/pv )
+	>=sys-fs/btrfs-progs-3.18.2"
+
+src_install() {
+	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" SYSTEMDDIR="$(systemd_get_systemunitdir)" install
+}
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
+		upgrade_0_26_0_warning="1"
+	fi
+}
+pkg_postinst() {
+	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
+		ewarn "If you are using raw targets, make sure to run the"
+		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
+	fi
+}
diff --git a/app-backup/btrbk/metadata.xml b/app-backup/btrbk/metadata.xml
new file mode 100644
index 000000000000..d5e883ce6629
--- /dev/null
+++ b/app-backup/btrbk/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>candrews@gentoo.org</email>
+        <name>Craig Andrews</name>
+    </maintainer>
+    <maintainer type="person">
+        <email>axel@tty0.ch</email>
+        <name>Axel Burri</name>
+    </maintainer>
+    <longdescription lang="en">
+        Tool for creating snapshots and remote backups of btrfs subvolumes
+    </longdescription>
+    <upstream>
+        <maintainer status="active">
+            <email>axel@tty0.ch</email>
+            <name>Axel Burri</name>
+        </maintainer>
+        <bugs-to>https://github.com/digint/btrbk/issues</bugs-to>
+        <changelog>https://raw.githubusercontent.com/digint/btrbk/master/ChangeLog</changelog>
+        <doc>https://github.com/digint/btrbk/blob/master/README.md</doc>
+        <remote-id type="github">digint/btrbk</remote-id>
+    </upstream>
+    <use>
+        <flag name='pv'>Use sys-apps/pv to enable progress bar functionality</flag>
+    </use>
+</pkgmetadata>
diff --git a/app-backup/bup-0.28.1 b/app-backup/bup-0.28.1
deleted file mode 100644
index 020aba6d70d0..000000000000
--- a/app-backup/bup-0.28.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/par2cmdline dev-python/fuse-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pylibacl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] web? ( www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) sys-libs/readline:0 dev-vcs/git test? ( dev-lang/perl net-misc/rsync ) app-text/pandoc
-DESCRIPTION=A highly efficient backup system based on the git packfile format
-EAPI=6
-HOMEPAGE=https://bup.github.io/ https://github.com/bup/bup
-IUSE=test web python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/par2cmdline dev-python/fuse-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pylibacl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] web? ( www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) sys-libs/readline:0 dev-vcs/git
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/bup/bup/archive/0.28.1.tar.gz -> bup-0.28.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c551eb9f08116f2a304f7225fd222839
diff --git a/app-backup/bup-0.29 b/app-backup/bup-0.29
deleted file mode 100644
index c04cbb7c5f33..000000000000
--- a/app-backup/bup-0.29
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/par2cmdline dev-python/fuse-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pylibacl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] web? ( www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) sys-libs/readline:0 dev-vcs/git test? ( dev-lang/perl net-misc/rsync ) app-text/pandoc
-DESCRIPTION=A highly efficient backup system based on the git packfile format
-EAPI=6
-HOMEPAGE=https://bup.github.io/ https://github.com/bup/bup
-IUSE=test web python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/par2cmdline dev-python/fuse-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pylibacl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] web? ( www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) sys-libs/readline:0 dev-vcs/git
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/bup/bup/archive/0.29.tar.gz -> bup-0.29.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c551eb9f08116f2a304f7225fd222839
diff --git a/app-backup/bup-0.29-r1 b/app-backup/bup-0.29-r1
deleted file mode 100644
index 9ff1a3ea422c..000000000000
--- a/app-backup/bup-0.29-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/par2cmdline dev-python/fuse-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pylibacl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] web? ( www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) sys-libs/readline:0 dev-vcs/git test? ( dev-lang/perl net-misc/rsync ) doc? ( app-text/pandoc )
-DESCRIPTION=A highly efficient backup system based on the git packfile format
-EAPI=6
-HOMEPAGE=https://bup.github.io/ https://github.com/bup/bup
-IUSE=+doc test web python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/par2cmdline dev-python/fuse-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pylibacl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] web? ( www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) sys-libs/readline:0 dev-vcs/git
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/bup/bup/archive/0.29.tar.gz -> bup-0.29.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=99afaa959e4ca157e076b5dcb0831955
diff --git a/app-backup/bup-0.29.1 b/app-backup/bup-0.29.1
deleted file mode 100644
index 802aae788b21..000000000000
--- a/app-backup/bup-0.29.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/par2cmdline dev-python/fuse-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pylibacl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] web? ( www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) sys-libs/readline:0 dev-vcs/git test? ( dev-lang/perl net-misc/rsync ) doc? ( app-text/pandoc )
-DESCRIPTION=A highly efficient backup system based on the git packfile format
-EAPI=6
-HOMEPAGE=https://bup.github.io/ https://github.com/bup/bup
-IUSE=+doc test web python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/par2cmdline dev-python/fuse-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pylibacl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] web? ( www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) sys-libs/readline:0 dev-vcs/git
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/bup/bup/archive/0.29.1.tar.gz -> bup-0.29.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=99afaa959e4ca157e076b5dcb0831955
diff --git a/app-backup/bup/Manifest b/app-backup/bup/Manifest
new file mode 100644
index 000000000000..e85fda0a00b6
--- /dev/null
+++ b/app-backup/bup/Manifest
@@ -0,0 +1,8 @@
+DIST bup-0.28.1.tar.gz 377712 BLAKE2B b469af7b40807e1462c603c03078fc4e048fc300f74dccba9db4ee9d5b1cd385b3092c2bcc08b60ba798e4f401953ccb3217275c6afb3ebf8040e6e507fde9fd SHA512 b27a94eeee86366f9f97081611d8e0443686ed8c4070d45729ad4efe1d48ee9f528d3257bfd5d37d6243927f5b63d6b613bf5ae2c39117012979ccd5ccecf9d2
+DIST bup-0.29.1.tar.gz 388654 BLAKE2B e0a1bd6606f0b2fa7fc50f7df46d2f1704b2bec7e9ac7ff8b97f0bc46081fd4c506f2f12af73e952854746bdf0de5b713d0d5519d99bebafb8c4b62f782ebd09 SHA512 2ad142214cf5ee61e2113b49d02761cdf8fdd5928eb4f885230af71f149ba33ee748e1d96e240903f54d3264dc2ad1614e6ece66027b4c7ed1e97b6147a9685e
+DIST bup-0.29.tar.gz 388173 BLAKE2B 4d844aa616daa56e457a6164a8a00521c3cc2fe56a4f7b3e73b3cdfa4d42977652b203756198e3b8222de5e49b6d0cadd340f70f79e0a1878f4af80dd2b4d2d7 SHA512 3a70d747c6bae2640809d48141b726fa7897f33af9f19047c8d4cfba88abe04ac907980f0ce572847b900e2c8d02a3303e886c8ad7af9a97a7804540c7da1705
+EBUILD bup-0.28.1.ebuild 1196 BLAKE2B 10a8e8e74be17ab9fa5cf7b1274065729c1372429092e53b7864b945413b83b70362fffcb7ab0043f265861e066e7ebf689e5b0516f86e71a455d57a01f85db7 SHA512 43b4b54ebf455d2c8604cb734af209586102e6f28041fe98b303087a2a128fc376ee88558536eb38db6ed5e7ce412aef0ebb0297fe5cf01345e969606c0f472e
+EBUILD bup-0.29-r1.ebuild 1286 BLAKE2B e6b96198a10844d613c683709a80d47ed26f9f4397ca88c0514d463d599f2b2622ea7479a0c6c60f14c588c71064df261a0436d1056f72abf7cb69d0bc9a3a20 SHA512 ad13428549e878f5854639b8a06fab3b0f5dd2142ef68e14a5f018a01bd446f2efb0e643459e061f6fb1b5a096ed730490806ca8c93d475c2c7b418559eb0096
+EBUILD bup-0.29.1.ebuild 1286 BLAKE2B e6b96198a10844d613c683709a80d47ed26f9f4397ca88c0514d463d599f2b2622ea7479a0c6c60f14c588c71064df261a0436d1056f72abf7cb69d0bc9a3a20 SHA512 ad13428549e878f5854639b8a06fab3b0f5dd2142ef68e14a5f018a01bd446f2efb0e643459e061f6fb1b5a096ed730490806ca8c93d475c2c7b418559eb0096
+EBUILD bup-0.29.ebuild 1196 BLAKE2B 10a8e8e74be17ab9fa5cf7b1274065729c1372429092e53b7864b945413b83b70362fffcb7ab0043f265861e066e7ebf689e5b0516f86e71a455d57a01f85db7 SHA512 43b4b54ebf455d2c8604cb734af209586102e6f28041fe98b303087a2a128fc376ee88558536eb38db6ed5e7ce412aef0ebb0297fe5cf01345e969606c0f472e
+MISC metadata.xml 404 BLAKE2B be0a8a5d858a23520e0927be152c1defea7c2df55d7f7d83a28652eeee7d0c0762f6b0d0671b0ec684cee2b1efdea864ca5a20167fb1d4396d427a9ae75f1185 SHA512 62266b2c5b320859e4283c23aac6c325036f1a83b51a314078ccad2b0e9b9360690e34d87f387bea86e8b98ecf1b9851744a57744c478bd7040b42adea517b81
diff --git a/app-backup/bup/bup-0.28.1.ebuild b/app-backup/bup/bup-0.28.1.ebuild
new file mode 100644
index 000000000000..f1071883fb22
--- /dev/null
+++ b/app-backup/bup/bup-0.28.1.ebuild
@@ -0,0 +1,57 @@
+# 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/bup-0.29-r1.ebuild b/app-backup/bup/bup-0.29-r1.ebuild
new file mode 100644
index 000000000000..86ff4f87983b
--- /dev/null
+++ b/app-backup/bup/bup-0.29-r1.ebuild
@@ -0,0 +1,60 @@
+# 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="+doc 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
+	)
+	doc? ( app-text/pandoc )
+"
+
+# unresolved sandbox issues
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	sed -e "/^CFLAGS :=/s/-O2 -Werror//" \
+		-i Makefile || die
+}
+
+src_configure() {
+	# only build/install docs if enabled
+	export PANDOC=$(usex doc pandoc "")
+
+	./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/bup-0.29.1.ebuild b/app-backup/bup/bup-0.29.1.ebuild
new file mode 100644
index 000000000000..86ff4f87983b
--- /dev/null
+++ b/app-backup/bup/bup-0.29.1.ebuild
@@ -0,0 +1,60 @@
+# 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="+doc 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
+	)
+	doc? ( app-text/pandoc )
+"
+
+# unresolved sandbox issues
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	sed -e "/^CFLAGS :=/s/-O2 -Werror//" \
+		-i Makefile || die
+}
+
+src_configure() {
+	# only build/install docs if enabled
+	export PANDOC=$(usex doc pandoc "")
+
+	./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/bup-0.29.ebuild b/app-backup/bup/bup-0.29.ebuild
new file mode 100644
index 000000000000..f1071883fb22
--- /dev/null
+++ b/app-backup/bup/bup-0.29.ebuild
@@ -0,0 +1,57 @@
+# 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
new file mode 100644
index 000000000000..958844441602
--- /dev/null
+++ b/app-backup/bup/metadata.xml
@@ -0,0 +1,14 @@
+<?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>
+	<use>
+		<flag name="web">Support browsing backups via a web interface</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">bup/bup</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-backup/burp-2.1.32 b/app-backup/burp-2.1.32
deleted file mode 100644
index d56ccd140128..000000000000
--- a/app-backup/burp-2.1.32
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=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 ) virtual/pkgconfig test? ( dev-libs/check ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Network backup and restore client and server for Unix and Windows
-EAPI=6
-HOMEPAGE=https://burp.grke.org/
-IUSE=acl ipv6 libressl test xattr
-KEYWORDS=amd64 ~arm x86
-LICENSE=AGPL-3
-RDEPEND=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 ) virtual/logger
-SLOT=0
-SRC_URI=https://github.com/grke/burp/archive/2.1.32.tar.gz -> burp-2.1.32.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b9ed19059d9240f930d09f52b3969ab3
diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest
new file mode 100644
index 000000000000..4c8fd685632f
--- /dev/null
+++ b/app-backup/burp/Manifest
@@ -0,0 +1,8 @@
+AUX burp-2.0.54-server_user.patch 282 BLAKE2B b949a5f1b8d73048145a5efd62bcee605f77f272fe3d4759958092e0c37b14b7077e01b9c55a865728a856293b7acdae494f8583e4451cd02b9242807b05ed72 SHA512 a4cd302967deed776b663f037e509e354dcb5958d6a4c33770062e5455d2ff641d62604779d25c6bb542aa547548c39d8b529fa7787ab1b42dba262f1439fcea
+AUX burp-2.1.20-no_mkdir_run.patch 238 BLAKE2B 44ba927f8ca97386d70d52411f2fe5ca233160e85de56d58e33c9a038c542e6d8cc5a96f1e6eb60fefd5677c201a5416949742d1ba725575021cb28b0afae254 SHA512 b25ce17b66988cdcdb67d847160d7a80a8daf8470cbc5ece066a70dfae34b369e175a2ee2cf10b0e68f51b8fd99f52762dc4c429d6abbc4411fd09a8500c067c
+AUX burp-2.1.20-protocol1_by_default.patch 943 BLAKE2B 430c1c13deabab35731f2610dd918b583455fda6d13eef6292a7eeaac0d14266bf21f97caf6dba65f0a46b1534695e7b72b91c6958d86f70ac63e356b5e05691 SHA512 249a426a76a81a2582f824d2d767695bfd848a04190ee9a2f1d4296bed03f93d4eaa86c13b4b755700b1b552bb584f9b0031ec60a705f2b27b20d62eb58aef8c
+AUX burp.initd 1086 BLAKE2B 7946355a6de36f956e953e59b216ea1807eabcee1a1631fc4f0e3d1bb7165adfba99c2d3c1c47631a5d4fdccca81171106583ba3a994263e08ff73a7b5d7125c SHA512 cb78acab82a919d9dd9eb21dc525f62d3443a690efbf77a695f7d3bc9e2245aafd025977a6f08084c6db545f460ee3d32d83b6f7f5641eae19e2e92d4e0d0850
+AUX burp.service 193 BLAKE2B fa9a00f32999834afaf84db9d28f2e8b65688e784e32f78bc019069649c50b4c17f1cc48db3b0a62e2e269db801182321e5daccc169eaa560677bd3ff52b5ffe SHA512 5ccb7fc0535d15afca1afe21b3bb937f53203b8a893730a2745e88a5effb1add73c0f109c3419e22244def1bf978378889d47953e68586a7da8909286ccf5dcd
+DIST burp-2.1.32.tar.gz 591737 BLAKE2B fd525bff32348f1dbc37b1c065d262ff8af1d999d19f63711ebcff3fb55e90a7440cc6cfc0b7eefe6f8e250672c799d86e65ed599f0b8d7dd80bebcb99888987 SHA512 2477b7a9a2123b227a27519f7f3d9facca7173a9e63d66f6a8fb2ae5408d8af4ad5bfdd0a14efd6cf80e7bc8e91907f7c293a3d621b86bafdbf163bfa08d0c81
+EBUILD burp-2.1.32.ebuild 2844 BLAKE2B b8c61593b365e83955e09ed19d220c497c3df2cb07ecc4a42a1e5fdef79a9723e96129c156acff9be20b2064c2f6a08bad5930db2f924188f3934e783d30cfa1 SHA512 d9b034f9c1885b9ce00a9428d263b99d71a2676478cc25f52e5167600a926c9bb61b7012e204ef0f3b12a17d7d659b5a8f161b349d03f2617a24646fcf3b4e47
+MISC metadata.xml 684 BLAKE2B 3b4511a62d65ec23ef3b1311f57d703154f08e8d82d189a5ea0b555b5d7d686c54365d2992b85c6e5dffa0ee93f7331367925766ea1bfe349446c23d73dba392 SHA512 3752a2b8e2fb49d44d8fe431768ab1b4bc9995099e9bbe4f957677b39ca038a75874bfb0781b1cd1bd4bd79186c0994f2ce5654921a58c9645ffd6dc553f3c9f
diff --git a/app-backup/burp/burp-2.1.32.ebuild b/app-backup/burp/burp-2.1.32.ebuild
new file mode 100644
index 000000000000..9f8399e8ca19
--- /dev/null
+++ b/app-backup/burp/burp-2.1.32.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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/files/burp-2.0.54-server_user.patch b/app-backup/burp/files/burp-2.0.54-server_user.patch
new file mode 100644
index 000000000000..979bb4bd4c91
--- /dev/null
+++ b/app-backup/burp/files/burp-2.0.54-server_user.patch
@@ -0,0 +1,13 @@
+--- a/configs/server/burp.conf.in
++++ b/configs/server/burp.conf.in
+@@ -68,8 +68,8 @@
+ # keep = 6
+ 
+ # Run as different user/group.
+-# user=graham
+-# group=nogroup
++user=burp
++group=burp
+ 
+ # CA options.
+ # If you want your server to be a certificate authority and generate its own
diff --git a/app-backup/burp/files/burp-2.1.20-no_mkdir_run.patch b/app-backup/burp/files/burp-2.1.20-no_mkdir_run.patch
new file mode 100644
index 000000000000..5dbdcf9e7c4c
--- /dev/null
+++ b/app-backup/burp/files/burp-2.1.20-no_mkdir_run.patch
@@ -0,0 +1,10 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -417,7 +417,6 @@
+ 
+ install-data-local:
+ 	$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(localstatedir)/spool/$(PACKAGE_TARNAME)
+-	$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(runstatedir)
+ 
+ clean-local: clean-local-check
+ 
diff --git a/app-backup/burp/files/burp-2.1.20-protocol1_by_default.patch b/app-backup/burp/files/burp-2.1.20-protocol1_by_default.patch
new file mode 100644
index 000000000000..db9e9b6a9de5
--- /dev/null
+++ b/app-backup/burp/files/burp-2.1.20-protocol1_by_default.patch
@@ -0,0 +1,24 @@
+--- a/configs/client/burp.conf.in
++++ b/configs/client/burp.conf.in
+@@ -10,7 +10,8 @@
+ # 0 to decide automatically, 1 to force protocol1 mode (file level granularity
+ # with a pseudo mirrored storage on the server and optional rsync). 2 forces
+ # protocol2 mode (inline deduplication with variable length blocks).
+-# protocol = 0
++# WARNING: as of September 2017 protocol2 is still considered experimental.
++protocol = 1
+ pidfile = @runstatedir@/@name@.client.pid
+ syslog = 0
+ stdout = 1
+--- a/configs/server/burp.conf.in
++++ b/configs/server/burp.conf.in
+@@ -21,7 +21,8 @@
+ # protocol2 mode (inline deduplication with variable length blocks).
+ # Like many other settings, this can be set per client in the clientconfdir
+ # files.
+-# protocol = 0
++# WARNING: as of September 2017 protocol2 is still considered experimental.
++protocol = 1
+ pidfile = @runstatedir@/@name@.server.pid
+ hardlinked_archive = 0
+ working_dir_recovery_method = delete
diff --git a/app-backup/burp/files/burp.initd b/app-backup/burp/files/burp.initd
new file mode 100644
index 000000000000..a0b0dccacbcc
--- /dev/null
+++ b/app-backup/burp/files/burp.initd
@@ -0,0 +1,45 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+BURP_CONFIG="/etc/burp/burp-server.conf"
+
+description="Burp is a network backup and restore program"
+
+command="/usr/sbin/burp"
+command_args="-c '${BURP_CONFIG}' -F"
+command_background="yes"
+pidfile="/run/burp.server.pid"
+start_stop_daemon_arg="--wait 500"
+
+extra_started_commands="reload summary"
+description_reload="Reloads configuration"
+description_summary="Displays main status monitor summary"
+
+get_backup_dir() {
+	grep '^directory = ' "${BURP_CONFIG}" \
+		| sed -e 's/^directory = //'
+}
+
+depend() {
+	need localmount
+	after bootmisc
+	use net
+}
+
+start_pre() {
+	checkpath -o root:burp -m 0775 -d /etc/burp
+	checkpath -o root:burp -m 0640 -f /etc/burp/burp-server.conf
+	checkpath -o root:burp -m 0750 -d /etc/burp/clientconfdir
+	checkpath -o root:burp -m 0770 -d "$(get_backup_dir)"
+}
+
+reload() {
+	ebegin "Reloading ${SVCNAME} configuration"
+	start-stop-daemon --exec ${command} --signal HUP
+	eend $?
+}
+
+summary() {
+	"${command}" -c "${BURP_CONFIG}" -a S
+}
diff --git a/app-backup/burp/files/burp.service b/app-backup/burp/files/burp.service
new file mode 100644
index 000000000000..121753629607
--- /dev/null
+++ b/app-backup/burp/files/burp.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=BackUp and Restore Program server
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/sbin/burp -F -c /etc/burp/burp-server.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-backup/burp/metadata.xml b/app-backup/burp/metadata.xml
new file mode 100644
index 000000000000..2887b871ddd0
--- /dev/null
+++ b/app-backup/burp/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription lang="en">
+		Burp is a network backup and restore program. It uses librsync in order
+		to save network traffic and to save on the amount of space that is used
+		by each backup. It also uses VSS (Volume Shadow Copy Service) to make
+		snapshots when backing up Windows computers.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">grke/burp</remote-id>
+		<remote-id type="sourceforge">burp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-backup/buttersink-0.6.8 b/app-backup/buttersink-0.6.8
deleted file mode 100644
index 3897034d401d..000000000000
--- a/app-backup/buttersink-0.6.8
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/boto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/crcmod[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-fs/btrfs-progs test? ( dev-python/flake8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=rsync-like utility for btrfs snapshots
-EAPI=6
-HOMEPAGE=https://github.com/AmesCornish/buttersink
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/boto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/crcmod[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-fs/btrfs-progs python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/AmesCornish/buttersink/archive/0.6.8.tar.gz -> buttersink-0.6.8.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c9d0c161ad1f43c051dacbb7e6b927df
diff --git a/app-backup/buttersink-9999 b/app-backup/buttersink-9999
deleted file mode 100644
index 8161fbb21273..000000000000
--- a/app-backup/buttersink-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/boto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/crcmod[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-fs/btrfs-progs test? ( dev-python/flake8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=rsync-like utility for btrfs snapshots
-EAPI=6
-HOMEPAGE=https://github.com/AmesCornish/buttersink
-IUSE=test python_targets_python2_7
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/boto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/crcmod[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-fs/btrfs-progs python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c9d0c161ad1f43c051dacbb7e6b927df
diff --git a/app-backup/buttersink/Manifest b/app-backup/buttersink/Manifest
new file mode 100644
index 000000000000..415d4d80f00e
--- /dev/null
+++ b/app-backup/buttersink/Manifest
@@ -0,0 +1,4 @@
+DIST buttersink-0.6.8.tar.gz 51784 BLAKE2B 3f18716bcc55aee99bbb73e8a1928c29cb28a782966aded60b019673e0336f342e4d76aff827f9bd7f39713fe9cadcd89f5f81438a86d8867a8b1ac0a57f3957 SHA512 52898140d983bcc6776497504191f0c1c727b24fa9543f5a5997a54ced26301ca492518094ca8770fce8064bc99dc6d3f6760e986eb66f08a758985a7a85ffff
+EBUILD buttersink-0.6.8.ebuild 1238 BLAKE2B 862f8095e60c89caba1e80fbae4e467b79934f9fb83b6f054c33d02bcbc99a5b681ffd0e6b0aaadfc063c8aeda4e9279db526b01a49754701b68c75e4dc6b0c9 SHA512 54096f54a676daf712bcf29c1aaa3310bbd73f142f8ba0af3a222317ce4c18249cdc0c89eb5aa733053188d56f0b48c32a6555fac635ed07b88e1209deadd2ce
+EBUILD buttersink-9999.ebuild 1238 BLAKE2B 862f8095e60c89caba1e80fbae4e467b79934f9fb83b6f054c33d02bcbc99a5b681ffd0e6b0aaadfc063c8aeda4e9279db526b01a49754701b68c75e4dc6b0c9 SHA512 54096f54a676daf712bcf29c1aaa3310bbd73f142f8ba0af3a222317ce4c18249cdc0c89eb5aa733053188d56f0b48c32a6555fac635ed07b88e1209deadd2ce
+MISC metadata.xml 385 BLAKE2B 4baa41b64c2ad94077d2ce5c752c8a42cd4eb54911dfa9c5715c4270530ab7b1648953924b37dfad712e92ffba17c313d5defe9108255abb87b71f7f33814183 SHA512 0a067465c740e3cc79c58e9204024edfadefa0c88ddae3e5cd05776c953388d9493bbe6292cbd0cff739f102993154c970af91b06387424254c8eccdeeee2022
diff --git a/app-backup/buttersink/buttersink-0.6.8.ebuild b/app-backup/buttersink/buttersink-0.6.8.ebuild
new file mode 100644
index 000000000000..998f4d7a31d8
--- /dev/null
+++ b/app-backup/buttersink/buttersink-0.6.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="rsync-like utility for btrfs snapshots"
+HOMEPAGE="https://github.com/AmesCornish/buttersink"
+
+LICENSE="GPL-3"
+SLOT=0
+IUSE="test"
+
+# local tests would require root and cause sandbox issues with btrfs subvolume
+# operations, and network tests would require an SSH server with root login to
+# test the SSH backend, or remote S3 for that backend
+RESTRICT="test"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/AmesCornish/buttersink"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/AmesCornish/buttersink/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/crcmod[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	sys-fs/btrfs-progs"
+DEPEND="${RDEPEND}
+	test? ( dev-python/flake8[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	if [[ ${PV} == 9999 ]] ; then
+		emake makestamps buttersink/version.py
+	else
+		mkdir makestamps || die
+		echo "version = \"${PV}\"" > buttersink/version.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
diff --git a/app-backup/buttersink/buttersink-9999.ebuild b/app-backup/buttersink/buttersink-9999.ebuild
new file mode 100644
index 000000000000..998f4d7a31d8
--- /dev/null
+++ b/app-backup/buttersink/buttersink-9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="rsync-like utility for btrfs snapshots"
+HOMEPAGE="https://github.com/AmesCornish/buttersink"
+
+LICENSE="GPL-3"
+SLOT=0
+IUSE="test"
+
+# local tests would require root and cause sandbox issues with btrfs subvolume
+# operations, and network tests would require an SSH server with root login to
+# test the SSH backend, or remote S3 for that backend
+RESTRICT="test"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/AmesCornish/buttersink"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/AmesCornish/buttersink/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/crcmod[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	sys-fs/btrfs-progs"
+DEPEND="${RDEPEND}
+	test? ( dev-python/flake8[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	if [[ ${PV} == 9999 ]] ; then
+		emake makestamps buttersink/version.py
+	else
+		mkdir makestamps || die
+		echo "version = \"${PV}\"" > buttersink/version.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
diff --git a/app-backup/buttersink/metadata.xml b/app-backup/buttersink/metadata.xml
new file mode 100644
index 000000000000..d80abca98b5f
--- /dev/null
+++ b/app-backup/buttersink/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>adebeus@gmail.com</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+  </maintainer>
+  <longdescription>rsync-like utility for btrfs snapshots</longdescription>
+</pkgmetadata>
diff --git a/app-backup/cachedir-1.4 b/app-backup/cachedir-1.4
deleted file mode 100644
index 6da39d4cad03..000000000000
--- a/app-backup/cachedir-1.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/cliapp[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Tag/untag cache directories
-EAPI=6
-HOMEPAGE=http://liw.fi/cachedir/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/cliapp[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cachedir/snapshot/cachedir-1.4.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=10a177df18b25ef8305c2263ba11906d
diff --git a/app-backup/cachedir/Manifest b/app-backup/cachedir/Manifest
new file mode 100644
index 000000000000..a07c43890afb
--- /dev/null
+++ b/app-backup/cachedir/Manifest
@@ -0,0 +1,3 @@
+DIST cachedir-1.4.tar.gz 16254 BLAKE2B f70fe693d614ab90c4b235c2979e9323eb41976ea8a97c4d3107af26f411553a86e0409b354483a6e3c9af956597c9a4114dc28829cc2ed55abe7c7dd3bb8a99 SHA512 dabeb36a4b99febafbfcc3bff4de625491eee6649cac6c03ef782415cfdd519d36911bed8ae6e7bb94b0afe6279b17fd99fcb87f0c2d2e37032a76fa516dd6c7
+EBUILD cachedir-1.4.ebuild 920 BLAKE2B 1245164d498c8ea5f3840a18d43329a43e228510508cec00ac63cf608e3b39e6184a1f1ab446dcdef12b15fccc607fb7c8d1cd04a1761f1860274776d98ed33c SHA512 402ea34eb4e24c79f1af0b0c6e06a5e6ea99a6c8479482a120a4bb9fb82cb804222e347ff24c85aa1765d3c9d6900cf8ac8f45d083bd25213007e0d37b0f287d
+MISC metadata.xml 244 BLAKE2B 4e1d876bfd59de3a266b815e745f499103f7a51dcf049893964134956ff947d34e5d006fdb8bf714df0c6520c1e23e397816938f0782ddb392470ff8b08db25b SHA512 79a93c4e2d9e1408640cf5f3ca110863c932665f90383f7d71bd5e5324160ba83f8bb30de5095b9c5a0778a305c8bffe94d729daadea15991daa1aa641cadaf4
diff --git a/app-backup/cachedir/cachedir-1.4.ebuild b/app-backup/cachedir/cachedir-1.4.ebuild
new file mode 100644
index 000000000000..ca9b3bf689b7
--- /dev/null
+++ b/app-backup/cachedir/cachedir-1.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tag/untag cache directories"
+HOMEPAGE="http://liw.fi/cachedir/"
+SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cachedir/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+# test deps not supporting python 3
+RESTRICT="test"
+
+RDEPEND="dev-python/cliapp[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+#	test? (
+#		dev-util/cmdtest[${PYTHON_USEDEP}]
+#	)
+#	"
+
+python_prepare_all() {
+	2to3 -w setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+src_compile() {
+	addwrite /proc/self/comm
+	distutils-r1_src_compile
+}
+
+src_test() {
+	addwrite /proc/self/comm
+	distutils-r1_src_test
+}
+
+python_test() {
+	esetup.py check
+}
diff --git a/app-backup/cachedir/metadata.xml b/app-backup/cachedir/metadata.xml
new file mode 100644
index 000000000000..b7595a302f22
--- /dev/null
+++ b/app-backup/cachedir/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jlec@gentoo.org</email>
+		<name>Justin Lecher</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-backup/ccollect-0.8 b/app-backup/ccollect-0.8
deleted file mode 100644
index 9b1714bfa3ba..000000000000
--- a/app-backup/ccollect-0.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=doc? ( >=app-text/asciidoc-8.1.0 app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.2 dev-libs/libxslt )
-DESCRIPTION=Pseudo incremental backup with different exclude lists using hardlinks and rsync
-EAPI=6
-HOMEPAGE=https://www.nico.schottelius.org/software/ccollect/
-IUSE=doc examples
-KEYWORDS=amd64 hppa ppc ~sparc x86
-LICENSE=GPL-3
-RDEPEND=net-misc/rsync
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.nico.schottelius.org/software/ccollect/download/ccollect-0.8.tar.bz2
-_md5_=b2b3acf4765d6d97aea67e065712c4c5
diff --git a/app-backup/ccollect/Manifest b/app-backup/ccollect/Manifest
new file mode 100644
index 000000000000..2464513cc5e3
--- /dev/null
+++ b/app-backup/ccollect/Manifest
@@ -0,0 +1,3 @@
+DIST ccollect-0.8.tar.bz2 60376 BLAKE2B e3580aa6d1438b106c372e5b4abc77b9e19a8e057b93cfbd5882b3e9a899d5fa02c31c030c933c6e3e254687423cc51d0d86787365d40e4f5635aab3aa6dd954 SHA512 dc4b2a8687c636938154f8a4a4048c3f0ef13f6d6e3f6e66d8dcc8f544f3a390a98a8dbfb3ba2ba9019decbec5d628f07461dd3f803e14b2203972936ebf96f3
+EBUILD ccollect-0.8.ebuild 2211 BLAKE2B eee5eddafcac2ca0e74fe8afb936cd9ee578c8e22959ecfb579f97a42e287eb40a2274e795a4ca3cb468fcbe1ac2c626342de7781621cd582339ee0811ff9cbd SHA512 8b40955d9a3d76dddc8bda3b6267b4df351cd32350a95a14e013a0a38d68c422ca5be476c51b3116b4b5ed6190c8e7b9f80f8d1045d01a29d4c4e06d95680e7f
+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
new file mode 100644
index 000000000000..f4da568241cd
--- /dev/null
+++ b/app-backup/ccollect/ccollect-0.8.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Pseudo incremental backup with different exclude lists using hardlinks and rsync"
+HOMEPAGE="https://www.nico.schottelius.org/software/ccollect/"
+SRC_URI="https://www.nico.schottelius.org/software/${PN}/download/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc ~sparc x86"
+IUSE="doc examples"
+
+DEPEND="
+	doc? (
+		>=app-text/asciidoc-8.1.0
+		app-text/docbook-xsl-stylesheets
+		app-text/docbook-xml-dtd:4.2
+		dev-libs/libxslt
+	)"
+RDEPEND="net-misc/rsync"
+
+# tests need ssh-access
+RESTRICT="test"
+
+src_compile() {
+	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 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
+
+	pushd doc/changes >/dev/null || die
+		for i in * ; do
+			newdoc ${i} NEWS-${i}
+		done
+	popd >/dev/null || die
+
+	if use doc; then
+		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
+		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 ${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 "  ${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/ccollect/metadata.xml b/app-backup/ccollect/metadata.xml
new file mode 100644
index 000000000000..8626ee05464b
--- /dev/null
+++ b/app-backup/ccollect/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dev-zero@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-backup/cdbackup-0.7.1-r1 b/app-backup/cdbackup-0.7.1-r1
deleted file mode 100644
index 0123a1f4bc7a..000000000000
--- a/app-backup/cdbackup-0.7.1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Allows streaming backup utilities to dump/restore from CD-R(W)s or DVD(+/-RW)s
-EAPI=6
-HOMEPAGE=http://www.muempf.de/index.html
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=app-cdr/cdrtools-1.11.28
-SLOT=0
-SRC_URI=http://www.muempf.de/down/cdbackup-0.7.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=2f6093e2c82c4d4ac3a8238d2c9e4b71
diff --git a/app-backup/cdbackup/Manifest b/app-backup/cdbackup/Manifest
new file mode 100644
index 000000000000..016087e36656
--- /dev/null
+++ b/app-backup/cdbackup/Manifest
@@ -0,0 +1,3 @@
+DIST cdbackup-0.7.1.tar.gz 22710 BLAKE2B eb21cf8ebd0c0a5487a86fb1d8afe7743be070743bdf3245fd4131c06c8ffe97b4bb93096e8952fb8479fac0cf3d764375478437691386ab762607aa420f8540 SHA512 9246295090a7d52ff452d5d24a429f2a21179e4d8deb4e9d6f2ab607dd04230830e3524f25d0180e36f62c7f7f87dec11cb3c1c01cde51708d467d6e0a4afc8f
+EBUILD cdbackup-0.7.1-r1.ebuild 744 BLAKE2B 6885c9c52fc7cadecf66b11033687849e4333a879d5bf1643800f8dec9f957d59052291d08d7505816748ce5bf0ee2c9a17956dc9019b32b73a6254894bf6006 SHA512 325c8e0dd7f0495e28883598b61d44469d0451863fe64034182ef3f63af0b6bd5d80992c2e0d968b24aabe22fe8721c3ea7324e79856feb8970e11ccbf1a72ee
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-backup/cdbackup/cdbackup-0.7.1-r1.ebuild b/app-backup/cdbackup/cdbackup-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..7529285d9a60
--- /dev/null
+++ b/app-backup/cdbackup/cdbackup-0.7.1-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 toolchain-funcs
+
+DESCRIPTION="Allows streaming backup utilities to dump/restore from CD-R(W)s or DVD(+/-RW)s"
+HOMEPAGE="http://www.muempf.de/index.html"
+SRC_URI="http://www.muempf.de/down/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-cdr/cdrtools-1.11.28"
+DEPEND=""
+
+src_prepare() {
+	sed -i -e '/cd\(backup\|restore\)/,+1 s:CFLAGS:LDFLAGS:' \
+                "${S}"/Makefile || die "sed Makefile failed"
+	default
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin cdbackup cdrestore
+	doman cdbackup.1 cdrestore.1
+	dodoc CHANGES CREDITS README
+}
diff --git a/app-backup/cdbackup/metadata.xml b/app-backup/cdbackup/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-backup/cdbackup/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-backup/cdbkup-1.0-r2 b/app-backup/cdbkup-1.0-r2
deleted file mode 100644
index 4b41a02903e7..000000000000
--- a/app-backup/cdbkup-1.0-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=net-misc/openssh virtual/cdrtools virtual/eject
-DESCRIPTION=performs full/incremental backups of local/remote filesystems onto CD-R(W)s
-EAPI=6
-HOMEPAGE=http://cdbkup.sourceforge.net/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=net-misc/openssh virtual/cdrtools virtual/eject !app-misc/cdcat
-SLOT=0
-SRC_URI=mirror://sourceforge/cdbkup/cdbkup-1.0.tar.gz
-_md5_=5d6404a4d7695af61a00aa3ce03e0ee7
diff --git a/app-backup/cdbkup/Manifest b/app-backup/cdbkup/Manifest
new file mode 100644
index 000000000000..80b4b27cbf05
--- /dev/null
+++ b/app-backup/cdbkup/Manifest
@@ -0,0 +1,3 @@
+DIST cdbkup-1.0.tar.gz 38252 BLAKE2B f16209fac8a4c64b628caf9770c67e944add326a7aeeec0b76a1018b8441fd7cfd92de1a657eb8efe0eb49f30fb3f0e135f090291d8c07da1fef313a81f4b0ab SHA512 f95a7540704c16a01e65397fb63b5b97011685c62d3c9a9b2e303470fed5a31f909cb700035466e89ccd181401fd3c19d427fa32c40ece1ba77c1dba9322969d
+EBUILD cdbkup-1.0-r2.ebuild 711 BLAKE2B f0242e29f54a329c823460e24a66d9c1f229cc76cd4104979c40b8451af0dbfcef96912b401bd9f12497108030b7ef0c31c1e39b59ae755d0de7968064070d3c SHA512 d7ba064e80eba0e7955b2de762350d1d87bfa00591f1a3da0c5105e205ea41bd9944cdf99b3d7918d14649afdaab960efcb4a5c533f07b1fa296a94aeda8d9f9
+MISC metadata.xml 392 BLAKE2B d840db592ea3cc9fe268652b9fe71d4fb5ce2637e4d0b97d1329d3e389678775677a530de9a31c76b0fd61667964d0a7899b899fa3d39d01b5ce39f2c4910c65 SHA512 12309a51f3fd6a5fe322a90d71cb554c07b1dcbe42aa5052f3b84f9e361dce74e90bf4915852b7d7d563488451f4e6148a9fc24bb7ef539178f4abc8f0805ff8
diff --git a/app-backup/cdbkup/cdbkup-1.0-r2.ebuild b/app-backup/cdbkup/cdbkup-1.0-r2.ebuild
new file mode 100644
index 000000000000..3c748f2a7b6a
--- /dev/null
+++ b/app-backup/cdbkup/cdbkup-1.0-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="performs full/incremental backups of local/remote filesystems onto CD-R(W)s"
+HOMEPAGE="http://cdbkup.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cdbkup/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="net-misc/openssh
+	virtual/cdrtools
+	virtual/eject
+"
+RDEPEND="${DEPEND}
+	!app-misc/cdcat
+"
+
+src_prepare() {
+	default
+	sed -i -e "s:doc/cdbkup:doc/${P}:" Makefile.in || die
+	sed -i -e 's/make /$(MAKE) /' Makefile.in || die
+}
+
+src_configure() {
+	econf --with-snardir=/etc/cdbkup --with-dumpgrp=users
+}
+
+src_install() {
+	default
+	dodoc COMPLIANCE
+}
diff --git a/app-backup/cdbkup/metadata.xml b/app-backup/cdbkup/metadata.xml
new file mode 100644
index 000000000000..bce6888fa2f8
--- /dev/null
+++ b/app-backup/cdbkup/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>A backup application capable of full/incremental backups on
+	local and remote systems onto cd-r and cd-rw discs.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">cdbkup</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-backup/cpdup-1.18 b/app-backup/cpdup-1.18
deleted file mode 100644
index f3f4afe1b167..000000000000
--- a/app-backup/cpdup-1.18
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=A comprehensive filesystem mirroring program
-EAPI=6
-HOMEPAGE=http://apollo.backplane.com/FreeSrc/
-IUSE=userland_GNU threads
-KEYWORDS=~x86-fbsd ~amd64
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=http://apollo.backplane.com/FreeSrc/cpdup-1.18.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=e69918b073ae4efb29c3fb41738740bd
diff --git a/app-backup/cpdup/Manifest b/app-backup/cpdup/Manifest
new file mode 100644
index 000000000000..c9ca4f8aba9f
--- /dev/null
+++ b/app-backup/cpdup/Manifest
@@ -0,0 +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 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
new file mode 100644
index 000000000000..cf88a6bfd530
--- /dev/null
+++ b/app-backup/cpdup/cpdup-1.18.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A comprehensive filesystem mirroring program"
+HOMEPAGE="http://apollo.backplane.com/FreeSrc/"
+SRC_URI="http://apollo.backplane.com/FreeSrc/${P}.tgz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~x86-fbsd ~amd64"
+IUSE="userland_GNU threads"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${PN}"
+PATCHES=( "${FILESDIR}"/${PN}-1.11-unused.patch )
+
+src_prepare() {
+	default
+
+	if use userland_GNU; then
+		cp "${FILESDIR}"/Makefile.linux Makefile || die
+		# bits/stat.h has __unused too
+		sed -i 's/__unused/__cpdup_unused/' *.c || die
+		echo "#define strlcpy(a,b,c) strncpy(a,b,c)" >> cpdup.h || die
+	fi
+}
+
+src_configure() {
+	tc-export CC
+	use threads || EXTRA_MAKE_OPTS="NOPTHREADS=1"
+}
+
+src_compile() {
+	MAKE=make emake ${EXTRA_MAKE_OPTS}
+}
+
+src_install() {
+	dobin cpdup
+	doman cpdup.1
+	dodoc -r scripts
+}
diff --git a/app-backup/cpdup/files/Makefile.linux b/app-backup/cpdup/files/Makefile.linux
new file mode 100644
index 000000000000..3e18e4e0b218
--- /dev/null
+++ b/app-backup/cpdup/files/Makefile.linux
@@ -0,0 +1,13 @@
+OBJS = cpdup.o fsmid.o hclink.o hcproto.o misc.o
+
+CFLAGS += -D__cpdup_unused="__attribute__ ((unused))" -D_GNU_SOURCE -D__USE_FILE_OFFSET64 -DNOMD5
+
+ifndef NOPTHREADS
+CFLAGS += -DUSE_PTHREADS=1 -pthread
+endif
+
+all: $(OBJS)
+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o cpdup
+
+.c.o:
+	$(CC) $(CFLAGS) -c -o $@ $<
diff --git a/app-backup/cpdup/files/cpdup-1.11-unused.patch b/app-backup/cpdup/files/cpdup-1.11-unused.patch
new file mode 100644
index 000000000000..5544afbeddf9
--- /dev/null
+++ b/app-backup/cpdup/files/cpdup-1.11-unused.patch
@@ -0,0 +1,14 @@
+--- a/cpdup.c
++++ b/cpdup.c
+@@ -1543,7 +1543,11 @@
+  */
+ 
+ static int
++#ifdef _ST_FLAGS_PRESENT_
+ xrename(const char *src, const char *dst, u_long flags)
++#else
++xrename(const char *src, const char *dst, u_long flags __unused)
++#endif
+ {
+     int r;
+ 
diff --git a/app-backup/cpdup/metadata.xml b/app-backup/cpdup/metadata.xml
new file mode 100644
index 000000000000..a00f3aeb1f81
--- /dev/null
+++ b/app-backup/cpdup/metadata.xml
@@ -0,0 +1,8 @@
+<?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>
+</pkgmetadata>
diff --git a/app-backup/dar-2.5.11 b/app-backup/dar-2.5.11
deleted file mode 100644
index ee63438c9b23..000000000000
--- a/app-backup/dar-2.5.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/attr:= ) ) static? ( app-arch/bzip2[static-libs] app-arch/xz-utils[static-libs] sys-libs/libcap[static-libs] sys-libs/zlib[static-libs] gcrypt? ( dev-libs/libgcrypt:0=[static-libs] ) gpg? ( app-crypt/gpgme[static-libs] dev-libs/libassuan[static-libs] dev-libs/libgpg-error[static-libs] ) lzo? ( dev-libs/lzo[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) ) nls? ( sys-devel/gettext virtual/libintl ) doc? ( app-doc/doxygen )
-DESCRIPTION=A full featured backup tool, aimed for disks
-EAPI=6
-HOMEPAGE=http://dar.linux.free.fr/
-IUSE=dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr
-KEYWORDS=amd64 ppc sparc x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/attr:= ) )
-REQUIRED_USE=?? ( dar32 dar64 ) gpg? ( gcrypt )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/dar/dar-2.5.11.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7818d9c6ed14868f0b3b892a664d8b8f
diff --git a/app-backup/dar-2.5.14 b/app-backup/dar-2.5.14
deleted file mode 100644
index 8bf30fd69667..000000000000
--- a/app-backup/dar-2.5.14
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/attr:= ) ) static? ( app-arch/bzip2[static-libs] app-arch/xz-utils[static-libs] sys-libs/libcap[static-libs] sys-libs/zlib[static-libs] gcrypt? ( dev-libs/libgcrypt:0=[static-libs] ) gpg? ( app-crypt/gpgme[static-libs] dev-libs/libassuan[static-libs] dev-libs/libgpg-error[static-libs] ) lzo? ( dev-libs/lzo[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) ) nls? ( sys-devel/gettext virtual/libintl ) doc? ( app-doc/doxygen )
-DESCRIPTION=A full featured backup tool, aimed for disks
-EAPI=6
-HOMEPAGE=http://dar.linux.free.fr/
-IUSE=dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/attr:= ) )
-REQUIRED_USE=?? ( dar32 dar64 ) gpg? ( gcrypt )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/dar/dar-2.5.14.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b78a7e743553198ece88300033834586
diff --git a/app-backup/dar-2.5.15 b/app-backup/dar-2.5.15
deleted file mode 100644
index ceac89e5ba69..000000000000
--- a/app-backup/dar-2.5.15
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/attr:= ) ) static? ( app-arch/bzip2[static-libs] app-arch/xz-utils[static-libs] sys-libs/libcap[static-libs] sys-libs/zlib[static-libs] gcrypt? ( dev-libs/libgcrypt:0=[static-libs] ) gpg? ( app-crypt/gpgme[static-libs] dev-libs/libassuan[static-libs] dev-libs/libgpg-error[static-libs] ) lzo? ( dev-libs/lzo[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) ) nls? ( sys-devel/gettext virtual/libintl ) doc? ( app-doc/doxygen )
-DESCRIPTION=A full featured backup tool, aimed for disks
-EAPI=6
-HOMEPAGE=http://dar.linux.free.fr/
-IUSE=dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/attr:= ) )
-REQUIRED_USE=?? ( dar32 dar64 ) gpg? ( gcrypt )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/dar/dar-2.5.15.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a495082e7fb9a4388aee47b0ee2c05c5
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
new file mode 100644
index 000000000000..5873597b8f72
--- /dev/null
+++ b/app-backup/dar/Manifest
@@ -0,0 +1,7 @@
+DIST dar-2.5.11.tar.gz 1891928 BLAKE2B 536cccca2533f7ddbc8b95972fe00e9c87a404481e6afbd7aa3634c00598403c18950eb876aefe71a818c3bf4df75bff5f3904dc69bd1d75880f6c8a349911a5 SHA512 36b90218a34ac7f41ce9ca0a2167cfb2fd243b23b8e84350153e8804f0faabf87291b4e4b061533bcb0ca079f087c074eeaa12a54ee8084dd386a072ac503847
+DIST dar-2.5.14.tar.gz 1904398 BLAKE2B 073423b338be6e6f31bb31f0fe29980670a62ab6e6f768b31d99c464763e6598adecfe2446ab08f7e6543dff74b9f4a978a56da309ce61168c1629d22e112c6a SHA512 035866bd891ff12adbcd18a78fa6f2475c232182b24e35aaf7c3c41c30e6298c4e655ea5a93b9be050c6dee332e2b7913f75e3d399cbee96a1f1d3101d33fbbc
+DIST dar-2.5.15.tar.gz 1905085 BLAKE2B 05dae478e140d9d86ffacbcff62ad612f8ae403e39cbf04fe64162722da4ee5feee1c6f826d4466de5a40f4ce8c24ca258ebaa26cd6eac851d34b946c3464f99 SHA512 0e583cd4dd920a3684364fbdea3bb882dfda2ca27f431a23146dc0c7d1e6ae74dd6245ba6983fc7f8073e9c9c9c496345c9645d1099eed7c75ac1e69381972c4
+EBUILD dar-2.5.11.ebuild 2402 BLAKE2B 2399becf88620c4f86746df445e74c39b677f17352c3468462e4a64a3719c53cfd2fa25471026d3e950cd07c9231d83169e470e0adab51ed13b3ff4e9b08dc3c SHA512 2519d1c4ee298e6439cf09946efd68d9ee8f627087f276e629ed0bb9af9b9b50889dc9cff8888e98b40f2bbe8cde59e26bdebaaffef177829bf7d40994ed9ded
+EBUILD dar-2.5.14.ebuild 2406 BLAKE2B 7f0a73200952c58eb492f65c46b66e763e6fba88134b45c9a3b902e7fd771385cca081ec4e8314b31eb49b00c96660b619619325cfd2fb73d9b68b0be0132392 SHA512 6d7185d1dbcf892ea038aa7c158a97ff9a77580d38a191914c704edbc78863d1c6ca74b30f5b3f39a76e137eca78e4cb42e5ce8d760fd624d3da47bb4933adb8
+EBUILD dar-2.5.15.ebuild 2381 BLAKE2B 30579303823d192fae8d51e10d15047cd78629dccdbe7f3a55bb3d241b6c017062bd7df41f53439ab2561f76ea8831af81c7054ded44a8f087933d01c65e7c55 SHA512 6186aa32ccba48c01e73078d2fc78f2a0c47f1b21aff4d163cd0142aa9be9f422935222880de9d8045a5e3a324e21e682657ef82355e3321a61e3b3a734b8cdd
+MISC metadata.xml 887 BLAKE2B 7fc6c15d3f725d59a115a839feb6d138b806e1f0e168c6e726e83c9f0185c46cbf869284e17872a376ce52f515fc0446134b5f3a449a578a33c10154876fa1f5 SHA512 9210de7c2f273c52c39555e2db525b1bdaa58c44d22deab887d1bf96e42ac9e8f32545461c7129d4673ced220a6445ddda68c6c2733e5660fcad05e98db56817
diff --git a/app-backup/dar/dar-2.5.11.ebuild b/app-backup/dar/dar-2.5.11.ebuild
new file mode 100644
index 000000000000..d1de0e73d30a
--- /dev/null
+++ b/app-backup/dar/dar-2.5.11.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic
+
+DESCRIPTION="A full featured backup tool, aimed for disks"
+HOMEPAGE="http://dar.linux.free.fr/"
+SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux"
+IUSE="dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr"
+
+RESTRICT="test" # need to be run as root
+
+RDEPEND=">=sys-libs/zlib-1.2.3:=
+	!static? (
+		app-arch/bzip2:=
+		app-arch/xz-utils:=
+		sys-libs/libcap
+		gcrypt? ( dev-libs/libgcrypt:0= )
+		gpg? ( app-crypt/gpgme )
+		lzo? ( dev-libs/lzo:= )
+		xattr? ( sys-apps/attr:= )
+	)"
+
+DEPEND="${RDEPEND}
+	static? (
+		app-arch/bzip2[static-libs]
+		app-arch/xz-utils[static-libs]
+		sys-libs/libcap[static-libs]
+		sys-libs/zlib[static-libs]
+		gcrypt? ( dev-libs/libgcrypt:0=[static-libs] )
+		gpg? (
+			app-crypt/gpgme[static-libs]
+			dev-libs/libassuan[static-libs]
+			dev-libs/libgpg-error[static-libs]
+		)
+		lzo? ( dev-libs/lzo[static-libs] )
+		xattr? ( sys-apps/attr[static-libs] )
+	)
+	nls? (
+		sys-devel/gettext
+		virtual/libintl
+	)
+	doc? ( app-doc/doxygen )"
+
+REQUIRED_USE="?? ( dar32 dar64 )
+		gpg? ( gcrypt )"
+
+#PATCHES=(
+#)
+
+src_configure() {
+	local myconf=( --disable-upx )
+
+	# Bug 103741
+	filter-flags -fomit-frame-pointer
+
+	# configure.ac is totally funked up regarding the AC_ARG_ENABLE
+	# logic.
+	# For example "--enable-dar-static" causes configure to DISABLE
+	# static builds of dar.
+	# Do _not_ use $(use_enable) until you have verified that the
+	# logic has been fixed by upstream.
+	use xattr || myconf+=( --disable-ea-support )
+	use dar32 && myconf+=( --enable-mode=32 )
+	use dar64 && myconf+=( --enable-mode=64 )
+	use doc || myconf+=( --disable-build-html )
+	# use examples && myconf+=( --enable-examples )
+	use gcrypt || myconf+=( --disable-libgcrypt-linking )
+	use gpg || myconf+=( --disable-gpgme-linking )
+	use lzo || myconf+=( --disable-liblzo2-linking )
+	use nls || myconf+=( --disable-nls )
+	if ! use static ; then
+		myconf+=( --disable-dar-static )
+		if ! use static-libs ; then
+			myconf+=( --disable-static )
+		fi
+	fi
+
+	econf ${myconf[@]}
+}
+
+src_install() {
+	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
+
+	local DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+	einstalldocs
+
+	if ! use static-libs ; then
+		prune_libtool_files --all
+	fi
+}
diff --git a/app-backup/dar/dar-2.5.14.ebuild b/app-backup/dar/dar-2.5.14.ebuild
new file mode 100644
index 000000000000..bb527233dac9
--- /dev/null
+++ b/app-backup/dar/dar-2.5.14.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic
+
+DESCRIPTION="A full featured backup tool, aimed for disks"
+HOMEPAGE="http://dar.linux.free.fr/"
+SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
+IUSE="dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr"
+
+RESTRICT="test" # need to be run as root
+
+RDEPEND=">=sys-libs/zlib-1.2.3:=
+	!static? (
+		app-arch/bzip2:=
+		app-arch/xz-utils:=
+		sys-libs/libcap
+		gcrypt? ( dev-libs/libgcrypt:0= )
+		gpg? ( app-crypt/gpgme )
+		lzo? ( dev-libs/lzo:= )
+		xattr? ( sys-apps/attr:= )
+	)"
+
+DEPEND="${RDEPEND}
+	static? (
+		app-arch/bzip2[static-libs]
+		app-arch/xz-utils[static-libs]
+		sys-libs/libcap[static-libs]
+		sys-libs/zlib[static-libs]
+		gcrypt? ( dev-libs/libgcrypt:0=[static-libs] )
+		gpg? (
+			app-crypt/gpgme[static-libs]
+			dev-libs/libassuan[static-libs]
+			dev-libs/libgpg-error[static-libs]
+		)
+		lzo? ( dev-libs/lzo[static-libs] )
+		xattr? ( sys-apps/attr[static-libs] )
+	)
+	nls? (
+		sys-devel/gettext
+		virtual/libintl
+	)
+	doc? ( app-doc/doxygen )"
+
+REQUIRED_USE="?? ( dar32 dar64 )
+		gpg? ( gcrypt )"
+
+#PATCHES=(
+#)
+
+src_configure() {
+	local myconf=( --disable-upx )
+
+	# Bug 103741
+	filter-flags -fomit-frame-pointer
+
+	# configure.ac is totally funked up regarding the AC_ARG_ENABLE
+	# logic.
+	# For example "--enable-dar-static" causes configure to DISABLE
+	# static builds of dar.
+	# Do _not_ use $(use_enable) until you have verified that the
+	# logic has been fixed by upstream.
+	use xattr || myconf+=( --disable-ea-support )
+	use dar32 && myconf+=( --enable-mode=32 )
+	use dar64 && myconf+=( --enable-mode=64 )
+	use doc || myconf+=( --disable-build-html )
+	# use examples && myconf+=( --enable-examples )
+	use gcrypt || myconf+=( --disable-libgcrypt-linking )
+	use gpg || myconf+=( --disable-gpgme-linking )
+	use lzo || myconf+=( --disable-liblzo2-linking )
+	use nls || myconf+=( --disable-nls )
+	if ! use static ; then
+		myconf+=( --disable-dar-static )
+		if ! use static-libs ; then
+			myconf+=( --disable-static )
+		fi
+	fi
+
+	econf ${myconf[@]}
+}
+
+src_install() {
+	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
+
+	local DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+	einstalldocs
+
+	if ! use static-libs ; then
+		prune_libtool_files --all
+	fi
+}
diff --git a/app-backup/dar/dar-2.5.15.ebuild b/app-backup/dar/dar-2.5.15.ebuild
new file mode 100644
index 000000000000..dbd30f33f184
--- /dev/null
+++ b/app-backup/dar/dar-2.5.15.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic
+
+DESCRIPTION="A full featured backup tool, aimed for disks"
+HOMEPAGE="http://dar.linux.free.fr/"
+SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
+IUSE="dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr"
+
+RESTRICT="test" # need to be run as root
+
+RDEPEND=">=sys-libs/zlib-1.2.3:=
+	!static? (
+		app-arch/bzip2:=
+		app-arch/xz-utils:=
+		sys-libs/libcap
+		gcrypt? ( dev-libs/libgcrypt:0= )
+		gpg? ( app-crypt/gpgme )
+		lzo? ( dev-libs/lzo:= )
+		xattr? ( sys-apps/attr:= )
+	)"
+
+DEPEND="${RDEPEND}
+	static? (
+		app-arch/bzip2[static-libs]
+		app-arch/xz-utils[static-libs]
+		sys-libs/libcap[static-libs]
+		sys-libs/zlib[static-libs]
+		gcrypt? ( dev-libs/libgcrypt:0=[static-libs] )
+		gpg? (
+			app-crypt/gpgme[static-libs]
+			dev-libs/libassuan[static-libs]
+			dev-libs/libgpg-error[static-libs]
+		)
+		lzo? ( dev-libs/lzo[static-libs] )
+		xattr? ( sys-apps/attr[static-libs] )
+	)
+	nls? (
+		sys-devel/gettext
+		virtual/libintl
+	)
+	doc? ( app-doc/doxygen )"
+
+REQUIRED_USE="?? ( dar32 dar64 )
+		gpg? ( gcrypt )"
+
+#PATCHES=(
+#)
+
+src_configure() {
+	# configure.ac is totally funked up regarding the AC_ARG_ENABLE
+	# logic.
+	# For example "--enable-dar-static" causes configure to DISABLE
+	# static builds of dar.
+	# Do _not_ use $(use_enable) until you have verified that the
+	# logic has been fixed by upstream.
+	local myconf=(
+		--disable-upx
+		$(usex dar32 --enable-mode=32 '')
+		$(usex dar64 --enable-mode=64 '')
+		$(usex doc '' --disable-build-html)
+		#$(usex examples --enable-examples '')
+		$(usex gcrypt '' --disable-libgcrypt-linking)
+		$(usex gpg '' --disable-gpgme-linking)
+		$(usex lzo '' --disable-liblzo2-linking)
+		$(usex nls '' --disable-nls)
+		$(usex xattr '' --disable-ea-support)
+	)
+
+	# Bug 103741
+	filter-flags -fomit-frame-pointer
+
+	if ! use static ; then
+		myconf+=( --disable-dar-static )
+		if ! use static-libs ; then
+			myconf+=( --disable-static )
+		fi
+	fi
+
+	econf ${myconf[@]}
+}
+
+src_install() {
+	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
+
+	local DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+	einstalldocs
+
+	if ! use static-libs ; then
+		find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+	fi
+}
diff --git a/app-backup/dar/metadata.xml b/app-backup/dar/metadata.xml
new file mode 100644
index 000000000000..e22d4effd2e8
--- /dev/null
+++ b/app-backup/dar/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rich0@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+Backup directory tree and files.
+Full featured archiver with support for differential backups, slices,
+compression, ATTR/ACL support. DAR also supports Pipes for remote
+operations, including with ssh.
+</longdescription>
+	<use>
+		<flag name="dar32">Enables --enable-mode=32 option, which replace infinite
+		by 32 bit integers</flag>
+		<flag name="dar64">Enables --enable-mode=64 option, which replace infinite
+		by 64 bit integers</flag>
+		<flag name="gcrypt">Enables strong encryption support</flag>
+		<flag name="gpg">Enables usage of asymetric crypto algorithms</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">dar</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-backup/deja-dup-34.3 b/app-backup/deja-dup-34.3
deleted file mode 100644
index 400856233b1a..000000000000
--- a/app-backup/deja-dup-34.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-admin/packagekit-base app-crypt/libsecret[vala] >=dev-libs/glib-2.34:2[dbus] >=dev-libs/libpeas-1.0 >=x11-libs/gtk+-3.10:3 >=x11-libs/libnotify-0.7 >=app-backup/duplicity-0.6.23 dev-libs/dbus-glib nautilus? ( gnome-base/nautilus ) || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) app-text/yelp-tools dev-perl/Locale-gettext virtual/pkgconfig dev-util/intltool sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Simple backup tool using duplicity back-end
-EAPI=6
-HOMEPAGE=https://launchpad.net/deja-dup/
-IUSE=nautilus test
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=app-admin/packagekit-base app-crypt/libsecret[vala] >=dev-libs/glib-2.34:2[dbus] >=dev-libs/libpeas-1.0 >=x11-libs/gtk+-3.10:3 >=x11-libs/libnotify-0.7 >=app-backup/duplicity-0.6.23 dev-libs/dbus-glib nautilus? ( gnome-base/nautilus ) gnome-base/dconf gnome-base/gvfs[fuse]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/deja-dup/34/34.3/+download/deja-dup-34.3.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=716ac7db0c5fa733e510251cda649237
diff --git a/app-backup/deja-dup/Manifest b/app-backup/deja-dup/Manifest
new file mode 100644
index 000000000000..06c5fcec9059
--- /dev/null
+++ b/app-backup/deja-dup/Manifest
@@ -0,0 +1,3 @@
+DIST deja-dup-34.3.tar.xz 702708 BLAKE2B 219bb3796f3b97b240f9ac353dfb3c206c6423e8b8c8d4e5a97c89d832226ad70cfb1116bbd900bac1fc1bf03608aad47c67af0441fda7bc8fe950313fa14ebf SHA512 0e703c18041fa5ca6d2f272f5b0e65ad31ff1094147432107834d1cd25e2ec14b87bdfac6faf727c97339d20d1681f3251c5f74b6edbee4368014839b1f04f06
+EBUILD deja-dup-34.3.ebuild 1481 BLAKE2B 43e095e4b8f7947595ca10a5b13eec2eb6f53f4f88d6c5ff032f0bfff4694baebcadc625a6f307911b9d102f84882809c0f8ecad15238c40c851980351b70426 SHA512 4c9190ce6437d8d22a22913d3b42b356c5b819d37d6c631b71f37ba875fff848c2592869e67cfe2a61eee0ae44ff4e3be008891f286b97175f028d8281579b8f
+MISC metadata.xml 425 BLAKE2B 8973d6823641d5c69a21ba4d5862dd9a361ce5771537f42b50f2b54b36ad1d9217b358f7289c5981586330c1ad0673ca421caa30db2259f6c92a479735f46c15 SHA512 ba6a6a6530d8a6f582be2c3029dfc221c8cdad945486017820b1e8ba6dc144de27469f7093db5b565ed8b9e28652f9a553362687ada5105ff55f0c6be103ba47
diff --git a/app-backup/deja-dup/deja-dup-34.3.ebuild b/app-backup/deja-dup/deja-dup-34.3.ebuild
new file mode 100644
index 000000000000..122c5fd5b611
--- /dev/null
+++ b/app-backup/deja-dup/deja-dup-34.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GCONF_DEBUG="no"
+
+inherit cmake-utils eutils gnome2 vala
+
+DESCRIPTION="Simple backup tool using duplicity back-end"
+HOMEPAGE="https://launchpad.net/deja-dup/"
+SRC_URI="https://launchpad.net/${PN}/34/${PV}/+download/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nautilus test"
+RESTRICT="test" # bug#????
+
+COMMON_DEPEND="
+	app-admin/packagekit-base
+	app-crypt/libsecret[vala]
+	>=dev-libs/glib-2.34:2[dbus]
+	>=dev-libs/libpeas-1.0
+	>=x11-libs/gtk+-3.10:3
+	>=x11-libs/libnotify-0.7
+
+	>=app-backup/duplicity-0.6.23
+	dev-libs/dbus-glib
+
+	nautilus? ( gnome-base/nautilus )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/dconf
+	gnome-base/gvfs[fuse]
+"
+DEPEND="${COMMON_DEPEND}
+	$(vala_depend)
+	app-text/yelp-tools
+	dev-perl/Locale-gettext
+	virtual/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext
+"
+
+src_prepare() {
+	sed \
+		-e '/RPATH/s:PKG_LIBEXECDIR:PKG_LIBDIR:g' \
+		-i CMakeLists.txt || die
+	vala_src_prepare
+	gnome2_src_prepare
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DVALA_EXECUTABLE="${VALAC}"
+		-DENABLE_CCPANEL=OFF
+		-DENABLE_PK=OFF
+		-DENABLE_UNITY=OFF
+		-DENABLE_UNITY_CCPANEL=OFF
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc
+		-DENABLE_NAUTILUS="$(usex nautilus)"
+		-DENABLE_TESTING="$(usex test)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/app-backup/deja-dup/metadata.xml b/app-backup/deja-dup/metadata.xml
new file mode 100644
index 000000000000..e0a16e6f1240
--- /dev/null
+++ b/app-backup/deja-dup/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="nautilus">Build gnome-base/nautilus extension</flag>
+  </use>
+  <upstream>
+    <remote-id type="launchpad">deja-dup</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-backup/dirvish-1.2.1 b/app-backup/dirvish-1.2.1
deleted file mode 100644
index acc4f10f427e..000000000000
--- a/app-backup/dirvish-1.2.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-arch/tar
-DESCRIPTION=Dirvish is a fast, disk based, rotating network backup system
-EAPI=6
-HOMEPAGE=http://www.dirvish.org/
-KEYWORDS=amd64 ppc x86
-LICENSE=OSL-2.0
-RDEPEND=dev-perl/Time-ParseDate dev-perl/Time-Period >=net-misc/rsync-2.5.7
-SLOT=0
-SRC_URI=http://dirvish.org/dirvish-1.2.1.tgz
-_md5_=0fefe1b8c5867e1b7974c9198c58e277
diff --git a/app-backup/dirvish/Manifest b/app-backup/dirvish/Manifest
new file mode 100644
index 000000000000..9da079da18dc
--- /dev/null
+++ b/app-backup/dirvish/Manifest
@@ -0,0 +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 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
new file mode 100644
index 000000000000..13f3e8b769af
--- /dev/null
+++ b/app-backup/dirvish/dirvish-1.2.1.ebuild
@@ -0,0 +1,45 @@
+# 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"
+
+LICENSE="OSL-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="app-arch/tar"
+RDEPEND="dev-perl/Time-ParseDate
+	dev-perl/Time-Period
+	>=net-misc/rsync-2.5.7"
+
+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 || 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
+
+	HTML_DOCS=( {FAQ,RELEASE,TODO}.html )
+	einstalldocs
+
+	insinto /etc/dirvish
+	doins "${FILESDIR}"/master.conf.example
+}
diff --git a/app-backup/dirvish/files/master.conf.example b/app-backup/dirvish/files/master.conf.example
new file mode 100644
index 000000000000..8264b88b8321
--- /dev/null
+++ b/app-backup/dirvish/files/master.conf.example
@@ -0,0 +1,33 @@
+bank:
+	/backup/dirvish/server
+	/backup/dirvish/laptop
+	/backup/dirvish/firewall
+exclude:
+	lost+found/
+        proc/
+	core
+Runall:
+	serverroot      03:00
+	serverboot      03:00
+	serverhome      03:00
+	serveropt       03:00
+	serverspare     03:00
+	laptoproot      03:00
+	laptopboot      03:00
+	laptopopt       03:00
+	laptopspare     03:00
+	firewallroot    03:00
+	firewallboot    03:00
+
+expire-default:	 never
+
+# keep the sunday backups forever, the dailies for 3 months 
+expire-rule:
+#	MIN	HR	DOM	MON	DOW	STRFTIME_FMT
+	*	*	*	*	*	+3 months
+	*	*	*	*	1	never
+
+pre-server: /usr/local/sbin/dirvish-pre
+
+post-server: /usr/local/sbin/dirvish-post
+
diff --git a/app-backup/dirvish/metadata.xml b/app-backup/dirvish/metadata.xml
new file mode 100644
index 000000000000..003cb2d2d730
--- /dev/null
+++ b/app-backup/dirvish/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">Dirvish is a fast, disk based, rotating network
+		backup system. With dirvish you can maintain a set of complete images 
+		of your filesystems with unattended creation and expiration. A dirvish 
+		backup vault is like a time machine for your data.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-backup/duplicity-0.7.10 b/app-backup/duplicity-0.7.10
deleted file mode 100644
index e4f1b992327d..000000000000
--- a/app-backup/duplicity-0.7.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=net-libs/librsync app-crypt/gnupg dev-python/lockfile dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Secure backup system using gnupg to encrypt data
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/duplicity/
-IUSE=s3 test python_targets_python2_7
-KEYWORDS=amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/lockfile dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] s3? ( dev-python/boto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://code.launchpad.net/duplicity/0.7-series/0.7.10/+download/duplicity-0.7.10.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=10c2d2f0fc23b3b630145d72f55e36c6
diff --git a/app-backup/duplicity-0.7.11 b/app-backup/duplicity-0.7.11
deleted file mode 100644
index f556ce86145e..000000000000
--- a/app-backup/duplicity-0.7.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=net-libs/librsync app-crypt/gnupg dev-python/lockfile dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Secure backup system using gnupg to encrypt data
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/duplicity/
-IUSE=s3 test python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/lockfile dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] s3? ( dev-python/boto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://code.launchpad.net/duplicity/0.7-series/0.7.11/+download/duplicity-0.7.11.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4435e25895219526a90982d9f71350f8
diff --git a/app-backup/duplicity-0.7.12 b/app-backup/duplicity-0.7.12
deleted file mode 100644
index ae80399bfa9b..000000000000
--- a/app-backup/duplicity-0.7.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=net-libs/librsync app-crypt/gnupg dev-python/lockfile dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Secure backup system using gnupg to encrypt data
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/duplicity/
-IUSE=s3 test python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/lockfile dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] s3? ( dev-python/boto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://code.launchpad.net/duplicity/0.7-series/0.7.12/+download/duplicity-0.7.12.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4435e25895219526a90982d9f71350f8
diff --git a/app-backup/duplicity-0.7.13.1 b/app-backup/duplicity-0.7.13.1
deleted file mode 100644
index c39741ed9a8f..000000000000
--- a/app-backup/duplicity-0.7.13.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Secure backup system using gnupg to encrypt data
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/duplicity/
-IUSE=s3 test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] s3? ( dev-python/boto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://code.launchpad.net/duplicity/0.7-series/0.7.13.1/+download/duplicity-0.7.13.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d784ea3468a378e4bb41f6cc8b9bd102
diff --git a/app-backup/duplicity-0.7.14 b/app-backup/duplicity-0.7.14
deleted file mode 100644
index 194853ca8558..000000000000
--- a/app-backup/duplicity-0.7.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Secure backup system using gnupg to encrypt data
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/duplicity/
-IUSE=s3 test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] s3? ( dev-python/boto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://code.launchpad.net/duplicity/0.7-series/0.7.14/+download/duplicity-0.7.14.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d784ea3468a378e4bb41f6cc8b9bd102
diff --git a/app-backup/duplicity-0.7.15 b/app-backup/duplicity-0.7.15
deleted file mode 100644
index 8c0ca7ab572c..000000000000
--- a/app-backup/duplicity-0.7.15
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( app-arch/par2cmdline dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Secure backup system using gnupg to encrypt data
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/duplicity/
-IUSE=s3 test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] s3? ( dev-python/boto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://code.launchpad.net/duplicity/0.7-series/0.7.15/+download/duplicity-0.7.15.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=091d3525eb289901f26940cbe4089a05
diff --git a/app-backup/duplicity-0.7.16 b/app-backup/duplicity-0.7.16
deleted file mode 100644
index 4b5b51458f8a..000000000000
--- a/app-backup/duplicity-0.7.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( app-arch/par2cmdline dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Secure backup system using gnupg to encrypt data
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/duplicity/
-IUSE=s3 test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] s3? ( dev-python/boto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://code.launchpad.net/duplicity/0.7-series/0.7.16/+download/duplicity-0.7.16.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7211ff950046c2a4647f4575c1906bea
diff --git a/app-backup/duplicity-0.7.17 b/app-backup/duplicity-0.7.17
deleted file mode 100644
index 4dd3c5d0bdba..000000000000
--- a/app-backup/duplicity-0.7.17
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( app-arch/par2cmdline dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Secure backup system using gnupg to encrypt data
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/duplicity/
-IUSE=s3 test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] s3? ( dev-python/boto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://code.launchpad.net/duplicity/0.7-series/0.7.17/+download/duplicity-0.7.17.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7211ff950046c2a4647f4575c1906bea
diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest
new file mode 100644
index 000000000000..1af3fa837464
--- /dev/null
+++ b/app-backup/duplicity/Manifest
@@ -0,0 +1,18 @@
+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
+EBUILD duplicity-0.7.10.ebuild 1244 BLAKE2B f95bcace0995c67a854b02a2dcbb4e355282b3bd1b0837c9ea1025da7387ba05b59d32377bea7950be8a434538ee08f4838e8ea40b49c21ac4759383f30cb4ac SHA512 a05b660f02332850751d731c6d3b5fb757e29c2a940860858e1f4dff41e15e5876da90a9b8d0cdc39f22affcb7b2e01ad0334d28186b6ea76f27ad00f9134561
+EBUILD duplicity-0.7.11.ebuild 1247 BLAKE2B c1b73ad1d3ebccf2888453ed274cc41247e91e28ff16c9933d3b915b4dce1bc7dfb93772de66b2afc5c859984ab37f924026e19f7c812bfe0153b75486a3f2ad SHA512 eccbc2686f551c90850144e204f3605fce59f218e95b5606beee727982eb6a59bb6c8209b5efd7b9cc5684c0415cd0d7ff03040e3d28386f37e5ee09432058f7
+EBUILD duplicity-0.7.12.ebuild 1247 BLAKE2B c1b73ad1d3ebccf2888453ed274cc41247e91e28ff16c9933d3b915b4dce1bc7dfb93772de66b2afc5c859984ab37f924026e19f7c812bfe0153b75486a3f2ad SHA512 eccbc2686f551c90850144e204f3605fce59f218e95b5606beee727982eb6a59bb6c8209b5efd7b9cc5684c0415cd0d7ff03040e3d28386f37e5ee09432058f7
+EBUILD duplicity-0.7.13.1.ebuild 1254 BLAKE2B f726387eb81e50b7e3fb37ce27683646a82f79d2cd51c45b17df108701ecfcc86c0daf98f585660fd9d4505a89df1ca6d75b009ebe705937ecfe515cce35f385 SHA512 b098c5be1b6ffb11f4135181d3af2232fd498ee0a62c3c77edf9c6e9569d202175603920da489e32b176e2a84544ccce955de540a942239674287ba670e66eb8
+EBUILD duplicity-0.7.14.ebuild 1254 BLAKE2B f726387eb81e50b7e3fb37ce27683646a82f79d2cd51c45b17df108701ecfcc86c0daf98f585660fd9d4505a89df1ca6d75b009ebe705937ecfe515cce35f385 SHA512 b098c5be1b6ffb11f4135181d3af2232fd498ee0a62c3c77edf9c6e9569d202175603920da489e32b176e2a84544ccce955de540a942239674287ba670e66eb8
+EBUILD duplicity-0.7.15.ebuild 1277 BLAKE2B 34d5dc7a4af93ed4d2c57c430672a0558661467dc1f20c50a393fc0e436963a1e54bffc2cd54a456f6e55cc075476104cc6782c89b3ade06608c473b96a7c21d SHA512 40b4db1b95451e869370232ff4e20f11adec32a66b27a102d6e785aea67c071e5256e6a8a98920167a0665447875edfd8fcff3d0ad5fcdf2f8d63591009271ce
+EBUILD duplicity-0.7.16.ebuild 1277 BLAKE2B 8a5079f892b26ab4d59d37e4864e45ee7fc70591c2323706804f467a001499027cc5d3e1f687a5ee2e6bbd635046a715027db4b7f7451c7aae101f2e3810379e SHA512 0f73bb0aff595924ab8f1e2f17f3eca71dd48bffca1500836874bc4b2c4118183d07287a53da449a613058c60f5f88b7bbd14d3f5f9bbc5bd19705daa055f3ba
+EBUILD duplicity-0.7.17.ebuild 1277 BLAKE2B 8a5079f892b26ab4d59d37e4864e45ee7fc70591c2323706804f467a001499027cc5d3e1f687a5ee2e6bbd635046a715027db4b7f7451c7aae101f2e3810379e SHA512 0f73bb0aff595924ab8f1e2f17f3eca71dd48bffca1500836874bc4b2c4118183d07287a53da449a613058c60f5f88b7bbd14d3f5f9bbc5bd19705daa055f3ba
+MISC metadata.xml 438 BLAKE2B 2ff1bcc823e556bb5371994032c2db75021b8d32d4e4d67ec89d0c1c92aea9cc8a50b01bce6a09dc5b9f0cbfe741267b40a6749b1d5ccb5258f31b3ccda233fb SHA512 d21a61eaada281cf520260d2868ef1dd3ddffa5d1dc6bc2feaf5c2daa8f8fda977d3527de0b5a7b862b18df7f0bbf6371bcb736fe751e5979ec95a66640e4756
diff --git a/app-backup/duplicity/duplicity-0.7.10.ebuild b/app-backup/duplicity/duplicity-0.7.10.ebuild
new file mode 100644
index 000000000000..6fd6bda1d011
--- /dev/null
+++ b/app-backup/duplicity/duplicity-0.7.10.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 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() {
+	einfo "Duplicity has many optional dependencies to support various backends."
+	einfo "Currently it's up to you to install them as necessary."
+}
diff --git a/app-backup/duplicity/duplicity-0.7.11.ebuild b/app-backup/duplicity/duplicity-0.7.11.ebuild
new file mode 100644
index 000000000000..f58453ccdf6d
--- /dev/null
+++ b/app-backup/duplicity/duplicity-0.7.11.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 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() {
+	einfo "Duplicity has many optional dependencies to support various backends."
+	einfo "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
new file mode 100644
index 000000000000..f58453ccdf6d
--- /dev/null
+++ b/app-backup/duplicity/duplicity-0.7.12.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 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() {
+	einfo "Duplicity has many optional dependencies to support various backends."
+	einfo "Currently it's up to you to install them as necessary."
+}
diff --git a/app-backup/duplicity/duplicity-0.7.13.1.ebuild b/app-backup/duplicity/duplicity-0.7.13.1.ebuild
new file mode 100644
index 000000000000..46196df24caa
--- /dev/null
+++ b/app-backup/duplicity/duplicity-0.7.13.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 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() {
+	einfo "Duplicity has many optional dependencies to support various backends."
+	einfo "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
new file mode 100644
index 000000000000..46196df24caa
--- /dev/null
+++ b/app-backup/duplicity/duplicity-0.7.14.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 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() {
+	einfo "Duplicity has many optional dependencies to support various backends."
+	einfo "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
new file mode 100644
index 000000000000..07a84c1db121
--- /dev/null
+++ b/app-backup/duplicity/duplicity-0.7.15.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 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() {
+	einfo "Duplicity has many optional dependencies to support various backends."
+	einfo "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
new file mode 100644
index 000000000000..b2f160dd6d9e
--- /dev/null
+++ b/app-backup/duplicity/duplicity-0.7.16.ebuild
@@ -0,0 +1,52 @@
+# 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() {
+	einfo "Duplicity has many optional dependencies to support various backends."
+	einfo "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
new file mode 100644
index 000000000000..b2f160dd6d9e
--- /dev/null
+++ b/app-backup/duplicity/duplicity-0.7.17.ebuild
@@ -0,0 +1,52 @@
+# 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() {
+	einfo "Duplicity has many optional dependencies to support various backends."
+	einfo "Currently it's up to you to install them as necessary."
+}
diff --git a/app-backup/duplicity/files/duplicity-0.6.24-skip-test.patch b/app-backup/duplicity/files/duplicity-0.6.24-skip-test.patch
new file mode 100644
index 000000000000..ef6d959685be
--- /dev/null
+++ b/app-backup/duplicity/files/duplicity-0.6.24-skip-test.patch
@@ -0,0 +1,10 @@
+--- duplicity-0.6.24/testing/functional/test_final.py
++++ duplicity-0.6.24/testing/functional/test_final.py
+@@ -156,6 +156,7 @@
+         self.run_duplicity(options=["remove-older-than", "50000", "--force", self.backend_url])
+         self.assertEqual(self.get_backend_files(), second_chain)
+ 
++    @unittest.skip('skip failing test')
+     def test_piped_password(self):
+         """Make sure that prompting for a password works"""
+         self.set_environ("PASSPHRASE", None)
diff --git a/app-backup/duplicity/metadata.xml b/app-backup/duplicity/metadata.xml
new file mode 100644
index 000000000000..b9ff658008bc
--- /dev/null
+++ b/app-backup/duplicity/metadata.xml
@@ -0,0 +1,15 @@
+<?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 type="person">
+		<email>rich0@gentoo.org</email>
+		<name>Rich Freeman</name>
+	</maintainer>
+	<use>
+		<flag name="s3">Support for backing up to the Amazon S3 system</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-backup/duply-1.11.2 b/app-backup/duply-1.11.2
deleted file mode 100644
index 22b37a67cc8b..000000000000
--- a/app-backup/duply-1.11.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=app-text/txt2man
-DESCRIPTION=A shell frontend for duplicity
-EAPI=5
-HOMEPAGE=http://duply.net
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-backup/duplicity
-SLOT=0
-SRC_URI=mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.11.x/duply_1.11.2.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a10108cc322dbcb5cd94e8157480b80d
diff --git a/app-backup/duply-1.11.3 b/app-backup/duply-1.11.3
deleted file mode 100644
index 85c770741d47..000000000000
--- a/app-backup/duply-1.11.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-text/txt2man
-DESCRIPTION=A shell frontend for duplicity
-EAPI=6
-HOMEPAGE=http://duply.net
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-backup/duplicity
-SLOT=0
-SRC_URI=mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.11.x/duply_1.11.3.tgz
-_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
-_md5_=e371e26c38dd0f92c837e8c85932f5e5
diff --git a/app-backup/duply-1.9.2 b/app-backup/duply-1.9.2
deleted file mode 100644
index 55a42cb11ebc..000000000000
--- a/app-backup/duply-1.9.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=app-text/txt2man
-DESCRIPTION=A shell frontend for duplicity
-EAPI=5
-HOMEPAGE=http://duply.net
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-backup/duplicity
-SLOT=0
-SRC_URI=mirror://sourceforge/ftplicity/duply_1.9.2.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=127dea5bcc7f9816e78a737db94ae36f
diff --git a/app-backup/duply-2.0.1 b/app-backup/duply-2.0.1
deleted file mode 100644
index 933fbb734a87..000000000000
--- a/app-backup/duply-2.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-text/txt2man
-DESCRIPTION=A shell frontend for duplicity
-EAPI=6
-HOMEPAGE=http://duply.net
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-backup/duplicity
-SLOT=0
-SRC_URI=mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.0.x/duply_2.0.1.tgz
-_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
-_md5_=02da013bd077ed748082aec9afca3ec2
diff --git a/app-backup/duply-2.0.2 b/app-backup/duply-2.0.2
deleted file mode 100644
index 0c5293fb9d34..000000000000
--- a/app-backup/duply-2.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-text/txt2man
-DESCRIPTION=A shell frontend for duplicity
-EAPI=6
-HOMEPAGE=http://duply.net
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-backup/duplicity
-SLOT=0
-SRC_URI=mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.0.x/duply_2.0.2.tgz
-_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
-_md5_=19ef2ea2992c1341bc29d544e91e0037
diff --git a/app-backup/duply-2.0.3 b/app-backup/duply-2.0.3
deleted file mode 100644
index 92573769ddd3..000000000000
--- a/app-backup/duply-2.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-text/txt2man
-DESCRIPTION=A shell frontend for duplicity
-EAPI=6
-HOMEPAGE=http://duply.net
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-backup/duplicity
-SLOT=0
-SRC_URI=mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.0.x/duply_2.0.3.tgz
-_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
-_md5_=19ef2ea2992c1341bc29d544e91e0037
diff --git a/app-backup/duply/Manifest b/app-backup/duply/Manifest
new file mode 100644
index 000000000000..6323d4b7f0ff
--- /dev/null
+++ b/app-backup/duply/Manifest
@@ -0,0 +1,14 @@
+AUX README.gentoo 122 BLAKE2B 2b8d4ce5a1388adaeb694bafbacae8daf7c417f1849ed54afd834888b96a94510238c9a621077fe9c2974b0b55c2b918a8e9b5493207b2f2cee7e846bb2532e4 SHA512 6d649c051529f6cc5a748f3f63c3d2f54ecf07d0a01fe6f091b7541b53c261120db521a112ac5bc8155fc330218a72b9a82f1801918b294dea22914ec6ac4a94
+DIST duply_1.11.2.tgz 44094 BLAKE2B 0aa52f9654bbb873564aaa180b5762b4a5bae1cf0da85d79fedfa6e59d27ada48061d78481b550615452dfba2428535d7b0665ce421abfdd1902ede0e83f7110 SHA512 20833c774705f83ec7efc88a7605c925ea5e56536a2338c6bd3a65ae789ffa7fabb03206b396fd92fb8ccf13cf0d72dbecdf705780e345a2cb1804783623e420
+DIST duply_1.11.3.tgz 44198 BLAKE2B 368c8a5d145068da00fccb970188bc64574365517211d3eca253c34f820dd520777f56ebc0dfddeca2fc910558e73bf6a2adac6287422b47d5a5751d43a74b86 SHA512 5817d4571c27288b227add04e84fa0066e278cdbc819a9332cb6fa2aaf6609e923abe9824ac704fed250b961300c57ca1de945af03370287f7cbf68876513457
+DIST duply_1.9.2.tgz 36222 BLAKE2B e1c028423eb8631598b662ad33f3cf24088f11e84ba2b28c818aa580eb69f069885af7cef5780fe457357066b88c7077e3b691ca5a87fc02f429fa416aa39f70 SHA512 9ef5e22f43a6854e413ed1c2b88b10d0ae75cff7b2bcd927d20a588234555e9b7eff25d094f688f9d4f8510eba6bc20f7635c0de9ab9b402966075595922333e
+DIST duply_2.0.1.tgz 44914 BLAKE2B 022a99e585a6231e85af84ae161988037fecf885a2a97d078e1a64b2176268ea6ef3c68e4843a967715ff362e8f24826cd800f0c1b32c4b187f5261d2b9cad67 SHA512 28f1670f2579956cb4d0d5727403e8b9f4afcdd8ea79e117536dfb89b3f3cf6a7bc7eb802bc4dcd39fc6a443a9f8fa3fe722f2b8336186517184940ce6fa73ec
+DIST duply_2.0.2.tgz 45406 BLAKE2B 46299930a2e05c5d3759e7a90a6bab8b41b28bdab95c945f1bbb5977d78cf5b72090edfb10bd69b2539c65b7c3804d45eb6b400866c6337fc4acdc283f8003e0 SHA512 2f53d380445272a2354f6914c39373e93d27fdcc5c712d7041fc798547280cebff53882f93d0467d86fc044b8a3a73a6b2fe04a9eaadae55b58bc9c617bab48a
+DIST duply_2.0.3.tgz 45542 BLAKE2B 101e19712546c71af16f5988f1d1a70139414b03fa6abcf9b82b8a656a9fd7385b4c9f524eb0e62e3af1b9d0b9a494e47505f2c829d39745c8b88ce56e6608a6 SHA512 c24dd57f75ab80795d67baf8a7ab79a5ae9608c7faea0ae8b711045371ef0cba49c855cfa0610f030c1c37734775b50052fd1e4162420cb3db624f984e4e8bc1
+EBUILD duply-1.11.2.ebuild 586 BLAKE2B d49c29b3a57e4992162b37ef550670097175b76c20f166785bf940b4aa8de1bd709658f39ae6d97d2e4620616cbd525654b9c11cd0245e1b1297238cba286134 SHA512 9c260dfe8d5b8604cd17181c7cf91f8f180c5c7623bb615a7ceb68970e2162ef0905f8e19aa4525561865ea1803156cbc77dfe287db6b99db229fb07d998e961
+EBUILD duply-1.11.3.ebuild 589 BLAKE2B a2809b3b4c11f4a29915edc004b1d117416b5551a371a4e950760bb63cdf06867b3e4d077bf4840aaa488035e94e2870225f81bc0d60b58c99d6132d5774f54f SHA512 c56bdb7d9e4d183494c0498c004fa21114a86b651336648cc5b2e0036a2d2b51acced93acdadc26b828f50a37f404446330f5671d420c4ed26c05642e5262a9f
+EBUILD duply-1.9.2.ebuild 515 BLAKE2B f684ee48cb886dc61947ff27bd4d22f14be12fa70e3d5ffb80071c519bf850ecfa2dfaaad529cdfe4d9d394cde6bba9e0d19bedb37c920b1195d84a6289d76a9 SHA512 4a1c380148270581af3a0096f3f0e5263ad0c7507066c8c308c262eaef28e3f59fb02f85d150d73e61ae93273c4a0efd45fc78ace3a160b878b8f708b855fb1b
+EBUILD duply-2.0.1.ebuild 588 BLAKE2B caa38a62e139fecdadbda7bca01d1c1cc2ae998a09dca27c18015b28e907a6a2d603f6b6437cc7e766f378d93733ee9cd98c4a3be502d3f1622ddd4ae900da38 SHA512 aff7359b9c6b4c48b6902cb3c16a18581c01e68a83b7eab89ecb091d31021c8353425ae5be197ed9034914381f884927a75b7d8386cf32e3744efbc3528ca50d
+EBUILD duply-2.0.2.ebuild 588 BLAKE2B 8f02d145fb3874a9ff0b5357eb0cf8dd1f937409402fda13ef58c64c2144bbd13045760ce196fc763d2112835488334bc0ad58b632657fa65fd49ad699c6f2aa SHA512 a07e0159b0a4ccbf343964f211667f073da12772e1fff2d760453f6560746b9f6d1bc746064b73e6dc0d6e3f5b17fb9b2a1b3bd5372336e8ca7353ca796bba49
+EBUILD duply-2.0.3.ebuild 588 BLAKE2B 8f02d145fb3874a9ff0b5357eb0cf8dd1f937409402fda13ef58c64c2144bbd13045760ce196fc763d2112835488334bc0ad58b632657fa65fd49ad699c6f2aa SHA512 a07e0159b0a4ccbf343964f211667f073da12772e1fff2d760453f6560746b9f6d1bc746064b73e6dc0d6e3f5b17fb9b2a1b3bd5372336e8ca7353ca796bba49
+MISC metadata.xml 463 BLAKE2B d797b2c9d46e9da7a7c0656fbd1b7b64fed89e1000e07958eb39f3126906a4bd82952d75cb6daf6d6940257a7f415daa40577cc0ac4bc7cfcef954864371588f SHA512 1918ce659c0ee644de3647eb45eac23cd38da8c22e5fe0f271d1f2f894b7bacd654ac63e6f71eb87e078bd2995aeaae2bf400cd5a114aebcca39e3e9e3a15ac1
diff --git a/app-backup/duply/duply-1.11.2.ebuild b/app-backup/duply/duply-1.11.2.ebuild
new file mode 100644
index 000000000000..4ac44196694c
--- /dev/null
+++ b/app-backup/duply/duply-1.11.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit readme.gentoo
+
+DESCRIPTION="A shell frontend for duplicity"
+HOMEPAGE="http://duply.net"
+SRC_URI="mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.11.x/${PN}_${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-text/txt2man"
+RDEPEND="app-backup/duplicity"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_install() {
+	dobin ${PN}
+	./${PN} txt2man > ${PN}.1 || die
+	doman ${PN}.1
+	dodoc CHANGELOG.txt
+	readme.gentoo_create_doc
+}
diff --git a/app-backup/duply/duply-1.11.3.ebuild b/app-backup/duply/duply-1.11.3.ebuild
new file mode 100644
index 000000000000..a68497432cd5
--- /dev/null
+++ b/app-backup/duply/duply-1.11.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit readme.gentoo-r1
+
+DESCRIPTION="A shell frontend for duplicity"
+HOMEPAGE="http://duply.net"
+SRC_URI="mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.11.x/${PN}_${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-text/txt2man"
+RDEPEND="app-backup/duplicity"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_install() {
+	dobin ${PN}
+	./${PN} txt2man > ${PN}.1 || die
+	doman ${PN}.1
+	dodoc CHANGELOG.txt
+	readme.gentoo_create_doc
+}
diff --git a/app-backup/duply/duply-1.9.2.ebuild b/app-backup/duply/duply-1.9.2.ebuild
new file mode 100644
index 000000000000..19baa7a47c0a
--- /dev/null
+++ b/app-backup/duply/duply-1.9.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit readme.gentoo
+
+DESCRIPTION="A shell frontend for duplicity"
+HOMEPAGE="http://duply.net"
+SRC_URI="mirror://sourceforge/ftplicity/${PN}_${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="app-text/txt2man"
+RDEPEND="app-backup/duplicity"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_install() {
+	dobin ${PN}
+	./${PN} txt2man > ${PN}.1 || die
+	doman ${PN}.1
+	readme.gentoo_create_doc
+}
diff --git a/app-backup/duply/duply-2.0.1.ebuild b/app-backup/duply/duply-2.0.1.ebuild
new file mode 100644
index 000000000000..9b784d8c149f
--- /dev/null
+++ b/app-backup/duply/duply-2.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit readme.gentoo-r1
+
+DESCRIPTION="A shell frontend for duplicity"
+HOMEPAGE="http://duply.net"
+SRC_URI="mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.0.x/${PN}_${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-text/txt2man"
+RDEPEND="app-backup/duplicity"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_install() {
+	dobin ${PN}
+	./${PN} txt2man > ${PN}.1 || die
+	doman ${PN}.1
+	dodoc CHANGELOG.txt
+	readme.gentoo_create_doc
+}
diff --git a/app-backup/duply/duply-2.0.2.ebuild b/app-backup/duply/duply-2.0.2.ebuild
new file mode 100644
index 000000000000..8eddec6aefe9
--- /dev/null
+++ b/app-backup/duply/duply-2.0.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit readme.gentoo-r1
+
+DESCRIPTION="A shell frontend for duplicity"
+HOMEPAGE="http://duply.net"
+SRC_URI="mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.0.x/${PN}_${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-text/txt2man"
+RDEPEND="app-backup/duplicity"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_install() {
+	dobin ${PN}
+	./${PN} txt2man > ${PN}.1 || die
+	doman ${PN}.1
+	dodoc CHANGELOG.txt
+	readme.gentoo_create_doc
+}
diff --git a/app-backup/duply/duply-2.0.3.ebuild b/app-backup/duply/duply-2.0.3.ebuild
new file mode 100644
index 000000000000..8eddec6aefe9
--- /dev/null
+++ b/app-backup/duply/duply-2.0.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit readme.gentoo-r1
+
+DESCRIPTION="A shell frontend for duplicity"
+HOMEPAGE="http://duply.net"
+SRC_URI="mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.0.x/${PN}_${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-text/txt2man"
+RDEPEND="app-backup/duplicity"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_install() {
+	dobin ${PN}
+	./${PN} txt2man > ${PN}.1 || die
+	doman ${PN}.1
+	dodoc CHANGELOG.txt
+	readme.gentoo_create_doc
+}
diff --git a/app-backup/duply/files/README.gentoo b/app-backup/duply/files/README.gentoo
new file mode 100644
index 000000000000..99d9a1320473
--- /dev/null
+++ b/app-backup/duply/files/README.gentoo
@@ -0,0 +1,4 @@
+If you use duply at the first time please have a
+look at the the usage help text "duply usage"
+for further information."
+
diff --git a/app-backup/duply/metadata.xml b/app-backup/duply/metadata.xml
new file mode 100644
index 000000000000..5ed910627eca
--- /dev/null
+++ b/app-backup/duply/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gentoo@pennewiss.de</email>
+    <name>Marcel Pennewiß</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">ftplicity</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-backup/flexbackup-1.2.1-r13 b/app-backup/flexbackup-1.2.1-r13
deleted file mode 100644
index f4dfa1a7fb45..000000000000
--- a/app-backup/flexbackup-1.2.1-r13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=app-arch/mt-st
-DESCRIPTION=Flexible backup script using perl
-EAPI=6
-HOMEPAGE=http://flexbackup.sourceforge.net/
-KEYWORDS=amd64 hppa ppc x86
-LICENSE=GPL-2
-RDEPEND=app-arch/mt-st
-SLOT=0
-SRC_URI=mirror://sourceforge/flexbackup/flexbackup-1.2.1.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f6b3a4cffd71437375e7f2b0af4f2904
diff --git a/app-backup/flexbackup/Manifest b/app-backup/flexbackup/Manifest
new file mode 100644
index 000000000000..63695e9c0266
--- /dev/null
+++ b/app-backup/flexbackup/Manifest
@@ -0,0 +1,15 @@
+AUX flexbackup-1.2.1-afio-large-files.patch 401 BLAKE2B 09d95c6f67bf368de94699dc7e597416c8a82971da780a772bd477d1fa66ad1e26057ee4f2ef814915f1dfddfebd40111fe0f883a910a1d44b3533c115ac9b23 SHA512 ad94ebbabe413b51d4f984f9a2d80b69f2998037512c0ac6077d92d0bb7f594a444503f196e668d0e91d35ad543f2cba73129ad31007a43de228fb50c0b4e870
+AUX flexbackup-1.2.1-bash.patch 445 BLAKE2B b542d44ad8e01cb27fa751efc15d5e6bd0c82de3048e193a91b876d679ba92fb137a38a5b5febb09aee299d68613e6a62693993fb8cff2615d4b4d8c0f05025c SHA512 ec74be2043c5791288abf9e5303cc24caa55ac0d14f51a7cfdd6b495f97bef1dece39e8dd0492a14df18a9b495f74463247586e2edefe0f897429631c9809745
+AUX flexbackup-1.2.1-lzma.patch 4336 BLAKE2B ed346685c6faef20ab5838f0479cd64b3dfd3eaf0c481c7707fe6ab37fbeb48549cd6fb6694f49ac0d495891b004fd07c8cb41bf0db6f9f4d84a59ad120e3f9a SHA512 de23710262aaaa79e7dda63221965267a4751cb5c1681b8d4db6ab7a065aa8dab3e6c3097d339a793650a28627eeffefeef408612c08a9bbe3f14d383179338e
+AUX flexbackup-1.2.1-mbuffer-switch.patch 5550 BLAKE2B d5c7d595dece5e9101b059ef8dec024f70a7c1228a4eac7b503b8e9f0e5437fab7da365b8b02a35b0210041649a65d6f4fa1e448627ae5fdc9185d848a7fe27f SHA512 1ad0e5ac04f0c44c970954aefd62f465d1c9c9604c6ab90cd56d61d44aa8b4c23e8befe992380e10d74fdf043975969431185e1ae66297bb630a105fd5329b4c
+AUX flexbackup-1.2.1-perl-5.12-deprecation-warning.patch 814 BLAKE2B 8f6264dc7a47bcf08329b537b96ce5e04d82a455dc19fddccd98e2144552471a9b9c78a2088fc558250c29cd054f52c483f04c454facf5310b0e3f01099bbb55 SHA512 ea77998e18fb7ae6612983ab2b6ebc1ab6de6056f5a60aada283ba593a60973953062dcaac9f9d2aa7068384ac4a8a0d72c439cf7cdd3c8a2b304d7ae779f302
+AUX flexbackup-1.2.1-perl-5.16-deprecation-warning.patch 374 BLAKE2B af63367cc84053551d6a3bdd57b76d796b9258058536bb506dec1ac3777d39d0b892649f23ca5f4a901f502aa0f9537535046ff66d3aada2a99c5132919fda7d SHA512 cf994cc48c735b2fe15f858b2f7f8e3d83012ad780e42b1ec05c2af2dacf04da844810e5c87d608f9bab40d2366507f2af017a7c95128f17141ce5afd5b228a4
+AUX flexbackup-1.2.1-prune.patch 5544 BLAKE2B 26f3b73f2b586a103ca3c6d16b9b84a4314537258a9f2bd26d56796dcff51233220bdabca1842ce58e406fd6b4e821bdcaac02ac8190b5c7c740915214d9025a SHA512 a2c1d7a82b3328b52a36dd04fa3f3e2a8b5918de9f3f089ef7342192bae023b3fe844ae847bf09d21348a794c06ee49185d6e49e116da2794121f005ea74b6c0
+AUX flexbackup-1.2.1-quieten.patch 418 BLAKE2B 5567c62d03043846471b53ea6df09bb92ce327e94f4f9309d5dace03cf8868292e60b7cf2ce8e8caaaa10b30653910d7e4cf4d3893111e11f113ecebab32da89 SHA512 bf263fb3c3301eb49942b1c7be3348b8b3b8584776baadc35bc34c709887a7dc48e534bc65dd543f835e6ebfe4747e9f074ded01199f4458ae974eb9565feaa2
+AUX flexbackup-1.2.1-remote-bufftest.patch 1940 BLAKE2B 17af279a19d655a9e16bb575f399fa7d4450543841ae8067758bfe388ca91b30c6c0519de2763779e2044961af467e9b3213b4eb430b3d16487ab0579d13a016 SHA512 76a3d6cb556596204791d98534ed13fc3738bed8642b4defef839d221510f6fad2d365abc524f368f43f88c710b6b6547cffd4be0e9a4ce53105bdc9dc1ed10e
+AUX flexbackup-1.2.1-secure-tempfile.patch 2563 BLAKE2B 34ce762db2abaf426e165ab2971bda4a9210b93e1b5abbd5be0de79dbe82109297153c55d365af4d0d47103afd9e4809079963badd5e633bc18f2a353d969661 SHA512 14bc8bccdb9c094bea92f97a7760079233364a87530750d0f904e3831c6bf4dca69cfdfdc578af316b65d8d7ff3d1c00c53bb8aa17acd2ecd009b919d87cd1f6
+AUX flexbackup-1.2.1-spaces-in-filenames.patch 11037 BLAKE2B d0ac4cef902d5d63a099bd64c89c6ed050d3d791d4d7093ff269e21badc04b3634d5839623641ee087a48559f57db6684c6b405294b7f2671bfb0118575be30e SHA512 58fdb4fbc59eaeefaf5a552abab0adf8a4d4e258cc737a1b310c00bef6ebf61c9fa55f3b3b7c68553ed224e12c082d03a9c16fdacfa2a44a70349bd882cfe987
+AUX flexbackup-1.2.1-tar-1.29.patch 514 BLAKE2B c5ff11dd0527d376a596b09781ab57c1f5f8a0a3d1b07390a97228b4a11e7ebb95aff896187b007b065a2e3ae82f2596596a367097e9b085c44f62a529d1ee8d SHA512 b8a28c93db2b8f04bcf7c56406fd0457b837e9afea30a5a1cf37bdd64554bbb4ee665b5c15af24701eeab10a1b1c2d31371b7c0ce32cbfb29223ac34956cc962
+DIST flexbackup-1.2.1.tar.gz 80158 BLAKE2B 0e54c275ddd218184195bb5bc873db10ab144409eed9d87410e5b7ba5ed09297fbdb58f3eb69b5d55c1ec727fe79f51b376914542ba5eae70ab4f87351b6dd4c SHA512 17630bc46657becdf5d5bde4852fd6cebe189fe54d381bda6471aa2e1db1ff082ba24461e2c22ba5805c2d93ac7f9805ffbdc4904da017f1b163cc21b5a3974b
+EBUILD flexbackup-1.2.1-r13.ebuild 2791 BLAKE2B 5eb4c59ef05a125252945f8739fcbd63fabc295b4adee19830c32d8885a13ef558a04af230a97f3741aee2ee4dc3b58d9cd99b6c153698981dc38488abf36847 SHA512 f33313f8842f8bd66e26ee3e1bb336c65b9cbbeba1b1d35603a7b07e487d9f5688dba5dcf58c87e929dd12b2b01966f226be5074c0ab7ddf1c44ff8bf518e0f9
+MISC metadata.xml 297 BLAKE2B f0205ea431c1b919654d761a82af8cee33ba2280a5c920242a8588edc7fd857166c07c4cfecfb28f621a7c3e77fc8ff6d21e84b7b20c0db1512129e8ed15a252 SHA512 a2fd29aba380cb3b9322131f97beed0d432569ab612118bf1a9a428a93602c859014face05fc8582c8dfdf6858296a36ae6754fdc45a78715058d779df3f7e0a
diff --git a/app-backup/flexbackup/files/flexbackup-1.2.1-afio-large-files.patch b/app-backup/flexbackup/files/flexbackup-1.2.1-afio-large-files.patch
new file mode 100644
index 000000000000..bf5ea230c85c
--- /dev/null
+++ b/app-backup/flexbackup/files/flexbackup-1.2.1-afio-large-files.patch
@@ -0,0 +1,13 @@
+Index: flexbackup
+===================================================================
+--- flexbackup	(revision 808)
++++ flexbackup	(working copy)
+@@ -1155,7 +1155,7 @@
+     $cmd .= "$::path{afio} -o ";
+     $cmd .= "$no_compress ";
+     $cmd .= "-z ";
+-    $cmd .= "-1 m ";
++    $cmd .= "-1 mC ";
+     $cmd .= "$::afio_z_flag ";
+     $cmd .= "$::afio_verb_flag ";
+     $cmd .= "$::afio_sparse_flag ";
diff --git a/app-backup/flexbackup/files/flexbackup-1.2.1-bash.patch b/app-backup/flexbackup/files/flexbackup-1.2.1-bash.patch
new file mode 100644
index 000000000000..a9da86a8e135
--- /dev/null
+++ b/app-backup/flexbackup/files/flexbackup-1.2.1-bash.patch
@@ -0,0 +1,18 @@
+--- flexbackup	2005-06-16 20:28:04.577086588 -0700
++++ flexbackup	2005-06-16 22:21:14.787322560 -0700
+@@ -5396,10 +5396,10 @@
+ 	    my $shell = $1;
+ 	    my $ver = $2;
+ 	    if ($shell eq 'bash') {
+-		if ($ver =~ m/^2/) {
+-		    $::shelltype{$host} = 'bash2';
+-		} else {
++		if ($ver =~ m/^1/) {
+ 		    $::shelltype{$host} = 'bash1';
++		} else {
++		    $::shelltype{$host} = 'bash2';
+ 		}
+ 	    } else {
+ 		$::shelltype{$host} = $shell;
+
+ 	  	 
diff --git a/app-backup/flexbackup/files/flexbackup-1.2.1-lzma.patch b/app-backup/flexbackup/files/flexbackup-1.2.1-lzma.patch
new file mode 100644
index 000000000000..95fa79ba606d
--- /dev/null
+++ b/app-backup/flexbackup/files/flexbackup-1.2.1-lzma.patch
@@ -0,0 +1,114 @@
+--- flexbackup	2003-10-10 15:12:09.000000000 +0100
++++ flexbackup	2007-01-15 01:08:18.000000000 +0000
+@@ -687,6 +687,8 @@
+ 		$filename .= ".zip";
+ 	    } elsif ($cfg::compress eq "compress") {
+ 		$filename .= ".Z";
++	    } elsif ($cfg::compress eq "lzma") {
++		$filename .= ".lzma";
+ 	    }
+ 	} elsif ($cfg::type eq "afio") {
+ 	    # tag these a little different, the archive file itself isn't a
+@@ -701,6 +703,8 @@
+ 		$filename .= "-zip";
+ 	    } elsif ($cfg::compress eq "compress") {
+ 		$filename .= "-Z";
++	    } elsif ($cfg::compress eq "lzma") {
++		$filename .= "-lzma";
+ 	    }
+ 	}
+ 
+@@ -2700,7 +2704,7 @@
+     # First check if things are defined in the config file
+     # Checks exist, true/false, or one of options
+     &checkvar(\$cfg::type,'type','dump afio cpio tar star pax zip ar shar lha copy rsync filelist','tar');
+-    &checkvar(\$cfg::compress,'compress','gzip bzip2 lzop compress zip false hardware','gzip');
++    &checkvar(\$cfg::compress,'compress','gzip bzip2 lzop compress zip false hardware lzma','gzip');
+     &checkvar(\$cfg::compr_level,'compr_level','exist','4');
+     &checkvar(\$cfg::verbose,'verbose','bool','true');
+     &checkvar(\$cfg::sparse,'sparse','bool','true');
+@@ -3001,6 +3005,16 @@
+ 	    $::z = " | $::path{zip} -$cfg::compr_level - -";
+ 	    $::unz = "$::path{funzip} | ";
+ 	}
++    } elsif ($cfg::compress eq "lzma") {
++	$::path{'lzma'} = &checkinpath($cfg::compress);
++	push(@::remoteprogs, $::path{$cfg::compress});
++	if ($cfg::compr_level !~ m/^[123456789]$/) {
++	    push(@::errors,"\$compr_level must be set to 1-9");
++	} else {
++	    $::z = " | $::path{$cfg::compress} -$cfg::compr_level ";
++	}
++	$::unz = "$::path{$cfg::compress} -d | ";
++
+     } else {
+ 	$::z = "";
+ 	$::unz = "";
+@@ -3252,6 +3266,10 @@
+ 		$::afio_z_flag = "-P $::path{$cfg::compress} -Q -c -Z";
+ 		$::afio_unz_flag = "-P $::path{$cfg::compress} -Q -d -Q -c -Z";
+ 
++	    } elsif ($cfg::compress eq "lzma") {
++		$::afio_z_flag = "-P $::path{$cfg::compress} -Q -$cfg::compr_level -Z";
++		$::afio_unz_flag = "-P $::path{$cfg::compress} -Q -d -Z";
++
+ 	    }
+ 	    $::unz = ""; # Reset & just use this for reading the archive file.
+ 
+@@ -3415,7 +3433,7 @@
+ 	$::path{'lha'} = &checkinpath('lha');
+ 	push(@::remoteprogs, $::path{'lha'});
+ 
+-	if ($cfg::compress =~ /^(gzip|bzip2|lzop|compress|zip)$/) {
++	if ($cfg::compress =~ /^(gzip|bzip2|lzop|compress|zip|lzma)$/) {
+ 	    warn("Using type \"lha\" with compress=$cfg::compress makes no sense");
+ 	    warn("Setting compression to false");
+ 	    $::unz = "";
+@@ -3781,7 +3799,7 @@
+ 
+     # Try and guess file types and commpression scheme
+     # might as well since we are reading from a file in this case
+-    if ($file =~ m/\.(dump|cpio|tar|star|pax|a|shar|filelist)\.(gz|bz2|lzo|Z|zip)$/) {
++    if ($file =~ m/\.(dump|cpio|tar|star|pax|a|shar|filelist)\.(gz|bz2|lzo|Z|zip|lzma)$/) {
+ 	$cfg::type = $1;
+ 	$cfg::compress = $2;
+ 	$cfg::type =~ s/^a$/ar/;
+@@ -3789,16 +3807,18 @@
+ 	$cfg::compress =~ s/bz2/bzip2/;
+ 	$cfg::compress =~ s/lzo/lzop/;
+ 	$cfg::compress =~ s/Z/compress/;
++	$cfg::compress =~ s/lzma/lzma/;
+ 	&log("| Auto-set to type=$cfg::type compress=$cfg::compress");
+ 	&optioncheck();                  # redo to set a few variables over
+ 
+-    } elsif ($file =~ m/\.afio-(gz|bz2|lzo|Z|zip)$/) {
++    } elsif ($file =~ m/\.afio-(gz|bz2|lzo|Z|zip|lzma)$/) {
+ 	$cfg::type = "afio";
+ 	$cfg::compress = $1;
+ 	$cfg::compress =~ s/gz/gzip/;
+ 	$cfg::compress =~ s/bz2/bzip2/;
+ 	$cfg::compress =~ s/lzo/lzop/;
+ 	$cfg::compress =~ s/Z/compress/;
++	$cfg::compress =~ s/lzma/lzma/;
+ 	&log("| Auto-set to type=$cfg::type compress=$cfg::compress");
+ 	&optioncheck();                  # redo to set a few variables over
+ 
+@@ -5686,3 +5706,5 @@
+ 
+     return($spinner[$index]);
+ }
++
++ 	  	 
+--- flexbackup.conf	2007-01-15 01:11:36.000000000 +0000
++++ flexbackup.conf.new	2007-01-15 01:21:46.000000000 +0000
+@@ -33,8 +33,8 @@
+ $prune{'/'} = "tmp proc";
+ 
+ # Compression
+-$compress = 'gzip'; # one of false/gzip/bzip2/lzop/zip/compress/hardware
+-$compr_level = '4'; # compression level (1-9) (for gzip/bzip2/lzop/zip)
++$compress = 'gzip'; # one of false/gzip/bzip2/lzop/zip/compress/hardware/lzma
++$compr_level = '4'; # compression level (1-9) (for gzip/bzip2/lzop/zip/lzma)
+ 
+ # Buffering program - to help streaming
+ $buffer = 'false';         # one of false/buffer/mbuffer
diff --git a/app-backup/flexbackup/files/flexbackup-1.2.1-mbuffer-switch.patch b/app-backup/flexbackup/files/flexbackup-1.2.1-mbuffer-switch.patch
new file mode 100644
index 000000000000..d22e40f24c26
--- /dev/null
+++ b/app-backup/flexbackup/files/flexbackup-1.2.1-mbuffer-switch.patch
@@ -0,0 +1,130 @@
+Common subdirectories: flexbackup-1.2.1-r3/contrib and flexbackup-1.2.1-r4/contrib
+diff -ubB flexbackup-1.2.1-r3/flexbackup flexbackup-1.2.1-r4/flexbackup
+--- flexbackup-1.2.1-r3/flexbackup	2007-04-14 17:03:34.000000000 -0400
++++ flexbackup-1.2.1-r4/flexbackup	2007-04-14 17:09:48.000000000 -0400
+@@ -442,7 +442,7 @@
+ 		# Get rid of trailing /
+ 		$dir = &nuke_trailing_slash($dir);
+ 
+-		# If level is icremental for the set, each dir might
++		# If level is incremental for the set, each dir might
+ 		# have a different numeric level
+ 		if (!defined($::set_incremental)) {
+ 		    $level = $::level;
+@@ -3090,7 +3090,7 @@
+ 	    push(@::remoteprogs, $::path{'mbuffer'});
+ 
+ 	    my $megs = $cfg::buffer_megs . "M";
+-	    my $bufcmd = "$::path{mbuffer} -q -m $megs -p $cfg::buffer_fill_pct $mbuffer_blk_flag ";
++		my $bufcmd  = "$::path{mbuffer} -q -m $megs -P $cfg::buffer_fill_pct $mbuffer_blk_flag ";
+ 
+ 	    $::buffer_cmd = " | $bufcmd";
+ 	    $::write_cmd = "$bufcmd -f -o ";
+@@ -4884,18 +4884,24 @@
+     }
+ 
+     if (defined(%{$::prune{$prunekey}})) {
++		my $rex;
+ 	# FreeBSD needs -E (above) and no backslashes around the (|) chars
+ 	if ($::uname =~ /FreeBSD/) {
+-	    $cmd .= '-regex "\./(';
+-	    $cmd .= join('|', keys %{$::prune{$prunekey}});
+-	    $cmd .= ')/.*" ';
+-	} else {
+-	    $cmd .= '-regex "\./\(';
+-	    $cmd .= join('\|', keys %{$::prune{$prunekey}});
+-	    $cmd .= '\)/.*" ';
+-	}
++			$rex  = '-regex "\./(';
++			$rex .= join('|', keys %{$::prune{$prunekey}});
++			$rex .= ')/.*" ';
++		} else {
++			$rex  = '-regex "\./\(';
++			$rex .= join('\|', keys %{$::prune{$prunekey}});
++			$rex .= '\)/.*" ';
++		}
++		# Show what the darn thing is constructing for prune expressions.
++		&log("| \"find\" regex for pruning is: $rex");
++		$cmd .= $rex;
+ 	$cmd .= '-prune -o ';
+     } else {
++		# Show what the darn thing is constructing for prune expressions.
++		&log("| No pruning defined for this tree.");
+ 	# Can't use find -depth with -prune (see single unix spec etc)
+ 	# (not toally required anyway, only if you are archiving dirs you
+ 	# don't have permissions on and are running as non-root)
+diff -ubB flexbackup-1.2.1-r3/flexbackup.conf flexbackup-1.2.1-r4/flexbackup.conf
+--- flexbackup-1.2.1-r3/flexbackup.conf	2007-04-14 17:03:35.000000000 -0400
++++ flexbackup-1.2.1-r4/flexbackup.conf	2007-04-14 17:09:48.000000000 -0400
+@@ -30,6 +30,45 @@
+ # A space-separated list of directories to prune from each backup.
+ # Key is a filesystem or host:dir spec as outlined above
+ # regular expressions allowed (not shell-type wildcards!)
++#
++# Note:  These directories are actually regular expressions and must
++# match "find" output relative to the path of the current backup set. This
++# means that different exclusions are needed for different backup sets.
++# This is a little tricky, so, read on.
++#
++# The regular expressions are processed by "find" but, before "find" is run,
++# FlexBackup changes into the base directory of the backup set in progress.
++# FlexBackup then runs "find" with a path of "." which means all output lines
++# start with "./".  To be helpful, FlexBackup packages each space-separated
++# prune directory as follows.  If you have a prune list like this
++#
++#     $prune{'/somedir'} = "one two three";
++#
++# then, the constructed -regex argument to "find" looks like this
++#
++#     -regex "\./\(one\|two\|three\)/.*"
++#
++# The last thing you need to know is that FlexBackup only uses the prune
++# terms that match the current base directory in the set you're backing
++# up.  For example, if your backup set definition looks like this
++#
++#     $set{'daily'} = "/home /root /var /usr";
++#
++# and you want to do some exclusions in "/home" and "/var" (but not the other
++# directories), you must set up a prune list for those two directories 
++# separately.  For example, to exclude bert's and ernie's home directories plus
++# /var/tmp, you would need the following:
++#
++#     $prune{'/home'} = "bert ernie";
++#     $prune{'/var'}  = "tmp";
++#
++# In particular, combining these *does not* work.  For example, this
++#
++#     $prune{'/'} = "home/bert home/ernie var/tmp";
++#
++# does not work, unless, of course, your backup set is backing up "/", 
++# which our example is not.
++#
+ $prune{'/'} = "tmp proc";
+ 
+ # Compression
+@@ -84,7 +123,8 @@
+ # True to try and preserve file access times during backup, if the selected
+ # archive program can do so. Note that if this is true, -cnewer checks (file
+ # permission/status changes only, not content) are turned off when deciding
+-# which files to archive on the local system.
++# which files to archive on the local system.  This is because preserving the
++# access time changes the permission/status change time in the filesystem.
+ $atime_preserve = 'false';
+ 
+ # Span across filesytems? ("dump" will ignore this option)
+@@ -97,8 +137,13 @@
+ # leading directories (the filesystem specs above or the "-dir" flag).
+ # Matches paths, not filenames, so put .* on the front/back as needed.
+ # Comment these out to exclude nothing.
+-$exclude_expr[0] = '.*/[Cc]ache/.*';
+-$exclude_expr[1] = '.*~$';
++# 
++# Note:  The first example line breaks portage in a restored backup because
++# "/usr/lib/portage/pym/cache" is not backed up.  Way too general!  The moral
++# of this story is, be very careful with global excludes.  The second example 
++# is probably okay.
++# $exclude_expr[0] = '.*/[Cc]ache/.*';
++# $exclude_expr[1] = '.*~$';
+ 
+ # If true (default), and using a tape device, level zero "set" backups
+ # assume you want to erase and use a new tape for each set. If false, level
diff --git a/app-backup/flexbackup/files/flexbackup-1.2.1-perl-5.12-deprecation-warning.patch b/app-backup/flexbackup/files/flexbackup-1.2.1-perl-5.12-deprecation-warning.patch
new file mode 100644
index 000000000000..2976eab916f1
--- /dev/null
+++ b/app-backup/flexbackup/files/flexbackup-1.2.1-perl-5.12-deprecation-warning.patch
@@ -0,0 +1,29 @@
+--- flexbackup.~1~	2010-10-09 13:19:27.633694860 +0200
++++ flexbackup	2010-10-09 13:21:52.396818511 +0200
+@@ -133,6 +133,9 @@
+ # tar has a limit of this many chars in its volume label
+ $::tar_max_label = 99;
+ 
++# Define the prune hash to avoid warnings with perl 5.12
++use vars qw( %prune );
++
+ # Get commandline flags
+ %::opt = ();
+ if (! &::GetOptions(\%::opt,
+@@ -1050,6 +1053,6 @@
+     } else {
+ 	$prunekey = $dir;
+     }
+-    if (defined(%{$::prune{$prunekey}})) {
++    if (defined($prune{$prunekey})) {
+ 	&log("| NOTE: \$prune is ignored for type=dump");
+     }
+@@ -4885,7 +4885,7 @@
+ 	$prunekey = $dir;
+     }
+ 
+-    if (defined(%{$::prune{$prunekey}})) {
++    if (defined($prune{$prunekey})) {
+ 		my $rex;
+ 	# FreeBSD needs -E (above) and no backslashes around the (|) chars
+ 	if ($::uname =~ /FreeBSD/) {
diff --git a/app-backup/flexbackup/files/flexbackup-1.2.1-perl-5.16-deprecation-warning.patch b/app-backup/flexbackup/files/flexbackup-1.2.1-perl-5.16-deprecation-warning.patch
new file mode 100644
index 000000000000..285cf26313f9
--- /dev/null
+++ b/app-backup/flexbackup/files/flexbackup-1.2.1-perl-5.16-deprecation-warning.patch
@@ -0,0 +1,11 @@
+--- flexbackup	2010-12-30 08:09:10.000000000 +0100
++++ flexbackup	2013-12-24 15:44:25.000000000 +0100
+@@ -2688,7 +2688,7 @@
+     }
+ 
+     # Flag old config file
+-    if (defined(@cfg::filesystems) or defined($cfg::mt_var_blksize)) {
++    if (@cfg::filesystems or $cfg::mt_var_blksize) {
+ 	# so strict shuts up
+ 	my $junk = @cfg::filesystems;
+ 	$junk = $cfg::mt_var_blksize;
diff --git a/app-backup/flexbackup/files/flexbackup-1.2.1-prune.patch b/app-backup/flexbackup/files/flexbackup-1.2.1-prune.patch
new file mode 100644
index 000000000000..35081932e6f1
--- /dev/null
+++ b/app-backup/flexbackup/files/flexbackup-1.2.1-prune.patch
@@ -0,0 +1,136 @@
+diff -ub flexbackup-old/flexbackup flexbackup-new/flexbackup
+--- flexbackup-old/flexbackup	2007-05-11 20:14:13.000000000 -0400
++++ flexbackup-new/flexbackup	2007-05-11 20:22:36.000000000 -0400
+@@ -3085,7 +3085,6 @@
+ 	    $::read_cmd = "$bufcmd $read_flags";
+ 
+ 	} elsif ($cfg::buffer eq "mbuffer") {
+-
+ 	    $::path{'mbuffer'} = &checkinpath('mbuffer');
+ 	    push(@::remoteprogs, $::path{'mbuffer'});
+ 
+@@ -3101,7 +3100,6 @@
+ 	    }
+ 	}
+     } else {
+-
+ 	# If buffering disabled, use dd or cat depending on if blocking turned off on not
+ 	if ($cfg::blksize eq '0') {
+ 	    $::buffer_cmd = "";
+@@ -4887,18 +4885,19 @@
+ 		my $rex;
+ 	# FreeBSD needs -E (above) and no backslashes around the (|) chars
+ 	if ($::uname =~ /FreeBSD/) {
+-			$rex  = '-regex "\./(';
++			$rex  = '"\./(';
+ 			$rex .= join('|', keys %{$::prune{$prunekey}});
+-			$rex .= ')/.*" ';
++			$rex .= ')"';
+ 		} else {
+-			$rex  = '-regex "\./\(';
++			$rex  = '"\./\(';
+ 			$rex .= join('\|', keys %{$::prune{$prunekey}});
+-			$rex .= '\)/.*" ';
++			$rex .= '\)"';
+ 		}
+ 		# Show what the darn thing is constructing for prune expressions.
+-		&log("| \"find\" regex for pruning is: $rex");
+-		$cmd .= $rex;
+-	$cmd .= '-prune -o ';
++		&log("| \"find\" regex for pruning is:");
++		&log("|     $rex");
++		&line();
++		$cmd .= '-regex ' . $rex . ' -prune -o ';
+     } else {
+ 		# Show what the darn thing is constructing for prune expressions.
+ 		&log("| No pruning defined for this tree.");
+diff -ub flexbackup-old/flexbackup.1 flexbackup-new/flexbackup.1
+--- flexbackup-old/flexbackup.1	2007-05-11 20:14:13.000000000 -0400
++++ flexbackup-new/flexbackup.1	2007-05-11 20:09:58.000000000 -0400
+@@ -48,7 +48,7 @@
+ Extract (restore) the files listed in text file \(dqfilelist\(dq into your
+ current working directory.
+ .TP
+-\fBflexbackup\fR \fI-extract\fR \fI-flist\fR <\fIfilename\fR>
++\fBflexbackup\fR \fI-extract\fR \fI-onefile\fR <\fIfilename\fR>
+ Extract (restore) the single file named \(dqfilename\(dq into your current
+ working directory.
+ .TP
+diff -ub flexbackup-old/flexbackup.conf flexbackup-new/flexbackup.conf
+--- flexbackup-old/flexbackup.conf	2007-05-11 20:14:13.000000000 -0400
++++ flexbackup-new/flexbackup.conf	2007-05-11 20:26:48.000000000 -0400
+@@ -28,10 +28,10 @@
+ 
+ # Subtree pruning
+ # A space-separated list of directories to prune from each backup.
+-# Key is a filesystem or host:dir spec as outlined above
+-# regular expressions allowed (not shell-type wildcards!)
++# Key is a filesystem or host:dir spec as outlined above.
++# Regular expressions are allowed (not shell-type wildcards!)
+ #
+-# Note:  These directories are actually regular expressions and must
++# Note:  These "directories" are actually regular expressions and must
+ # match "find" output relative to the path of the current backup set. This
+ # means that different exclusions are needed for different backup sets.
+ # This is a little tricky, so, read on.
+@@ -46,9 +46,11 @@
+ #
+ # then, the constructed -regex argument to "find" looks like this
+ #
+-#     -regex "\./\(one\|two\|three\)/.*"
++#     -regex "\./(one|two|three)"
+ #
+-# The last thing you need to know is that FlexBackup only uses the prune
++# (with characters escaped as necessary depending on your environment).
++#
++# Another thing you need to know is that FlexBackup only uses the prune
+ # terms that match the current base directory in the set you're backing
+ # up.  For example, if your backup set definition looks like this
+ #
+@@ -66,9 +68,16 @@
+ #
+ #     $prune{'/'} = "home/bert home/ernie var/tmp";
+ #
+-# does not work, unless, of course, your backup set is backing up "/", 
++# doesn't work, unless, of course, your backup set is backing up "/", 
+ # which our example is not.
+ #
++# Many other complex and abstruse variations are possible.  Here's one 
++# interesting corner case.  If you want to preserve a directory but none of its
++# contents, you can do it.  Picking on ernie from our previous example, preserve
++# only his home directory:
++#
++#     $prune{'/home'} = "ernie/.*";
++#
+ $prune{'/'} = "tmp proc";
+ 
+ # Compression
+@@ -138,10 +147,10 @@
+ # Matches paths, not filenames, so put .* on the front/back as needed.
+ # Comment these out to exclude nothing.
+ # 
+-# Note:  The first example line breaks portage in a restored backup because
+-# "/usr/lib/portage/pym/cache" is not backed up.  Way too general!  The moral
+-# of this story is, be very careful with global excludes.  The second example 
+-# is probably okay.
++# Gentoo note:  The first example line breaks portage in a restored backup 
++# because "/usr/lib/portage/pym/cache" is not backed up.  Way too general!
++# The moral of this story is, be very careful with global excludes.  The 
++# second example is probably okay.
+ # $exclude_expr[0] = '.*/[Cc]ache/.*';
+ # $exclude_expr[1] = '.*~$';
+ 
+diff -ub flexbackup-old/flexbackup.conf.5 flexbackup-new/flexbackup.conf.5
+--- flexbackup-old/flexbackup.conf.5	2007-05-11 20:14:13.000000000 -0400
++++ flexbackup-new/flexbackup.conf.5	2007-05-11 20:09:58.000000000 -0400
+@@ -40,7 +40,9 @@
+ \fB$prune{\fI'/'\fR}\fR = \fI'tmp proc'\fR;
+ Configure subtree pruning. A space-separated list of directories to prune from
+ each backup. Key is a filesystem/directory or \(dqhost:directory\(dq spec as
+-outlined above regular expressions allowed (not shell-type wildcards!).
++outlined above. Regular expressions allowed (not shell-type wildcards!). There
++is additional explanation (and a lot of examples) in the provided configuration
++file.
+ .TP
+ \fB$compress\fR = \fI'false|gzip|bzip2|lzop|zip|compress|hardware'\fR;
+ .TQ
diff --git a/app-backup/flexbackup/files/flexbackup-1.2.1-quieten.patch b/app-backup/flexbackup/files/flexbackup-1.2.1-quieten.patch
new file mode 100644
index 000000000000..4d9ad8f4e4c7
--- /dev/null
+++ b/app-backup/flexbackup/files/flexbackup-1.2.1-quieten.patch
@@ -0,0 +1,13 @@
+Index: flexbackup
+===================================================================
+--- flexbackup	(revision 814)
++++ flexbackup	(revision 891)
+@@ -2419,7 +2419,7 @@
+     if (! -r "$configfile") {
+ 	die("config file $configfile: $OS_ERROR");
+     }
+-    system("perl -c \"$configfile\"");
++    system("perl -c \"$configfile\" 2>&1");
+     if ($CHILD_ERROR) {
+ 	die("syntax error in config file $configfile");
+     }
diff --git a/app-backup/flexbackup/files/flexbackup-1.2.1-remote-bufftest.patch b/app-backup/flexbackup/files/flexbackup-1.2.1-remote-bufftest.patch
new file mode 100644
index 000000000000..3d473b9810ce
--- /dev/null
+++ b/app-backup/flexbackup/files/flexbackup-1.2.1-remote-bufftest.patch
@@ -0,0 +1,59 @@
+Common subdirectories: flexbackup-1.2.1-r4/contrib and flexbackup-1.2.1-r5/contrib
+diff -ubB flexbackup-1.2.1-r4/flexbackup flexbackup-1.2.1-r5/flexbackup
+--- flexbackup-1.2.1-r4/flexbackup	2007-04-14 17:09:48.000000000 -0400
++++ flexbackup-1.2.1-r5/flexbackup	2007-04-14 17:23:20.000000000 -0400
+@@ -5276,6 +5276,7 @@
+     my $tmp_script = "$cfg::tmpdir/buftest.$host.$PROCESS_ID.sh";
+     my $retval = 0;
+     my $pipecmd;
++	my $explicit_success;
+ 
+     $buffer_cmd =~ s:^\s*\|\s*::;
+     $buffer_cmd =~ s:\s*\|\s*$::;
+@@ -5290,7 +5291,7 @@
+     print SCR "res=\$?\n";
+     print SCR "out=\`cat \$tmp_err\`\n";
+     print SCR "if [ \$res -eq 0 ]; then\n";
+-    print SCR "   echo successful\n";
++    print SCR "    echo \"successful\"\n";
+     print SCR "else\n";
+     print SCR "   echo \"unsuccessful: exit code \$res: \$out\" \n";
+     print SCR "fi\n";
+@@ -5302,13 +5303,19 @@
+ 	$pipecmd = "sh $tmp_script ";
+     } else {
+ 	print $::msg "| Checking '$cfg::buffer' on host $host... ";
+-	$pipecmd =  "cat $tmp_script | ($::remoteshell $host 'cat > $tmp_script; sh $tmp_script; rm -f $tmp_script')";
++	$pipecmd =  "$::remoteshell $host '$::path{mkdir} -p $cfg::tmpdir'; cat $tmp_script | ($::remoteshell $host 'cat > $tmp_script; sh $tmp_script; rm -rf $cfg::tmpdir')";
+     }
+ 
+     if (!defined($::debug)) {
+ 
+ 	open(PIPE,"$pipecmd |") || die;
++
++	$explicit_success = 0;
+ 	while (<PIPE>) {
++		if (/^successful$/) {
++			$explicit_success = 1;
++			last;
++		}
+ 	    if (/^unsuccessful: exit code (\d+): (.*)/) {
+ 		$retval = $1;
+ 		my $out = $2;
+@@ -5337,11 +5344,15 @@
+ 	print $::msg "\n(debug) $pipecmd\n";
+     }
+ 
+-    if ($retval == 0) {
++	if ($explicit_success) {
+ 	print $::msg "Ok\n";
+     }  else {
++		if ($retval == 0) {
++		    push(@::errors, "Unanticipated problems encountered testing '$cfg::buffer' on host '$host'.");
++		}  else {
+ 	print $::msg "Failed!\n";
+     }
++	}
+     unlink("$tmp_script");
+ 
+     return($retval);
diff --git a/app-backup/flexbackup/files/flexbackup-1.2.1-secure-tempfile.patch b/app-backup/flexbackup/files/flexbackup-1.2.1-secure-tempfile.patch
new file mode 100644
index 000000000000..9242f01efcfb
--- /dev/null
+++ b/app-backup/flexbackup/files/flexbackup-1.2.1-secure-tempfile.patch
@@ -0,0 +1,72 @@
+--- a/flexbackup	2003-10-10 07:12:09.000000000 -0700
++++ b/flexbackup	2006-05-14 13:14:54.000000000 -0700
+@@ -269,6 +269,7 @@
+     untie(%::index);
+ }
+ 
++system ('rm', '-rf', $cfg::tmpdir);
+ exit(0);
+ 
+ ######################################################################
+@@ -811,6 +812,11 @@
+ 	($remove, @cmds) = &backup_filelist($label, $localdir, $title, $level, $remote);
+     }
+ 
++	if(defined($remote)) {
++		# create our temporary directory as first remote command
++		unshift(@cmds, &maybe_remote_cmd("$::path{mkdir} -p $cfg::tmpdir", $remote));
++	}
++
+     # Nuke any tmp files used in the above routines
+     if ($remove ne '') {
+ 	push(@cmds, &maybe_remote_cmd("$::path{rm} -f $remove", $remote));
+@@ -827,6 +833,11 @@
+ 	    push(@cmds, &maybe_remote_cmd("$::path{rm} -f $pkglist", $remote));
+ 	}
+     }
++	
++	if(defined($remote)) {
++		# remove temporary directory as our last remote command
++		push(@cmds, &maybe_remote_cmd("$::path{rm} -rf $cfg::tmpdir", $remote));
++	}
+ 
+     # Strip multiple spaces
+     foreach my $cmd (@cmds) {
+@@ -2750,8 +2761,9 @@
+     $::path{'find'} = &checkinpath('find');
+     $::path{'dd'} = &checkinpath('dd');
+     $::path{'printf'} = &checkinpath('printf');
++    $::path{'mkdir'} = &checkinpath('mkdir');
+ 
+-    push(@::remoteprogs,($::path{'touch'},$::path{'rm'},$::path{'find'},$::path{'printf'}));
++    push(@::remoteprogs,($::path{'touch'},$::path{'rm'},$::path{'find'},$::path{'printf'},$::path{'mkdir'}));
+ 
+     # Check device (or dir)
+     $::ftape = 0;
+@@ -3442,6 +3454,15 @@
+ 	push(@::errors,"\$tmpdir $cfg::tmpdir is not writable");
+     }
+ 
++	$cfg::hostname = `hostname`;
++	chomp($cfg::hostname);
++
++	# Use a subdirectory of the user-specified directory as our tmpdir
++	# Also note that we make it closer to globally unique as we sometimes
++	# use this variable for remote systems, so PID isn't enough
++    $cfg::tmpdir = $cfg::tmpdir .'/flexbackup.'.$$.'.'.$cfg::hostname;
++    mkdir ($cfg::tmpdir) || die "Can't create temporary directory, $!";
++
+     # Levels
+     if (defined($::opt{'level'}) and
+ 	(defined($::opt{'incremental'}) or
+@@ -5236,8 +5257,8 @@
+     # Create a script which tests the buffer program
+     open(SCR,"> $tmp_script") || die;
+     print SCR "#!/bin/sh\n";
+-    print SCR "tmp_data=/tmp/bufftest\$\$.txt\n";
+-    print SCR "tmp_err=/tmp/bufftest\$\$.err\n";
++    print SCR "tmp_data=\`tempfile\`\n";
++    print SCR "tmp_err=\`tempfile\`\n";
+     print SCR "echo testme > \$tmp_data\n";
+     print SCR "$buffer_cmd > /dev/null 2> \$tmp_err < \$tmp_data\n";
+     print SCR "res=\$?\n";
diff --git a/app-backup/flexbackup/files/flexbackup-1.2.1-spaces-in-filenames.patch b/app-backup/flexbackup/files/flexbackup-1.2.1-spaces-in-filenames.patch
new file mode 100644
index 000000000000..1e9ea220ebf5
--- /dev/null
+++ b/app-backup/flexbackup/files/flexbackup-1.2.1-spaces-in-filenames.patch
@@ -0,0 +1,296 @@
+Index: flexbackup
+===================================================================
+--- flexbackup	(.../tags/flexbackup-1.2.1-r5)	(revision 784)
++++ flexbackup	(.../trunk)	(revision 784)
+@@ -1301,8 +1301,8 @@
+ 	$cmd .= "$::unz";
+     }
+     $cmd .= "(";
+-    $cmd .= "mkdir -p $::device ; ";
+-    $cmd .= "cd $::device ; ";
++    $cmd .= "mkdir -p \"$::device\" ; ";
++    $cmd .= "cd \"$::device\" ; ";
+     $cmd .= "$::path{cpio} -i ";
+     $cmd .= "-m ";
+     $cmd .= "-d ";
+@@ -1351,9 +1351,8 @@
+ 
+     # Have to take leading './' off to make rsync's include/exclude work right
+     $cmd .= " | $::path{sed} -e \"s/\\.\\///g\" | ";
+-
+     $cmd .= "$::path{rsync} ";
+-    $cmd .= "--include-from=- --exclude=* ";
++    $cmd .= "--files-from=- ";
+     $cmd .= "--archive ";
+     $cmd .= "$::rsync_verb_flag ";
+     $cmd .= "--delete --delete-excluded ";
+@@ -1368,7 +1367,7 @@
+ 	    $cmd .= "$remote:";
+ 	}
+     }
+-    $cmd .= "$dir/ $::device";
++    $cmd .= "\"$dir/\" \"$::device\"";
+ 
+     push(@cmds, $cmd);
+ 
+@@ -1658,7 +1657,9 @@
+     my $tmpfile = "$cfg::tmpdir/ar.$PROCESS_ID";
+     my $remove = '';
+ 
+-    &log("| NOTE: ar archives will not descend directories");
++    &log("| NOTE: ar archives will not recurse into subdirectories,");
++    &log("|       which makes them inappropriate for most backups.");
++    &log("|       Be sure this is what you want.");
+ 
+     if (defined($remote) and ($level != 0)) {
+ 	my $time = &get_last_date($label, $level, 'numeric');
+@@ -1682,11 +1683,13 @@
+     $cmd = "cd \"$dir\" && ";
+     $cmd .= &file_list_cmd( $dir, $stamp, 'newline', $level, $remote, '-maxdepth 1 ! -type d');
+     $cmd .= "> $filelist; ";
++    # Escape any spaces in filenames. 
++    $cmd .= "$::path{sed} -i -e 's/ /\\\\ /g' $filelist; ";
+ 
+     $cmd .= "$::path{ar} rc";
+     $cmd .= "$::ar_verb_flag ";
+     $cmd .= "$tmpfile ";
+-    $cmd .= "`$::path{cat} $filelist`";
++    $cmd .= "\@$filelist ";
+     $cmd .= "; $::path{cat} $tmpfile $::z";
+ 
+     # Buffer both sides if remote
+@@ -1800,12 +1803,9 @@
+ 
+     $cmd = "cd \"$dir\" && ";
+     $cmd .= &file_list_cmd( $dir, $stamp, 'newline', $level, $remote);
+-    $cmd .= "> $filelist; ";
+-
+-    $cmd .= "$::path{lha} a";
++    $cmd .= " | $::path{lha} a";
+     $cmd .= "$::lha_verb_flag ";
+     $cmd .= "$tmpfile ";
+-    $cmd .= "`$::path{cat} $filelist`";
+     $cmd .= "; $::path{cat} $tmpfile $::z";
+ 
+     # Buffer both sides if remote
+@@ -2766,6 +2766,7 @@
+     $::path{'dd'} = &checkinpath('dd');
+     $::path{'printf'} = &checkinpath('printf');
+     $::path{'mkdir'} = &checkinpath('mkdir');
++	$::path{'sed'} = &checkinpath('sed');
+ 
+     push(@::remoteprogs,($::path{'touch'},$::path{'rm'},$::path{'find'},$::path{'printf'},$::path{'mkdir'}));
+ 
+@@ -4894,9 +4895,9 @@
+ 			$rex .= '\)"';
+ 		}
+ 		# Show what the darn thing is constructing for prune expressions.
+-		&log("| \"find\" regex for pruning is:");
+-		&log("|     $rex");
+-		&line();
++        (my $temp = $rex) =~ s/\\([()|])/$1/g;
++		&log("| \"find\" regex for pruning (shell escaping omitted for clarity) is:");
++		&log("|     $temp");
+ 		$cmd .= '-regex ' . $rex . ' -prune -o ';
+     } else {
+ 		# Show what the darn thing is constructing for prune expressions.
+@@ -4906,6 +4907,7 @@
+ 		# don't have permissions on and are running as non-root)
+ 		$cmd .= "-depth ";
+     }
++    &line();
+ 
+     $cmd .= "$::mountpoint_flag ";
+     $cmd .= "! -type s ";
+@@ -5301,12 +5303,14 @@
+ 	print $::msg "| Checking '$cfg::buffer' on this machine... ";
+ 	$pipecmd = "sh $tmp_script ";
+     } else {
++	$pipecmd = 
++        "$::remoteshell $host '$::path{mkdir} -p $cfg::tmpdir'; " .
++        "cat $tmp_script | ($::remoteshell $host 'cat > $tmp_script; " .
++        "sh $tmp_script; rm -rf $cfg::tmpdir')";
+ 	print $::msg "| Checking '$cfg::buffer' on host $host... ";
+-	$pipecmd =  "$::remoteshell $host '$::path{mkdir} -p $cfg::tmpdir'; cat $tmp_script | ($::remoteshell $host 'cat > $tmp_script; sh $tmp_script; rm -rf $cfg::tmpdir')";
+     }
+ 
+     if (!defined($::debug)) {
+-
+ 	open(PIPE,"$pipecmd |") || die;
+ 
+ 	$explicit_success = 0;
+Index: flexbackup.conf
+===================================================================
+--- flexbackup.conf	(.../tags/flexbackup-1.2.1-r5)	(revision 784)
++++ flexbackup.conf	(.../trunk)	(revision 784)
+@@ -12,19 +12,27 @@
+ 
+ # Configure backup "sets".
+ # Not needed if you use "-dir <dir>" to backup one tree at a time.
+-# Each set is a simple space-separated list of filesystems
+-# Remote filesystems should denoted as 'host:dir'
+-# You can use anything (other than 'all') as set names
+-#
+-# Example:
+-#  $set{'set1'} = "/home /usr";
+-#  $set{'set2'} = "/dir3 machine2:/dir4 machine3:/dir5";
++# Each set is a simple space-separated list of filesystems.  Remote filesystems
++# should denoted as 'host:dir'.  If the filesystem name (local or remote)
++# contains spaces, then it should be enclosed in its entirety in double quotes.
++# Multiple quoted filesystems included in a set should be space separated just
++# like unquoted filesystem.  The Perl '.' string concatenation operator can be
++# used to split excessively long lines.
++#
++# You can use anything (other than 'all') as set names.
++#
++# Examples:
++#  $set{'set1'} = '/home /usr';
++#  $set{'set2'} = '/dir3 machine2:/dir4 machine3:/dir5';
++#  $set{'set3'} =
++#      '"/mnt/winmachine1/Documents and Settings" ' .
++#      '"/mnt/winmachine1/Program Files"';
+ #
+ # "-set all" will back up all defined sets. If you are doing a full backup
+ # using tapes, each "set" will go onto a different tape and you will be
+ # prompted for tape change in between.
+ #
+-$set{'backup'} = "/home";
++$set{'backup'} = '/home';
+ 
+ # Subtree pruning
+ # A space-separated list of directories to prune from each backup.
+@@ -42,7 +50,7 @@
+ # start with "./".  To be helpful, FlexBackup packages each space-separated
+ # prune directory as follows.  If you have a prune list like this
+ #
+-#     $prune{'/somedir'} = "one two three";
++#     $prune{'/somedir'} = 'one two three';
+ #
+ # then, the constructed -regex argument to "find" looks like this
+ #
+@@ -54,31 +62,38 @@
+ # terms that match the current base directory in the set you're backing
+ # up.  For example, if your backup set definition looks like this
+ #
+-#     $set{'daily'} = "/home /root /var /usr";
++#     $set{'daily'} = '/home /root /var /usr';
+ #
+ # and you want to do some exclusions in "/home" and "/var" (but not the other
+ # directories), you must set up a prune list for those two directories 
+ # separately.  For example, to exclude bert's and ernie's home directories plus
+ # /var/tmp, you would need the following:
+ #
+-#     $prune{'/home'} = "bert ernie";
+-#     $prune{'/var'}  = "tmp";
++#     $prune{'/home'} = 'bert ernie';
++#     $prune{'/var'}  = 'tmp';
+ #
+ # In particular, combining these *does not* work.  For example, this
+ #
+-#     $prune{'/'} = "home/bert home/ernie var/tmp";
++#     $prune{'/'} = 'home/bert home/ernie var/tmp';
+ #
+ # doesn't work, unless, of course, your backup set is backing up "/", 
+ # which our example is not.
+ #
++# Like the $set configuration item, special handling is required for
++# directories with spaces in them.  Double quotes should surround pruning
++# targets but not the key.  Example:
++#
++#     $prune{'/mnt/winmachine1/Documents and Settings'} =
++#         '"user1/Local Settings/Temp" user2';
++#
+ # Many other complex and abstruse variations are possible.  Here's one 
+ # interesting corner case.  If you want to preserve a directory but none of its
+ # contents, you can do it.  Picking on ernie from our previous example, preserve
+ # only his home directory:
+ #
+-#     $prune{'/home'} = "ernie/.*";
++#     $prune{'/home'} = 'ernie/.*';
+ #
+-$prune{'/'} = "tmp proc";
++$prune{'/'} = 'tmp proc';
+ 
+ # Compression
+ $compress = 'gzip'; # one of false/gzip/bzip2/lzop/zip/compress/hardware/lzma
+Index: flexbackup.conf.5
+===================================================================
+--- flexbackup.conf.5	(.../tags/flexbackup-1.2.1-r5)	(revision 784)
++++ flexbackup.conf.5	(.../trunk)	(revision 784)
+@@ -24,25 +24,51 @@
+ .TP
+ \fB$set{\fI'tag'\fR}\fR = \fI'/dir'\fR;
+ Configure backup \(dqsets\(dq. Not needed if \(dq-dir <dir>\(dq is used to
+-backup one tree at a time.  Each set is a simple space-separated list of
+-filesystems/directories. Remote filesystems should be denoted as
+-\(dqhost:directory\(dq.  You can use anything (other than \fI'all'\fR) as set
+-names. Using \(dq-set all\(dq will back up all defined sets. If you are doing
+-a full backup using tapes, each \(dqset\(dq will go onto a different tape and
+-you will be prompted for tape change in between. Examples:
++backup one tree at a time.
++Each set is a simple space-separated list of filesystems/directories.
++Remote filesystems should be denoted as \(dqhost:directory\(dq.
++You can use anything (other than \fI'all'\fR) as set names.
++Using \(dq-set all\(dq will back up all defined sets.
++If you are doing a full backup using tapes, each \(dqset\(dq will go onto a
++different tape and you will be prompted for tape change in between.
++Examples:
+ .RS
+ .PP
+ \fB$set{\fI'set1'\fI}\fR = \fI'/home /usr'\fR;
+ .br
+ \fB$set{\fI'set2'\fI}\fR = \fI'/dir3 machine2:/dir4 machine3:/dir5'\fR;
++.br
++.PP
++Directories (local or remote) with spaces in their names should be enclosed in
++their entirety in double quotes.
++Multiple quoted directories included in a set should be space separated just
++like unquoted directories.
++The Perl '.' string concatenation operator can be used to split excessively
++long sets.
++Example:
++.PP
++\fB$set{\fI'set3'\fI}\fR = \fI
++    '\(dq/mnt/winmachine1/Documents and Settings\(dq ' .
++    '\(dq/mnt/winmachine1/Program Files\(dq';\fR
+ .RE
+ .TP
+ \fB$prune{\fI'/'\fR}\fR = \fI'tmp proc'\fR;
+ Configure subtree pruning. A space-separated list of directories to prune from
+ each backup. Key is a filesystem/directory or \(dqhost:directory\(dq spec as
+-outlined above. Regular expressions allowed (not shell-type wildcards!). There
+-is additional explanation (and a lot of examples) in the provided configuration
+-file.
++outlined above. Regular expressions allowed (not shell-type wildcards!).
++.RS
++.PP
++Like the \fB$set\fR configuration item, special handling is required for
++directories with spaces in them.  Double quotes should surround pruning targets
++but not the key.  Example:
++.PP
++\fB$prune{\fI'/mnt/winmachine1/Documents and Settings'\fI}\fR = 
++    \fI'\(dquser1/Local Settings/Temp\(dq user2'\fR;
++.br
++.PP
++There are lots of examples and additional explanation in the provided sample
++configuration file.
++.RE
+ .TP
+ \fB$compress\fR = \fI'false|gzip|bzip2|lzop|zip|compress|hardware'\fR;
+ .TQ
+@@ -207,7 +233,7 @@
+ .RS
+ .TP
+ If GNU \fBtar\fR is called \fB\(dqgtar\(dq\fR on your system:
+-\fB$path{'tar'} = 'gtar';
++\fB$path{'tar'} = 'gtar';\fR
+ .TP
+ Or it can be used to \fB\(dqsudo\(dq\fR certain commands:
+ \fB$path{\fI'find'\fR}\fR = \fI'sudo find'\fR;
+@@ -304,3 +330,6 @@
+ Written by Edwin Huffstutler (edwinh@computer.org)
+ .SH "SEE ALSO"
+ \fBflexbackup\fR(1)
++.\" Local Variables:
++.\" mode: nroff
++.\" End:
diff --git a/app-backup/flexbackup/files/flexbackup-1.2.1-tar-1.29.patch b/app-backup/flexbackup/files/flexbackup-1.2.1-tar-1.29.patch
new file mode 100644
index 000000000000..211cf2067623
--- /dev/null
+++ b/app-backup/flexbackup/files/flexbackup-1.2.1-tar-1.29.patch
@@ -0,0 +1,15 @@
+diff -ubBr old/flexbackup new/flexbackup
+--- old/flexbackup	2016-12-01 10:52:59.088767278 -0500
++++ new/flexbackup	2016-12-01 10:54:18.006882216 -0500
+@@ -1408,10 +1408,10 @@
+ 
+     $cmd .= "$::path{tar} --create ";
+     $cmd .= "--null ";
++    $cmd .= "--no-recursion ";
+     $cmd .= "--files-from=- ";
+     $cmd .= "--ignore-failed-read ";
+     $cmd .= "--same-permissions ";
+-    $cmd .= "--no-recursion ";
+     $cmd .= "--totals ";
+     if ($cfg::label ne 'false') {
+ 	if (length($title) > $::tar_max_label) {
diff --git a/app-backup/flexbackup/flexbackup-1.2.1-r13.ebuild b/app-backup/flexbackup/flexbackup-1.2.1-r13.ebuild
new file mode 100644
index 000000000000..528b303d318b
--- /dev/null
+++ b/app-backup/flexbackup/flexbackup-1.2.1-r13.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="Flexible backup script using perl"
+HOMEPAGE="http://flexbackup.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc x86"
+IUSE=""
+
+RDEPEND="app-arch/mt-st"
+DEPEND="${RDEPEND}"
+
+DOCS="CHANGES CREDITS README TODO"
+HTML_DOCS="faq.html"
+
+src_prepare() {
+	# Patch from upstream adds optional lzma compression mode.
+	eapply -p0 "${FILESDIR}"/${P}-lzma.patch
+
+	# Fix bug #116510: cannot back up remote machines after patch CAN-2005-2965
+	eapply "${FILESDIR}"/${P}-secure-tempfile.patch
+
+	# Fix bug #96334: incorrectly determines bash 3.x to be bash 1.x
+	eapply -p0 "${FILESDIR}"/${P}-bash.patch
+
+	# Fix bug #171205: specifies wrong command line option for mbuffer / other small enhancements
+	eapply "${FILESDIR}"/${P}-mbuffer-switch.patch
+
+	# Fix bug #173672: remote host buffer test is broken
+	eapply "${FILESDIR}"/${P}-remote-bufftest.patch
+
+	# Fix bug #178126: subtle subtree pruning issue / other small issues
+	eapply "${FILESDIR}"/${P}-prune.patch
+
+	# Fix bug #184560: fails to back up targets with spaces in their names in some modes
+	eapply -p0 "${FILESDIR}"/${P}-spaces-in-filenames.patch
+
+	# Fix bug #190357: fails on very large files with afio back end
+	eapply -p0 "${FILESDIR}"/${P}-afio-large-files.patch
+
+	# Fix bug #235416: prevent normal status message during conf file read from going to stderr
+	eapply -p0 "${FILESDIR}"/${P}-quieten.patch
+
+	# Fix bug #331673: perl 5.12 deprecation warnings.
+	eapply -p0 "${FILESDIR}"/${P}-perl-5.12-deprecation-warning.patch
+
+	# Fix bug #495232: perl 5.16 deprecation warnings.
+	eapply -p0 "${FILESDIR}"/${P}-perl-5.16-deprecation-warning.patch
+
+	# Fix bug #601368: app-backup/flexbackup breaks with >=app-arch/tar-1.29 when making tar-based backups
+	eapply "${FILESDIR}"/${P}-tar-1.29.patch
+
+	eapply_user
+
+	sed -i \
+		-e '/^\$type = /s:afio:tar:' \
+		-e "/^\$buffer = /s:'buffer':'false':" \
+		flexbackup.conf \
+		|| die "Failed to set modified configuration defaults."
+
+	MY_PV=$(replace_all_version_separators '_')
+	sed -i \
+		-e "/^[[:blank:]]*my \$ver = /s:${MY_PV}:&-${PR}:" \
+		flexbackup \
+		|| die "Failed to apply ebuild revision to internal version string."
+}
+
+src_install() {
+	dodir /etc /usr/bin /usr/share/man/man{1,5}
+	emake install \
+		PREFIX="${D}"/usr \
+		CONFFILE="${D}"/etc/flexbackup.conf \
+		|| die "emake install failed"
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "Please edit your /etc/flexbackup.conf file to suit your"
+	elog "needs.  If you are using devfs, the tape device should"
+	elog "be set to /dev/tapes/tape0/mtn.  If you need to use any"
+	elog "archiver other than tar, please emerge it separately."
+}
diff --git a/app-backup/flexbackup/metadata.xml b/app-backup/flexbackup/metadata.xml
new file mode 100644
index 000000000000..ee448e7097ec
--- /dev/null
+++ b/app-backup/flexbackup/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>graaff@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">flexbackup</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-backup/fsarchiver-0.8.4 b/app-backup/fsarchiver-0.8.4
deleted file mode 100644
index 5eafad871151..000000000000
--- a/app-backup/fsarchiver-0.8.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/libgcrypt:0= >=sys-fs/e2fsprogs-1.41.4 lz4? ( app-arch/lz4 ) lzma? ( >=app-arch/xz-utils-4.999.9_beta ) lzo? ( >=dev-libs/lzo-2.02 ) static? ( lz4? ( app-arch/lz4[static-libs] ) lzma? ( app-arch/xz-utils[static-libs] ) lzo? ( dev-libs/lzo[static-libs] ) zstd? ( app-arch/zstd[static-libs] ) ) zstd? ( app-arch/zstd ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Flexible filesystem archiver for backup and deployment tool
-EAPI=6
-HOMEPAGE=http://www.fsarchiver.org
-IUSE=debug lz4 lzma lzo static zstd
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libgcrypt:0= >=sys-fs/e2fsprogs-1.41.4 lz4? ( app-arch/lz4 ) lzma? ( >=app-arch/xz-utils-4.999.9_beta ) lzo? ( >=dev-libs/lzo-2.02 ) static? ( lz4? ( app-arch/lz4[static-libs] ) lzma? ( app-arch/xz-utils[static-libs] ) lzo? ( dev-libs/lzo[static-libs] ) zstd? ( app-arch/zstd[static-libs] ) ) zstd? ( app-arch/zstd )
-SLOT=0
-SRC_URI=https://github.com/fdupoux/fsarchiver/releases/download/0.8.4/fsarchiver-0.8.4.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c314118edcab53acd9c926b0897bb578
diff --git a/app-backup/fsarchiver-0.8.5 b/app-backup/fsarchiver-0.8.5
deleted file mode 100644
index 2cad795fc631..000000000000
--- a/app-backup/fsarchiver-0.8.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/libgcrypt:0= >=sys-fs/e2fsprogs-1.41.4 lz4? ( app-arch/lz4 ) lzma? ( >=app-arch/xz-utils-4.999.9_beta ) lzo? ( >=dev-libs/lzo-2.02 ) zstd? ( app-arch/zstd ) static? ( lz4? ( app-arch/lz4[static-libs] ) lzma? ( app-arch/xz-utils[static-libs] ) lzo? ( dev-libs/lzo[static-libs] ) zstd? ( app-arch/zstd[static-libs] ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Flexible filesystem archiver for backup and deployment tool
-EAPI=7
-HOMEPAGE=http://www.fsarchiver.org
-IUSE=debug lz4 lzma lzo static zstd
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/fdupoux/fsarchiver/releases/download/0.8.5/fsarchiver-0.8.5.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=efe399d16251be02b28a49e92cb04e3e
diff --git a/app-backup/fsarchiver/Manifest b/app-backup/fsarchiver/Manifest
new file mode 100644
index 000000000000..d8fa52cbde88
--- /dev/null
+++ b/app-backup/fsarchiver/Manifest
@@ -0,0 +1,6 @@
+AUX fsarchiver-0.8.4-xattr.patch 1875 BLAKE2B 57841c69bbfe68a55f83affb5e0ec2f7583673d1741d780e71bd55817a5659dc34d75b56bea531ad41365ff741b6c17965926456809b61fbdeedfad33c9b0867 SHA512 cc1e632bd7147da8af77d4f45c473617f1d40768dd30f94880384f3cfb3f43df85ab6f3917b48a2299a267a7c8861ba5f3b1bbef1e8a706eebba8a849fda2e50
+DIST fsarchiver-0.8.4.tar.gz 298793 BLAKE2B 706b1ed8a3966703ce8e6b0e16a502645317158478422e0fb999ed277185f83ca9a5a607f189c9bbf6b63c6bf1b4d9589d51fcbf3b256d57b6cd056757156ae3 SHA512 15712e5fdb9695148e8fe42791952acf0c7d34611c3467a0cb2e2631c9c5f1c55a4e839098085e6a72c2d8988b05e6f515ef772bcc5766b57a07da65a5209efd
+DIST fsarchiver-0.8.5.tar.gz 298502 BLAKE2B 434fbc945bb4999243fe2b6a212c6b04118ae37749b4b14b590cf8269e541a5b09954e75a898126c8a55b5b516f458a1cf1842b4a9f4ead2185c7b5e8c99343c SHA512 bf427dfcc5a73fc799710766dc1c1392ed379565ec68d7cef49e9391da749e08fb655f2b86b4ab4db7cacaf323286b4673a7c3fbebba81ac50d0b66c1f0b91ff
+EBUILD fsarchiver-0.8.4.ebuild 1161 BLAKE2B 4efb9c4f957970f0d9a419100014ad9ebb280f1c264d8861e36b75235fc17592651573fed512d42a4075b85c44ba9a9c7208ec4839a4eeec4e370264e20fb439 SHA512 2faf1f1528578db1b5a1abc3e6e525b5e6121021b2a6658ea04546de151f89ac5e94c8481fc4bd8ff0a347e8e7aca40bfe8e3f6f60198be2f10c15a6fbb6c3fd
+EBUILD fsarchiver-0.8.5.ebuild 1140 BLAKE2B 92fc4c9a6bac17acc897d674ac16eccc34621ec2755ddb98fe1c01468772798116e22a3335fe541e62891e0309f84af8a379d8940885a18acbc53c6b8da5d5d6 SHA512 c29a3b4facc93afa1ca6262534d1ce2969efe7007806cd25c93cb0941184cdf892ecc6631dcdcf198b1b4e99c3f87fc1549987a5386762924a7cd15d23563790
+MISC metadata.xml 519 BLAKE2B e4afd2bb8fde74149478f3a4d987fc37ade9fdc874b1e88235a0076e177fe97f03f87d994e44ca0392f3960b0599629d68f7c9a4c6d4b98de66b34d963aa8815 SHA512 c9bcbf8757957ce60ca5ea13e485d0241731052eaf0a73eed75734412429ddc6372244e78c92537f8efd886a3976055f060b67c8fa9a025d5b7dff48fc23c316
diff --git a/app-backup/fsarchiver/files/fsarchiver-0.8.4-xattr.patch b/app-backup/fsarchiver/files/fsarchiver-0.8.4-xattr.patch
new file mode 100644
index 000000000000..cbc879008dfe
--- /dev/null
+++ b/app-backup/fsarchiver/files/fsarchiver-0.8.4-xattr.patch
@@ -0,0 +1,67 @@
+From 57759f2b1106b6d19f3bc11b21463f4307dfc3d8 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 20 Feb 2018 10:13:30 +0100
+Subject: [PATCH] Replace <attr/xattr.h> with <sys/xattr.h>
+
+The former has been long deprecated and removed in attr-2.4.48
+---
+ configure.ac       | 2 +-
+ src/oper_restore.c | 3 ++-
+ src/oper_save.c    | 7 ++++++-
+ 3 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 66cfbf3..ae9aae8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -114,7 +114,7 @@ PKG_CHECK_MODULES([BLKID], [blkid])
+ PKG_CHECK_MODULES([UUID], [uuid])
+ 
+ dnl Check for header files installed with a library
+-AC_CHECK_HEADER([attr/xattr.h],, [AC_MSG_ERROR([attr/xattr.h not found. you may have to install a package called attr, libattr, libattr-devel])])
++AC_CHECK_HEADER([sys/xattr.h],, [AC_MSG_ERROR([sys/xattr.h not found.])])
+ 
+ dnl Check for standard header files.
+ AC_CHECK_HEADERS([malloc.h unistd.h pthread.h])
+diff --git a/src/oper_restore.c b/src/oper_restore.c
+index dd8af1f..92eb5f6 100644
+--- a/src/oper_restore.c
++++ b/src/oper_restore.c
+@@ -24,7 +24,8 @@
+ #include <assert.h>
+ #include <string.h>
+ #include <stdlib.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
++#include <errno.h>
+ #include <sys/time.h>
+ #include <sys/stat.h>
+ #include <gcrypt.h>
+diff --git a/src/oper_save.c b/src/oper_save.c
+index ce6f194..ff29074 100644
+--- a/src/oper_save.c
++++ b/src/oper_save.c
+@@ -29,7 +29,8 @@
+ #include <sys/param.h>
+ #include <sys/statvfs.h>
+ #include <sys/stat.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
++#include <errno.h>
+ #include <zlib.h>
+ #include <assert.h>
+ #include <gcrypt.h>
+@@ -59,6 +60,10 @@
+ #include "error.h"
+ #include "queue.h"
+ 
++#ifndef ENOATTR
++#define ENOATTR ENODATA
++#endif
++
+ typedef struct s_savear
+ {   carchwriter ai;
+     cregmulti   regmulti;
+-- 
+2.16.2
+
diff --git a/app-backup/fsarchiver/fsarchiver-0.8.4.ebuild b/app-backup/fsarchiver/fsarchiver-0.8.4.ebuild
new file mode 100644
index 000000000000..392119c19cf0
--- /dev/null
+++ b/app-backup/fsarchiver/fsarchiver-0.8.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Flexible filesystem archiver for backup and deployment tool"
+HOMEPAGE="http://www.fsarchiver.org"
+SRC_URI="https://github.com/fdupoux/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug lz4 lzma lzo static zstd"
+
+DEPEND="dev-libs/libgcrypt:0=
+	>=sys-fs/e2fsprogs-1.41.4
+	lz4? ( app-arch/lz4 )
+	lzma? ( >=app-arch/xz-utils-4.999.9_beta )
+	lzo? ( >=dev-libs/lzo-2.02 )
+	static? (
+		lz4? ( app-arch/lz4[static-libs] )
+		lzma? ( app-arch/xz-utils[static-libs] )
+		lzo? ( dev-libs/lzo[static-libs] )
+		zstd? ( app-arch/zstd[static-libs] )
+	)
+	zstd? ( app-arch/zstd )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-xattr.patch"
+)
+
+src_prepare() {
+	default
+	sed -i -e 's/^\([a-z]*_CFLAGS.*\)-ggdb/\1/' src/Makefile.am \
+		|| die "seding failed"
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug devel)
+		$(use_enable lz4)
+		$(use_enable lzma)
+		$(use_enable lzo)
+		$(use_enable static)
+		$(use_enable zstd)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/app-backup/fsarchiver/fsarchiver-0.8.5.ebuild b/app-backup/fsarchiver/fsarchiver-0.8.5.ebuild
new file mode 100644
index 000000000000..7d22bbd4d2b7
--- /dev/null
+++ b/app-backup/fsarchiver/fsarchiver-0.8.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Flexible filesystem archiver for backup and deployment tool"
+HOMEPAGE="http://www.fsarchiver.org"
+SRC_URI="https://github.com/fdupoux/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug lz4 lzma lzo static zstd"
+
+CDEPEND="dev-libs/libgcrypt:0=
+	>=sys-fs/e2fsprogs-1.41.4
+	lz4? ( app-arch/lz4 )
+	lzma? ( >=app-arch/xz-utils-4.999.9_beta )
+	lzo? ( >=dev-libs/lzo-2.02 )
+	zstd? ( app-arch/zstd )
+"
+DEPEND="${CDEPEND}
+	static? (
+		lz4? ( app-arch/lz4[static-libs] )
+		lzma? ( app-arch/xz-utils[static-libs] )
+		lzo? ( dev-libs/lzo[static-libs] )
+		zstd? ( app-arch/zstd[static-libs] )
+	)"
+RDEPEND="${DDEPEND}"
+
+src_prepare() {
+	default
+	sed -i -e 's/^\([a-z]*_CFLAGS.*\)-ggdb/\1/' src/Makefile.am \
+		|| die "seding failed"
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug devel)
+		$(use_enable lz4)
+		$(use_enable lzma)
+		$(use_enable lzo)
+		$(use_enable static)
+		$(use_enable zstd)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/app-backup/fsarchiver/metadata.xml b/app-backup/fsarchiver/metadata.xml
new file mode 100644
index 000000000000..b705057e31d0
--- /dev/null
+++ b/app-backup/fsarchiver/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<use>
+		<flag name="lz4">Enable lz4 compression support</flag>
+		<flag name="zstd">Enable zstd compression support</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">fsarchiver</remote-id>
+		<remote-id type="github">fdupoux/fsarchiver</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-backup/furball-0.5 b/app-backup/furball-0.5
deleted file mode 100644
index f85da789ed5b..000000000000
--- a/app-backup/furball-0.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A small perl script utilizing tar
-EAPI=4
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl app-arch/tar
-SLOT=0
-SRC_URI=http://www.claws-and-paws.com/software/furball/furball-0.5.tgz
-_md5_=ff02286e1fabeec78ef8a745c5b862dd
diff --git a/app-backup/furball/Manifest b/app-backup/furball/Manifest
new file mode 100644
index 000000000000..493522acbd19
--- /dev/null
+++ b/app-backup/furball/Manifest
@@ -0,0 +1,3 @@
+DIST furball-0.5.tgz 10112 BLAKE2B 2d88bda98bf187f4eb5af07c06000a4370ca4258669b0dee13b956350fde99642c1e20b8b47b160440f485a8e4aff6b44858d9774cd1ef4d3d45f767296632e7 SHA512 e5bf9857de8b391dbedfe14e6f84021447c5c0e7d7e9bed021a4cdf28e93de72c8a8fb82afad64b2863c80b0a983a986a2a00bb2b5319e9b4595781dac18e3b6
+EBUILD furball-0.5.ebuild 456 BLAKE2B a195f0c31e6d45c9fa8a57e4f5beb41f71ed59685de6ee482179996b073a5ae40b4e3d20201454fad5494adb276d903047ee351278074d83e3ef2d63a824b4aa SHA512 45f5a4d306c3460fc96b0df87a418e57a7e9c812daf4c16ff72c998355ba7719e19ad0d570f7d5bfbc39aed6385b70ba80a3552a7296021f627a368aed76d716
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-backup/furball/furball-0.5.ebuild b/app-backup/furball/furball-0.5.ebuild
new file mode 100644
index 000000000000..230d48aaae0e
--- /dev/null
+++ b/app-backup/furball/furball-0.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="A small perl script utilizing tar"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="http://www.claws-and-paws.com/software/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
+RDEPEND="dev-lang/perl
+	app-arch/tar"
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc README NEWS THANKS
+}
diff --git a/app-backup/furball/metadata.xml b/app-backup/furball/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-backup/furball/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-backup/genbackupdata-1.9 b/app-backup/genbackupdata-1.9
deleted file mode 100644
index 64ed1e965fec..000000000000
--- a/app-backup/genbackupdata-1.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/cliapp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ttystatus-0.31[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Generate test data for backup software testing.
-EAPI=5
-HOMEPAGE=http://liw.fi/genbackupdata/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/cliapp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ttystatus-0.31[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/g/genbackupdata/genbackupdata_1.9.orig.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=edc9645abb9d467a4654f544c65a4698
diff --git a/app-backup/genbackupdata/Manifest b/app-backup/genbackupdata/Manifest
new file mode 100644
index 000000000000..66676b840b65
--- /dev/null
+++ b/app-backup/genbackupdata/Manifest
@@ -0,0 +1,3 @@
+DIST genbackupdata_1.9.orig.tar.xz 14112 BLAKE2B 0d0bb2c68ca473ce5af406547ae42e5a9bdc95a08f7cdb056e0fd1c6539f2485b92fbeca163eabf0c28c93ba787a8fe5e74d54b36a700c0f20798daf62350cf6 SHA512 341c9cfa60f79c5fec7d6b607b2e8080d0768fb9b73622baf48569c91294f537a015ed7a23a57eb0d027dabb6f6d736a8660067e9ef80373a9372d1898043673
+EBUILD genbackupdata-1.9.ebuild 728 BLAKE2B 57b9738e08fae3756d86787dba927c6668fb31d7c0b216db6b3a81caad398de5fa4c6310d0c09ab2e897f3eaaae1ada3255a6c23d303bb2b8d6ac91dca68291d SHA512 0e032f1ab7b6bec77b7c66a8555b98f73140d93fcfff26bc36fbf84ea8818158271747bed0366a1b7b7244ec6436b194df3defabb73a8a8a94f5326dc0165d97
+MISC metadata.xml 250 BLAKE2B fe89695d5dcb55e3a59fe901cba061e1b73e5d09cc72d362bb3ec127aecdba741ba23920096bfad7a39c43e35ffbc006fe84f3e50a34c91097a32deceeb91e84 SHA512 c599b09b9aaf744dfe13d0707adde7d3dfd1a8a411e937fcba25e65c6045792cdcf6ceb9004e3dd38b014c486c9f1334bfc898419f59806ec6abebfc71bca382
diff --git a/app-backup/genbackupdata/genbackupdata-1.9.ebuild b/app-backup/genbackupdata/genbackupdata-1.9.ebuild
new file mode 100644
index 000000000000..e6cae7caa61a
--- /dev/null
+++ b/app-backup/genbackupdata/genbackupdata-1.9.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit distutils-r1
+
+DESCRIPTION="Generate test data for backup software testing."
+HOMEPAGE="http://liw.fi/genbackupdata/"
+#SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/$PN/snapshot/${P}.tar.gz"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}
+	dev-python/cliapp[${PYTHON_USEDEP}]
+	>=dev-python/ttystatus-0.31[${PYTHON_USEDEP}]
+	"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	addwrite /proc/self/comm
+	distutils-r1_src_compile
+	emake genbackupdata.1
+}
diff --git a/app-backup/genbackupdata/metadata.xml b/app-backup/genbackupdata/metadata.xml
new file mode 100644
index 000000000000..4073267daf2a
--- /dev/null
+++ b/app-backup/genbackupdata/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-backup/hdup-2.0.14 b/app-backup/hdup-2.0.14
deleted file mode 100644
index ed663efc7a14..000000000000
--- a/app-backup/hdup-2.0.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=app-arch/bzip2 app-arch/gzip app-arch/tar >=dev-libs/glib-2.0 virtual/pkgconfig
-DESCRIPTION=Hdup is backup program using tar, find, gzip/bzip2, mcrypt and ssh
-EAPI=6
-HOMEPAGE=http://www.miek.nl/projects/hdup2/index.html
-IUSE=crypt
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 app-arch/gzip app-arch/tar >=dev-libs/glib-2.0 net-misc/openssh sys-apps/coreutils sys-apps/findutils crypt? ( app-crypt/mcrypt )
-SLOT=0
-SRC_URI=http://www.miek.nl/projects/hdup2/hdup-2.0.14.tar.bz2
-_md5_=539e6c9aed096fc7269d81dc30956002
diff --git a/app-backup/hdup/Manifest b/app-backup/hdup/Manifest
new file mode 100644
index 000000000000..394a7607c986
--- /dev/null
+++ b/app-backup/hdup/Manifest
@@ -0,0 +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 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
new file mode 100644
index 000000000000..87d941b00336
--- /dev/null
+++ b/app-backup/hdup/hdup-2.0.14.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0.14-fix-build-system.patch )
+
+src_install() {
+	HTML_DOCS=( doc/FAQ.html )
+	default
+	dodoc Credits
+
+	insinto /usr/share/${PN}
+	doins -r contrib examples
+}
+
+pkg_postinst() {
+	elog "Now edit your /etc/hdup/${PN}.conf to configure your backups."
+	elog "You can also check included examples and contrib, see /usr/share/${PN}/."
+}
diff --git a/app-backup/hdup/metadata.xml b/app-backup/hdup/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-backup/hdup/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-backup/holland-1.0.10 b/app-backup/holland-1.0.10
deleted file mode 100644
index 0bd94c9328c1..000000000000
--- a/app-backup/holland-1.0.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Holland Core Plugins
-EAPI=5
-HOMEPAGE=http://www.hollandbackup.org/
-IUSE=doc examples +mysql postgres sqlite python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=mysql? ( ~app-backup/holland-backup-mysql-meta-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( ~app-backup/holland-backup-pgdump-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sqlite? ( ~app-backup/holland-backup-sqlite-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) examples? ( ~app-backup/holland-backup-example-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~app-backup/holland-backup-random-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://hollandbackup.org/releases/stable/1.0/holland-1.0.10.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=760dbf0ed382ea979e35553f661a4aa1
diff --git a/app-backup/holland-backup-example-1.0.10 b/app-backup/holland-backup-example-1.0.10
deleted file mode 100644
index 8148c6e967bf..000000000000
--- a/app-backup/holland-backup-example-1.0.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Holland Example Plugin
-EAPI=5
-HOMEPAGE=http://www.hollandbackup.org/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=~app-backup/holland-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://hollandbackup.org/releases/stable/1.0/holland-1.0.10.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aac86b125f494bee7bf31c414293ec8c
diff --git a/app-backup/holland-backup-example/Manifest b/app-backup/holland-backup-example/Manifest
new file mode 100644
index 000000000000..80b6b875cbe7
--- /dev/null
+++ b/app-backup/holland-backup-example/Manifest
@@ -0,0 +1,3 @@
+DIST holland-1.0.10.tar.gz 449334 BLAKE2B 0b0290b916448be1865ff2b5c2f0e78de9c4640418fc049b999f5dd171d8fa54c63411b5b8972c843d98f77e6b9726dbc849cb73d3771244e871bb9fea67652a SHA512 5183ec73012edcaba50ef5cc9b892480d5f60301d01d17bd96c5490bd8e6ae42bd21abb6084e6665317b8025489981a02293cd583964f01e86459609b93e918f
+EBUILD holland-backup-example-1.0.10.ebuild 889 BLAKE2B 0dea10cf383013019f2044fa58daa72f0af1f029379387b1c21500d02d47b999e7cc708787d4a4a8f46c3411b318f02efbff2ee75f93471f84938e24fd5cf660 SHA512 8b40e08af7c36e67674a34237c4d4c07b92bcce2d0633d9097bc6adffac967c6c69f4e21bd74136a948d2bdb1e2d91471d1c3e83be728c83667783b83efce76c
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-backup/holland-backup-example/holland-backup-example-1.0.10.ebuild b/app-backup/holland-backup-example/holland-backup-example-1.0.10.ebuild
new file mode 100644
index 000000000000..381e70da2771
--- /dev/null
+++ b/app-backup/holland-backup-example/holland-backup-example-1.0.10.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Holland Example Plugin"
+HOMEPAGE="http://www.hollandbackup.org/"
+
+MY_P="${P%%-*}-${P##*-}"
+
+SRC_URI="http://hollandbackup.org/releases/stable/${PV%.*}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+PDEPEND="~app-backup/holland-${PV}[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}/plugins/${PN//-/.}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	keepdir /etc/holland
+	keepdir /etc/holland/backupsets
+	keepdir /etc/holland/providers
+
+	insinto /etc/holland/backupsets
+	doins "${S}"/../../config/backupsets/examples/${PN##*-}.conf
+
+	insinto /etc/holland/providers
+	doins "${S}"/../../config/providers/${PN##*-}.conf
+}
diff --git a/app-backup/holland-backup-example/metadata.xml b/app-backup/holland-backup-example/metadata.xml
new file mode 100644
index 000000000000..7a38bb900964
--- /dev/null
+++ b/app-backup/holland-backup-example/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-backup/holland-backup-pgdump-1.0.10 b/app-backup/holland-backup-pgdump-1.0.10
deleted file mode 100644
index 35854e8ea111..000000000000
--- a/app-backup/holland-backup-pgdump-1.0.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Holland pgdump Plugin
-EAPI=5
-HOMEPAGE=http://www.hollandbackup.org/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=~app-backup/holland-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-RDEPEND=~app-backup/holland-lib-common-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/psycopg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://hollandbackup.org/releases/stable/1.0/holland-1.0.10.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f20c4732dfeb74ba12b441b9b9698624
diff --git a/app-backup/holland-backup-pgdump/Manifest b/app-backup/holland-backup-pgdump/Manifest
new file mode 100644
index 000000000000..e77005288c52
--- /dev/null
+++ b/app-backup/holland-backup-pgdump/Manifest
@@ -0,0 +1,3 @@
+DIST holland-1.0.10.tar.gz 449334 BLAKE2B 0b0290b916448be1865ff2b5c2f0e78de9c4640418fc049b999f5dd171d8fa54c63411b5b8972c843d98f77e6b9726dbc849cb73d3771244e871bb9fea67652a SHA512 5183ec73012edcaba50ef5cc9b892480d5f60301d01d17bd96c5490bd8e6ae42bd21abb6084e6665317b8025489981a02293cd583964f01e86459609b93e918f
+EBUILD holland-backup-pgdump-1.0.10.ebuild 854 BLAKE2B 7c4a04c39c38015cd03db694cf4c1c652f4a5a0c4e36f9571978a3a267c09c4e2716281773f72cefc6753676ab9f29aff752053a93b86500e4d3109b396ddd4b SHA512 6403157e9f8ccd422f1e035f48048989030108469379045dfce187974846db92d8181df4f3bc8b904a787c1b692f101d950edf305284285cc7e9e906bf38e4ba
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-backup/holland-backup-pgdump/holland-backup-pgdump-1.0.10.ebuild b/app-backup/holland-backup-pgdump/holland-backup-pgdump-1.0.10.ebuild
new file mode 100644
index 000000000000..63609d1a9966
--- /dev/null
+++ b/app-backup/holland-backup-pgdump/holland-backup-pgdump-1.0.10.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Holland pgdump Plugin"
+HOMEPAGE="http://www.hollandbackup.org/"
+
+MY_P="${P%%-*}-${P##*-}"
+
+SRC_URI="http://hollandbackup.org/releases/stable/${PV%.*}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	~app-backup/holland-lib-common-${PV}[${PYTHON_USEDEP}]
+	dev-python/psycopg[${PYTHON_USEDEP}]
+"
+PDEPEND="~app-backup/holland-${PV}[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}/plugins/${PN//-/.}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	keepdir /etc/holland
+	keepdir /etc/holland/providers
+
+	insinto /etc/holland/providers
+	doins "${S}"/../../config/providers/${PN##*-}.conf
+}
diff --git a/app-backup/holland-backup-pgdump/metadata.xml b/app-backup/holland-backup-pgdump/metadata.xml
new file mode 100644
index 000000000000..7a38bb900964
--- /dev/null
+++ b/app-backup/holland-backup-pgdump/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-backup/holland-backup-random-1.0.10 b/app-backup/holland-backup-random-1.0.10
deleted file mode 100644
index 59ce888f05c8..000000000000
--- a/app-backup/holland-backup-random-1.0.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Holland Random Plugin
-EAPI=5
-HOMEPAGE=http://www.hollandbackup.org/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=~app-backup/holland-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://hollandbackup.org/releases/stable/1.0/holland-1.0.10.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d94e51417dcb2846926819b89073b2ed
diff --git a/app-backup/holland-backup-random/Manifest b/app-backup/holland-backup-random/Manifest
new file mode 100644
index 000000000000..563978e1b6e0
--- /dev/null
+++ b/app-backup/holland-backup-random/Manifest
@@ -0,0 +1,3 @@
+DIST holland-1.0.10.tar.gz 449334 BLAKE2B 0b0290b916448be1865ff2b5c2f0e78de9c4640418fc049b999f5dd171d8fa54c63411b5b8972c843d98f77e6b9726dbc849cb73d3771244e871bb9fea67652a SHA512 5183ec73012edcaba50ef5cc9b892480d5f60301d01d17bd96c5490bd8e6ae42bd21abb6084e6665317b8025489981a02293cd583964f01e86459609b93e918f
+EBUILD holland-backup-random-1.0.10.ebuild 888 BLAKE2B b605414817799f9418f7062772e4ba6fd007eb5bc0bccc4f54cb5f5cb78461e2e9211d9f2003b8271366e610686ee83d079e8e094e013e0ac8500c1c07961d65 SHA512 84df887af065566efcedd8fe4358d2b4033445cbbb30cd941497a2dadc051c0edfc57d935f212df51b0a01c309cbb5eb362ac5588c77fd604dad0cdcb13a2540
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-backup/holland-backup-random/holland-backup-random-1.0.10.ebuild b/app-backup/holland-backup-random/holland-backup-random-1.0.10.ebuild
new file mode 100644
index 000000000000..c0c5500161e2
--- /dev/null
+++ b/app-backup/holland-backup-random/holland-backup-random-1.0.10.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Holland Random Plugin"
+HOMEPAGE="http://www.hollandbackup.org/"
+
+MY_P="${P%%-*}-${P##*-}"
+
+SRC_URI="http://hollandbackup.org/releases/stable/${PV%.*}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+PDEPEND="~app-backup/holland-${PV}[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}/plugins/${PN//-/.}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	keepdir /etc/holland
+	keepdir /etc/holland/backupsets
+	keepdir /etc/holland/providers
+
+	insinto /etc/holland/backupsets
+	doins "${S}"/../../config/backupsets/examples/${PN##*-}.conf
+
+	insinto /etc/holland/providers
+	doins "${S}"/../../config/providers/${PN##*-}.conf
+}
diff --git a/app-backup/holland-backup-random/metadata.xml b/app-backup/holland-backup-random/metadata.xml
new file mode 100644
index 000000000000..7a38bb900964
--- /dev/null
+++ b/app-backup/holland-backup-random/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-backup/holland-backup-sqlite-1.0.10 b/app-backup/holland-backup-sqlite-1.0.10
deleted file mode 100644
index ef022b8b033f..000000000000
--- a/app-backup/holland-backup-sqlite-1.0.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Holland sqlite Plugin
-EAPI=5
-HOMEPAGE=http://www.hollandbackup.org/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=~app-backup/holland-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-RDEPEND=~app-backup/holland-lib-common-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://hollandbackup.org/releases/stable/1.0/holland-1.0.10.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cda5ed2e673393144b38f2dfbc36baa2
diff --git a/app-backup/holland-backup-sqlite/Manifest b/app-backup/holland-backup-sqlite/Manifest
new file mode 100644
index 000000000000..52d3d95f61e5
--- /dev/null
+++ b/app-backup/holland-backup-sqlite/Manifest
@@ -0,0 +1,3 @@
+DIST holland-1.0.10.tar.gz 449334 BLAKE2B 0b0290b916448be1865ff2b5c2f0e78de9c4640418fc049b999f5dd171d8fa54c63411b5b8972c843d98f77e6b9726dbc849cb73d3771244e871bb9fea67652a SHA512 5183ec73012edcaba50ef5cc9b892480d5f60301d01d17bd96c5490bd8e6ae42bd21abb6084e6665317b8025489981a02293cd583964f01e86459609b93e918f
+EBUILD holland-backup-sqlite-1.0.10.ebuild 942 BLAKE2B 0e8981cb114af2e3f0d4c8d8eebc36f581d993b9327f8b144dab74dc3e4d1bee20a13e813b89b8e7721c84d89f3b720b4a694c8cea9152becb72f4cef2b2af0b SHA512 e53b99ff92a6f3426ec972a3fcfefd9740d34b4b9cd9abf07ed5a93a3bb8dd89a5a28dfb36058a186039d9bf798f36c071f86ff30fb49c099e04702bd63c787e
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-backup/holland-backup-sqlite/holland-backup-sqlite-1.0.10.ebuild b/app-backup/holland-backup-sqlite/holland-backup-sqlite-1.0.10.ebuild
new file mode 100644
index 000000000000..cdb9d844719b
--- /dev/null
+++ b/app-backup/holland-backup-sqlite/holland-backup-sqlite-1.0.10.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Holland sqlite Plugin"
+HOMEPAGE="http://www.hollandbackup.org/"
+
+MY_P="${P%%-*}-${P##*-}"
+
+SRC_URI="http://hollandbackup.org/releases/stable/${PV%.*}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="~app-backup/holland-lib-common-${PV}[${PYTHON_USEDEP}]"
+PDEPEND="~app-backup/holland-${PV}[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}/plugins/${PN//-/.}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	keepdir /etc/holland
+	keepdir /etc/holland/backupsets
+	keepdir /etc/holland/providers
+
+	insinto /etc/holland/backupsets
+	doins "${S}"/../../config/backupsets/examples/${PN##*-}.conf
+
+	insinto /etc/holland/providers
+	doins "${S}"/../../config/providers/${PN##*-}.conf
+}
diff --git a/app-backup/holland-backup-sqlite/metadata.xml b/app-backup/holland-backup-sqlite/metadata.xml
new file mode 100644
index 000000000000..7a38bb900964
--- /dev/null
+++ b/app-backup/holland-backup-sqlite/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-backup/holland-lib-common-1.0.10 b/app-backup/holland-lib-common-1.0.10
deleted file mode 100644
index 950e4832bdc9..000000000000
--- a/app-backup/holland-lib-common-1.0.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Holland Core Library
-EAPI=5
-HOMEPAGE=http://www.hollandbackup.org/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=~app-backup/holland-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://hollandbackup.org/releases/stable/1.0/holland-1.0.10.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3c58f13ac52095bff02ef2c9da75d150
diff --git a/app-backup/holland-lib-common/Manifest b/app-backup/holland-lib-common/Manifest
new file mode 100644
index 000000000000..6d16667dff0e
--- /dev/null
+++ b/app-backup/holland-lib-common/Manifest
@@ -0,0 +1,3 @@
+DIST holland-1.0.10.tar.gz 449334 BLAKE2B 0b0290b916448be1865ff2b5c2f0e78de9c4640418fc049b999f5dd171d8fa54c63411b5b8972c843d98f77e6b9726dbc849cb73d3771244e871bb9fea67652a SHA512 5183ec73012edcaba50ef5cc9b892480d5f60301d01d17bd96c5490bd8e6ae42bd21abb6084e6665317b8025489981a02293cd583964f01e86459609b93e918f
+EBUILD holland-lib-common-1.0.10.ebuild 559 BLAKE2B 8dc0493c9c78b0864eb89c5c91c50c4c495891ddfa50acd449d6606ff467159272efa1d9e6ad6351a8d536dcd12bd75cd6ff148dd76178828bb6c7b446810c28 SHA512 942ac17570a3f255a44c7bb072b5a674f3f1f4461d382861a044c70b6937105eaed4c8267d374a48201e7a4464b6e3e23592402969ad19cef4d09aa00a79db9f
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-backup/holland-lib-common/holland-lib-common-1.0.10.ebuild b/app-backup/holland-lib-common/holland-lib-common-1.0.10.ebuild
new file mode 100644
index 000000000000..0bcc8c88bfb8
--- /dev/null
+++ b/app-backup/holland-lib-common/holland-lib-common-1.0.10.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Holland Core Library"
+HOMEPAGE="http://www.hollandbackup.org/"
+
+MY_P="${P%%-*}-${P##*-}"
+
+SRC_URI="http://hollandbackup.org/releases/stable/${PV%.*}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+PDEPEND="~app-backup/holland-${PV}[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}/plugins/${PN//-/.}"
diff --git a/app-backup/holland-lib-common/metadata.xml b/app-backup/holland-lib-common/metadata.xml
new file mode 100644
index 000000000000..7a38bb900964
--- /dev/null
+++ b/app-backup/holland-lib-common/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-backup/holland-lib-lvm-1.0.10 b/app-backup/holland-lib-lvm-1.0.10
deleted file mode 100644
index 427393aa25c1..000000000000
--- a/app-backup/holland-lib-lvm-1.0.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Holland LVM Library
-EAPI=5
-HOMEPAGE=http://www.hollandbackup.org
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=~app-backup/holland-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://hollandbackup.org/releases/stable/1.0/holland-1.0.10.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=38ee29ab792df5a754296120689ecd76
diff --git a/app-backup/holland-lib-lvm/Manifest b/app-backup/holland-lib-lvm/Manifest
new file mode 100644
index 000000000000..15aabb534ca9
--- /dev/null
+++ b/app-backup/holland-lib-lvm/Manifest
@@ -0,0 +1,3 @@
+DIST holland-1.0.10.tar.gz 449334 BLAKE2B 0b0290b916448be1865ff2b5c2f0e78de9c4640418fc049b999f5dd171d8fa54c63411b5b8972c843d98f77e6b9726dbc849cb73d3771244e871bb9fea67652a SHA512 5183ec73012edcaba50ef5cc9b892480d5f60301d01d17bd96c5490bd8e6ae42bd21abb6084e6665317b8025489981a02293cd583964f01e86459609b93e918f
+EBUILD holland-lib-lvm-1.0.10.ebuild 557 BLAKE2B 7149fdd1a26c983bf7c79bb5953f8b5f695c61d42484e978f40735ae742c0e33ef84a2d0657ed1560deec20d4173b0d1b82de44efa3a3e97df738109e9db2b61 SHA512 8747a20afab4defb9196a8f4a2f6f376d726b8f2015a8b87255be552e6b9f2110ccf11d23f9f9ef30b79e3b8f2465aceaef71cb7748c1061892312b788a9980c
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-backup/holland-lib-lvm/holland-lib-lvm-1.0.10.ebuild b/app-backup/holland-lib-lvm/holland-lib-lvm-1.0.10.ebuild
new file mode 100644
index 000000000000..311e601e857b
--- /dev/null
+++ b/app-backup/holland-lib-lvm/holland-lib-lvm-1.0.10.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Holland LVM Library"
+HOMEPAGE="http://www.hollandbackup.org"
+
+MY_P="${P%%-*}-${P##*-}"
+
+SRC_URI="http://hollandbackup.org/releases/stable/${PV%.*}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+PDEPEND="~app-backup/holland-${PV}[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}/plugins/${PN//-/.}"
diff --git a/app-backup/holland-lib-lvm/metadata.xml b/app-backup/holland-lib-lvm/metadata.xml
new file mode 100644
index 000000000000..7a38bb900964
--- /dev/null
+++ b/app-backup/holland-lib-lvm/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-backup/holland/Manifest b/app-backup/holland/Manifest
new file mode 100644
index 000000000000..ec71f3cd2eec
--- /dev/null
+++ b/app-backup/holland/Manifest
@@ -0,0 +1,3 @@
+DIST holland-1.0.10.tar.gz 449334 BLAKE2B 0b0290b916448be1865ff2b5c2f0e78de9c4640418fc049b999f5dd171d8fa54c63411b5b8972c843d98f77e6b9726dbc849cb73d3771244e871bb9fea67652a SHA512 5183ec73012edcaba50ef5cc9b892480d5f60301d01d17bd96c5490bd8e6ae42bd21abb6084e6665317b8025489981a02293cd583964f01e86459609b93e918f
+EBUILD holland-1.0.10.ebuild 1410 BLAKE2B 36043bafe9690314d43c2add28a61014e1324bff1029371d799d9cf32d9d4e2324d4fba4fdf82961cf88d6651ea96db01dfe9aa1e997f0b2821b087de881c1b3 SHA512 d1ed02610f3eb782014988467af619094a7c10856f20329d797ca19a06404f0ca3318439d3e6ba472991266c65fd329f5e458e88ccb18903e202a6615033f1b0
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-backup/holland/holland-1.0.10.ebuild b/app-backup/holland/holland-1.0.10.ebuild
new file mode 100644
index 000000000000..93923b276ab7
--- /dev/null
+++ b/app-backup/holland/holland-1.0.10.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Holland Core Plugins"
+HOMEPAGE="http://www.hollandbackup.org/"
+SRC_URI="http://hollandbackup.org/releases/stable/${PV%.*}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples +mysql postgres sqlite"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+	mysql? ( ~app-backup/holland-backup-mysql-meta-${PV}[${PYTHON_USEDEP}] )
+	postgres? ( ~app-backup/holland-backup-pgdump-${PV}[${PYTHON_USEDEP}] )
+	sqlite? ( ~app-backup/holland-backup-sqlite-${PV}[${PYTHON_USEDEP}] )
+	examples? (
+		~app-backup/holland-backup-example-${PV}[${PYTHON_USEDEP}]
+		~app-backup/holland-backup-random-${PV}[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local DOCS=( README config/README config/providers/README docs/man/README docs/man/holland.rst )
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+
+	keepdir /var/log/holland
+
+	keepdir /etc/holland
+	keepdir /etc/holland/backupsets
+	keepdir /etc/holland/providers
+
+	insinto /etc/holland
+	doins config/holland.conf
+
+	insinto /etc/holland/backupsets
+	doins config/backupsets/default.conf
+
+	doman docs/man/holland.1
+}
diff --git a/app-backup/holland/metadata.xml b/app-backup/holland/metadata.xml
new file mode 100644
index 000000000000..7a38bb900964
--- /dev/null
+++ b/app-backup/holland/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-backup/kfoldersync-3.4.1 b/app-backup/kfoldersync-3.4.1
deleted file mode 100644
index aff9c90635f9..000000000000
--- a/app-backup/kfoldersync-3.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Folder synchronization and backup tool based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.linux-apps.com/p/1127677/
-IUSE=debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-3
-RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=https://dl.opendesktop.org/api/files/download/id/1485353737/kfoldersync-3.4.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=385cf950f892f1ef07dbe0557526c425
diff --git a/app-backup/kfoldersync/Manifest b/app-backup/kfoldersync/Manifest
new file mode 100644
index 000000000000..184192259789
--- /dev/null
+++ b/app-backup/kfoldersync/Manifest
@@ -0,0 +1,3 @@
+DIST kfoldersync-3.4.1.tar.xz 49308 BLAKE2B b2d928d7b4111d69f9fdf28efcddb72da715b6bc143d94cc6d37fd8e5888f5ebd70d11e57a1cdce046ced7f55b6ba4a3da9d64947928d60ddb560b593af9a996 SHA512 b51c005942f0627f8ab3428e860c5f336df0282fd3dc184cac6897755a740ca873241e63828b1af7704b373e0a92de1a4bd9dbe8db3b7a35fbbafc2a509603d0
+EBUILD kfoldersync-3.4.1.ebuild 865 BLAKE2B 436bbf8c3247395fef9212111163d5c13c4b9d8dd19931c6e0d27cd32c301b02823c118e9231f57906101bb3e0d1c075b4fcefc3842d10265ba8de1bc571b0e0 SHA512 b390a643bdd2ebc2cc362803a445d53b9d12612ec60c82d932222f8ab75c9a03b5ecb777782780e5d0f1f76cc88e8b4baa4ff156b99d85b57e7c79df2a2b617d
+MISC metadata.xml 521 BLAKE2B c1b348ed6b4d0ec451a6da0508000c2f67a56f41e7c85c80535fdcd87e7fcc16b91efa957052e82f4cde5e44a5147410b0c5a7b22a51a09a893d6eb887682de2 SHA512 23ce04633c404da4e581a1931230ccff3069093280a0e049b2612f881005296c358f4c01d8ab9fcc344a176d143b9dbd87b5218204a7eace67fc2ea55f8b7d61
diff --git a/app-backup/kfoldersync/kfoldersync-3.4.1.ebuild b/app-backup/kfoldersync/kfoldersync-3.4.1.ebuild
new file mode 100644
index 000000000000..9732856b2334
--- /dev/null
+++ b/app-backup/kfoldersync/kfoldersync-3.4.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_GCC_MINIMAL="5.1"
+inherit kde5
+
+DESCRIPTION="Folder synchronization and backup tool based on KDE Frameworks"
+HOMEPAGE="https://www.linux-apps.com/p/1127677/"
+SRC_URI="https://dl.opendesktop.org/api/files/download/id/1485353737/${P}.tar.xz"
+
+LICENSE="GPL-3"
+KEYWORDS="amd64 ~arm x86"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
diff --git a/app-backup/kfoldersync/metadata.xml b/app-backup/kfoldersync/metadata.xml
new file mode 100644
index 000000000000..14c1d660333e
--- /dev/null
+++ b/app-backup/kfoldersync/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<maintainer status="active">
+			<email>vindex17@outlook.it</email>
+			<name>Lorenzo Porta</name>
+		</maintainer>
+		<changelog>https://build.opensuse.org/package/view_file/home:Vindex17:myapps/kfoldersync/kfoldersync.changes?expand=1</changelog>
+	</upstream>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-backup/luckybackup-0.4.9 b/app-backup/luckybackup-0.4.9
deleted file mode 100644
index 49d4c6177b95..000000000000
--- a/app-backup/luckybackup-0.4.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
-DESCRIPTION=Powerful and flexible backup (and syncing) tool, using RSync and Qt
-EAPI=6
-HOMEPAGE=http://luckybackup.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-misc/rsync
-SLOT=0
-SRC_URI=mirror://sourceforge/luckybackup/luckybackup-0.4.9.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=ae9a7cb8c2fe9005db05bbed19c77053
diff --git a/app-backup/luckybackup/Manifest b/app-backup/luckybackup/Manifest
new file mode 100644
index 000000000000..8ba05fa49307
--- /dev/null
+++ b/app-backup/luckybackup/Manifest
@@ -0,0 +1,3 @@
+DIST luckybackup-0.4.9.tar.gz 5954338 BLAKE2B 632738f8c422ba7d56536fae866ce31d224910b41495e4df3be28a8013ba776e30b4d8e70ceb26c92d28aaf70c96402f27687c55d8f5d7aa5d405bab506a66be SHA512 86d6f1bd84f3bfd89734f0f2066cb17bbf9b4ede96167398de03a460c14d24bf4b50a91bb380655ace9a23497271e102b940ea99a7595cf17f596660dae7f7dd
+EBUILD luckybackup-0.4.9.ebuild 1442 BLAKE2B 07b9b559b32179733248d205b862f5e4eb1e4ccbf1e4fcd6ea63a0c07ffee7436055236bfc12fcc9aebfacd53b279379c1a0ee3d4d132fb892679f3cc338da4a SHA512 68d4d5e8b5d70b1b2a20471e97c65459969d2f7486fe700e1e18031c68eb612776970a2ac411b17cf8bc83e34e51dd87175bbfd62b405cbedecd32499eaf8cb8
+MISC metadata.xml 328 BLAKE2B b41ac27e6b5c14d5c6bf9df4a47291ffe57bc679b06ab27b3cf9135be123195a161be705ffd2349f3cc4a5f618c2e75740a677696afa244a3a3716be625aa223 SHA512 64415b71b483e93f41d75f858bbdbce2c612b5e7c37753237d7c2374b1bb2bd2d30a86d18b32f5ac015e15c57e94553019756d2cc6021c803d25da527929ddeb
diff --git a/app-backup/luckybackup/luckybackup-0.4.9.ebuild b/app-backup/luckybackup/luckybackup-0.4.9.ebuild
new file mode 100644
index 000000000000..eab1f1a17131
--- /dev/null
+++ b/app-backup/luckybackup/luckybackup-0.4.9.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="Powerful and flexible backup (and syncing) tool, using RSync and Qt"
+HOMEPAGE="http://luckybackup.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	net-misc/rsync"
+
+DOCS=( readme/{AUTHORS,README,TODO,TRANSLATIONS,changelog} )
+
+src_prepare() {
+	sed -i \
+		-e "s:/usr/share/doc/${PN}:/usr/share/doc/${PF}:g" \
+		-e "s:/usr/share/doc/packages/${PN}:/usr/share/doc/${PF}:g" \
+		luckybackup.pro src/global.cpp || die "sed failed"
+
+	# The su-to-root command is an ubuntu-specific script so it will
+	# not work with Gentoo. No reason to have it anyway.
+	sed -i -e "/^Exec/s:=.*:=/usr/bin/${PN}:" menu/${PN}-gnome-su.desktop \
+		|| die "failed to remove su-to-root"
+
+	# causes empty directory to be installed
+	sed -i -e '/^INSTALLS/s/debianmenu //' luckybackup.pro \
+		|| die "sed installs failed"
+
+	# bogus dependency - bug #645732
+	sed -i -e '/QT += network/s/^/#/' luckybackup.pro || die
+
+	# remove text version - cannot remote HTML version
+	# as it's used within the application
+	rm license/gpl.txt || die "rm failed"
+
+	default
+}
+
+src_configure() {
+	eqmake5 ${PN}.pro
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
diff --git a/app-backup/luckybackup/metadata.xml b/app-backup/luckybackup/metadata.xml
new file mode 100644
index 000000000000..06fb30b44cd1
--- /dev/null
+++ b/app-backup/luckybackup/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">luckybackup</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-backup/metadata.xml b/app-backup/metadata.xml
new file mode 100644
index 000000000000..291110abf582
--- /dev/null
+++ b/app-backup/metadata.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The app-backup category contains tools for performing backups of data,
+		including both full and incremental backups, as well as backups to other
+		media (CD-R, Tape, etc.).
+	</longdescription>
+	<longdescription lang="ja">
+		app-backupカテゴリにはデータバックアップ(充実と増分)を実行すると
+		メディア(CD-R、テープ…)にバックアップするツールが含まれます。
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm app-backup chứa các công cụ để sao lưu dữ liệu, bao gồm
+		sao lưu toàn bộ và sao lưu tăng tiến, cũng như sao lưu ra các phương
+		tiện khác (CD-R, băng từ ...).
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie app-backup enthält Programme zur Erstellung inkrementeller und
+		vollständiger Backups, sowie zur Sicherung auf andere Medien (CD-R, Band, etc.).
+	</longdescription>
+	<longdescription lang="it">
+		La categoria app-backup contiene strumenti per il backup dei dati, incluso
+		backup completo o incrementale, come backup su altri media (CD-R, nastri, ecc.).
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria app-backup contém ferramentas para fazer backup de dados,
+		incluindo tanto backups completos como incrementais, bem como backups
+		para outras mídias (CD-R, Fita, etc.).
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria app-backup zawiera programy służące do tworzenia pełnych i
+		przyrostowych kopii zapasowych danych oraz do zapisywania
+		ich na inne nośniki danych (jak płyty CD-R, taśmy etc.).
+	</longdescription>
+	<longdescription lang="es">
+		La categoría app-backup contiene herramientas para realizar copias
+		de respaldo de datos, incluyendo copias completas e incrementales,
+		así como respaldos realizados a otros medios (CD-R, cinta, etc.).
+	</longdescription>
+</catmetadata>
+
diff --git a/app-backup/mirdir-2.1-r2 b/app-backup/mirdir-2.1-r2
deleted file mode 100644
index d57868033af8..000000000000
--- a/app-backup/mirdir-2.1-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Synchronize two directory trees in a fast way
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/mirdir/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/mirdir/mirdir-2.1-Unix.tar.gz
-_md5_=ec7a0d9293e290c683ef871768656723
diff --git a/app-backup/mirdir/Manifest b/app-backup/mirdir/Manifest
new file mode 100644
index 000000000000..c31a864fcbb2
--- /dev/null
+++ b/app-backup/mirdir/Manifest
@@ -0,0 +1,3 @@
+DIST mirdir-2.1-Unix.tar.gz 74002 BLAKE2B e9a22bbdae1e2502ffb3bff09f56aa546b79d1847d1e2081ebb262bc9601d1e1e3e48ded45db7e6adb657d2b491b9615974a740be630a277094a66bf4bcbfeaf SHA512 d99cbc04a5d99a739c16fea9198d92cd0209fb5fd4fc931eb2af2bb6c0c0ddcec3c34a27269bf108d7ffebcf760c9817088ea2091abbe9d3c4e932724e85c680
+EBUILD mirdir-2.1-r2.ebuild 532 BLAKE2B 786a3812122bc7be09799b9c2a3f0aef59e418bcec7afb9d75445cf4d02387aea8e5f2cf20521151a76c37d86c11e2f2609001917a435c74225835978cd7118f SHA512 42169eacbd465854f7ae69f0187b5bc1e6dd736d678fce77d2ae56bca1be6312e73fcc0c21e0763f75aa490d18f1139086dcd8c75e68afe8447cabf88d592736
+MISC metadata.xml 336 BLAKE2B f87b752a398bae78b6f2d8878143d8843cd8643c04b66b3e64d405ef8bc2a7bce301b9bd17b2e86fd6fbb309e9bdd71fa23181a9c8afc4b3c0e8a3b78d334fa9 SHA512 61218d2351264fd28d3f17040748268825b5a3b21f48c38bd0865b5e4c743783d74ea21617c5d3c92d205ff044b3b5e0aa09b7a30d48fd37cb675450a6c46831
diff --git a/app-backup/mirdir/metadata.xml b/app-backup/mirdir/metadata.xml
new file mode 100644
index 000000000000..5f01d58eb176
--- /dev/null
+++ b/app-backup/mirdir/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>robbat2@gentoo.org</email>
+    <name>Robin H. Johnson</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">mirdir</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-backup/mirdir/mirdir-2.1-r2.ebuild b/app-backup/mirdir/mirdir-2.1-r2.ebuild
new file mode 100644
index 000000000000..97c44d1b6321
--- /dev/null
+++ b/app-backup/mirdir/mirdir-2.1-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Synchronize two directory trees in a fast way"
+HOMEPAGE="https://sourceforge.net/projects/mirdir/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-Unix.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${P}-UNIX"
+
+src_prepare() {
+	default
+	# Disable stripping, bug 239939
+	sed -i -e 's:strip .*::' Makefile.in || die
+}
+
+src_install() {
+	dobin "bin/${PN}"
+	doman "${PN}.1"
+	einstalldocs
+}
diff --git a/app-backup/mkstage4-0.1 b/app-backup/mkstage4-0.1
deleted file mode 100644
index 286de78e1d7b..000000000000
--- a/app-backup/mkstage4-0.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Bash Utility for Creating Stage 4 Tarballs
-EAPI=6
-HOMEPAGE=https://github.com/TheChymera/mkstage4
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=app-shells/bash app-arch/tar
-SLOT=0
-SRC_URI=https://github.com/TheChymera/mkstage4/archive/0.1.tar.gz -> mkstage4-0.1.tar.gz
-_md5_=be4eb44ded36f0719452e33632f5bdab
diff --git a/app-backup/mkstage4-9999 b/app-backup/mkstage4-9999
deleted file mode 100644
index 626a90a4ac78..000000000000
--- a/app-backup/mkstage4-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Bash Utility for Creating Stage 4 Tarballs
-EAPI=6
-HOMEPAGE=https://github.com/TheChymera/mkstage4
-LICENSE=GPL-3
-RDEPEND=app-shells/bash app-arch/tar
-SLOT=0
-_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b
-_md5_=7b0983df0b48ef5140d312cdb36dd359
diff --git a/app-backup/mkstage4/Manifest b/app-backup/mkstage4/Manifest
new file mode 100644
index 000000000000..36d4a27f6a8c
--- /dev/null
+++ b/app-backup/mkstage4/Manifest
@@ -0,0 +1,4 @@
+DIST mkstage4-0.1.tar.gz 15220 BLAKE2B 43f091615d4fbb19495c2103729556ec307501f93c60bd0df676f710868d932dc7bb7e0a1c2f6613d0cc2edc266f9b9f7b74e534e84a7d41a4bf4f66c09f98e4 SHA512 e42d23ffe214c9fef8dde94f8b8faa32490e9e553f182f042a2c4d713a72031c9560e291b6231a0ced812e43f80a58cb3fa5bfdc4ad7e132d7ea7c74525d64c5
+EBUILD mkstage4-0.1.ebuild 459 BLAKE2B 7bfa3edfb99837f99eec51dee1e70fc6754097c01e05afae9cae5721fecc285d3c8d503769062a60f28d631e3d709ef0b6495e70d0134da861507ba335a5ac97 SHA512 2568f56448c7a430a4df279550821c55ad50b5f46bd7b17d1188e411393949c557cab846975d09f1c4fbf09896408e0c34dad4df53ba0e2d6045575532b0b05d
+EBUILD mkstage4-9999.ebuild 440 BLAKE2B 9663bbe0c3a0bbf346fb91345a647ec2d9597f4890f625424ba8efbbad4a2835233590cca543ef68763ed6b4e8d416ac0e36e8a736084902488b6191f1864b31 SHA512 ce683de171866c996a6d3ae269cd3e74adc11203bc42d03f15e79935ee3315dc8c4795fc36ebdabfe4329b1ffadc93ea9ba680bf890b2b43d5fa24d9357f079a
+MISC metadata.xml 707 BLAKE2B 03820bb993e66eae180233f519ace9f0eb69fa4dc9e6202967a54f87931d104d0d1c67f4c00256ebb969712347b4e49384fc7a12003772ea8f5e96bcefdda574 SHA512 a3271d39d05e3c63a703bfe268b1094545cd3900cf0e04fa196d1c611bbb2376fed3c7b61f7626810d794eb0cce8b2bf73c380b81b79e0ff91cfcfec3e34025e
diff --git a/app-backup/mkstage4/metadata.xml b/app-backup/mkstage4/metadata.xml
new file mode 100644
index 000000000000..352e903207e7
--- /dev/null
+++ b/app-backup/mkstage4/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>horea.christ@gmail.com</email>
+		<name>Horea Christian</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		This is a bash script to create stage 4 tarballs either for the 
+		running system, or a system at a specified mount point. It is 
+		highly parameterized allowing the exclusion of sensitive user
+		data.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">TheChymera/mkstage4</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-backup/mkstage4/mkstage4-0.1.ebuild b/app-backup/mkstage4/mkstage4-0.1.ebuild
new file mode 100644
index 000000000000..10464eafc25b
--- /dev/null
+++ b/app-backup/mkstage4/mkstage4-0.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Bash Utility for Creating Stage 4 Tarballs"
+HOMEPAGE="https://github.com/TheChymera/mkstage4"
+SRC_URI="https://github.com/TheChymera/mkstage4/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-shells/bash
+	app-arch/tar"
+
+src_install() {
+	newbin mkstage4.sh mkstage4
+}
diff --git a/app-backup/mkstage4/mkstage4-9999.ebuild b/app-backup/mkstage4/mkstage4-9999.ebuild
new file mode 100644
index 000000000000..6cb479448e6a
--- /dev/null
+++ b/app-backup/mkstage4/mkstage4-9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit git-r3
+
+DESCRIPTION="Bash Utility for Creating Stage 4 Tarballs"
+HOMEPAGE="https://github.com/TheChymera/mkstage4"
+EGIT_REPO_URI="https://github.com/TheChymera/${PN}.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-shells/bash
+	app-arch/tar"
+
+src_install() {
+	newbin mkstage4.sh mkstage4
+}
diff --git a/app-backup/mylvmbackup-0.14 b/app-backup/mylvmbackup-0.14
deleted file mode 100644
index adf862749930..000000000000
--- a/app-backup/mylvmbackup-0.14
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Tool for creating backups of MySQL server's data files using LVM snapshots
-EAPI=6
-HOMEPAGE=http://lenzg.net/mylvmbackup/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-perl/Config-IniFiles dev-perl/DBD-mysql dev-perl/TimeDate >=sys-fs/lvm2-2.02.06 virtual/mysql
-SLOT=0
-SRC_URI=http://lenzg.net/mylvmbackup/mylvmbackup-0.14.tar.gz
-_md5_=75dba05a6947cda2f5f5990486df5acb
diff --git a/app-backup/mylvmbackup/Manifest b/app-backup/mylvmbackup/Manifest
new file mode 100644
index 000000000000..3b8f1ba309f2
--- /dev/null
+++ b/app-backup/mylvmbackup/Manifest
@@ -0,0 +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 678 BLAKE2B b879f2a7701675784b211f3586f929246cdb45dcd2a205578a941f8b5a9f937cfdc39d6788ebc72e36ebef417a6fbffa6c07737dc981ab8659b85c424aa52d48 SHA512 0393f91e96ee75b9320e7b6ec4aa3d040b48a00542e3448f5a666d7a7bca512772b082d986f4796ee477baf2e99bc373c84aced40af433e28f1f45be7d8b3684
+MISC metadata.xml 250 BLAKE2B fe89695d5dcb55e3a59fe901cba061e1b73e5d09cc72d362bb3ec127aecdba741ba23920096bfad7a39c43e35ffbc006fe84f3e50a34c91097a32deceeb91e84 SHA512 c599b09b9aaf744dfe13d0707adde7d3dfd1a8a411e937fcba25e65c6045792cdcf6ceb9004e3dd38b014c486c9f1334bfc898419f59806ec6abebfc71bca382
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/metadata.xml b/app-backup/mylvmbackup/metadata.xml
new file mode 100644
index 000000000000..4073267daf2a
--- /dev/null
+++ b/app-backup/mylvmbackup/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-backup/mylvmbackup/mylvmbackup-0.14.ebuild b/app-backup/mylvmbackup/mylvmbackup-0.14.ebuild
new file mode 100644
index 000000000000..77f80942fdf2
--- /dev/null
+++ b/app-backup/mylvmbackup/mylvmbackup-0.14.ebuild
@@ -0,0 +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
+	dev-perl/DBD-mysql
+	dev-perl/TimeDate
+	>=sys-fs/lvm2-2.02.06
+	virtual/mysql"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.14-fix-build-system.patch
+	"${FILESDIR}"/${PN}-0.14-fix-config.patch
+)
+
+src_install() {
+	default
+
+	keepdir /var/tmp/${PN}/{backup,mnt}
+	fperms 0700 /var/tmp/${PN}/
+}
diff --git a/app-backup/pdumpfs-1.3-r2 b/app-backup/pdumpfs-1.3-r2
deleted file mode 100644
index 78986cd3de31..000000000000
--- a/app-backup/pdumpfs-1.3-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/ruby-2.0.0_p598
-DESCRIPTION=A daily backup system similar to Plan9's dumpfs
-EAPI=5
-HOMEPAGE=http://0xcc.net/pdumpfs/
-IUSE=l10n_ja
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://0xcc.net/pdumpfs/pdumpfs-1.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ad3b9ea50c4db11d7104c66f42a71876
diff --git a/app-backup/pdumpfs/Manifest b/app-backup/pdumpfs/Manifest
new file mode 100644
index 000000000000..a68091d6e62c
--- /dev/null
+++ b/app-backup/pdumpfs/Manifest
@@ -0,0 +1,5 @@
+AUX pdumpfs-in.patch 977 BLAKE2B 5be9f88f6af0dc051c856da71c4cb4fc3d52f610ec0cedb0364b0d59d01925bcda9ab7c5872c0fe87e8aa9ba07a4d284adb90b382d6b92b480aa64cce1a4b00f SHA512 3d45d5ecbf2e3af71ae80de28c8cedc46b5ea2f7d0e9f6ea58c4154e477db8375f21587ebc4cade04b353e5a0552620790a0f8ea13d9f8151b4236e8e2489ee9
+AUX pdumpfs-test.patch 392 BLAKE2B 99b04a1f9667e5996afc294de54eca4d45d51ca36103f661a9c576a823faa85b1fd215e27ae6d1f2d9c02e696f55fceb9b00e55778d56bad0e5560d40aa18a00 SHA512 b7647f51acb30cfc86e80cf5eb5e6d7fa84c6b3ba3c1e6246468baca7835bd08a6d3f3e70dbb55a2c6ef0ffe67b4d10dd78b5a4673ff636c8da74e64f7b827fa
+DIST pdumpfs-1.3.tar.gz 68210 BLAKE2B ab5428c0f12ac289ef6efb5ae1b1ebcb047ce48183a36423d6f4b80d2d55da07b6e346e8ebd0ccd6eb85ae132c4367bd806c8106abeb681a9fa6ebffbaef1075 SHA512 1299676982f1981aa55f0601f361ec24ac119067f5ecbbeebcf9f41ccd69df2f18a07ae5a6e77f30ca7606ee49ecfa516d6066a07c1edbb4d4796f34f02508c3
+EBUILD pdumpfs-1.3-r2.ebuild 886 BLAKE2B 0f8e1b67227771c8cb377468cef7141f726dfa9c69422d04dc3fc968f800b15f66b2c6810a1ea9eb0ab2f1894f35aad84b0269c92bf2001ac188098f28c6c626 SHA512 dccd98ec4b5524c5a960ec5d38d4669f0e15346e0bb65bb3e14fde696b43f45cbbe1882fbda5922edd241a8f7b0c49161f362c2e6435ecec9fc6fffe127ee52d
+MISC metadata.xml 659 BLAKE2B 2fb28583b174d69031ec454a7d8e45876eceada6d5a7c4a150d079a67009120f67e8cab6ac772d2c0968289544e08753a389ccb6d19854998e1d98deee9a6bff SHA512 ad8d61826ef10df3dbb0765ca6f5c020044ce015663f4b96dde61e92fca360866d72fb84751da465c0659956b6d849a565966ae444969c6a6754a5d49a74eaab
diff --git a/app-backup/pdumpfs/files/pdumpfs-in.patch b/app-backup/pdumpfs/files/pdumpfs-in.patch
new file mode 100644
index 000000000000..cddfb995918a
--- /dev/null
+++ b/app-backup/pdumpfs/files/pdumpfs-in.patch
@@ -0,0 +1,40 @@
+patch by proxy maintainer, P. Healy, April 2015
+# Bug 509960
+--- pdumpfs.in_orig	2004-12-21 02:43:12.000000000 +0000
++++ pdumpfs.in	2015-04-01 10:58:22.671131947 +0100
+@@ -48,7 +48,7 @@
+ #
+ 
+ require 'find'
+-require 'ftools'
++require 'fileutils'
+ require 'getoptlong'
+ require 'date'
+ 
+@@ -868,7 +868,7 @@
+       today  = File.join(dest, datedir(start_time), base)
+ 
+       File.umask(0077)
+-      File.mkpath(today) unless @dry_run
++      FileUtils.mkpath(today) unless @dry_run
+       if latest
+         update_snapshot(src, latest, today)
+       else
+@@ -1018,7 +1018,7 @@
+ 
+       case type
+       when "directory"
+-        File.mkpath(today)
++        FileUtils.mkpath(today)
+       when "unchanged"
+         File.force_link(latest, today)
+       when "updated"
+@@ -1089,7 +1089,7 @@
+ 
+           case type
+           when "directory"
+-            File.mkpath(t)
++            FileUtils.mkpath(t)
+           when "new_file"
+             copy(s, t)
+           when "symlink"
diff --git a/app-backup/pdumpfs/files/pdumpfs-test.patch b/app-backup/pdumpfs/files/pdumpfs-test.patch
new file mode 100644
index 000000000000..e81e8b0f2d8a
--- /dev/null
+++ b/app-backup/pdumpfs/files/pdumpfs-test.patch
@@ -0,0 +1,12 @@
+patch by proxy maintainer, P. Healy, April 2015
+# Bug 509960
+--- tests/pdumpfs-test_orig	2004-08-10 07:54:28.000000000 +0100
++++ tests/pdumpfs-test	2015-04-01 11:24:35.948633870 +0100
+@@ -17,6 +17,7 @@
+ 
+ ../pdumpfs src dest > tmp.log || exit 1
+ diff -r src dest/$today/src || exit 1
++mkdir -p dest/$yesterday && rmdir dest/$yesterday
+ mv dest/$today dest/$yesterday
+ 
+ echo update > src/foo
diff --git a/app-backup/pdumpfs/metadata.xml b/app-backup/pdumpfs/metadata.xml
new file mode 100644
index 000000000000..02211b3e08f7
--- /dev/null
+++ b/app-backup/pdumpfs/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lmiphay@gmail.com</email>
+		<name>Paul Healy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+<longdescription>
+pdumpfs is a simple daily backup system similar to Plan9's dumpfs which
+preserves every daily snapshot. pdumpfs is written in Ruby. You can access
+the past snapshots at any time for retrieving a certain day's file. Let's
+backup your home directory with pdumpfs!
+</longdescription>
+</pkgmetadata>
diff --git a/app-backup/pdumpfs/pdumpfs-1.3-r2.ebuild b/app-backup/pdumpfs/pdumpfs-1.3-r2.ebuild
new file mode 100644
index 000000000000..527828394d33
--- /dev/null
+++ b/app-backup/pdumpfs/pdumpfs-1.3-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A daily backup system similar to Plan9's dumpfs"
+HOMEPAGE="http://0xcc.net/pdumpfs/"
+SRC_URI="http://0xcc.net/pdumpfs/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="l10n_ja"
+
+DEPEND=">=dev-lang/ruby-2.0.0_p598"
+
+src_prepare() {
+	# Bug #509960
+	epatch "${FILESDIR}/${PN}-in.patch" \
+		"${FILESDIR}/${PN}-test.patch"
+}
+
+src_compile() {
+	emake pdumpfs
+}
+
+src_test() {
+	# RUBYOPT=-rauto_gem without rubygems installed will cause ruby to fail, bug #158455 and #163473.
+	export RUBYOPT="${GENTOO_RUBYOPT}"
+	emake check
+}
+
+src_install() {
+	dobin pdumpfs
+
+	doman man/man8/pdumpfs.8
+	dohtml -r doc/*
+
+	if use l10n_ja; then
+		insinto /usr/share/man/ja/man8
+		doins man/ja/man8/pdumpfs.8
+	fi
+
+	dodoc ChangeLog README
+}
diff --git a/app-backup/rdedup-1.0.2 b/app-backup/rdedup-1.0.2
deleted file mode 100644
index 23f3fab978a3..000000000000
--- a/app-backup/rdedup-1.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=>=dev-libs/libsodium-1.0.11 >=dev-util/cargo-0.13.0
-DESCRIPTION=data deduplication with compression and public key encryption
-EAPI=6
-HOMEPAGE=https://github.com/dpc/rdedup
-IUSE=debug
-KEYWORDS=~amd64
-LICENSE=MPL-2.0
-RDEPEND=>=dev-libs/libsodium-1.0.11
-SLOT=0
-SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.5.3/download -> aho-corasick-0.5.3.crate https://crates.io/api/v1/crates/argparse/0.2.1/download -> argparse-0.2.1.crate https://crates.io/api/v1/crates/env_logger/0.3.5/download -> env_logger-0.3.5.crate https://crates.io/api/v1/crates/flate2/0.2.17/download -> flate2-0.2.17.crate https://crates.io/api/v1/crates/fs2/0.2.5/download -> fs2-0.2.5.crate https://crates.io/api/v1/crates/gcc/0.3.43/download -> gcc-0.3.43.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/libc/0.2.20/download -> libc-0.2.20.crate https://crates.io/api/v1/crates/libsodium-sys/0.0.12/download -> libsodium-sys-0.0.12.crate https://crates.io/api/v1/crates/log/0.3.6/download -> log-0.3.6.crate https://crates.io/api/v1/crates/memchr/0.1.11/download -> memchr-0.1.11.crate https://crates.io/api/v1/crates/miniz-sys/0.1.9/download -> miniz-sys-0.1.9.crate https://crates.io/api/v1/crates/pkg-config/0.3.9/download -> pkg-config-0.3.9.crate https://crates.io/api/v1/crates/rand/0.3.15/download -> rand-0.3.15.crate https://crates.io/api/v1/crates/rdedup-lib/1.0.2/download -> rdedup-lib-1.0.2.crate https://crates.io/api/v1/crates/regex/0.1.80/download -> regex-0.1.80.crate https://crates.io/api/v1/crates/regex-syntax/0.3.9/download -> regex-syntax-0.3.9.crate https://crates.io/api/v1/crates/rollsum/0.2.1/download -> rollsum-0.2.1.crate https://crates.io/api/v1/crates/rpassword/0.2.3/download -> rpassword-0.2.3.crate https://crates.io/api/v1/crates/rust-crypto/0.2.36/download -> rust-crypto-0.2.36.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.22/download -> rustc-serialize-0.3.22.crate https://crates.io/api/v1/crates/serde/0.7.15/download -> serde-0.7.15.crate https://crates.io/api/v1/crates/sodiumoxide/0.0.12/download -> sodiumoxide-0.0.12.crate https://crates.io/api/v1/crates/termios/0.2.2/download -> termios-0.2.2.crate https://crates.io/api/v1/crates/thread-id/2.0.0/download -> thread-id-2.0.0.crate https://crates.io/api/v1/crates/thread_local/0.2.7/download -> thread_local-0.2.7.crate https://crates.io/api/v1/crates/time/0.1.36/download -> time-0.1.36.crate https://crates.io/api/v1/crates/utf8-ranges/0.1.3/download -> utf8-ranges-0.1.3.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/rdedup/1.0.2/download -> rdedup-1.0.2.crate https://crates.io/api/v1/crates/rdedup-lib/1.0.2/download -> rdedup-lib-1.0.2.crate https://crates.io/api/v1/crates/redox_syscall/0.1.16/download -> redox_syscall-0.1.16.crate
-_eclasses_=cargo	959846e2836f8244430c9582dd6493af	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=958dc843c0bb13509bff3a0c563d4bea
diff --git a/app-backup/rdedup/Manifest b/app-backup/rdedup/Manifest
new file mode 100644
index 000000000000..9482c2ed7788
--- /dev/null
+++ b/app-backup/rdedup/Manifest
@@ -0,0 +1,34 @@
+DIST aho-corasick-0.5.3.crate 252052 BLAKE2B aba67d996b22c336165be78c89f53a2164605544f82587ceb1145bdb850326c2889d1bdcc3e95a6c5bb1dc0a996902130ab8425a7b0b88b38daffbfc9f58e309 SHA512 cc297b4882b869919edf9023ee2bd7100eb48709f6e7076fd26d1701dab3d8aa2cfb03752a764877cd92177ab7a4ce3dcdae76d16965eca2ff53667832afda31
+DIST argparse-0.2.1.crate 18969 BLAKE2B 68e4b5502409b2d2b8d2891164d114bde6b65babca241f8c881b07483dd78b114594c1450c06124f04946022303fa41d8b108122757ff2117ca6be3a0e619ad3 SHA512 f12aea4ddc0d619d40194f8d3db3c4d952521d1dfad6bc21b5b7cf8db91c30f70c5259bd6a0cf40d521e4d0cbaf3e4d59ae0bd40554772c79a4b200ebcfa73fe
+DIST env_logger-0.3.5.crate 5950 BLAKE2B 89772523b6beaa965be1548a0193d92a0a334e301b23e94bcbd407c1e0d5c31ea999b75fbc48d007529ac7581f92866a654d0fd67cc2df329a1ba1ce53c0fdf6 SHA512 9650ba32bfaa8c013c04cf2eb68378874fed53a178332151bec8d7ac832ab2884f91fdc39c372d3c1677954b073212654fb570da1f3c708e4d5a25910d6c1181
+DIST flate2-0.2.17.crate 47795 BLAKE2B d6bcae7d12040f2fdddc33828e7c66ee8de47469c4b808ba10239ad3b31482ddeda0f39678a6660410a3772afc3546c03aa4050ca6f83ac532f051f39b8fe104 SHA512 609f2e3c71e8889ccc3682fa62ecf52a068c1e61040b2e0eebb7b8de7784dd595592bdef34c7a03e0587cb3e4c2e2d8de88eec113122a222676cd4fb7d8cc775
+DIST fs2-0.2.5.crate 12661 BLAKE2B c759986069c015e470fb622bccfea63b7d6b9c89e08fbc304765204a23e05552ab0408c9cf508a2ec5aaf1baac8bb992dcc39037e37d21c3adc7cae0c2025a85 SHA512 733598cf49f8725a98b91f65d1243dd0d078f129df62f68e8fb9ecd4cc58179627038586ab505d31a82932e7ee196e99f4967f5f82d08b90e3c7927a19006447
+DIST gcc-0.3.43.crate 26087 BLAKE2B abd5bfd81c628a2f726fb3fca90e87c87de8a78d58982b1db20b26dde2a182a708c4e30ae2b0714aec8d8d85c9e0af508b093e1a53a7ab9b41543d4dd508cc10 SHA512 27dd847b9466140d8cdd9bd4ac466d2ba26a93f858fcdcc1d58a59b08207f34f283004512faa53c4d8cf9632e0e9199c0f42db6df1db9a8d6b96e72e074af5e3
+DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
+DIST libc-0.2.20.crate 121083 BLAKE2B 5ff063ccfb8eb0398cdb7307c9ee096a32fbce6da02418677324d6fe9901f3437c6060435867c781d4d617fe9183126a42a9c07acc9b5698c4af92121e6fbdbc SHA512 fb86e11f8317881c3e804e186ad9e2b7aee0ad4d0965ea67729ba74682e246e70bc2d283b170b6ab451c9907ee63fa6632a7211b2342f03e2ecb800fcaafd696
+DIST libsodium-sys-0.0.12.crate 13527 BLAKE2B 991f3ca1009af39a55d259e1b161750e4144ffd8098948934877af47a29cb8296fb0cb0c8a41556eac21713fe8d6374823afd3f351ecae9443fc1055e9b04e50 SHA512 9370a2b69fe6b0b1c69d07ebbbbff0f5677e8575bb4be43356c0d7bd6c64e7553396f3626e06e8a48a2ff03823bb164f18d768bd49732a5f7ab00168126dfdf1
+DIST log-0.3.6.crate 16110 BLAKE2B 6dc589c3c24f3bbecf60310bfbd187179ac18afae1a17e6d28abf38f322e740aa02d73d396926650c347dba24afc50e3bb4cdeccf74ec7511ff9a7277084f5ec SHA512 f2e5526a2613f70301a607cbc79213a946a6039f85473f9de28ceb2f3b464be61a584f34ca6381e077d8bf6ac751c93011087d1723649c0d7722281f1a2b7174
+DIST memchr-0.1.11.crate 6977 BLAKE2B 44d270a5ad4916dfeb186b3997168cf80556f2afd1727b1e4c796942d48e8e453ea6182fd47526ecdfe5c6edf33ea9329b5a3864db9e681420e8c76cb726a9bc SHA512 96bbdb69913966326acba4bb82b8dfe0516edba225ac38b3355d60a2337ca620807750682fff3de7a2a38a7f70f0db7d8c1638701aacca7ab4c14098ba0fbcab
+DIST miniz-sys-0.1.9.crate 53242 BLAKE2B 1259dae3c0c1d37c68e947f9f64e8c4044ef7eb6d900cc8f6a8ef07a42454beba4565885c301021cf925096b605fbe482d22df6c6f9b44a228e7a6fe468ad7a8 SHA512 130d872d25ca30937cbe34d93c6c3be359b4613c192b2dd8c542c0f3c2893c15176afc84da8e9077368647bdc0cc584aa995b3cbc8927b5e7de059b6135be709
+DIST pkg-config-0.3.9.crate 11055 BLAKE2B 8c8c9a4badcb2d2691a953b06a6c479794eae97e40d95509051ae34665ac467554849f050eafd83c03070c9239709b7873e1c33604a06acce396ddf678c96e34 SHA512 084e18e8c91ba6a1b305624d16c06f8f7df994c93cf86ccf443bc8f2669368a15bfa9875bc4f2933e94aa268e15fef783235c98558ba596cfc79dbd31f0b69d1
+DIST rand-0.3.15.crate 55312 BLAKE2B bde7d5bf10e153d793d0ce9711c6626dab545e1b42296c6c4f0f104bd316bccc51fad3d6321c504069360fba96a74d2af756c92db3859675295c33d0be46c660 SHA512 4c812b1f742adf94fe45c806fd66a360a2490e474db6cc1d13acf4101fd63072429f1b50aa84b51cc742c1624a871a588769f4c12faa775f6f275a028fe96633
+DIST rdedup-1.0.2.crate 7161 BLAKE2B 800eb6da28186b310a973ff4c5a678230e9455400d4262a774f64c8285bcf51feaceca3abd87b7b3445e2a4cd29568d7f24893a03eb5a478bad670ba359f00ac SHA512 f3999b6c981b52d237288c77c6bbb7b86a6531c0753d660d26cc6cfe540037c57e06f626315d1294b2fd312f0782494f273242b295a4ab9bc79a6a4de0cb8562
+DIST rdedup-lib-1.0.2.crate 12851 BLAKE2B 9fe6536ab54c5288763e14b304e2bdd31bfd7b5ca3b675ad707c7a83bef2640bf97ff0573efb90033b4eaa666320770e62305c28e190e540ee836cc6443983e9 SHA512 563376d7423facd4831a87a444f57c597d909e3cee7c53cc5420ddf4dcc512d789d6c31da0d3c9edc8ce736bab71519424333ec6a4ab5c86ce4046a80b5d9703
+DIST redox_syscall-0.1.16.crate 11598 BLAKE2B c6fd512e6d61c5d96a4b5aa65f7bc383e61abd7ccd96c332d99f10c8afd1985c18cf0744769cd3e743a4abce55c1ef4824a5397021ebeb2d8b690b4ad8ecbfd2 SHA512 16b2a06549dbfd778e1bcbde2b1aa33951bc925d34cc910898563e400ca107221f32e022a131089831370aa7c056da1717ebb6f0947e2d8722bb443388462f2f
+DIST regex-0.1.80.crate 185806 BLAKE2B d1bb6b363584528a11f0de67a0ebcda1d07a43d890acc7b5b8417f946e236d318708c6483fc6c7efdcb82509a116183400b39d939aed227821c9f5badba1c2a6 SHA512 a160d80f4ac9f1e17d1debe163584f2c6c2ba7a8c49c34a7e11ed945614fe1923714880515a31a1501566e254edad23be40307b452f9216915fa03d3dfaebda0
+DIST regex-syntax-0.3.9.crate 117427 BLAKE2B 81b0fbd7565902c6b87619b5f66bab9a7e3fc5d64e4085a2b600daedaaa0a294add31790bfca3c653ec79033272f14c89f34f5f49b32dd9991c0199b209eeb24 SHA512 85513709816b148a163b73495b1e0100203da6c37d50a7d64368efb82fdac45fdd083d31bce4b193e1aa5926943e5278eaec5b23b174c425b5954d7b716fa506
+DIST rollsum-0.2.1.crate 4171 BLAKE2B 61f255d1815d724492a3f8295d9584794520a9103d6b65704333e54488da2978829b70212d12e0d7d42428e747317f0cd3b0b78a0bbc20bcb1f828595f2d12ac SHA512 d179f8dd169a98a921affeb896cbef1368eeb393556c11a89386b6532239776fe4f1be9e80e41bd3c8f744bc36c5b0cc6fa2649e4235c6f69e948dad7917a58d
+DIST rpassword-0.2.3.crate 3610 BLAKE2B 1a094674d11637d5c3ca9d067c9b324c05a90a1e4f7be762b4e5ebf124e5dbecc184e619c9238d18cad6daf72f4340a42bbbd63addf7bd79939e138d1813b5ae SHA512 16b8d627e56a581ee663c43c6ed63c8f45160b46c7bb4544614aa98911850edcf379c23e35c0d6682037b05f6990a96c86490f65d23a26d58928af096c556229
+DIST rust-crypto-0.2.36.crate 857879 BLAKE2B c486a2e43eb9ac9d2558bb39a249dcd689e86eef51d9a7613a3964baa633cebec824d5a490254dc06eca7a5faa471126de92452d62c522a3dbf494b9940a13e1 SHA512 0fac026d8799ecde523f20e7b34b9486343e48b95e79cd76bb6c8bfaeaebed550e45d59d85d8a3a58595f10c02a4a5e55691da15c203a4336a9bdb5480cd2e90
+DIST rustc-serialize-0.3.22.crate 45545 BLAKE2B b367550233def2244b15cfffa7b089a0771e99047f477dab92a44c3b228b8879b92fba3f76998e9f6babb5b0a0ea8062f619bc8d9256f6e8edbb1680a4c548c3 SHA512 833649dc82e0a568eee051a37856983aadb3a33ca5d20c02e6ef057c7fad802c19d3131cc7108b33b098a964a2492e43d796f36b600fe3df4c93c76c9abb219c
+DIST serde-0.7.15.crate 22719 BLAKE2B 4d9fbe17250097540c9b0188b4935a39befb52b8637c7296b848a971dabec89c8243e833d36c9640a81da6f42c5d28be17514a94e6ded500a82629654d9e48f2 SHA512 c7fe504876c3d654797c88b47af81d422129b427bb3bc8d9876106865913ac9863e7b323cb6a5098d654e7af0b18b39310bbb204d03d3b465dde38ad92912a7c
+DIST sodiumoxide-0.0.12.crate 2068250 BLAKE2B 55e916af69c91d494137e19eeeb38db51ad2647cf774fa9fb487bd4c7ce9ba23a7717a445a00e661dc4e78b5b2758a8dadc27dc168093f5334948ec67827c8b5 SHA512 b47e9a1463185360886f23a8dc0b5f26784f639b204dec9ff6e830d845f42b201addc7cba87a4f75d19939fb1b21ee0fb7e3dc55dccbbe7e8d0f6c3ae7bac2a8
+DIST termios-0.2.2.crate 8966 BLAKE2B df99537abec76fe65a51bb5172d69cf0626045447b5aebc9e388b9b36b685f99919f032075ff6a3da82612b6fee5a0fa57d347136b66a761dc24b84ca4128749 SHA512 ded990bf8c1fa2bc31087ce077903eb8955687cd8ada25b82c4ab030ce3a73cede0ed4c599963c2d0c05c51e2a0c26f0d29d328b364342d21a73eaf4fc153f2c
+DIST thread-id-2.0.0.crate 6108 BLAKE2B 616ecca5907d78d8ce4326d69cea3e4af6d7076f701f59865c0c67f3ef2b62b5d9cdcc5fd0f4806ea4d4010afce2fbc288809d590330308818616faa9f6a862e SHA512 9fc73cb13dd70f6f323161667f7a253b48c4e11d074457fa033b3617dcaf7ba9aa95f12801c4c045e7e9c07dd4b63a83f79701b489a9d97aefde07970064d9b0
+DIST thread_local-0.2.7.crate 10954 BLAKE2B 70a8545a0e9ab525c4246409d7b6c35e8675dffc58799b74f6286ee81f6b3a13a2d2d6a2fa38ed13cb83b5d6aad7e54d9896f004a8e623788d928d6cac975001 SHA512 adc9be75120fd9e27429d0116cc6774a519ed9a2348db122ea90864947e4c1e1c98aeef740e7f8d28861b1db0f4a9340e58e13c1b3ece1fb3320058ea7a47b35
+DIST time-0.1.36.crate 28333 BLAKE2B b87de9c713346b55eea1b738236608e7d9e14d619fb16e0d4772cc383c04b63a1ae5428d2248ad161d16fe37d282e3676dc04bc0b83ef86ecc6e5aeeaf998689 SHA512 1aa57438bb471344c1559610a0bb644dc488b0a69e354ad362c3cc95cd44c1c9269d9bd266c556c53796161d6ed381b35cba6fdcb62dfbef161ab4502300550a
+DIST utf8-ranges-0.1.3.crate 8422 BLAKE2B c044c53be4ae0ecba9117cfea6a2d8f26c326d4285ae4e3e5920a48c0a7817769dcef72974fdcb06d1428c2cf5a645fcb15268cf6a82de2bc2cbb858a888a338 SHA512 84bd9b67c423923b856452e113f0d786ac438bc7f9b4d4d9f31f6f91f141a8ac4c93f45f722ac5a8a4bac8eac0e355fe7db1eebc62391709326e9817eda8c374
+DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
+DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
+EBUILD rdedup-1.0.2.ebuild 1145 BLAKE2B cc7dd7c85c548f9afd4d25f152619fc2aacc485e1258efcf1c3636c0c3fa65ef981e719c11c7091b3f04745a96a73edcdee888d58051de4cbbd6cc4278fd1d10 SHA512 16dbfcb2e03f9ccef7ed5648287c5af511e4f8928d2f9ce403f58bc3991440487908ab6d87f9cef1c75d14520636c96805d28a9a85074bc6c5db6e68bee09db1
+MISC metadata.xml 325 BLAKE2B b29288cacf9d5fd366085fd4849aa23fdd6cb8fa243d90936ce568254d78f25bdffebdca162fe43c3e3df1ee75e6456dfc8b46bbd812a78d348e44bad2642da3 SHA512 d929b91d79451edd8facd161376146c37c0036782f8525eddeffb29e16f4a63d55ce84a2b35a52df8f4a5a89f6a95b8a7b1c0eafd2a279d4e680196fec196653
diff --git a/app-backup/rdedup/metadata.xml b/app-backup/rdedup/metadata.xml
new file mode 100644
index 000000000000..bec4631dc800
--- /dev/null
+++ b/app-backup/rdedup/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">dpc/rdedup</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-backup/rdedup/rdedup-1.0.2.ebuild b/app-backup/rdedup/rdedup-1.0.2.ebuild
new file mode 100644
index 000000000000..378d63f771d7
--- /dev/null
+++ b/app-backup/rdedup/rdedup-1.0.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CRATES="
+aho-corasick-0.5.3
+argparse-0.2.1
+env_logger-0.3.5
+flate2-0.2.17
+fs2-0.2.5
+gcc-0.3.43
+kernel32-sys-0.2.2
+libc-0.2.20
+libsodium-sys-0.0.12
+log-0.3.6
+memchr-0.1.11
+miniz-sys-0.1.9
+pkg-config-0.3.9
+rand-0.3.15
+rdedup-lib-1.0.2
+regex-0.1.80
+regex-syntax-0.3.9
+rollsum-0.2.1
+rpassword-0.2.3
+rust-crypto-0.2.36
+rustc-serialize-0.3.22
+serde-0.7.15
+sodiumoxide-0.0.12
+termios-0.2.2
+thread-id-2.0.0
+thread_local-0.2.7
+time-0.1.36
+utf8-ranges-0.1.3
+winapi-0.2.8
+winapi-build-0.1.1
+rdedup-1.0.2
+rdedup-lib-1.0.2
+redox_syscall-0.1.16
+"
+
+inherit cargo
+
+DESCRIPTION="data deduplication with compression and public key encryption"
+HOMEPAGE="https://github.com/dpc/rdedup"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+RESTRICT=""
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+DEPEND="${DEPEND} >=dev-libs/libsodium-1.0.11"
+RDEPEND="${DEPEND}"
+DOCS=( README.md CHANGELOG.md )
+
+src_prepare() {
+	default_src_prepare
+	ln -sf "${WORKDIR}/cargo_home/gentoo/rdedup-lib-${PV}" "${S}/lib"
+}
+
+src_install() {
+	cargo_src_install
+	einstalldocs
+}
diff --git a/app-backup/rdiff-backup-1.3.3-r1 b/app-backup/rdiff-backup-1.3.3-r1
deleted file mode 100644
index 29837c478633..000000000000
--- a/app-backup/rdiff-backup-1.3.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-libs/librsync:0/1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Local/remote mirroring+incremental backup
-EAPI=5
-HOMEPAGE=https://github.com/sol1/rdiff-backup
-IUSE=examples python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-2
-RDEPEND=dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pylibacl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/sol1/rdiff-backup/archive/r1-3-3.tar.gz -> rdiff-backup-1.3.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8777ffde76b013c7ebce3d9504ecf448
diff --git a/app-backup/rdiff-backup-1.3.3-r3 b/app-backup/rdiff-backup-1.3.3-r3
deleted file mode 100644
index 2173d92ee0bc..000000000000
--- a/app-backup/rdiff-backup-1.3.3-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-libs/librsync:0=
-DESCRIPTION=Local/remote mirroring+incremental backup
-EAPI=7
-HOMEPAGE=https://github.com/sol1/rdiff-backup
-IUSE=examples python_targets_python2_7
-KEYWORDS=alpha amd64 ~arm ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-2
-RDEPEND=net-libs/librsync:0= dev-python/pylibacl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/sol1/rdiff-backup/archive/r1.3.3.tar.gz -> rdiff-backup-1.3.3.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=10f7a21347ee4386a30c7f3c5f2101d8
diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest
new file mode 100644
index 000000000000..c97751503f43
--- /dev/null
+++ b/app-backup/rdiff-backup/Manifest
@@ -0,0 +1,6 @@
+AUX rdiff-backup-1.3.3-librsync-1.0.0.patch 498 BLAKE2B b9af390ffa1f6061301f923f21fcb047c213c442f211570602f7cb3dbc8bc30d29a877bcb99a95c500257fd838ea3514b5cd985ab8d94e2ebc4b453adb8587d9 SHA512 2749fc3f5e187d8bc7874ddb7e185ebb17a0ad77e44e12d3f02a10de7ca5acea568321ce7262e45433732a0b532702e674564cc83d8987b0e339e28f7468395f
+AUX rdiff-backup-1.3.3-no-docs.patch 573 BLAKE2B 0463ddf18f4e626879a7b2f4c330219c93305305c1dd6106586aa7b309221680515ad70c4e14cc1ee038c450c5292ea4f6459bd2cde347910898fa18197af822 SHA512 94d19500e09496322fdb1a5188321283da7e31d315ef860abdcf19a086c50c7d866cc4cbb525e456a9cdf2563d052f3d5466c5f482910d23ac07841a24e23f7f
+DIST rdiff-backup-1.3.3.tar.gz 198412 BLAKE2B 95141b64ecb3442b2a420e3e2f4325a80bc4e3949e920f3fb04d8d7e69cd20b2809d230a5f9f6af6958f47689d73cf9fdc2d95134d41a5a9d0d6037ee87cf96e SHA512 e2731464a6ff146cdecac49d2d99275dc5e6b4a3ff5b8209fe6dc71fd80cdbf573d029531325a879e9a169c12b31568f75fdcb812f53df33896784c5bc550280
+EBUILD rdiff-backup-1.3.3-r1.ebuild 798 BLAKE2B e2f661540bc9195ca1f2d0000739214c9b5428199fa8a3371767f9b649b2d670a142611182d752e16a706cb69dce840e4b03a39a06b61a2fe8c6d9203c3573ee SHA512 b2e214fc6d2df981dd5f8b2d37c1fa13433062bc6ea5c94c861e1a78f64f1af025ccae4c3c19b36236606e2dd102e41697b278fcdb485e83bafa041e4b47b27a
+EBUILD rdiff-backup-1.3.3-r3.ebuild 886 BLAKE2B 8ad3ec4dd517dc10b9a016e1df4d2f61f5408eca01d1de0257fe15c54838ca68c6bf96bffbebcae1bd30c112f940f3f9bd1832475f0f259aca4985d33f6e273d SHA512 ba33d053446b6ccee55c996062316bb2200e18607985fa867f1a00344fb96bf3ca01601ac40aeef07aa00989454064f4e8d287ae3b81aae748e715c7584f4bc2
+MISC metadata.xml 335 BLAKE2B f427a882be2c0152b97b9807660ba4b2b1113708f1cca3b86f42256e72845841f3f17d9646d996c4add83a44c5cfd29430323d6012592dc76420f8af0bc3e083 SHA512 ee210d45a15817b3fa09e4c41577bf499ffcf52bd6298429fceaa566f7edf0c17cc1016ecdf5893fcbc39a10410b7104a2c72ee035f30799058e52e48feb55da
diff --git a/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-librsync-1.0.0.patch b/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-librsync-1.0.0.patch
new file mode 100644
index 000000000000..16b97ab1c011
--- /dev/null
+++ b/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-librsync-1.0.0.patch
@@ -0,0 +1,16 @@
+--- rdiff-backup-1.2.8/_librsyncmodule.c			2009-03-16 15:36:21.000000000 +0100
++++ rdiff-backup-1.2.8/_librsyncmodule.c.librsync-1.0.0		2015-03-02 00:54:24.000000000 +0100
+@@ -59,8 +59,13 @@
+   if (sm == NULL) return NULL;
+   sm->x_attr = NULL;
+ 
++#ifdef RS_DEFAULT_STRONG_LEN
+   sm->sig_job = rs_sig_begin((size_t)blocklen,
+ 							 (size_t)RS_DEFAULT_STRONG_LEN);
++#else
++  sm->sig_job = rs_sig_begin((size_t)blocklen,
++							 (size_t)8, RS_MD4_SIG_MAGIC);
++#endif
+   return (PyObject*)sm;
+ }
+ 
diff --git a/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-no-docs.patch b/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-no-docs.patch
new file mode 100644
index 000000000000..9d69bba9ea2e
--- /dev/null
+++ b/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-no-docs.patch
@@ -0,0 +1,13 @@
+--- a/setup.py	2009-03-16 15:45:54.000000000 +0100
++++ b/setup.py	2018-06-16 18:23:29.689677175 +0200
+@@ -73,9 +73,6 @@
+ 							   libraries=libname,
+ 							   extra_link_args=lflags_arg)],
+ 	  scripts = ['rdiff-backup', 'rdiff-backup-statistics'],
+-	  data_files = [('share/man/man1', ['rdiff-backup.1',
+-										'rdiff-backup-statistics.1']),
+-					('share/doc/rdiff-backup-%s' % (version_string,),
+-					 ['CHANGELOG', 'COPYING', 'README', 'FAQ.html'])],
++	  data_files = [('share/man/man1', ['rdiff-backup.1','rdiff-backup-statistics.1'])],
+ 					**extra_options)
+ 
diff --git a/app-backup/rdiff-backup/metadata.xml b/app-backup/rdiff-backup/metadata.xml
new file mode 100644
index 000000000000..f7741b77b9fc
--- /dev/null
+++ b/app-backup/rdiff-backup/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">sol1/rdiff-backup</remote-id>
+	</upstream>
+</pkgmetadata>
+
diff --git a/app-backup/rdiff-backup/rdiff-backup-1.3.3-r1.ebuild b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r1.ebuild
new file mode 100644
index 000000000000..5df10721abc4
--- /dev/null
+++ b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 versionator
+
+UPSTREAM_PV=$(replace_all_version_separators '-')
+
+DESCRIPTION="Local/remote mirroring+incremental backup"
+HOMEPAGE="https://github.com/sol1/rdiff-backup"
+SRC_URI="https://github.com/sol1/${PN}/archive/r${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="examples"
+
+DEPEND="
+	net-libs/librsync:0/1
+"
+RDEPEND="
+	dev-python/pyxattr[${PYTHON_USEDEP}]
+	dev-python/pylibacl[${PYTHON_USEDEP}]
+"
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples.html )
+
+	distutils-r1_python_install_all
+}
diff --git a/app-backup/rdiff-backup/rdiff-backup-1.3.3-r3.ebuild b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r3.ebuild
new file mode 100644
index 000000000000..3a6f9bf04f5b
--- /dev/null
+++ b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+UPSTREAM_PV=$(ver_rs 0 '-')
+
+DESCRIPTION="Local/remote mirroring+incremental backup"
+HOMEPAGE="https://github.com/sol1/rdiff-backup"
+SRC_URI="https://github.com/sol1/${PN}/archive/r${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="examples"
+
+DEPEND="
+	net-libs/librsync:0=
+"
+RDEPEND="${DEPEND}
+	dev-python/pylibacl[${PYTHON_USEDEP}]
+	dev-python/pyxattr[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-librsync-1.0.0.patch"
+	"${FILESDIR}/${P}-no-docs.patch"
+)
+
+python_install_all() {
+	local HTML_DOCS=( FAQ.html )
+	use examples && HTML_DOCS+=( examples.html )
+	distutils-r1_python_install_all
+}
diff --git a/app-backup/rdumpfs-0.1 b/app-backup/rdumpfs-0.1
deleted file mode 100644
index e929c93ee7c4..000000000000
--- a/app-backup/rdumpfs-0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DESCRIPTION=a rsync-based dump file system backup tool
-EAPI=5
-HOMEPAGE=https://github.com/chneukirchen/rdumpfs
-IUSE=+xattr
-KEYWORDS=~amd64
-LICENSE=CC0-1.0
-RDEPEND=net-misc/rsync[xattr?]
-SLOT=0
-SRC_URI=https://github.com/chneukirchen/rdumpfs/archive/v0.1.tar.gz -> rdumpfs-0.1.tar.gz
-_eclasses_=vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=7a6f9626218f2fc5b069264f93058b16
diff --git a/app-backup/rdumpfs/Manifest b/app-backup/rdumpfs/Manifest
new file mode 100644
index 000000000000..c2fb5545137b
--- /dev/null
+++ b/app-backup/rdumpfs/Manifest
@@ -0,0 +1,3 @@
+DIST rdumpfs-0.1.tar.gz 3054 BLAKE2B 6ac78101003dbecb8920c52bc1c4a0bd902b2f4805cfd004665edef4488bb766c57d0328a6bd23413e88e8d8202348e0e10d1012e731eab9dab150188598a2e0 SHA512 54add203d09bff1190c3bd292bd5fde3b81f4b6810f4dc8d1be18f9abfb5334bcbca1aebc00795f4bdce861f356a7b9e5d809cd80475a3c50a21752380570853
+EBUILD rdumpfs-0.1.ebuild 600 BLAKE2B 6f922bce1ddfeb541d5a1d3e242ee93207bad8a18e8d47537a3bdd23d1a6a3339f89cbd1e85f61a4b49e56217d2de882c10036457a7ef1d11aca8222aab4656a SHA512 08bf572651ee56734f09d1c77b3ac69d4f87217bfefc80b425d1a6909073c5387fb8480892ec867ba6693f0052ae0e0a79b91fde03f02ba05629186314326e2f
+MISC metadata.xml 348 BLAKE2B 0c9eb156e54b8439196c31723fa3c29212a761f66351c3dbc867a33226431172fca6f95aaeea2874ee8be3d914ab5684569a0559be9e29637e0cb06a0267e293 SHA512 106211864b1adb098cd8728facf25fc9103ebc6fcc2478b038864c82e8af8b9c41599e0dee4b4f479e4d9c3caceeaaf34f2f3c241e2334a5357a9e0ed2c0e479
diff --git a/app-backup/rdumpfs/metadata.xml b/app-backup/rdumpfs/metadata.xml
new file mode 100644
index 000000000000..127cd97aeefe
--- /dev/null
+++ b/app-backup/rdumpfs/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>junghans@gentoo.org</email>
+    <name>Christoph Junghans</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">chneukirchen/rdumpfs</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-backup/rdumpfs/rdumpfs-0.1.ebuild b/app-backup/rdumpfs/rdumpfs-0.1.ebuild
new file mode 100644
index 000000000000..ee61a90de855
--- /dev/null
+++ b/app-backup/rdumpfs/rdumpfs-0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vcs-snapshot
+
+COMMIT="b7e8e7b0efd9d73344e022e204f2e99e6321136e"
+DESCRIPTION="a rsync-based dump file system backup tool"
+HOMEPAGE="https://github.com/chneukirchen/rdumpfs"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+xattr"
+
+DEPEND=""
+RDEPEND="net-misc/rsync[xattr?]"
+
+src_prepare() {
+	use xattr || sed -i '/RDUMPFS_DEFAULT_ARGS:=/s/aHAX/aHA/' "${PN}" || die
+}
+
+src_install() {
+	dobin "${PN}"
+	dodoc README
+}
diff --git a/app-backup/rdup-1.1.15 b/app-backup/rdup-1.1.15
deleted file mode 100644
index c10be0ead05b..000000000000
--- a/app-backup/rdup-1.1.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare test
-DEPEND=app-arch/libarchive dev-libs/glib:2 dev-libs/libpcre dev-libs/nettle test? ( dev-util/dejagnu ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Generate a file list suitable for full or incremental backups
-EAPI=6
-HOMEPAGE=https://github.com/miekg/rdup/releases
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-arch/libarchive dev-libs/glib:2 dev-libs/libpcre dev-libs/nettle
-SLOT=0
-SRC_URI=https://github.com/miekg/rdup/archive/1.1.15.tar.gz -> rdup-1.1.15.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=93af2c843d637fbf452d6272a2e5f5a1
diff --git a/app-backup/rdup/Manifest b/app-backup/rdup/Manifest
new file mode 100644
index 000000000000..13cb3ea1ee42
--- /dev/null
+++ b/app-backup/rdup/Manifest
@@ -0,0 +1,3 @@
+DIST rdup-1.1.15.tar.gz 333646 BLAKE2B 452cf4a4e6393ae56ffee4ebd3086af0606b03125f9af84590314516fa643fd4122d64a34e17d6a5b4bd7ac5921bb9f1fe3c312694015b90b91a85f9c48cd851 SHA512 e377ec29e0dacae306ee58c935c9738f32d177e1c2575e4fa3618d2753d248f2898633dde46da81410271205458ccf0d3d885e3eebc5f1948afc5cd9e99ce7c3
+EBUILD rdup-1.1.15.ebuild 856 BLAKE2B 8d279dc4921220c67da27f08e81ff932f6c5eaf4096ea1ab17e83e45a12895a14b32c8f34e10d9bc531b5b5a02d4e0be5624f0361628bf394081a4a86f8fd77d SHA512 b17d5ceab2aa7ead80cd792473b90390922976b708f48ee747dd5b3d84578cb065e6e93851e277f4ab3cd1b39037a2d441a9949cdd73a71a86044e0a45e1acbd
+MISC metadata.xml 325 BLAKE2B 884b9307d33bc2a05e23db61a7f39c620df3147241b851254747e19bd5362c9bed0c3db8d5b4e7da483374acc6ad28e7128a7c093da677d4ce94f5d24921bdbd SHA512 73d0a20ad97d9e9c26f10252fb7d50c93b2c5d07df8eceb8f97796758341c884bdd75ea7707f5f0645d430348af6669595612c662dd019d355fa9f366f6d44fd
diff --git a/app-backup/rdup/metadata.xml b/app-backup/rdup/metadata.xml
new file mode 100644
index 000000000000..9f9793a7335b
--- /dev/null
+++ b/app-backup/rdup/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">miekg/rdup</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-backup/rdup/rdup-1.1.15.ebuild b/app-backup/rdup/rdup-1.1.15.ebuild
new file mode 100644
index 000000000000..a0188659a094
--- /dev/null
+++ b/app-backup/rdup/rdup-1.1.15.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils autotools
+
+DESCRIPTION="Generate a file list suitable for full or incremental backups"
+HOMEPAGE="https://github.com/miekg/rdup/releases"
+SRC_URI="https://github.com/miekg/rdup/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug test"
+
+RDEPEND="
+	app-arch/libarchive
+	dev-libs/glib:2
+	dev-libs/libpcre
+	dev-libs/nettle"
+DEPEND="${RDEPEND}
+	test? ( dev-util/dejagnu )"
+
+src_prepare() {
+	default_src_prepare
+	sed -i -e 's/ -Werror//' GNUmakefile.in || die "Failed to fix Makefile"
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable debug)
+}
+
+src_test() {
+	if use debug; then
+		ewarn "Test phase skipped, as it is known to fail with USE=\"debug\"."
+	else
+		default_src_test
+	fi
+}
diff --git a/app-backup/rear-1.15-r1 b/app-backup/rear-1.15-r1
deleted file mode 100644
index 52f90a19bb9c..000000000000
--- a/app-backup/rear-1.15-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=A setup-and-forget Linux bare metal disaster recovery solution
-EAPI=5
-HOMEPAGE=http://relax-and-recover.org/
-IUSE=libressl udev
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-dialup/mingetty net-fs/nfs-utils sys-apps/iproute2 sys-apps/lsb-release sys-apps/util-linux sys-block/parted sys-boot/syslinux virtual/cdrtools udev? ( virtual/udev )
-SLOT=0
-SRC_URI=mirror://sourceforge/rear/rear-1.15.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=683f6eaed2f172f84e09d1ebc5c1aa7a
diff --git a/app-backup/rear-1.17.0 b/app-backup/rear-1.17.0
deleted file mode 100644
index 34a6c4e67037..000000000000
--- a/app-backup/rear-1.17.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=A setup-and-forget Linux bare metal disaster recovery solution
-EAPI=5
-HOMEPAGE=http://relax-and-recover.org/
-IUSE=libressl udev
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-dialup/mingetty net-fs/nfs-utils sys-apps/gawk sys-apps/iproute2 sys-apps/lsb-release sys-apps/util-linux sys-block/parted sys-boot/syslinux virtual/cdrtools udev? ( virtual/udev )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/rear/rear/1.17/1.17.0/rear-1.17.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c61093df5f229196195477e94cb1406e
diff --git a/app-backup/rear-1.17.1 b/app-backup/rear-1.17.1
deleted file mode 100644
index c42e5b4f03b7..000000000000
--- a/app-backup/rear-1.17.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=A setup-and-forget Linux bare metal disaster recovery solution
-EAPI=5
-HOMEPAGE=http://relax-and-recover.org/
-IUSE=libressl udev
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-dialup/mingetty net-fs/nfs-utils sys-apps/gawk sys-apps/iproute2 sys-apps/lsb-release sys-apps/util-linux sys-block/parted sys-boot/syslinux virtual/cdrtools udev? ( virtual/udev )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/rear/rear/1.17/1.17.1/rear-1.17.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c61093df5f229196195477e94cb1406e
diff --git a/app-backup/rear/Manifest b/app-backup/rear/Manifest
new file mode 100644
index 000000000000..b998a27515fa
--- /dev/null
+++ b/app-backup/rear/Manifest
@@ -0,0 +1,8 @@
+AUX rear-1.15-add-support-for-gentoo-kernels.patch 817 BLAKE2B 1bd821856ec3b52f7addd7d438d8a2bb412587fd29b3acfcdba99dd769fd217a7dbe1a264431382981cd79e4802819b80d53340841be2d8104beae8be1c48de2 SHA512 b60b77276c6be79324c8df30365950cc864751c96e6373c8231a60a6293046571cb2dad75423f3e1beaea28597c52a431e7d16b01d8c8cb6f279cd1428670659
+DIST rear-1.15.tar.gz 258153 BLAKE2B 1172806962df7d1a5f278d1aeb696e38d482f1710c6b13dba6b00f60f51fd3c02ba6d28c9c5e4b1a648468f9a6f5987b47ca1f819c8e66c9b6f209c75b0ba0b6 SHA512 dc953c33b82f221de6c2acd7ffbb26c34b86aebcd7f8a4d7d520a1d08c15c723fed75326b8e19614f5e09f6436d392091b362b350ffad06caf10c711eb97fcb2
+DIST rear-1.17.0.tar.gz 299444 BLAKE2B bbada2b5705a5ff0f82b97974f14de728a779847a6b410e0be71033404ae08f0ba6c4bd76c07aba0195aa677c174ebf016bbb6a17f3aa2698bed24bcb50618f3 SHA512 4b9991dc14138e6a2cd28c9fb9f1dcf46ea1a580454bb2c966024481657a102cc849baf6af5ebfa0793ac3f5ebff5b07abc87d1e4b02e1496a0f87b8cf79284e
+DIST rear-1.17.1.tar.gz 303253 BLAKE2B 3c84a76b0aaf1ef72191a49976aa86ce4fcf7c9aee1c6c85af3d68d80e0c6a7ba0d16e109847c7753a626ef34df9ee05f2912b30df5e205303c194831bd5af77 SHA512 66595e962345c0e61c5152f11aee6745ec348acc02d0cbc717faaca8618c83211d8c45ec5e80a17ba9d8c8ad9c6d2ecb109f827d976eb0d126bfc44cf4b49afc
+EBUILD rear-1.15-r1.ebuild 1275 BLAKE2B 36665c42c5ddaf6cef28c1f6e574e8e4aa64ca10e303022538e44d41b4af183572e81738fb24a3f2972c55f5de8b86b7c38b1d5f9ec3b27e1bd76c74fa6650ac SHA512 ed2893187e3388d1f2a3dc6dcb7220f6e4a77cfb720b86c67b464526c6a54469023f05a6481e44f939420b80651bb4e4e85dcaa06c022abd101b674dfbdd6653
+EBUILD rear-1.17.0.ebuild 1255 BLAKE2B afcd0f322104c658b9bfbada162bf498b1fb4689314826a3cef11bab11726d0f50bdac4826d43a0798b2e9a0e58f68875e513f8c035e7911f9fdd7479620b516 SHA512 fe04b73d4105763c99eb267d5fe7bbba9334b629de6423c47b1e6d8ef1461821ce809ff31cb5f2afc966f48f6d759e4c8e9abc6d40f0004ea6c38fcb9e854f36
+EBUILD rear-1.17.1.ebuild 1255 BLAKE2B afcd0f322104c658b9bfbada162bf498b1fb4689314826a3cef11bab11726d0f50bdac4826d43a0798b2e9a0e58f68875e513f8c035e7911f9fdd7479620b516 SHA512 fe04b73d4105763c99eb267d5fe7bbba9334b629de6423c47b1e6d8ef1461821ce809ff31cb5f2afc966f48f6d759e4c8e9abc6d40f0004ea6c38fcb9e854f36
+MISC metadata.xml 959 BLAKE2B 7e442e9959630922fdac4720c014d7e989c59739486180c5435375c5e88611a439ca4520f2cbc929e1c190b2624ae9b4eed1955d49b6a52c8c2594983389ffaa SHA512 eace4c6f5b1a3afdfa0beaa989daeaafe21ddb48a3539cfe9eb5575827a32e9a391289703fc4ed395ff2439d450af58fde6b302b4e0a62821b4cc4e1b401c69a
diff --git a/app-backup/rear/files/rear-1.15-add-support-for-gentoo-kernels.patch b/app-backup/rear/files/rear-1.15-add-support-for-gentoo-kernels.patch
new file mode 100644
index 000000000000..608685418676
--- /dev/null
+++ b/app-backup/rear/files/rear-1.15-add-support-for-gentoo-kernels.patch
@@ -0,0 +1,19 @@
+diff --git a/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh b/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh
+index 6816f37..ec437e4 100644
+--- a/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh
++++ b/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh
+@@ -50,6 +50,14 @@ if [ ! -s "$KERNEL_FILE" ]; then
+ 		else
+ 			Error "Could not find Arch kernel /boot/vmlinuz[-linux|26]"
+ 		fi
++	elif [ -f /etc/gentoo-release ]; then
++		if [ -f "/boot/kernel-genkernel-${REAL_MACHINE}-${KERNEL_VERSION}" ]; then
++     		KERNEL_FILE="/boot/kernel-genkernel-${REAL_MACHINE}-${KERNEL_VERSION}"
++     	elif [ -f "/boot/kernel-${KERNEL_VERSION}" ]; then
++     		KERNEL_FILE="/boot/kernel-${KERNEL_VERSION}"
++		else
++     		Error "Could not find Gentoo kernel"
++		fi
+ 	else
+ 		Error "Could not find a matching kernel in /boot !"
+ 	fi
diff --git a/app-backup/rear/metadata.xml b/app-backup/rear/metadata.xml
new file mode 100644
index 000000000000..a120589d37c4
--- /dev/null
+++ b/app-backup/rear/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>morlix@morlix.de</email>
+		<name>Timo Eissler</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		Relax and Recover (Rear) is the leading Open Source disaster recovery solution, and successor to mkcdrec. It comprises of a modular framework and ready-to-go workflows for many common situations to produce a bootable image and restore from backup using this image. As a benefit, it allows to restore to different hardware and can therefore be used as a migration tool as well.
+	</longdescription>
+	<use>
+		<flag name="udev">Have ReaR start backup when attaching your USB drive.</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">rear</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-backup/rear/rear-1.15-r1.ebuild b/app-backup/rear/rear-1.15-r1.ebuild
new file mode 100644
index 000000000000..b7e163f56dd2
--- /dev/null
+++ b/app-backup/rear/rear-1.15-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="A setup-and-forget Linux bare metal disaster recovery solution"
+HOMEPAGE="http://relax-and-recover.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="libressl udev"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-dialup/mingetty
+	net-fs/nfs-utils
+	sys-apps/iproute2
+	sys-apps/lsb-release
+	sys-apps/util-linux
+	sys-block/parted
+	sys-boot/syslinux
+	virtual/cdrtools
+	udev? ( virtual/udev )
+"
+
+src_prepare () {
+	epatch "${FILESDIR}/${P}-add-support-for-gentoo-kernels.patch"
+}
+
+src_compile () { :; }
+
+src_install () {
+	# Deploy udev USB rule and udev will autostart ReaR workflows in case a USB
+	# drive with the label 'REAR_000' is connected, which in turn is the
+	# default label when running the `rear format` command.
+	if use udev ; then
+		insinto /lib/udev/rules.d
+		doins etc/udev/rules.d/62-${PN}-usb.rules
+	fi
+
+	# Copy main script-file and documentation.
+	dosbin usr/sbin/${PN}
+	doman doc/${PN}.8
+	dodoc README
+
+	# Copy configurations files.
+	insinto /etc
+	doins -r etc/${PN}/
+
+	insinto /usr/share/
+	doins -r usr/share/${PN}/
+}
diff --git a/app-backup/rear/rear-1.17.0.ebuild b/app-backup/rear/rear-1.17.0.ebuild
new file mode 100644
index 000000000000..2aa812a47a1a
--- /dev/null
+++ b/app-backup/rear/rear-1.17.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="A setup-and-forget Linux bare metal disaster recovery solution"
+HOMEPAGE="http://relax-and-recover.org/"
+MY_PV=${PV%.*}
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="libressl udev"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-dialup/mingetty
+	net-fs/nfs-utils
+	sys-apps/gawk
+	sys-apps/iproute2
+	sys-apps/lsb-release
+	sys-apps/util-linux
+	sys-block/parted
+	sys-boot/syslinux
+	virtual/cdrtools
+	udev? ( virtual/udev )
+"
+
+src_compile () { :; }
+
+src_install () {
+	# Deploy udev USB rule and udev will autostart ReaR workflows in case a USB
+	# drive with the label 'REAR_000' is connected, which in turn is the
+	# default label when running the `rear format` command.
+	if use udev ; then
+		insinto /lib/udev/rules.d
+		doins etc/udev/rules.d/62-${PN}-usb.rules
+	fi
+
+	# Copy main script-file and documentation.
+	dosbin usr/sbin/${PN}
+	doman doc/${PN}.8
+	dodoc README
+
+	# Copy configurations files.
+	insinto /etc
+	doins -r etc/${PN}/
+
+	insinto /usr/share/
+	doins -r usr/share/${PN}/
+}
diff --git a/app-backup/rear/rear-1.17.1.ebuild b/app-backup/rear/rear-1.17.1.ebuild
new file mode 100644
index 000000000000..2aa812a47a1a
--- /dev/null
+++ b/app-backup/rear/rear-1.17.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="A setup-and-forget Linux bare metal disaster recovery solution"
+HOMEPAGE="http://relax-and-recover.org/"
+MY_PV=${PV%.*}
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="libressl udev"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-dialup/mingetty
+	net-fs/nfs-utils
+	sys-apps/gawk
+	sys-apps/iproute2
+	sys-apps/lsb-release
+	sys-apps/util-linux
+	sys-block/parted
+	sys-boot/syslinux
+	virtual/cdrtools
+	udev? ( virtual/udev )
+"
+
+src_compile () { :; }
+
+src_install () {
+	# Deploy udev USB rule and udev will autostart ReaR workflows in case a USB
+	# drive with the label 'REAR_000' is connected, which in turn is the
+	# default label when running the `rear format` command.
+	if use udev ; then
+		insinto /lib/udev/rules.d
+		doins etc/udev/rules.d/62-${PN}-usb.rules
+	fi
+
+	# Copy main script-file and documentation.
+	dosbin usr/sbin/${PN}
+	doman doc/${PN}.8
+	dodoc README
+
+	# Copy configurations files.
+	insinto /etc
+	doins -r etc/${PN}/
+
+	insinto /usr/share/
+	doins -r usr/share/${PN}/
+}
diff --git a/app-backup/reoback-1.0_p3-r1 b/app-backup/reoback-1.0_p3-r1
deleted file mode 100644
index ce5bdf72ce01..000000000000
--- a/app-backup/reoback-1.0_p3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=>=app-arch/tar-1.13
-DESCRIPTION=Reoback Backup Solution
-EAPI=5
-HOMEPAGE=http://reoback.sourceforge.net/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.6.1
-SLOT=0
-SRC_URI=mirror://sourceforge/reoback/reoback-1.0_r3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=18eab49f270c6e6f1dcbba0941820784
diff --git a/app-backup/reoback/Manifest b/app-backup/reoback/Manifest
new file mode 100644
index 000000000000..d6ce11f05fe9
--- /dev/null
+++ b/app-backup/reoback/Manifest
@@ -0,0 +1,3 @@
+DIST reoback-1.0_r3.tar.gz 27396 BLAKE2B 65fa4324d1160a240fc2c229d9429eb2f6f535714fe59a1c74ebacf32a349fcb17205e5f22914cd7caddd7218374a1978f43e0295b6d035091362aacc84851ac SHA512 fcec19f284d96c4be96ac4d5bae4a689f777261ae08032da58b7d9c38a3bb1f6ade3825895b93e2b7ad285e0d1371d12f3cf25a7ffe46639ef9e80611941cd2a
+EBUILD reoback-1.0_p3-r1.ebuild 977 BLAKE2B 6dbfaae04e1d430290efb8e9347548a8e409ad1b2d7daeddd12e4843b6d78d191d20a79ec551e20651a9ca7a8f603536124a465ab29dd538100091c688b40658 SHA512 a0c6bf5570b0376a8b75a3fff66bd62fbbf755ee5aab5032de3d1c8a8b78ad6ce3166d1e7c6f95ed6e2905241ff3557b4d819065a7fa9e91ea7e06d51a35306d
+MISC metadata.xml 249 BLAKE2B 9189a92c3cef2b8661b9244720b25c6672f271cd370ec5e2edea32ed00e14906c04990d4bb849a9ed55b03b00490e3b7c88f1da2b89fb36fc540635c426aaa51 SHA512 90f66a23a5c76b064963aa17fcf2c68f48c894e7b95e9214315696d7bbe4f70f0517f2188d15eab391caa8ea0844866e2660edf1087f74959d25c09219e8e993
diff --git a/app-backup/reoback/metadata.xml b/app-backup/reoback/metadata.xml
new file mode 100644
index 000000000000..eb73d556efe4
--- /dev/null
+++ b/app-backup/reoback/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="sourceforge">reoback</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-backup/reoback/reoback-1.0_p3-r1.ebuild b/app-backup/reoback/reoback-1.0_p3-r1.ebuild
new file mode 100644
index 000000000000..5333073fa6b1
--- /dev/null
+++ b/app-backup/reoback/reoback-1.0_p3-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Reoback Backup Solution"
+HOMEPAGE="http://reoback.sourceforge.net/"
+SRC_URI="mirror://sourceforge/reoback/reoback-${PV/_p/_r}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.6.1"
+DEPEND=">=app-arch/tar-1.13"
+
+S=${WORKDIR}/${PN}-${PV/_*}
+
+src_prepare() {
+	ecvs_clean
+	sed \
+		-e '/^config=/s:=.*:=/etc/reoback/settings.conf:' \
+		-e '/^reoback=/s:=.*:=/usr/sbin/reoback.pl:' \
+		-i run_reoback.sh || die
+}
+
+src_install() {
+	dosbin reoback.pl
+	insinto /etc/reoback
+	doins conf/*
+	fperms o-x /usr/sbin/reoback.pl
+	insinto /etc/cron.daily
+	newins run_reoback.sh reoback
+	dodoc docs/{BUGS,CHANGES,INSTALL,MANUALS,README,TODO}
+}
+
+pkg_postinst() {
+	elog "Reoback can now be activated by simply configuring the files in"
+	elog "/etc/reoback and then doing: chmod +x /etc/cron.daily/reoback"
+}
diff --git a/app-backup/restic-0.8.3 b/app-backup/restic-0.8.3
deleted file mode 100644
index c9ec3c2619a7..000000000000
--- a/app-backup/restic-0.8.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=dev-lang/go test? ( sys-fs/fuse:0 ) >=dev-lang/go-1.9
-DESCRIPTION=A backup program that is fast, efficient and secure
-EAPI=6
-HOMEPAGE=https://restic.github.io/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD-2
-RDEPEND=sys-fs/fuse:0
-SLOT=0
-SRC_URI=https://github.com/restic/restic/archive/v0.8.3.tar.gz -> restic-0.8.3.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8f90d3cbe4acf8d6b79af79ebe595e0a
diff --git a/app-backup/restic-0.9.0 b/app-backup/restic-0.9.0
deleted file mode 100644
index 4b7fc93e4c61..000000000000
--- a/app-backup/restic-0.9.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=sys-fs/fuse:0 >=dev-lang/go-1.9
-DESCRIPTION=A backup program that is fast, efficient and secure
-EAPI=6
-HOMEPAGE=https://restic.github.io/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD-2
-RDEPEND=sys-fs/fuse:0
-SLOT=0
-SRC_URI=https://github.com/restic/restic/archive/v0.9.0.tar.gz -> restic-0.9.0.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=7e2dbdbf792732e212edaf20ad8cc9aa
diff --git a/app-backup/restic-0.9.1 b/app-backup/restic-0.9.1
deleted file mode 100644
index 68a3eabac676..000000000000
--- a/app-backup/restic-0.9.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=sys-fs/fuse:0 >=dev-lang/go-1.9
-DESCRIPTION=A backup program that is fast, efficient and secure
-EAPI=6
-HOMEPAGE=https://restic.github.io/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD-2
-RDEPEND=sys-fs/fuse:0
-SLOT=0
-SRC_URI=https://github.com/restic/restic/archive/v0.9.1.tar.gz -> restic-0.9.1.tar.gz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=7e2dbdbf792732e212edaf20ad8cc9aa
diff --git a/app-backup/restic/Manifest b/app-backup/restic/Manifest
new file mode 100644
index 000000000000..6a1e92aded1a
--- /dev/null
+++ b/app-backup/restic/Manifest
@@ -0,0 +1,7 @@
+DIST restic-0.8.3.tar.gz 48746281 BLAKE2B 4161326068165b5ba19e9ee0e6386aa1df29a961a42509a2cb7924958100b9412abd1dd27d299d1eef76fdd4731d4a56f0a68e796a46071229a3e6767d3a6bb7 SHA512 758b2c69af8aad6bb62dc750141d5f5a1954ca2b51350ef59c35fd10afefaddc4d8d0cdd5914f249594946db6138124a48fba531b8a24353f022ccea773a240c
+DIST restic-0.9.0.tar.gz 51049118 BLAKE2B 4089a0eafe0f3778d540ffb87d5d773f1bb4296c3cb7a085a38cc1ac54742392790ccf61145ed3ff19a7e35b358e0b40c7f3edf6ee661e22ffd00efafa2bdee1 SHA512 c01e8450c7afbea59d86a53a5491e562ba5d1ab7fe3e96e0e5b53d96f4df2cf051d7abaef742ff2ecce759e2cd97386566e1c19260f0d74ae678edbe200aa885
+DIST restic-0.9.1.tar.gz 51056544 BLAKE2B eb66381e284c94b17b0fa31f824f41b24a52d04555af6798fa9ac2f1dd0ca168d5e8a9fde922b205c420288002743b86a49a16a939c07a0f3fd942348f0348b6 SHA512 9d365bdcb561255e2103d7170d02e850e5cf767bc2e02e099d57ec9aad719ebd4319446f5162e64437ca9a8e1fdca273fd1c6cc4314013ca07b5ebdbeef93c2a
+EBUILD restic-0.8.3.ebuild 1190 BLAKE2B b67c12c01ad4f69c281ffeeee90eff0dc1eaba5341ff18c519b2183ef1460843a50d7adb9ec518f8affbe3546328f9f488d274ae99071799e7e3d1ef5415fd3a SHA512 980f1040b4f6b2c46598dd6ba70bd3e9bff8d89274002dad12e497f82ff2c0eb362a43e91473da05f982c1b4aad3e19e1124c8fd753fc371eb5f73f7a43f7b17
+EBUILD restic-0.9.0.ebuild 1155 BLAKE2B 2370d9923040125cab0b8831850d5c997638669eb1a1939e3f59a51d27f131b2631ea5866d77ac1ef85e73fd74c54cd3d49aafc619924e7afdc4c888c08f0864 SHA512 5cdd3cff4ff86b0502f8d6e31f647e144a84db086c43d33fd53cdadcebe4f440a84f82f5bc478f2043adc4ac007a1800a33bf97f9c8b4d43fc11ca5d287572bf
+EBUILD restic-0.9.1.ebuild 1155 BLAKE2B 2370d9923040125cab0b8831850d5c997638669eb1a1939e3f59a51d27f131b2631ea5866d77ac1ef85e73fd74c54cd3d49aafc619924e7afdc4c888c08f0864 SHA512 5cdd3cff4ff86b0502f8d6e31f647e144a84db086c43d33fd53cdadcebe4f440a84f82f5bc478f2043adc4ac007a1800a33bf97f9c8b4d43fc11ca5d287572bf
+MISC metadata.xml 444 BLAKE2B f9cc0e8188fbd02a7bacc258eac4052b88fcd3d3b878ce336f7f4635bd4fa94abdfa5112b35bbf6913dcbbfb64833d5f3a4d372c202b2f2488d5d0c750ce2f52 SHA512 8dbd7df10769ff8d0271588be8c97402d5917a4c0dbafa5daad2090245ee4b022193a6c271f71c342540d7599b029998c91c10364eae7d55de0275276342c0f4
diff --git a/app-backup/restic/metadata.xml b/app-backup/restic/metadata.xml
new file mode 100644
index 000000000000..d013f0a0c06a
--- /dev/null
+++ b/app-backup/restic/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>davidroman96@gmail.com</email>
+		<name>David Roman</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">restic/restic</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-backup/restic/restic-0.8.3.ebuild b/app-backup/restic/restic-0.8.3.ebuild
new file mode 100644
index 000000000000..6654fb9c5cce
--- /dev/null
+++ b/app-backup/restic/restic-0.8.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot bash-completion-r1
+
+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"
+
+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
+
+	newbashcomp doc/bash-completion.sh "${PN}"
+
+	insinto /usr/share/zsh/site-functions
+	newins doc/zsh-completion.zsh _restic
+
+	doman doc/man/*
+	dodoc doc/*.rst
+}
diff --git a/app-backup/restic/restic-0.9.0.ebuild b/app-backup/restic/restic-0.9.0.ebuild
new file mode 100644
index 000000000000..89515ce18d02
--- /dev/null
+++ b/app-backup/restic/restic-0.9.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 golang-vcs-snapshot
+
+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"
+
+RDEPEND="sys-fs/fuse:0"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_compile() {
+	local mygoargs=(
+		-v
+		-work
+		-x
+		-tags release
+		-ldflags "-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
+
+	newbashcomp doc/bash-completion.sh "${PN}"
+
+	insinto /usr/share/zsh/site-functions
+	newins doc/zsh-completion.zsh _restic
+
+	doman doc/man/*
+	dodoc doc/*.rst
+}
diff --git a/app-backup/restic/restic-0.9.1.ebuild b/app-backup/restic/restic-0.9.1.ebuild
new file mode 100644
index 000000000000..89515ce18d02
--- /dev/null
+++ b/app-backup/restic/restic-0.9.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 golang-vcs-snapshot
+
+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"
+
+RDEPEND="sys-fs/fuse:0"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_compile() {
+	local mygoargs=(
+		-v
+		-work
+		-x
+		-tags release
+		-ldflags "-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
+
+	newbashcomp doc/bash-completion.sh "${PN}"
+
+	insinto /usr/share/zsh/site-functions
+	newins doc/zsh-completion.zsh _restic
+
+	doman doc/man/*
+	dodoc doc/*.rst
+}
diff --git a/app-backup/rsnapshot-1.3.1-r2 b/app-backup/rsnapshot-1.3.1-r2
deleted file mode 100644
index 1168a3ca049b..000000000000
--- a/app-backup/rsnapshot-1.3.1-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=>=dev-lang/perl-5.8.2 dev-perl/Lchown >=sys-apps/util-linux-2.12-r4 >=sys-apps/coreutils-5.0.91-r4 >=net-misc/openssh-3.7.1_p2-r1 >=net-misc/rsync-2.6.0
-DESCRIPTION=A filesystem backup utility based on rsync
-EAPI=5
-HOMEPAGE=http://www.rsnapshot.org
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.8.2 dev-perl/Lchown >=sys-apps/util-linux-2.12-r4 >=sys-apps/coreutils-5.0.91-r4 >=net-misc/openssh-3.7.1_p2-r1 >=net-misc/rsync-2.6.0
-SLOT=0
-SRC_URI=http://www.rsnapshot.org/downloads/rsnapshot-1.3.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=902a39dea2576b75882b13e5243d4efb
diff --git a/app-backup/rsnapshot-1.4.1 b/app-backup/rsnapshot-1.4.1
deleted file mode 100644
index 6392466e7a84..000000000000
--- a/app-backup/rsnapshot-1.4.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=>=dev-lang/perl-5.8.2 dev-perl/Lchown >=sys-apps/util-linux-2.12-r4 >=sys-apps/coreutils-5.0.91-r4 >=net-misc/openssh-3.7.1_p2-r1 >=net-misc/rsync-2.6.0
-DESCRIPTION=A filesystem backup utility based on rsync
-EAPI=5
-HOMEPAGE=http://www.rsnapshot.org
-KEYWORDS=alpha amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.8.2 dev-perl/Lchown >=sys-apps/util-linux-2.12-r4 >=sys-apps/coreutils-5.0.91-r4 >=net-misc/openssh-3.7.1_p2-r1 >=net-misc/rsync-2.6.0
-SLOT=0
-SRC_URI=http://www.rsnapshot.org/downloads/rsnapshot-1.4.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cd2d79d170794a062262cdafef44ad47
diff --git a/app-backup/rsnapshot-1.4.2 b/app-backup/rsnapshot-1.4.2
deleted file mode 100644
index b1b0c8061dbe..000000000000
--- a/app-backup/rsnapshot-1.4.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=>=dev-lang/perl-5.8.2 dev-perl/Lchown >=sys-apps/util-linux-2.12-r4 >=sys-apps/coreutils-5.0.91-r4 >=net-misc/openssh-3.7.1_p2-r1 >=net-misc/rsync-2.6.0
-DESCRIPTION=A filesystem backup utility based on rsync
-EAPI=6
-HOMEPAGE=http://www.rsnapshot.org
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.8.2 dev-perl/Lchown >=sys-apps/util-linux-2.12-r4 >=sys-apps/coreutils-5.0.91-r4 >=net-misc/openssh-3.7.1_p2-r1 >=net-misc/rsync-2.6.0
-SLOT=0
-SRC_URI=http://www.rsnapshot.org/downloads/rsnapshot-1.4.2.tar.gz
-_md5_=093157295436ca62ce519593acfbb020
diff --git a/app-backup/rsnapshot/Manifest b/app-backup/rsnapshot/Manifest
new file mode 100644
index 000000000000..ab09d1680430
--- /dev/null
+++ b/app-backup/rsnapshot/Manifest
@@ -0,0 +1,9 @@
+AUX rsnapshot-1.3.1-cp_al.patch 535 BLAKE2B fa29c724ff56fdb6ca2c9c966784fe36d2fd93e6f589ac885d449a14ceac01b4027f3f7e286ac61c10469d9d8cab43e53cadb98b603ab6d32462be58feff5b58 SHA512 511b447d914f01c757b85f098846a91d8585a40297a2ae8b7d07101cbbfd3e99a46168a583a64eaf66e236c4716a69fefcce40fd2e0666fd6f3d9aafdb0c783d
+AUX rsnapshot-1.3.1-perl518.patch 349 BLAKE2B 1a19da5968db79ea95aab0da43f4a73d77459bbb3b9924353b147149da0a12731ca6741fb21f63aaba78b52606977f8e75aa6748c9b2e5582a3777e9cf6c52ef SHA512 5e4d43b814b0ade9743a08da0c580b6bb98673aa39127d2dd6fa0993d4b7a6ac163deff5f1ebd9fbf4c95434ef10f4c48d8f55967e1f78866563bcbaaa9d45a0
+DIST rsnapshot-1.3.1.tar.gz 215806 BLAKE2B fe2d31a5bc62577b187e33bf644600fdd2ade845572a3b0ee6ee9ff146dcdab3277cb5494e84ae144c46adda8391304de83ba3cadda8b5e451b63efd9bfd517e SHA512 a74ad0a21d213dd2e05cb577a47c491af90d8994df8f5a154195515345da438ac9c0d72b563aa02314883a0b3bb86e3c23f8b530a7078c2b55a9547a2d666c10
+DIST rsnapshot-1.4.1.tar.gz 489481 BLAKE2B d8170d6b47d15a45b1d14f67cfcb62e854ef49eb071ff0bb5dd5f640a053e6791e8684e38e7a1bf1e14ab459cb850b5a1c840569732a36acf3dd392331af20d5 SHA512 a99e639bd706aafac82d2a4a40fc6c7fa026321c527ad5826a4fc7917cadea5962c4c7988c98efbe06833ef70db081605aa47a6d77c04dcf6077cc232c078cbf
+DIST rsnapshot-1.4.2.tar.gz 487959 BLAKE2B 90a52af1b2b3de5eae7e98f87b87dae4564a7fa5d240d9e844180d6a57bb4e14b4cf762aa0ed6bbdba8deda0436d77e6c5d281ca8b62eba1c3b6caf948ae9432 SHA512 621be52715a6c1f70ddb251d7f6103ba3487cd0c6c607411d744866547d3ced571862a8f6b5e40a1d050696703f3a15821bd6e829a3fca057848f04566d0e4a0
+EBUILD rsnapshot-1.3.1-r2.ebuild 1258 BLAKE2B 9fb8d6fe040b01f9acf781884d6cf8fc486896d6a45ba7d4ff4d6649bd213303a030b48004fad789e88dab81ea3ee8d1b0fca8bf11e2a472b7ad4c966498a08e SHA512 28955d9db87a895dad872c96cbc9afea92593622343bff395b4334af6e281144affee64a84e75fd06bc8eaf5d9bd3abb73197cf434804a8cf8cb4fc59e52340c
+EBUILD rsnapshot-1.4.1.ebuild 1111 BLAKE2B aadee2953a37371d051fa6240916bb96b309b011e56d03310360709afee4e483990170551ec94faff17751bf7ad97524509daffb698d9c9377700b08bbb6a675 SHA512 38915db4b7bccab6134449c1db5da7b81e01d30739e371b4525ec2b4977141f987765f48daa81265429152458e7aa72f7ca68bff5d50a56f6585d757de4a159c
+EBUILD rsnapshot-1.4.2.ebuild 1338 BLAKE2B bea0eb613747e9e498801628cfff794a393e107ca4d36e2b2c84a13110fbd69de6fea2e5d6a0ee15b60153d212b1984ee2674a099299d13af74d5ceb94b2dbb6 SHA512 fb33bc4e043910281ea74f0663d97503878a9965b3c3bf0f32b253034d10a3c09c43cc50ce7140cad7493233906a9a3fc5d20500f6f1b50000bee1ac6d4a8f30
+MISC metadata.xml 385 BLAKE2B 663d1a8524cad5c1ff25711d7f63808109958f264a18c40195b59d2ce03c3ac92dd4812097863fc36b95f6da92c47f7fae820446323b1c4c9973facabbfb8e34 SHA512 1dcdf81afbd2de28c4039e74e12111b7f334717c68ba161951fdea9e327a97f1cbed3e1b50e3dab5e938cd5e022d5399e0c0f1b19f3a8acefc5523eb57804d54
diff --git a/app-backup/rsnapshot/files/rsnapshot-1.3.1-cp_al.patch b/app-backup/rsnapshot/files/rsnapshot-1.3.1-cp_al.patch
new file mode 100644
index 000000000000..7241d6c8c07e
--- /dev/null
+++ b/app-backup/rsnapshot/files/rsnapshot-1.3.1-cp_al.patch
@@ -0,0 +1,12 @@
+diff -ur rsnapshot-1.3.1.original/rsnapshot-program.pl rsnapshot-1.3.1/rsnapshot-program.pl
+--- rsnapshot-1.3.1.original/rsnapshot-program.pl	2006-10-21 08:12:30.000000000 +0200
++++ rsnapshot-1.3.1/rsnapshot-program.pl	2006-11-22 21:37:39.133222510 +0100
+@@ -3269,7 +3269,7 @@
+ 				if (0 == $test) {
+ 					$result = cp_al(
+ 						"$config_vars{'snapshot_root'}/$interval.0/",
+-						"$config_vars{'snapshot_root'}/$interval.1/"
++						"$config_vars{'snapshot_root'}/$interval.1"
+ 					);
+ 					if (! $result) {
+ 						my $errstr = '';
diff --git a/app-backup/rsnapshot/files/rsnapshot-1.3.1-perl518.patch b/app-backup/rsnapshot/files/rsnapshot-1.3.1-perl518.patch
new file mode 100644
index 000000000000..367055d5cc96
--- /dev/null
+++ b/app-backup/rsnapshot/files/rsnapshot-1.3.1-perl518.patch
@@ -0,0 +1,17 @@
+Fixed man-page creation with pod2man from >=perl-5.18
+
+https://bugs.gentoo.org/490486
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+
+--- rsnapshot-1.3.1/rsnapshot-program.pl
++++ rsnapshot-1.3.1/rsnapshot-program.pl
+@@ -6716,6 +6716,8 @@
+ 
+ =back
+ 
++=back
++
+ =head1 USAGE
+ 
+ B<rsnapshot> can be used by any user, but for system-wide backups
diff --git a/app-backup/rsnapshot/metadata.xml b/app-backup/rsnapshot/metadata.xml
new file mode 100644
index 000000000000..41d4a20db9c6
--- /dev/null
+++ b/app-backup/rsnapshot/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>Sergiy.Borodych@gmail.com</email>
+    <name>Sergiy Borodych</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-backup/rsnapshot/rsnapshot-1.3.1-r2.ebuild b/app-backup/rsnapshot/rsnapshot-1.3.1-r2.ebuild
new file mode 100644
index 000000000000..bde8688ca3f2
--- /dev/null
+++ b/app-backup/rsnapshot/rsnapshot-1.3.1-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A filesystem backup utility based on rsync"
+HOMEPAGE="http://www.rsnapshot.org"
+SRC_URI="http://www.rsnapshot.org/downloads/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.8.2
+		dev-perl/Lchown
+		>=sys-apps/util-linux-2.12-r4
+		>=sys-apps/coreutils-5.0.91-r4
+		>=net-misc/openssh-3.7.1_p2-r1
+		>=net-misc/rsync-2.6.0"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cp_al.patch \
+		"${FILESDIR}"/${P}-perl518.patch
+}
+
+src_install() {
+	# Change sysconfdir to install the template file as documentation
+	# rather than in /etc.
+	emake install DESTDIR="${D}" \
+		sysconfdir="${EPREFIX}/usr/share/doc/${PF}"
+
+	dodoc README AUTHORS TODO ChangeLog \
+		docs/Upgrading_from_1.1 \
+		docs/HOWTOs/rsnapshot-{Mac,windows}-howto
+
+	docinto utils
+	dodoc utils/{README,rsnaptar,*.sh,*.pl}
+
+	docinto utils/rsnapshotdb
+	dodoc utils/rsnapshotdb/*
+}
+
+pkg_postinst() {
+	elog "The template configuration file has been installed as"
+	elog "/usr/share/doc/${PF}/rsnapshot.conf.default"
+	elog "Copy and edit the the above file as /etc/rsnapshot.conf"
+}
diff --git a/app-backup/rsnapshot/rsnapshot-1.4.1.ebuild b/app-backup/rsnapshot/rsnapshot-1.4.1.ebuild
new file mode 100644
index 000000000000..c7bf113fb38b
--- /dev/null
+++ b/app-backup/rsnapshot/rsnapshot-1.4.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A filesystem backup utility based on rsync"
+HOMEPAGE="http://www.rsnapshot.org"
+SRC_URI="http://www.rsnapshot.org/downloads/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=dev-lang/perl-5.8.2
+		dev-perl/Lchown
+		>=sys-apps/util-linux-2.12-r4
+		>=sys-apps/coreutils-5.0.91-r4
+		>=net-misc/openssh-3.7.1_p2-r1
+		>=net-misc/rsync-2.6.0"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	# Change sysconfdir to install the template file as documentation
+	# rather than in /etc.
+	emake install DESTDIR="${D}" \
+		sysconfdir="${EPREFIX}/usr/share/doc/${PF}"
+
+	dodoc README.md AUTHORS ChangeLog \
+		docs/Upgrading_from_1.1
+
+	docinto utils
+	dodoc utils/{README,rsnaptar,*.sh,*.pl}
+
+	docinto utils/rsnapshotdb
+	dodoc utils/rsnapshotdb/*
+}
+
+pkg_postinst() {
+	elog "The template configuration file has been installed as"
+	elog "/usr/share/doc/${PF}/rsnapshot.conf.default"
+	elog "Copy and edit the the above file as /etc/rsnapshot.conf"
+}
diff --git a/app-backup/rsnapshot/rsnapshot-1.4.2.ebuild b/app-backup/rsnapshot/rsnapshot-1.4.2.ebuild
new file mode 100644
index 000000000000..ddb24de4790a
--- /dev/null
+++ b/app-backup/rsnapshot/rsnapshot-1.4.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A filesystem backup utility based on rsync"
+HOMEPAGE="http://www.rsnapshot.org"
+SRC_URI="http://www.rsnapshot.org/downloads/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+RDEPEND=">=dev-lang/perl-5.8.2
+		dev-perl/Lchown
+		>=sys-apps/util-linux-2.12-r4
+		>=sys-apps/coreutils-5.0.91-r4
+		>=net-misc/openssh-3.7.1_p2-r1
+		>=net-misc/rsync-2.6.0"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	# remove '/etc/' since we don't place it here, bug #461554
+	sed -i -e 's:/etc/rsnapshot.conf.default:rsnapshot.conf.default:' rsnapshot-program.pl || die
+}
+
+src_install() {
+	docompress -x "/usr/share/doc/${PF}/rsnapshot.conf.default"
+
+	# Change sysconfdir to install the template file as documentation
+	# rather than in /etc.
+	emake install DESTDIR="${D}" \
+		sysconfdir="${EPREFIX}/usr/share/doc/${PF}"
+
+	dodoc README.md AUTHORS ChangeLog \
+		docs/Upgrading_from_1.1
+
+	docinto utils
+	dodoc utils/{README,rsnaptar,*.sh,*.pl}
+
+	docinto utils/rsnapshotdb
+	dodoc utils/rsnapshotdb/*
+}
+
+pkg_postinst() {
+	elog "The template configuration file has been installed as"
+	elog "  /usr/share/doc/${PF}/rsnapshot.conf.default"
+	elog "Copy and edit the the above file as /etc/rsnapshot.conf"
+}
diff --git a/app-backup/sarab-1.0.0 b/app-backup/sarab-1.0.0
deleted file mode 100644
index 839486f2ae40..000000000000
--- a/app-backup/sarab-1.0.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=SaraB is a powerful and automated backup scheduling system based on DAR
-EAPI=6
-HOMEPAGE=http://sarab.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-backup/dar virtual/mailx
-SLOT=0
-SRC_URI=mirror://sourceforge/sarab/sarab-1.0.0.tar.gz
-_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
-_md5_=3d1dab619fc96ad74147d9811c125df1
diff --git a/app-backup/sarab/Manifest b/app-backup/sarab/Manifest
new file mode 100644
index 000000000000..fdae0a5bfb16
--- /dev/null
+++ b/app-backup/sarab/Manifest
@@ -0,0 +1,5 @@
+AUX 1.0.0-better-defaults-gentoo.patch 809 BLAKE2B 4c06df38ee68c612ebf671334d99c30d21bcea5bc16ad1b1e9c38e2824e503a12aa189f2aae254c991bf71de96244374ee1ef7ed180454905bba316705ed7676 SHA512 733484580782296c344d9c2ec69d4948359fef9c7513d9d481756c9f80fb4a369919dbbae01489dfba4b560d6c8077c755a31fcc74ba01f99148f3f63824fcee
+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 955 BLAKE2B dcf58aefc12cbbbbdcc76fcc1adbdff349d5282b348e54f477f22221b18ee207046b758c4219f26bf6d9c115e6e0c5902a6faf77b526afe70ad7c7c881a4aa6c SHA512 77e8deaac5fa43aead91a0a431ae9816e5e6b98db08815645ef4d901e74e7cd8fef7854daf6c6cba658e9a20f44b5695ae979644e1c3b7f6371045d8a35e7a9d
+MISC metadata.xml 545 BLAKE2B 87704a0d959232fe1644ced86be57804036dee9f61af88d07ca4f356dfb023f862c4bf792bddfc6b9c67c02bdf57b7eaec7b4050a3b21472ac3a96a0de5cf89f SHA512 fc6b600c6047c1f2216964ae23abbe5de1516fa7b72d531eb9ddddd1d3feac2dcb30c3c769032046f225e8770483a76e01464ead26082369fba0d53f330da30f
diff --git a/app-backup/sarab/files/1.0.0-better-defaults-gentoo.patch b/app-backup/sarab/files/1.0.0-better-defaults-gentoo.patch
new file mode 100644
index 000000000000..ecb8b558e067
--- /dev/null
+++ b/app-backup/sarab/files/1.0.0-better-defaults-gentoo.patch
@@ -0,0 +1,21 @@
+--- sarab-1.0.0.orig/etc/sarab.conf	2010-02-21 06:13:22.000000000 -0500
++++ sarab-1.0.0/etc/sarab.conf	2010-08-20 18:30:41.630323933 -0400
+@@ -76,10 +76,10 @@
+ 
+ # The location of the DAR executable file
+ # This line is only effective if not added by install.sh later in this file
+-DAR_BINARY="/usr/local/bin/dar"
++DAR_BINARY="/usr/bin/dar"
+ 
+ # The location of the statically-compiled DAR executable file
+-DAR_STATIC="/usr/local/bin/dar_static"
++DAR_STATIC="/usr/bin/dar_static"
+ 
+ # The temporary directory name that backups will be created in. This will be created underneath $DESTINATION.
+ WORK_DIR=".sarab_temp_workdir"
+@@ -88,4 +88,4 @@
+ DAR_CREATE="$DESTINATION/$WORK_DIR/$BASENAME"
+ 
+ # Location and name of temporary log file
+-TEMP_LOG="$SARAB_ETC/sarab_temp.log"
++TEMP_LOG="/var/log/sarab_temp.log"
diff --git a/app-backup/sarab/files/README.gentoo b/app-backup/sarab/files/README.gentoo
new file mode 100644
index 000000000000..46359913c729
--- /dev/null
+++ b/app-backup/sarab/files/README.gentoo
@@ -0,0 +1,13 @@
+-*- outline -*-
+
+Gentoo GNU/Linux specific notes for SaraB
+-----------------------------------------
+
+This is the README.Gentoo file from /usr/share/doc/@PF@/ directory.
+
+  * The Gentoo port includes more reasonable pathnames for the example
+    configuration.
+
+If you encounter any problems or have suggestions, use https://bugs.gentoo.org.
+Please don't bother the upstream authors unless you are absolutely certain it is
+not Gentoo-related.
diff --git a/app-backup/sarab/metadata.xml b/app-backup/sarab/metadata.xml
new file mode 100644
index 000000000000..71ee597ed5ae
--- /dev/null
+++ b/app-backup/sarab/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>rich0@gentoo.org</email>
+  </maintainer>
+  <longdescription>
+SaraB works with DAR (Disk ARchive) to schedule backups.  SaraB provides a
+powerful, automated rotation schedule which allows administrators to create a
+custom rotation that fits the needs of their network.
+</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">sarab</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-backup/sarab/sarab-1.0.0.ebuild b/app-backup/sarab/sarab-1.0.0.ebuild
new file mode 100644
index 000000000000..896edbcc95c8
--- /dev/null
+++ b/app-backup/sarab/sarab-1.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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
+	virtual/mailx"
+
+PATCHES=( "${FILESDIR}"/${PV}-better-defaults-gentoo.patch )
+
+src_install() {
+	dobin sarab.sh
+	einstalldocs
+
+	insinto /etc/sarab
+	doins -r etc/.
+	# sarab.conf could contain passphrase information
+	fperms 600 /etc/sarab/sarab.conf
+
+	readme.gentoo_create_doc
+}
+
+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/simplebackup-1.8.1-r1 b/app-backup/simplebackup-1.8.1-r1
deleted file mode 100644
index 50a72280db20..000000000000
--- a/app-backup/simplebackup-1.8.1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Cross-platform backup program
-EAPI=6
-HOMEPAGE=http://migas-sbackup.sourceforge.net/
-IUSE=sasl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl sasl? ( dev-perl/Authen-SASL )
-SLOT=0
-SRC_URI=mirror://sourceforge/migas-sbackup/simplebackup-1.8.1.tar.gz
-_md5_=035fa6138e45213cda284b52ee2b952b
diff --git a/app-backup/simplebackup/Manifest b/app-backup/simplebackup/Manifest
new file mode 100644
index 000000000000..7ef5a4acdc7d
--- /dev/null
+++ b/app-backup/simplebackup/Manifest
@@ -0,0 +1,3 @@
+DIST simplebackup-1.8.1.tar.gz 9630257 BLAKE2B bd6dde849ee2a72b6345993a4018d7d5a502960ba65c5802598ef5dca602df8a6404c18781d17aef084863b777ffe1807cbbeb9d76bc80d4b3060d0ba012faa7 SHA512 0c6c6fad99817b794c557f1d55420211b3e58de004b239b2be4c21cd88ab04ffc9a793fb55eae3bddb6b84eb7e53f0b19d3932d17579d0f3f68f024214eeb71d
+EBUILD simplebackup-1.8.1-r1.ebuild 530 BLAKE2B 2edee2b9a20a4854861e124a5edc60e7da28a72aebff59e73e15593464e1b5cbd3c895b22bc764a7341c9a9b7dfea885239e5c05b96b80a9ca40050e3569f428 SHA512 24eabe3700b1215116e3214593d98bc63f1d32eaa57af13bca326fb2ba58c0d92f4b8c0addf636dbf5289adbf25ebf640aa31bf821ac70a792db721465a0fa6e
+MISC metadata.xml 250 BLAKE2B ba248d38dfc24150932db7cc5f3208fcc6778f8dd533b058ef351ad0f4073d833c86e2089efa1ea955aa345eaa33e3b455f4133bb9572a05daaff08d12c3762b SHA512 59c453803c29ef3837b19d5da16e6ed122f8a15e4099bcd12deedb209e4d873037a7c92f281a326e4265044eaf08279ce2e0c6a0e11d65b4b3969624e3c9341c
diff --git a/app-backup/simplebackup/metadata.xml b/app-backup/simplebackup/metadata.xml
new file mode 100644
index 000000000000..59179617779e
--- /dev/null
+++ b/app-backup/simplebackup/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">migas-sbackup</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-backup/simplebackup/simplebackup-1.8.1-r1.ebuild b/app-backup/simplebackup/simplebackup-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..3c933c229773
--- /dev/null
+++ b/app-backup/simplebackup/simplebackup-1.8.1-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Cross-platform backup program"
+HOMEPAGE="http://migas-sbackup.sourceforge.net/"
+SRC_URI="mirror://sourceforge/migas-sbackup/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sasl"
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+	sasl? ( dev-perl/Authen-SASL )"
+
+S="${WORKDIR}/${P}/unix"
+
+src_compile() {
+	return;
+}
+
+src_install() {
+	newbin simplebackup.pl simplebackup
+	dodoc ../unix_readme.txt
+}
diff --git a/app-backup/snapper-0.2.8-r1 b/app-backup/snapper-0.2.8-r1
deleted file mode 100644
index 8348613e6602..000000000000
--- a/app-backup/snapper-0.2.8-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/boost:=[threads] dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux sys-libs/zlib virtual/libintl btrfs? ( >=sys-fs/btrfs-progs-3.17.1 ) ext4? ( sys-fs/e2fsprogs ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr ) sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Command-line program for btrfs and ext4 snapshot management
-EAPI=5
-HOMEPAGE=http://snapper.io/
-IUSE=+btrfs ext4 lvm pam xattr
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:=[threads] dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux sys-libs/zlib virtual/libintl btrfs? ( >=sys-fs/btrfs-progs-3.17.1 ) ext4? ( sys-fs/e2fsprogs ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr )
-REQUIRED_USE=|| ( btrfs ext4 lvm )
-SLOT=0
-SRC_URI=ftp://ftp.suse.com/pub/projects/snapper/snapper-0.2.8.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3b4f7de64234551aecb095664dc50982
diff --git a/app-backup/snapper-0.3.3 b/app-backup/snapper-0.3.3
deleted file mode 100644
index 5d7ee1bc408b..000000000000
--- a/app-backup/snapper-0.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/boost:=[threads] dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux sys-libs/zlib virtual/libintl btrfs? ( >=sys-fs/btrfs-progs-3.17.1 ) ext4? ( sys-fs/e2fsprogs ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr ) sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Command-line program for btrfs and ext4 snapshot management
-EAPI=5
-HOMEPAGE=http://snapper.io/
-IUSE=+btrfs ext4 lvm pam xattr
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:=[threads] dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux sys-libs/zlib virtual/libintl btrfs? ( >=sys-fs/btrfs-progs-3.17.1 ) ext4? ( sys-fs/e2fsprogs ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr )
-REQUIRED_USE=|| ( btrfs ext4 lvm )
-SLOT=0
-SRC_URI=ftp://ftp.suse.com/pub/projects/snapper/snapper-0.3.3.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f76b191e4140e441de82776c8ef7123e
diff --git a/app-backup/snapper-0.4.1 b/app-backup/snapper-0.4.1
deleted file mode 100644
index 1899f2a44859..000000000000
--- a/app-backup/snapper-0.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/boost:=[threads] dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux sys-libs/zlib virtual/libintl btrfs? ( >=sys-fs/btrfs-progs-3.17.1 ) ext4? ( sys-fs/e2fsprogs ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr ) sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Command-line program for btrfs and ext4 snapshot management
-EAPI=5
-HOMEPAGE=http://snapper.io/
-IUSE=+btrfs ext4 lvm pam xattr
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:=[threads] dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux sys-libs/zlib virtual/libintl btrfs? ( >=sys-fs/btrfs-progs-3.17.1 ) ext4? ( sys-fs/e2fsprogs ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr )
-REQUIRED_USE=|| ( btrfs ext4 lvm )
-SLOT=0
-SRC_URI=ftp://ftp.suse.com/pub/projects/snapper/snapper-0.4.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f76b191e4140e441de82776c8ef7123e
diff --git a/app-backup/snapper-0.5.0 b/app-backup/snapper-0.5.0
deleted file mode 100644
index 5bce00d01570..000000000000
--- a/app-backup/snapper-0.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/boost:=[threads] dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux sys-libs/zlib virtual/libintl btrfs? ( >=sys-fs/btrfs-progs-3.17.1 ) ext4? ( sys-fs/e2fsprogs ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr ) sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Command-line program for btrfs and ext4 snapshot management
-EAPI=6
-HOMEPAGE=http://snapper.io/
-IUSE=+btrfs ext4 lvm pam xattr
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:=[threads] dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux sys-libs/zlib virtual/libintl btrfs? ( >=sys-fs/btrfs-progs-3.17.1 ) ext4? ( sys-fs/e2fsprogs ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr )
-REQUIRED_USE=|| ( btrfs ext4 lvm )
-SLOT=0
-SRC_URI=ftp://ftp.suse.com/pub/projects/snapper/snapper-0.5.0.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bcb7391c01ba82a9cf186b382ca21cf2
diff --git a/app-backup/snapper-0.5.4 b/app-backup/snapper-0.5.4
deleted file mode 100644
index 4041b2160ab0..000000000000
--- a/app-backup/snapper-0.5.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/boost:=[threads] dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux >=sys-fs/btrfs-progs-3.17.1 sys-libs/zlib virtual/libintl lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr ) sys-devel/gettext virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Command-line program for btrfs and lvm snapshot management
-EAPI=6
-HOMEPAGE=http://snapper.io/
-IUSE=lvm pam xattr
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:=[threads] dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux >=sys-fs/btrfs-progs-3.17.1 sys-libs/zlib virtual/libintl lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr )
-SLOT=0
-SRC_URI=ftp://ftp.suse.com/pub/projects/snapper/snapper-0.5.4.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=272fdcff17ab16c69823aa0124de84bc
diff --git a/app-backup/snapper-9999 b/app-backup/snapper-9999
deleted file mode 100644
index db2902d3fc62..000000000000
--- a/app-backup/snapper-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=dev-libs/boost:=[threads] dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux sys-libs/zlib virtual/libintl btrfs? ( >=sys-fs/btrfs-progs-3.17.1 ) ext4? ( sys-fs/e2fsprogs ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr ) sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Command-line program for btrfs and ext4 snapshot management
-EAPI=5
-HOMEPAGE=http://snapper.io/
-IUSE=+btrfs ext4 lvm pam xattr
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:=[threads] dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux sys-libs/zlib virtual/libintl btrfs? ( >=sys-fs/btrfs-progs-3.17.1 ) ext4? ( sys-fs/e2fsprogs ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr )
-REQUIRED_USE=|| ( btrfs ext4 lvm )
-SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e3526658c0fce44782ff33a4fa7f5e9a
diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
new file mode 100644
index 000000000000..cf81281beb17
--- /dev/null
+++ b/app-backup/snapper/Manifest
@@ -0,0 +1,14 @@
+AUX cron-confd.patch 916 BLAKE2B 52672e59ebbfde9dd120516d9c0fb80443b8bfe38d08ec943956005a3d07aa1ed3e9273c572730722a02d3b841859dbc8d3fa81e89e87d6958251abec016716c SHA512 7f0872b14f1fa6b3c7990a9b219a0b2c0b941b1376fb89eda6e4fdf4b3b37818d0114febdb21d2432f5b1c08f1ba4354936d556c1c26953a0fe0f3196d699aa7
+AUX snapper-0.5.0-gcc6.patch 482 BLAKE2B e7291ba147c9118eeaa8aafe6e7e0b3c821530db452704da073185c49bbb9085ee0d24101d303d3d40573b0a8b79f0237ff7d6a15c76eaa09652c8db17ac745a SHA512 b512cff8a9cd7038f8ad39eaadaed7092278f9b2dadb31a6ba449d05dfab38513507779576fedf52333ebe6b0d8158722ff15afa2b43cd13cfdc25c7917bfa0c
+DIST snapper-0.2.8.tar.bz2 475053 BLAKE2B f6e4046f572ce70bc811e99bfe53d043ab2ca381219113d5c871b3b85a33b9bf1e28ea4e62a7410335788d4f6dea90b16ed63c7eb681d3e6c5ec4f62c827bc28 SHA512 ce1529062943c34b9de2eafb62c6e28b39bda6f4afc23ec5df5ddd42f213cbaf0d77d94d11d982285114ceecd27bd48206436119af84b2769ed4792aab01c75d
+DIST snapper-0.3.3.tar.bz2 545800 BLAKE2B dca7b6912beb015335324144ca60e1f4667e96cb3d057ced4c68b7bc66a4895f2b3c068582137cd40fd5a267f3178e462029428154c860f67846163adba05c5d SHA512 f24f6d121f9a613549899b7bf3751f6d9c101db716d7bc3858a2add9f90e08861fc46927ce0130efc232240a91e24934820d0c2b1b65f206ac80d04cdaaec39d
+DIST snapper-0.4.1.tar.bz2 570673 BLAKE2B 7b36cac2bdb84d80817be496ba1aa0984ba48680468bfc04fa47a10f452da0dbe1a94fac70d6c7a8ba03f76047ebbba579924f35b4e86c2d30c28e222cba38ec SHA512 23d12a4685039ce629333854bc3e8a90a524bf1207590102ccfbc358473e7bef9ca6a723d2bc8a2f0f7466c4b34dce724b806d24762ae54b26292e730a10a70c
+DIST snapper-0.5.0.tar.bz2 571716 BLAKE2B 3eb1db265566d0129c3177dcf8d62848108df918eb705ae149672664e215a17b760279e35d1ac658b18bb6e6fa05f5102d05c3a00e45fbfe73093b073fc3f8f9 SHA512 37487a1230825dc5d533e5c864965d9d05c2a3f4e12e5ae910f2721ef2497be2dafedcd13148d7246896551eae11cbcb925e04b58f799ea3d644eea329d3da29
+DIST snapper-0.5.4.tar.bz2 579172 BLAKE2B ce23b56047b818946f1b885308abd21ce6df216b890f784c3b57d8bd44a0a26bebf992b4d2a8ff36e11e096b0d589197e81bf223dd018feb9dcbeaa04c03a904 SHA512 fed417ef817526ab8c2110a70f5e9750642d7f427619efa52c2ed2e3adb83ff47314cdd8843e6331ce1c37fca79367a0a5ff8c6ba394602b24399eb5e6b97cd0
+EBUILD snapper-0.2.8-r1.ebuild 1543 BLAKE2B 0ac296d81e513470b43725f11bf325e4eb0e8a1945898b6c6785fa49a57cd1e576e129541c9a6ecf80ca4b26c372957640ceaecce853883124efa94a378d9b49 SHA512 5dc08d9e9a85984e3bd8ba2c6797f7d37d385fd767498ccf6b44c18e75ef18d7c928b9501caa53e3b3e520426f59dfd345f0984e7e0c0b9ab0d081529ece3576
+EBUILD snapper-0.3.3.ebuild 1536 BLAKE2B 639a2e6893158981d8f405465aae73f51438ec424bc6cf8fafa75299667b4a36a4ba627b774651c53407474cd3571872f84261ba02bee9fcbe33d7a001dfe871 SHA512 11e40f5df3d6af95b4186493bd1b216b2354d2b1d0eb7b65d1002737c15ca651acd0ac7dd27a3a93a840d010b9dff223a7130270aab30f7e668df6669f237f42
+EBUILD snapper-0.4.1.ebuild 1536 BLAKE2B 639a2e6893158981d8f405465aae73f51438ec424bc6cf8fafa75299667b4a36a4ba627b774651c53407474cd3571872f84261ba02bee9fcbe33d7a001dfe871 SHA512 11e40f5df3d6af95b4186493bd1b216b2354d2b1d0eb7b65d1002737c15ca651acd0ac7dd27a3a93a840d010b9dff223a7130270aab30f7e668df6669f237f42
+EBUILD snapper-0.5.0.ebuild 1583 BLAKE2B b32c38f849fd77202d3557e8aae208bb2e9d304cd042d1f32f5760aa73365e8a7b694b83e9db860478eb4f0c14ac103367981219819106d5963205fd8a270c01 SHA512 052e15517c42a84ab74dec462ad2f3afc8a9498d8b94692cbb0e0672c19a47c06a2d0383b3e790dff33e08a807eb97405c346d92f2b3a5bbc09503be6157aced
+EBUILD snapper-0.5.4.ebuild 1694 BLAKE2B eb03d7133e4094ffcbedbdc4aed28bcfdda6edb8eb34515c09d13e1b63f4724ddcc19637ebeb2c25f4945cb7e5fff67db99d852e98e171ef90c03af00923599b SHA512 d0156ebcbf1f0797f63eaedb6776993326fff17b8be3b673dbb87be29a84416419723e4bfdac5d9ae64cb188a51880831c9df2e5defa1e030d38bd1f32f28383
+EBUILD snapper-9999.ebuild 1615 BLAKE2B 01177dd4a732938924c25fe054e7a415856192a295f64a8ac0a753a2ec0aeebcf83d464f9c545b88cc3a2b6306c01dd648f91b45c70fceceeedde5b0776e0678 SHA512 e6d8980d625a32f9787e4f0bc25ad0390fd7f0b1b2a43845074abe5e585caf141eaceac5bde8bd0050c891828630c9e74827586167b3ec00f7c618694efe9c79
+MISC metadata.xml 1456 BLAKE2B 327ecba708769cd77e1cd785f178f124cdfa37bf3ba1a3e90161f673fdb10d823a3a1aa14b73877345ed39a71014c5cc51836fe7a539e2c62cc992f473deb31b SHA512 9954576d7d44f0f1a20a5bd5168a6b9c5968ad1a47708a198ae8b4a7054863c2de1c58d9d6108a3dcabf944fb5f266ffe6451be5c2b924636cc53380b2779976
diff --git a/app-backup/snapper/files/cron-confd.patch b/app-backup/snapper/files/cron-confd.patch
new file mode 100644
index 000000000000..473e749d0bb2
--- /dev/null
+++ b/app-backup/snapper/files/cron-confd.patch
@@ -0,0 +1,32 @@
+diff -u old/scripts/snapper-daily new/scripts/snapper-daily
+--- old/scripts/snapper-daily   2014-01-29 17:48:30.000000000 +0200
++++ new/scripts/snapper-daily   2014-02-19 13:32:22.702734875 +0200
+@@ -9,10 +9,10 @@
+ 
+ 
+ #
+-# get information from /etc/sysconfig/snapper
++# get information from /etc/conf.d/snapper
+ #
+-if [ -f /etc/sysconfig/snapper ] ; then
+-    . /etc/sysconfig/snapper
++if [ -f /etc/conf.d/snapper ] ; then
++    . /etc/conf.d/snapper
+ fi
+ 
+ 
+diff -u old/scripts/snapper-hourly new/scripts/snapper-hourly
+--- old/scripts/snapper-hourly  2014-01-29 17:48:30.000000000 +0200
++++ new/scripts/snapper-hourly  2014-02-19 13:32:43.609166927 +0200
+@@ -9,10 +9,10 @@
+ 
+ 
+ #
+-# get information from /etc/sysconfig/snapper
++# get information from /etc/conf.d/snapper
+ #
+-if [ -f /etc/sysconfig/snapper ] ; then
+-    . /etc/sysconfig/snapper
++if [ -f /etc/conf.d/snapper ] ; then
++    . /etc/conf.d/snapper
+ fi
diff --git a/app-backup/snapper/files/snapper-0.5.0-gcc6.patch b/app-backup/snapper/files/snapper-0.5.0-gcc6.patch
new file mode 100644
index 000000000000..2720ae57f71f
--- /dev/null
+++ b/app-backup/snapper/files/snapper-0.5.0-gcc6.patch
@@ -0,0 +1,21 @@
+From 2e3812d2c1d1f54861fb79f5c2b0197de96a00a3 Mon Sep 17 00:00:00 2001
+From: Arvin Schnell <aschnell@suse.de>
+Date: Wed, 6 Sep 2017 09:49:38 +0200
+Subject: [PATCH] - added include statement
+
+---
+ client/cleanup.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/client/cleanup.cc b/client/cleanup.cc
+index 0dbfc03..d7f2f68 100644
+--- a/client/cleanup.cc
++++ b/client/cleanup.cc
+@@ -21,6 +21,7 @@
+  */
+ 
+ 
++#include <iostream>
+ #include <vector>
+ 
+ #include "dbus/DBusMessage.h"
diff --git a/app-backup/snapper/metadata.xml b/app-backup/snapper/metadata.xml
new file mode 100644
index 000000000000..4b63f78f6038
--- /dev/null
+++ b/app-backup/snapper/metadata.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription>
+		Snapper is a command-line program for filesystem snapshot management.
+		It can create, delete and compare snapshots and undo changes done
+		between  snapshots. It supports both btrfs and ext4.
+	</longdescription>
+	<maintainer type="person">
+		<email>pastas4@gmail.com</email>
+		<name>Dainius Masiliūnas (GreatEmerald)</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>aschnell@suse.de</email>
+			<name>Arvin Schnell</name>
+		</maintainer>
+		<changelog>https://raw.github.com/openSUSE/snapper/master/package/snapper.changes</changelog>
+		<bugs-to>https://bugzilla.novell.com/</bugs-to>
+		<remote-id type="github">openSUSE/snapper</remote-id>
+	</upstream>
+	<use>
+		<flag name="xattr">
+		Add support for getting and setting POSIX extended attributes, through
+		<pkg>sys-apps/attr</pkg>.
+		</flag>
+		<flag name="btrfs">Include Btrfs support <pkg>sys-fs/btrfs-progs</pkg></flag>
+		<flag name="ext4">Include Ext4 support <pkg>sys-fs/e2fsprogs</pkg></flag>
+		<flag name="lvm">Enable LVM thinprovisioned snapshots support <pkg>sys-fs/lvm2</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/app-backup/snapper/snapper-0.2.8-r1.ebuild b/app-backup/snapper/snapper-0.2.8-r1.ebuild
new file mode 100644
index 000000000000..9b4de6eddcc3
--- /dev/null
+++ b/app-backup/snapper/snapper-0.2.8-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Command-line program for btrfs and ext4 snapshot management"
+HOMEPAGE="http://snapper.io/"
+SRC_URI="ftp://ftp.suse.com/pub/projects/snapper/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+btrfs ext4 lvm pam xattr"
+
+RDEPEND="dev-libs/boost:=[threads]
+	dev-libs/libxml2
+	dev-libs/icu:=
+	sys-apps/acl
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libintl
+	btrfs? ( >=sys-fs/btrfs-progs-3.17.1 )
+	ext4? ( sys-fs/e2fsprogs )
+	lvm? ( sys-fs/lvm2 )
+	pam? ( sys-libs/pam )
+	xattr? ( sys-apps/attr )"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+REQUIRED_USE="|| ( btrfs ext4 lvm )"
+
+DOCS=( AUTHORS README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/cron-confd.patch
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-conf="/etc/conf.d"
+		--docdir="/usr/share/doc/${PF}"
+		--disable-zypp
+		--enable-rollback
+		$(use_enable btrfs)
+		$(use_enable ext4)
+		$(use_enable lvm)
+		$(use_enable pam)
+		$(use_enable xattr xattrs)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# Existing configuration file required to function
+	newconfd data/sysconfig.snapper snapper
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	elog "In order to use Snapper, you need to set up"
+	elog "at least one config first. To do this, run:"
+	elog "snapper create-config <subvolume>"
+	elog "For more information, see man (8) snapper or"
+	elog "http://snapper.io/documentation.html"
+}
diff --git a/app-backup/snapper/snapper-0.3.3.ebuild b/app-backup/snapper/snapper-0.3.3.ebuild
new file mode 100644
index 000000000000..891e694a6f05
--- /dev/null
+++ b/app-backup/snapper/snapper-0.3.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Command-line program for btrfs and ext4 snapshot management"
+HOMEPAGE="http://snapper.io/"
+SRC_URI="ftp://ftp.suse.com/pub/projects/snapper/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+btrfs ext4 lvm pam xattr"
+
+RDEPEND="dev-libs/boost:=[threads]
+	dev-libs/libxml2
+	dev-libs/icu:=
+	sys-apps/acl
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libintl
+	btrfs? ( >=sys-fs/btrfs-progs-3.17.1 )
+	ext4? ( sys-fs/e2fsprogs )
+	lvm? ( sys-fs/lvm2 )
+	pam? ( sys-libs/pam )
+	xattr? ( sys-apps/attr )"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+REQUIRED_USE="|| ( btrfs ext4 lvm )"
+
+DOCS=( AUTHORS )
+
+src_prepare() {
+	epatch "${FILESDIR}"/cron-confd.patch
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-conf="/etc/conf.d"
+		--docdir="/usr/share/doc/${PF}"
+		--disable-zypp
+		--enable-rollback
+		$(use_enable btrfs)
+		$(use_enable ext4)
+		$(use_enable lvm)
+		$(use_enable pam)
+		$(use_enable xattr xattrs)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# Existing configuration file required to function
+	newconfd data/sysconfig.snapper snapper
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	elog "In order to use Snapper, you need to set up"
+	elog "at least one config first. To do this, run:"
+	elog "snapper create-config <subvolume>"
+	elog "For more information, see man (8) snapper or"
+	elog "http://snapper.io/documentation.html"
+}
diff --git a/app-backup/snapper/snapper-0.4.1.ebuild b/app-backup/snapper/snapper-0.4.1.ebuild
new file mode 100644
index 000000000000..891e694a6f05
--- /dev/null
+++ b/app-backup/snapper/snapper-0.4.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Command-line program for btrfs and ext4 snapshot management"
+HOMEPAGE="http://snapper.io/"
+SRC_URI="ftp://ftp.suse.com/pub/projects/snapper/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+btrfs ext4 lvm pam xattr"
+
+RDEPEND="dev-libs/boost:=[threads]
+	dev-libs/libxml2
+	dev-libs/icu:=
+	sys-apps/acl
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libintl
+	btrfs? ( >=sys-fs/btrfs-progs-3.17.1 )
+	ext4? ( sys-fs/e2fsprogs )
+	lvm? ( sys-fs/lvm2 )
+	pam? ( sys-libs/pam )
+	xattr? ( sys-apps/attr )"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+REQUIRED_USE="|| ( btrfs ext4 lvm )"
+
+DOCS=( AUTHORS )
+
+src_prepare() {
+	epatch "${FILESDIR}"/cron-confd.patch
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-conf="/etc/conf.d"
+		--docdir="/usr/share/doc/${PF}"
+		--disable-zypp
+		--enable-rollback
+		$(use_enable btrfs)
+		$(use_enable ext4)
+		$(use_enable lvm)
+		$(use_enable pam)
+		$(use_enable xattr xattrs)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# Existing configuration file required to function
+	newconfd data/sysconfig.snapper snapper
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	elog "In order to use Snapper, you need to set up"
+	elog "at least one config first. To do this, run:"
+	elog "snapper create-config <subvolume>"
+	elog "For more information, see man (8) snapper or"
+	elog "http://snapper.io/documentation.html"
+}
diff --git a/app-backup/snapper/snapper-0.5.0.ebuild b/app-backup/snapper/snapper-0.5.0.ebuild
new file mode 100644
index 000000000000..1b4ef13115e6
--- /dev/null
+++ b/app-backup/snapper/snapper-0.5.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Command-line program for btrfs and ext4 snapshot management"
+HOMEPAGE="http://snapper.io/"
+SRC_URI="ftp://ftp.suse.com/pub/projects/snapper/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+btrfs ext4 lvm pam xattr"
+
+RDEPEND="dev-libs/boost:=[threads]
+	dev-libs/libxml2
+	dev-libs/icu:=
+	sys-apps/acl
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libintl
+	btrfs? ( >=sys-fs/btrfs-progs-3.17.1 )
+	ext4? ( sys-fs/e2fsprogs )
+	lvm? ( sys-fs/lvm2 )
+	pam? ( sys-libs/pam )
+	xattr? ( sys-apps/attr )"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+REQUIRED_USE="|| ( btrfs ext4 lvm )"
+
+DOCS=( AUTHORS )
+
+src_prepare() {
+	default
+	epatch "${FILESDIR}"/cron-confd.patch
+	epatch "${FILESDIR}/${P}"-gcc6.patch
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-conf="/etc/conf.d"
+		--docdir="/usr/share/doc/${PF}"
+		--disable-zypp
+		--enable-rollback
+		$(use_enable btrfs)
+		$(use_enable ext4)
+		$(use_enable lvm)
+		$(use_enable pam)
+		$(use_enable xattr xattrs)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# Existing configuration file required to function
+	newconfd data/sysconfig.snapper snapper
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	elog "In order to use Snapper, you need to set up"
+	elog "at least one config first. To do this, run:"
+	elog "snapper create-config <subvolume>"
+	elog "For more information, see man (8) snapper or"
+	elog "http://snapper.io/documentation.html"
+}
diff --git a/app-backup/snapper/snapper-0.5.4.ebuild b/app-backup/snapper/snapper-0.5.4.ebuild
new file mode 100644
index 000000000000..0615011a39c3
--- /dev/null
+++ b/app-backup/snapper/snapper-0.5.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="Command-line program for btrfs and lvm snapshot management"
+HOMEPAGE="http://snapper.io/"
+SRC_URI="ftp://ftp.suse.com/pub/projects/snapper/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="lvm pam xattr"
+
+RDEPEND="dev-libs/boost:=[threads]
+	dev-libs/libxml2
+	dev-libs/icu:=
+	sys-apps/acl
+	sys-apps/dbus
+	sys-apps/util-linux
+	>=sys-fs/btrfs-progs-3.17.1
+	sys-libs/zlib
+	virtual/libintl
+	lvm? ( sys-fs/lvm2 )
+	pam? ( sys-libs/pam )
+	xattr? ( sys-apps/attr )"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/cron-confd.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \
+		-i data/Makefile.* \
+		|| die "Failed to fix systemd services and timers installation path"
+}
+
+src_configure() {
+	# ext4 code does not work anymore
+	# snapper does not build without btrfs
+	local myeconfargs=(
+		--with-conf="/etc/conf.d"
+		--docdir="/usr/share/doc/${PF}"
+		--disable-zypp
+		--enable-rollback
+		--disable-ext4
+		--enable-btrfs
+		$(use_enable lvm)
+		$(use_enable pam)
+		$(use_enable xattr xattrs)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# Existing configuration file required to function
+	newconfd data/sysconfig.snapper snapper
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "In order to use Snapper, you need to set up"
+	elog "at least one config first. To do this, run:"
+	elog "snapper create-config <subvolume>"
+	elog "For more information, see man (8) snapper or"
+	elog "http://snapper.io/documentation.html"
+}
diff --git a/app-backup/snapper/snapper-9999.ebuild b/app-backup/snapper/snapper-9999.ebuild
new file mode 100644
index 000000000000..510d4e252f28
--- /dev/null
+++ b/app-backup/snapper/snapper-9999.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGIT_REPO_URI="https://github.com/openSUSE/snapper.git"
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+inherit eutils autotools-utils git-r3
+
+DESCRIPTION="Command-line program for btrfs and ext4 snapshot management"
+HOMEPAGE="http://snapper.io/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="+btrfs ext4 lvm pam xattr"
+
+RDEPEND="dev-libs/boost:=[threads]
+	dev-libs/libxml2
+	dev-libs/icu:=
+	sys-apps/acl
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libintl
+	btrfs? ( >=sys-fs/btrfs-progs-3.17.1 )
+	ext4? ( sys-fs/e2fsprogs )
+	lvm? ( sys-fs/lvm2 )
+	pam? ( sys-libs/pam )
+	xattr? ( sys-apps/attr )"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+REQUIRED_USE="|| ( btrfs ext4 lvm )"
+
+DOCS=( AUTHORS package/snapper.changes )
+
+PATCHES=( "${FILESDIR}"/cron-confd.patch )
+
+src_configure() {
+	local myeconfargs=(
+		--with-conf="/etc/conf.d"
+		--docdir="/usr/share/doc/${PF}"
+		--disable-zypp
+		--enable-rollback
+		$(use_enable btrfs)
+		$(use_enable ext4)
+		$(use_enable lvm)
+		$(use_enable pam)
+		$(use_enable xattr xattrs)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	# Existing configuration file required to function
+	newconfd data/sysconfig.snapper snapper
+}
+
+pkg_postinst() {
+	elog "In order to use Snapper, you need to set up"
+	elog "at least one config first. To do this, run:"
+	elog "snapper create-config <subvolume>"
+	elog "For more information, see man (8) snapper or"
+	elog "http://snapper.io/documentation.html"
+}
diff --git a/app-backup/spideroak-bin-7.2.0 b/app-backup/spideroak-bin-7.2.0
deleted file mode 100644
index d0f769fdc7e6..000000000000
--- a/app-backup/spideroak-bin-7.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prepare unpack
-DEPEND=dev-util/patchelf
-DESCRIPTION=Secure free online backup, storage, and sharing system
-EAPI=6
-HOMEPAGE=https://spideroak.com
-IUSE=dbus X
-KEYWORDS=~amd64 ~x86
-LICENSE=spideroak
-RDEPEND=app-crypt/mit-krb5[keyutils] media-libs/libpng:1.2 dbus? ( sys-apps/dbus ) X? ( media-libs/fontconfig media-libs/freetype:2 dev-libs/glib:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXrender x11-libs/libXt )
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=x86? ( https://spideroak.com/release/spideroak/deb_x86 -> spideroak-bin-7.2.0_x86.deb ) amd64? ( https://spideroak.com/release/spideroak/deb_x64 -> spideroak-bin-7.2.0_amd64.deb )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3260a6456f800dd781a809a24a59e1de
diff --git a/app-backup/spideroak-bin/Manifest b/app-backup/spideroak-bin/Manifest
new file mode 100644
index 000000000000..374f97a64b7c
--- /dev/null
+++ b/app-backup/spideroak-bin/Manifest
@@ -0,0 +1,4 @@
+DIST spideroak-bin-7.2.0_amd64.deb 24854982 BLAKE2B 9eab89f2c7713f9edbf97da986744c605113830efa971b5327794aa05640ab6386d76d4473cd3a5f6373611bdf7f2ee5ec8eb59d1b9914de48a7b2f724ce4c4e SHA512 9edaf0a7e6e6e985dd7ae1e969c43373393ea6293b8895d74be48f364513a992865ca5cb3150e5fce23eb49635a3442f5162a2606d8fac1ab1036ed922c214cb
+DIST spideroak-bin-7.2.0_x86.deb 24773806 BLAKE2B 4c4c778f50efa8b77c6d0b2ff522ce3ccacc9c0b6fba5b9acb8e6ea25816b303b34751e47f3e27f6b014c03e02473d22b1eba280618cdd9b6c639b82f2425d70 SHA512 758bdaefe307c4c7b7eebc47ebbb835e66c0a57350e34a2cd818212de1d800ae432459933d9613af60b877889724fe90726dd6705fa152b2478bd55552e541ba
+EBUILD spideroak-bin-7.2.0.ebuild 2664 BLAKE2B fc53873462c7f98e69ac926273c6c62bf19e4d47d3028ad5eed684417dd0827505b1960b30005714fd564a52ebee59e3da2f44ad101312fa680e85409968b1d4 SHA512 75ad609ca59dfc51da9feac1953314c15b5914e56b8d7c89d3ee91e66536b37e1b5ae0d48c47d34536403aa4cf164b1568e44d97242b5598e2d5341fb55e173e
+MISC metadata.xml 352 BLAKE2B d51f327fe859d894ae43eebfeac7b983b9b450ebd190352dedaaa95f844d1df86c6e8ea6b7478dafbc419af1fa273760b0c53c02280050947058ba052650f53b SHA512 fd3c4eea494c4e8e5f093e5cc099577c2f944d0f05c6376798a1e7680e9b194c45719e09a6cec755054b174dd6f9039c69d10e863f0bec72b6a15420d0c9bd7b
diff --git a/app-backup/spideroak-bin/metadata.xml b/app-backup/spideroak-bin/metadata.xml
new file mode 100644
index 000000000000..bdf371a8df29
--- /dev/null
+++ b/app-backup/spideroak-bin/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>lucianposton@pm.me</email>
+	<name>Lucian Poston</name>
+</maintainer>
+<maintainer type="person">
+	<email>blueness@gentoo.org</email>
+	<name>Anthony G. Basile</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-backup/spideroak-bin/spideroak-bin-7.2.0.ebuild b/app-backup/spideroak-bin/spideroak-bin-7.2.0.ebuild
new file mode 100644
index 000000000000..b50355c676a7
--- /dev/null
+++ b/app-backup/spideroak-bin/spideroak-bin-7.2.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils unpacker
+
+DESCRIPTION="Secure free online backup, storage, and sharing system"
+HOMEPAGE="https://spideroak.com"
+
+SRC_URI_BASE="https://spideroak.com/release/spideroak"
+SRC_URI="x86? ( ${SRC_URI_BASE}/deb_x86 -> ${P}_x86.deb )
+	amd64? ( ${SRC_URI_BASE}/deb_x64 -> ${P}_amd64.deb )"
+
+RESTRICT="mirror strip"
+
+LICENSE="spideroak"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus X"
+
+DEPEND="dev-util/patchelf"
+RDEPEND="
+	app-crypt/mit-krb5[keyutils]
+	media-libs/libpng:1.2
+	dbus? ( sys-apps/dbus )
+	X? (
+		media-libs/fontconfig
+		media-libs/freetype:2
+		dev-libs/glib:2
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+"
+
+S=${WORKDIR}
+
+QA_PREBUILT="*"
+
+src_prepare() {
+	# Set RPATH for preserve-libs handling (bug #400979).
+	cd "${S}/opt/SpiderOakONE/lib" || die
+	local x
+	for x in `find` ; do
+		# Use \x7fELF header to separate ELF executables and libraries
+		[[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue
+		patchelf --set-rpath '$ORIGIN' "${x}" || \
+			die "patchelf failed on ${x}"
+	done
+
+	#Remove the libraries that break compatibility in modern systems
+	#SpiderOak will use the system libs instead
+	rm -f "${S}/opt/SpiderOakONE/lib/libstdc++.so.6"
+	rm -f "${S}/opt/SpiderOakONE/lib/libgcc_s.so.1"
+	rm -f "${S}/opt/SpiderOakONE/lib/libpng12.so.0"
+	rm -f "${S}/opt/SpiderOakONE/lib/libz.so.1"
+
+	eapply_user
+}
+
+src_install() {
+	#install the wrapper script
+	exeinto /usr/bin
+	doexe usr/bin/SpiderOakONE
+
+	# inotify_dir_watcher needs to be marked executable, bug #453266
+	#chmod a+rx opt/SpiderOakONE/lib/inotify_dir_watcher
+
+	#install the executable
+	exeinto /opt/SpiderOakONE/lib
+	doexe opt/SpiderOakONE/lib/SpiderOakONE
+	doexe opt/SpiderOakONE/lib/inotify_dir_watcher
+	rm -f opt/SpiderOakONE/lib/{SpiderOakONE,inotify_dir_watcher}
+
+	#install the prebundled libraries
+	insinto /opt/SpiderOakONE
+	doins -r opt/SpiderOakONE/lib
+
+	#install the config files
+	use dbus || rm -rf etc/dbus-1
+	insinto /
+	doins -r etc
+
+	#install the manpage
+	doman usr/share/man/man1/SpiderOakONE.1.gz
+
+	if use X; then
+		domenu usr/share/applications/SpiderOakONE.desktop
+		doicon usr/share/pixmaps/SpiderOakONE.png
+	fi
+}
+
+pkg_postinst() {
+	if ! use X; then
+		einfo "For instructions on running SpiderOakONE without a GUI, please read the FAQ:"
+		einfo "  https://spideroak.com/faq/questions/62/how_do_i_install_spideroak_on_a_headless_linux_server/"
+		einfo "  https://spideroak.com/faq/questions/67/how_can_i_use_spideroak_from_the_commandline/"
+	fi
+}
diff --git a/app-backup/tarsnap-1.0.35 b/app-backup/tarsnap-1.0.35
deleted file mode 100644
index 88c7d16db8f9..000000000000
--- a/app-backup/tarsnap-1.0.35
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/e2fsprogs-libs sys-libs/zlib acl? ( sys-apps/acl ) bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) xattr? ( sys-apps/attr ) virtual/os-headers
-DESCRIPTION=Online backups for the truly paranoid
-EAPI=5
-HOMEPAGE=http://www.tarsnap.com/
-IUSE=acl bzip2 libressl lzma cpu_flags_x86_sse2 xattr
-KEYWORDS=~amd64 ~x86
-LICENSE=tarsnap
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/e2fsprogs-libs sys-libs/zlib acl? ( sys-apps/acl ) bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) xattr? ( sys-apps/attr )
-SLOT=0
-SRC_URI=https://www.tarsnap.com/download/tarsnap-autoconf-1.0.35.tgz
-_md5_=4f488df426cf49358bb576bf0484ecdf
diff --git a/app-backup/tarsnap-1.0.37 b/app-backup/tarsnap-1.0.37
deleted file mode 100644
index 101f4e164a44..000000000000
--- a/app-backup/tarsnap-1.0.37
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/e2fsprogs-libs sys-libs/zlib acl? ( sys-apps/acl ) bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) xattr? ( sys-apps/attr ) virtual/os-headers
-DESCRIPTION=Online backups for the truly paranoid
-EAPI=6
-HOMEPAGE=http://www.tarsnap.com/
-IUSE=acl bzip2 libressl lzma xattr
-KEYWORDS=~amd64 ~x86
-LICENSE=tarsnap
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/e2fsprogs-libs sys-libs/zlib acl? ( sys-apps/acl ) bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) xattr? ( sys-apps/attr )
-SLOT=0
-SRC_URI=https://www.tarsnap.com/download/tarsnap-autoconf-1.0.37.tgz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=a6fb3a309ad4f7e1ac70034745d64152
diff --git a/app-backup/tarsnap/Manifest b/app-backup/tarsnap/Manifest
new file mode 100644
index 000000000000..3a58ea2e275c
--- /dev/null
+++ b/app-backup/tarsnap/Manifest
@@ -0,0 +1,5 @@
+DIST tarsnap-autoconf-1.0.35.tgz 600115 BLAKE2B d2dc76a444e6095f00ba3742fa0aca5fd13263e5cc1ad666c222983ef5a5a9c9c72b5af18283ad33bef690328b9eab0c70fe908b33d87b286b1eacd55b664a4d SHA512 70f932b172717d7f0d6f96a357487b8f8ad13cb7332d73878f629c3abf0862da54a0621092d81ce8cd9eb8380cf5b4c32e89df4d890949429fc84737024dcb61
+DIST tarsnap-autoconf-1.0.37.tgz 629450 BLAKE2B 440858098c5c3f2be6fb6b1473ab4fade158203162c04fbc4c2e051f443c7ce3246ab0701e117bccb436b8f1f022e986ec67f653a3c34b9c36da99ca85d73bc8 SHA512 050053f2109b74cda16511cf35ab2c11e0470ba745c661d254b7c17efde9e629830d519896b343dbd4f48ee739dfef47b724eb5e2e78c3e7dbc4ae018a536a5f
+EBUILD tarsnap-1.0.35.ebuild 895 BLAKE2B ecf21e91cb7c9cdfdc32da8c266406a5d646361e6597dc78e75e987acc38fc87dab513d48feb321b22aeceac9d3ae5874c670ca6c523f13af942d6972e398b57 SHA512 ef92677942b4303492aa290d921e9bec93716a8e310b26bbff0b77c356bdeea4e158091c53d32812404e4573251bd8c1414b20a249d42aa8f09581350d33a1ba
+EBUILD tarsnap-1.0.37.ebuild 927 BLAKE2B e04c236550c9ecf356e9742584e1f15c255058df521276b37d4989e66b25c0551ab24e820963f8a7fdd82695c504f03ada3f241b0aa1ed6e01eae061dfc61072 SHA512 6193ff9f8fc4bcb2ac0f8aabe56c4edf9a7af5545c74f00df6a439666be44d42990089e7b5d366cbf07eec2102c84a4ee80fbac9a671fcca593f3d05ceae5246
+MISC metadata.xml 275 BLAKE2B 2998d89884ee6c9d7c561577399f14407518c581b2eb5e04a0a7e92d0012fb7da12914f64ede0dc92672eebeb4c32fd96190798cc38d709f59840855c8192fc3 SHA512 5cfcef332788131c3e3b46355f30c3b06fb247f83bcb722e1c4afd5cef5189c3fcb5ba80b55bbf90570661f91c10f9d2803920ed09cd8b2ec76e90775cb44249
diff --git a/app-backup/tarsnap/metadata.xml b/app-backup/tarsnap/metadata.xml
new file mode 100644
index 000000000000..bf9dc03e0dec
--- /dev/null
+++ b/app-backup/tarsnap/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>rafaelmartins@gentoo.org</email>
+        <name>Rafael G. Martins</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/app-backup/tarsnap/tarsnap-1.0.35.ebuild b/app-backup/tarsnap/tarsnap-1.0.35.ebuild
new file mode 100644
index 000000000000..17f77b783b74
--- /dev/null
+++ b/app-backup/tarsnap/tarsnap-1.0.35.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Online backups for the truly paranoid"
+HOMEPAGE="http://www.tarsnap.com/"
+SRC_URI="https://www.tarsnap.com/download/${PN}-autoconf-${PV}.tgz"
+
+LICENSE="tarsnap"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="acl bzip2 libressl lzma cpu_flags_x86_sse2 xattr"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/e2fsprogs-libs
+	sys-libs/zlib
+	acl? ( sys-apps/acl )
+	bzip2? ( app-arch/bzip2 )
+	lzma? ( app-arch/xz-utils )
+	xattr? ( sys-apps/attr )"
+DEPEND="${RDEPEND}
+	virtual/os-headers" # Required for "magic.h"
+
+S=${WORKDIR}/${PN}-autoconf-${PV}
+
+src_configure() {
+	econf \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable xattr) \
+		$(use_enable acl) \
+		$(use_with bzip2 bz2lib) \
+		--without-lzmadec \
+		$(use_with lzma)
+}
diff --git a/app-backup/tarsnap/tarsnap-1.0.37.ebuild b/app-backup/tarsnap/tarsnap-1.0.37.ebuild
new file mode 100644
index 000000000000..537b94cdf769
--- /dev/null
+++ b/app-backup/tarsnap/tarsnap-1.0.37.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+DESCRIPTION="Online backups for the truly paranoid"
+HOMEPAGE="http://www.tarsnap.com/"
+SRC_URI="https://www.tarsnap.com/download/${PN}-autoconf-${PV}.tgz"
+
+LICENSE="tarsnap"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="acl bzip2 libressl lzma xattr"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/e2fsprogs-libs
+	sys-libs/zlib
+	acl? ( sys-apps/acl )
+	bzip2? ( app-arch/bzip2 )
+	lzma? ( app-arch/xz-utils )
+	xattr? ( sys-apps/attr )"
+DEPEND="${RDEPEND}
+	virtual/os-headers" # Required for "magic.h"
+
+S=${WORKDIR}/${PN}-autoconf-${PV}
+
+src_configure() {
+	econf \
+		$(use_enable xattr) \
+		$(use_enable acl) \
+		$(use_with bzip2 bz2lib) \
+		--without-lzmadec \
+		$(use_with lzma)
+}
+
+src_install() {
+	default
+	dobashcomp misc/bash_completion.d/*
+}
diff --git a/app-backup/tob-0.26-r2 b/app-backup/tob-0.26-r2
deleted file mode 100644
index 49a854ca9adb..000000000000
--- a/app-backup/tob-0.26-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=A general driver for making and maintaining backups
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=app-arch/afio
-SLOT=0
-SRC_URI=mirror://gentoo/tob-0.26.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1a3cfd9ea40acc6739738cdfdb89cd60
diff --git a/app-backup/tob/Manifest b/app-backup/tob/Manifest
new file mode 100644
index 000000000000..4213ee518154
--- /dev/null
+++ b/app-backup/tob/Manifest
@@ -0,0 +1,6 @@
+AUX tob-0.26-nice.patch 248 BLAKE2B e49a1245525cd4d2920584a4225eeedaf2186642d6d8c05ec6acb768749aa106f7f547b9211802c877f853a0fe216c06fef4782293a528b3efee6d1bf4be65dd SHA512 5d6cf1434a0ab3f3818748a302d4be78f9a8b71b68a8f641484fb5181c69c561d2fae84a0507b6bd5e124c2df8974985dd1fe9e439b6d4fc622bfff3f4a34868
+AUX tob-0.26-no-maketemp-warn.diff 386 BLAKE2B 9f147fd5b59d7ee861f5d8c6d8d41d2bd1335cafd1ff70712897f4349b63d781b26f2788ad65ec313d2039a4826207a25197ad1ef081a4b00f21f0b9decc1a89 SHA512 4c91ee5bf9b6dcbc9076481e527da2660a15c7bc20d4105fa3d89aafae3062fa73b4f0041f71a74ff15fe727ccdab36b324fe99974cf3d0dff424c9928b72b30
+AUX tob-0.26-scsi-tape.diff 406 BLAKE2B 152f04f712716b81ab968909ee5594646b0ad3d913f03e374d52edb49ed1abeb426cd33d4e4e72ed098e9406039c031b1907b34d2e5edad9ace7409d7a949303 SHA512 fa0f6852ebbd1c293dbfea32be81fae370d55fa5bb42596f7cff6f970d12e55667f15a56f5e40db581a64d24704fa47ad5e66e18a402a0cfdeeaa89e5a7ce0a8
+DIST tob-0.26.tgz 107711 BLAKE2B 2de8f95816b8cf3721d70ba24544f4f137a4711e9ec88f1927e3195b21cf4c8f20f399faaf314c559b0c18ae72b05ffe9ed69c54c197b0ce1a4005f2311c7110 SHA512 4c570388d3dff6c240a36492c05f7248a5efd527235b45238731db4972ed3fd10b8e3e5632768f16214bafef5e27d7796ada253ce9e3cfb71d182d1c9516b9cd
+EBUILD tob-0.26-r2.ebuild 724 BLAKE2B 3a5cdd3d583080be885a6f06b403e4fb7efc2bf93acdc1f6eedcd2c802f55cc6bdd56916fe6b5f0c5422763aa9d40dc3fce3d56e7affd7104acff030678ea0f9 SHA512 cf3ab21956e857b7d4343161883920a3590dac98440de913b24f3de256cf80ac77ade001bf557b17296d632e81b31852183774d99aaf153959c105a77736e4b5
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-backup/tob/files/tob-0.26-nice.patch b/app-backup/tob/files/tob-0.26-nice.patch
new file mode 100644
index 000000000000..d488a27a19cd
--- /dev/null
+++ b/app-backup/tob/files/tob-0.26-nice.patch
@@ -0,0 +1,11 @@
+--- tob.old	2005-02-13 17:46:00.000000000 -0500
++++ tob	2005-02-13 17:35:43.000000000 -0500
+@@ -314,7 +314,7 @@
+     fi
+ 
+     if [ "$NICEFIND" = "yes" ] ; then
+-	nicefindcmd="nice -19"
++	nicefindcmd="nice -n 19"
+     else
+ 	nicefindcmd=""
+     fi
diff --git a/app-backup/tob/files/tob-0.26-no-maketemp-warn.diff b/app-backup/tob/files/tob-0.26-no-maketemp-warn.diff
new file mode 100644
index 000000000000..af346d111353
--- /dev/null
+++ b/app-backup/tob/files/tob-0.26-no-maketemp-warn.diff
@@ -0,0 +1,12 @@
+diff -u tob-0.26/tob tob-0.26.new/tob
+--- tob-0.26/tob	2003-12-22 01:25:17.000000000 +0100
++++ tob-0.26.new/tob	2004-03-20 10:30:09.916597016 +0100
+@@ -61,7 +61,7 @@
+ ## 16 May 1998
+ ##
+ ## Smartened up by Stephen van Egmond <svanegmond@tinyplanet.ca> 2003/10/30
+-MKTEMP=`which maketemp`;
++MKTEMP=`which maketemp 2> /dev/null`;
+ if [ ! -x "$MKTEMP" ]; then
+ 	MKTEMP=`which mktemp`;
+ fi
diff --git a/app-backup/tob/files/tob-0.26-scsi-tape.diff b/app-backup/tob/files/tob-0.26-scsi-tape.diff
new file mode 100644
index 000000000000..4628d8a8f417
--- /dev/null
+++ b/app-backup/tob/files/tob-0.26-scsi-tape.diff
@@ -0,0 +1,12 @@
+diff -Nur tob-0.26/tob /tmp/tob-0.26/tob
+--- a/tob-0.26/tob	2005-02-27 22:46:15.701964928 +0100
++++ b/tob-0.26/tob	2005-02-27 22:45:41.091226560 +0100
+@@ -219,8 +219,6 @@
+     if [ -d "$BACKUPDEV" ]; then
+     	BACKUPDIR=$BACKUPDEV
+     	BACKUPDEV="${BACKUPDIR}/${VOLUMENAME}_${DATE}_${TYPE}.${EXT}"
+-    else
+-        BACKUPDIR="/var/lib/tob"
+     fi
+ 
+     # check that relevant environment vars are set
diff --git a/app-backup/tob/metadata.xml b/app-backup/tob/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-backup/tob/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-backup/tob/tob-0.26-r2.ebuild b/app-backup/tob/tob-0.26-r2.ebuild
new file mode 100644
index 000000000000..ca568a113f3a
--- /dev/null
+++ b/app-backup/tob/tob-0.26-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A general driver for making and maintaining backups"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="app-arch/afio"
+DEPEND=""
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-no-maketemp-warn.diff \
+		"${FILESDIR}"/${P}-nice.patch \
+		"${FILESDIR}"/${P}-scsi-tape.diff
+	ecvs_clean
+}
+
+src_install() {
+	dosbin tob
+	dodir /var/lib/tob
+	insinto /etc/tob
+	doins tob.rc
+	insinto /etc/tob/volumes
+	doins example.*
+
+	dodoc -r README contrib/tobconv doc sample-rc
+	doman tob.8
+}
diff --git a/app-backup/tsm-7.1.4.4-r2 b/app-backup/tsm-7.1.4.4-r2
deleted file mode 100644
index 9573101e2d6a..000000000000
--- a/app-backup/tsm-7.1.4.4-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst setup unpack
-DEPEND=>=app-arch/rpm2targz-9.0.0.3g virtual/pkgconfig
-DESCRIPTION=Tivoli Storage Manager (TSM) Backup/Archive (B/A) Client and API
-EAPI=5
-HOMEPAGE=http://www.tivoli.com/
-IUSE=acl java +tsm_cit +tsm_hw
-KEYWORDS=~amd64 -*
-LICENSE=Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exolab dom4j EPL-1.0 FTL icu unicode IBM Info-ZIP LGPL-2 LGPL-2.1 openafs-krb5-a ZLIB MPL-1.0 MPL-1.1 NPL-1.1 openssl OPENLDAP RSA public-domain W3C || ( BSD GPL-2+ ) gSOAP libpng tsm
-RDEPEND=dev-libs/expat dev-libs/libxml2 =sys-fs/fuse-2* acl? ( sys-apps/acl ) java? ( >=virtual/jre-1.7 )
-RESTRICT=strip
-SLOT=0
-SRC_URI=ftp://ftp.software.ibm.com/storage/tivoli-storage-management/patches/client/v7r1/Linux/LinuxX86/BA/v714/7.1.4.4-TIV-TSMBAC-LinuxX86.tar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	rpm	f52cfa3a435468d86d3b49c357b9cb35	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bb79ca89a58583ab0a48630c3b7c2c93
diff --git a/app-backup/tsm/Manifest b/app-backup/tsm/Manifest
new file mode 100644
index 000000000000..b1888d9c4e3d
--- /dev/null
+++ b/app-backup/tsm/Manifest
@@ -0,0 +1,9 @@
+AUX dsmc.conf.d 196 BLAKE2B e87b70a2580b33a2e9c18b25b98b0f8452ec9396a0bcd757286ef2362bb2707fad468397dad71689d63cf42b27e5e2d775fd42c33a4c78a3d41f8fc95754df5e SHA512 5697da5a820f328e80c78063be2216572b544e4195efbb0866d15f781be8d155aac257b3bb843e67d466b2c1b37efdc3922397cf49fdf5cc18f0c5c08808f634
+AUX dsmc.init.d 718 BLAKE2B a1de3d6eab6e0ee94f9549a73f45323728911eff36c87b5d471046daa27052932a77bf70c66411ab01db228c276553ddf04e6c2b9bc6a574fafe026105443629 SHA512 01cf7775b0a7e3ad84cc2c35bd73ae3ce6a4fb1c1968da6cfe9d97a8804833970af32873f895181d7d2220b0787e96b67c4b5f8ff4b6d450ee3a5d92735a6f2c
+AUX dsmc.service 184 BLAKE2B a6a14302b32cdfdd9d1460b2d686a9a828d1cdd3c19dc53f8f57b4febccdb389d12813e0cb6ec34d9e1914d85f19865d7d8e75d5ecdac101bb4108ba68f9c64a SHA512 b047251e3fb7d006315b0f069adac62bc3c7f6ccc835ab59a2975a3f206151de8b0cb6a8f414d0f41922a961378376d79d61e38cd7be2aa5743822f365f87bf6
+AUX dsmcad.init.d-r1 531 BLAKE2B 840b6431f083df2da7f42d79a1b28a87ed3b90d497e54a165b98dec9466323d1ec8ffad894c5d165fd994a99e7a52ca22bb6b81597e93001f22be2af641da6a9 SHA512 b69166e9e004d81a7f43551e5f1189c3a545afc67e5029009e9693fbed20a247f922975fec695542f0a3afd7c0c5a4ee6c026678de4812b00488afc45699699a
+AUX dsmcad.service 224 BLAKE2B cb84b8616daa3649b8b29c58aa91fffbb119dfd1e84810ed61564fd45380ac792c89c20da1f8296f617467c411605f86a5cc2190d2135be771348c1d58b7c56c SHA512 e3572098abf5b2831d10a3b649337b5c9f1cd9fda4ed58844408b6fe31fdc68a3bbc197eab227f9808bc9ab4b4a7488c766aaa472e801d88631b6b8ec398eb45
+AUX tsm.logrotate 60 BLAKE2B bb367d3da53f8061d71e3753ab8c46595d5cf91485da920f032473a99d3241d22fdbe576cc99088c99e97c63d3f2af920d4602878830fb815a58dc8321d37a2a SHA512 2f412c61a21dbb2c69b2c12130ae12844787d998098de269da2b8a284c2ed86f7244c2854d7050f2a521b3fbe7239f1ec4339f3b434c67b9cd57980fe5de5a92
+DIST 7.1.4.4-TIV-TSMBAC-LinuxX86.tar 220456960 BLAKE2B 1deb7f40b0db899dba475d83d4f22d602563b30c491d280f478e69c558677b9d09e49050eace4275e083eeeb670df2e545ad65abc2abf9dade1e35c947e581f6 SHA512 5f0b0262ad4b8f1dc6d9763735c3390a9ea0d559a3efd08593c6aa81e89978387906ff728a5dee575725da7d0b7e4f4e6d207111b79625c6487b6e8d56d767de
+EBUILD tsm-7.1.4.4-r2.ebuild 7048 BLAKE2B 8f3a3c6ccf19d9e894a582c71a9dadab04b6a756b8ce58daa90442115140095becafcfbf6503f7a57f2c9ac65d01fd015bed3ba992e148c4bbed8b830f2b5f05 SHA512 2783686176225a97f88a35cd841ba925a9d2fcba88d6a2243e0d9ec8e92751e39e1adf6b268071175d8f6bb4c17795e6423c7103de5df263c526422bbd491505
+MISC metadata.xml 502 BLAKE2B ccc5497a90f1d6f345663a4d1d54df4fa2fd3c2d36babccb864abd186d4ae42370d30915ed809877f2a2c10c9d52a7f954a1c94aa47c5690576fac9bfe77cb33 SHA512 2f348fba8aaf9e4ce1e7038b4478662a0acb4f17214984fda5febed3059e74de1144c9e97f74207d7eff1a84a5326e35469d6c60285d16938bc97481869b04aa
diff --git a/app-backup/tsm/files/dsmc.conf.d b/app-backup/tsm/files/dsmc.conf.d
new file mode 100644
index 000000000000..c4fd1c76a98c
--- /dev/null
+++ b/app-backup/tsm/files/dsmc.conf.d
@@ -0,0 +1,7 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Config file for /etc/init.d/tivoli
+
+# See your TSM manual for valid ops
+#DSMC_OPTS=""
diff --git a/app-backup/tsm/files/dsmc.init.d b/app-backup/tsm/files/dsmc.init.d
new file mode 100644
index 000000000000..0e9773294858
--- /dev/null
+++ b/app-backup/tsm/files/dsmc.init.d
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+        use net
+        after dns
+}
+
+start() {
+        ebegin "Starting dsmc"
+        start-stop-daemon --start --background --nicelevel 15 \
+                --make-pidfile --pidfile /var/run/dsmc.pid \
+                --exec /opt/tivoli/tsm/client/ba/bin/dsmc sched ${DSMC_OPTS}
+        eend $?
+}
+
+stop() {
+        ebegin "Stopping dsmc"
+        # For whatever reason SIGTERM doesn't affect the dsmc process, but
+        # SIGHUP makes it exit cleanly
+        start-stop-daemon --stop \
+                --signal 1 \
+                --pidfile /var/run/dsmc.pid
+        eend $?
+}
+
diff --git a/app-backup/tsm/files/dsmc.service b/app-backup/tsm/files/dsmc.service
new file mode 100644
index 000000000000..aa25e1f74798
--- /dev/null
+++ b/app-backup/tsm/files/dsmc.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Tivoli Storage Manager (TSM) - dsmc
+After=network.target
+
+[Service]
+Nice=15
+ExecStart=/opt/tivoli/tsm/client/ba/bin/dsmc sched
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-backup/tsm/files/dsmcad.init.d-r1 b/app-backup/tsm/files/dsmcad.init.d-r1
new file mode 100644
index 000000000000..6c487fd8c970
--- /dev/null
+++ b/app-backup/tsm/files/dsmcad.init.d-r1
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command=/opt/tivoli/tsm/client/ba/bin/dsmcad
+
+depend() {
+        use net
+        after dns dsmc
+}
+
+start() {
+        ebegin "Starting dsmcad"
+        start-stop-daemon --start --nicelevel 15 \
+                --exec ${command}
+        eend $?
+}
+
+stop() {
+        ebegin "Stopping dsmcad"
+        start-stop-daemon --stop \
+                --signal 1 \
+                --exec ${command}
+        eend $?
+}
diff --git a/app-backup/tsm/files/dsmcad.service b/app-backup/tsm/files/dsmcad.service
new file mode 100644
index 000000000000..34cccedd820f
--- /dev/null
+++ b/app-backup/tsm/files/dsmcad.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Tivoli Storage Manager (TSM) - dsmcad
+After=network.target dsmc.service
+
+[Service]
+Type=forking
+Nice=15
+ExecStart=/opt/tivoli/tsm/client/ba/bin/dsmcad
+GuessMainPID=no
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-backup/tsm/files/tsm.logrotate b/app-backup/tsm/files/tsm.logrotate
new file mode 100644
index 000000000000..656e8aff515b
--- /dev/null
+++ b/app-backup/tsm/files/tsm.logrotate
@@ -0,0 +1,4 @@
+/var/log/tsm/*.log {
+	create 0660 root tsm
+	delaycompress
+}
diff --git a/app-backup/tsm/metadata.xml b/app-backup/tsm/metadata.xml
new file mode 100644
index 000000000000..1bc67e1a1dd3
--- /dev/null
+++ b/app-backup/tsm/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dilfridge@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<use>
+		<flag name="tsm_cit">IBM Tivoli Common Inventory Technology</flag>
+		<flag name="tsm_hw">Difference snapshot support for NetApp and N-Series file servers</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-backup/tsm/tsm-7.1.4.4-r2.ebuild b/app-backup/tsm/tsm-7.1.4.4-r2.ebuild
new file mode 100644
index 000000000000..4bfb05faf99c
--- /dev/null
+++ b/app-backup/tsm/tsm-7.1.4.4-r2.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit versionator multilib eutils readme.gentoo rpm systemd user pax-utils
+
+DESCRIPTION="Tivoli Storage Manager (TSM) Backup/Archive (B/A) Client and API"
+HOMEPAGE="http://www.tivoli.com/"
+
+MY_PV_MAJOR=$(get_major_version)
+MY_PV_MINOR=$(get_version_component_range 2)
+MY_PV_TINY=$(get_version_component_range 3)
+MY_PV_PATCH=$(get_version_component_range 4)
+
+MY_PV_NODOTS="${MY_PV_MAJOR}${MY_PV_MINOR}${MY_PV_TINY}"
+MY_PVR_ALLDOTS=${PV}
+
+if [[ ${MY_PV_PATCH} == 0 ]]; then
+	MY_RELEASE_PATH=maintenance
+else
+	MY_RELEASE_PATH=patches
+fi
+BASE_URI="ftp://ftp.software.ibm.com/storage/tivoli-storage-management/"
+BASE_URI+="${MY_RELEASE_PATH}/client/v${MY_PV_MAJOR}r${MY_PV_MINOR}/"
+BASE_URI+="Linux/LinuxX86/BA/v${MY_PV_NODOTS}/"
+SRC_TAR="${MY_PVR_ALLDOTS}-TIV-TSMBAC-LinuxX86.tar"
+SRC_URI="${BASE_URI}${SRC_TAR}"
+
+RESTRICT="strip" # Breaks libPiIMG.so and libPiSNAP.so
+LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exolab
+	dom4j EPL-1.0 FTL icu unicode IBM Info-ZIP LGPL-2 LGPL-2.1 openafs-krb5-a
+	ZLIB MPL-1.0 MPL-1.1 NPL-1.1 openssl OPENLDAP RSA public-domain W3C
+	|| ( BSD GPL-2+ ) gSOAP libpng tsm"
+
+SLOT="0"
+KEYWORDS="~amd64 -*"
+IUSE="acl java +tsm_cit +tsm_hw"
+QA_PREBUILT="*"
+
+# not available (yet?)
+#MY_LANGS="cs:CS_CZ de:DE_DE es:ES_ES fr:FR_FR hu:HU_HU it:IT_IT ja:JA_JP
+#	ko:KO_KR pl:PL_PL pt-BR:PT_BR ru:RU_RU zh-CN:ZH_CN zh-TW:ZH_TW"
+MY_LANG_PV="${MY_PVR_ALLDOTS}-"
+for lang in ${MY_LANGS}; do
+	IUSE="${IUSE} l10n_${lang%:*}"
+	SRC_URI="${SRC_URI} l10n_${lang%:*}? ( \
+${BASE_URI}TIVsm-msg.${lang#*:}.x86_64.rpm -> \
+${MY_LANG_PV}TIVsm-msg.${lang#*:}.x86_64.rpm )"
+done
+unset lang
+
+DEPEND=""
+RDEPEND="
+	dev-libs/expat
+	dev-libs/libxml2
+	=sys-fs/fuse-2*
+	acl? ( sys-apps/acl )
+	java? ( >=virtual/jre-1.7 )
+"
+
+S="${WORKDIR}/bacli"
+
+pkg_setup() {
+	enewgroup tsm
+	DOC_CONTENTS="
+		Note that you have to be either root or member of the group tsm to
+		be able to use the Tivoli Storage Manager client."
+}
+
+src_unpack() {
+	local rpm rpms lang
+	unpack ${SRC_TAR}
+
+	cd "${S}"
+	for rpm in *.rpm; do
+		case ${rpm} in
+			TIVsm-APIcit.*|TIVsm-BAcit.*)
+				use tsm_cit && rpms="${rpms} ./${rpm}"
+				;;
+			TIVsm-BAhdw.*)
+				use tsm_hw && rpms="${rpms} ./${rpm}"
+				;;
+			TIVsm-JBB.*|*-filepath-*)
+				# "journal based backup" for all filesystems
+				# requires a kernel module.
+				# "Linux Filepath source code" available
+				# by request from vendor
+				;;
+			*)
+				rpms="${rpms} ./${rpm}"
+				;;
+		esac
+	done
+	for rpm in ${A}; do
+		case ${rpm} in
+			*.rpm)
+				rpms="${rpms} ${rpm}"
+				;;
+		esac
+	done
+
+	rpm_unpack ${rpms}
+
+	# Avoid strange error messages caused by read-only files
+	chmod -R u+w "${S}" || die
+}
+
+src_install(){
+	cp -a opt "${D}" || die
+	cp -a usr "${D}" || die
+
+	# The RPM files contain postinstall scripts which can be extracted
+	# e.g. using https://bugs.gentoo.org/attachment.cgi?id=234663 .
+	# Below we try to mimic the behaviour of these scripts.
+	# We don't deal with SELinux compliance (yet), though.
+	local RPM_INSTALL_PREFIX CLIENTDIR i
+	RPM_INSTALL_PREFIX=/opt
+	CLIENTDIR=$RPM_INSTALL_PREFIX/tivoli/tsm/client
+
+	# Create links for messages; this is spread over several postin scripts.
+	#for i in $(cd "${D}"${CLIENTDIR}/lang; ls -1d ??_??); do
+	#	dosym ../../lang/${i} $CLIENTDIR/ba/bin/${i}
+	#	dosym ../../lang/${i} $CLIENTDIR/api/bin64/${i}
+	#done
+
+	# Mimic TIVsm-API64 postinstall script
+	for i in libgpfs.so libdmapi.so; do
+		dosym ../..$CLIENTDIR/api/bin64/${i} /usr/lib64/${i}
+	done
+
+	# The TIVsm-BA postinstall script only does messages and ancient upgrades
+
+	# The gscrypt64 postinstall script only deals with s390[x] SELinux
+	# and the symlink for the iccs library which we handle in the loop below.
+
+	# Move stuff from /usr/local to /opt, #452332
+	mv "${D}"/usr/local/ibm "${D}"/opt/ || die
+	rmdir "${D}"/usr/local || die
+
+	# Mimic gskssl64 postinstall script
+	for i in sys p11 km ssl drld kicc ldap cms acmeidup valn dbfl iccs; do
+		dosym ../../opt/ibm/gsk8_64/lib64/libgsk8${i}_64.so \
+			/usr/lib64/libgsk8${i}_64.so
+	done
+	for i in capicmd ver; do
+		dosym ../../opt/ibm/gsk8_64/bin/gsk8${i}_64 /usr/bin/gsk${i}_64
+	done
+
+	# Done with the postinstall scripts as the RPMs contain them.
+	# Now on to some more Gentoo-specific installation.
+
+	[[ -d "${D}usr/lib" ]] && die "Using 32bit lib dir in 64bit only system"
+
+	# Avoid "QA Notice: Found an absolute symlink in a library directory"
+	local target
+	find "${D}"usr/lib* -lname '/*' | while read i; do
+		target=$(readlink "${i}")
+		rm -v "${i}" || die
+		dosym "../..${target}" "${i#${D}}"
+	done
+
+	fowners :tsm /opt/tivoli/tsm/client/ba/bin/dsmtca
+	fperms 4710 /opt/tivoli/tsm/client/ba/bin/dsmtca
+
+	keepdir /var/log/tsm
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/tsm.logrotate" tsm
+
+	keepdir /etc/tivoli
+
+	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.sys.smp" "${D}/etc/tivoli/dsm.sys" || die
+	echo '	 PasswordDir "/etc/tivoli/"' >> ${D}/etc/tivoli/dsm.sys
+	echo '	 PasswordAccess generate' >> ${D}/etc/tivoli/dsm.sys
+
+	# Added the hostname to be more friendly, the admin will need to edit this file anyway
+	echo '	 NodeName' `hostname` >> ${D}/etc/tivoli/dsm.sys
+	echo '	 ErrorLogName "/var/log/tsm/dsmerror.log"' >> ${D}/etc/tivoli/dsm.sys
+	echo '	 SchedLogName "/var/log/tsm/dsmsched.log"' >> ${D}/etc/tivoli/dsm.sys
+	dosym ../../../../../../etc/tivoli/dsm.sys /opt/tivoli/tsm/client/ba/bin/dsm.sys
+
+	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.opt.smp" "${D}/etc/tivoli/dsm.opt"
+	dosym ../../../../../../etc/tivoli/dsm.opt /opt/tivoli/tsm/client/ba/bin/dsm.opt
+
+	# Setup the env
+	dodir /etc/env.d
+	ENV_FILE="${D}/etc/env.d/80tivoli"
+	echo 'DSM_CONFIG="/etc/tivoli/dsm.opt"' >> ${ENV_FILE}
+	echo 'DSM_DIR="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
+	echo 'DSM_LOG="/var/log/tsm"' >> ${ENV_FILE}
+	echo 'ROOTPATH="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
+
+	echo 'SEARCH_DIRS_MASK="/opt/tivoli/tsm/client/ba/bin"' > "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild"
+	doins "${T}/80${PN}"
+
+	newconfd "${FILESDIR}/dsmc.conf.d" dsmc
+	newinitd "${FILESDIR}/dsmc.init.d" dsmc
+	newinitd "${FILESDIR}/dsmcad.init.d-r1" dsmcad
+
+	# Need this for hardened, otherwise a cryptic "connection to server lost" message appears
+	pax-mark -m "${D}/opt/tivoli/tsm/client/ba/bin/dsmc"
+
+	systemd_dounit "${FILESDIR}/dsmc.service"
+	systemd_dounit "${FILESDIR}/dsmcad.service"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	local i dirs
+	for i in /var/log/tsm/dsm{error,sched,j,webcl}.log; do
+		if [[ ! -e $i ]]; then
+			touch $i || die
+			chown :tsm $i || die
+			chmod 0660 $i || die
+		fi
+	done
+
+	# Bug #375041: the log directory itself should not be world writable.
+	# Have to do this in postinst due to bug #141619
+	chown root:tsm /var/log/tsm || die
+	chmod 0750 /var/log/tsm || die
+
+	# Bug 508052: directories used to be too restrictive, have to widen perms.
+	dirs=( /opt/tivoli $(find /opt/tivoli/tsm -type d) )
+	chown root:root "${dirs[@]}" || die
+	chmod 0755 "${dirs[@]}" || die
+
+	readme.gentoo_print_elog
+}
diff --git a/app-backup/untangle-https-backup-0.0.8 b/app-backup/untangle-https-backup-0.0.8
deleted file mode 100644
index a636df5f94af..000000000000
--- a/app-backup/untangle-https-backup-0.0.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Back up Untangle configurations via the web admin UI
-EAPI=6
-HOMEPAGE=http://michael.orlitzky.com/code/untangle-https-backup.php
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=http://michael.orlitzky.com/code/releases/untangle-https-backup-0.0.8.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5826231774cf3573d466f27889d02a42
diff --git a/app-backup/untangle-https-backup/Manifest b/app-backup/untangle-https-backup/Manifest
new file mode 100644
index 000000000000..32525fa57304
--- /dev/null
+++ b/app-backup/untangle-https-backup/Manifest
@@ -0,0 +1,3 @@
+DIST untangle-https-backup-0.0.8.tar.gz 16263 BLAKE2B 3a41b2ee172a14e3a11ac6e1d47adf9bb818facf8e45d16826a0da70e9280c28d09f9d4f670b4efdda487c152ce4ef5350709b70165dc9262ae4e3e0d0a106c9 SHA512 4eb74d4cb939a9ac59fc475b5dbcc2a1fb4b36b59e6335c02b6de44b5fd56c44f1b7a52f6b71b36ed91663aff17556e0c9cfb04f309a191596a7a858ffec4693
+EBUILD untangle-https-backup-0.0.8.ebuild 579 BLAKE2B e5774400d0962670a5a6d2d0576d575d8e76b4346e1fcb574469395bf1f592c70dd007428712479c1a6cb24ab00b8f4b59290b34bf9405224eca86ff74367765 SHA512 5d6999edd4fa55f363de6f4f61c78019b8247ebdb1df53f0e129d28550095c981b3936f324216dcbd35ddf7e58717c1fc529ac1269da0b093a91574cfc9f02f2
+MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/app-backup/untangle-https-backup/metadata.xml b/app-backup/untangle-https-backup/metadata.xml
new file mode 100644
index 000000000000..45125b9b6e99
--- /dev/null
+++ b/app-backup/untangle-https-backup/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-backup/untangle-https-backup/untangle-https-backup-0.0.8.ebuild b/app-backup/untangle-https-backup/untangle-https-backup-0.0.8.ebuild
new file mode 100644
index 000000000000..872eda0cac70
--- /dev/null
+++ b/app-backup/untangle-https-backup/untangle-https-backup-0.0.8.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="ssl(+)"
+inherit distutils-r1
+
+DESCRIPTION="Back up Untangle configurations via the web admin UI"
+HOMEPAGE="http://michael.orlitzky.com/code/untangle-https-backup.php"
+SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+	distutils-r1_src_install
+	doman "doc/man8/${PN}.8"
+	dodoc "doc/${PN}.example.ini"
+}
diff --git a/app-backup/vzdump-1.2 b/app-backup/vzdump-1.2
deleted file mode 100644
index 639e587fe62b..000000000000
--- a/app-backup/vzdump-1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/perl:=
-DESCRIPTION=A utility to make consistent snapshots of running OpenVZ containers
-EAPI=6
-HOMEPAGE=http://pve.proxmox.com/wiki/VZDump
-KEYWORDS=~x86 ~amd64
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl:= app-misc/cstream dev-perl/LockFile-Simple net-misc/rsync sys-cluster/vzctl sys-fs/lvm2 virtual/mta virtual/perl-Getopt-Long
-SLOT=0
-SRC_URI=http://www.proxmox.com/cms_proxmox/cms/upload/vzdump/vzdump-1.2.tar.gz
-_eclasses_=perl-functions	01e8c68d5a528bbcda4d3c60205983df
-_md5_=33d50f4cd6a8bd917b5231b0da242a40
diff --git a/app-backup/vzdump/Manifest b/app-backup/vzdump/Manifest
new file mode 100644
index 000000000000..2baf74810601
--- /dev/null
+++ b/app-backup/vzdump/Manifest
@@ -0,0 +1,3 @@
+DIST vzdump-1.2.tar.gz 20296 BLAKE2B adbf4c8a51b9d87f022f6c415db566b5df41c33ca6fca800f362d4eb6b25de53bcc7106b54790e59fe22091e9b519d467750e20e467656ed0ec6d9ac90e66ff4 SHA512 c24bf785704ca3a624127b322a87fee5436fa272e42db159bd08b575405a9ec427d9ad3c82bb0a839495ece4f53b7dafcadc0430b8074368bb8cd844eb31b6cc
+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
new file mode 100644
index 000000000000..da366eec9b75
--- /dev/null
+++ b/app-backup/vzdump/metadata.xml
@@ -0,0 +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>
+</pkgmetadata>
diff --git a/app-backup/vzdump/vzdump-1.2.ebuild b/app-backup/vzdump/vzdump-1.2.ebuild
new file mode 100644
index 000000000000..7027a1cd9fe0
--- /dev/null
+++ b/app-backup/vzdump/vzdump-1.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit perl-functions
+
+DESCRIPTION="A utility to make consistent snapshots of running OpenVZ containers"
+HOMEPAGE="http://pve.proxmox.com/wiki/VZDump"
+SRC_URI="http://www.proxmox.com/cms_proxmox/cms/upload/vzdump/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND="dev-lang/perl:="
+RDEPEND="${DEPEND}
+	app-misc/cstream
+	dev-perl/LockFile-Simple
+	net-misc/rsync
+	sys-cluster/vzctl
+	sys-fs/lvm2
+	virtual/mta
+	virtual/perl-Getopt-Long"
+
+src_compile() {
+	return
+}
+
+src_install() {
+	emake PERLLIBDIR="$(perl_get_vendorlib)/PVE" DESTDIR="${D}" install
+	einstalldocs
+}
diff --git a/app-backup/zbackup-1.4.4-r1 b/app-backup/zbackup-1.4.4-r1
deleted file mode 100644
index 69a7d04ae17e..000000000000
--- a/app-backup/zbackup-1.4.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-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= ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A versatile deduplicating backup tool
-EAPI=6
-HOMEPAGE=http://zbackup.org/ https://github.com/zbackup/zbackup
-IUSE=libressl tartool
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=app-arch/lzma dev-libs/lzo:2 dev-libs/protobuf:0= sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-SLOT=0
-SRC_URI=https://github.com/zbackup/zbackup/archive/1.4.4.tar.gz -> zbackup-1.4.4.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b54df4997fc0f9c539b420a9ff3e1d82
diff --git a/app-backup/zbackup-9999 b/app-backup/zbackup-9999
deleted file mode 100644
index 54b3889e8f29..000000000000
--- a/app-backup/zbackup-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-arch/lzma dev-libs/lzo:2 dev-libs/protobuf:0= sys-libs/libunwind:7 sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=A versatile deduplicating backup tool
-EAPI=6
-HOMEPAGE=http://zbackup.org/ https://github.com/zbackup/zbackup
-IUSE=libressl tartool
-LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=app-arch/lzma dev-libs/lzo:2 dev-libs/protobuf:0= sys-libs/libunwind:7 sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-SLOT=0
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7dbb8e7bce7b916dd6d33ae6661a8191
diff --git a/app-backup/zbackup/Manifest b/app-backup/zbackup/Manifest
new file mode 100644
index 000000000000..59c4dd882fd0
--- /dev/null
+++ b/app-backup/zbackup/Manifest
@@ -0,0 +1,6 @@
+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-9999.ebuild 776 BLAKE2B b54cadd2af1da601fdd9aff31468b9294c2461eb086ff5be4d24d03d1d42035b51f79a66f29f9d464b66b162760b7c650c1b27ed70bce819fe247011e0d89765 SHA512 a83157f48f1457114527b38f28a7f74159b7173d5f3891aed6d5fdd9f98ddcfd08dc5c0196c74321c2841f52af138dcdbd35cba3959c297399507ac99868ae3d
+MISC metadata.xml 868 BLAKE2B 2ca9b107e5d3351ff15030e11d7da82a1b029fcdbcd24c6e0d67bd63b173fe7403c6642b11022253ba735fe70ba085c276dcfbf5dfd01e56d8c91be8144ee82d SHA512 d452d2e94449e05f0d2f99d223587560380999c7afd1396e3c7e3ed8a3792d4abd0bb717d078053cec0cd397df4cb2cf00949b24ab407fc966705bfe6911b524
diff --git a/app-backup/zbackup/files/zbackup-1.4.4-tartool.patch b/app-backup/zbackup/files/zbackup-1.4.4-tartool.patch
new file mode 100644
index 000000000000..8f9f839a66fd
--- /dev/null
+++ b/app-backup/zbackup/files/zbackup-1.4.4-tartool.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2017-02-24 09:22:39.360392521 +0200
++++ b/CMakeLists.txt	2017-02-24 09:23:13.642390978 +0200
+@@ -51,4 +51,8 @@
+   ${LIBLZO_LIBRARIES}
+ )
+ 
++if (BUILD_TARTOOL)
++	add_subdirectory(tartool)
++endif (BUILD_TARTOOL)
++
+ install( TARGETS zbackup DESTINATION bin )
diff --git a/app-backup/zbackup/files/zbackup-9999-tartool.patch b/app-backup/zbackup/files/zbackup-9999-tartool.patch
new file mode 100644
index 000000000000..26052f97a485
--- /dev/null
+++ b/app-backup/zbackup/files/zbackup-9999-tartool.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2017-02-24 09:22:39.360392521 +0200
++++ b/CMakeLists.txt	2017-02-24 09:23:13.642390978 +0200
+@@ -51,4 +51,8 @@
+   ${LIBLZO_LIBRARIES}
+ )
+ 
++if (BUILD_TARTOOL)
++	add_subdirectory(tools/tartool)
++endif (BUILD_TARTOOL)
++
+ install( TARGETS zbackup DESTINATION bin )
diff --git a/app-backup/zbackup/metadata.xml b/app-backup/zbackup/metadata.xml
new file mode 100644
index 000000000000..65b656521136
--- /dev/null
+++ b/app-backup/zbackup/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>spiderx@spiderx.dp.ua</email>
+		<name>Vladimir Pavljuchenkov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+	zbackup is a globally-deduplicating backup tool.
+	The program has the following features:
+	Parallel LZMA or LZO compression of the stored data
+	Built-in AES encryption of the stored data
+	Possibility to delete old backup data
+	Use of a 64-bit rolling hash, keeping the amount of soft collisions to zero
+	</longdescription>
+	<use>
+		<flag name="tartool">Install tartool utility</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">zbackup/zbackup</remote-id>
+	</upstream>
+</pkgmetadata>
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
new file mode 100644
index 000000000000..7b648c0e2b3f
--- /dev/null
+++ b/app-backup/zbackup/zbackup-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils git-r3
+
+DESCRIPTION="A versatile deduplicating backup tool"
+HOMEPAGE="http://zbackup.org/ https://github.com/zbackup/zbackup"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+
+LICENSE="GPL-2+-with-openssl-exception"
+KEYWORDS=""
+SLOT="0"
+IUSE="libressl tartool"
+
+DEPEND="app-arch/lzma
+	dev-libs/lzo:2
+	dev-libs/protobuf:0=
+	sys-libs/libunwind:7
+	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
+}