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 718E813829C for ; Fri, 10 Jun 2016 07:20:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A2F3254023; Fri, 10 Jun 2016 07:20:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1B208254023 for ; Fri, 10 Jun 2016 07:20:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B74B3340961 for ; Fri, 10 Jun 2016 07:20:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 591F99F4 for ; Fri, 10 Jun 2016 07:20:33 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1465543226.43115ed54fa6291626dc263838c1d2bb1975b350.heroxbd@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/sed/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/sed/sed-4.2.2.ebuild X-VCS-Directories: sys-apps/sed/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: 43115ed54fa6291626dc263838c1d2bb1975b350 X-VCS-Branch: master Date: Fri, 10 Jun 2016 07:20:33 +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: cad164cb-5bfb-4b3a-828a-876509ce64b0 X-Archives-Hash: e1c29a02195c07cb23007a6fd0f0b41c commit: 43115ed54fa6291626dc263838c1d2bb1975b350 Author: Benda Xu gentoo org> AuthorDate: Fri Jun 10 07:19:55 2016 +0000 Commit: Benda XU gentoo org> CommitDate: Fri Jun 10 07:20:26 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43115ed5 sys-apps/sed: bump to EAPI=5 and support Prefix. Package-Manager: portage-2.2.28 sys-apps/sed/sed-4.2.2.ebuild | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/sys-apps/sed/sed-4.2.2.ebuild b/sys-apps/sed/sed-4.2.2.ebuild index f6a4878..8e10644 100644 --- a/sys-apps/sed/sed-4.2.2.ebuild +++ b/sys-apps/sed/sed-4.2.2.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ +EAPI=5 + inherit eutils flag-o-matic toolchain-funcs DESCRIPTION="Super-useful stream editor" @@ -31,24 +33,23 @@ src_bootstrap_sed() { fi } -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { epatch "${FILESDIR}"/${PN}-4.1.5-alloca.patch - # don't use sed here if we have to recover a broken host sed -} -src_compile() { + # don't use sed before bootstrap if we have to recover a broken host sed src_bootstrap_sed # this has to be after the bootstrap portion sed -i \ -e '/docdir =/s:=.*/doc:= $(datadir)/doc/'${PF}'/html:' \ doc/Makefile.in || die "sed html doc" +} - local myconf= bindir=/bin - if ! use userland_GNU ; then - myconf="--program-prefix=g" - bindir=/usr/bin +src_configure() { + local myconf=() + if use userland_GNU; then + myconf+=( --exec-prefix="${EPREFIX}" ) + else + myconf+=( --program-prefix=g ) fi # Should be able to drop this hack in next release. #333887 @@ -57,14 +58,7 @@ src_compile() { export ac_cv_header_selinux_{context,selinux}_h=$(usex selinux) use static && append-ldflags -static econf \ - --bindir=${bindir} \ $(use_enable acl) \ $(use_enable nls) \ - ${myconf} - emake || die "build failed" -} - -src_install() { - emake install DESTDIR="${D}" || die "Install failed" - dodoc NEWS README* THANKS AUTHORS BUGS ChangeLog + "${myconf[@]}" }