gentoo resync : 21.07.2018

7 files changed, 28 insertions, 28 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 2257dc6863a5..c88a6c12b53f 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/cdbackup/Manifest b/app-backup/cdbackup/Manifest
index 016087e36656..522eb631199f 100644
--- a/app-backup/cdbackup/Manifest
+++ b/app-backup/cdbackup/Manifest
@@ -1,3 +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
+EBUILD cdbackup-0.7.1-r1.ebuild 730 BLAKE2B 60fac951df47218ba0173c7925517fe6e6b57300beca28c17080b885ba72fff4be38a2b29e490ac88e6c6cb43615b2eb0758bfcbf49d9491071e793e0a8d3659 SHA512 0c190a6d87e63ffccd66982053c82b9c628ce44f2cc0519ab9367c06ed0c9b9968d259dd3e09ac918a178c3cd42a393e1fdffdc9ae7b9a979301f9f91c807133
 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
index 7529285d9a60..184aa586db4c 100644
--- a/app-backup/cdbackup/cdbackup-0.7.1-r1.ebuild
+++ b/app-backup/cdbackup/cdbackup-0.7.1-r1.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
@@ -19,7 +19,7 @@ DEPEND=""
 
 src_prepare() {
 	sed -i -e '/cd\(backup\|restore\)/,+1 s:CFLAGS:LDFLAGS:' \
-                "${S}"/Makefile || die "sed Makefile failed"
+		"${S}"/Makefile || die "sed Makefile failed"
 	default
 }
 
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index 5873597b8f72..6707e210b2b2 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -1,7 +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
+DIST dar-2.5.16.tar.gz 1905306 BLAKE2B 5f4d0a8314decf0d22d54470e0a176b25c6faafd014162336e74afb7fae746c959bcb0e6908603a09fdd80dab4cd235765b12ebaddae8941ba90dee80f36f51a SHA512 20c4f6e17640f26d85dc51c20680a84b32b4e80b61a0fd7c92deccb05a79c88f73383fb497b53e1d6583dba244aeea78e12a6791b02e63c991f0b499f5c81e09
 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
+EBUILD dar-2.5.16.ebuild 2401 BLAKE2B 4a2cec184b059f34b33d8bf8185a89d852fc22ce8a79274809994f850b139a5829f4f9a2a1d50a850c37dadf5e444cbe58dda6d80b5b275fdf4e536a575ad3ae SHA512 a0fba745d39fff69a04944818af377d025787478f106198abdae9a6492048fdf82508d5c4fa818b048cbbd4992b1cf40eb0d29d35c01838fcbbabb3a5d42d64f
 MISC metadata.xml 887 BLAKE2B 7fc6c15d3f725d59a115a839feb6d138b806e1f0e168c6e726e83c9f0185c46cbf869284e17872a376ce52f515fc0446134b5f3a449a578a33c10154876fa1f5 SHA512 9210de7c2f273c52c39555e2db525b1bdaa58c44d22deab887d1bf96e42ac9e8f32545461c7129d4673ced220a6445ddda68c6c2733e5660fcad05e98db56817
diff --git a/app-backup/dar/dar-2.5.14.ebuild b/app-backup/dar/dar-2.5.16.ebuild
index bb527233dac9..15e5c3408e8f 100644
--- a/app-backup/dar/dar-2.5.14.ebuild
+++ b/app-backup/dar/dar-2.5.16.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 flag-o-matic
 
 DESCRIPTION="A full featured backup tool, aimed for disks"
@@ -54,26 +54,28 @@ REQUIRED_USE="?? ( dar32 dar64 )
 #)
 
 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 )
+	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
@@ -90,7 +92,8 @@ src_install() {
 	local DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
 	einstalldocs
 
+	find "${ED}" -name '*.la' -delete || die
 	if ! use static-libs ; then
-		prune_libtool_files --all
+		find "${ED}" -name '*.a' -delete || die
 	fi
 }
diff --git a/app-backup/fsarchiver/Manifest b/app-backup/fsarchiver/Manifest
index d8fa52cbde88..34c405c9f26c 100644
--- a/app-backup/fsarchiver/Manifest
+++ b/app-backup/fsarchiver/Manifest
@@ -3,4 +3,4 @@ DIST fsarchiver-0.8.4.tar.gz 298793 BLAKE2B 706b1ed8a3966703ce8e6b0e16a502645317
 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
+MISC metadata.xml 436 BLAKE2B 4f26964f353b98b6548e6770a99284de8311945435cf88c449bd84b3b37096f56431702382bd3a317e4ea69fdeb17a9a22bff75203d83e44f9ebc492311e5180 SHA512 f6e8e65d36a2e548c63b8f940cf3d883807096b0cba45adadefe74260e8c86e8cb1d63e2740fa75a5ad452bb5ca9ffc776b917404165f6aff11e2cfc02b28e99
diff --git a/app-backup/fsarchiver/metadata.xml b/app-backup/fsarchiver/metadata.xml
index b705057e31d0..716e72d09ff4 100644
--- a/app-backup/fsarchiver/metadata.xml
+++ b/app-backup/fsarchiver/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?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>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="lz4">Enable lz4 compression support</flag>
 		<flag name="zstd">Enable zstd compression support</flag>