vapier 14/10/19 20:31:56 Modified: bash-3.1_p23.ebuild ChangeLog Added: bash-3.0_p22.ebuild bash-2.05b_p13.ebuild Log: Restore SLOTed bash-2.05b and bash-3.0 for devs. (Portage version: 2.2.14_rc1/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key D2E96200)
Revision Changes Path 1.6 app-shells/bash/bash-3.1_p23.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/bash-3.1_p23.ebuild?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/bash-3.1_p23.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/bash-3.1_p23.ebuild?r1=1.5&r2=1.6 Index: bash-3.1_p23.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.1_p23.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- bash-3.1_p23.ebuild 19 Oct 2014 20:16:14 -0000 1.5 +++ bash-3.1_p23.ebuild 19 Oct 2014 20:31:56 -0000 1.6 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.1_p23.ebuild,v 1.5 2014/10/19 20:16:14 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.1_p23.ebuild,v 1.6 2014/10/19 20:31:56 vapier Exp $ EAPI="4" @@ -128,10 +128,6 @@ "${myconf[@]}" } -src_compile() { - emake -j1 #102426 -} - src_install() { into / newbin bash bash-${SLOT} 1.422 app-shells/bash/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/ChangeLog?rev=1.422&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/ChangeLog?rev=1.422&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/ChangeLog?r1=1.421&r2=1.422 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v retrieving revision 1.421 retrieving revision 1.422 diff -u -r1.421 -r1.422 --- ChangeLog 19 Oct 2014 20:30:15 -0000 1.421 +++ ChangeLog 19 Oct 2014 20:31:56 -0000 1.422 @@ -1,6 +1,26 @@ # ChangeLog for app-shells/bash # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.421 2014/10/19 20:30:15 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.422 2014/10/19 20:31:56 vapier Exp $ + +*bash-3.0_p22 (19 Oct 2014) +*bash-2.05b_p13 (19 Oct 2014) + + 19 Oct 2014; Mike Frysinger <[email protected]> +bash-2.05b_p13.ebuild, + +bash-3.0_p22.ebuild, bash-3.1_p23.ebuild, +files/bash-2.05b-destdir.patch, + +files/bash-2.05b-empty-herestring.patch, + +files/bash-2.05b-fix-job-warning.patch, +files/bash-2.05b-jobs.patch, + +files/bash-2.05b-protos.patch, +files/bash-2.05b-rbash.patch, + +files/bash-3.0-afs.patch, +files/bash-3.0-configs.patch, + +files/bash-3.0-crash.patch, +files/bash-3.0-darwin-conn.patch, + +files/bash-3.0-histtimeformat.patch, +files/bash-3.0-jobs.patch, + +files/bash-3.0-locale.patch, +files/bash-3.0-manpage.patch, + +files/bash-3.0-multibyteifs.patch, +files/bash-3.0-pgrp-pipe-fix.patch, + +files/bash-3.0-protos.patch, +files/bash-3.0-pwd.patch, + +files/bash-3.0-rbash.patch, +files/bash-3.0-read-builtin-pipe.patch, + +files/bash-3.0-read-e-segfault.patch, +files/bash-3.0-strnlen.patch, + +files/bash-3.0-subshell.patch, +files/bash-3.0-ulimit.patch, + +files/bash-3.0-volatile-command.patch: + Restore SLOTed bash-2.05b and bash-3.0 for devs. 19 Oct 2014; Mike Frysinger <[email protected]> +files/bash-2.05b-parallel-build.patch, +files/bash-3.1-protos.patch, 1.1 app-shells/bash/bash-3.0_p22.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/bash-3.0_p22.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/bash-3.0_p22.ebuild?rev=1.1&content-type=text/plain Index: bash-3.0_p22.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.0_p22.ebuild,v 1.1 2014/10/19 20:31:56 vapier Exp $ EAPI="4" inherit eutils flag-o-matic toolchain-funcs # Official patchlevel # See ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/ 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}} [[ ${plevel} -eq 0 ]] && return 1 eval set -- {1..${plevel}} set -- $(printf "${pn}${pv/\.}-%03d " "$@") if [[ ${opt} == -s ]] ; then echo "${@/#/${DISTDIR}/}" else local u for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do printf "${u}/${pn}-${pv}-patches/%s " "$@" done fi } DESCRIPTION="The standard GNU Bourne again shell" HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"; SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)" LICENSE="GPL-2" SLOT="${MY_PV}" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" IUSE="afs +net nls +readline" DEPEND=">=sys-libs/ncurses-5.2-r2 readline? ( >=sys-libs/readline-6.2 ) nls? ( virtual/libintl )" RDEPEND="${DEPEND}" S=${WORKDIR}/${MY_P} pkg_setup() { if is-flag -malign-double ; then #7332 eerror "Detected bad CFLAGS '-malign-double'. Do not use this" eerror "as it breaks LFS (struct stat64) on x86." die "remove -malign-double from your CFLAGS mr ricer" fi } src_unpack() { unpack ${MY_P}.tar.gz } src_prepare() { # Include official patches [[ ${PLEVEL} -gt 0 ]] && epatch $(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 sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die epatch "${FILESDIR}"/autoconf-mktime-2.53.patch #220040 epatch "${FILESDIR}"/${PN}-3.0-protos.patch epatch "${FILESDIR}"/${PN}-3.0-rbash.patch #26854 epatch "${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002 epatch "${FILESDIR}"/${PN}-3.0-darwin-conn.patch #79124 # read patch headers for more info ... many ripped from Fedora/Debian[17]/SuSe/upstream for i in afs crash jobs manpage pwd ulimit histtimeformat \ locale multibyteifs subshell \ volatile-command do epatch "${FILESDIR}"/${PN}-3.0-${i}.patch done epatch "${FILESDIR}"/${PN}-3.0-read-builtin-pipe.patch #87093 epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch epatch "${FILESDIR}"/${PN}-3.0-pgrp-pipe-fix.patch #92349 epatch "${FILESDIR}"/${PN}-3.0-configs.patch epatch "${FILESDIR}"/${PN}-3.0-strnlen.patch epatch_user } src_configure() { local myconf=() # Force pgrp synchronization # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653 export bash_cv_pgrp_pipe=yes # For descriptions of these, see config-top.h # bashrc/#26952 bash_logout/#90488 ssh/#24762 append-cppflags \ -DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \ -DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \ -DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \ -DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \ -DNON_INTERACTIVE_LOGIN_SHELLS \ -DSSH_SOURCE_BASHRC # Don't even think about building this statically without # reading Bug 7714 first. If you still build it statically, # don't come crying to us with bugs ;). #use static && export LDFLAGS="${LDFLAGS} -static" use nls || myconf+=( --disable-nls ) # Historically, we always used the builtin readline, but since # our handling of SONAME upgrades has gotten much more stable # in the PM (and the readline ebuild itself preserves the old # libs during upgrades), linking against the system copy should # be safe. # Exact cached version here doesn't really matter as long as it # is at least what's in the DEPEND up above. export ac_cv_rl_version=6.2 # Force linking with system curses ... the bundled termcap lib # sucks bad compared to ncurses. For the most part, ncurses # is here because readline needs it. But bash itself calls # ncurses in one or two small places :(. tc-export AR #444070 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[@]}" } src_install() { into / newbin bash bash-${SLOT} newman doc/bash.1 bash-${SLOT}.1 newman doc/builtins.1 builtins-${SLOT}.1 insinto /usr/share/info newins doc/bashref.info bash-${SLOT}.info dosym bash-${SLOT}.info /usr/share/info/bashref-${SLOT}.info dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO } 1.1 app-shells/bash/bash-2.05b_p13.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/bash-2.05b_p13.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/bash-2.05b_p13.ebuild?rev=1.1&content-type=text/plain Index: bash-2.05b_p13.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-2.05b_p13.ebuild,v 1.1 2014/10/19 20:31:56 vapier Exp $ EAPI="4" inherit eutils 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} [[ ${PV} != *_p* ]] && PLEVEL=0 patches() { 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 " "$@") if [[ ${opt} == -s ]] ; then echo "${@/#/${DISTDIR}/}" else local u for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do printf "${u}/${pn}-${pv}-patches/%s " "$@" done fi } DESCRIPTION="The standard GNU Bourne again shell" HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"; SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)" LICENSE="GPL-2" SLOT="${MY_PV}" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" IUSE="afs +net nls +readline" DEPEND=">=sys-libs/ncurses-5.2-r2 readline? ( >=sys-libs/readline-6.2 ) nls? ( virtual/libintl )" RDEPEND="${DEPEND}" S=${WORKDIR}/${MY_P} pkg_setup() { if is-flag -malign-double ; then #7332 eerror "Detected bad CFLAGS '-malign-double'. Do not use this" eerror "as it breaks LFS (struct stat64) on x86." die "remove -malign-double from your CFLAGS mr ricer" fi } src_unpack() { unpack ${MY_P}.tar.gz } src_prepare() { # Include official patches [[ ${PLEVEL} -gt 0 ]] && epatch $(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 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_user } src_configure() { local myconf=() # Force pgrp synchronization # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653 export bash_cv_pgrp_pipe=yes # For descriptions of these, see config-top.h # bashrc/#26952 bash_logout/#90488 ssh/#24762 append-cppflags \ -DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \ -DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \ -DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \ -DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \ -DNON_INTERACTIVE_LOGIN_SHELLS \ -DSSH_SOURCE_BASHRC # Don't even think about building this statically without # reading Bug 7714 first. If you still build it statically, # don't come crying to us with bugs ;). #use static && export LDFLAGS="${LDFLAGS} -static" use nls || myconf+=( --disable-nls ) # Historically, we always used the builtin readline, but since # our handling of SONAME upgrades has gotten much more stable # in the PM (and the readline ebuild itself preserves the old # libs during upgrades), linking against the system copy should # be safe. # Exact cached version here doesn't really matter as long as it # is at least what's in the DEPEND up above. export ac_cv_rl_version=6.2 # Force linking with system curses ... the bundled termcap lib # sucks bad compared to ncurses. For the most part, ncurses # is here because readline needs it. But bash itself calls # ncurses in one or two small places :(. tc-export AR #444070 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[@]}" } src_install() { into / newbin bash bash-${SLOT} newman doc/bash.1 bash-${SLOT}.1 newman doc/builtins.1 builtins-${SLOT}.1 insinto /usr/share/info newins doc/bashref.info bash-${SLOT}.info dosym bash-${SLOT}.info /usr/share/info/bashref-${SLOT}.info dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO }
