gentoo resync : 15.09.2018

3 files changed, 2 insertions, 98 deletions

diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index bbda4da7497f..85dd3aaeabf2 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -2,8 +2,6 @@ AUX darwin-triplet.patch 657 BLAKE2B cb710ca481e9a45d593ab857dc10ff8baf6c3bc5fbd
 AUX freebsd-triplet.patch 800 BLAKE2B 43f1f7e1fa43313e2f323a3e5031a463185c2388a3b59c75f1a3a216d6ce6e04be9cb584ffe3c44773c072408740c02354dec4969d42d6abd824a1fc633fa4dd SHA512 7f66e6ab4bdc21959e00b8ad21aaa13eab6d11552d92e8978ce5c501339a3ddf0b303f47ae5fce4056522ffea90cef3d25c5dc5d6469e7bbffa078526e1c7404
 AUX rhash-1.3.6-no_echon.patch 1224 BLAKE2B 949b6aa839667a6fef3c3a668b6cadc451986ba837807b3d7a56b80f50c8248d734745f886d40d341a99fefaf439f95bdeb0382ee15ea9e4f8561f98703fba2d SHA512 3771077c64c28b1fcf310d7a449d3e1eb951d1669b2ad3ddffe76d98ac5821ea8af40013984c65f28c7fce3434b7173a74a77120847f557cab2dedefac0c8b58
 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 2696 BLAKE2B bcaedcbbf9641101617be2014b44a0ab0155f856f6382090e7195154e5a15a0709478eaf14ab1e79962da2ae2d9b5fbad7e9ceeee3f344293b678c6a032d7a05 SHA512 2c0553f10b23946c4edc61ef9db1b1f9fc99eed8dff2bbfaca85cf85929aec4c31df308cbafa94dd2c91f86a380933d79ffb5a4b46901dcdc4399272639f759f
-EBUILD rhash-1.3.6-r1.ebuild 1912 BLAKE2B c7e48f20c2d057a6988e74b8ecbe855371a0efe1424c8220a6e4fad185a36af4bcd5671c9dfb67a5f37ab9d54efe06296a4a6f169c3ec088df496a2a6f230060 SHA512 5a34204f9d95417c2ddd3769d6f893e051cbe3f651f93307c856044ea7ae82e39a08beb09a7fc148f33c25a41c60e062e4cdb173763fde64febe7bd47d4b0323
+EBUILD rhash-1.3.6-r1.ebuild 1911 BLAKE2B ebd95d432f02cc62a83a75468056b3f179bd53ffe2a12d00231429c2e5c90b6ac50460526c60f185c208044d51118f67c816008f9fb2664732b7f9a445f73bda SHA512 68a950a830dae095e6c5e21c2a2ed58525564b31399093e1ba001ca6e5cf9dcf9603e0afe75ae00d068d1c873c4a7565af8a2176d9a847d640e48dbd503baa91
 MISC metadata.xml 753 BLAKE2B 09d65c4222a77b9cdab0e82e8b3a38a63762c9e691285f712e09e99ecf28937d70436ac0dc56a890ea1f6ca9981c7f02383ce92a0da6a0c5ca11af2b3598e77e SHA512 d9a8480839af7651eb09b1210b2b0f736d01018cd1863eb17f24f0f51024c234f6f5036745f2034e89bcbd85f396b194184fc987adba43d9d0bebfa0b65d635a
diff --git a/app-crypt/rhash/rhash-1.3.5.ebuild b/app-crypt/rhash/rhash-1.3.5.ebuild
deleted file mode 100644
index b086054c04a1..000000000000
--- a/app-crypt/rhash/rhash-1.3.5.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="Console utility and library for computing and verifying file hash sums"
-HOMEPAGE="http://rhash.anz.ru/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="debug nls libressl ssl static-libs"
-
-RDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-)"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/RHash-${PV}"
-
-src_prepare() {
-	default
-
-	# Install /etc stuff inside the Prefix
-	sed -i -e 's:\$(DESTDIR)/etc:\$(DESTDIR)/$(SYSCONFDIR):g' Makefile || die
-
-	if use elibc_Darwin ; then
-		local ver_script='-Wl,--version-script,exports.sym,-soname,$(SONAME)'
-		local install_name='-install_name $(LIBDIR)/$(SONAME)'
-		sed -i -e '/^\(SONAME\|SHAREDLIB\)/s/\.so\.\([0-9]\+\)/.\1.dylib/' \
-			-e '/^SOLINK/s/\.so/.dylib/' \
-			-e "s:${ver_script}:${install_name}:" \
-			librhash/Makefile \
-			Makefile || die
-	fi
-
-	if use elibc_SunOS ; then
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=12548
-		# skip the export.sym for now
-		sed -i -e 's/,--version-script,exports.sym//' librhash/Makefile || die
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	local ADDCFLAGS=(
-		$(use debug || echo -DNDEBUG)
-		$(use nls && echo -DUSE_GETTEXT)
-		$(use ssl && echo -DOPENSSL_RUNTIME -rdynamic)
-	)
-
-	local ADDLDFLAGS=(
-		$(use ssl && echo -ldl)
-	)
-
-	use elibc_Darwin || use elibc_DragonFly || use elibc_FreeBSD ||
-		use elibc_NetBSD || use elibc_OpenBSD || use elibc_SunOS &&
-			ADDLDFLAGS+=( $(use nls && echo -lintl) )
-
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
-		  ADDCFLAGS="${ADDCFLAGS[*]}" ADDLDFLAGS="${ADDLDFLAGS[*]}" \
-		  PREFIX="${EPREFIX}"/usr LIBDIR='$(PREFIX)'/$(get_libdir) \
-		  build-shared $(use static-libs && echo lib-static)
-}
-
-myemake() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr \
-		LIBDIR='$(PREFIX)'/$(get_libdir) SYSCONFDIR="${EPREFIX}"/etc "${@}"
-}
-
-multilib_src_install() {
-	myemake -C librhash install-lib-shared install-so-link
-	multilib_is_native_abi && myemake install-shared
-	use static-libs && myemake install-lib-static
-}
-
-multilib_src_install_all() {
-	myemake -C librhash install-headers
-	use nls && myemake install-gmo
-	einstalldocs
-}
-
-multilib_src_test() {
-	cd tests || die
-	LD_LIBRARY_PATH=$(pwd)/../librhash ./test_rhash.sh --full ../rhash_shared || die "tests failed"
-}
diff --git a/app-crypt/rhash/rhash-1.3.6-r1.ebuild b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
index c3e0ea290ebb..96a05fea2520 100644
--- a/app-crypt/rhash/rhash-1.3.6-r1.ebuild
+++ b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="debug nls libressl ssl static-libs"
 
 RDEPEND="