[gentoo-commits] repo/gentoo:master commit in: app-text/lv/files/, app-text/lv/

[Akinori Hattori]

commit:     79c3a348e1db805b3c2c285e7c324d3743fe9bd5
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 10 02:38:36 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Jun 10 02:38:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79c3a348

app-text/lv: update patches

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-text/lv/files/{lv-4.51-gentoo.patch => lv-gentoo.patch}  |  5 ++---
 app-text/lv/files/{lv-4.51-protos.patch => lv-headers.patch} |  5 +----
 app-text/lv/files/{lv-4.51-tinfo.patch => lv-tinfo.patch}    |  2 --
 app-text/lv/files/{lv-4.51-xz.diff => lv-xz.patch}           | 10 +++++-----
 app-text/lv/lv-4.51-r3.ebuild                                |  8 ++++----
 app-text/lv/lv-4.51-r4.ebuild                                |  8 ++++----
 6 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/app-text/lv/files/lv-4.51-gentoo.patch b/app-text/lv/files/lv-gentoo.patch
similarity index 86%
rename from app-text/lv/files/lv-4.51-gentoo.patch
rename to app-text/lv/files/lv-gentoo.patch
index 90acab49fd1..99724ef9c69 100644
--- a/app-text/lv/files/lv-4.51-gentoo.patch
+++ b/app-text/lv/files/lv-gentoo.patch
@@ -1,6 +1,5 @@
-diff -Naur lv451.orig/src/Makefile.in lv451/src/Makefile.in
---- lv451.orig/src/Makefile.in	2004-01-06 16:22:17.000000000 +0900
-+++ lv451/src/Makefile.in	2008-10-08 00:20:13.000000000 +0900
+--- a/src/Makefile.in
++++ b/src/Makefile.in
 @@ -25,6 +25,7 @@
  LDFLAGS=@LDFLAGS@
  INSTALL=@INSTALL@

diff --git a/app-text/lv/files/lv-4.51-protos.patch b/app-text/lv/files/lv-headers.patch
similarity index 82%
rename from app-text/lv/files/lv-4.51-protos.patch
rename to app-text/lv/files/lv-headers.patch
index 602ef5f6117..5207ec07cbe 100644
--- a/app-text/lv/files/lv-4.51-protos.patch
+++ b/app-text/lv/files/lv-headers.patch
@@ -3,8 +3,7 @@ Add missing string protos.
  * src/guess.c:150:12: warning: implicit declaration of function ‘strncmp’ [-Wimplicit-function-declaration]
  * src/guess.c:218:22: warning: implicit declaration of function ‘strcmp’ [-Wimplicit-function-declaration]
  * src/guesslocale.c:42:9: warning: implicit declaration of function ‘toupper’ [-Wimplicit-function-declaration]
-diff --git a/src/guess.c b/src/guess.c
-index facd95e..555acd3 100644
+
 --- a/src/guess.c
 +++ b/src/guess.c
 @@ -21,6 +21,7 @@
@@ -15,8 +14,6 @@ index facd95e..555acd3 100644
  
  #include <import.h>
  #include <decode.h>
-diff --git a/src/guesslocale.c b/src/guesslocale.c
-index 7974c88..c259723 100644
 --- a/src/guesslocale.c
 +++ b/src/guesslocale.c
 @@ -29,6 +29,7 @@

diff --git a/app-text/lv/files/lv-4.51-tinfo.patch b/app-text/lv/files/lv-tinfo.patch
similarity index 88%
rename from app-text/lv/files/lv-4.51-tinfo.patch
rename to app-text/lv/files/lv-tinfo.patch
index 9c17a92a65e..7da23d47495 100644
--- a/app-text/lv/files/lv-4.51-tinfo.patch
+++ b/app-text/lv/files/lv-tinfo.patch
@@ -1,5 +1,3 @@
-diff --git a/src/configure.in b/src/configure.in
-index 7d118de..29833a7 100644
 --- a/src/configure.in
 +++ b/src/configure.in
 @@ -24,7 +24,16 @@ AC_ARG_ENABLE(purify,

diff --git a/app-text/lv/files/lv-4.51-xz.diff b/app-text/lv/files/lv-xz.patch
similarity index 90%
rename from app-text/lv/files/lv-4.51-xz.diff
rename to app-text/lv/files/lv-xz.patch
index 058029b8be2..1b6ad8a9165 100644
--- a/app-text/lv/files/lv-4.51-xz.diff
+++ b/app-text/lv/files/lv-xz.patch
@@ -1,5 +1,5 @@
---- lv451.orig/index.html
-+++ lv451/index.html
+--- a/index.html
++++ b/index.html
 @@ -301,8 +301,11 @@
  	<P>
  	Compressed files that have suffix ``gz'', ``z'', or ``GZ'', ``Z'' are
@@ -14,8 +14,8 @@
  	<P>
  	In case that standard output is not connected to an ordinal terminal
  	but to redirect or pipe-line,
---- lv451.orig/src/stream.c
-+++ lv451/src/stream.c
+--- a/src/stream.c
++++ b/src/stream.c
 @@ -43,6 +43,8 @@
  
  private byte *gz_filter = "zcat";
@@ -37,7 +37,7 @@
    if( NULL != filter ){
      /*
 -     * zcat or bzcat
-+     * zcat or bzcat or lzcat or xzcat
++     * zcat, bzcat, lzcat or xzcat
       */
      if( NULL == (st->fp = (FILE *)tmpfile()) )
        perror( "temporary file" ), exit( -1 );

diff --git a/app-text/lv/lv-4.51-r3.ebuild b/app-text/lv/lv-4.51-r3.ebuild
index ad9d48b78c3..d5c5de76eb5 100644
--- a/app-text/lv/lv-4.51-r3.ebuild
+++ b/app-text/lv/lv-4.51-r3.ebuild
@@ -23,10 +23,10 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-protos.patch
-	epatch "${FILESDIR}"/${P}-tinfo.patch
-	epatch "${FILESDIR}"/${P}-xz.diff
+	epatch "${FILESDIR}"/${PN}-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-headers.patch
+	epatch "${FILESDIR}"/${PN}-tinfo.patch
+	epatch "${FILESDIR}"/${PN}-xz.patch
 
 	cd "${S}"/src
 	mv configure.{in,ac}

diff --git a/app-text/lv/lv-4.51-r4.ebuild b/app-text/lv/lv-4.51-r4.ebuild
index f85c10324f2..e219f8f061c 100644
--- a/app-text/lv/lv-4.51-r4.ebuild
+++ b/app-text/lv/lv-4.51-r4.ebuild
@@ -23,10 +23,10 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-protos.patch
-	"${FILESDIR}"/${P}-tinfo.patch
-	"${FILESDIR}"/${P}-xz.diff
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-headers.patch
+	"${FILESDIR}"/${PN}-tinfo.patch
+	"${FILESDIR}"/${PN}-xz.patch
 )
 DOCS=( README hello.sample )
 HTML_DOCS=( index.html relnote.html hello.sample.gif )