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 eb179a7f709e8ce46f05dfaa56e0d46d21d321fc..ebca9efb4734f4a8f1c55d46b3bf54d47fab9c05 100644 (file)
--- 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 be7e5b330c52dbcb05a37abe748b1ed28b664c44..86abd970105867f66a35d7bff8c455290a35e7d7 100644 (file)
--- 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 0883fdb858e8265d8b7cb7d65b4c66e51007477b..ba13b2306d7414b65e40a328301d0764893b3761 100644 (file)
--- 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
 "