gentoo resync : 15.12.2017

3 files changed, 23 insertions, 1 deletions

diff --git a/app-i18n/mecab-skkserv/Manifest b/app-i18n/mecab-skkserv/Manifest
index 55c444337b85..9a85987e5c6a 100644
--- a/app-i18n/mecab-skkserv/Manifest
+++ b/app-i18n/mecab-skkserv/Manifest
@@ -1,6 +1,7 @@
 AUX mecab-skkserv-cflags.patch 312 BLAKE2B 015a99b1645a278f59a959db91d52fe15608ebea7ab87edecfff4e56276d594849ed70db9bbfd4d45a0f77d425ed77d69e2475eec0c62e59b4dd0a1e1cc810c2 SHA512 7b3ae93eab4d0a13701c590d7cfd033fb3d34aa085beb59224bcd60823829c87674e0ee8edff2f8d73c204c56be668673e6dabd3ac5f60da34afae927bcc1106
 AUX mecab-skkserv-dicrc.patch 146 BLAKE2B 7bf9969ad1d16f8f8a3cd1a8efaa970795ae3658f58fde4335732c0dd352b281fe9765bb09276cc72df0fbd3ccdf44c91e083b96e5cff71cb9d37e73d70f5ea5 SHA512 9c96b2c71e8c06c1a7e12c5c4952a9202d06943aebb1e96b63d00084f77822af657745dbf2c926358739723444a99be86537d638d3eea5728b4392a22471314d
+AUX mecab-skkserv-getopt.patch 347 BLAKE2B 02332389fb70107d58e45fcb57e8a0883e29bb795e48731d84be74289b6b49fb6e52a75bc0e0bbacc37c7b2e17dc685ee07fe62527b0ad2deb8f632a06331257 SHA512 0edd393e1ed32f1a31778eec668d1f4ec5fd598251473af4e9ba74db71a67298927d973f552d589359dbb29c70f89f9d8e7fdb3e154608199614bf84aa9d438c
 AUX mecab-skkserv.xinetd 238 BLAKE2B cfb09ee995755129def89310cb16c512f030cbc3166bc67fffcb43c7031bc55bb7e582c2076853de5f32c809d4322363a681f085d943839ed387c31b1303a8aa SHA512 181ab3fb6abe4f4d7555db674881430d6149561459dbaca6fbc5081bfcba2154670e54a383dafd4b3339ed8f412a32d93f3c9024841c3b28c8c00808b5a5f366
 DIST mecab-skkserv-0.03.tar.gz 5398452 BLAKE2B 89327edb34a66e0acc42942bee09d835c5ca7d5834513d818914dbff1c74b838c964f2ddf79a4684dba551a4f0fda0d12f63086f7fac4b68dcddf89831aff44f SHA512 268621035391ec780b8aa04980d668afc83410853d25f06b4578dba3d4e3803ebfea42aabde1325fd80edad7524a4658480e40a00c6bfec1f04310a8d47bb2c9
-EBUILD mecab-skkserv-0.03.ebuild 760 BLAKE2B 3dc4c0dace5498ea4b6447f9d8c3117f0e276825daded362988bb9bd5be8c4f340bb5a6adc876a1d4b7b7cbb965035993068585ea51bdef213a4a1cfffc24007 SHA512 08aba49f5541f55b8eb81468e46c5329a9e1de1e130391367440b1a8cf2a9e57128a4e185ea7a6b472b33bf8421e683b2966edb4b30753fda2fb33548be21b57
+EBUILD mecab-skkserv-0.03.ebuild 823 BLAKE2B d381c7df93dd59a2a72fd5919d18ab1e3c35dfb316c3fe9968ff5ccb8f38e9eecb72ab3faf3a6942178c1676378db44b5c1374478f8f52cf2d786f616a89439e SHA512 66d8b8f387fa031891893f59f244c68200c2d0036758f87c67206f7471d158d52f3b0a24f3498fa4815aa515486f2605ba1010188a8b8e3c07cfec5e46402af8
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/mecab-skkserv/files/mecab-skkserv-getopt.patch b/app-i18n/mecab-skkserv/files/mecab-skkserv-getopt.patch
new file mode 100644
index 000000000000..24b5017a28b3
--- /dev/null
+++ b/app-i18n/mecab-skkserv/files/mecab-skkserv-getopt.patch
@@ -0,0 +1,19 @@
+--- a/mecab-skkserv.cpp
++++ b/mecab-skkserv.cpp
+@@ -33,15 +33,9 @@
+ #include <stdexcept>
+ #include <set>
+ 
+-#ifdef HAVE_GETOPT_H
+-#include <getopt.h>
+-#endif
+-
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+-#endif
+-
+-#if defined HAVE_GETOPT_H && defined HAVE_GETOPT_LONG
++#elif defined(HAVE_GETOPT_H)
+ #include <getopt.h>
+ #else
+ #include "getopt.h"
diff --git a/app-i18n/mecab-skkserv/mecab-skkserv-0.03.ebuild b/app-i18n/mecab-skkserv/mecab-skkserv-0.03.ebuild
index a988749886da..3f49e98dfc96 100644
--- a/app-i18n/mecab-skkserv/mecab-skkserv-0.03.ebuild
+++ b/app-i18n/mecab-skkserv/mecab-skkserv-0.03.ebuild
@@ -21,6 +21,7 @@ RDEPEND="${DEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-cflags.patch
 	"${FILESDIR}"/${PN}-dicrc.patch
+	"${FILESDIR}"/${PN}-getopt.patch
 )
 HTML_DOCS=( index.html ${PN}.css )
 
@@ -28,6 +29,7 @@ src_prepare() {
 	sed -i "/^dictdir/s:lib:$(get_libdir):" Makefile.am
 
 	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }