gentoo resync : 25.08.2018

22 files changed, 55 insertions, 422 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 77bf54f30830..04a2afd0acd6 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index 52b0c4458661..4210408f8435 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -1,10 +1,6 @@
-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
+DIST borgbackup-1.1.7.tar.gz 3446832 BLAKE2B c4e2ce7c08f0df479d3333e5766ea070d0c1e18abc88fc8787e4212eff27e8e4505759f80f3bdda80d2b9a737241b907a41749edca9a6138eae2a5620913908d SHA512 586420b9cad7e731f2f1b8b05f3cd3dc606691c5a5ec307e887035d941ac5ac6d4c988783660969960a1221e4d9f2b865ee5558d4007ea7524632d0a50a8a402
 EBUILD borgbackup-1.1.6.ebuild 1088 BLAKE2B b89c1c7d27543d4b83d8c00b29e45b0602a6c6c27c5d04ed8309d0701bc37470b09befcaa33304124235ca37d83e84809f077027eb9eca333f78ade8e1bd63e6 SHA512 5a679f0db9dd1fb59f7c6c97c180e55289b3e175c3920e81956b34870a95349023d65165f1c7f3156df1dc8fc40801184a57380684d6fba18df42e018e063c71
+EBUILD borgbackup-1.1.7.ebuild 1090 BLAKE2B 54321c9dadf7b6bf077a286375c3ebc84b5f8e545e6d103d0af24253fed071f67a547b6a33af03b00bf72b765122125c16041fe6668d42f99d4809a74f87047e SHA512 c135ae63d7fa35c806fd9ffb0bcf4be28fb935a539843253054c4169d38affaefa1dce2d9388def85022bcbe4b232f4e0e762abe5715b5e87d18fb70d7cb64a9
 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
deleted file mode 100644
index b360607c770f..000000000000
--- a/app-backup/borgbackup/borgbackup-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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
deleted file mode 100644
index fdd80a89ecd9..000000000000
--- a/app-backup/borgbackup/borgbackup-1.1.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.7.ebuild
index fdd80a89ecd9..fdd80a89ecd9 100644
--- a/app-backup/borgbackup/borgbackup-1.1.4-r1.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.1.7.ebuild
diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest
index 1af3fa837464..7bd7e65940a6 100644
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@@ -7,12 +7,12 @@ DIST duplicity-0.7.14.tar.gz 1556110 BLAKE2B 32d4d7f941a09e85915724352ec14d6ed1b
 DIST duplicity-0.7.15.tar.gz 1563272 BLAKE2B 1a5487d863253298ecab0bf328bc7e4aa7ac7df4e2b2dd47fd60b674310bcb9046e96546860fb6f299cddeb3ad384abae615a065759798e7215addb064d4582b SHA512 7cdcf1c707e9bdbbc250afcd359978607454b1614128d2b7f09403867195795606794c5f193dc869579ae8c3a9251d7ef8f9acd66d4e69bce91344d7c046ca90
 DIST duplicity-0.7.16.tar.gz 1563676 BLAKE2B 67e1a205a880b2658ed265efa46590553537881d82af21f538fe0b524338ed8450ded1dcc30089ecf13892f5cccc284fe2acd3dbb1a17597557640ccbb1376cd SHA512 552f63848ce90ccd8481136df6c0918bbf2463dde00d4e54f0af3693dc5439551ac086dc43b7b7191d1dcf0b710d7391b6c627ce0effd14a59beb0b5fa06a804
 DIST duplicity-0.7.17.tar.gz 1719145 BLAKE2B fb5b3b3319305e63aaabcf4feef89d8a9c7b84d8e1ff09082cbfb49ebb7129a88afe6c85f6db892c0fdc8a27ca2b247e903e20a2f7b7fd9d6ced0aa77f15a2d4 SHA512 a7fa3f26709bcb25be519a20d65a196072a49ca468ace84b4876a815efea23fc1ed5b77abf765475fb8a08e3138349bf1d48e0ce22816ef66526463b646e12a3
-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
+EBUILD duplicity-0.7.10.ebuild 1242 BLAKE2B 6c0ec022f98a61a0308910f5077e562e171e8f7e22a6add2f230c3c9e3fdcbbf766542cef9ec7d0b0e907d4b396cb25d70e01ec783047bc60ea6b904b699f253 SHA512 d8d9f170e05036b2fb9a0eb70429529cf22ab9e818d50270e429533aefa1c77c642b8ffd676c8271a2b84a9477b04aa622bf9aac2e2046323880011ffce10064
+EBUILD duplicity-0.7.11.ebuild 1245 BLAKE2B 56bcf675983f66f7a01f46ab909d608935d5f2a4c75fad798da78558351ff0cde6b3fa242a4e95c22a398918317423075c36c79612f6a2159b648344b40583c1 SHA512 2c57e4f235e7a5478645b98fe7750768e36eb73009a430cb1f1b54ece440972d6f8e39965e6b4c1d765b610fb88d25ac35fad2269160e02369bc0f51cf302073
+EBUILD duplicity-0.7.12.ebuild 1245 BLAKE2B 56bcf675983f66f7a01f46ab909d608935d5f2a4c75fad798da78558351ff0cde6b3fa242a4e95c22a398918317423075c36c79612f6a2159b648344b40583c1 SHA512 2c57e4f235e7a5478645b98fe7750768e36eb73009a430cb1f1b54ece440972d6f8e39965e6b4c1d765b610fb88d25ac35fad2269160e02369bc0f51cf302073
+EBUILD duplicity-0.7.13.1.ebuild 1252 BLAKE2B aacaec8e96367279d050700dab7dbaa64df94bff29bf7f7aa28488c2032c0f7656574be8815f49877f9a7b986aceb3f1c39d7badeebac6ee368612108f82ba33 SHA512 19aa6bb381f9ffa1a8a01a8cefa917c3103ff2c08a943bcc5b1cb33fdf90170eebd09a1d16fdf2d417d801fdbe5cefd57a79eeca691d6a6158d57c8828f4677c
+EBUILD duplicity-0.7.14.ebuild 1252 BLAKE2B aacaec8e96367279d050700dab7dbaa64df94bff29bf7f7aa28488c2032c0f7656574be8815f49877f9a7b986aceb3f1c39d7badeebac6ee368612108f82ba33 SHA512 19aa6bb381f9ffa1a8a01a8cefa917c3103ff2c08a943bcc5b1cb33fdf90170eebd09a1d16fdf2d417d801fdbe5cefd57a79eeca691d6a6158d57c8828f4677c
+EBUILD duplicity-0.7.15.ebuild 1275 BLAKE2B 617c99dd058f1037a4c84df4d8d8e62d7612b255315902f265a6932309b2dbd341702875aa1144d2716d215b773f16cfeb6a3b26e657508527afac1c924e27ab SHA512 5a08f43b7894582b728004a99134f87a57136ace034994d7a3e9ebfc6ea7eab471e2fdd93b60605035e29dbdfa5c6ae3fca8b0f284977f6e94a5efc17703acf8
+EBUILD duplicity-0.7.16.ebuild 1275 BLAKE2B 617c99dd058f1037a4c84df4d8d8e62d7612b255315902f265a6932309b2dbd341702875aa1144d2716d215b773f16cfeb6a3b26e657508527afac1c924e27ab SHA512 5a08f43b7894582b728004a99134f87a57136ace034994d7a3e9ebfc6ea7eab471e2fdd93b60605035e29dbdfa5c6ae3fca8b0f284977f6e94a5efc17703acf8
+EBUILD duplicity-0.7.17.ebuild 1275 BLAKE2B 617c99dd058f1037a4c84df4d8d8e62d7612b255315902f265a6932309b2dbd341702875aa1144d2716d215b773f16cfeb6a3b26e657508527afac1c924e27ab SHA512 5a08f43b7894582b728004a99134f87a57136ace034994d7a3e9ebfc6ea7eab471e2fdd93b60605035e29dbdfa5c6ae3fca8b0f284977f6e94a5efc17703acf8
 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
index 6fd6bda1d011..084f57576353 100644
--- a/app-backup/duplicity/duplicity-0.7.10.ebuild
+++ b/app-backup/duplicity/duplicity-0.7.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -46,6 +46,6 @@ python_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."
+	elog "Duplicity has many optional dependencies to support various backends."
+	elog "Currently it's up to you to install them as necessary."
 }
diff --git a/app-backup/duplicity/duplicity-0.7.11.ebuild b/app-backup/duplicity/duplicity-0.7.11.ebuild
index f58453ccdf6d..c4137e57f2f0 100644
--- a/app-backup/duplicity/duplicity-0.7.11.ebuild
+++ b/app-backup/duplicity/duplicity-0.7.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -46,6 +46,6 @@ python_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."
+	elog "Duplicity has many optional dependencies to support various backends."
+	elog "Currently it's up to you to install them as necessary."
 }
