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

["Benda XU" <heroxbd@gentoo.org>]

commit:     93686282a23b9415fa84be6ee21e0c03b74fd57d
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sun May 22 01:10:03 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun May 22 01:10:03 2016 +0000
URL:        https://gitweb.gentoo.org/dev/heroxbd.git/commit/?id=93686282

sys-apps/sed: bump to EAPI=5 and support Prefix.

 sys-apps/sed/Manifest         |  5 +++++
 sys-apps/sed/sed-4.2.2.ebuild | 22 ++++++++--------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index f48a47f..740e5c4 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -1,2 +1,7 @@
+AUX sed-4.1.5-alloca.patch 413 SHA256 9b371d7e3db5f6955536b4c4a23739b7d84448b9865046f0cc3bd3903a04009a SHA512 dccdad774cbf1eb71744b9d1a49ce45e6c6197ffed66448b6de9302dc88d46246b52a6cbed95a5b86511f19a735a710af177003732d54ca01baa84ef21734d29 WHIRLPOOL a7c81b9229bb62946618053993c35db26a7f06d03880a499916aed28fcab9308b7038f6a90ba84e2f86caaef0383cf8daf59d5759f5de0c6b840f9cbbc6561b3
+AUX sed-4.2.1-handle-incomplete-sequences-as-if-they-were-invalid.patch 1507 SHA256 11e8585a1ca572aa48632903040b3c81be75c764a401ede121f83c4555435746 SHA512 ceeebddd7b64dc8675936d19812580c46c462fc6c102acb68b07cf4333b53721eebd744cbaca423644f8c8377e645a224d86cf928b6d5dbb6b538c6e26d3271f WHIRLPOOL ef70156dd924b25cad0193f1579e5e880e47f133c03c9f301a895f56d8a316d8d0953b4a58fbde3bf11348d46727d7afa520c46c76337082537bc8be718ee614
 DIST sed-4.2.1.tar.bz2 899091 SHA256 2ac3b36ca37bfeb43c4ef4025778cd66d89c77abb843d90552a515a7c9d2948f SHA512 273d4d0b3dd41a3966260fbe261a20110a2a4c0749e11a080f4fc8694e47b605cb977f2535b20b92d57b1b74129df092ba47f4184951dbc3f0f14fd9b91b7bfd WHIRLPOOL 426b244431cb00a8c8f7320f22cf0a5de3165a43d9d6fb8343163e1d4054d61b2737a697ebe54311cf5d2d2f696d2f07877a41b8710ad80d96a7d5138fff07e1
 DIST sed-4.2.2.tar.bz2 1059414 SHA256 f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7 SHA512 dbbb0bb348fac54612d29182c09c88bda7096dea03bd94f03c580c24146e65a06db12808c6a1a9adc94548fa3843511e3e80b251cb07142110cf149eab23f573 WHIRLPOOL d816657c51a2718c2b309455facaff50c9da08b79d20985ab1d61faa5b42bffa0b33ea7d3368a8cdaa6079891cfc27cdab38788563c8323081580b4478c7e2b5
+EBUILD sed-4.2.1-r1.ebuild 1804 SHA256 bb817eb07b97686fc6c6b4ba429fe8b490b192802e7fde6e633dec16ec4ed752 SHA512 deff6ad5092f728683732aa48987b32e0c994ef926a593f89c4dd395e10e5245d4212ec1d85edbaa9b85b84e26cf8226f574e09f17437a2d71d850d516f3f847 WHIRLPOOL 5b792135d7ed31af1ee627687446b6583dc22d014a2f1db0817ed060000a867b1cc6fe10bb603ae325838bb32ce1bc20bae8b5ce134a4b85a60dc70c3639fd01
+EBUILD sed-4.2.2.ebuild 1708 SHA256 29a73e645b83870de458efea276d89d155efbde59bb0b8bb0ea305b93b17fe7a SHA512 974102b10ee543aaedcc3d95cdbcfd4d66bff041a62befee635058bcad29aff2c37e64cc442009af0606392474070d3810a5f534165adc0a85b0d100725acb60 WHIRLPOOL e5097da2a6fd2ada7e804f84cb3ae5823fdc4de58a184e8ce792777a9fd7e8e38f772124eb162352f4c7b7eb6f1749ee5db55d411b68bb95e39289d0faa76fff
+MISC metadata.xml 323 SHA256 4574efa0a4c0db71c699957b59632b3212209a654e0bbcee1d6448b0b16074c5 SHA512 ec3a11f7aafded3d4b5e12680358f39dbeb166f96af51eae8dafb21b186024ddb9b5b9ba36bde626be01b1938fd6f4bbcb58f0f8bad2208a84d44eaadc95652e WHIRLPOOL d00ccb5adec759d4fb86b9e919d7f2a942edcf455b2e6681f4b299448396127a39b8f81e690bd873f678452ebcaf90e8a76c3789db7cc4269f4da303c15201be

diff --git a/sys-apps/sed/sed-4.2.2.ebuild b/sys-apps/sed/sed-4.2.2.ebuild
index f6a4878..b4526ea 100644
--- 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,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() {
+src_configure() {
 	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
+	local myconf=
+	if use userland_GNU; then
+		myconf="--exec-prefix=${EPREFIX}"
+	else
 		myconf="--program-prefix=g"
-		bindir=/usr/bin
 	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
 }