From: Lars Wendler <polynomial-c@gentoo.org>
Date: Mon, 9 Jul 2018 10:58:12 +0000 (+0200)
Subject: sys-apps/gptfdisk: Really fix static dependencies this time.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=91c0efc19c4cc6b6f0e80024c8ee34485454bdcb;p=gentoo.git

sys-apps/gptfdisk: Really fix static dependencies this time.

Closes: https://bugs.gentoo.org/660772
Package-Manager: Portage-2.3.41, Repoman-2.3.9
---

diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild
index eb179a7f709e..ebca9efb4734 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild
@@ -14,13 +14,17 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="kernel_linux ncurses static"
 
-LIB_DEPEND="
-	dev-libs/popt[static-libs(+)]
-	ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] )
-	kernel_linux? ( sys-apps/util-linux[static-libs(+)] )" # libuuid
-RDEPEND="!static? ( ${LIB_DEPEND//,static-libs(+)} )"
+RDEPEND="!static? (
+		dev-libs/popt
+		ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] )
+		kernel_linux? ( sys-apps/util-linux )
+	)"
 DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
+	static? (
+		dev-libs/popt[static-libs(+)]
+		ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] )
+		kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
+	)
 	virtual/pkgconfig"
 
 src_prepare() {
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
index be7e5b330c52..86abd9701058 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
@@ -15,15 +15,18 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-l
 IUSE="kernel_linux ncurses static"
 
 # libuuid from util-linux is required.
-LIB_DEPEND="
-	dev-libs/popt[static-libs(+)]
-	ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] )
-	kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
-"
-RDEPEND="!static? ( ${LIB_DEPEND//,static-libs(+)} )"
+RDEPEND="!static? (
+		dev-libs/popt
+		ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] )
+		kernel_linux? ( sys-apps/util-linux )
+	)"
 DEPEND="
 	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
+	static? (
+		dev-libs/popt[static-libs(+)]
+		ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] )
+		kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
+	)
 	virtual/pkgconfig
 "
 
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild
index 0883fdb858e8..ba13b2306d74 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild
@@ -15,15 +15,18 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-l
 IUSE="kernel_linux ncurses static"
 
 # libuuid from util-linux is required.
-LIB_DEPEND="
-	dev-libs/popt[static-libs(+)]
-	ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] )
-	kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
-"
-RDEPEND="!static? ( ${LIB_DEPEND//,static-libs(+)} )"
+RDEPEND="!static? (
+		dev-libs/popt
+		ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] )
+		kernel_linux? ( sys-apps/util-linux )
+	)"
 DEPEND="
 	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
+	static? (
+		dev-libs/popt[static-libs(+)]
+		ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] )
+		kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
+	)
 	virtual/pkgconfig
 "