gentoo resync : 16.06.2018

7 files changed, 41 insertions, 44 deletions

diff --git a/app-text/lv/Manifest b/app-text/lv/Manifest
index 5080c86a83f2..bb24098a3e97 100644
--- a/app-text/lv/Manifest
+++ b/app-text/lv/Manifest
@@ -1,8 +1,8 @@
-AUX lv-4.51-gentoo.patch 1385 BLAKE2B 11a6782b13ebbc3e09e8d9cdda5ddd709a597cc9e03cd2b138b6635d7ee31493bb2aa5dc98104e73f75180667f29f11ec2f654d7a8a2871e1aa7c008da63073f SHA512 b8af37ef32cb61a8d4903faeff2ff7f9e3cf4e4f0f3bb167503792bd0a3ee870c1c1dcd0d483c902e49c280e7d0783d4f34323bffa3aa9fa6a603d80c391d647
-AUX lv-4.51-protos.patch 874 BLAKE2B b9bec36bdc34ab651a672f8d00ec1289ae368f42a1850e8821680bf96cc5fd3c6165da608e1901c0f5c8c5ac426b96f901c4976accf6290a5b4e0227c6127d4a SHA512 785c95aee52503d573269ad8a6d8d879462cd754ab2b1ed79e02a43dd2b8ae8e472ed3fdd8985ef8baa9a6aba564be3960f9f021f2a1d113b6e781482699ce95
-AUX lv-4.51-tinfo.patch 708 BLAKE2B ae9f4a69a6f1ee1b582bcf15c6f844172a33bb0b698a75c6072f3b25e4cf074bc61973ad68d35b39faac9ed22ac187b1097d5532ebe5dd7a776cfaf814f5ced7 SHA512 3b49387dfeceef6cef6676c0fffb2e733f995daa5f56714fb4c15c47b7ec8a48f746c065fd3b11286dd578ef6c93630940e17342b8d858267907705e427dd962
-AUX lv-4.51-xz.diff 1445 BLAKE2B e914ed64cbf4b52a8a64ab23d0521ac52dce1bb034fbf5e5bd56f2c4ba1ee93ecc4c4b7665dda213730da06e311bd47235d9b697b532914203528e55a4e788e9 SHA512 fb48d11cca4ca89d1ccecd267ed3a9502ae6541fa1c9564852742979e0dcbb4ca6e083ae90b65987366d3a3f6d43d4411af6ed1bcaa181908ada8ee3b4354f72
+AUX lv-gentoo.patch 1240 BLAKE2B 76955ff7694332d448283f9dbe6e91e8c84824d6913cbbc3cb008871d1c1e5330eb07f8c5ede4966b6567b6a03f59e159c4e1aa4600f44e47b520d7edffad7b6 SHA512 6b98404792b01be3940d45a3fa89f0c0e490edee4ae76f70c3f2dfee36265a77761f878b398b71278829193211d0370af29e2e6bbc293c46fa84db9e90fe2e8d
+AUX lv-headers.patch 725 BLAKE2B 64a570d256aae0e5d3c13c2c6a51c2311da1dff3057219f4b48639f77cdbfe27da1e6c35dc16f79c26b48ce17fa2160f966d4337efea594bb6303649637e53e0 SHA512 f349f8096eb5fa2c35a1606ace275e2e66e6fec188daac6b54f57a1cb57cc1eeadf620355090840c2f6bbd791ab888f11c0f170acd1db03cd4010b4a0d0a6ebc
+AUX lv-tinfo.patch 629 BLAKE2B 1923de4cb256d6752561f2489d1633a01987e4ad073bd28fcafcd2ab81c68a2ea8a4a278a0c4a8c1c09df581f0391fb2c469c65144ddf5d7975ba1b8b9ae5555 SHA512 3a33edf5ad11d77cd23bd27fbe071aacf83ec5367b100103954159a0dc4ba2856f3978d3b8c7f41c52006dc99097bdd9d127419f700d75cbb88b745ffe4694e0
+AUX lv-xz.patch 1415 BLAKE2B e4a9cbd5bb2ca71eb3c6eea8e132caf2f1bbfda84e8055654eac86948b7f0e57397af96beca2eeacf259f9258aafa5d03303a202ab5562236ba05f0adf22cfa7 SHA512 eb791a2e392070a01e372bbc6d0d4bc113fbb57394e50fb7a55e46ee4b0896177fdb1698db750b43e78b6aa120d0fef34ad4859fee5d4a1749c062a7afb6ec84
 DIST lv451.tar.gz 605082 BLAKE2B cbfdf1c4c90dc746de631e55e3d1e88335f22342991ca7d5bd4b3661803af4efc0c6dcd821ea58be6024fa7ce773ffaa0aa3844350b6f67dd61be09e2475cb70 SHA512 88c05cb06ddc56e7f16f30b38218ec3bf9c8ef6c3c2b08d5a3f950b6870b82417368ada3f14f183b0feb6ed32d144d71901ad8134e5f88ddec11fc7b9520e810
