| 1 |
commit: 4582b31ed2cf4323040ccea113a59009ce46fb06 |
| 2 |
Author: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 28 22:26:22 2018 +0000 |
| 4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 28 22:27:16 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4582b31e |
| 7 |
|
| 8 |
app-crypt/rhash: add LibreSSL support |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
| 11 |
|
| 12 |
app-crypt/rhash/metadata.xml | 3 --- |
| 13 |
app-crypt/rhash/rhash-1.3.5.ebuild | 12 ++++++++---- |
| 14 |
app-crypt/rhash/rhash-1.3.6-r1.ebuild | 10 +++++++--- |
| 15 |
3 files changed, 15 insertions(+), 10 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-crypt/rhash/metadata.xml b/app-crypt/rhash/metadata.xml |
| 18 |
index 7852b7af67d..a6651d883c4 100644 |
| 19 |
--- a/app-crypt/rhash/metadata.xml |
| 20 |
+++ b/app-crypt/rhash/metadata.xml |
| 21 |
@@ -10,9 +10,6 @@ |
| 22 |
<remote-id type="github">rhash/RHash</remote-id> |
| 23 |
<bugs-to>https://github.com/rhash/RHash/issues</bugs-to> |
| 24 |
</upstream> |
| 25 |
- <use> |
| 26 |
- <flag name='openssl'>Add support for hashes from dev-libs/openssl</flag> |
| 27 |
- </use> |
| 28 |
<longdescription lang="en"> |
| 29 |
RHash is a console utility for calculation and verification of magnet links and a wide range of hash sums like CRC32, MD4, MD5, SHA1, SHA256, SHA512, SHA3, AICH, ED2K, Tiger, DC++ TTH, BitTorrent BTIH, GOST R 34.11-94, RIPEMD-160, HAS-160, EDON-R, Whirlpool and Snefru. |
| 30 |
</longdescription> |
| 31 |
|
| 32 |
diff --git a/app-crypt/rhash/rhash-1.3.5.ebuild b/app-crypt/rhash/rhash-1.3.5.ebuild |
| 33 |
index e7fcbe0474f..dd34f36efb7 100644 |
| 34 |
--- a/app-crypt/rhash/rhash-1.3.5.ebuild |
| 35 |
+++ b/app-crypt/rhash/rhash-1.3.5.ebuild |
| 36 |
@@ -12,9 +12,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz" |
| 37 |
LICENSE="MIT" |
| 38 |
SLOT="0" |
| 39 |
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
| 40 |
-IUSE="debug nls openssl static-libs" |
| 41 |
+IUSE="debug nls libressl ssl static-libs" |
| 42 |
|
| 43 |
-RDEPEND="openssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )" |
| 44 |
+RDEPEND=" |
| 45 |
+ ssl? ( |
| 46 |
+ !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
| 47 |
+ libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
| 48 |
+)" |
| 49 |
|
| 50 |
DEPEND="${RDEPEND} |
| 51 |
nls? ( sys-devel/gettext )" |
| 52 |
@@ -50,11 +54,11 @@ multilib_src_compile() { |
| 53 |
local ADDCFLAGS=( |
| 54 |
$(use debug || echo -DNDEBUG) |
| 55 |
$(use nls && echo -DUSE_GETTEXT) |
| 56 |
- $(use openssl && echo -DOPENSSL_RUNTIME -rdynamic) |
| 57 |
+ $(use ssl && echo -DOPENSSL_RUNTIME -rdynamic) |
| 58 |
) |
| 59 |
|
| 60 |
local ADDLDFLAGS=( |
| 61 |
- $(use openssl && echo -ldl) |
| 62 |
+ $(use ssl && echo -ldl) |
| 63 |
) |
| 64 |
|
| 65 |
use elibc_Darwin || use elibc_DragonFly || use elibc_FreeBSD || |
| 66 |
|
| 67 |
diff --git a/app-crypt/rhash/rhash-1.3.6-r1.ebuild b/app-crypt/rhash/rhash-1.3.6-r1.ebuild |
| 68 |
index f5d9f3796fa..24efa670541 100644 |
| 69 |
--- a/app-crypt/rhash/rhash-1.3.6-r1.ebuild |
| 70 |
+++ b/app-crypt/rhash/rhash-1.3.6-r1.ebuild |
| 71 |
@@ -12,9 +12,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz" |
| 72 |
LICENSE="MIT" |
| 73 |
SLOT="0" |
| 74 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x64-solaris ~x86-solaris" |
| 75 |
-IUSE="debug nls openssl static-libs" |
| 76 |
+IUSE="debug nls libressl ssl static-libs" |
| 77 |
|
| 78 |
-RDEPEND="openssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )" |
| 79 |
+RDEPEND=" |
| 80 |
+ ssl? ( |
| 81 |
+ !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
| 82 |
+ libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
| 83 |
+)" |
| 84 |
|
| 85 |
DEPEND="${RDEPEND} |
| 86 |
nls? ( sys-devel/gettext )" |
| 87 |
@@ -47,7 +51,7 @@ multilib_src_configure() { |
| 88 |
--enable-lib-shared \ |
| 89 |
$(use_enable debug) \ |
| 90 |
$(use_enable nls gettext) \ |
| 91 |
- $(use_enable openssl) \ |
| 92 |
+ $(use_enable ssl openssl) \ |
| 93 |
$(use_enable static-libs lib-static) |
| 94 |
|
| 95 |
echo "${@}" |
Archives