gentoo resync : 08.01.2021

4 files changed, 89 insertions, 6 deletions

diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index 10b833c7a727..38c939fc33e1 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -4,6 +4,8 @@ AUX rhash-1.3.6-no_echon.patch 1224 BLAKE2B 949b6aa839667a6fef3c3a668b6cadc45198
 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.0-src.tar.gz 406433 BLAKE2B 2af437cd3a049bb9473825026f8a6476c81b4400a47638c62ee3ecb3d3984f7f9fe97def91488094a2919e5baad967d3f49ec7d95363896e270251ad085bacac SHA512 2f02487fffe8d1bc70c4454829bbd250a15fbd09db5ef85c54d3e8ad1008e84616ea54483292deae45047a27964e27b26d9b3da8447e7c37dac1e2ce18a63a07
-EBUILD rhash-1.3.6-r1.ebuild 1906 BLAKE2B 2b42abc2249717d46bf80a29ec189ce359dd414226ad895711fb91fcd11f30d8adfd695b0a58150ed810da03c5b859fec103691038b94d8f3c785ad63d1fcf4d SHA512 372d233a7507b52c8dd1a919afda5d4d61ba3bf6049f744d98e417570739491d8f6079723d7c86bc763cc31fe4dc408304148297bf079f34f02439c66b2851ab
-EBUILD rhash-1.4.0.ebuild 1945 BLAKE2B e83ac65e2b39812c7788c2f4ce4808f0643a856ad4fbbf5c6e5c738ab375316441db36978eaac7a202631dc450c40f9394c4a3a2ee034ce02b317a7256e54d9f SHA512 c5b69afb6517a2a4ab5d036b86815332e532dc5e74b67ddc9957ce0596a77aa9c564161ba95613f6ead781f416704c8eb626e0bf043fca2d53508f7982657518
+DIST rhash-1.4.1-src.tar.gz 413274 BLAKE2B 2027bccc677e8a1766f0624e67f475713653ddb4be457f9c8434c45019bc730934ca860e69f8b8e1fec349e724b1a366df0f5fb98501c825b44f9b8105068ff7 SHA512 30bbef7ce7815ee4ac062c537206a0b895845f61de4b1fdc0c0494f66284d9f3c1b06f812ea913fa35a3342d230d25d0986a1db644c7b4464bc1185997beb638
+EBUILD rhash-1.3.6-r1.ebuild 1895 BLAKE2B 53b459d4c1d7216500306eb71228087bf8df76e24a899709eb846f8e01deb8fd5e499fc119be30805ad966d2e1b619a438caee7c6540af2c89353123891f1763 SHA512 b25db77839d64bb70e6e53f13e2e726453f7c817724e2df66d470118c01f5c253d2c74e338f590c5b30e0b72c75f4b923cef2d9114c8ea9b22f50d3f66da0fcd
+EBUILD rhash-1.4.0.ebuild 1934 BLAKE2B 34ab1bfe7b69a38f92c3eb4b3d86253a638fe1e6185ff394f800281ca5f073d938464348cbcfa756f2f570ce043de6d1f28437e9b975a7042144f196b842bdc0 SHA512 c034859f7681bfae06503384d293463e93f08cfc40d7c767b6765ff31060408219229fe408e0d8203f07abce50d109ddeacfef3b623f8123e0fc79bc15209ebc
+EBUILD rhash-1.4.1.ebuild 1934 BLAKE2B 34ab1bfe7b69a38f92c3eb4b3d86253a638fe1e6185ff394f800281ca5f073d938464348cbcfa756f2f570ce043de6d1f28437e9b975a7042144f196b842bdc0 SHA512 c034859f7681bfae06503384d293463e93f08cfc40d7c767b6765ff31060408219229fe408e0d8203f07abce50d109ddeacfef3b623f8123e0fc79bc15209ebc
 MISC metadata.xml 816 BLAKE2B bb6057383b42281881b70331deed4070724bf10bdd00eb8329d3f3133329aa47d8d64ea66c70500dbeb8f92995f527b012dfeadd96d5c2a1eb73ff0ceb20f43a SHA512 ef3d1b671c08f7f1e1394675f626fc399a7a07dbefaa1a4ef1201052db524f2063efca3470b0d4f58a03cb8a49bb086e37b0bb8357cfc761107b1d6563e79263
diff --git a/app-crypt/rhash/rhash-1.3.6-r1.ebuild b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
index 44d587216112..1aae5aeadcb8 100644
--- a/app-crypt/rhash/rhash-1.3.6-r1.ebuild
+++ b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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-linux ~x86-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="debug nls libressl ssl static-libs"
 
 RDEPEND="
diff --git a/app-crypt/rhash/rhash-1.4.0.ebuild b/app-crypt/rhash/rhash-1.4.0.ebuild
index 88a8e3ebfe3f..84b05ebc648f 100644
--- a/app-crypt/rhash/rhash-1.4.0.ebuild
+++ b/app-crypt/rhash/rhash-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="debug nls libressl ssl static-libs"
 
 RDEPEND="
diff --git a/app-crypt/rhash/rhash-1.4.1.ebuild b/app-crypt/rhash/rhash-1.4.1.ebuild
new file mode 100644
index 000000000000..84b05ebc648f
--- /dev/null
+++ b/app-crypt/rhash/rhash-1.4.1.ebuild
@@ -0,0 +1,81 @@
+# 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 ~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}
+"
+
+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
+}