From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D549F1382C5 for ; Mon, 19 Mar 2018 10:31:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C64DAE099B; Mon, 19 Mar 2018 10:31:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 81B36E099B for ; Mon, 19 Mar 2018 10:31:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 12B87335C76 for ; Mon, 19 Mar 2018 10:31:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5329E244 for ; Mon, 19 Mar 2018 10:31:54 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1521455504.8659d46e313acd4bbc5515ab9e92a58a22064a69.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/rhash/, app-crypt/rhash/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/rhash/files/rhash-1.3.6-no_echon.patch app-crypt/rhash/rhash-1.3.6-r1.ebuild app-crypt/rhash/rhash-1.3.6.ebuild X-VCS-Directories: app-crypt/rhash/files/ app-crypt/rhash/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 8659d46e313acd4bbc5515ab9e92a58a22064a69 X-VCS-Branch: master Date: Mon, 19 Mar 2018 10:31:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c1d03d0a-e5d4-4cd2-9596-a07cabf15ff4 X-Archives-Hash: 0d7312177f5a72382732be578040f89a commit: 8659d46e313acd4bbc5515ab9e92a58a22064a69 Author: James Le Cuirot gentoo org> AuthorDate: Mon Mar 19 10:30:47 2018 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Mon Mar 19 10:31:44 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8659d46e app-crypt/rhash: Fix missing headers and dash issue I swear it installed the headers without this line at least some of the time. Yay for custom build systems. Closes: https://bugs.gentoo.org/650840 Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-crypt/rhash/files/rhash-1.3.6-no_echon.patch | 54 ++++++++++++++++++++++ .../{rhash-1.3.6.ebuild => rhash-1.3.6-r1.ebuild} | 4 ++ 2 files changed, 58 insertions(+) diff --git a/app-crypt/rhash/files/rhash-1.3.6-no_echon.patch b/app-crypt/rhash/files/rhash-1.3.6-no_echon.patch new file mode 100644 index 00000000000..9b25b29a89f --- /dev/null +++ b/app-crypt/rhash/files/rhash-1.3.6-no_echon.patch @@ -0,0 +1,54 @@ +From c1776248a0b34a690e99ab9a7a814c34f78088ec Mon Sep 17 00:00:00 2001 +From: Lars Wendler +Date: Mon, 19 Mar 2018 10:47:13 +0100 +Subject: [PATCH] "echo -n" cannot be expected to work with every POSIX shell + +See "man 1p echo" section APPLICATION USAGE. This patch replaces "echo -n" +with "printf '%s'". +--- + configure | 15 ++------------- + 1 file changed, 2 insertions(+), 13 deletions(-) + +diff --git a/configure b/configure +index f480f7b..2a7d485 100755 +--- a/configure ++++ b/configure +@@ -22,17 +22,6 @@ INSTALL_LIB_STATIC=auto + INSTALL_LIB_SHARED=auto + INSTALL_PKGCONFIGDIR="$PKG_INSTALLDIR" + +-case $(echo -n) in +- -n) # SysV style +- ECHO_N= +- ECHO_C='\c' +- ;; +- *) # BSD style +- ECHO_N='-n ' +- ECHO_C= +- ;; +-esac +- + # display error message and exit + die () { + echo +@@ -235,7 +224,7 @@ trap remove_tmpdir EXIT + + str_concat() + { +- echo ${ECHO_N} $@ ${ECHO_C} ++ printf '%s ' $@ + } + + yn_nonempty() +@@ -246,7 +235,7 @@ yn_nonempty() + # Use this before starting a check + start_check() { + echo "============ Checking for $1 ============" >> "$TMPLOG" +- echo ${ECHO_N} "Checking for $1 ... ${ECHO_C}" ++ printf '%s' "Checking for $1 ... " + res_comment="" + } + +-- +2.16.2 + diff --git a/app-crypt/rhash/rhash-1.3.6.ebuild b/app-crypt/rhash/rhash-1.3.6-r1.ebuild similarity index 94% rename from app-crypt/rhash/rhash-1.3.6.ebuild rename to app-crypt/rhash/rhash-1.3.6-r1.ebuild index 5680b2872ad..affa8241147 100644 --- a/app-crypt/rhash/rhash-1.3.6.ebuild +++ b/app-crypt/rhash/rhash-1.3.6-r1.ebuild @@ -23,6 +23,7 @@ S="${WORKDIR}/RHash-${PV}" PATCHES=( "${FILESDIR}"/unquote-cc.patch + "${FILESDIR}"/${P}-no_echon.patch ) src_prepare() { @@ -60,6 +61,9 @@ multilib_src_install() { emake DESTDIR="${D}" -j1 \ install{,-lib-so-link,-pkg-config} \ $(use nls && echo install-gmo) + + emake DESTDIR="${D}" -j1 \ + -C lib${PN} install-headers } multilib_src_test() {