diff --git a/app-backup/duplicity/duplicity-0.7.12.ebuild b/app-backup/duplicity/duplicity-0.7.12.ebuild
index f58453ccdf6d..c4137e57f2f0 100644
--- a/app-backup/duplicity/duplicity-0.7.12.ebuild
+++ b/app-backup/duplicity/duplicity-0.7.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -46,6 +46,6 @@ python_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."
+	elog "Duplicity has many optional dependencies to support various backends."
+	elog "Currently it's up to you to install them as necessary."
 }
diff --git a/app-backup/duplicity/duplicity-0.7.13.1.ebuild b/app-backup/duplicity/duplicity-0.7.13.1.ebuild
index 46196df24caa..8b00a732be67 100644
--- a/app-backup/duplicity/duplicity-0.7.13.1.ebuild
+++ b/app-backup/duplicity/duplicity-0.7.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -46,6 +46,6 @@ python_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."
+	elog "Duplicity has many optional dependencies to support various backends."
+	elog "Currently it's up to you to install them as necessary."
 }
diff --git a/app-backup/duplicity/duplicity-0.7.14.ebuild b/app-backup/duplicity/duplicity-0.7.14.ebuild
index 46196df24caa..8b00a732be67 100644
--- a/app-backup/duplicity/duplicity-0.7.14.ebuild
+++ b/app-backup/duplicity/duplicity-0.7.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -46,6 +46,6 @@ python_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."
+	elog "Duplicity has many optional dependencies to support various backends."
+	elog "Currently it's up to you to install them as necessary."
 }
diff --git a/app-backup/duplicity/duplicity-0.7.15.ebuild b/app-backup/duplicity/duplicity-0.7.15.ebuild
index 07a84c1db121..0e550a7c893c 100644
--- a/app-backup/duplicity/duplicity-0.7.15.ebuild
+++ b/app-backup/duplicity/duplicity-0.7.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -47,6 +47,6 @@ python_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."
+	elog "Duplicity has many optional dependencies to support various backends."
+	elog "Currently it's up to you to install them as necessary."
 }
diff --git a/app-backup/duplicity/duplicity-0.7.16.ebuild b/app-backup/duplicity/duplicity-0.7.16.ebuild
index b2f160dd6d9e..0e550a7c893c 100644
--- a/app-backup/duplicity/duplicity-0.7.16.ebuild
+++ b/app-backup/duplicity/duplicity-0.7.16.ebuild
@@ -47,6 +47,6 @@ python_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."
+	elog "Duplicity has many optional dependencies to support various backends."
+	elog "Currently it's up to you to install them as necessary."
 }
diff --git a/app-backup/duplicity/duplicity-0.7.17.ebuild b/app-backup/duplicity/duplicity-0.7.17.ebuild
index b2f160dd6d9e..0e550a7c893c 100644
--- a/app-backup/duplicity/duplicity-0.7.17.ebuild
+++ b/app-backup/duplicity/duplicity-0.7.17.ebuild
@@ -47,6 +47,6 @@ python_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."
+	elog "Duplicity has many optional dependencies to support various backends."
+	elog "Currently it's up to you to install them as necessary."
 }
diff --git a/app-backup/restic/Manifest b/app-backup/restic/Manifest
index 6a1e92aded1a..11070bd02688 100644
--- a/app-backup/restic/Manifest
+++ b/app-backup/restic/Manifest
@@ -1,7 +1,5 @@
 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
+DIST restic-0.9.2.tar.gz 27344284 BLAKE2B 17c121a0d4df470397b467e09ceac559848c34e6a43f289b68eff8b85af86a18a4d2e1340060812613cb7e9cecf86f706565a6bcce31fbcd5aab076a85b57c67 SHA512 e060e0e16031924df7347ec74972bf52c75c84cca8ae996b1c5dd8a6f42c9022062e004ec17af2ebc0b6e9480ecfdff4ca7f64956afab9b9799201848d0be731
 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
+EBUILD restic-0.9.2.ebuild 1155 BLAKE2B 2370d9923040125cab0b8831850d5c997638669eb1a1939e3f59a51d27f131b2631ea5866d77ac1ef85e73fd74c54cd3d49aafc619924e7afdc4c888c08f0864 SHA512 5cdd3cff4ff86b0502f8d6e31f647e144a84db086c43d33fd53cdadcebe4f440a84f82f5bc478f2043adc4ac007a1800a33bf97f9c8b4d43fc11ca5d287572bf
 MISC metadata.xml 444 BLAKE2B f9cc0e8188fbd02a7bacc258eac4052b88fcd3d3b878ce336f7f4635bd4fa94abdfa5112b35bbf6913dcbbfb64833d5f3a4d372c202b2f2488d5d0c750ce2f52 SHA512 8dbd7df10769ff8d0271588be8c97402d5917a4c0dbafa5daad2090245ee4b022193a6c271f71c342540d7599b029998c91c10364eae7d55de0275276342c0f4
