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 DEEE01382C5 for ; Mon, 14 May 2018 08:09:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3DADFE088F; Mon, 14 May 2018 08:09:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 0561FE088F for ; Mon, 14 May 2018 08:09:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 C3DA6335CA4 for ; Mon, 14 May 2018 08:09:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D24C6260 for ; Mon, 14 May 2018 08:09:07 +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: <1526285040.48803d38b5a42e55608b1606469de1cda353b05e.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/dash/files/, app-shells/dash/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-shells/dash/Manifest app-shells/dash/dash-0.5.10-r1.ebuild app-shells/dash/files/dash-0.5.10-subshells.patch X-VCS-Directories: app-shells/dash/ app-shells/dash/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 48803d38b5a42e55608b1606469de1cda353b05e X-VCS-Branch: master Date: Mon, 14 May 2018 08:09:07 +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: a58c16ff-be6e-4de6-be56-2069a99a7b61 X-Archives-Hash: 0b7d3b9ec4d846999e8b04041cd6cb27 commit: 48803d38b5a42e55608b1606469de1cda353b05e Author: Lars Wendler gentoo org> AuthorDate: Mon May 14 08:04:00 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon May 14 08:04:00 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48803d38 app-shells/dash: Removed old. Package-Manager: Portage-2.3.36, Repoman-2.3.9 app-shells/dash/Manifest | 1 - app-shells/dash/dash-0.5.10-r1.ebuild | 79 ----------------------- app-shells/dash/files/dash-0.5.10-subshells.patch | 16 ----- 3 files changed, 96 deletions(-) diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest index c6b2df6dc22..28e096423d1 100644 --- a/app-shells/dash/Manifest +++ b/app-shells/dash/Manifest @@ -1,3 +1,2 @@ DIST dash-0.5.10.1.tar.gz 225253 BLAKE2B 55dbdca7f01d19656e002d6e210bcae920619e2e88d4d174a3e08cbbc40bf867ece3f24ce9690ec64f95b1f0995ab35cabc08381ac031a33b55282cec0b09e73 SHA512 7ca3bbcf8bac84d359cde710a9ab393f05cf8522e969a2c110d2e71620e53f349387128045e68738dc621afe0b48f43ae3d32851187f2ae02d49b3e2575ffa6b -DIST dash-0.5.10.tar.gz 225242 BLAKE2B c21b04aea58599c4a487ec7325bc1ffac2fb4b9be911e07cb0da3fd62eb15b5eb8d30857fad6cbc01fa36a948ac5e5e226566b42d4f9507f709e4d6636cf84f6 SHA512 47383284faf2cbdf65471b72196bdcea46efb8b01041fdc7685a811ae125ba77e5af653939255bda20bd3d56a13f838d85e0003549dcede6b75a37625816cb30 DIST dash-0.5.9.1.tar.gz 225217 BLAKE2B a80aa00ea5418d00b03c9ded21ef5c3a28d599059d1ac2f20082867b71ece6afac2f0bce9bc09946450c7618ad2c7f95df63b3d519a7f56552a291d09e44a71b SHA512 d56a043b8fab4693d3f70cceb531c37174e7ded4acd5549e53048d7ce29125ff21d7e758f51a4a73e06250d051e246467039989275838c19a2579edea3f72b7d diff --git a/app-shells/dash/dash-0.5.10-r1.ebuild b/app-shells/dash/dash-0.5.10-r1.ebuild deleted file mode 100644 index 97e4202bc4d..00000000000 --- a/app-shells/dash/dash-0.5.10-r1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic toolchain-funcs versionator - -#MY_PV="$(get_version_component_range 1-3)" -DEB_PATCH="" #$(get_version_component_range 4) -#MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Debian Almquist Shell" -HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/" -SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz" -if [[ -n "${DEB_PATCH}" ]] ; then - DEB_PF="${PN}_${MY_PV}-${DEB_PATCH}" - SRC_URI+=" mirror://debian/pool/main/d/dash/${DEB_PF}.diff.gz" -fi - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="libedit static vanilla" - -RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )" -DEPEND="${RDEPEND} - virtual/pkgconfig - libedit? ( static? ( dev-libs/libedit[static-libs] ) )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.5.9.1-format-security.patch - "${FILESDIR}"/${P}-subshells.patch -) - -src_prepare() { - if [[ -n "${DEB_PATCH}" ]] ; then - eapply "${WORKDIR}"/${DEB_PF}.diff - eapply */debian/diff/* - fi - - #337329 #527848 - use vanilla || eapply "${FILESDIR}"/${PN}-0.5.10-dumb-echo.patch - - default - - # Fix the invalid sort - sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins - - # Use pkg-config for libedit linkage - sed -i \ - -e "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" \ - configure || die -} - -src_configure() { - # don't redefine stat on Solaris - if [[ ${CHOST} == *-solaris* ]] ; then - export ac_cv_func_stat64=yes - fi - append-cppflags -DJOBS=$(usex libedit 1 0) - use static && append-ldflags -static - # Do not pass --enable-glob due to #443552. - # Autotools use $LINENO as a proxy for extended debug support - # (i.e. they're running bash), so disable that. #527644 - local myeconfargs=( - --bindir="${EPREFIX}"/bin - --enable-fnmatch - --disable-lineno - $(use_with libedit) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - if [[ -n "${DEB_PATCH}" ]] ; then - dodoc */debian/changelog - fi -} diff --git a/app-shells/dash/files/dash-0.5.10-subshells.patch b/app-shells/dash/files/dash-0.5.10-subshells.patch deleted file mode 100644 index 5943db11e69..00000000000 --- a/app-shells/dash/files/dash-0.5.10-subshells.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://bugs.gentoo.org/655320 -https://patchwork.kernel.org/patch/10382199/ - ---- dash-0.5.10/src/jobs.c -+++ dash-0.5.10/src/jobs.c -@@ -975,8 +975,8 @@ - int st; - - TRACE(("waitforjob(%%%d) called\n", jp ? jobno(jp) : 0)); -- while ((jp && jp->state == JOBRUNNING) || gotsigchld) -- dowait(DOWAIT_BLOCK, jp); -+ while (jp ? jp->state == JOBRUNNING : gotsigchld) -+ dowait(jp ? DOWAIT_BLOCK : DOWAIT_NORMAL, jp); - if (!jp) - return exitstatus; - st = getstatus(jp);