-EBUILD lv-4.51-r3.ebuild 1009 BLAKE2B 9fa133b8f0c85e1d2d2780da6303a54087d4efcfe383c883720ff419db16ea03d5f74f12785f3262fb6554f34feefaa2ec5fb92765fbe73737647e6be727b3ca SHA512 f38131dedfe7d7a8055e26d809e4acebd1f63966f7c9c186cba579afc1bc99139686e37e9ec4536fd56828d2fd5d6562dfe77f179917896c7ec084441bfa980b
-EBUILD lv-4.51-r4.ebuild 963 BLAKE2B 58f6e74eed4a1f534f0d305e1315f52dc854c2e9ddbf81889974d65cfb220696c04312139ed02d10980f3c7abd024a7453799f3bbd66b573ec6bc3846aacec53 SHA512 c43686140618d519d89e9dc5036b45ecae9c361e03150892f2333cc572352b73f9fb460ace04f6f313354a3a1861efc435e59a90886551b34fef87cd63910416
+EBUILD lv-4.51-r3.ebuild 1067 BLAKE2B 22d15f031dc2edc33fd93e80e8bc9b596eb78cad3532307ba7bbe092f186f6cab722219441ff21aeb02a8aa8ac9b6c272951540e113440a9274af469a0dbbb5d SHA512 31a2d9bc82822582c2e68f746385b0e623a3aa05117f84c996023d4a9bfc575e281ebf7a15f71bc4d52b0297054b8e1bdb9e76202e911c7987aa388c8805fcec
+EBUILD lv-4.51-r4.ebuild 1017 BLAKE2B df902d931c531f3e510c5528a2dc7387a0472cb2f6ef081833a5d31ed0c72d6f2b549865b1ce068c6207ccadc946ea7942dee424eec0ff05f8b555b62c7889a5 SHA512 7a740ca5ae20ebd82610dc64fcc5714999525a1ab10fa325ae7b16f438864de8a53ed14b415670643ada5d005630774548d3d7b3291e2df27544f6d94a053a25
 MISC metadata.xml 358 BLAKE2B 56858cc481cec55add44dce0a02d0955fa787248b0a6861914fc450957d9b18ae256a698613d94479aca810cae4c264e0a91bf3ff89b52183c4945ce32a5dec5 SHA512 7b250d5ddc092d7ecd4e6f48175e1f57f1671af4f8529368f368071b777fd773e363e83bcd3cfee3c9352ee93c9c0bc205f940c4cb6601dac3164ad34766e6a1
diff --git a/app-text/lv/files/lv-4.51-gentoo.patch b/app-text/lv/files/lv-gentoo.patch
index 90acab49fd16..99724ef9c69e 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
index 602ef5f6117f..5207ec07cbee 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
index 9c17a92a65ef..7da23d474951 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
index 058029b8be28..1b6ad8a91659 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 b7a63bf3f3aa..f5f4561fe2c9 100644
--- a/app-text/lv/lv-4.51-r3.ebuild
+++ b/app-text/lv/lv-4.51-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -8,26 +8,29 @@ inherit autotools eutils toolchain-funcs
 MY_P="${PN}${PV//./}"
 
 DESCRIPTION="Powerful Multilingual File Viewer"
-HOMEPAGE="http://www.ff.iij4u.or.jp/~nrt/lv/"
-SRC_URI="http://www.ff.iij4u.or.jp/~nrt/freeware/${MY_P}.tar.gz"
+#HOMEPAGE="http://www.ff.iij4u.or.jp/~nrt/lv/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
-RDEPEND="sys-libs/ncurses
-	!app-editors/levee"
+RDEPEND="!app-editors/levee
+	sys-libs/ncurses"
 DEPEND="${RDEPEND}
 	dev-lang/perl"
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-xz.diff
-	epatch "${FILESDIR}"/${P}-tinfo.patch
-	epatch "${FILESDIR}"/${P}-protos.patch
+	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}
 	eautoreconf
 }
 
diff --git a/app-text/lv/lv-4.51-r4.ebuild b/app-text/lv/lv-4.51-r4.ebuild
index a1b366d3665c..2518014787f3 100644
--- a/app-text/lv/lv-4.51-r4.ebuild
+++ b/app-text/lv/lv-4.51-r4.ebuild
@@ -1,42 +1,42 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="6"
 
-inherit autotools eutils toolchain-funcs
+inherit autotools toolchain-funcs
 
 MY_P="${PN}${PV//./}"
 
 DESCRIPTION="Powerful Multilingual File Viewer"
-HOMEPAGE="http://www.ff.iij4u.or.jp/~nrt/lv/"
-SRC_URI="http://www.ff.iij4u.or.jp/~nrt/freeware/${MY_P}.tar.gz"
+#HOMEPAGE="http://www.ff.iij4u.or.jp/~nrt/lv/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
-RDEPEND="sys-libs/ncurses:0=
-	!app-editors/levee"
+RDEPEND="!app-editors/levee
+	sys-libs/ncurses:0="
 DEPEND="${RDEPEND}
 	dev-lang/perl"
-
 S="${WORKDIR}/${MY_P}"
 
-DOCS=(README hello.sample)
-HTML_DOCS=(index.html relnote.html hello.sample.gif)
-
 PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-xz.diff
-	"${FILESDIR}"/${P}-tinfo.patch
-	"${FILESDIR}"/${P}-protos.patch
+	"${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 )
 
 src_prepare() {
 	default
 
 	cd src
+	mv configure.{in,ac}
 	eautoreconf
 }