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 6CBB4138359 for ; Mon, 10 Aug 2020 07:52:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5B8EBE0817; Mon, 10 Aug 2020 07:52:11 +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 3DE39E0817 for ; Mon, 10 Aug 2020 07:52:11 +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 DD75634F43E for ; Mon, 10 Aug 2020 07:52:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 58BA62F2 for ; Mon, 10 Aug 2020 07:52:08 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1597045925.8ece46444a072f6e37af3303f9a282fb21efa2fc.polynomial-c@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_p23-r1.ebuild app-shells/bash/bash-4.4_p23-r2.ebuild X-VCS-Directories: app-shells/bash/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 8ece46444a072f6e37af3303f9a282fb21efa2fc X-VCS-Branch: master Date: Mon, 10 Aug 2020 07:52:08 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4fee6394-0c2d-4e64-a83d-84b153b08cb1 X-Archives-Hash: f2cca71a42c859d29d4c4536db1bab45 commit: 8ece46444a072f6e37af3303f9a282fb21efa2fc Author: Lars Wendler gentoo org> AuthorDate: Mon Aug 10 07:51:35 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Aug 10 07:52:05 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ece4644 app-shells/bash: Move bash-4.4 into its own slot. Removed SLOT="0" version. Package-Manager: Portage-3.0.2, Repoman-2.3.23 Signed-off-by: Lars Wendler gentoo.org> ...sh-4.4_p23-r1.ebuild => bash-4.4_p23-r2.ebuild} | 90 +++------------------- 1 file changed, 11 insertions(+), 79 deletions(-) diff --git a/app-shells/bash/bash-4.4_p23-r1.ebuild b/app-shells/bash/bash-4.4_p23-r2.ebuild similarity index 73% rename from app-shells/bash/bash-4.4_p23-r1.ebuild rename to app-shells/bash/bash-4.4_p23-r2.ebuild index d939664e191..645851b12af 100644 --- a/app-shells/bash/bash-4.4_p23-r1.ebuild +++ b/app-shells/bash/bash-4.4_p23-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit eutils flag-o-matic toolchain-funcs multilib prefix @@ -45,14 +45,14 @@ else fi LICENSE="GPL-3" -SLOT="0" +SLOT="${MY_PV}" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline" DEPEND=" >=sys-libs/ncurses-5.2-r2:0= - readline? ( >=sys-libs/readline-${READLINE_VER}:0= ) nls? ( virtual/libintl ) + readline? ( >=sys-libs/readline-${READLINE_VER}:0= ) " RDEPEND=" ${DEPEND} @@ -175,83 +175,15 @@ src_compile() { } src_install() { - local d f - - default - - dodir /bin - mv "${ED%/}"/usr/bin/bash "${ED%/}"/bin/ || die - dosym bash /bin/rbash - - insinto /etc/bash - doins "${FILESDIR}"/bash_logout - doins "$(prefixify_ro "${FILESDIR}"/bashrc)" - keepdir /etc/bash/bashrc.d - insinto /etc/skel - for f in bash{_logout,_profile,rc} ; do - newins "${FILESDIR}"/dot-${f} .${f} - done - - local sed_args=( - -e "s:#${USERLAND}#@::" - -e '/#@/d' - ) - if ! use readline ; then - sed_args+=( #432338 - -e '/^shopt -s histappend/s:^:#:' - -e 's:use_color=true:use_color=false:' - ) - fi - sed -i \ - "${sed_args[@]}" \ - "${ED%/}"/etc/skel/.bashrc \ - "${ED%/}"/etc/bash/bashrc || die - - if use plugins ; then - exeinto /usr/$(get_libdir)/bash - doexe $(echo examples/loadables/*.o | sed 's:\.o::g') - insinto /usr/include/bash-plugins - doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h} - fi - - if use examples ; then - for d in examples/{functions,misc,scripts,startup-files} ; do - exeinto /usr/share/doc/${PF}/${d} - docinto ${d} - for f in ${d}/* ; do - if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then - doexe ${f} - else - dodoc ${f} - fi - done - done - fi - - doman doc/*.1 - newdoc CWRU/changelog ChangeLog - dosym bash.info /usr/share/info/bashref.info -} + into / + newbin bash bash-${SLOT} -pkg_preinst() { - if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then - mkdir -p "${EROOT}"/etc/bash - mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ - fi + newman doc/bash.1 bash-${SLOT}.1 + newman doc/builtins.1 builtins-${SLOT}.1 - if [[ -L ${EROOT}/bin/sh ]] ; then - # rewrite the symlink to ensure that its mtime changes. having /bin/sh - # missing even temporarily causes a fatal error with paludis. - local target=$(readlink "${EROOT}"/bin/sh) - local tmp=$(emktemp "${EROOT}"/bin) - ln -sf "${target}" "${tmp}" - mv -f "${tmp}" "${EROOT}"/bin/sh - fi -} + insinto /usr/share/info + newins doc/bashref.info bash-${SLOT}.info + dosym bash-${SLOT}.info /usr/share/info/bashref-${SLOT}.info -pkg_postinst() { - # If /bin/sh does not exist, provide it - if [[ ! -e ${EROOT}/bin/sh ]] ; then - ln -sf bash "${EROOT}"/bin/sh - fi + dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO }