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 8425E138330 for ; Thu, 31 May 2018 13:23:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1C9D9E090E; Thu, 31 May 2018 13:23:06 +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 C7BF3E0841 for ; Thu, 31 May 2018 13:23:05 +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 308B0335C43 for ; Thu, 31 May 2018 13:23:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8CB45287 for ; Thu, 31 May 2018 13:23:02 +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: <1527772976.d1818df330a374f668db868f1be2086839530d5b.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-accessibility/yasr/files/, app-accessibility/yasr/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-accessibility/yasr/files/yasr-0.6.9-automake113.patch app-accessibility/yasr/files/yasr-0.6.9-gcc43.patch app-accessibility/yasr/files/yasr-0.6.9-gettext018.patch app-accessibility/yasr/files/yasr-0.6.9-gettext019.patch app-accessibility/yasr/files/yasr-0.6.9-remove-m4.patch app-accessibility/yasr/yasr-0.6.9-r1.ebuild X-VCS-Directories: app-accessibility/yasr/ app-accessibility/yasr/files/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: d1818df330a374f668db868f1be2086839530d5b X-VCS-Branch: master Date: Thu, 31 May 2018 13:23:02 +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: d9462c81-1451-4bd8-b09e-2c4512cbe08c X-Archives-Hash: ad12e7079b4fffd76600388c04f8ca46 commit: d1818df330a374f668db868f1be2086839530d5b Author: Marty E. Plummer startmail com> AuthorDate: Thu Mar 22 15:10:41 2018 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Thu May 31 13:22:56 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1818df3 app-accessibility/yasr: EAPI bump and patches cleanup Bump EAPI to 6, cleanup patches, remove eutils, move dosed from src_install to src_prepare (and change it to normal sed -i), allow building with sys-devel/gettext-0.19.8.1 Package-Manager: Portage-2.3.24, Repoman-2.3.6 Closes: https://github.com/gentoo/gentoo/pull/7583 .../yasr/files/yasr-0.6.9-automake113.patch | 2 -- .../yasr/files/yasr-0.6.9-gcc43.patch | 5 ++- ...ettext018.patch => yasr-0.6.9-gettext019.patch} | 4 +-- .../yasr/files/yasr-0.6.9-remove-m4.patch | 10 +++--- app-accessibility/yasr/yasr-0.6.9-r1.ebuild | 42 +++++++++++----------- 5 files changed, 29 insertions(+), 34 deletions(-) diff --git a/app-accessibility/yasr/files/yasr-0.6.9-automake113.patch b/app-accessibility/yasr/files/yasr-0.6.9-automake113.patch index 2fbc32c2e98..0697a17fdc3 100644 --- a/app-accessibility/yasr/files/yasr-0.6.9-automake113.patch +++ b/app-accessibility/yasr/files/yasr-0.6.9-automake113.patch @@ -1,5 +1,3 @@ -diff --git a/configure.in b/configure.in -index d78e8b2..15e8666 100644 --- a/configure.in +++ b/configure.in @@ -2,11 +2,10 @@ dnl Process this file with autoconf to produce a configure script. diff --git a/app-accessibility/yasr/files/yasr-0.6.9-gcc43.patch b/app-accessibility/yasr/files/yasr-0.6.9-gcc43.patch index ee2b1a6ef7b..ccff0009e9e 100644 --- a/app-accessibility/yasr/files/yasr-0.6.9-gcc43.patch +++ b/app-accessibility/yasr/files/yasr-0.6.9-gcc43.patch @@ -1,6 +1,5 @@ -diff -NrU5 yasr-0.6.9.orig/yasr/yasr.h yasr-0.6.9/yasr/yasr.h ---- yasr-0.6.9.orig/yasr/yasr.h 2008-06-29 01:23:44.000000000 +0200 -+++ yasr-0.6.9/yasr/yasr.h 2008-06-29 01:37:00.000000000 +0200 +--- a/yasr/yasr.h ++++ b/yasr/yasr.h @@ -306,22 +306,10 @@ extern void opt_say(int num, int flag); extern void opt_set(int num, void *val); diff --git a/app-accessibility/yasr/files/yasr-0.6.9-gettext018.patch b/app-accessibility/yasr/files/yasr-0.6.9-gettext019.patch similarity index 62% rename from app-accessibility/yasr/files/yasr-0.6.9-gettext018.patch rename to app-accessibility/yasr/files/yasr-0.6.9-gettext019.patch index 26337dbc673..89b2adfcd45 100644 --- a/app-accessibility/yasr/files/yasr-0.6.9-gettext018.patch +++ b/app-accessibility/yasr/files/yasr-0.6.9-gettext019.patch @@ -1,5 +1,3 @@ -diff --git a/configure.in b/configure.in -index c26f577..d78e8b2 100644 --- a/configure.in +++ b/configure.in @@ -57,7 +57,7 @@ fi @@ -7,7 +5,7 @@ index c26f577..d78e8b2 100644 AM_GNU_GETTEXT(external) -AM_GNU_GETTEXT_VERSION([0.17]) -+AM_GNU_GETTEXT_VERSION([0.18.1]) ++AM_GNU_GETTEXT_VERSION([0.19]) AC_OUTPUT([ m4/Makefile Makefile diff --git a/app-accessibility/yasr/files/yasr-0.6.9-remove-m4.patch b/app-accessibility/yasr/files/yasr-0.6.9-remove-m4.patch index fa05f0791fc..4c2a345df58 100644 --- a/app-accessibility/yasr/files/yasr-0.6.9-remove-m4.patch +++ b/app-accessibility/yasr/files/yasr-0.6.9-remove-m4.patch @@ -1,6 +1,5 @@ -diff -Naur yasr-0.6.9.orig/Makefile.am yasr-0.6.9/Makefile.am ---- yasr-0.6.9.orig/Makefile.am 2008-02-02 06:44:05.000000000 -0600 -+++ yasr-0.6.9/Makefile.am 2009-02-06 08:37:07.000000000 -0600 +--- a/Makefile.am ++++ b/Makefile.am @@ -7,7 +7,6 @@ SUBDIRS = \ @@ -14,9 +13,8 @@ diff -Naur yasr-0.6.9.orig/Makefile.am yasr-0.6.9/Makefile.am README-ru -ACLOCAL_AMFLAGS = -I m4 -diff -Naur yasr-0.6.9.orig/configure.in yasr-0.6.9/configure.in ---- yasr-0.6.9.orig/configure.in 2008-02-02 07:09:04.000000000 -0600 -+++ yasr-0.6.9/configure.in 2009-02-06 08:36:43.000000000 -0600 +--- a/configure.in ++++ b/configure.in @@ -59,8 +59,7 @@ AM_GNU_GETTEXT(external) AM_GNU_GETTEXT_VERSION([0.17]) diff --git a/app-accessibility/yasr/yasr-0.6.9-r1.ebuild b/app-accessibility/yasr/yasr-0.6.9-r1.ebuild index 2bf8a4603be..9c0ccb97b09 100644 --- a/app-accessibility/yasr/yasr-0.6.9-r1.ebuild +++ b/app-accessibility/yasr/yasr-0.6.9-r1.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=2 -inherit autotools eutils +EAPI=6 -DESCRIPTION="general-purpose console screen reader" +inherit autotools + +DESCRIPTION="General-purpose console screen reader" HOMEPAGE="http://yasr.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" @@ -16,16 +17,27 @@ IUSE="nls" RDEPEND="" DEPEND="nls? ( sys-devel/gettext )" +PATCHES=( + "${FILESDIR}"/${PN}-0.6.9-automake113.patch + "${FILESDIR}"/${PN}-0.6.9-gettext019.patch + "${FILESDIR}"/${PN}-0.6.9-gcc43.patch + "${FILESDIR}"/${PN}-0.6.9-remove-m4.patch +) + src_prepare() { + default local x=/usr/share/gettext/po/Makefile.in.in - [[ -e $x ]] && cp -f $x po/ #330879 + [[ -e $x ]] && cp -f $x po/ || die #330879 + + rm -r "${S}"/m4 || die - epatch "${FILESDIR}"/${P}-automake113.patch \ - "${FILESDIR}"/${P}-gettext018.patch \ - "${FILESDIR}"/${P}-gcc43.patch \ - "${FILESDIR}"/${P}-remove-m4.patch + sed -i \ + 's:^\(synthesizer=emacspeak server\):#\1: + s:^\(synthesizer port=|/usr/local/bin/eflite\):#\1: + s:^#\(synthesizer=speech dispatcher\):\1: + s:^#\(synthesizer port=127.0.0.1.6560\):\1:' yasr.conf || die - rm -r "${S}"/m4 + mv configure.{in,ac} || die eautoreconf } @@ -36,16 +48,6 @@ src_configure() { $(use_enable nls) } -src_install() { - emake DESTDIR="${D}" install || die - dodoc README ChangeLog AUTHORS BUGS CREDITS - dosed \ - 's:^\(synthesizer=emacspeak server\):#\1: - s:^\(synthesizer port=|/usr/local/bin/eflite\):#\1: - s:^#\(synthesizer=speech dispatcher\):\1: - s:^#\(synthesizer port=127.0.0.1.6560\):\1:' /etc/yasr/yasr.conf -} - pkg_postinst() { elog elog "Speech-dispatcher is configured as the default synthesizer for yasr."