commit: 1cdc359aa073e986fe37a90047701e541612ca72 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Wed Aug 8 23:10:13 2018 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Wed Aug 8 23:10:13 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cdc359a
app-crypt/rhash: Fix triplet issues and restore fbsd/macos keywords I was waiting for upstream to release the fix but that is taking a while so I've patched it. Closes: https://bugs.gentoo.org/651334 Package-Manager: Portage-2.3.45, Repoman-2.3.10 app-crypt/rhash/files/darwin-triplet.patch | 23 +++++++++++++++++++++++ app-crypt/rhash/files/freebsd-triplet.patch | 23 +++++++++++++++++++++++ app-crypt/rhash/rhash-1.3.6-r1.ebuild | 3 ++- 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/app-crypt/rhash/files/darwin-triplet.patch b/app-crypt/rhash/files/darwin-triplet.patch new file mode 100644 index 00000000000..49b7e121d81 --- /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 <[email protected]> +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 00000000000..94b615824be --- /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 <[email protected]> +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 b2d4ec528a7..71e3618548a 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() {
