| 1 |
commit: 91c0efc19c4cc6b6f0e80024c8ee34485454bdcb |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 9 10:58:12 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 9 10:58:27 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91c0efc1 |
| 7 |
|
| 8 |
sys-apps/gptfdisk: Really fix static dependencies this time. |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/660772 |
| 11 |
Package-Manager: Portage-2.3.41, Repoman-2.3.9 |
| 12 |
|
| 13 |
sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild | 16 ++++++++++------ |
| 14 |
sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild | 17 ++++++++++------- |
| 15 |
sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild | 17 ++++++++++------- |
| 16 |
3 files changed, 30 insertions(+), 20 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild |
| 19 |
index eb179a7f709..ebca9efb473 100644 |
| 20 |
--- a/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild |
| 21 |
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild |
| 22 |
@@ -14,13 +14,17 @@ SLOT="0" |
| 23 |
KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux" |
| 24 |
IUSE="kernel_linux ncurses static" |
| 25 |
|
| 26 |
-LIB_DEPEND=" |
| 27 |
- dev-libs/popt[static-libs(+)] |
| 28 |
- ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] ) |
| 29 |
- kernel_linux? ( sys-apps/util-linux[static-libs(+)] )" # libuuid |
| 30 |
-RDEPEND="!static? ( ${LIB_DEPEND//,static-libs(+)} )" |
| 31 |
+RDEPEND="!static? ( |
| 32 |
+ dev-libs/popt |
| 33 |
+ ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] ) |
| 34 |
+ kernel_linux? ( sys-apps/util-linux ) |
| 35 |
+ )" |
| 36 |
DEPEND="${RDEPEND} |
| 37 |
- static? ( ${LIB_DEPEND} ) |
| 38 |
+ static? ( |
| 39 |
+ dev-libs/popt[static-libs(+)] |
| 40 |
+ ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] ) |
| 41 |
+ kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) |
| 42 |
+ ) |
| 43 |
virtual/pkgconfig" |
| 44 |
|
| 45 |
src_prepare() { |
| 46 |
|
| 47 |
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild |
| 48 |
index be7e5b330c5..86abd970105 100644 |
| 49 |
--- a/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild |
| 50 |
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild |
| 51 |
@@ -15,15 +15,18 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-l |
| 52 |
IUSE="kernel_linux ncurses static" |
| 53 |
|
| 54 |
# libuuid from util-linux is required. |
| 55 |
-LIB_DEPEND=" |
| 56 |
- dev-libs/popt[static-libs(+)] |
| 57 |
- ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] ) |
| 58 |
- kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) |
| 59 |
-" |
| 60 |
-RDEPEND="!static? ( ${LIB_DEPEND//,static-libs(+)} )" |
| 61 |
+RDEPEND="!static? ( |
| 62 |
+ dev-libs/popt |
| 63 |
+ ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] ) |
| 64 |
+ kernel_linux? ( sys-apps/util-linux ) |
| 65 |
+ )" |
| 66 |
DEPEND=" |
| 67 |
${RDEPEND} |
| 68 |
- static? ( ${LIB_DEPEND} ) |
| 69 |
+ static? ( |
| 70 |
+ dev-libs/popt[static-libs(+)] |
| 71 |
+ ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] ) |
| 72 |
+ kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) |
| 73 |
+ ) |
| 74 |
virtual/pkgconfig |
| 75 |
" |
| 76 |
|
| 77 |
|
| 78 |
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild |
| 79 |
index 0883fdb858e..ba13b2306d7 100644 |
| 80 |
--- a/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild |
| 81 |
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild |
| 82 |
@@ -15,15 +15,18 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-l |
| 83 |
IUSE="kernel_linux ncurses static" |
| 84 |
|
| 85 |
# libuuid from util-linux is required. |
| 86 |
-LIB_DEPEND=" |
| 87 |
- dev-libs/popt[static-libs(+)] |
| 88 |
- ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] ) |
| 89 |
- kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) |
| 90 |
-" |
| 91 |
-RDEPEND="!static? ( ${LIB_DEPEND//,static-libs(+)} )" |
| 92 |
+RDEPEND="!static? ( |
| 93 |
+ dev-libs/popt |
| 94 |
+ ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] ) |
| 95 |
+ kernel_linux? ( sys-apps/util-linux ) |
| 96 |
+ )" |
| 97 |
DEPEND=" |
| 98 |
${RDEPEND} |
| 99 |
- static? ( ${LIB_DEPEND} ) |
| 100 |
+ static? ( |
| 101 |
+ dev-libs/popt[static-libs(+)] |
| 102 |
+ ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] ) |
| 103 |
+ kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) |
| 104 |
+ ) |
| 105 |
virtual/pkgconfig |
| 106 |
" |
Archives