| 1 |
commit: 57bda9c4f94cd43a2dd2e33faccadce256a0572d |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 6 16:34:16 2019 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 6 16:34:28 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57bda9c4 |
| 7 |
|
| 8 |
app-portage/portage-utils: fix USE=static, fix RDEPEND |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/687512 |
| 11 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 12 |
Package-Manager: Portage-2.3.66, Repoman-2.3.11 |
| 13 |
|
| 14 |
.../portage-utils-0.80_pre20190605.ebuild | 36 ++++++++++++---------- |
| 15 |
.../portage-utils/portage-utils-9999.ebuild | 36 ++++++++++++---------- |
| 16 |
2 files changed, 40 insertions(+), 32 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-portage/portage-utils/portage-utils-0.80_pre20190605.ebuild b/app-portage/portage-utils/portage-utils-0.80_pre20190605.ebuild |
| 19 |
index 86a1c0df20a..754e9aafaac 100644 |
| 20 |
--- a/app-portage/portage-utils/portage-utils-0.80_pre20190605.ebuild |
| 21 |
+++ b/app-portage/portage-utils/portage-utils-0.80_pre20190605.ebuild |
| 22 |
@@ -3,8 +3,6 @@ |
| 23 |
|
| 24 |
EAPI="6" |
| 25 |
|
| 26 |
-inherit toolchain-funcs |
| 27 |
- |
| 28 |
DESCRIPTION="Small and fast Portage helper tools written in C" |
| 29 |
HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils" |
| 30 |
|
| 31 |
@@ -21,10 +19,9 @@ else |
| 32 |
KEYWORDS="~amd64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 33 |
fi |
| 34 |
|
| 35 |
-RDEPEND="dev-libs/iniparser:0" |
| 36 |
-DEPEND="${RDEPEND} |
| 37 |
- app-arch/xz-utils |
| 38 |
+RDEPEND=" |
| 39 |
static? ( dev-libs/iniparser:0[static-libs] ) |
| 40 |
+ !static? ( dev-libs/iniparser:0 ) |
| 41 |
qmanifest? ( |
| 42 |
openmp? ( |
| 43 |
|| ( |
| 44 |
@@ -32,24 +29,31 @@ DEPEND="${RDEPEND} |
| 45 |
sys-devel/clang-runtime:*[openmp] |
| 46 |
) |
| 47 |
) |
| 48 |
- app-crypt/libb2 |
| 49 |
- !libressl? ( dev-libs/openssl:0= ) |
| 50 |
- libressl? ( dev-libs/libressl:0= ) |
| 51 |
- sys-libs/zlib |
| 52 |
- app-crypt/gpgme |
| 53 |
+ static? ( |
| 54 |
+ app-crypt/libb2:=[static-libs] |
| 55 |
+ !libressl? ( dev-libs/openssl:0=[static-libs] ) |
| 56 |
+ libressl? ( dev-libs/libressl:0=[static-libs] ) |
| 57 |
+ sys-libs/zlib[static-libs] |
| 58 |
+ app-crypt/gpgme[static-libs] |
| 59 |
+ ) |
| 60 |
+ !static? ( |
| 61 |
+ app-crypt/libb2 |
| 62 |
+ !libressl? ( dev-libs/openssl:0= ) |
| 63 |
+ libressl? ( dev-libs/libressl:0= ) |
| 64 |
+ sys-libs/zlib |
| 65 |
+ app-crypt/gpgme |
| 66 |
+ ) |
| 67 |
) |
| 68 |
- " |
| 69 |
- |
| 70 |
-src_prepare() { |
| 71 |
- default |
| 72 |
-} |
| 73 |
+" |
| 74 |
+DEPEND="${RDEPEND}" |
| 75 |
|
| 76 |
src_configure() { |
| 77 |
econf \ |
| 78 |
--disable-maintainer-mode \ |
| 79 |
--with-eprefix="${EPREFIX}" \ |
| 80 |
$(use_enable qmanifest) \ |
| 81 |
- $(use_enable openmp) |
| 82 |
+ $(use_enable openmp) \ |
| 83 |
+ $(use_enable static) |
| 84 |
} |
| 85 |
|
| 86 |
pkg_postinst() { |
| 87 |
|
| 88 |
diff --git a/app-portage/portage-utils/portage-utils-9999.ebuild b/app-portage/portage-utils/portage-utils-9999.ebuild |
| 89 |
index 42e27f0ce8a..d116c33af56 100644 |
| 90 |
--- a/app-portage/portage-utils/portage-utils-9999.ebuild |
| 91 |
+++ b/app-portage/portage-utils/portage-utils-9999.ebuild |
| 92 |
@@ -3,8 +3,6 @@ |
| 93 |
|
| 94 |
EAPI="6" |
| 95 |
|
| 96 |
-inherit toolchain-funcs |
| 97 |
- |
| 98 |
DESCRIPTION="Small and fast Portage helper tools written in C" |
| 99 |
HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils" |
| 100 |
|
| 101 |
@@ -21,10 +19,9 @@ else |
| 102 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 103 |
fi |
| 104 |
|
| 105 |
-RDEPEND="dev-libs/iniparser:0" |
| 106 |
-DEPEND="${RDEPEND} |
| 107 |
- app-arch/xz-utils |
| 108 |
+RDEPEND=" |
| 109 |
static? ( dev-libs/iniparser:0[static-libs] ) |
| 110 |
+ !static? ( dev-libs/iniparser:0 ) |
| 111 |
qmanifest? ( |
| 112 |
openmp? ( |
| 113 |
|| ( |
| 114 |
@@ -32,22 +29,29 @@ DEPEND="${RDEPEND} |
| 115 |
sys-devel/clang-runtime:*[openmp] |
| 116 |
) |
| 117 |
) |
| 118 |
- app-crypt/libb2 |
| 119 |
- !libressl? ( dev-libs/openssl:0= ) |
| 120 |
- libressl? ( dev-libs/libressl:0= ) |
| 121 |
- sys-libs/zlib |
| 122 |
- app-crypt/gpgme |
| 123 |
+ static? ( |
| 124 |
+ app-crypt/libb2:=[static-libs] |
| 125 |
+ !libressl? ( dev-libs/openssl:0=[static-libs] ) |
| 126 |
+ libressl? ( dev-libs/libressl:0=[static-libs] ) |
| 127 |
+ sys-libs/zlib[static-libs] |
| 128 |
+ app-crypt/gpgme[static-libs] |
| 129 |
+ ) |
| 130 |
+ !static? ( |
| 131 |
+ app-crypt/libb2 |
| 132 |
+ !libressl? ( dev-libs/openssl:0= ) |
| 133 |
+ libressl? ( dev-libs/libressl:0= ) |
| 134 |
+ sys-libs/zlib |
| 135 |
+ app-crypt/gpgme |
| 136 |
+ ) |
| 137 |
) |
| 138 |
- " |
| 139 |
- |
| 140 |
-src_prepare() { |
| 141 |
- default |
| 142 |
-} |
| 143 |
+" |
| 144 |
+DEPEND="${RDEPEND}" |
| 145 |
|
| 146 |
src_configure() { |
| 147 |
econf \ |
| 148 |
--disable-maintainer-mode \ |
| 149 |
--with-eprefix="${EPREFIX}" \ |
| 150 |
$(use_enable qmanifest) \ |
| 151 |
- $(use_enable openmp) |
| 152 |
+ $(use_enable openmp) \ |
| 153 |
+ $(use_enable static) |
| 154 |
} |
Archives