gentoo resync : 22.10.2018

3 files changed, 11 insertions, 49 deletions

diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index bfcee3789e3f..4e3f278fd407 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -7,6 +7,6 @@ DIST xfsprogs-4.14.0.tar.xz 1137048 BLAKE2B b58373ca7f58e5d887cf18ed2aab169aed4b
 DIST xfsprogs-4.17.0.tar.xz 1205508 BLAKE2B 46168792c1e4c335b7ed9e7489afc20d7df4b4e554eb86043b2c19303879491cc4746b18d23fdff3e2f92ca3887ac27957ae57e85ba784476d8891ea6909d67e SHA512 996de920c76de596b6175e4ae4ba9de208c16fbcf9362bbb44d25ee1c12b249d0178fc5cc93dc5a434ab20e6d515d64a3f51b8e89905b5b033b28a3638f4d400
 DIST xfsprogs-4.18.0.tar.xz 1214480 BLAKE2B 78db41319e53be1f03b66f85ecc7c50e0c6658fa3fd8ddd8539bac04e656614a5cb54dc930a324d9df6afe4024c2be10259b903e1ca0ccd0ffb340e7410692c2 SHA512 0629400f8824620138928a7d72908b7a852408814238a55e11d6eb3b2da42cd56273960430d3ea729a9bce95f605d225607940d4728b68c468c39eb5a9a590be
 EBUILD xfsprogs-4.14.0.ebuild 2655 BLAKE2B 8aa62f0b2a4aecaebf4842edf8c636f0dddee92b2635ff8355f26e6cd95ff5b328e613e325463cb3dc22d1a7dad376b0ff3ef8840da0bfa9e9dbf775ee8a7d9d SHA512 a9bd435a3d8ec8f6ca2c3b1408cff7eb5c8f5bfeba876d4fad81c7ec6bf1f2cb35c2380badea5fc556ac386f933c8764521cfa35fa5c8ce5e2cd2f3bec57bd22
-EBUILD xfsprogs-4.17.0-r1.ebuild 2880 BLAKE2B 3383295cbdd67ceafdb14af6e57b12f0e090f3ca9d97ff418c2fc314bd6a39a53423457db18825275de162990f689a80d69f308f54943d9664f5d1652b9c0c4c SHA512 bec7dda7404dcd6854290ea91fd76840339c16b6a01918dd8f0690ae74135db00f63098d4d16807e68c56b1ea829e2ca93cdc4ed118a53cdee7a43946daa3d8b
-EBUILD xfsprogs-4.18.0.ebuild 2887 BLAKE2B e17dfa5a76155525edf9a5bfae7ddf2d869a8c16a846bc5e2db122c327b3214a9ce59b91429eed89f5cc179fe7549c796933640ac85c8072dc97e40037068f39 SHA512 8599b45f034314a0e9f48e97551bf4d8efbbc50aa2b72a86975ee5788362c507d904b45a69eeacc9b31eabbe80177f0d7ed7d3600de6c9024519dd7ea5da48c6
+EBUILD xfsprogs-4.17.0-r1.ebuild 2305 BLAKE2B 71456bbc5893d4289ebd432ffea3d8e0e4fbf8927b89368290a577ecaaae28e47b7cf5cae0e365e6b6462ee74e28ec60152fdac6f9a81627379d708081468903 SHA512 2c7270c10661d5894a15da2f8aa723714106abc8c58013b0435551c84f4e38abf3aab5d928e2ee2ca1716f07faf2ff3831441e2e05b0137e3af2cf7605c84647
+EBUILD xfsprogs-4.18.0.ebuild 2314 BLAKE2B b2a8dd0f0a36b5461bdc34b5ec061e261f24040c29b49989977927e05bd66a3716cf275f5ae7d2d3ce54e64f78b919f3fc9e939539482294ce7d17067c03824d SHA512 01ccc49541ff057324b706fb2a8474492422e5b32ada74844494ca53a010920eeafde7e321e2a94c9c2b9c25823bae86db5b50597c87407202147f94ef92e4ad
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild
index e13414de1dad..70e095eb507f 100644
--- a/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,21 +11,16 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
-IUSE="icu libedit nls readline static static-libs"
-REQUIRED_USE="static? ( static-libs )"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sh ~sparc x86"
+IUSE="icu libedit nls readline static-libs"
 
 LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
 	icu? ( dev-libs/icu:=[static-libs(+)] )
 	readline? ( sys-libs/readline:0=[static-libs(+)] )
 	!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+RDEPEND="${LIB_DEPEND//\[static-libs(+)]}
 	!<sys-fs/xfsdump-3"
 DEPEND="${RDEPEND}
