gentoo resync : 07.10.2018

4 files changed, 62 insertions, 8 deletions

diff --git a/app-arch/lha/Manifest b/app-arch/lha/Manifest
index f1e70b19c4d3..98491e3a6f6d 100644
--- a/app-arch/lha/Manifest
+++ b/app-arch/lha/Manifest
@@ -1,6 +1,7 @@
-AUX lha-114i-file-list-from-stdin.patch 991 BLAKE2B eab4a7c196a1e99bff97dee124d47af0870c01660fd96da3835797e0e14d9b2c271e69d8522278819f97f6787c050016a76916af28e2b949f880003f2f9b6426 SHA512 fb3e112ef592b7542cab4cd34759407b5bace3ebc83af0aad52daf9d8584ec897e26ef1e0d4cc3656c1b0bfbd5eb242dedc6fb0a8fedce765ae30735a95b79a2
-AUX lha-114i-fix-getopt_long-declaration.patch 267 BLAKE2B c87ac7e0842b9b637b5f9201ad0f596a2ee3bdb44447428d2f7e28c61c7da30f397c7dcacee86bdf6e1166f10d0b4962056ea77e443885487eae0eb3bcbb0f2d SHA512 c0e23d742a4e37b86f69e7096eba95e0c41619e2a459d526f5ede31ec73d2cfc14b3660fd1741c68e40d2ddb9bfd7c4250f275edea3965e1077b1a482a788f10
+AUX lha-114i-file-list-from-stdin.patch 999 BLAKE2B f039b70dfbb82f9d2ada3df90621b4a10117c33e4a201c5f22f8093ede4da5ace496af62b24af0c7f59a8ab28a10afbb6cc2be4ccd1c427f5a4e796455f8cf69 SHA512 28c79640e0bc1b7e7e29f06bea319ebdb594568d5752f1067db472d054c91101fd5d9d769448e32463025d162adf70fd067a161a9aa4ad1b1e38aa0e8023173e
+AUX lha-114i-fix-getopt_long-declaration.patch 263 BLAKE2B d5b53f0624a9b039167289f32369ba2b2905e8a223201404ba8d9a63d1a2fd9cb73f7e5d40fc2a14bcb510a4e49905545947bb21cfd38871e80c92591ba0007b SHA512 0216d24e001b7dc0db179d8e809fa838fd1d1d965e7d3f4ead79b9b276c39ee2666d6268fd835f9ce35664452d662aaadeeab00cb121f3485765db4c6be9d145
 DIST lha-1.14i-ac20050924p1.tar.gz 285518 BLAKE2B 7e10ee4cfaeb7212f9dfbe254d33ec7b97bce41a042eed3d6f826790650f5059a19d2a334cc41a86112ba8d80904168a0b3c2785e7670577b2bda0b4d27f0dcc SHA512 efe43d407d273f8f724f7b205223bd122c76adac4b67ad5e9811e88cae03f1f3c3af4297aa6f24951a02558975bbafacf697e97ab0da578b4e0115b89237566f
 EBUILD lha-114i-r7.ebuild 991 BLAKE2B af079ce8bcb696d6f7486c14e4faae0d4767e81556c85dd0c8ecf96e33d4d979b696af26c27abb7598e4410355193e2cd550d0342c555214f71fced05e86b674 SHA512 58af6daefe2f32f9479496811c78e0b224196da43f798d9734ee2bb4e78fcefd143bd2b01b409c8aeb1a736e6eae3548ef483e4a829b0a5a8d52dd226426a1e5
 EBUILD lha-114i-r8.ebuild 1147 BLAKE2B d8d4589cd5130d531750633b00553f98a59da7c7cbdb77750478a3bb3b6fb5f87a477f1bb524c972cd81c34189006d2371117df5c96b75be799e3f06079daee3 SHA512 fc3be81aba9e9f7d9a27c753ea187790956dcec389a890e6d06e939c0aafdc88a0b7e579f05f57809950f88bc32777b10ad3948b95fe27a41cecfd149ef08544
