Respect CFLAGS #432204; Convert to EAPI=4

(Portage version: 2.2.0_alpha123/cvs/Linux x86_64)

3 files changed, 34 insertions, 12 deletions

diff --git a/app-i18n/mecab-skkserv/ChangeLog b/app-i18n/mecab-skkserv/ChangeLog
index 027e069dcb2a..80ed731a1969 100644
--- a/app-i18n/mecab-skkserv/ChangeLog
+++ b/app-i18n/mecab-skkserv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/mecab-skkserv
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/mecab-skkserv/ChangeLog,v 1.5 2012/06/01 00:19:37 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/mecab-skkserv/ChangeLog,v 1.6 2012/08/28 07:32:45 naota Exp $
+
+  28 Aug 2012; Naohiro Aota <naota@gentoo.org>
+  +files/mecab-skkserv-0.03-cflags.patch, mecab-skkserv-0.03.ebuild:
+  Respect CFLAGS #432204; Convert to EAPI=4
 
   01 Jun 2012; Zac Medico <zmedico@gentoo.org> mecab-skkserv-0.03.ebuild:
   inherit multilib for get_libdir
@@ -23,4 +27,3 @@
   02 Apr 2005; Mamoru KOMACHI <usata@gentoo.org> +files/mecab-skkserv,
   +metadata.xml, +mecab-skkserv-0.02.ebuild:
   Initial import. Thanks to bashi <bashi@dream.ie.ariake-nct.ac.jp>.
-
diff --git a/app-i18n/mecab-skkserv/files/mecab-skkserv-0.03-cflags.patch b/app-i18n/mecab-skkserv/files/mecab-skkserv-0.03-cflags.patch
new file mode 100644
index 000000000000..6144d69f2823
--- /dev/null
+++ b/app-i18n/mecab-skkserv/files/mecab-skkserv-0.03-cflags.patch
@@ -0,0 +1,15 @@
+diff --git a/configure.in b/configure.in
+index c7c00aa..a2c7a9e 100644
+--- a/configure.in
++++ b/configure.in
+@@ -19,8 +19,8 @@ AC_CHECK_FUNCS(getopt)
+ AC_CHECK_FUNCS(getopt_long)
+ 
+ if test -n "$GCC"; then
+-   CFLAGS="-O3  -Wno-deprecated -Wall"
+-   CXXFLAGS="-O3 -Wno-deprecated -Wall"
++   CFLAGS+=" -Wno-deprecated -Wall"
++   CXXFLAGS+=" -Wno-deprecated -Wall"
+ fi
+ 
+ AC_ARG_WITH(
diff --git a/app-i18n/mecab-skkserv/mecab-skkserv-0.03.ebuild b/app-i18n/mecab-skkserv/mecab-skkserv-0.03.ebuild
index 47cd3208619f..71b32ff2e5fa 100644
--- a/app-i18n/mecab-skkserv/mecab-skkserv-0.03.ebuild
+++ b/app-i18n/mecab-skkserv/mecab-skkserv-0.03.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/mecab-skkserv/mecab-skkserv-0.03.ebuild,v 1.3 2012/06/01 00:19:37 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/mecab-skkserv/mecab-skkserv-0.03.ebuild,v 1.4 2012/08/28 07:32:45 naota Exp $
 
-inherit eutils multilib
+EAPI=4
+
+inherit multilib autotools-utils
 
 DESCRIPTION="mecab-skkserv is a Kana-Kanji conversion server using MeCab."
 HOMEPAGE="http://chasen.org/~taku/software/mecab-skkserv/"
@@ -18,18 +20,20 @@ DEPEND=">=app-text/mecab-0.91"
 RDEPEND="${DEPEND}
 	sys-apps/xinetd"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e "/^dictdir/s@lib@$(get_libdir)@" Makefile* || die
+DOCS=( README NEWS AUTHORS )
+HTML_DOCS=( index.html )
+PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_prepare() {
+	sed -i -e "/^dictdir/s@lib@$(get_libdir)@" Makefile.am || die
+	autotools-utils_src_prepare
 }
 
 src_install() {
-
-	emake DESTDIR="${D}" install || die "einstall failed."
+	autotools-utils_src_install
 
 	# for running skkserv from xinetd
 	insinto /etc/xinetd.d; doins "${FILESDIR}"/mecab-skkserv || die
-	dodoc README NEWS AUTHORS
-	dohtml index.html
 }