gentoo resync : 30.04.2018

4 files changed, 18 insertions, 13 deletions

diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index 07263168ea86..1688536a5697 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -2,6 +2,6 @@ AUX rhash-1.3.6-no_echon.patch 1224 BLAKE2B 949b6aa839667a6fef3c3a668b6cadc45198
 AUX unquote-cc.patch 791 BLAKE2B a872b7a8e8d2e04f5cf3dda0b4f4aa5e0177878942f9836f8a431d950392dafb46be646048a0ab4dc4a31ac20b6676fa8627b39bbb30a990861cf8d3cfc742f8 SHA512 7a4c2bf019cbcde021bb79572abdbc9b42f995ada5bb9798fed127d79c44ed9d4b9544c1413952604b1dd45ed307acdacba6675419f6331d75ecf34c15b8f5ca
 DIST rhash-1.3.5-src.tar.gz 316867 BLAKE2B 3ffbf2ec5aef24ef63455e21c3efcae043a321a78be522a26bd25086111430071a496ab3775ff9b4956da7304df8d8e552a061f3306a7a683be5fc65ea3fd1c4 SHA512 e8450aab0c16bfb975bf4aeee218740fb4d86d5514e426b70c3edb84e4d63865cd4051939aa95c24a87a78baaedc49e40bb509b2610e89ca3745930808b3ef6c
 DIST rhash-1.3.6-src.tar.gz 328097 BLAKE2B c74993d183f0f2e479f0bd5831a9f653b9bd17bbed4d1ba896f6e33db98b7141175cd3c688dc41dfd8ec4b98acb51255ae5b795435cbc9dfb5ab77573cb25543 SHA512 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6
-EBUILD rhash-1.3.5.ebuild 2622 BLAKE2B 28d39e4b2212149ba41fcda4070141b1ddb0f350520c3ebbb1e77c751179dc87b9455f3870b822b100d297c49db26e597498d937d0d3317abde71f46257c2068 SHA512 0d57acaa7876e74d2914b4ccade7a94e248f49f4ad32e21b87171a2d4a795028d88210cc1977f45d917d006e73b7dc8f5f5ad9321ac890a50a893bcd9cfb3120
-EBUILD rhash-1.3.6-r1.ebuild 1732 BLAKE2B 407f7e0693017530a5ed607d382518b1014ac8b5e0deb4fc29bcc443209e2d59bf88b5813b1417efed6d88eae62a16977cbbda8c531d0bd2a6f7148260afde1f SHA512 21699e9008cce86c8091b5b03fc5c5af7f226de93ecb76cc3e7916e2e6a055831abfb111db5762600fb047d17c028980c5a5d83872ff5f1b000d4ae5dcdc7692
-MISC metadata.xml 843 BLAKE2B 9380d16da7ed26bc2cb455ad4e01806d54233df9ec229e67a8ed1a3944e91569cc4a478c375e75a87ea758eab6a886b89fae27dea32434e8c7f4a068d0371369 SHA512 360de1b8627471599f06a5bbd34a4359be7bd5bc39fe97d7db3da57794e2ace132539e56a2cc971b53911887b314a8ff1c689063c86d70473ac771062f1f3b4f
+EBUILD rhash-1.3.5.ebuild 2691 BLAKE2B 55cc1850b0f7d66510c349fdfda73fd9729f261ac00d6835e80cbfd56eb7c99ff891b1afb4cf86f8b28a518e95362b28dcec7cf7129084938c58b40b8d515371 SHA512 173c9ec7b77b7f6f39abcf00349a45d92d32463f1482c97f0cf8493e804246427b93e5b3eba34891e46936298e8240db036c1351b7045dba0b92413feca12f86
+EBUILD rhash-1.3.6-r1.ebuild 1813 BLAKE2B e8093c62235027d5083b7af10c63138d5e39928637c98568d08057292a7fa52474fff68fd6431079b7289fe327320fb44e23af7bea8c7114ccd595412bb6e891 SHA512 04290c4db196edeca5b88a994d83af7e519ffc97a6faad31dea34e233f410f528325d6b1637b83e49789d45937da8331eebb126ad62fd8b537915ff95f664f30
+MISC metadata.xml 753 BLAKE2B 09d65c4222a77b9cdab0e82e8b3a38a63762c9e691285f712e09e99ecf28937d70436ac0dc56a890ea1f6ca9981c7f02383ce92a0da6a0c5ca11af2b3598e77e SHA512 d9a8480839af7651eb09b1210b2b0f736d01018cd1863eb17f24f0f51024c234f6f5036745f2034e89bcbd85f396b194184fc987adba43d9d0bebfa0b65d635a
diff --git a/app-crypt/rhash/metadata.xml b/app-crypt/rhash/metadata.xml
index 7852b7af67d7..a6651d883c41 100644
--- a/app-crypt/rhash/metadata.xml
+++ b/app-crypt/rhash/metadata.xml
@@ -10,9 +10,6 @@
 		<remote-id type="github">rhash/RHash</remote-id>
 		<bugs-to>https://github.com/rhash/RHash/issues</bugs-to>
 	</upstream>
-	<use>
-		<flag name='openssl'>Add support for hashes from dev-libs/openssl</flag>
-	</use>
 	<longdescription lang="en">
 		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.
 	</longdescription>
diff --git a/app-crypt/rhash/rhash-1.3.5.ebuild b/app-crypt/rhash/rhash-1.3.5.ebuild
index e7fcbe0474f8..dd34f36efb70 100644
--- a/app-crypt/rhash/rhash-1.3.5.ebuild
+++ b/app-crypt/rhash/rhash-1.3.5.ebuild
@@ -12,9 +12,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 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"
-IUSE="debug nls openssl static-libs"
+IUSE="debug nls libressl ssl static-libs"
 
-RDEPEND="openssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )"
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+)"
 
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
@@ -50,11 +54,11 @@ multilib_src_compile() {
 	local ADDCFLAGS=(
 		$(use debug || echo -DNDEBUG)
 		$(use nls && echo -DUSE_GETTEXT)
-		$(use openssl && echo -DOPENSSL_RUNTIME -rdynamic)
+		$(use ssl && echo -DOPENSSL_RUNTIME -rdynamic)
 	)
 
 	local ADDLDFLAGS=(
-		$(use openssl && echo -ldl)
+		$(use ssl && echo -ldl)
 	)
 
 	use elibc_Darwin || use elibc_DragonFly || use elibc_FreeBSD ||
diff --git a/app-crypt/rhash/rhash-1.3.6-r1.ebuild b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
index f5d9f3796faa..24efa6705413 100644
--- a/app-crypt/rhash/rhash-1.3.6-r1.ebuild
+++ b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
@@ -12,9 +12,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x64-solaris ~x86-solaris"
-IUSE="debug nls openssl static-libs"
+IUSE="debug nls libressl ssl static-libs"
 
-RDEPEND="openssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )"
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+)"
 
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
@@ -47,7 +51,7 @@ multilib_src_configure() {
 		--enable-lib-shared \
 		$(use_enable debug) \
 		$(use_enable nls gettext) \
-		$(use_enable openssl) \
+		$(use_enable ssl openssl) \
 		$(use_enable static-libs lib-static)
 
 	echo "${@}"