From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C07E458973 for ; Tue, 26 Jan 2016 07:24:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47C38E0817; Tue, 26 Jan 2016 07:24:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9D7D6E0817 for ; Tue, 26 Jan 2016 07:24:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 97083340A9F for ; Tue, 26 Jan 2016 07:23:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 07BADFF9 for ; Tue, 26 Jan 2016 07:23:58 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1453792330.d70680449dd7e3eae1baab9c6af38cba586cd7cc.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/bash/, app-shells/bash/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-shells/bash/bash-4.3_p33-r1.ebuild app-shells/bash/bash-4.3_p33-r2.ebuild app-shells/bash/bash-4.3_p33.ebuild app-shells/bash/bash-4.3_p39.ebuild app-shells/bash/files/bash-4.3-declare-visibility.patch app-shells/bash/files/bash-4.3-parse-time-keyword.patch X-VCS-Directories: app-shells/bash/files/ app-shells/bash/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: d70680449dd7e3eae1baab9c6af38cba586cd7cc X-VCS-Branch: master Date: Tue, 26 Jan 2016 07:23:58 +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: 0e9754ee-1dc5-42e7-ab6b-8f99343a35bf X-Archives-Hash: adf683351c4393fa24a82b1e414457c2 commit: d70680449dd7e3eae1baab9c6af38cba586cd7cc Author: Mike Frysinger gentoo org> AuthorDate: Mon Jan 25 00:55:05 2016 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Tue Jan 26 07:12:10 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7068044 app-shells/bash: drop old versions app-shells/bash/bash-4.3_p33-r1.ebuild | 249 -------------------- app-shells/bash/bash-4.3_p33-r2.ebuild | 250 --------------------- app-shells/bash/bash-4.3_p33.ebuild | 247 -------------------- app-shells/bash/bash-4.3_p39.ebuild | 248 -------------------- .../bash/files/bash-4.3-declare-visibility.patch | 60 ----- .../bash/files/bash-4.3-parse-time-keyword.patch | 30 --- 6 files changed, 1084 deletions(-) diff --git a/app-shells/bash/bash-4.3_p33-r1.ebuild b/app-shells/bash/bash-4.3_p33-r1.ebuild deleted file mode 100644 index da7f827..0000000 --- a/app-shells/bash/bash-4.3_p33-r1.ebuild +++ /dev/null @@ -1,249 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils flag-o-matic toolchain-funcs multilib - -# Official patchlevel -# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-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 -} - -# The version of readline this bash normally ships with. -READLINE_VER="6.3" - -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)" -[[ ${PV} == *_rc* ]] && SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla" - -DEPEND=">=sys-libs/ncurses-5.2-r2 - readline? ( >=sys-libs/readline-${READLINE_VER} ) - nls? ( virtual/libintl )" -RDEPEND="${DEPEND} - !assign_func) (var, l->word->word, i, 0); - else - array_insert (a, i, l->word->word); -+ -+ VUNSETATTR (var, att_invisible); /* no longer invisible */ -+ - return var; - } - -@@ -639,6 +642,10 @@ assign_array_var_from_string (var, value, flags) - - if (nlist) - dispose_words (nlist); -+ -+ if (var) -+ VUNSETATTR (var, att_invisible); /* no longer invisible */ -+ - return (var); - } - - -bind_int_variable: make sure `v' is non-null before making it visible - -diff --git a/variables.c b/variables.c -index 2f07ebb..cbe7806 100644 ---- a/variables.c -+++ b/variables.c -@@ -2872,10 +2872,12 @@ bind_int_variable (lhs, rhs) - #endif - v = bind_variable (lhs, rhs, 0); - -- if (v && isint) -- VSETATTR (v, att_integer); -- -- VUNSETATTR (v, att_invisible); -+ if (v) -+ { -+ if (isint) -+ VSETATTR (v, att_integer); -+ VUNSETATTR (v, att_invisible); -+ } - - return (v); - } --- -2.3.0 - diff --git a/app-shells/bash/files/bash-4.3-parse-time-keyword.patch b/app-shells/bash/files/bash-4.3-parse-time-keyword.patch deleted file mode 100644 index cd516e5..0000000 --- a/app-shells/bash/files/bash-4.3-parse-time-keyword.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://lists.gnu.org/archive/html/bug-bash/2014-06/msg00034.html - -*** ../bash-4.3-patched/parse.y 2014-04-07 11:56:12.000000000 -0400 ---- parse.y 2014-06-11 10:25:53.000000000 -0400 -*************** -*** 2789,2797 **** - case OR_OR: - case '&': - case DO: - case THEN: - case ELSE: - case '{': /* } */ -! case '(': /* ) */ - case BANG: /* ! time pipeline */ - case TIME: /* time time pipeline */ ---- 2789,2802 ---- - case OR_OR: - case '&': -+ case WHILE: - case DO: -+ case UNTIL: -+ case IF: - case THEN: -+ case ELIF: - case ELSE: - case '{': /* } */ -! case '(': /* )( */ -! case ')': /* only valid in case statement */ - case BANG: /* ! time pipeline */ - case TIME: /* time time pipeline */