gentoo resync : 20.10.2021

4 files changed, 86 insertions, 83 deletions

diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index 5e81ed2e0331..a94f58983493 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -1,11 +1,10 @@
 AUX darwin-triplet.patch 657 BLAKE2B cb710ca481e9a45d593ab857dc10ff8baf6c3bc5fbd2ac9ef97cee5589d8873cdc81a6a730f9058a7b9a10199667384ebbf56f828d2e6b817bf40443653adbe5 SHA512 5caec1179c860c0bf003605dd96d8c4a47a3ef784d937080a237106364918a36c1bf1138b9a4b1b0f5e5c042d653c5b324ada1a0f9b621dc33aa4a11d4f9c1c1
 AUX freebsd-triplet.patch 800 BLAKE2B 43f1f7e1fa43313e2f323a3e5031a463185c2388a3b59c75f1a3a216d6ce6e04be9cb584ffe3c44773c072408740c02354dec4969d42d6abd824a1fc633fa4dd SHA512 7f66e6ab4bdc21959e00b8ad21aaa13eab6d11552d92e8978ce5c501339a3ddf0b303f47ae5fce4056522ffea90cef3d25c5dc5d6469e7bbffa078526e1c7404
 AUX rhash-1.3.6-no_echon.patch 1224 BLAKE2B 949b6aa839667a6fef3c3a668b6cadc451986ba837807b3d7a56b80f50c8248d734745f886d40d341a99fefaf439f95bdeb0382ee15ea9e4f8561f98703fba2d SHA512 3771077c64c28b1fcf310d7a449d3e1eb951d1669b2ad3ddffe76d98ac5821ea8af40013984c65f28c7fce3434b7173a74a77120847f557cab2dedefac0c8b58
+AUX rhash-1.4.2-clang.patch 2775 BLAKE2B 0160a245931d58eb4809e95b5ab8a515fadf1459714378f254c597d56f3c4336ee59b17152c3fc23ae4ca39a4cc076eb78783e609b847b0c276c8f8c37fdd940 SHA512 3b28f8234d42f7dc46a8b890e5ba6f49e61f3db26019e81bfe8d4318b28d71ca781c49f0ee09c387a1cbef626ad016fc3177037f2d504be7572d56ed836ff954
 AUX unquote-cc.patch 791 BLAKE2B a872b7a8e8d2e04f5cf3dda0b4f4aa5e0177878942f9836f8a431d950392dafb46be646048a0ab4dc4a31ac20b6676fa8627b39bbb30a990861cf8d3cfc742f8 SHA512 7a4c2bf019cbcde021bb79572abdbc9b42f995ada5bb9798fed127d79c44ed9d4b9544c1413952604b1dd45ed307acdacba6675419f6331d75ecf34c15b8f5ca
 DIST rhash-1.3.6-src.tar.gz 328097 BLAKE2B c74993d183f0f2e479f0bd5831a9f653b9bd17bbed4d1ba896f6e33db98b7141175cd3c688dc41dfd8ec4b98acb51255ae5b795435cbc9dfb5ab77573cb25543 SHA512 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6
-DIST rhash-1.4.1-src.tar.gz 413274 BLAKE2B 2027bccc677e8a1766f0624e67f475713653ddb4be457f9c8434c45019bc730934ca860e69f8b8e1fec349e724b1a366df0f5fb98501c825b44f9b8105068ff7 SHA512 30bbef7ce7815ee4ac062c537206a0b895845f61de4b1fdc0c0494f66284d9f3c1b06f812ea913fa35a3342d230d25d0986a1db644c7b4464bc1185997beb638
 DIST rhash-1.4.2-src.tar.gz 416853 BLAKE2B 06322825116cb00aa4987b01610d967eb57c94aa29b43348ec2c31f053fd471a900fcee776714263213e9a79eaf389b2e79d7b34a5afd3e98d68198193b5cbe7 SHA512 41df57e8b3f32c93d8e6f2ac668b32aaa23eb2eaf90a83f109e61e511404a5036ea88bcf2854e19c1ade0f61960e0d9edf01f3d82e1c645fed36579e9d7a6a25
 EBUILD rhash-1.3.6-r1.ebuild 1815 BLAKE2B 25d7980d3736edd66242acec9de12ef8bc434993a083dd2e12b3f382ca90aefbb42d4e96b35b6c42c106184e6956c8e33aac424d2272e1ae7eb77ead02f4d5af SHA512 15307b2110d89a05d3afdb6ee43a87f3ec33c921d7796cc73831d2d60c7e25df7531a73badb5a9721aa010b58dba74f1536bea7b7c9ec283e2a7ad1e430af1c4