diff --git a/app-backup/restic/restic-0.9.1.ebuild b/app-backup/restic/restic-0.9.1.ebuild
deleted file mode 100644
index 89515ce18d02..000000000000
--- a/app-backup/restic/restic-0.9.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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.0.ebuild b/app-backup/restic/restic-0.9.2.ebuild
index 89515ce18d02..89515ce18d02 100644
--- a/app-backup/restic/restic-0.9.0.ebuild
+++ b/app-backup/restic/restic-0.9.2.ebuild
diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index cf81281beb17..3ad7a2a9bddd 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -1,14 +1,9 @@
 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
+DIST snapper-0.5.6.tar.bz2 580047 BLAKE2B 3b945acbf734db1925dad5515323a64a2c08ee8226a593025f9160e0d1b1140734b2b498d036256946159900b50fec8567147dc0a974c281be747e977bcbd05b SHA512 392427d097cbe221bf7ca0ae20bc065dffaa4d0017ed750c41748d71128fc7ce054bb4425d6dbed7308a530df71815f80f56e60d72aab17ef3e0a16f3b3ba47e
 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
+EBUILD snapper-0.5.6.ebuild 1694 BLAKE2B eb03d7133e4094ffcbedbdc4aed28bcfdda6edb8eb34515c09d13e1b63f4724ddcc19637ebeb2c25f4945cb7e5fff67db99d852e98e171ef90c03af00923599b SHA512 d0156ebcbf1f0797f63eaedb6776993326fff17b8be3b673dbb87be29a84416419723e4bfdac5d9ae64cb188a51880831c9df2e5defa1e030d38bd1f32f28383
 MISC metadata.xml 1456 BLAKE2B 327ecba708769cd77e1cd785f178f124cdfa37bf3ba1a3e90161f673fdb10d823a3a1aa14b73877345ed39a71014c5cc51836fe7a539e2c62cc992f473deb31b SHA512 9954576d7d44f0f1a20a5bd5168a6b9c5968ad1a47708a198ae8b4a7054863c2de1c58d9d6108a3dcabf944fb5f266ffe6451be5c2b924636cc53380b2779976
diff --git a/app-backup/snapper/snapper-0.2.8-r1.ebuild b/app-backup/snapper/snapper-0.2.8-r1.ebuild
deleted file mode 100644
index 9b4de6eddcc3..000000000000
--- a/app-backup/snapper/snapper-0.2.8-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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
deleted file mode 100644
index 891e694a6f05..000000000000
--- a/app-backup/snapper/snapper-0.3.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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.5.6.ebuild
index 891e694a6f05..0615011a39c3 100644
--- a/app-backup/snapper/snapper-0.4.1.ebuild
+++ b/app-backup/snapper/snapper-0.5.6.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils
+inherit systemd
 
-DESCRIPTION="Command-line program for btrfs and ext4 snapshot management"
+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="+btrfs ext4 lvm pam xattr"
+IUSE="lvm pam xattr"
 
 RDEPEND="dev-libs/boost:=[threads]
 	dev-libs/libxml2
@@ -20,10 +20,9 @@ RDEPEND="dev-libs/boost:=[threads]
 	sys-apps/acl
 	sys-apps/dbus
 	sys-apps/util-linux
+	>=sys-fs/btrfs-progs-3.17.1
 	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 )"
@@ -32,22 +31,28 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"
 
-REQUIRED_USE="|| ( btrfs ext4 lvm )"
-
-DOCS=( AUTHORS )
+PATCHES=(
+	"${FILESDIR}"/cron-confd.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/cron-confd.patch
+	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
-		$(use_enable btrfs)
-		$(use_enable ext4)
+		--disable-ext4
+		--enable-btrfs
 		$(use_enable lvm)
 		$(use_enable pam)
 		$(use_enable xattr xattrs)
@@ -60,7 +65,7 @@ src_install() {
 	default
 	# Existing configuration file required to function
 	newconfd data/sysconfig.snapper snapper
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/app-backup/snapper/snapper-9999.ebuild b/app-backup/snapper/snapper-9999.ebuild
deleted file mode 100644
index 510d4e252f28..000000000000
--- a/app-backup/snapper/snapper-9999.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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"
-}