| 1 |
commit: 37dc446c5ca493b697603311b3e8d35f47a88e8d |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 27 16:35:03 2019 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 27 20:27:49 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37dc446c |
| 7 |
|
| 8 |
dev-libs/librelp: [QA] Fix USE=libressl semantics |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/683992 |
| 11 |
Package-Manager: Portage-2.3.64, Repoman-2.3.12 |
| 12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-libs/librelp/librelp-1.2.18.ebuild | 21 ++++++--------------- |
| 15 |
dev-libs/librelp/librelp-1.3.0.ebuild | 19 +++++-------------- |
| 16 |
dev-libs/librelp/librelp-1.4.0.ebuild | 19 +++++-------------- |
| 17 |
3 files changed, 16 insertions(+), 43 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-libs/librelp/librelp-1.2.18.ebuild b/dev-libs/librelp/librelp-1.2.18.ebuild |
| 20 |
index bd8997fcf00..fd69546976e 100644 |
| 21 |
--- a/dev-libs/librelp/librelp-1.2.18.ebuild |
| 22 |
+++ b/dev-libs/librelp/librelp-1.2.18.ebuild |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-# Copyright 1999-2018 Gentoo Authors |
| 25 |
+# Copyright 1999-2019 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
EAPI="7" |
| 29 |
@@ -16,26 +16,17 @@ SLOT="0/0.4.0" |
| 30 |
|
| 31 |
KEYWORDS="amd64 arm ~arm64 hppa sparc x86" |
| 32 |
IUSE="debug doc +ssl +gnutls libressl openssl static-libs" |
| 33 |
-REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) ) |
| 34 |
- gnutls? ( ssl ) |
| 35 |
- openssl? ( ssl ) |
| 36 |
- libressl? ( openssl )" |
| 37 |
+REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )" |
| 38 |
|
| 39 |
-RDEPEND="ssl? ( |
| 40 |
+RDEPEND=" |
| 41 |
+ ssl? ( |
| 42 |
gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) |
| 43 |
openssl? ( |
| 44 |
!libressl? ( dev-libs/openssl:0= ) |
| 45 |
libressl? ( dev-libs/libressl:0= ) |
| 46 |
) |
| 47 |
)" |
| 48 |
- |
| 49 |
-DEPEND="ssl? ( |
| 50 |
- gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) |
| 51 |
- openssl? ( |
| 52 |
- !libressl? ( dev-libs/openssl:0= ) |
| 53 |
- libressl? ( dev-libs/libressl:0= ) |
| 54 |
- ) |
| 55 |
- ) |
| 56 |
+DEPEND="${RDEPEND} |
| 57 |
virtual/pkgconfig" |
| 58 |
|
| 59 |
src_prepare() { |
| 60 |
@@ -70,6 +61,6 @@ src_install() { |
| 61 |
default |
| 62 |
|
| 63 |
if ! use static-libs; then |
| 64 |
- find "${ED%/}"/usr/lib* -name '*.la' -delete || die |
| 65 |
+ find "${D}" -name '*.la' -delete || die |
| 66 |
fi |
| 67 |
} |
| 68 |
|
| 69 |
diff --git a/dev-libs/librelp/librelp-1.3.0.ebuild b/dev-libs/librelp/librelp-1.3.0.ebuild |
| 70 |
index 17fe8ff33f4..b5359490d5f 100644 |
| 71 |
--- a/dev-libs/librelp/librelp-1.3.0.ebuild |
| 72 |
+++ b/dev-libs/librelp/librelp-1.3.0.ebuild |
| 73 |
@@ -17,26 +17,17 @@ SLOT="0/0.4.0" |
| 74 |
|
| 75 |
KEYWORDS="amd64 arm ~arm64 ~hppa ~sparc x86" |
| 76 |
IUSE="debug doc +ssl +gnutls libressl openssl static-libs test" |
| 77 |
-REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) ) |
| 78 |
- gnutls? ( ssl ) |
| 79 |
- openssl? ( ssl ) |
| 80 |
- libressl? ( openssl )" |
| 81 |
+REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )" |
| 82 |
|
| 83 |
-RDEPEND="ssl? ( |
| 84 |
+RDEPEND=" |
| 85 |
+ ssl? ( |
| 86 |
gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) |
| 87 |
openssl? ( |
| 88 |
!libressl? ( dev-libs/openssl:0= ) |
| 89 |
libressl? ( dev-libs/libressl:0= ) |
| 90 |
) |
| 91 |
)" |
| 92 |
- |
| 93 |
-DEPEND="ssl? ( |
| 94 |
- gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) |
| 95 |
- openssl? ( |
| 96 |
- !libressl? ( dev-libs/openssl:0= ) |
| 97 |
- libressl? ( dev-libs/libressl:0= ) |
| 98 |
- ) |
| 99 |
- ) |
| 100 |
+DEPEND="${RDEPEND} |
| 101 |
test? ( ${PYTHON_DEPS} ) |
| 102 |
virtual/pkgconfig" |
| 103 |
|
| 104 |
@@ -80,6 +71,6 @@ src_install() { |
| 105 |
default |
| 106 |
|
| 107 |
if ! use static-libs; then |
| 108 |
- find "${ED%/}"/usr/lib* -name '*.la' -delete || die |
| 109 |
+ find "${D}" -name '*.la' -delete || die |
| 110 |
fi |
| 111 |
} |
| 112 |
|
| 113 |
diff --git a/dev-libs/librelp/librelp-1.4.0.ebuild b/dev-libs/librelp/librelp-1.4.0.ebuild |
| 114 |
index eb73628561b..7f2f302f832 100644 |
| 115 |
--- a/dev-libs/librelp/librelp-1.4.0.ebuild |
| 116 |
+++ b/dev-libs/librelp/librelp-1.4.0.ebuild |
| 117 |
@@ -17,26 +17,17 @@ SLOT="0/0.5.0" |
| 118 |
|
| 119 |
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86" |
| 120 |
IUSE="debug doc +ssl +gnutls libressl openssl static-libs test" |
| 121 |
-REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) ) |
| 122 |
- gnutls? ( ssl ) |
| 123 |
- openssl? ( ssl ) |
| 124 |
- libressl? ( openssl )" |
| 125 |
+REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )" |
| 126 |
|
| 127 |
-RDEPEND="ssl? ( |
| 128 |
+RDEPEND=" |
| 129 |
+ ssl? ( |
| 130 |
gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) |
| 131 |
openssl? ( |
| 132 |
!libressl? ( dev-libs/openssl:0= ) |
| 133 |
libressl? ( dev-libs/libressl:0= ) |
| 134 |
) |
| 135 |
)" |
| 136 |
- |
| 137 |
-DEPEND="ssl? ( |
| 138 |
- gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) |
| 139 |
- openssl? ( |
| 140 |
- !libressl? ( dev-libs/openssl:0= ) |
| 141 |
- libressl? ( dev-libs/libressl:0= ) |
| 142 |
- ) |
| 143 |
- ) |
| 144 |
+DEPEND="${RDEPEND} |
| 145 |
test? ( ${PYTHON_DEPS} ) |
| 146 |
virtual/pkgconfig" |
| 147 |
|
| 148 |
@@ -78,6 +69,6 @@ src_install() { |
| 149 |
default |
| 150 |
|
| 151 |
if ! use static-libs; then |
| 152 |
- find "${ED%/}"/usr/lib* -name '*.la' -delete || die |
| 153 |
+ find "${D}" -name '*.la' -delete || die |
| 154 |
fi |
| 155 |
} |
Archives