gentoo resync : 14.07.2018

3 files changed, 20 insertions, 50 deletions

diff --git a/app-backup/fsarchiver/Manifest b/app-backup/fsarchiver/Manifest
index 628e553e7740..d8fa52cbde88 100644
--- a/app-backup/fsarchiver/Manifest
+++ b/app-backup/fsarchiver/Manifest
@@ -1,8 +1,6 @@
 AUX fsarchiver-0.8.4-xattr.patch 1875 BLAKE2B 57841c69bbfe68a55f83affb5e0ec2f7583673d1741d780e71bd55817a5659dc34d75b56bea531ad41365ff741b6c17965926456809b61fbdeedfad33c9b0867 SHA512 cc1e632bd7147da8af77d4f45c473617f1d40768dd30f94880384f3cfb3f43df85ab6f3917b48a2299a267a7c8861ba5f3b1bbef1e8a706eebba8a849fda2e50
-DIST fsarchiver-0.8.1.tar.gz 265048 BLAKE2B 2bf36ea0c1370abcce94e7e603ae98112c7da09ec6f9c7c928d78596093a6e478032a2e4ed408ace0a938b909be7317f841a84f2906345f20aec077d9372429e SHA512 17133392b0678b88552ae356bc199a8a5a8a88d3c8878b593b36acdc0f9dc3869f87475cc1a36d0df752e3bc3df8c9c0641954f675aaf60da4f1b0862dec1bc6
-DIST fsarchiver-0.8.2.tar.gz 296486 BLAKE2B 655377c4e99bd45eccf529f13a3bf1f1e944a9fb18f91f57d2c59b46beb3cf7f85b9c1ab617aea7e021009c242a016cc351d6117466768c6ebbacd9be756d783 SHA512 e7b5b5dcd44be57d2d8a2639a54d8ef9c8bf9fde39ed3ca317c7cc124e1735a88db4a2be937b890c582eb4881926c8d50cdf940d13c0f97f9b8276f2b0a9319c
 DIST fsarchiver-0.8.4.tar.gz 298793 BLAKE2B 706b1ed8a3966703ce8e6b0e16a502645317158478422e0fb999ed277185f83ca9a5a607f189c9bbf6b63c6bf1b4d9589d51fcbf3b256d57b6cd056757156ae3 SHA512 15712e5fdb9695148e8fe42791952acf0c7d34611c3467a0cb2e2631c9c5f1c55a4e839098085e6a72c2d8988b05e6f515ef772bcc5766b57a07da65a5209efd
-EBUILD fsarchiver-0.8.1.ebuild 895 BLAKE2B ac38b3dbecb3eec60225f32615fa7d78d4442c9d393eabf35559e5482b7ee641fb07128b3d7310683229a3b1ccf858d0dee4f64fe4f9f750868545904ca3eff0 SHA512 0848bbe0f95cd3ba2f56b42fd17f51982b8476b9b4800967cf2aabf29cb909e5eefd9b69c47aa0c41c02456d327b40a53181d74fa3545171a843bf5a2daa7b1e
-EBUILD fsarchiver-0.8.2.ebuild 903 BLAKE2B f31554f388fc627e16da158ca254ac4de837e6cba368d61fefee9d329b1a5f336a89509a807c61efebcc0d51b311889fb1fcaa8c3f47da0eb8441340d1251164 SHA512 1cae4d5f5ee113820dab9309d1f4c351229eb50439d02ef55dd2d9486e3c2786866234ea619600cb219dc515e5d13c3fe04902aaf2ed35fab7f35b021e8974b6
+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/fsarchiver-0.8.1.ebuild b/app-backup/fsarchiver/fsarchiver-0.8.1.ebuild
deleted file mode 100644
index ad64ed434945..000000000000
--- a/app-backup/fsarchiver/fsarchiver-0.8.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 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 lzma lzo static"
-
-DEPEND="dev-libs/libgcrypt:0=
-	>=sys-fs/e2fsprogs-1.41.4
-	lzma? ( >=app-arch/xz-utils-4.999.9_beta )
-	lzo? ( >=dev-libs/lzo-2.02 )
-	static? ( lzma? ( app-arch/xz-utils[static-libs] ) )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i -e 's/^\([a-z]*_CFLAGS.*\)-ggdb/\1/' src/Makefile.am \
-		|| die "seding failed"
-	eautoreconf
-}
-
-src_configure() {
-	myeconfargs=(
-		$(use_enable lzma)
-		$(use_enable lzo)
-		$(use_enable static)
-		$(use_enable debug devel)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/app-backup/fsarchiver/fsarchiver-0.8.2.ebuild b/app-backup/fsarchiver/fsarchiver-0.8.5.ebuild
index 325a278172cd..7d22bbd4d2b7 100644
--- a/app-backup/fsarchiver/fsarchiver-0.8.2.ebuild
+++ b/app-backup/fsarchiver/fsarchiver-0.8.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -12,14 +12,23 @@ SRC_URI="https://github.com/fdupoux/${PN}/releases/download/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug lzma lzo static"
+IUSE="debug lz4 lzma lzo static zstd"
 
-DEPEND="dev-libs/libgcrypt:0=
+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 )
-	static? ( lzma? ( app-arch/xz-utils[static-libs] ) )"
-RDEPEND="${DEPEND}"
+	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
@@ -30,10 +39,12 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
+		$(use_enable debug devel)
+		$(use_enable lz4)
 		$(use_enable lzma)
 		$(use_enable lzo)
 		$(use_enable static)
-		$(use_enable debug devel)
+		$(use_enable zstd)
 	)
 	econf "${myeconfargs[@]}"
 }