[gentoo-commits] dev/heroxbd:master commit in: sys-apps/sed/, sys-apps/sed/files/
commit: 3c5dc9af44a4e30d873cdedbc738286c5706c4f4 Author: Benda Xu gentoo org> AuthorDate: Fri Jun 10 07:23:58 2016 + Commit: Benda XU gentoo org> CommitDate: Fri Jun 10 07:23:58 2016 + URL:https://gitweb.gentoo.org/dev/heroxbd.git/commit/?id=3c5dc9af sys-app/sed: merged. sys-apps/sed/Manifest | 7 --- sys-apps/sed/files/sed-4.1.5-alloca.patch | 14 - ...omplete-sequences-as-if-they-were-invalid.patch | 45 -- sys-apps/sed/metadata.xml | 11 sys-apps/sed/sed-4.2.1-r1.ebuild | 68 -- sys-apps/sed/sed-4.2.2.ebuild | 64 6 files changed, 209 deletions(-) diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest deleted file mode 100644 index 740e5c4..000 --- a/sys-apps/sed/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -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 5b792135d7ed31af1ee627687446b6583dc22d014a2f1db0817ed06a867b1cc6fe10bb603ae325838bb32ce1bc20bae8b5ce134a4b85a60dc70c3639fd01 -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/files/sed-4.1.5-alloca.patch b/sys-apps/sed/files/sed-4.1.5-alloca.patch deleted file mode 100644 index 89679c5..000 --- a/sys-apps/sed/files/sed-4.1.5-alloca.patch +++ /dev/null @@ -1,14 +0,0 @@ -fix building on BSD systems which often do not have alloca.h - sed-4.1.5/lib/regex_internal.h -+++ sed-4.1.5/lib/regex_internal.h -@@ -410,7 +410,9 @@ static unsigned int re_string_context_at - #define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx)) - #define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx)) - -+#ifdef HAVE_ALLOCA_H - #include -+#endif - - #ifndef _LIBC - # if HAVE_ALLOCA diff --git a/sys-apps/sed/files/sed-4.2.1-handle-incomplete-sequences-as-if-they-were-invalid.patch b/sys-apps/sed/files/sed-4.2.1-handle-incomplete-sequences-as-if-they-were-invalid.patch deleted file mode 100644 index dfd9206..000 --- a/sys-apps/sed/files/sed-4.2.1-handle-incomplete-sequences-as-if-they-were-invalid.patch +++ /dev/null @@ -1,45 +0,0 @@ -http://bugs.gentoo.org/284403 - -From 20f68fb1abe862a98bc0378e5bb54d94bb98b8fe Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini -Date: Thu, 15 Oct 2009 19:56:12 +0200 -Subject: [PATCH] handle incomplete sequences as if they were invalid - -2009-10-15 Paolo Bonzini - WANG Yunfeng - - * sed/execute.c (str_append, str_append_modif
[gentoo-commits] dev/heroxbd:master commit in: sys-apps/sed/
commit: ac0b14e6b9ad8ea8da85336a7b2028fa1ec0a3b8
Author: Benda Xu gentoo org>
AuthorDate: Fri Jun 10 03:34:52 2016 +
Commit: Benda XU gentoo org>
CommitDate: Fri Jun 10 03:43:45 2016 +
URL:https://gitweb.gentoo.org/dev/heroxbd.git/commit/?id=ac0b14e6
sys-apps/sed: use array myconf.
sys-apps/sed/Manifest | 2 +-
sys-apps/sed/sed-4.2.2.ebuild | 8 +++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index 874ec3d..740e5c4 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
5b792135d7ed31af1ee627687446b6583dc22d014a2f1db0817ed06a867b1cc6fe10bb603ae325838bb32ce1bc20bae8b5ce134a4b85a60dc70c3639fd01
-EBUILD sed-4.2.2.ebuild 1661 SHA256
51ce1d3d8030f7e8448025220f6ac27b4317976bb35d77f04465ca4f7042c777 SHA512
07bd21d14cc21923e2ce711b3b0d5ca51c0f3d200831d423277b1d421fc7479debe19b986c523f159bced65782522593d7bd0073b5cbf8108dad0c51448dd408
WHIRLPOOL
37ff57b08cc432c9a3315b90e009a45d39f9537e51192ed992d943369b0693e99cc117bfb46a9ec09311d533bf6f9500a5e35ed8036a262b8c1bbd7e0dabcdbb
+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 8e50b87..14cc4be 100644
--- a/sys-apps/sed/sed-4.2.2.ebuild
+++ b/sys-apps/sed/sed-4.2.2.ebuild
@@ -45,6 +45,12 @@ src_prepare() {
}
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
tc-is-cross-compiler && export gl_cv_func_working_acl_get_file=yes
@@ -54,5 +60,5 @@ src_configure() {
econf \
$(use_enable acl) \
$(use_enable nls) \
- $(usex userland_GNU "--exec-prefix=${EPREFIX}"
"--program-prefix=g")
+ "${myconf[@]}"
}
[gentoo-commits] dev/heroxbd:master commit in: sys-apps/sed/
commit: a6d6262dd9cd9e7b9e995329fa8fa9c66c9e1600
Author: Benda Xu gentoo org>
AuthorDate: Sun May 22 01:20:37 2016 +
Commit: Benda XU gentoo org>
CommitDate: Sun May 22 01:20:37 2016 +
URL:https://gitweb.gentoo.org/dev/heroxbd.git/commit/?id=a6d6262d
sys-apps/sed: usex and src_prepare updates.
sys-apps/sed/Manifest | 2 +-
sys-apps/sed/sed-4.2.2.ebuild | 14 --
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
5b792135d7ed31af1ee627687446b6583dc22d014a2f1db0817ed06a867b1cc6fe10bb603ae325838bb32ce1bc20bae8b5ce134a4b85a60dc70c3639fd01
-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")
}
[gentoo-commits] dev/heroxbd:master commit in: sys-apps/sed/files/, sys-apps/sed/
commit: 179c0f9a5e53e37da6015ec10db3e839e28530ae
Author: Benda Xu gentoo org>
AuthorDate: Sun May 22 01:02:27 2016 +
Commit: Benda XU gentoo org>
CommitDate: Sun May 22 01:02:27 2016 +
URL:https://gitweb.gentoo.org/dev/heroxbd.git/commit/?id=179c0f9a
sys-apps/sed: track
sys-apps/sed/Manifest | 2 +
sys-apps/sed/files/sed-4.1.5-alloca.patch | 14 +
...omplete-sequences-as-if-they-were-invalid.patch | 45 ++
sys-apps/sed/metadata.xml | 11
sys-apps/sed/sed-4.2.1-r1.ebuild | 68 +
sys-apps/sed/sed-4.2.2.ebuild | 70 ++
6 files changed, 210 insertions(+)
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
new file mode 100644
index 000..f48a47f
--- /dev/null
+++ b/sys-apps/sed/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/sys-apps/sed/files/sed-4.1.5-alloca.patch
b/sys-apps/sed/files/sed-4.1.5-alloca.patch
new file mode 100644
index 000..89679c5
--- /dev/null
+++ b/sys-apps/sed/files/sed-4.1.5-alloca.patch
@@ -0,0 +1,14 @@
+fix building on BSD systems which often do not have alloca.h
+
+--- sed-4.1.5/lib/regex_internal.h
sed-4.1.5/lib/regex_internal.h
+@@ -410,7 +410,9 @@ static unsigned int re_string_context_at
+ #define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx))
+ #define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
+
++#ifdef HAVE_ALLOCA_H
+ #include
++#endif
+
+ #ifndef _LIBC
+ # if HAVE_ALLOCA
diff --git
a/sys-apps/sed/files/sed-4.2.1-handle-incomplete-sequences-as-if-they-were-invalid.patch
b/sys-apps/sed/files/sed-4.2.1-handle-incomplete-sequences-as-if-they-were-invalid.patch
new file mode 100644
index 000..dfd9206
--- /dev/null
+++
b/sys-apps/sed/files/sed-4.2.1-handle-incomplete-sequences-as-if-they-were-invalid.patch
@@ -0,0 +1,45 @@
+http://bugs.gentoo.org/284403
+
+From 20f68fb1abe862a98bc0378e5bb54d94bb98b8fe Mon Sep 17 00:00:00 2001
+From: Paolo Bonzini
+Date: Thu, 15 Oct 2009 19:56:12 +0200
+Subject: [PATCH] handle incomplete sequences as if they were invalid
+
+2009-10-15 Paolo Bonzini
+ WANG Yunfeng
+
+ * sed/execute.c (str_append, str_append_modified): Handle incomplete
+ sequences as if they were invalid.
+---
+ ChangeLog |6 ++
+ NEWS |4 +++-
+ sed/execute.c |6 +++---
+ 3 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/sed/execute.c b/sed/execute.c
+index 66cb809..d5903be 100644
+--- a/sed/execute.c
b/sed/execute.c
+@@ -254,8 +254,8 @@ str_append(to, string, length)
+ {
+ size_t n = MBRLEN (string, length, &to->mbstate);
+
+-/* An invalid sequence is treated like a singlebyte character. */
+-if (n == (size_t) -1)
++/* An invalid or imcomplete sequence is treated like a singlebyte
character. */
++if (n == (size_t) -1 || n == (size_t) -2)
+ {
+ memset (&to->mbstate, 0, sizeof (to->mbstate));
+ n = 1;
+@@ -341,7 +341,7 @@ str_append_modified(to, string, length, type)
+ /* Copy the new wide character to the end of the string. */
+ n = WCRTOMB (to->active + to->length, wc, &to->mbstate);
+ to->length += n;
+- if (n == -1)
++ if (n == -1 || n == -2)
+ {
+ fprintf (stderr, "Case conversion produced an invalid character!");
+ abort ();
+--
+1.7.3.1
+
diff --git a/sys-apps/sed/metadata.xml b/sys-apps/sed/metadata.xml
new file mode 100644
index 000..b738f8c
--- /dev/null
+++ b/sys-apps/sed/metadata.xml
@@ -0,0 +1,11 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+
+ base-sys...@gentoo.org
+ Gentoo Base System
+
+
+ sed
+
+
diff --git a/sys-apps/sed/sed-4.2.1-r1.ebuild b/sys-apps/sed/sed-4.2.1-r1.ebuild
new file mode 100644
index 000..6c002dc
--- /dev/null
+++ b/sys-apps/sed/sed-4.2.1-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Super-useful stream editor"
+HOMEPAGE="http://sed.sourceforge.net/";
+SRC_URI="mirror:
[gentoo-commits] dev/heroxbd:master commit in: sys-apps/sed/
commit: 93686282a23b9415fa84be6ee21e0c03b74fd57d
Author: Benda Xu gentoo org>
AuthorDate: Sun May 22 01:10:03 2016 +
Commit: Benda XU gentoo org>
CommitDate: Sun May 22 01:10:03 2016 +
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
5b792135d7ed31af1ee627687446b6583dc22d014a2f1db0817ed06a867b1cc6fe10bb603ae325838bb32ce1bc20bae8b5ce134a4b85a60dc70c3639fd01
+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}"