-	static? (
-		${LIB_DEPEND}
-		readline? ( sys-libs/ncurses:0=[static-libs] )
-	)
 	nls? ( sys-devel/gettext )"
 
 PATCHES=(
@@ -44,22 +39,12 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	# LLDFLAGS is used for programs, so apply -all-static when USE=static is enabled.
 	# Clear out -static from all flags since we want to link against dynamic xfs libs.
 	sed -i \
 		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		-e "1iLLDFLAGS += $(usex static '-all-static' '')" \
 		include/builddefs.in || die
 	find -name Makefile -exec \
 		sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
-
-	# TODO: Write a patch for configure.ac to use pkg-config for the uuid-part.
-	if use static && use readline ; then
-		sed -i \
-			-e 's|-lreadline|& -lncurses|' \
-			-e 's|-lblkid|& -luuid|' \
-			configure || die
-	fi
 }
 
 src_configure() {
@@ -76,12 +61,8 @@ src_configure() {
 		$(use_enable nls gettext)
 		$(use_enable readline)
 		$(usex readline --disable-editline $(use_enable libedit editline))
+		$(use_enable static-libs static)
 	)
-	if use static || use static-libs ; then
-		myconf+=( --enable-static )
-	else
-		myconf+=( --disable-static )
-	fi
 
 	econf "${myconf[@]}"
 
diff --git a/sys-fs/xfsprogs/xfsprogs-4.18.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.18.0.ebuild
index 273db91aea0b..ac490a41e289 100644
--- a/sys-fs/xfsprogs/xfsprogs-4.18.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,20 +12,15 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="icu libedit nls readline static static-libs"
-REQUIRED_USE="static? ( static-libs )"
+IUSE="icu libedit nls readline static-libs"
 
 LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
 	icu? ( dev-libs/icu:=[static-libs(+)] )
 	readline? ( sys-libs/readline:0=[static-libs(+)] )
 	!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+RDEPEND="${LIB_DEPEND//\[static-libs(+)]}
 	!<sys-fs/xfsdump-3"
 DEPEND="${RDEPEND}
-	static? (
-		${LIB_DEPEND}
-		readline? ( sys-libs/ncurses:0=[static-libs] )
-	)
 	nls? ( sys-devel/gettext )"
 
 PATCHES=(
@@ -44,22 +39,12 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	# LLDFLAGS is used for programs, so apply -all-static when USE=static is enabled.
 	# Clear out -static from all flags since we want to link against dynamic xfs libs.
 	sed -i \
 		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		-e "1iLLDFLAGS += $(usex static '-all-static' '')" \
 		include/builddefs.in || die
 	find -name Makefile -exec \
 		sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
-
-	# TODO: Write a patch for configure.ac to use pkg-config for the uuid-part.
-	if use static && use readline ; then
-		sed -i \
-			-e 's|-lreadline|& -lncurses|' \
-			-e 's|-lblkid|& -luuid|' \
-			configure || die
-	fi
 }
 
 src_configure() {
@@ -76,12 +61,8 @@ src_configure() {
 		$(use_enable nls gettext)
 		$(use_enable readline)
 		$(usex readline --disable-editline $(use_enable libedit editline))
+		$(use_enable static-libs static)
 	)
-	if use static || use static-libs ; then
-		myconf+=( --enable-static )
-	else
-		myconf+=( --disable-static )
-	fi
 
 	econf "${myconf[@]}"