-EBUILD rhash-1.4.1.ebuild 1885 BLAKE2B 65d6c7be3d3db04a2f43f1c1f4614ff3e812e56895ed7e0e0f8824e28a718224614366d08def5d1cb8f480744061b28ef00f08fe61e1859756af5cafeb0e282a SHA512 01e111abd4f61534bc6fef1ed0b76a085e377b698b0350855218e772927bc8adc557cc4e37928c9860649f775995a7e4da296bdb722b4589a5af13e3a4ef3f6b
-EBUILD rhash-1.4.2.ebuild 1891 BLAKE2B 3d91c3b3d806cef4e010c614060c45c0ddf9fa559321470c209eaa11b7a661428a98efc2d85224c4d4922be10f2df43c651b0bdbc0523e2cbf002a26949afcfa SHA512 924476fcc45ff97f78603c9475646247065647059b85de6bf79b03477250ed24e6c434af1933d1467561606a87892faa9b871db7557f6222c8c052af678bbf1b
+EBUILD rhash-1.4.2.ebuild 1936 BLAKE2B 881dcdcefc9c332aba1158c9170f14d3669676b6416598e058c88c0f69b1700f7b5c85bb874918ac37c43b0df7d887d751e9f94d9119e5d126da9d74f0b721a7 SHA512 b9c636c3347d32a6660c91199965fafc1eecc9d5c241c1a28af40d421335fe154e63585d727ad70699949831a032d531972ac7325a6b575625dfb6bba3c907fe
 MISC metadata.xml 817 BLAKE2B eeb15cde9e06507f73330759d44dca59dea3bbcb972cb25af71d91f065eb64dbd1ddc61e43f8fad50c264c269542f92efdace36d3397647c3c53972e695da22f SHA512 3e2f688b57c74e051fcfb90d34685346c459c5e9f425266fd3d8e099f586037b14c2bfdac76f135a046c77cc850bb49954c0e7d8dc9ded1db47bf0919ab3ea93
