summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenda Xu <heroxbd@gentoo.org>2016-05-22 10:20:37 +0900
committerBenda Xu <heroxbd@gentoo.org>2016-05-22 10:20:37 +0900
commita6d6262dd9cd9e7b9e995329fa8fa9c66c9e1600 (patch)
treee4b4c715ce6958808c55a0963ee32f1b3e5b3728
parentsys-apps/sed: bump to EAPI=5 and support Prefix. (diff)
downloadheroxbd-a6d6262dd9cd9e7b9e995329fa8fa9c66c9e1600.tar.gz
heroxbd-a6d6262dd9cd9e7b9e995329fa8fa9c66c9e1600.tar.bz2
heroxbd-a6d6262dd9cd9e7b9e995329fa8fa9c66c9e1600.zip
sys-apps/sed: usex and src_prepare updates.
-rw-r--r--sys-apps/sed/Manifest2
-rw-r--r--sys-apps/sed/sed-4.2.2.ebuild14
2 files changed, 5 insertions, 11 deletions
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index 740e5c4..874ec3d 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -3,5 +3,5 @@ AUX sed-4.2.1-handle-incomplete-sequences-as-if-they-were-invalid.patch 1507 SHA
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
+EBUILD sed-4.2.2.ebuild 1661 SHA256 51ce1d3d8030f7e8448025220f6ac27b4317976bb35d77f04465ca4f7042c777 SHA512 07bd21d14cc21923e2ce711b3b0d5ca51c0f3d200831d423277b1d421fc7479debe19b986c523f159bced65782522593d7bd0073b5cbf8108dad0c51448dd408 WHIRLPOOL 37ff57b08cc432c9a3315b90e009a45d39f9537e51192ed992d943369b0693e99cc117bfb46a9ec09311d533bf6f9500a5e35ed8036a262b8c1bbd7e0dabcdbb
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 b4526ea..8e50b87 100644
--- a/sys-apps/sed/sed-4.2.2.ebuild
+++ b/sys-apps/sed/sed-4.2.2.ebuild
@@ -35,22 +35,16 @@ src_bootstrap_sed() {
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_configure() {
+ # 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=
- if use userland_GNU; then
- myconf="--exec-prefix=${EPREFIX}"
- else
- myconf="--program-prefix=g"
- 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
@@ -60,5 +54,5 @@ src_configure() {
econf \
$(use_enable acl) \
$(use_enable nls) \
- ${myconf}
+ $(usex userland_GNU "--exec-prefix=${EPREFIX}" "--program-prefix=g")
}