+EBUILD lha-114i-r9.ebuild 1145 BLAKE2B 3782520dd549dd9e8acef29baa3c9c6dd7913fbaa979388525d76e6e96dc40a0d810510c6b72764346de8ab1be7224095f73f84a5cc81039183c7eca6b91a3dd SHA512 15b7be4b3feb1d850f6e3c7d95f889cdc236d448bc76f7a663a4ccaf99e0a48dc8992c2cb7827b2b39d75c8c4e9a8f036c41dd73eaf6315e800b17d12f4af43f
 MISC metadata.xml 534 BLAKE2B 861f00b0b2b6c547ba122d9dbc9da0d9b84bd49b553a2c8f2d2fa5dd7ef7dcd86caca75292a825dccb74becd7ad8c34a4f9cbe71cd5096ba7617953c4f612c7c SHA512 499669685613b31d118c1878fda13c25551d13eedb1532507d2952a490725b1083dd16aaf4d6927bb2cc8ca859c2d29e1a064d15f9d4e099108ad7ea80fc040f
diff --git a/app-arch/lha/files/lha-114i-file-list-from-stdin.patch b/app-arch/lha/files/lha-114i-file-list-from-stdin.patch
index 4bd0d17d7527..d29f8d20bc8d 100644
--- a/app-arch/lha/files/lha-114i-file-list-from-stdin.patch
+++ b/app-arch/lha/files/lha-114i-file-list-from-stdin.patch
@@ -1,7 +1,7 @@
 Index: src/lharc.c
 ===================================================================
---- src/lharc.c	(revision 773)
-+++ src/lharc.c	(working copy)
+--- a/src/lharc.c	(revision 773)
++++ b/src/lharc.c	(working copy)
 @@ -561,7 +561,7 @@
          if (!isatty(1) && cmd == CMD_ADD)
              quiet = TRUE;
@@ -13,8 +13,8 @@ Index: src/lharc.c
              /* Bug(?) on MinGW, isatty() return 0 on Cygwin console.
 Index: configure.ac
 ===================================================================
---- configure.ac	(revision 773)
-+++ configure.ac	(working copy)
+--- a/configure.ac	(revision 773)
++++ b/configure.ac	(working copy)
 @@ -289,6 +289,11 @@
  	    [Define to 1 if you want to ignore dot files with -X command line switch])
  fi
diff --git a/app-arch/lha/files/lha-114i-fix-getopt_long-declaration.patch b/app-arch/lha/files/lha-114i-fix-getopt_long-declaration.patch
index b57a1c9c6158..3c3b7dfd94c5 100644
--- a/app-arch/lha/files/lha-114i-fix-getopt_long-declaration.patch
+++ b/app-arch/lha/files/lha-114i-fix-getopt_long-declaration.patch
@@ -1,5 +1,5 @@
---- src/getopt_long.c.orig      2013-12-18 16:05:59.789413528 -0600
-+++ src/getopt_long.c   2013-12-18 16:06:01.200420472 -0600
+--- a/src/getopt_long.c   2013-12-18 16:05:59.789413528 -0600
++++ b/src/getopt_long.c   2013-12-18 16:06:01.200420472 -0600
 @@ -64,7 +64,7 @@
  
  #ifndef USE_GNU
diff --git a/app-arch/lha/lha-114i-r9.ebuild b/app-arch/lha/lha-114i-r9.ebuild
new file mode 100644
index 000000000000..fc3cd93847f4
--- /dev/null
+++ b/app-arch/lha/lha-114i-r9.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+MY_P="${PN}-1.14i-ac20050924p1"
+
+DESCRIPTION="Utility for creating and opening lzh archives"
+HOMEPAGE="https://lha.osdn.jp https://github.com/jca02266/lha"
+SRC_URI="mirror://sourceforge.jp/${PN}/22231/${MY_P}.tar.gz"
+
+LICENSE="lha"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-file-list-from-stdin.patch
+	"${FILESDIR}"/${P}-fix-getopt_long-declaration.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e '/^AM_C_PROTOTYPES/d' \
+		-e 's/^AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
+		-i configure.ac || die #423125, 467544
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DPROTOTYPES #423125
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		export ac_cv_header_inttypes_h=no
+		export ac_cv_func_iconv=no
+	fi
+
+	econf
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		mandir="${EPREFIX}"/usr/share/man/ja \
+		install
+
+	dodoc ChangeLog Hacking_of_LHa
+}