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 F25C11382C5 for ; Wed, 21 Apr 2021 19:56:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E74ACE087F; Wed, 21 Apr 2021 19:56:02 +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 B7A18E087C for ; Wed, 21 Apr 2021 19:56:02 +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 49441335D3C for ; Wed, 21 Apr 2021 19:56:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BD4E3706 for ; Wed, 21 Apr 2021 19:55:59 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1619034930.d0e4b627f95a29ec0fb75aca074a82530aa572b2.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/shish/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-shells/shish/shish-0.7_pre3-r1.ebuild X-VCS-Directories: app-shells/shish/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d0e4b627f95a29ec0fb75aca074a82530aa572b2 X-VCS-Branch: master Date: Wed, 21 Apr 2021 19:55:59 +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: d944cb7f-e447-4e82-b592-4251b9471148 X-Archives-Hash: 58400547c382c267db989bfdc8692400 commit: d0e4b627f95a29ec0fb75aca074a82530aa572b2 Author: Sam James gentoo org> AuthorDate: Wed Apr 21 19:51:59 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Apr 21 19:55:30 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0e4b627 app-shells/shish: port to EAPI 7 Signed-off-by: Sam James gentoo.org> app-shells/shish/shish-0.7_pre3-r1.ebuild | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/app-shells/shish/shish-0.7_pre3-r1.ebuild b/app-shells/shish/shish-0.7_pre3-r1.ebuild index 11fee89ec6d..10c7d469d2d 100644 --- a/app-shells/shish/shish-0.7_pre3-r1.ebuild +++ b/app-shells/shish/shish-0.7_pre3-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit toolchain-funcs @@ -11,6 +11,7 @@ MY_P="${PN}-${MY_PV}" DESCRIPTION="The diet shell" HOMEPAGE="http://www.blah.ch/shish/" SRC_URI="http://www.blah.ch/${PN}/pkg/${MY_P}.tar.bz2" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" @@ -20,15 +21,11 @@ IUSE="debug diet" DEPEND="diet? ( dev-libs/dietlibc )" RDEPEND="${DEPEND}" -S="${WORKDIR}/${MY_P}" - DOCS=( AUTHORS BUGS ChangeLog README TODO ) -pkg_setup() { - use diet && export CC="diet $(tc-getCC) -nostdinc" -} - src_prepare() { + default + # Respect CFLAGS, bug #439974 sed -i \ -e '/CFLAGS="$CFLAGS/d' \ @@ -37,6 +34,8 @@ src_prepare() { } src_configure() { + use diet && export CC="diet $(tc-getCC) -nostdinc" + econf \ $(use_enable debug) \ --disable-quiet # bug 439974 @@ -53,7 +52,7 @@ src_install() { } pkg_postinst() { - einfo "Updating ${ROOT}etc/shells" - ( grep -v "^/bin/shish$" "${ROOT}"etc/shells; echo "/bin/shish" ) > "${T}"/shells - mv -f "${T}"/shells "${ROOT}"etc/shells + einfo "Updating ${EROOT}/etc/shells" + ( grep -v "^/bin/shish$" "${EROOT}"/etc/shells; echo "/bin/shish" ) > "${T}"/shells + mv -f "${T}"/shells "${EROOT}"/etc/shells }