commit:     32f9630668aefa699137991a293d371def9b47b4
Author:     Oskari Pirhonen <xxc3ncoredxx <AT> gmail <DOT> com>
AuthorDate: Mon Mar 27 03:37:01 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Apr  4 12:45:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32f96306

app-editors/vim: remove some useless sed

- The libc.h mentioned in bug #43885 has moved to 9libs/libc.h so it's
  no longer relevant. And the sed was broken due to whitespace changes
  anyway.
- Finding the path to xsubpp is handled through autoconf and substituted
  into src/auto/config.mk which is read by src/Makefile.

Signed-off-by: Oskari Pirhonen <xxc3ncoredxx <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-editors/vim/vim-9.0.1000.ebuild | 11 -----------
 app-editors/vim/vim-9.0.1157.ebuild | 11 -----------
 app-editors/vim/vim-9.0.1363.ebuild | 11 -----------
 app-editors/vim/vim-9.0.1403.ebuild | 11 -----------
 app-editors/vim/vim-9999.ebuild     | 11 -----------
 5 files changed, 55 deletions(-)

diff --git a/app-editors/vim/vim-9.0.1000.ebuild 
b/app-editors/vim/vim-9.0.1000.ebuild
index 556785a2b235..ce978f7e8d41 100644
--- a/app-editors/vim/vim-9.0.1000.ebuild
+++ b/app-editors/vim/vim-9.0.1000.ebuild
@@ -117,13 +117,6 @@ src_prepare() {
                "${S}"/runtime/menu.vim \
                "${S}"/src/configure.ac || die 'sed failed'
 
-       # Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-       # this is NeXT, but it's actually just a file in dev-libs/9libs
-       # This fixes bug #43885 (20 Mar 2004 agriffis)
-       sed -i -e \
-               's/ libc\.h / /' \
-               "${S}"/src/configure.ac || die 'sed failed'
-
        # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
        # correctly. To avoid some really entertaining error messages about 
stuff
        # which isn't even in the source file being invalid, we'll do some 
trickery
@@ -154,10 +147,6 @@ src_prepare() {
 
        cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp 
failed"
 
-       sed -i -e \
-               "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-               "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
        # Fix bug 18245: Prevent "make" from the following chain:
        # (1) Notice configure.ac is newer than auto/configure
        # (2) Rebuild auto/configure

diff --git a/app-editors/vim/vim-9.0.1157.ebuild 
b/app-editors/vim/vim-9.0.1157.ebuild
index 556785a2b235..ce978f7e8d41 100644
--- a/app-editors/vim/vim-9.0.1157.ebuild
+++ b/app-editors/vim/vim-9.0.1157.ebuild
@@ -117,13 +117,6 @@ src_prepare() {
                "${S}"/runtime/menu.vim \
                "${S}"/src/configure.ac || die 'sed failed'
 
-       # Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-       # this is NeXT, but it's actually just a file in dev-libs/9libs
-       # This fixes bug #43885 (20 Mar 2004 agriffis)
-       sed -i -e \
-               's/ libc\.h / /' \
-               "${S}"/src/configure.ac || die 'sed failed'
-
        # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
        # correctly. To avoid some really entertaining error messages about 
stuff
        # which isn't even in the source file being invalid, we'll do some 
trickery
@@ -154,10 +147,6 @@ src_prepare() {
 
        cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp 
failed"
 
-       sed -i -e \
-               "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-               "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
        # Fix bug 18245: Prevent "make" from the following chain:
        # (1) Notice configure.ac is newer than auto/configure
        # (2) Rebuild auto/configure

diff --git a/app-editors/vim/vim-9.0.1363.ebuild 
b/app-editors/vim/vim-9.0.1363.ebuild
index 0e985e6afed2..50428d19e4ba 100644
--- a/app-editors/vim/vim-9.0.1363.ebuild
+++ b/app-editors/vim/vim-9.0.1363.ebuild
@@ -117,13 +117,6 @@ src_prepare() {
                "${S}"/runtime/menu.vim \
                "${S}"/src/configure.ac || die 'sed failed'
 
-       # Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-       # this is NeXT, but it's actually just a file in dev-libs/9libs
-       # This fixes bug #43885 (20 Mar 2004 agriffis)
-       sed -i -e \
-               's/ libc\.h / /' \
-               "${S}"/src/configure.ac || die 'sed failed'
-
        # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
        # correctly. To avoid some really entertaining error messages about 
stuff
        # which isn't even in the source file being invalid, we'll do some 
trickery
@@ -154,10 +147,6 @@ src_prepare() {
 
        cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp 
failed"
 
-       sed -i -e \
-               "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-               "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
        # Fix bug 18245: Prevent "make" from the following chain:
        # (1) Notice configure.ac is newer than auto/configure
        # (2) Rebuild auto/configure

diff --git a/app-editors/vim/vim-9.0.1403.ebuild 
b/app-editors/vim/vim-9.0.1403.ebuild
index 0e985e6afed2..50428d19e4ba 100644
--- a/app-editors/vim/vim-9.0.1403.ebuild
+++ b/app-editors/vim/vim-9.0.1403.ebuild
@@ -117,13 +117,6 @@ src_prepare() {
                "${S}"/runtime/menu.vim \
                "${S}"/src/configure.ac || die 'sed failed'
 
-       # Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-       # this is NeXT, but it's actually just a file in dev-libs/9libs
-       # This fixes bug #43885 (20 Mar 2004 agriffis)
-       sed -i -e \
-               's/ libc\.h / /' \
-               "${S}"/src/configure.ac || die 'sed failed'
-
        # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
        # correctly. To avoid some really entertaining error messages about 
stuff
        # which isn't even in the source file being invalid, we'll do some 
trickery
@@ -154,10 +147,6 @@ src_prepare() {
 
        cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp 
failed"
 
-       sed -i -e \
-               "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-               "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
        # Fix bug 18245: Prevent "make" from the following chain:
        # (1) Notice configure.ac is newer than auto/configure
        # (2) Rebuild auto/configure

diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index 0e985e6afed2..50428d19e4ba 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -117,13 +117,6 @@ src_prepare() {
                "${S}"/runtime/menu.vim \
                "${S}"/src/configure.ac || die 'sed failed'
 
-       # Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-       # this is NeXT, but it's actually just a file in dev-libs/9libs
-       # This fixes bug #43885 (20 Mar 2004 agriffis)
-       sed -i -e \
-               's/ libc\.h / /' \
-               "${S}"/src/configure.ac || die 'sed failed'
-
        # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
        # correctly. To avoid some really entertaining error messages about 
stuff
        # which isn't even in the source file being invalid, we'll do some 
trickery
@@ -154,10 +147,6 @@ src_prepare() {
 
        cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp 
failed"
 
-       sed -i -e \
-               "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-               "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
        # Fix bug 18245: Prevent "make" from the following chain:
        # (1) Notice configure.ac is newer than auto/configure
        # (2) Rebuild auto/configure

Reply via email to