gentoo resync : 30.04.2018

2 files changed, 20 insertions, 18 deletions

diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index 00d1d652f0a3..5873597b8f72 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.13.tar.gz 1903994 BLAKE2B 9e58e2d86d38203364f23b506d957fb78b1b6d33df780a2711aab13913e50ce83726fed9301bcfe7975987bef6b3b8de45a30ad32c4e0b9a2d3b5db14e8a108e SHA512 759a54c07bee787a02f751db4ecb4036fa578224ba69779e784ea4edebf3d9feb3547414fe605c0f655bb4ac364575638ae35aab952df1f6610dd436bc70b444
 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.13.ebuild 2406 BLAKE2B 7f0a73200952c58eb492f65c46b66e763e6fba88134b45c9a3b902e7fd771385cca081ec4e8314b31eb49b00c96660b619619325cfd2fb73d9b68b0be0132392 SHA512 6d7185d1dbcf892ea038aa7c158a97ff9a77580d38a191914c704edbc78863d1c6ca74b30f5b3f39a76e137eca78e4cb42e5ce8d760fd624d3da47bb4933adb8
 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.13.ebuild b/app-backup/dar/dar-2.5.15.ebuild
index bb527233dac9..dbd30f33f184 100644
--- a/app-backup/dar/dar-2.5.13.ebuild
+++ b/app-backup/dar/dar-2.5.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
@@ -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
@@ -91,6 +93,6 @@ src_install() {
 	einstalldocs
 
 	if ! use static-libs ; then
-		prune_libtool_files --all
+		find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
 	fi
 }