gentoo resync : 12.08.2018

4 files changed, 51 insertions, 2 deletions

diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index 45bccad62707..bf5ab5c40743 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -1,7 +1,9 @@
+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 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 1813 BLAKE2B e8093c62235027d5083b7af10c63138d5e39928637c98568d08057292a7fa52474fff68fd6431079b7289fe327320fb44e23af7bea8c7114ccd595412bb6e891 SHA512 04290c4db196edeca5b88a994d83af7e519ffc97a6faad31dea34e233f410f528325d6b1637b83e49789d45937da8331eebb126ad62fd8b537915ff95f664f30
+EBUILD rhash-1.3.6-r1.ebuild 1910 BLAKE2B fa232839a86fab8962048ccfced5d9a934ef2161a2e692f8ec2862d63c3cac149c05ab113cc17888da92c26be58f543c2d85dd5830f0fc4f59faa5f4011c7a31 SHA512 94f19b264f0e43117a5386c102721075b4e77678647d1a69511d459536492afa41bd6f9f4768d2642542ebc5bb200c8ef29b520de863bc85d20132ac011c6f3d
 MISC metadata.xml 753 BLAKE2B 09d65c4222a77b9cdab0e82e8b3a38a63762c9e691285f712e09e99ecf28937d70436ac0dc56a890ea1f6ca9981c7f02383ce92a0da6a0c5ca11af2b3598e77e SHA512 d9a8480839af7651eb09b1210b2b0f736d01018cd1863eb17f24f0f51024c234f6f5036745f2034e89bcbd85f396b194184fc987adba43d9d0bebfa0b65d635a
diff --git a/app-crypt/rhash/files/darwin-triplet.patch b/app-crypt/rhash/files/darwin-triplet.patch
new file mode 100644
index 000000000000..49b7e121d818
--- /dev/null
+++ b/app-crypt/rhash/files/darwin-triplet.patch
@@ -0,0 +1,23 @@
+From 35a830d1968465e4ecb079273f032b754bac6c66 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sun, 25 Mar 2018 17:40:49 +0100
+Subject: [PATCH] configure: Add target OS clause for Darwin
+
+These triplets can also have a version number suffix, for example,
+x86_64-apple-darwin16.
+---
+ configure | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure b/configure
+index 5b6b710..2d8ac42 100755
+--- a/configure
++++ b/configure
+@@ -410,6 +410,7 @@ else
+       amigaos) TARGET_OS=AmigaOS ;;
+       mingw32*) TARGET_OS=MINGW32 ;;
+       wine) TARGET_OS=Wine ;;
++      darwin*) TARGET_OS=Darwin ;;
+     esac
+   }
+   TARGET_OS="UNKNOWN"
diff --git a/app-crypt/rhash/files/freebsd-triplet.patch b/app-crypt/rhash/files/freebsd-triplet.patch
new file mode 100644
index 000000000000..94b615824be7
--- /dev/null
+++ b/app-crypt/rhash/files/freebsd-triplet.patch
@@ -0,0 +1,23 @@
+From 14db7f9ee87e05450853ba0e1d8e83cc34aef3e4 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@aura-online.co.uk>
+Date: Sat, 24 Mar 2018 13:51:56 +0000
+Subject: [PATCH] configure: Match FreeBSD triplets with versions
+
+Triplets such as x86_64-unknown-freebsd11.1 are common.
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 8ebb929..5b6b710 100755
+--- a/configure
++++ b/configure
+@@ -398,7 +398,7 @@ else
+     part=$(echo $BUILD_TARGET | cut -d '-' -f $component)
+     case "$(echo $part | tr '[A-Z]' '[a-z]')" in
+       linux) TARGET_OS=Linux ;;
+-      freebsd) TARGET_OS=FreeBSD ;;
++      freebsd*) TARGET_OS=FreeBSD ;;
+       gnu/kfreebsd) TARGET_OS=FreeBSD ;;
+       netbsd) TARGET_OS=NetBSD ;;
+       bsd/os) TARGET_OS=BSD/OS ;;
diff --git a/app-crypt/rhash/rhash-1.3.6-r1.ebuild b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
index 24efa6705413..f87064529335 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 ~sparc ~x86 ~amd64-linux ~x64-solaris ~x86-solaris"
+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 libressl ssl static-libs"
 
 RDEPEND="
@@ -28,6 +28,7 @@ S="${WORKDIR}/RHash-${PV}"
 PATCHES=(
 	"${FILESDIR}"/unquote-cc.patch
 	"${FILESDIR}"/${P}-no_echon.patch
+	"${FILESDIR}"/{freebsd,darwin}-triplet.patch
 )
 
 src_prepare() {