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 92A451382C5 for ; Tue, 27 Mar 2018 23:36:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A06CCE07BA; Tue, 27 Mar 2018 23:36:09 +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 692FAE07BA for ; Tue, 27 Mar 2018 23:36:09 +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 E5976335C8D for ; Tue, 27 Mar 2018 23:36:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D80DF25C for ; Tue, 27 Mar 2018 23:36:05 +0000 (UTC) From: "Aaron Bauman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" Message-ID: <1522193747.11c05efb7def362bff4e89bb6525a2c6efa846ec.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-accessibility/emacspeak/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild app-accessibility/emacspeak/emacspeak-9999.ebuild X-VCS-Directories: app-accessibility/emacspeak/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: 11c05efb7def362bff4e89bb6525a2c6efa846ec X-VCS-Branch: master Date: Tue, 27 Mar 2018 23:36:05 +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: 4110a112-bd8c-4a32-b68a-63e2792ac907 X-Archives-Hash: 1bbc35207bfdbdb0defa2e71958b3315 commit: 11c05efb7def362bff4e89bb6525a2c6efa846ec Author: Marty E. Plummer startmail com> AuthorDate: Thu Mar 22 12:30:15 2018 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Tue Mar 27 23:35:47 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11c05efb app-accessibility/emacspeak: EAPI bump Package-Manager: Portage-2.3.24, Repoman-2.3.6 .../emacspeak/emacspeak-39.0-r2.ebuild | 23 ++++++++++------------ app-accessibility/emacspeak/emacspeak-9999.ebuild | 19 ++++++++---------- 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild b/app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild index b720e3de787..daa09b1d531 100644 --- a/app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild +++ b/app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 NEED_EMACS=24 FORCE_PRINT_ELOG=1 DISABLE_AUTOFORMATTING=1 -inherit eutils readme.gentoo elisp +inherit elisp readme.gentoo-r1 if [[ ${PV} == "9999" ]] ; then - ESVN_REPO_URI="https://${PN}.googlecode.com/svn/trunk" - inherit subversion + EGIT_REPO_URI="https://github.com/tvraman/emacspeak.git" + inherit git-r3 else SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2" KEYWORDS="amd64 ppc x86" @@ -22,7 +22,7 @@ LICENSE="BSD GPL-2" SLOT="0" IUSE="+espeak" - DEPEND="espeak? ( app-accessibility/espeak )" +DEPEND="espeak? ( app-accessibility/espeak )" RDEPEND="${DEPEND} >=dev-tcltk/tclx-8.4" @@ -35,10 +35,7 @@ by adding the following to your ~/.emacs file: (load "/usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el") ' -src_prepare() { - # Allow user patches to be applied without modifying the ebuild - epatch_user -} +HTML_DOCS=( install-guide user-guide ) src_configure() { emake config @@ -51,7 +48,7 @@ src_compile() { if [[ -z $tcl_version ]]; then die 'Unable to detect the installed version of dev-lang/tcl.' fi - cd servers/linux-espeak + cd servers/linux-espeak || die emake TCL_VERSION="${tcl_version}" fi } @@ -72,8 +69,8 @@ src_install() { popd > /dev/null || die fi dodoc README etc/NEWS* etc/FAQ etc/COPYRIGHT - dohtml -r install-guide user-guide - cd "${D}/usr/share/emacs/site-lisp/${PN}" + einstalldocs + cd "${D}/usr/share/emacs/site-lisp/${PN}" || die rm -rf README etc/NEWS* etc/FAQ etc/COPYRIGHT install-guide \ user-guide || die readme.gentoo_create_doc diff --git a/app-accessibility/emacspeak/emacspeak-9999.ebuild b/app-accessibility/emacspeak/emacspeak-9999.ebuild index 203cdea8432..67a6062698b 100644 --- a/app-accessibility/emacspeak/emacspeak-9999.ebuild +++ b/app-accessibility/emacspeak/emacspeak-9999.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 NEED_EMACS=24 FORCE_PRINT_ELOG=1 DISABLE_AUTOFORMATTING=1 -inherit eutils readme.gentoo elisp +inherit elisp readme.gentoo-r1 if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/tvraman/emacspeak.git" @@ -22,7 +22,7 @@ LICENSE="BSD GPL-2" SLOT="0" IUSE="+espeak" - DEPEND="espeak? ( app-accessibility/espeak )" +DEPEND="espeak? ( app-accessibility/espeak )" RDEPEND="${DEPEND} >=dev-tcltk/tclx-8.4" @@ -35,10 +35,7 @@ by adding the following to your ~/.emacs file: (load "/usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el") ' -src_prepare() { - # Allow user patches to be applied without modifying the ebuild - epatch_user -} +HTML_DOCS=( install-guide user-guide ) src_configure() { emake config @@ -51,7 +48,7 @@ src_compile() { if [[ -z $tcl_version ]]; then die 'Unable to detect the installed version of dev-lang/tcl.' fi - cd servers/linux-espeak + cd servers/linux-espeak || die emake TCL_VERSION="${tcl_version}" fi } @@ -72,8 +69,8 @@ src_install() { popd > /dev/null || die fi dodoc README etc/NEWS* etc/FAQ etc/COPYRIGHT - dohtml -r install-guide user-guide - cd "${D}/usr/share/emacs/site-lisp/${PN}" + einstalldocs + cd "${D}/usr/share/emacs/site-lisp/${PN}" || die rm -rf README etc/NEWS* etc/FAQ etc/COPYRIGHT install-guide \ user-guide || die readme.gentoo_create_doc