summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2018-07-09 12:58:12 +0200
committerLars Wendler <polynomial-c@gentoo.org>2018-07-09 12:58:27 +0200
commit91c0efc19c4cc6b6f0e80024c8ee34485454bdcb (patch)
tree2e35ed586a161b8422b3d249c48e9e3861dbf3ae /sys-apps/gptfdisk
parentsys-libs/libosinfo: bump to 1.2.0 (diff)
downloadgentoo-91c0efc19c4cc6b6f0e80024c8ee34485454bdcb.tar.gz
gentoo-91c0efc19c4cc6b6f0e80024c8ee34485454bdcb.tar.bz2
gentoo-91c0efc19c4cc6b6f0e80024c8ee34485454bdcb.zip
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
Diffstat (limited to 'sys-apps/gptfdisk')
-rw-r--r--sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild16
-rw-r--r--sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild17
-rw-r--r--sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild17
3 files changed, 30 insertions, 20 deletions
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
"