diff --git a/app-crypt/rhash/files/rhash-1.4.2-clang.patch b/app-crypt/rhash/files/rhash-1.4.2-clang.patch
new file mode 100644
index 000000000000..460e73a6ace7
--- /dev/null
+++ b/app-crypt/rhash/files/rhash-1.4.2-clang.patch
@@ -0,0 +1,80 @@
+From 4dc506066cf1727b021e6352535a8bb315c3f8dc Mon Sep 17 00:00:00 2001
+From: Aleksey <rhash.admin@gmail.com>
+Date: Sat, 17 Jul 2021 18:39:41 +0300
+Subject: [PATCH] configure: fix clang detection on macOS
+
+---
+ configure | 58 +++++++++++++++++++++++++++----------------------------
+ 1 file changed, 28 insertions(+), 30 deletions(-)
+
+diff --git a/configure b/configure
+index 59d432b..111270a 100755
+--- a/configure
++++ b/configure
+@@ -519,38 +519,36 @@ else
+     elif run_cmd "$CC --version"; then
+       cc_name_tmp=$($CC --version 2>&1 | head -n 1 | cut -d ' ' -f 1)
+     fi
+-    if test -n "${cc_name_tmp}"; then
+-      if echo "$cc_name_tmp" | grep -q "gcc"; then
+-        cc_name=$cc_name_tmp
+-        start_check "$CC version"
+-        cc_vendor=gnu
+-        cc_version=$($CC -dumpversion 2>&1)
+-        if ! echo $cc_version | grep -q '^[0-9][0-9]*\.[0-9]'; then
+-          cc_v2=$($CC -dumpfullversion -dumpversion 2>/dev/null)
+-          if echo $cc_v2 | grep -q '^[0-9][0-9]*\.[0-9]'; then
+-            cc_version=$cc_v2
+-          fi
++    if echo "$cc_name_tmp" | grep -q "gcc"; then
++      cc_name=$cc_name_tmp
++      start_check "$CC version"
++      cc_vendor=gnu
++      cc_version=$($CC -dumpversion 2>&1)
++      if ! echo $cc_version | grep -q '^[0-9][0-9]*\.[0-9]'; then
++        cc_v2=$($CC -dumpfullversion -dumpversion 2>/dev/null)
++        if echo $cc_v2 | grep -q '^[0-9][0-9]*\.[0-9]'; then
++          cc_version=$cc_v2
+         fi
+-        case $cc_version in
+-          2.96*)
+-            cc_fail=yes
+-            ;;
+-          *)
+-            _cc_major=$(echo $cc_version | cut -d '.' -f 1)
+-            _cc_minor=$(echo $cc_version | cut -d '.' -f 2)
+-            _cc_mini=$(echo $cc_version | cut -d '.' -f 3)
+-            ;;
+-        esac
+-        finish_check "$cc_name $cc_version"
+-        break
+-      fi
+-      if echo "$cc_name_tmp" | grep -q "clang"; then
+-        start_check "$CC version"
+-        cc_vendor=clang
+-        cc_version=$($CC -dumpversion 2>&1)
+-        finish_check "clang $cc_version"
+-        break
+       fi
++      case $cc_version in
++        2.96*)
++          cc_fail=yes
++          ;;
++        *)
++          _cc_major=$(echo $cc_version | cut -d '.' -f 1)
++          _cc_minor=$(echo $cc_version | cut -d '.' -f 2)
++          _cc_mini=$(echo $cc_version | cut -d '.' -f 3)
++          ;;
++      esac
++      finish_check "$cc_name $cc_version"
++      break
++    elif $CC --version 2>&1 | grep -q "clang"; then
++      start_check "$CC version"
++      cc_vendor=clang
++      cc_version=$($CC -dumpversion 2>&1)
++      finish_check "clang $cc_version"
++      break
++    else
+       cc_name_tmp=$($CC -V 2>&1 | head -n 1 | cut -d ' ' -f 2,3)
+       if test "$cc_name_tmp" = "Sun C"; then
+         start_check "$CC version"
diff --git a/app-crypt/rhash/rhash-1.4.1.ebuild b/app-crypt/rhash/rhash-1.4.1.ebuild
deleted file mode 100644
index 4aa5c894ec98..000000000000
--- a/app-crypt/rhash/rhash-1.4.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="Console utility and library for computing and verifying file hash sums"
-HOMEPAGE="http://rhash.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug nls ssl static-libs"
-
-RDEPEND="
-	ssl? (
-		dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-)"
-
-DEPEND="
-	${RDEPEND}
-"
-
-BDEPEND="
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/RHash-${PV}"
-
-src_prepare() {
-	default
-
-	if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then
-		# we lack posix_memalign
-		sed -i -e '/if _POSIX_VERSION/s/if .*$/if 0/' \
-			librhash/util.h || die
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	set -- \
-		./configure \
-		--target="${CHOST}" \
-		--cc="$(tc-getCC)" \
-		--ar="$(tc-getAR)" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-ldflags="${LDFLAGS}" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--sysconfdir="${EPREFIX}"/etc \
-		--disable-openssl-runtime \
-		--disable-static \
-		--enable-lib-shared \
-		$(use_enable debug) \
-		$(use_enable nls gettext) \
-		$(use_enable ssl openssl) \
-		$(use_enable static-libs lib-static)
-
-	echo "${@}"
-	"${@}" || die "configure failed"
-}
-
-# We would add compile-gmo to the build targets but install-gmo always
-# recompiles unconditionally. :(
-
-multilib_src_install() {
-	# -j1 needed due to race condition.
-	emake DESTDIR="${D}" -j1 \
-		install{,-lib-headers,-pkg-config} \
-		$(use nls && echo install-gmo) \
-		$(use kernel_Winnt || echo install-lib-so-link)
-}
-
-multilib_src_test() {
-	emake test
-}
diff --git a/app-crypt/rhash/rhash-1.4.2.ebuild b/app-crypt/rhash/rhash-1.4.2.ebuild
index fd42272e981c..0aea0acab044 100644
--- a/app-crypt/rhash/rhash-1.4.2.ebuild
+++ b/app-crypt/rhash/rhash-1.4.2.ebuild
@@ -29,6 +29,10 @@ BDEPEND="
 
 S="${WORKDIR}/RHash-${PV}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-clang.patch
+)
+
 src_prepare() {
 	default