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 13BF6139694 for ; Thu, 20 Jul 2017 13:44:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 548F5E0D47; Thu, 20 Jul 2017 13:44:23 +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 25C6BE0D47 for ; Thu, 20 Jul 2017 13:44:22 +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 BE0B53416EB for ; Thu, 20 Jul 2017 13:44:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AC91774A6 for ; Thu, 20 Jul 2017 13:44:19 +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: <1500558090.d91658c607b4d4147e5c75c65b7f1baed5dd8776.hattya@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emacs/yc/, app-emacs/yc/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emacs/yc/files/50yc-gentoo.el app-emacs/yc/files/sample.dot.emacs app-emacs/yc/files/sample.dot.emacs-4 app-emacs/yc/metadata.xml app-emacs/yc/yc-4.0.13.ebuild X-VCS-Directories: app-emacs/yc/files/ app-emacs/yc/ X-VCS-Committer: hattya X-VCS-Committer-Name: Akinori Hattori X-VCS-Revision: d91658c607b4d4147e5c75c65b7f1baed5dd8776 X-VCS-Branch: master Date: Thu, 20 Jul 2017 13:44:19 +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: e6fecea1-0dfc-4e6f-aa93-9c566ee16ae8 X-Archives-Hash: cee2b9f620434fda19b449d8ebfa369c commit: d91658c607b4d4147e5c75c65b7f1baed5dd8776 Author: Akinori Hattori gentoo org> AuthorDate: Thu Jul 20 13:41:30 2017 +0000 Commit: Akinori Hattori gentoo org> CommitDate: Thu Jul 20 13:41:30 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d91658c6 app-emacs/yc: update to EAPI 6 Gentoo-Bug: 621518 Package-Manager: Portage-2.3.6, Repoman-2.3.1 app-emacs/yc/files/50yc-gentoo.el | 3 -- .../files/{sample.dot.emacs-4 => sample.dot.emacs} | 0 app-emacs/yc/metadata.xml | 16 ++++---- app-emacs/yc/yc-4.0.13.ebuild | 48 +++++++++++----------- 4 files changed, 31 insertions(+), 36 deletions(-) diff --git a/app-emacs/yc/files/50yc-gentoo.el b/app-emacs/yc/files/50yc-gentoo.el index 33bd4a72a45..431f7e90ae7 100644 --- a/app-emacs/yc/files/50yc-gentoo.el +++ b/app-emacs/yc/files/50yc-gentoo.el @@ -1,4 +1 @@ - -;;; YC site-lisp configuration - (add-to-list 'load-path "@SITELISP@") diff --git a/app-emacs/yc/files/sample.dot.emacs-4 b/app-emacs/yc/files/sample.dot.emacs similarity index 100% rename from app-emacs/yc/files/sample.dot.emacs-4 rename to app-emacs/yc/files/sample.dot.emacs diff --git a/app-emacs/yc/metadata.xml b/app-emacs/yc/metadata.xml index 02fb2539160..2c9ca3c416d 100644 --- a/app-emacs/yc/metadata.xml +++ b/app-emacs/yc/metadata.xml @@ -1,12 +1,12 @@ - - gnu-emacs@gentoo.org - Gentoo GNU Emacs project - - - cjk@gentoo.org - Cjk - + + gnu-emacs@gentoo.org + Gentoo GNU Emacs project + + + cjk@gentoo.org + Cjk + diff --git a/app-emacs/yc/yc-4.0.13.ebuild b/app-emacs/yc/yc-4.0.13.ebuild index f2724d97396..a8179e6426b 100644 --- a/app-emacs/yc/yc-4.0.13.ebuild +++ b/app-emacs/yc/yc-4.0.13.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=3 +EAPI="6" inherit elisp toolchain-funcs @@ -14,42 +14,40 @@ SLOT="0" KEYWORDS="alpha ~amd64 ppc x86" IUSE="" -DEPEND="" -RDEPEND=">=app-i18n/canna-3.6" +RDEPEND="app-i18n/canna" SITEFILE="50${PN}-gentoo.el" src_prepare() { - sed -e 's:$(CC) -o $(PROGRAM) $(OBJS):$(CC) ${CFLAGS} ${LDFLAGS} -o $(PROGRAM) $(OBJS):' -i Makefile || die + sed -i '/$(CC)/s/ -o / $(CFLAGS) $(LDFLAGS) -o /' Makefile + + default } src_compile() { - emake CC="$(tc-getCC)" || die + emake CC="$(tc-getCC)" } src_install() { - elisp-install ${PN} *.el *.elc || die - elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die - dobin icanna || die - newdoc "${FILESDIR}"/sample.dot.emacs-4 sample.dot.emacs || die - dodoc "${FILESDIR}"/sample.hosts.canna || die + elisp_src_install + + dobin icanna + dodoc "${FILESDIR}"/sample.{dot.emacs,hosts.canna} } pkg_postinst() { - elisp-site-regen - elog "See the sample.dot.emacs file in /usr/share/doc/${PF}/." + elisp_pkg_postinst + + elog "See the sample.dot.emacs in ${EPREFIX}/usr/share/doc/${PF}." elog - elog "And If you use unix domain socket for connecting the canna server, " - elog " please confirm that there's *no* following line in your .emacs ." - elog " (setq yc-server-host \"localhost\")" + elog "And If you use unix domain socket for connecting the canna server," + elog "please confirm that there's *no* following line in your ~/.emacs:" + elog ' (setq yc-server-host "localhost")' elog - elog "If you use inet domain socket for connecting the canna server, " - elog " please modify as following in /etc/conf.d/canna." - elog " CANNASERVER_OPTS=\"-inet\"" - elog " And create /etc/hosts.canna." - elog " (see the sample.hosts.canna file in /usr/share/doc/${PF}/)" -} - -pkg_postrm() { - elisp-site-regen + elog "If you use inet domain socket for connecting the canna server," + elog "please modify as following in ${EPREFIX}/etc/conf.d/canna:" + elog ' CANNASERVER_OPTS="-inet"' + elog + elog "And create ${EPREFIX}/etc/hosts.canna." + elog "See the sample.hosts.canna in ${EPREFIX}/usr/share/doc/${PF}." }