[gentoo-commits] repo/gentoo:master commit in: sys-apps/sed/

[Benda XU]

commit:     43115ed54fa6291626dc263838c1d2bb1975b350
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 10 07:19:55 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> 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[@]}"
 }