diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-09-30 17:27:54 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-09-30 17:27:54 +0100 |
commit | f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (patch) | |
tree | e907cb121b30e3c1df1710719c0ddf4029597a47 /app-shells/bash/bash-2.05b_p13.ebuild | |
parent | db063b515939ab15261136b24e4bc44386335c0c (diff) |
gentoo resync : 30.09.2020
Diffstat (limited to 'app-shells/bash/bash-2.05b_p13.ebuild')
-rw-r--r-- | app-shells/bash/bash-2.05b_p13.ebuild | 71 |
1 files changed, 36 insertions, 35 deletions
diff --git a/app-shells/bash/bash-2.05b_p13.ebuild b/app-shells/bash/bash-2.05b_p13.ebuild index f5a44266db77..9c9eb79db32a 100644 --- a/app-shells/bash/bash-2.05b_p13.ebuild +++ b/app-shells/bash/bash-2.05b_p13.ebuild @@ -1,19 +1,19 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=7 -inherit eutils flag-o-matic toolchain-funcs +inherit flag-o-matic toolchain-funcs # Official patchlevel # See ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/ -PLEVEL=${PV##*_p} -MY_PV=${PV/_p*} -MY_PV=${MY_PV/_/-} -MY_P=${PN}-${MY_PV} +PLEVEL="${PV##*_p}" +MY_PV="${PV/_p*}" +MY_PV="${MY_PV/_/-}" +MY_P="${PN}-${MY_PV}" [[ ${PV} != *_p* ]] && PLEVEL=0 patches() { - local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}} + local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}} [[ ${plevel} -eq 0 ]] && return 1 eval set -- {1..${plevel}} set -- $(printf "${pn}${pv/\.}-%03d " "$@") @@ -43,7 +43,19 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} )" -S=${WORKDIR}/${MY_P} +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/${PN}-2.05b-destdir.patch + "${FILESDIR}"/autoconf-mktime-2.53.patch #220040 + "${FILESDIR}"/${PN}-2.05b-protos.patch + "${FILESDIR}"/${PN}-2.05b-empty-herestring.patch + "${FILESDIR}"/${PN}-2.05b-rbash.patch #26854 + "${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002 + "${FILESDIR}"/${PN}-2.05b-jobs.patch + "${FILESDIR}"/${PN}-2.05b-fix-job-warning.patch + "${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch #431850 +) pkg_setup() { if is-flag -malign-double ; then #7332 @@ -59,28 +71,28 @@ src_unpack() { src_prepare() { # Include official patches - [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) + [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s) # Clean out local libs so we know we use system ones - rm -rf lib/{readline,termcap}/* - touch lib/{readline,termcap}/Makefile.in # for config.status + rm -rf lib/{readline,termcap}/* || die + touch lib/{readline,termcap}/Makefile.in || die # for config.status sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die - epatch "${FILESDIR}"/${PN}-2.05b-destdir.patch - epatch "${FILESDIR}"/autoconf-mktime-2.53.patch #220040 - epatch "${FILESDIR}"/${PN}-2.05b-protos.patch - epatch "${FILESDIR}"/${PN}-2.05b-empty-herestring.patch - epatch "${FILESDIR}"/${PN}-2.05b-rbash.patch #26854 - epatch "${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002 - epatch "${FILESDIR}"/${PN}-2.05b-jobs.patch - epatch "${FILESDIR}"/${PN}-2.05b-fix-job-warning.patch - epatch "${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch #431850 - - epatch_user + default } src_configure() { - local myconf=() + local myconf=( + --with-installed-readline=. + --with-curses + $(use_with afs) + $(use_enable net net-redirections) + --disable-profiling + --without-gnu-malloc + $(use_enable readline) + $(use_enable readline history) + $(use_enable readline bang-history) + ) # Force pgrp synchronization # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653 @@ -118,18 +130,7 @@ src_configure() { # This old autoconf script does not re-exec itself properly and fails when # /bin/sh is not bash. Rather than try to regen everything, just force the # use of bash directly. - CONFIG_SHELL="/bin/bash" \ - econf \ - --with-installed-readline=. \ - --with-curses \ - $(use_with afs) \ - $(use_enable net net-redirections) \ - --disable-profiling \ - --without-gnu-malloc \ - $(use_enable readline) \ - $(use_enable readline history) \ - $(use_enable readline bang-history) \ - "${myconf[@]}" + CONFIG_SHELL="/bin/bash" econf "${myconf[@]}" } src_install() { |