gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-07 05:57:07 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Closes: https://bugs.gentoo.org/660772
Package-Manager: Portage-2.3.41, Repoman-2.3.9
This commit is contained in:
Lars Wendler
2018-07-09 12:58:27 +02:00
parent 33b66ce0aa
commit 91c0efc19c
3 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild
+10 -6
View File
@@ -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() {
sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
+10 -7
View File
@@ -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
"
sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild
+10 -7
View File
@@ -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
"