From: Lars Wendler <polynomial-c@gentoo.org>
Date: Mon, 16 Jul 2018 15:14:51 +0000 (+0200)
Subject: sys-fs/xfsprogs: Revbumps to add "icu" USE flag. Removed old.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=a6f6f5b96f9c7109f91125ce4bce3868444604f4;p=gentoo.git

sys-fs/xfsprogs: Revbumps to add "icu" USE flag. Removed old.

This removes automagic dep on dev-libs/icu.

Package-Manager: Portage-2.3.42, Repoman-2.3.9
---

diff --git a/sys-fs/xfsprogs/xfsprogs-4.16.1.ebuild b/sys-fs/xfsprogs/xfsprogs-4.16.1-r1.ebuild
similarity index 95%
rename from sys-fs/xfsprogs/xfsprogs-4.16.1.ebuild
rename to sys-fs/xfsprogs/xfsprogs-4.16.1-r1.ebuild
index 275a8f8ef898..273db91aea0b 100644
--- a/sys-fs/xfsprogs/xfsprogs-4.16.1.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.16.1-r1.ebuild
@@ -12,10 +12,11 @@ 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="libedit nls readline static static-libs"
+IUSE="icu libedit nls readline static static-libs"
 REQUIRED_USE="static? ( 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(+)]} )
@@ -68,8 +69,10 @@ src_configure() {
 
 	local myconf=(
 		--disable-lto #655638
+		--enable-blkid
 		--with-crond-dir="${EPREFIX}/etc/cron.d"
 		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+		$(use_enable icu libicu)
 		$(use_enable nls gettext)
 		$(use_enable readline)
 		$(usex readline --disable-editline $(use_enable libedit editline))
diff --git a/sys-fs/xfsprogs/xfsprogs-4.17.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild
similarity index 95%
rename from sys-fs/xfsprogs/xfsprogs-4.17.0.ebuild
rename to sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild
index 275a8f8ef898..273db91aea0b 100644
--- a/sys-fs/xfsprogs/xfsprogs-4.17.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild
@@ -12,10 +12,11 @@ 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="libedit nls readline static static-libs"
+IUSE="icu libedit nls readline static static-libs"
 REQUIRED_USE="static? ( 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(+)]} )
@@ -68,8 +69,10 @@ src_configure() {
 
 	local myconf=(
 		--disable-lto #655638
+		--enable-blkid
 		--with-crond-dir="${EPREFIX}/etc/cron.d"
 		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+		$(use_enable icu libicu)
 		$(use_enable nls gettext)
 		$(use_enable readline)
 		$(usex readline --disable-editline $(use_enable libedit editline))