From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1F294139695 for ; Tue, 18 Jul 2017 13:53:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 61748E0D1F; Tue, 18 Jul 2017 13:53:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2B278E0D14 for ; Tue, 18 Jul 2017 13:53:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0291F341752 for ; Tue, 18 Jul 2017 13:53:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BBCE874B7 for ; Tue, 18 Jul 2017 13:53:32 +0000 (UTC) From: "Akinori Hattori" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Akinori Hattori" Message-ID: <1500385978.93c808484b1d2a4b1b44a82abf0d6d6f6a0da705.hattya@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/freewnn/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild app-i18n/freewnn/metadata.xml X-VCS-Directories: app-i18n/freewnn/ X-VCS-Committer: hattya X-VCS-Committer-Name: Akinori Hattori X-VCS-Revision: 93c808484b1d2a4b1b44a82abf0d6d6f6a0da705 X-VCS-Branch: master Date: Tue, 18 Jul 2017 13:53:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2e61a540-b1c3-4d91-a3d6-d7436894c24a X-Archives-Hash: f0bde35bcf2ffa5be3c43371b7b79c7d commit: 93c808484b1d2a4b1b44a82abf0d6d6f6a0da705 Author: Akinori Hattori gentoo org> AuthorDate: Tue Jul 18 13:38:07 2017 +0000 Commit: Akinori Hattori gentoo org> CommitDate: Tue Jul 18 13:52:58 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93c80848 app-i18n/freewnn: update to EAPI 6 Package-Manager: Portage-2.3.6, Repoman-2.3.1 app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild | 63 ++++++++++++--------------- app-i18n/freewnn/metadata.xml | 14 +++--- 2 files changed, 34 insertions(+), 43 deletions(-) diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild index 0a7b948bba6..39f27f3bf6a 100644 --- a/app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild +++ b/app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild @@ -1,60 +1,51 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit eutils +EAPI="6" MY_P="FreeWnn-${PV/_alpha/-a0}" DESCRIPTION="Network-Extensible Kana-to-Kanji Conversion System" -HOMEPAGE="http://freewnn.sourceforge.jp/ - http://www.freewnn.org/" -SRC_URI="mirror://sourceforge.jp/freewnn/59257/${MY_P}.tar.bz2" +HOMEPAGE="http://freewnn.sourceforge.jp/ http://www.freewnn.org/" +SRC_URI="mirror://sourceforge.jp/${PN}/59257/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="alpha amd64 ~arm64 hppa ia64 ppc ppc64 sparc x86" -IUSE="X ipv6" - -DEPEND="X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt )" -RDEPEND="${DEPEND}" +IUSE="ipv6" S="${WORKDIR}/${MY_P}" -src_prepare() { - #Change WNNOWNER to root so we don't need to add wnn user - # and disable stripping of binary files - sed -i -e "s/WNNOWNER = wnn/WNNOWNER = root/" \ - -e "s/@INSTPGMFLAGS@//" makerule.mk.in \ - -e "s/@LN_S@/ln -sf/" || die - - #bug #318593 +PATCHES=( "${FILESDIR}"/${P}-parallel-build.patch ) +DOCS="ChangeLog* CONTRIBUTORS" - epatch "${FILESDIR}"/${P}-parallel-build.patch #517916 - - # 542534 - sed -i -e "s/egrep -v/egrep -av/" kWnn/kdic/Makefile.in \ - cWnn/tdic/Makefile.in cWnn/cdic/Makefile.in \ - Wnn/pubdicplus/Makefile.in || die +src_prepare() { + default + + sed -i \ + -e "s/WNNOWNER = wnn/WNNOWNER = root/" \ + -e "s/@INSTPGMFLAGS@//" \ + makerule.mk.in + + # bug #542534 + sed -i \ + -e "s/egrep -v/egrep -av/" \ + PubdicPlus/Makefile.in \ + Wnn/pubdicplus/Makefile.in \ + cWnn/[ct]dic/Makefile.in \ + kWnn/kdic/Makefile.in } src_configure() { econf \ + $(use_with ipv6) \ --disable-cWnn \ - --disable-kWnn \ - --without-termcap \ - $(use_with X x) \ - $(use_with ipv6) + --disable-kWnn } src_install() { - # install executables, libs ,dictionaries - emake DESTDIR="${ED}" install || die - # install man pages - emake DESTDIR="${ED}" install.man || die - # install docs - dodoc ChangeLog* CONTRIBUTORS - # install rc script - newinitd "${FILESDIR}"/freewnn.initd freewnn + emake DESTDIR="${D}" install install.man + einstalldocs + + newinitd "${FILESDIR}"/${PN}.initd ${PN} } diff --git a/app-i18n/freewnn/metadata.xml b/app-i18n/freewnn/metadata.xml index a20c4e7b601..b05cbf37299 100644 --- a/app-i18n/freewnn/metadata.xml +++ b/app-i18n/freewnn/metadata.xml @@ -1,11 +1,11 @@ - - cjk@gentoo.org - Cjk - - - freewnn - + + cjk@gentoo.org + Cjk + + + freewnn +