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 97479138B11 for ; Mon, 24 Oct 2016 00:36:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BE0D2E07FB; Mon, 24 Oct 2016 00:35:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7E832E07FB for ; Mon, 24 Oct 2016 00:35:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7367934161D for ; Mon, 24 Oct 2016 00:35:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B78E2413 for ; Mon, 24 Oct 2016 00:35:56 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1477269336.75b7af65f66102a800ade5383639e77c3b7f8d57.heroxbd@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/bash/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-shells/bash/bash-4.4-r1.ebuild X-VCS-Directories: app-shells/bash/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: 75b7af65f66102a800ade5383639e77c3b7f8d57 X-VCS-Branch: master Date: Mon, 24 Oct 2016 00:35:56 +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: 4ae2afc6-cff2-4397-985c-00cf03dbba30 X-Archives-Hash: 9ce527a91cd087a162a5787f12599634 commit: 75b7af65f66102a800ade5383639e77c3b7f8d57 Author: Benda Xu gentoo org> AuthorDate: Mon Oct 24 00:35:36 2016 +0000 Commit: Benda XU gentoo org> CommitDate: Mon Oct 24 00:35:36 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75b7af65 app-shells/bash: prefixify hard-coded path names. Bug: 595142 Package-Manager: portage-2.3.0 app-shells/bash/bash-4.4-r1.ebuild | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app-shells/bash/bash-4.4-r1.ebuild b/app-shells/bash/bash-4.4-r1.ebuild index 3a1e9b0..caed46f 100644 --- a/app-shells/bash/bash-4.4-r1.ebuild +++ b/app-shells/bash/bash-4.4-r1.ebuild @@ -4,7 +4,7 @@ EAPI="5" -inherit eutils flag-o-matic toolchain-funcs multilib +inherit eutils flag-o-matic toolchain-funcs multilib prefix # Official patchlevel # See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/ @@ -84,6 +84,9 @@ src_prepare() { sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die fi + # Prefixify hardcoded path names. No-op for non-prefix. + hprefixify pathnames.h.in + # Avoid regenerating docs after patches #407985 sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die touch -r . doc/* @@ -176,7 +179,7 @@ src_install() { insinto /etc/bash doins "${FILESDIR}"/bash_logout - doins "${FILESDIR}"/bashrc + doins "$(prefixify_ro "${FILESDIR}"/bashrc)" keepdir /etc/bash/bashrc.d insinto /etc/skel for f in bash{_logout,_profile,rc} ; do