[gentoo-commits] repo/gentoo:master commit in: app-accessibility/yasr/

2022-04-07 Thread Jakov Smolić
commit: 41bcf6aef13afebfb087728d4f860665c7845b84
Author: Atharva Amritkar  protonmail  com>
AuthorDate: Sun Apr  3 18:12:27 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Apr  7 15:30:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41bcf6ae

app-accessibility/yasr: Keyword 0.6.9-r1 for ~riscv

Signed-off-by: Atharva Amritkar  protonmail.com>
Signed-off-by: Jakov Smolić  gentoo.org>

 app-accessibility/yasr/yasr-0.6.9-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-accessibility/yasr/yasr-0.6.9-r1.ebuild 
b/app-accessibility/yasr/yasr-0.6.9-r1.ebuild
index 3d1abf962f25..9730215c65cd 100644
--- a/app-accessibility/yasr/yasr-0.6.9-r1.ebuild
+++ b/app-accessibility/yasr/yasr-0.6.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ppc ~riscv x86"
 IUSE="nls"
 
 BDEPEND="nls? ( sys-devel/gettext )"



[gentoo-commits] repo/gentoo:master commit in: app-accessibility/yasr/

2021-04-01 Thread Sam James
commit: c69b1fa0eef6875e200f8c7343b5d2c4ac82551e
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 23:20:51 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr  1 21:17:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c69b1fa0

app-accessibility/yasr: make NLS fully optional

Bug: https://bugs.gentoo.org/330879
Signed-off-by: Sam James  gentoo.org>

 app-accessibility/yasr/yasr-0.6.9-r1.ebuild | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app-accessibility/yasr/yasr-0.6.9-r1.ebuild 
b/app-accessibility/yasr/yasr-0.6.9-r1.ebuild
index 1c7e089be17..3d1abf962f2 100644
--- a/app-accessibility/yasr/yasr-0.6.9-r1.ebuild
+++ b/app-accessibility/yasr/yasr-0.6.9-r1.ebuild
@@ -26,9 +26,11 @@ PATCHES=(
 src_prepare() {
default
 
-   local x="${BROOT}"/usr/share/gettext/po/Makefile.in.in
-   # bug 330879
-   [[ -e $x ]] && cp -f $x po/ || die
+   if use nls ; then
+   local x="${BROOT}"/usr/share/gettext/po/Makefile.in.in
+   # bug 330879
+   [[ -e $x ]] && cp -f $x po/ || die
+   fi
 
rm -r "${S}"/m4 || die
 



[gentoo-commits] repo/gentoo:master commit in: app-accessibility/yasr/

2021-04-01 Thread Sam James
commit: 10c2f5e418230f74c29ee7338a7369fb1b27d351
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 23:19:57 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr  1 21:17:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10c2f5e4

app-accessibility/yasr: port to EAPI 7, fix Prefix install

Signed-off-by: Sam James  gentoo.org>

 app-accessibility/yasr/yasr-0.6.9-r1.ebuild | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app-accessibility/yasr/yasr-0.6.9-r1.ebuild 
b/app-accessibility/yasr/yasr-0.6.9-r1.ebuild
index b9e8c1573d6..1c7e089be17 100644
--- a/app-accessibility/yasr/yasr-0.6.9-r1.ebuild
+++ b/app-accessibility/yasr/yasr-0.6.9-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="nls"
 
-RDEPEND=""
-DEPEND="nls? ( sys-devel/gettext )"
+BDEPEND="nls? ( sys-devel/gettext )"
 
 PATCHES=(
"${FILESDIR}"/${PN}-0.6.9-automake113.patch
@@ -26,8 +25,10 @@ PATCHES=(
 
 src_prepare() {
default
-   local x=/usr/share/gettext/po/Makefile.in.in
-   [[ -e $x ]] && cp -f $x po/ || die #330879
+
+   local x="${BROOT}"/usr/share/gettext/po/Makefile.in.in
+   # bug 330879
+   [[ -e $x ]] && cp -f $x po/ || die
 
rm -r "${S}"/m4 || die
 
@@ -50,5 +51,5 @@ src_configure() {
 pkg_postinst() {
elog
elog "Speech-dispatcher is configured as the default synthesizer for 
yasr."
-   elog "If this is not what you want, edit /etc/yasr/yasr.conf."
+   elog "If this is not what you want, edit ${EROOT}/etc/yasr/yasr.conf."
 }



[gentoo-commits] repo/gentoo:master commit in: app-accessibility/yasr/

2018-05-31 Thread Aaron Bauman
commit: a2c39442796e404a5408eb2348a784c0db3f5f69
Author: Aaron Bauman  gentoo  org>
AuthorDate: Thu May 31 13:22:31 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Thu May 31 13:22:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2c39442

app-accessibility/yasr: cleanup src_configure

Drop dependency-tracking as it is default now.  Add EPREFIX as well.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-accessibility/yasr/yasr-0.6.9-r1.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app-accessibility/yasr/yasr-0.6.9-r1.ebuild 
b/app-accessibility/yasr/yasr-0.6.9-r1.ebuild
index 9c0ccb97b09..b9e8c1573d6 100644
--- a/app-accessibility/yasr/yasr-0.6.9-r1.ebuild
+++ b/app-accessibility/yasr/yasr-0.6.9-r1.ebuild
@@ -43,8 +43,7 @@ src_prepare() {
 
 src_configure() {
econf \
-   --datadir=/etc \
-   --disable-dependency-tracking \
+   --datadir="${EPREFIX}"/etc \
$(use_enable nls)
 }
 



[gentoo-commits] repo/gentoo:master commit in: app-accessibility/yasr/files/, app-accessibility/yasr/

2018-05-31 Thread Aaron Bauman
commit: d1818df330a374f668db868f1be2086839530d5b
Author: Marty E. Plummer  startmail  com>
AuthorDate: Thu Mar 22 15:10:41 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Thu May 31 13:22:56 2018 +
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.h2008-06-29 01:23:44.0 +0200
-+++ yasr-0.6.9/yasr/yasr.h 2008-06-29 01:37:00.0 +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.am2008-02-02 06:44:05.0 -0600
-+++ yasr-0.6.9/Makefile.am 2009-02-06 08:37:07.0 -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.0 -0600
-+++ yasr-0.6.9/configure.in2009-02-06 08:36:43.0 -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
+)
+