[patch] sed-4.2.2.patch

sed.patch (text/plain), 1.47 KB, created by Benda Xu on 2016-05-22 01:23:39 UTC

--- a/sys-apps/sed/sed-4.2.2.ebuild
+++ b/sys-apps/sed/sed-4.2.2.ebuild
@@ -2,6 +2,8 @@
 # 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,25 +33,18 @@ 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
-	fi
+src_configure() {
 
 	# Should be able to drop this hack in next release. #333887
 	tc-is-cross-compiler && export gl_cv_func_working_acl_get_file=yes
@@ -57,14 +52,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
+		$(usex userland_GNU "--exec-prefix=${EPREFIX}" "--program-prefix=g")
 }