subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: app\-accessibility\/brltty\/files\/"

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

2017-12-06 Thread Michael Palimaka

commit: fd89fb2bb4ed5ed44ef1408d998348f7216b5688
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Mon Dec  4 19:35:48 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Dec  6 13:03:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd89fb2b

app-accessibility/brltty: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/6438

 .../brltty/files/brltty-5.2-major.patch| 59 --
 1 file changed, 59 deletions(-)

diff --git a/app-accessibility/brltty/files/brltty-5.2-major.patch 
b/app-accessibility/brltty/files/brltty-5.2-major.patch
deleted file mode 100644
index 7c591b1cc0e..000
--- a/app-accessibility/brltty/files/brltty-5.2-major.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Bug: https://bugs.gentoo.org/581130
-diff --git a/Programs/system_linux.c b/Programs/system_linux.c
-index c73bd39..ef7d807 100644
 a/Programs/system_linux.c
-+++ b/Programs/system_linux.c
-@@ -25,6 +25,12 @@
- #include 
- #include 
- 
-+#ifdef MAJOR_IN_MKDEV
-+#include 
-+#elif defined MAJOR_IN_SYSMACROS
-+#include 
-+#endif
-+
- #include "log.h"
- #include "file.h"
- #include "device.h"
-diff --git a/configure.ac b/configure.ac
-index 96305f7..dcae1e1 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -555,6 +555,8 @@ BRLTTY_ARG_DISABLE(
- ])
- AC_SUBST([install_messages])
- 
-+AC_HEADER_MAJOR
-+
- AC_CHECK_FUNC([wcslen], [AC_CHECK_HEADERS([wchar.h], [dnl
-AC_CHECK_FUNCS([wcwidth])
- ])])
-diff --git a/config.h.in b/config.h.in
-index 71341c6..ff201c2 100644
 a/config.h.in
-+++ b/config.h.in
-@@ -457,2 +457,10 @@ extern "C" {
- 
-+/* Define to 1 if `major', `minor', and `makedev' are declared in .
-+   */
-+#undef MAJOR_IN_MKDEV
-+
-+/* Define to 1 if `major', `minor', and `makedev' are declared in
-+   . */
-+#undef MAJOR_IN_SYSMACROS
-+
- /* Define this to be a string containing the path to the root of the 
Mikropuhe package. */
-diff --git a/Programs/brlapi_client.c b/Programs/brlapi_client.c
-index bd6497b..df63b30 100644
 a/Programs/brlapi_client.c
-+++ b/Programs/brlapi_client.c
-@@ -32,2 +32,8 @@
- 
-+#ifdef MAJOR_IN_MKDEV
-+#include 
-+#elif defined MAJOR_IN_SYSMACROS
-+#include 
-+#endif
-+
- #ifndef __MINGW32__

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

2017-12-06 Thread Michael Palimaka

commit: fd89fb2bb4ed5ed44ef1408d998348f7216b5688
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Mon Dec  4 19:35:48 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Dec  6 13:03:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd89fb2b

app-accessibility/brltty: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/6438

 .../brltty/files/brltty-5.2-major.patch| 59 --
 1 file changed, 59 deletions(-)

diff --git a/app-accessibility/brltty/files/brltty-5.2-major.patch 
b/app-accessibility/brltty/files/brltty-5.2-major.patch
deleted file mode 100644
index 7c591b1cc0e..000
--- a/app-accessibility/brltty/files/brltty-5.2-major.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Bug: https://bugs.gentoo.org/581130
-diff --git a/Programs/system_linux.c b/Programs/system_linux.c
-index c73bd39..ef7d807 100644
 a/Programs/system_linux.c
-+++ b/Programs/system_linux.c
-@@ -25,6 +25,12 @@
- #include 
- #include 
- 
-+#ifdef MAJOR_IN_MKDEV
-+#include 
-+#elif defined MAJOR_IN_SYSMACROS
-+#include 
-+#endif
-+
- #include "log.h"
- #include "file.h"
- #include "device.h"
-diff --git a/configure.ac b/configure.ac
-index 96305f7..dcae1e1 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -555,6 +555,8 @@ BRLTTY_ARG_DISABLE(
- ])
- AC_SUBST([install_messages])
- 
-+AC_HEADER_MAJOR
-+
- AC_CHECK_FUNC([wcslen], [AC_CHECK_HEADERS([wchar.h], [dnl
-AC_CHECK_FUNCS([wcwidth])
- ])])
-diff --git a/config.h.in b/config.h.in
-index 71341c6..ff201c2 100644
 a/config.h.in
-+++ b/config.h.in
-@@ -457,2 +457,10 @@ extern "C" {
- 
-+/* Define to 1 if `major', `minor', and `makedev' are declared in .
-+   */
-+#undef MAJOR_IN_MKDEV
-+
-+/* Define to 1 if `major', `minor', and `makedev' are declared in
-+   . */
-+#undef MAJOR_IN_SYSMACROS
-+
- /* Define this to be a string containing the path to the root of the 
Mikropuhe package. */
-diff --git a/Programs/brlapi_client.c b/Programs/brlapi_client.c
-index bd6497b..df63b30 100644
 a/Programs/brlapi_client.c
-+++ b/Programs/brlapi_client.c
-@@ -32,2 +32,8 @@
- 
-+#ifdef MAJOR_IN_MKDEV
-+#include 
-+#elif defined MAJOR_IN_SYSMACROS
-+#include 
-+#endif
-+
- #ifndef __MINGW32__

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

2017-12-06 Thread Michael Palimaka

commit: fd89fb2bb4ed5ed44ef1408d998348f7216b5688
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Mon Dec  4 19:35:48 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Dec  6 13:03:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd89fb2b

app-accessibility/brltty: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/6438

 .../brltty/files/brltty-5.2-major.patch| 59 --
 1 file changed, 59 deletions(-)

diff --git a/app-accessibility/brltty/files/brltty-5.2-major.patch 
b/app-accessibility/brltty/files/brltty-5.2-major.patch
deleted file mode 100644
index 7c591b1cc0e..000
--- a/app-accessibility/brltty/files/brltty-5.2-major.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Bug: https://bugs.gentoo.org/581130
-diff --git a/Programs/system_linux.c b/Programs/system_linux.c
-index c73bd39..ef7d807 100644
 a/Programs/system_linux.c
-+++ b/Programs/system_linux.c
-@@ -25,6 +25,12 @@
- #include 
- #include 
- 
-+#ifdef MAJOR_IN_MKDEV
-+#include 
-+#elif defined MAJOR_IN_SYSMACROS
-+#include 
-+#endif
-+
- #include "log.h"
- #include "file.h"
- #include "device.h"
-diff --git a/configure.ac b/configure.ac
-index 96305f7..dcae1e1 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -555,6 +555,8 @@ BRLTTY_ARG_DISABLE(
- ])
- AC_SUBST([install_messages])
- 
-+AC_HEADER_MAJOR
-+
- AC_CHECK_FUNC([wcslen], [AC_CHECK_HEADERS([wchar.h], [dnl
-AC_CHECK_FUNCS([wcwidth])
- ])])
-diff --git a/config.h.in b/config.h.in
-index 71341c6..ff201c2 100644
 a/config.h.in
-+++ b/config.h.in
-@@ -457,2 +457,10 @@ extern "C" {
- 
-+/* Define to 1 if `major', `minor', and `makedev' are declared in .
-+   */
-+#undef MAJOR_IN_MKDEV
-+
-+/* Define to 1 if `major', `minor', and `makedev' are declared in
-+   . */
-+#undef MAJOR_IN_SYSMACROS
-+
- /* Define this to be a string containing the path to the root of the 
Mikropuhe package. */
-diff --git a/Programs/brlapi_client.c b/Programs/brlapi_client.c
-index bd6497b..df63b30 100644
 a/Programs/brlapi_client.c
-+++ b/Programs/brlapi_client.c
-@@ -32,2 +32,8 @@
- 
-+#ifdef MAJOR_IN_MKDEV
-+#include 
-+#elif defined MAJOR_IN_SYSMACROS
-+#include 
-+#endif
-+
- #ifndef __MINGW32__

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

2017-12-06 Thread Michael Palimaka

commit: fd89fb2bb4ed5ed44ef1408d998348f7216b5688
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Mon Dec  4 19:35:48 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Dec  6 13:03:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd89fb2b

app-accessibility/brltty: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/6438

 .../brltty/files/brltty-5.2-major.patch| 59 --
 1 file changed, 59 deletions(-)

diff --git a/app-accessibility/brltty/files/brltty-5.2-major.patch 
b/app-accessibility/brltty/files/brltty-5.2-major.patch
deleted file mode 100644
index 7c591b1cc0e..000
--- a/app-accessibility/brltty/files/brltty-5.2-major.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Bug: https://bugs.gentoo.org/581130
-diff --git a/Programs/system_linux.c b/Programs/system_linux.c
-index c73bd39..ef7d807 100644
 a/Programs/system_linux.c
-+++ b/Programs/system_linux.c
-@@ -25,6 +25,12 @@
- #include 
- #include 
- 
-+#ifdef MAJOR_IN_MKDEV
-+#include 
-+#elif defined MAJOR_IN_SYSMACROS
-+#include 
-+#endif
-+
- #include "log.h"
- #include "file.h"
- #include "device.h"
-diff --git a/configure.ac b/configure.ac
-index 96305f7..dcae1e1 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -555,6 +555,8 @@ BRLTTY_ARG_DISABLE(
- ])
- AC_SUBST([install_messages])
- 
-+AC_HEADER_MAJOR
-+
- AC_CHECK_FUNC([wcslen], [AC_CHECK_HEADERS([wchar.h], [dnl
-AC_CHECK_FUNCS([wcwidth])
- ])])
-diff --git a/config.h.in b/config.h.in
-index 71341c6..ff201c2 100644
 a/config.h.in
-+++ b/config.h.in
-@@ -457,2 +457,10 @@ extern "C" {
- 
-+/* Define to 1 if `major', `minor', and `makedev' are declared in .
-+   */
-+#undef MAJOR_IN_MKDEV
-+
-+/* Define to 1 if `major', `minor', and `makedev' are declared in
-+   . */
-+#undef MAJOR_IN_SYSMACROS
-+
- /* Define this to be a string containing the path to the root of the 
Mikropuhe package. */
-diff --git a/Programs/brlapi_client.c b/Programs/brlapi_client.c
-index bd6497b..df63b30 100644
 a/Programs/brlapi_client.c
-+++ b/Programs/brlapi_client.c
-@@ -32,2 +32,8 @@
- 
-+#ifdef MAJOR_IN_MKDEV
-+#include 
-+#elif defined MAJOR_IN_SYSMACROS
-+#include 
-+#endif
-+
- #ifndef __MINGW32__

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

2017-12-06 Thread Michael Palimaka

commit: fd89fb2bb4ed5ed44ef1408d998348f7216b5688
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Mon Dec  4 19:35:48 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Dec  6 13:03:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd89fb2b

app-accessibility/brltty: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/6438

 .../brltty/files/brltty-5.2-major.patch| 59 --
 1 file changed, 59 deletions(-)

diff --git a/app-accessibility/brltty/files/brltty-5.2-major.patch 
b/app-accessibility/brltty/files/brltty-5.2-major.patch
deleted file mode 100644
index 7c591b1cc0e..000
--- a/app-accessibility/brltty/files/brltty-5.2-major.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Bug: https://bugs.gentoo.org/581130
-diff --git a/Programs/system_linux.c b/Programs/system_linux.c
-index c73bd39..ef7d807 100644
 a/Programs/system_linux.c
-+++ b/Programs/system_linux.c
-@@ -25,6 +25,12 @@
- #include 
- #include 
- 
-+#ifdef MAJOR_IN_MKDEV
-+#include 
-+#elif defined MAJOR_IN_SYSMACROS
-+#include 
-+#endif
-+
- #include "log.h"
- #include "file.h"
- #include "device.h"
-diff --git a/configure.ac b/configure.ac
-index 96305f7..dcae1e1 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -555,6 +555,8 @@ BRLTTY_ARG_DISABLE(
- ])
- AC_SUBST([install_messages])
- 
-+AC_HEADER_MAJOR
-+
- AC_CHECK_FUNC([wcslen], [AC_CHECK_HEADERS([wchar.h], [dnl
-AC_CHECK_FUNCS([wcwidth])
- ])])
-diff --git a/config.h.in b/config.h.in
-index 71341c6..ff201c2 100644
 a/config.h.in
-+++ b/config.h.in
-@@ -457,2 +457,10 @@ extern "C" {
- 
-+/* Define to 1 if `major', `minor', and `makedev' are declared in .
-+   */
-+#undef MAJOR_IN_MKDEV
-+
-+/* Define to 1 if `major', `minor', and `makedev' are declared in
-+   . */
-+#undef MAJOR_IN_SYSMACROS
-+
- /* Define this to be a string containing the path to the root of the 
Mikropuhe package. */
-diff --git a/Programs/brlapi_client.c b/Programs/brlapi_client.c
-index bd6497b..df63b30 100644
 a/Programs/brlapi_client.c
-+++ b/Programs/brlapi_client.c
-@@ -32,2 +32,8 @@
- 
-+#ifdef MAJOR_IN_MKDEV
-+#include 
-+#elif defined MAJOR_IN_SYSMACROS
-+#include 
-+#endif
-+
- #ifndef __MINGW32__

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

2017-12-06 Thread Michael Palimaka

commit: fd89fb2bb4ed5ed44ef1408d998348f7216b5688
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Mon Dec  4 19:35:48 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Dec  6 13:03:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd89fb2b

app-accessibility/brltty: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/6438

 .../brltty/files/brltty-5.2-major.patch| 59 --
 1 file changed, 59 deletions(-)

diff --git a/app-accessibility/brltty/files/brltty-5.2-major.patch 
b/app-accessibility/brltty/files/brltty-5.2-major.patch
deleted file mode 100644
index 7c591b1cc0e..000
--- a/app-accessibility/brltty/files/brltty-5.2-major.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Bug: https://bugs.gentoo.org/581130
-diff --git a/Programs/system_linux.c b/Programs/system_linux.c
-index c73bd39..ef7d807 100644
 a/Programs/system_linux.c
-+++ b/Programs/system_linux.c
-@@ -25,6 +25,12 @@
- #include 
- #include 
- 
-+#ifdef MAJOR_IN_MKDEV
-+#include 
-+#elif defined MAJOR_IN_SYSMACROS
-+#include 
-+#endif
-+
- #include "log.h"
- #include "file.h"
- #include "device.h"
-diff --git a/configure.ac b/configure.ac
-index 96305f7..dcae1e1 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -555,6 +555,8 @@ BRLTTY_ARG_DISABLE(
- ])
- AC_SUBST([install_messages])
- 
-+AC_HEADER_MAJOR
-+
- AC_CHECK_FUNC([wcslen], [AC_CHECK_HEADERS([wchar.h], [dnl
-AC_CHECK_FUNCS([wcwidth])
- ])])
-diff --git a/config.h.in b/config.h.in
-index 71341c6..ff201c2 100644
 a/config.h.in
-+++ b/config.h.in
-@@ -457,2 +457,10 @@ extern "C" {
- 
-+/* Define to 1 if `major', `minor', and `makedev' are declared in .
-+   */
-+#undef MAJOR_IN_MKDEV
-+
-+/* Define to 1 if `major', `minor', and `makedev' are declared in
-+   . */
-+#undef MAJOR_IN_SYSMACROS
-+
- /* Define this to be a string containing the path to the root of the 
Mikropuhe package. */
-diff --git a/Programs/brlapi_client.c b/Programs/brlapi_client.c
-index bd6497b..df63b30 100644
 a/Programs/brlapi_client.c
-+++ b/Programs/brlapi_client.c
-@@ -32,2 +32,8 @@
- 
-+#ifdef MAJOR_IN_MKDEV
-+#include 
-+#elif defined MAJOR_IN_SYSMACROS
-+#include 
-+#endif
-+
- #ifndef __MINGW32__

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

2017-12-06 Thread Michael Palimaka

commit: fd89fb2bb4ed5ed44ef1408d998348f7216b5688
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Mon Dec  4 19:35:48 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Dec  6 13:03:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd89fb2b

app-accessibility/brltty: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/6438

 .../brltty/files/brltty-5.2-major.patch| 59 --
 1 file changed, 59 deletions(-)

diff --git a/app-accessibility/brltty/files/brltty-5.2-major.patch 
b/app-accessibility/brltty/files/brltty-5.2-major.patch
deleted file mode 100644
index 7c591b1cc0e..000
--- a/app-accessibility/brltty/files/brltty-5.2-major.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Bug: https://bugs.gentoo.org/581130
-diff --git a/Programs/system_linux.c b/Programs/system_linux.c
-index c73bd39..ef7d807 100644
 a/Programs/system_linux.c
-+++ b/Programs/system_linux.c
-@@ -25,6 +25,12 @@
- #include 
- #include 
- 
-+#ifdef MAJOR_IN_MKDEV
-+#include 
-+#elif defined MAJOR_IN_SYSMACROS
-+#include 
-+#endif
-+
- #include "log.h"
- #include "file.h"
- #include "device.h"
-diff --git a/configure.ac b/configure.ac
-index 96305f7..dcae1e1 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -555,6 +555,8 @@ BRLTTY_ARG_DISABLE(
- ])
- AC_SUBST([install_messages])
- 
-+AC_HEADER_MAJOR
-+
- AC_CHECK_FUNC([wcslen], [AC_CHECK_HEADERS([wchar.h], [dnl
-AC_CHECK_FUNCS([wcwidth])
- ])])
-diff --git a/config.h.in b/config.h.in
-index 71341c6..ff201c2 100644
 a/config.h.in
-+++ b/config.h.in
-@@ -457,2 +457,10 @@ extern "C" {
- 
-+/* Define to 1 if `major', `minor', and `makedev' are declared in .
-+   */
-+#undef MAJOR_IN_MKDEV
-+
-+/* Define to 1 if `major', `minor', and `makedev' are declared in
-+   . */
-+#undef MAJOR_IN_SYSMACROS
-+
- /* Define this to be a string containing the path to the root of the 
Mikropuhe package. */
-diff --git a/Programs/brlapi_client.c b/Programs/brlapi_client.c
-index bd6497b..df63b30 100644
 a/Programs/brlapi_client.c
-+++ b/Programs/brlapi_client.c
-@@ -32,2 +32,8 @@
- 
-+#ifdef MAJOR_IN_MKDEV
-+#include 
-+#elif defined MAJOR_IN_SYSMACROS
-+#include 
-+#endif
-+
- #ifndef __MINGW32__

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

2017-12-06 Thread Michael Palimaka

commit: fd89fb2bb4ed5ed44ef1408d998348f7216b5688
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Mon Dec  4 19:35:48 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Dec  6 13:03:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd89fb2b

app-accessibility/brltty: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/6438

 .../brltty/files/brltty-5.2-major.patch| 59 --
 1 file changed, 59 deletions(-)

diff --git a/app-accessibility/brltty/files/brltty-5.2-major.patch 
b/app-accessibility/brltty/files/brltty-5.2-major.patch
deleted file mode 100644
index 7c591b1cc0e..000
--- a/app-accessibility/brltty/files/brltty-5.2-major.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Bug: https://bugs.gentoo.org/581130
-diff --git a/Programs/system_linux.c b/Programs/system_linux.c
-index c73bd39..ef7d807 100644
 a/Programs/system_linux.c
-+++ b/Programs/system_linux.c
-@@ -25,6 +25,12 @@
- #include 
- #include 
- 
-+#ifdef MAJOR_IN_MKDEV
-+#include 
-+#elif defined MAJOR_IN_SYSMACROS
-+#include 
-+#endif
-+
- #include "log.h"
- #include "file.h"
- #include "device.h"
-diff --git a/configure.ac b/configure.ac
-index 96305f7..dcae1e1 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -555,6 +555,8 @@ BRLTTY_ARG_DISABLE(
- ])
- AC_SUBST([install_messages])
- 
-+AC_HEADER_MAJOR
-+
- AC_CHECK_FUNC([wcslen], [AC_CHECK_HEADERS([wchar.h], [dnl
-AC_CHECK_FUNCS([wcwidth])
- ])])
-diff --git a/config.h.in b/config.h.in
-index 71341c6..ff201c2 100644
 a/config.h.in
-+++ b/config.h.in
-@@ -457,2 +457,10 @@ extern "C" {
- 
-+/* Define to 1 if `major', `minor', and `makedev' are declared in .
-+   */
-+#undef MAJOR_IN_MKDEV
-+
-+/* Define to 1 if `major', `minor', and `makedev' are declared in
-+   . */
-+#undef MAJOR_IN_SYSMACROS
-+
- /* Define this to be a string containing the path to the root of the 
Mikropuhe package. */
-diff --git a/Programs/brlapi_client.c b/Programs/brlapi_client.c
-index bd6497b..df63b30 100644
 a/Programs/brlapi_client.c
-+++ b/Programs/brlapi_client.c
-@@ -32,2 +32,8 @@
- 
-+#ifdef MAJOR_IN_MKDEV
-+#include 
-+#elif defined MAJOR_IN_SYSMACROS
-+#include 
-+#endif
-+
- #ifndef __MINGW32__

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

2024-03-05 Thread Petr Vaněk

commit: 91b169691a782c516e57bddf55c5b512a98119cc
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Mar  4 18:16:14 2024 +
Commit: Petr Vaněk  gentoo  org>
CommitDate: Tue Mar  5 09:16:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91b16969

app-accessibility/brltty: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Petr Vaněk  gentoo.org>

 .../brltty/files/brltty-6.5-gettext-0.22.patch | 49 --
 1 file changed, 49 deletions(-)

diff --git a/app-accessibility/brltty/files/brltty-6.5-gettext-0.22.patch 
b/app-accessibility/brltty/files/brltty-6.5-gettext-0.22.patch
deleted file mode 100644
index 7cf62f74221c..
--- a/app-accessibility/brltty/files/brltty-6.5-gettext-0.22.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-https://bugs.gentoo.org/908897
-fix: 
https://github.com/brltty/brltty/commit/31061173fd80c7ed0f83e8d20d62c59dbedcebe0
-
-From 31061173fd80c7ed0f83e8d20d62c59dbedcebe0 Mon Sep 17 00:00:00 2001
-From: Yaakov Selkowitz 
-Date: Tue, 27 Jun 2023 15:07:09 -0400
-Subject: [PATCH] Add gettext header to ru.po
-
-Building with gettext-0.22 fails for lack of this header:
-
-/usr/bin/msgfmt: input file doesn't contain a header entry with a
-charset specification
 a/Messages/ru.po
-+++ b/Messages/ru.po
-@@ -1,3 +1,34 @@
-+# BRLTTY - A background process providing access to the console screen (when 
in
-+#  text mode) for a blind person using a refreshable braille display.
-+#
-+# Copyright (C) 1995-2022 by The BRLTTY Developers.
-+#
-+# BRLTTY comes with ABSOLUTELY NO WARRANTY.
-+#
-+# This is free software, placed under the terms of the
-+# GNU Lesser General Public License, as published by the Free Software
-+# Foundation; either version 2.1 of the License, or (at your option) any
-+# later version. Please see the file LICENSE-LGPL for details.
-+#
-+# Web Page: http://brltty.app/
-+#
-+# This software is maintained by Dave Mielke .
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: brltty 4.5\n"
-+"Report-Msgid-Bugs-To: brl...@brltty.app\n"
-+"POT-Creation-Date: 2021-01-27 11:47-0500\n"
-+"PO-Revision-Date: 2021-02-07 08:18-0500\n"
-+"Last-Translator: Маргарита Мельникова \n"
-+"Language-Team: Friends of BRLTTY \n"
-+"Language: ru\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-+
- #: Programs/brltty.c:167
- #, c-format
- msgid "\"%s\" started as \"%s\"\n"

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

2023-01-19 Thread Sam James

commit: 0c850ccc28efa2fa5ea2538e249a243d0a7102a2
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Jan 15 19:54:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 20 01:21:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c850ccc

app-accessibility/brltty: remove unused files

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29121
Signed-off-by: Sam James  gentoo.org>

 app-accessibility/brltty/files/brltty.rc| 12 
 app-accessibility/brltty/files/brltty.tmpfiles.conf |  1 -
 2 files changed, 13 deletions(-)

diff --git a/app-accessibility/brltty/files/brltty.rc 
b/app-accessibility/brltty/files/brltty.rc
deleted file mode 100644
index 100dd29b778a..
--- a/app-accessibility/brltty/files/brltty.rc
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-command=/bin/brltty
-pidfile=/var/run/brltty.pid
-command_args="-P ${pidfile} -q"
-
-depend() {
-   before *
-   after clock
-}

diff --git a/app-accessibility/brltty/files/brltty.tmpfiles.conf 
b/app-accessibility/brltty/files/brltty.tmpfiles.conf
deleted file mode 100644
index 18cc4021e33b..
--- a/app-accessibility/brltty/files/brltty.tmpfiles.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /run/brltty 0755 root root -

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

2020-08-13 Thread Michał Górny

commit: fb676f5c2d2ebd24423e35585ed567566b269aa2
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Aug 13 20:13:57 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Aug 13 20:25:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb676f5c

app-accessibility/brltty: Remove old (py3.6)

Signed-off-by: Michał Górny  gentoo.org>

 app-accessibility/brltty/Manifest  |   1 -
 app-accessibility/brltty/brltty-5.2-r1.ebuild  | 197 -
 .../brltty/files/brltty-5.2-fix-ldflags.patch  |  56 --
 .../brltty/files/brltty-5.2-sysmacros.patch|  20 ---
 .../brltty/files/brltty-5.2-udev.patch |  27 ---
 5 files changed, 301 deletions(-)

diff --git a/app-accessibility/brltty/Manifest 
b/app-accessibility/brltty/Manifest
index 2618e8dd7d8..5057b79d6e5 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1,2 +1 @@
-DIST brltty-5.2.tar.xz 2532684 BLAKE2B 
9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f
 SHA512 
8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f
 DIST brltty-6.0.tar.xz 2879976 BLAKE2B 
31bd45b63838d119d940492c615deb27ec47389c68afa39f19da3534324914695343344260799a10deae6ca3de41bedf9b0c1de1f78dbe01a89b694c2aa6e265
 SHA512 
07344fa902ad169967ca39d19b09dfea24e698011031dd63dce3eb997a4cb86622ee9427b216976b3ef60e5cbabb710a621621447c6bfa2313748fc1a1cf4b06

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
deleted file mode 100644
index 64b28132085..000
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-FINDLIB_USE="ocaml"
-
-inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic 
usr-ldscript \
-   autotools udev systemd python-r1
-
-DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind 
person"
-HOMEPAGE="https://brltty.app/";
-SRC_URI="https://brltty.app/archive/${P}.tar.xz";
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 x86"
-IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
-   java +midi ncurses nls ocaml +pcm python usb +speech
-   tcl X"
-REQUIRED_USE="doc? ( api )
-   java? ( api )
-   ocaml? ( api )
-   python? ( api ${PYTHON_REQUIRED_USE} )
-   tcl? ( api )"
-
-COMMON_DEP="bluetooth? ( net-wireless/bluez )
-   gpm? ( >=sys-libs/gpm-1.20 )
-   iconv? ( virtual/libiconv )
-   icu? ( dev-libs/icu:= )
-   python? ( ${PYTHON_DEPS} )
-   ncurses? ( sys-libs/ncurses:0= )
-   nls? ( virtual/libintl )
-   tcl? ( >=dev-lang/tcl-8.4.15:0= )
-   usb? ( virtual/libusb:0 )
-   X? ( x11-libs/libXaw )"
-DEPEND="virtual/pkgconfig
-   java? ( >=virtual/jdk-1.4 )
-   python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
-   ${COMMON_DEP}"
-RDEPEND="java? ( >=virtual/jre-1.4 )
-   ${COMMON_DEP}"
-
-HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-5.2-fix-ldflags.patch
-   "${FILESDIR}"/${PN}-5.2-udev.patch
-   "${FILESDIR}"/${PN}-5.2-respect-AR.patch
-   "${FILESDIR}"/${PN}-5.2-sysmacros.patch
-)
-
-src_prepare() {
-   default
-
-   java-pkg-opt-2_src_prepare
-
-   # The code runs `pkg-config` directly instead of locating a suitable
-   # pkg-config wrapper (or respecting $PKG_CONFIG).
-   sed -i \
-   -e 's/\/${PKG_CONFIG:-pkg-config}/' \
-   aclocal.m4 configure.ac || die
-
-   # We run eautoconf instead of using eautoreconf because brltty uses
-   # a custom build system that uses autoconf without the rest of the
-   # autotools.
-   eautoconf
-   python_copy_sources
-}
-
-src_configure() {
-   append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
-   append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
-
-   tc-export AR LD PKG_CONFIG
-   # override prefix in order to install into /
-   # braille terminal needs to be available as soon in the boot process as
-   # possible
-   # Also override localstatedir so that the lib/brltty directory is 
installed
-   # correctly.
-   # Disable stripping since we do that ourselves.
-   local myconf=(
-   --prefix=/
-   --localedir=/usr/share/locale
-   --includedir=/usr/include
-   --localstatedir=/var
-   --disable-stripping
-   --with-install-root="${D}"
-   --with-writable-directory="/run/brltty"
-   $(use_enable api)
-   $(use_with beeper beep-package)
-   $(use_e

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

2017-12-04 Thread David Seifert

commit: 9972fed3f21b47e7315949e39f762d9b209c1fd5
Author: David Seifert  gentoo  org>
AuthorDate: Mon Dec  4 10:24:38 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Dec  4 10:25:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9972fed3

app-accessibility/brltty: [QA] Fix multiple issues

* Don't add dead python impls to PYTHON_COMPAT
* Don't remove python metadata vars (${PYTHON_REQUIRED_USE})
  from REQUIRED_USE
* Don't remove the SLOT specifier for sys-libs/ncurses
* Get rid of the awfully complicated, hacky and
  non-generalisable solution for the libtinfo split,
  which also doesn't generalise to Prefix.
  Using pkg-config is easier, safer, more portable and
  less brittle than the previous hacks.
* Get rid of the totally unnecessary code paths
  created by dispatching on glibc versions.
  'sys/sysmacros.h' can always be included on glibc,
  packages just have relied on this include implicitly.

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 app-accessibility/brltty/brltty-5.2-r1.ebuild| 12 +---
 .../brltty/files/brltty-5.2-sysmacros.patch  | 20 
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 12ea62ef94e..71cbc57d9d1 100644
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
 FINDLIB_USE="ocaml"
 
 inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
@@ -22,7 +22,7 @@ IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm 
iconv icu
 REQUIRED_USE="doc? ( api )
java? ( api )
ocaml? ( api )
-   python? ( api )
+   python? ( api ${PYTHON_REQUIRED_USE} )
tcl? ( api )"
 
 COMMON_DEP="bluetooth? ( net-wireless/bluez )
@@ -30,7 +30,7 @@ COMMON_DEP="bluetooth? ( net-wireless/bluez )
iconv? ( virtual/libiconv )
icu? ( dev-libs/icu:= )
python? ( ${PYTHON_DEPS} )
-   ncurses? ( sys-libs/ncurses:= )
+   ncurses? ( sys-libs/ncurses:0= )
nls? ( virtual/libintl )
tcl? ( >=dev-lang/tcl-8.4.15:0= )
usb? ( virtual/libusb:0 )
@@ -64,10 +64,8 @@ src_prepare() {
 }
 
 src_configure() {
-   filter-flags "_*_SOURCE*"
-   append-cppflags -D_DEFAULT_SOURCE
-   has_version ">=sys-libs/glibc-2.25-r5" && append-cppflags 
-DHAVE_SYS_SYSMACROS_H
-   has_version "sys-libs/ncurses[tinfo]" && append-libs -ltinfo
+   append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
+   append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
 
tc-export AR LD PKG_CONFIG
# override prefix in order to install into /

diff --git a/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch 
b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
index d45d6104e4b..f33e46a1890 100644
--- a/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
+++ b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
@@ -1,24 +1,20 @@
 a/Programs/system_linux.c  2017-12-02 12:54:34.098643832 -0800
-+++ b/Programs/system_linux.c  2017-12-02 12:59:00.683592161 -0800
-@@ -24,6 +24,9 @@
+--- a/Programs/system_linux.c
 b/Programs/system_linux.c
+@@ -24,6 +24,7 @@
  #include 
  #include 
  #include 
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include   /* major() w/newer glibc */
-+#endif
++#include 
  
  #include "log.h"
  #include "file.h"
 a/Programs/brlapi_client.c 2017-12-02 14:29:37.524205316 -0800
-+++ b/Programs/brlapi_client.c 2017-12-02 14:32:45.679948051 -0800
-@@ -73,6 +73,9 @@
+--- a/Programs/brlapi_client.c
 b/Programs/brlapi_client.c
+@@ -73,6 +73,7 @@
  #include 
  #include 
  #define MAXIMUM_VIRTUAL_CONSOLE MAX_NR_CONSOLES
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include   /* major() w/newer glibc */
-+#endif
++#include 
  #endif /* linux */
  
  #ifdef __OpenBSD__

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

2016-11-28 Thread Sergei Trofimovich

commit: 433c45c715bdee3e008e924a7475080e79e0aa25
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Nov 28 09:21:08 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Nov 28 09:21:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=433c45c7

app-accessibility/brltty: fix makedev() autodetection, bug #581130

Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/581130

Package-Manager: portage-2.3.2

 app-accessibility/brltty/brltty-5.2-r1.ebuild  |  5 +-
 .../brltty/files/brltty-5.2-major.patch| 59 ++
 2 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 80195c7..46daab6 100644
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -31,7 +31,7 @@ COMMON_DEP="bluetooth? ( net-wireless/bluez )
iconv? ( virtual/libiconv )
icu? ( dev-libs/icu:= )
python? ( ${PYTHON_DEPS} )
-   ncurses? ( sys-libs/ncurses )
+   ncurses? ( sys-libs/ncurses:0= )
nls? ( virtual/libintl )
tcl? ( >=dev-lang/tcl-8.4.15:0= )
usb? ( virtual/libusb:0 )
@@ -46,7 +46,8 @@ RDEPEND="java? ( >=virtual/jre-1.4 )
 src_prepare() {
epatch "${FILESDIR}"/${P}-fix-ldflags.patch \
"${FILESDIR}"/${P}-udev.patch \
-   "${FILESDIR}"/${P}-respect-AR.patch
+   "${FILESDIR}"/${P}-respect-AR.patch \
+   "${FILESDIR}"/${P}-major.patch
 
java-pkg-opt-2_src_prepare
 

diff --git a/app-accessibility/brltty/files/brltty-5.2-major.patch 
b/app-accessibility/brltty/files/brltty-5.2-major.patch
new file mode 100644
index ..7c591b1
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-5.2-major.patch
@@ -0,0 +1,59 @@
+Bug: https://bugs.gentoo.org/581130
+diff --git a/Programs/system_linux.c b/Programs/system_linux.c
+index c73bd39..ef7d807 100644
+--- a/Programs/system_linux.c
 b/Programs/system_linux.c
+@@ -25,6 +25,12 @@
+ #include 
+ #include 
+ 
++#ifdef MAJOR_IN_MKDEV
++#include 
++#elif defined MAJOR_IN_SYSMACROS
++#include 
++#endif
++
+ #include "log.h"
+ #include "file.h"
+ #include "device.h"
+diff --git a/configure.ac b/configure.ac
+index 96305f7..dcae1e1 100644
+--- a/configure.ac
 b/configure.ac
+@@ -555,6 +555,8 @@ BRLTTY_ARG_DISABLE(
+ ])
+ AC_SUBST([install_messages])
+ 
++AC_HEADER_MAJOR
++
+ AC_CHECK_FUNC([wcslen], [AC_CHECK_HEADERS([wchar.h], [dnl
+AC_CHECK_FUNCS([wcwidth])
+ ])])
+diff --git a/config.h.in b/config.h.in
+index 71341c6..ff201c2 100644
+--- a/config.h.in
 b/config.h.in
+@@ -457,2 +457,10 @@ extern "C" {
+ 
++/* Define to 1 if `major', `minor', and `makedev' are declared in .
++   */
++#undef MAJOR_IN_MKDEV
++
++/* Define to 1 if `major', `minor', and `makedev' are declared in
++   . */
++#undef MAJOR_IN_SYSMACROS
++
+ /* Define this to be a string containing the path to the root of the 
Mikropuhe package. */
+diff --git a/Programs/brlapi_client.c b/Programs/brlapi_client.c
+index bd6497b..df63b30 100644
+--- a/Programs/brlapi_client.c
 b/Programs/brlapi_client.c
+@@ -32,2 +32,8 @@
+ 
++#ifdef MAJOR_IN_MKDEV
++#include 
++#elif defined MAJOR_IN_SYSMACROS
++#include 
++#endif
++
+ #ifndef __MINGW32__

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

2018-03-26 Thread Aaron Bauman

commit: 6326de87e9f6e14fe2cd72839e21a4cb45534b18
Author: Marty E. Plummer  startmail  com>
AuthorDate: Thu Mar 22 11:54:34 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Mar 26 20:19:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6326de87

app-accessibility/brltty: bump to EAPI 6

Also readjusted the epatch call to an eapply call, added
HTML_DOCS/einstalldocs as dohtml is deprecated on EAPI=6,
and adjusted the keepdir call to point at the correct directory.

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/7590

 app-accessibility/brltty/brltty-5.2-r1.ebuild  | 43 --
 .../brltty/files/brltty-5.2-respect-AR.patch   |  5 +--
 .../brltty/files/brltty-5.2-udev.patch |  5 +--
 3 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 8b9f34c0e4f..3622819ef62 100644
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 FINDLIB_USE="ocaml"
@@ -42,11 +42,17 @@ DEPEND="virtual/pkgconfig
 RDEPEND="java? ( >=virtual/jre-1.4 )
${COMMON_DEP}"
 
+HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-5.2-fix-ldflags.patch
+   "${FILESDIR}"/${PN}-5.2-udev.patch
+   "${FILESDIR}"/${PN}-5.2-respect-AR.patch
+   "${FILESDIR}"/${PN}-5.2-sysmacros.patch
+)
+
 src_prepare() {
-   epatch "${FILESDIR}"/${P}-fix-ldflags.patch \
-   "${FILESDIR}"/${P}-udev.patch \
-   "${FILESDIR}"/${P}-respect-AR.patch \
-   "${FILESDIR}"/${P}-sysmacros.patch
+   default
 
java-pkg-opt-2_src_prepare
 
@@ -163,30 +169,29 @@ src_install() {
 
libdir="$(get_libdir)"
mkdir -p "${D}"/usr/${libdir}/
-   mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/
+   mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/ || die
gen_usr_ldscript libbrlapi.so
 
-   cd Documents
-   mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt
-   mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt
-   mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt
+   cd Documents || die
+   mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt || die
+   mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt || die
+   mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt || die
dodoc CONTRIBUTORS ChangeLog HISTORY README* TODO BRLTTY-*.txt
-   dohtml -r Manual-BRLTTY
if use doc; then
-   dohtml -r Manual-BrlAPI
dodoc BrlAPI-*.txt
+   HTML_DOCS="Manual-BRLTTY" einstalldocs
fi
 
-   keepdir /var/lib/brlapi
-   rmdir "${D}/run/brltty"
-   rmdir "${D}/run"
+   keepdir /var/lib/BrlAPI
+   rmdir "${D}/run/brltty" || die
+   rmdir "${D}/run" || die
 }
 
 pkg_postinst() {
elog
-   elog please be sure "${ROOT}"etc/brltty.conf is correct for your system.
+   elog "please be sure ${ROOT}etc/brltty.conf is correct for your system."
elog
-   elog To make brltty start on boot, type this command as root:
+   elog "To make brltty start on boot, type this command as root:"
elog
-   elog rc-update add brltty boot
+   elog "rc-update add brltty boot"
 }

diff --git a/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch 
b/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
index 95451dc98b7..c5698a2b939 100644
--- a/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
+++ b/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
@@ -1,6 +1,5 @@
-diff -Naur brltty-5.2/Programs/Makefile.in brltty-5.2-new/Programs/Makefile.in
 brltty-5.2/Programs/Makefile.in2014-11-06 07:28:41.0 -0800
-+++ brltty-5.2-new/Programs/Makefile.in2014-11-20 05:41:57.144219093 
-0800
+--- a/Programs/Makefile.in
 b/Programs/Makefile.in
 @@ -434,7 +434,7 @@
[ ! -f lib.def ] || mv lib.def $(API_DEF)
  

diff --git a/app-accessibility/brltty/files/brltty-5.2-udev.patch 
b/app-accessibility/brltty/files/brltty-5.2-udev.patch
index dbbc2989766..e6d56603b01 100644
--- a/app-accessibility/brltty/files/brltty-5.2-udev.patch
+++ b/app-accessibility/brltty/files/brltty-5.2-udev.patch
@@ -1,6 +1,5 @@
-diff -Naur brltty-5.2/Autostart/Udev/udev.rules 
brltty-5.2-new/Autostart/Udev/udev.rules
 brltty-5.2/Autostart/Udev/udev.rules   2014-11-06 07:28:41.0 
-0800
-+++ brltty-5.2-new/Autostart/Udev/udev.rules   2014-11-20 05:28:44.404885312 
-0800
+--- a/Autostart/Udev/udev.rules
 b/Autostart/Udev/udev.rules
 @@ -182,20 +182,22 @@
  # FreedomScientific [Focus Blue]
  ENV{PRODUCT}

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

2019-03-22 Thread Lars Wendler

commit: 91f4f99d403ec7f89ec2c23a91bb1a1dce4d9f4e
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Mar 22 14:58:47 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Mar 22 14:59:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f4f99d

app-accessibility/brltty: Bump to version 6.0

Closes: https://bugs.gentoo.org/632630
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 app-accessibility/brltty/Manifest  |   1 +
 app-accessibility/brltty/brltty-6.0.ebuild | 194 +
 .../brltty/files/brltty-6.0-udev.patch |  27 +++
 app-accessibility/brltty/files/brltty.rc   |   4 +-
 4 files changed, 224 insertions(+), 2 deletions(-)

diff --git a/app-accessibility/brltty/Manifest 
b/app-accessibility/brltty/Manifest
index 018608d0bc4..2618e8dd7d8 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1 +1,2 @@
 DIST brltty-5.2.tar.xz 2532684 BLAKE2B 
9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f
 SHA512 
8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f
+DIST brltty-6.0.tar.xz 2879976 BLAKE2B 
31bd45b63838d119d940492c615deb27ec47389c68afa39f19da3534324914695343344260799a10deae6ca3de41bedf9b0c1de1f78dbe01a89b694c2aa6e265
 SHA512 
07344fa902ad169967ca39d19b09dfea24e698011031dd63dce3eb997a4cb86622ee9427b216976b3ef60e5cbabb710a621621447c6bfa2313748fc1a1cf4b06

diff --git a/app-accessibility/brltty/brltty-6.0.ebuild 
b/app-accessibility/brltty/brltty-6.0.ebuild
new file mode 100644
index 000..badd7a11678
--- /dev/null
+++ b/app-accessibility/brltty/brltty-6.0.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+FINDLIB_USE="ocaml"
+
+inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
+   autotools udev systemd python-r1
+
+DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind 
person"
+HOMEPAGE="http://brltty.com/";
+SRC_URI="http://brltty.com/archive/${P}.tar.xz";
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
+   java +midi ncurses nls ocaml +pcm python usb +speech
+   tcl X"
+REQUIRED_USE="doc? ( api )
+   java? ( api )
+   ocaml? ( api )
+   python? ( api ${PYTHON_REQUIRED_USE} )
+   tcl? ( api )"
+
+COMMON_DEP="bluetooth? ( net-wireless/bluez )
+   gpm? ( >=sys-libs/gpm-1.20 )
+   iconv? ( virtual/libiconv )
+   icu? ( dev-libs/icu:= )
+   python? ( ${PYTHON_DEPS} )
+   ncurses? ( sys-libs/ncurses:0= )
+   nls? ( virtual/libintl )
+   tcl? ( >=dev-lang/tcl-8.4.15:0= )
+   usb? ( virtual/libusb:0 )
+   X? ( x11-libs/libXaw )"
+DEPEND="${COMMON_DEP}"
+BDEPEND="
+   virtual/pkgconfig
+   java? ( >=virtual/jdk-1.4 )
+   python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
+"
+RDEPEND="java? ( >=virtual/jre-1.4 )
+   ${COMMON_DEP}"
+
+HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-6.0-udev.patch
+   "${FILESDIR}"/${PN}-5.2-respect-AR.patch
+)
+
+src_prepare() {
+   default
+
+   java-pkg-opt-2_src_prepare
+
+   # The code runs `pkg-config` directly instead of locating a suitable
+   # pkg-config wrapper (or respecting $PKG_CONFIG).
+   sed -i \
+   -e 's/\/${PKG_CONFIG:-pkg-config}/' \
+   aclocal.m4 configure.ac || die
+
+   # We run eautoconf instead of using eautoreconf because brltty uses
+   # a custom build system that uses autoconf without the rest of the
+   # autotools.
+   eautoconf
+   python_copy_sources
+}
+
+src_configure() {
+   tc-export AR LD PKG_CONFIG
+   # override prefix in order to install into /
+   # braille terminal needs to be available as soon in the boot process as
+   # possible
+   # Also override localstatedir so that the lib/brltty directory is 
installed
+   # correctly.
+   # Disable stripping since we do that ourselves.
+   local myconf=(
+   --prefix="${EPREFIX}"/
+   --localedir="${EPREFIX}"/usr/share/locale
+   --includedir="${EPREFIX}"/usr/include
+   --localstatedir="${EPREFIX}"/var
+   --disable-stripping
+   --with-install-root="${D}"
+   --with-writable-directory="${EPREFIX}"/run/brltty
+   $(use_enable api)
+   $(use_with beeper beep-package)
+   $(use_enable contracted-braille)
+   $(use_with fm fm-package)
+   $(use_enable gpm)
+   $(us

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

2016-11-28 Thread Sergei Trofimovich

commit: 433c45c715bdee3e008e924a7475080e79e0aa25
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Nov 28 09:21:08 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Nov 28 09:21:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=433c45c7

app-accessibility/brltty: fix makedev() autodetection, bug #581130

Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/581130

Package-Manager: portage-2.3.2

 app-accessibility/brltty/brltty-5.2-r1.ebuild  |  5 +-
 .../brltty/files/brltty-5.2-major.patch| 59 ++
 2 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 80195c7..46daab6 100644
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -31,7 +31,7 @@ COMMON_DEP="bluetooth? ( net-wireless/bluez )
iconv? ( virtual/libiconv )
icu? ( dev-libs/icu:= )
python? ( ${PYTHON_DEPS} )
-   ncurses? ( sys-libs/ncurses )
+   ncurses? ( sys-libs/ncurses:0= )
nls? ( virtual/libintl )
tcl? ( >=dev-lang/tcl-8.4.15:0= )
usb? ( virtual/libusb:0 )
@@ -46,7 +46,8 @@ RDEPEND="java? ( >=virtual/jre-1.4 )
 src_prepare() {
epatch "${FILESDIR}"/${P}-fix-ldflags.patch \
"${FILESDIR}"/${P}-udev.patch \
-   "${FILESDIR}"/${P}-respect-AR.patch
+   "${FILESDIR}"/${P}-respect-AR.patch \
+   "${FILESDIR}"/${P}-major.patch
 
java-pkg-opt-2_src_prepare
 

diff --git a/app-accessibility/brltty/files/brltty-5.2-major.patch 
b/app-accessibility/brltty/files/brltty-5.2-major.patch
new file mode 100644
index ..7c591b1
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-5.2-major.patch
@@ -0,0 +1,59 @@
+Bug: https://bugs.gentoo.org/581130
+diff --git a/Programs/system_linux.c b/Programs/system_linux.c
+index c73bd39..ef7d807 100644
+--- a/Programs/system_linux.c
 b/Programs/system_linux.c
+@@ -25,6 +25,12 @@
+ #include 
+ #include 
+ 
++#ifdef MAJOR_IN_MKDEV
++#include 
++#elif defined MAJOR_IN_SYSMACROS
++#include 
++#endif
++
+ #include "log.h"
+ #include "file.h"
+ #include "device.h"
+diff --git a/configure.ac b/configure.ac
+index 96305f7..dcae1e1 100644
+--- a/configure.ac
 b/configure.ac
+@@ -555,6 +555,8 @@ BRLTTY_ARG_DISABLE(
+ ])
+ AC_SUBST([install_messages])
+ 
++AC_HEADER_MAJOR
++
+ AC_CHECK_FUNC([wcslen], [AC_CHECK_HEADERS([wchar.h], [dnl
+AC_CHECK_FUNCS([wcwidth])
+ ])])
+diff --git a/config.h.in b/config.h.in
+index 71341c6..ff201c2 100644
+--- a/config.h.in
 b/config.h.in
+@@ -457,2 +457,10 @@ extern "C" {
+ 
++/* Define to 1 if `major', `minor', and `makedev' are declared in .
++   */
++#undef MAJOR_IN_MKDEV
++
++/* Define to 1 if `major', `minor', and `makedev' are declared in
++   . */
++#undef MAJOR_IN_SYSMACROS
++
+ /* Define this to be a string containing the path to the root of the 
Mikropuhe package. */
+diff --git a/Programs/brlapi_client.c b/Programs/brlapi_client.c
+index bd6497b..df63b30 100644
+--- a/Programs/brlapi_client.c
 b/Programs/brlapi_client.c
+@@ -32,2 +32,8 @@
+ 
++#ifdef MAJOR_IN_MKDEV
++#include 
++#elif defined MAJOR_IN_SYSMACROS
++#include 
++#endif
++
+ #ifndef __MINGW32__

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

2019-03-22 Thread Lars Wendler

commit: 91f4f99d403ec7f89ec2c23a91bb1a1dce4d9f4e
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Mar 22 14:58:47 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Mar 22 14:59:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f4f99d

app-accessibility/brltty: Bump to version 6.0

Closes: https://bugs.gentoo.org/632630
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 app-accessibility/brltty/Manifest  |   1 +
 app-accessibility/brltty/brltty-6.0.ebuild | 194 +
 .../brltty/files/brltty-6.0-udev.patch |  27 +++
 app-accessibility/brltty/files/brltty.rc   |   4 +-
 4 files changed, 224 insertions(+), 2 deletions(-)

diff --git a/app-accessibility/brltty/Manifest 
b/app-accessibility/brltty/Manifest
index 018608d0bc4..2618e8dd7d8 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1 +1,2 @@
 DIST brltty-5.2.tar.xz 2532684 BLAKE2B 
9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f
 SHA512 
8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f
+DIST brltty-6.0.tar.xz 2879976 BLAKE2B 
31bd45b63838d119d940492c615deb27ec47389c68afa39f19da3534324914695343344260799a10deae6ca3de41bedf9b0c1de1f78dbe01a89b694c2aa6e265
 SHA512 
07344fa902ad169967ca39d19b09dfea24e698011031dd63dce3eb997a4cb86622ee9427b216976b3ef60e5cbabb710a621621447c6bfa2313748fc1a1cf4b06

diff --git a/app-accessibility/brltty/brltty-6.0.ebuild 
b/app-accessibility/brltty/brltty-6.0.ebuild
new file mode 100644
index 000..badd7a11678
--- /dev/null
+++ b/app-accessibility/brltty/brltty-6.0.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+FINDLIB_USE="ocaml"
+
+inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
+   autotools udev systemd python-r1
+
+DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind 
person"
+HOMEPAGE="http://brltty.com/";
+SRC_URI="http://brltty.com/archive/${P}.tar.xz";
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
+   java +midi ncurses nls ocaml +pcm python usb +speech
+   tcl X"
+REQUIRED_USE="doc? ( api )
+   java? ( api )
+   ocaml? ( api )
+   python? ( api ${PYTHON_REQUIRED_USE} )
+   tcl? ( api )"
+
+COMMON_DEP="bluetooth? ( net-wireless/bluez )
+   gpm? ( >=sys-libs/gpm-1.20 )
+   iconv? ( virtual/libiconv )
+   icu? ( dev-libs/icu:= )
+   python? ( ${PYTHON_DEPS} )
+   ncurses? ( sys-libs/ncurses:0= )
+   nls? ( virtual/libintl )
+   tcl? ( >=dev-lang/tcl-8.4.15:0= )
+   usb? ( virtual/libusb:0 )
+   X? ( x11-libs/libXaw )"
+DEPEND="${COMMON_DEP}"
+BDEPEND="
+   virtual/pkgconfig
+   java? ( >=virtual/jdk-1.4 )
+   python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
+"
+RDEPEND="java? ( >=virtual/jre-1.4 )
+   ${COMMON_DEP}"
+
+HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-6.0-udev.patch
+   "${FILESDIR}"/${PN}-5.2-respect-AR.patch
+)
+
+src_prepare() {
+   default
+
+   java-pkg-opt-2_src_prepare
+
+   # The code runs `pkg-config` directly instead of locating a suitable
+   # pkg-config wrapper (or respecting $PKG_CONFIG).
+   sed -i \
+   -e 's/\/${PKG_CONFIG:-pkg-config}/' \
+   aclocal.m4 configure.ac || die
+
+   # We run eautoconf instead of using eautoreconf because brltty uses
+   # a custom build system that uses autoconf without the rest of the
+   # autotools.
+   eautoconf
+   python_copy_sources
+}
+
+src_configure() {
+   tc-export AR LD PKG_CONFIG
+   # override prefix in order to install into /
+   # braille terminal needs to be available as soon in the boot process as
+   # possible
+   # Also override localstatedir so that the lib/brltty directory is 
installed
+   # correctly.
+   # Disable stripping since we do that ourselves.
+   local myconf=(
+   --prefix="${EPREFIX}"/
+   --localedir="${EPREFIX}"/usr/share/locale
+   --includedir="${EPREFIX}"/usr/include
+   --localstatedir="${EPREFIX}"/var
+   --disable-stripping
+   --with-install-root="${D}"
+   --with-writable-directory="${EPREFIX}"/run/brltty
+   $(use_enable api)
+   $(use_with beeper beep-package)
+   $(use_enable contracted-braille)
+   $(use_with fm fm-package)
+   $(use_enable gpm)
+   $(us

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

2018-03-26 Thread Aaron Bauman

commit: 6326de87e9f6e14fe2cd72839e21a4cb45534b18
Author: Marty E. Plummer  startmail  com>
AuthorDate: Thu Mar 22 11:54:34 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Mar 26 20:19:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6326de87

app-accessibility/brltty: bump to EAPI 6

Also readjusted the epatch call to an eapply call, added
HTML_DOCS/einstalldocs as dohtml is deprecated on EAPI=6,
and adjusted the keepdir call to point at the correct directory.

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/7590

 app-accessibility/brltty/brltty-5.2-r1.ebuild  | 43 --
 .../brltty/files/brltty-5.2-respect-AR.patch   |  5 +--
 .../brltty/files/brltty-5.2-udev.patch |  5 +--
 3 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 8b9f34c0e4f..3622819ef62 100644
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 FINDLIB_USE="ocaml"
@@ -42,11 +42,17 @@ DEPEND="virtual/pkgconfig
 RDEPEND="java? ( >=virtual/jre-1.4 )
${COMMON_DEP}"
 
+HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-5.2-fix-ldflags.patch
+   "${FILESDIR}"/${PN}-5.2-udev.patch
+   "${FILESDIR}"/${PN}-5.2-respect-AR.patch
+   "${FILESDIR}"/${PN}-5.2-sysmacros.patch
+)
+
 src_prepare() {
-   epatch "${FILESDIR}"/${P}-fix-ldflags.patch \
-   "${FILESDIR}"/${P}-udev.patch \
-   "${FILESDIR}"/${P}-respect-AR.patch \
-   "${FILESDIR}"/${P}-sysmacros.patch
+   default
 
java-pkg-opt-2_src_prepare
 
@@ -163,30 +169,29 @@ src_install() {
 
libdir="$(get_libdir)"
mkdir -p "${D}"/usr/${libdir}/
-   mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/
+   mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/ || die
gen_usr_ldscript libbrlapi.so
 
-   cd Documents
-   mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt
-   mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt
-   mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt
+   cd Documents || die
+   mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt || die
+   mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt || die
+   mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt || die
dodoc CONTRIBUTORS ChangeLog HISTORY README* TODO BRLTTY-*.txt
-   dohtml -r Manual-BRLTTY
if use doc; then
-   dohtml -r Manual-BrlAPI
dodoc BrlAPI-*.txt
+   HTML_DOCS="Manual-BRLTTY" einstalldocs
fi
 
-   keepdir /var/lib/brlapi
-   rmdir "${D}/run/brltty"
-   rmdir "${D}/run"
+   keepdir /var/lib/BrlAPI
+   rmdir "${D}/run/brltty" || die
+   rmdir "${D}/run" || die
 }
 
 pkg_postinst() {
elog
-   elog please be sure "${ROOT}"etc/brltty.conf is correct for your system.
+   elog "please be sure ${ROOT}etc/brltty.conf is correct for your system."
elog
-   elog To make brltty start on boot, type this command as root:
+   elog "To make brltty start on boot, type this command as root:"
elog
-   elog rc-update add brltty boot
+   elog "rc-update add brltty boot"
 }

diff --git a/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch 
b/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
index 95451dc98b7..c5698a2b939 100644
--- a/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
+++ b/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
@@ -1,6 +1,5 @@
-diff -Naur brltty-5.2/Programs/Makefile.in brltty-5.2-new/Programs/Makefile.in
 brltty-5.2/Programs/Makefile.in2014-11-06 07:28:41.0 -0800
-+++ brltty-5.2-new/Programs/Makefile.in2014-11-20 05:41:57.144219093 
-0800
+--- a/Programs/Makefile.in
 b/Programs/Makefile.in
 @@ -434,7 +434,7 @@
[ ! -f lib.def ] || mv lib.def $(API_DEF)
  

diff --git a/app-accessibility/brltty/files/brltty-5.2-udev.patch 
b/app-accessibility/brltty/files/brltty-5.2-udev.patch
index dbbc2989766..e6d56603b01 100644
--- a/app-accessibility/brltty/files/brltty-5.2-udev.patch
+++ b/app-accessibility/brltty/files/brltty-5.2-udev.patch
@@ -1,6 +1,5 @@
-diff -Naur brltty-5.2/Autostart/Udev/udev.rules 
brltty-5.2-new/Autostart/Udev/udev.rules
 brltty-5.2/Autostart/Udev/udev.rules   2014-11-06 07:28:41.0 
-0800
-+++ brltty-5.2-new/Autostart/Udev/udev.rules   2014-11-20 05:28:44.404885312 
-0800
+--- a/Autostart/Udev/udev.rules
 b/Autostart/Udev/udev.rules
 @@ -182,20 +182,22 @@
  # FreedomScientific [Focus Blue]
  ENV{PRODUCT}

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

2017-12-04 Thread David Seifert

commit: 9972fed3f21b47e7315949e39f762d9b209c1fd5
Author: David Seifert  gentoo  org>
AuthorDate: Mon Dec  4 10:24:38 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Dec  4 10:25:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9972fed3

app-accessibility/brltty: [QA] Fix multiple issues

* Don't add dead python impls to PYTHON_COMPAT
* Don't remove python metadata vars (${PYTHON_REQUIRED_USE})
  from REQUIRED_USE
* Don't remove the SLOT specifier for sys-libs/ncurses
* Get rid of the awfully complicated, hacky and
  non-generalisable solution for the libtinfo split,
  which also doesn't generalise to Prefix.
  Using pkg-config is easier, safer, more portable and
  less brittle than the previous hacks.
* Get rid of the totally unnecessary code paths
  created by dispatching on glibc versions.
  'sys/sysmacros.h' can always be included on glibc,
  packages just have relied on this include implicitly.

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 app-accessibility/brltty/brltty-5.2-r1.ebuild| 12 +---
 .../brltty/files/brltty-5.2-sysmacros.patch  | 20 
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 12ea62ef94e..71cbc57d9d1 100644
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
 FINDLIB_USE="ocaml"
 
 inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
@@ -22,7 +22,7 @@ IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm 
iconv icu
 REQUIRED_USE="doc? ( api )
java? ( api )
ocaml? ( api )
-   python? ( api )
+   python? ( api ${PYTHON_REQUIRED_USE} )
tcl? ( api )"
 
 COMMON_DEP="bluetooth? ( net-wireless/bluez )
@@ -30,7 +30,7 @@ COMMON_DEP="bluetooth? ( net-wireless/bluez )
iconv? ( virtual/libiconv )
icu? ( dev-libs/icu:= )
python? ( ${PYTHON_DEPS} )
-   ncurses? ( sys-libs/ncurses:= )
+   ncurses? ( sys-libs/ncurses:0= )
nls? ( virtual/libintl )
tcl? ( >=dev-lang/tcl-8.4.15:0= )
usb? ( virtual/libusb:0 )
@@ -64,10 +64,8 @@ src_prepare() {
 }
 
 src_configure() {
-   filter-flags "_*_SOURCE*"
-   append-cppflags -D_DEFAULT_SOURCE
-   has_version ">=sys-libs/glibc-2.25-r5" && append-cppflags 
-DHAVE_SYS_SYSMACROS_H
-   has_version "sys-libs/ncurses[tinfo]" && append-libs -ltinfo
+   append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
+   append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
 
tc-export AR LD PKG_CONFIG
# override prefix in order to install into /

diff --git a/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch 
b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
index d45d6104e4b..f33e46a1890 100644
--- a/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
+++ b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
@@ -1,24 +1,20 @@
 a/Programs/system_linux.c  2017-12-02 12:54:34.098643832 -0800
-+++ b/Programs/system_linux.c  2017-12-02 12:59:00.683592161 -0800
-@@ -24,6 +24,9 @@
+--- a/Programs/system_linux.c
 b/Programs/system_linux.c
+@@ -24,6 +24,7 @@
  #include 
  #include 
  #include 
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include   /* major() w/newer glibc */
-+#endif
++#include 
  
  #include "log.h"
  #include "file.h"
 a/Programs/brlapi_client.c 2017-12-02 14:29:37.524205316 -0800
-+++ b/Programs/brlapi_client.c 2017-12-02 14:32:45.679948051 -0800
-@@ -73,6 +73,9 @@
+--- a/Programs/brlapi_client.c
 b/Programs/brlapi_client.c
+@@ -73,6 +73,7 @@
  #include 
  #include 
  #define MAXIMUM_VIRTUAL_CONSOLE MAX_NR_CONSOLES
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include   /* major() w/newer glibc */
-+#endif
++#include 
  #endif /* linux */
  
  #ifdef __OpenBSD__

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

2020-08-13 Thread Michał Górny

commit: fb676f5c2d2ebd24423e35585ed567566b269aa2
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Aug 13 20:13:57 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Aug 13 20:25:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb676f5c

app-accessibility/brltty: Remove old (py3.6)

Signed-off-by: Michał Górny  gentoo.org>

 app-accessibility/brltty/Manifest  |   1 -
 app-accessibility/brltty/brltty-5.2-r1.ebuild  | 197 -
 .../brltty/files/brltty-5.2-fix-ldflags.patch  |  56 --
 .../brltty/files/brltty-5.2-sysmacros.patch|  20 ---
 .../brltty/files/brltty-5.2-udev.patch |  27 ---
 5 files changed, 301 deletions(-)

diff --git a/app-accessibility/brltty/Manifest 
b/app-accessibility/brltty/Manifest
index 2618e8dd7d8..5057b79d6e5 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1,2 +1 @@
-DIST brltty-5.2.tar.xz 2532684 BLAKE2B 
9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f
 SHA512 
8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f
 DIST brltty-6.0.tar.xz 2879976 BLAKE2B 
31bd45b63838d119d940492c615deb27ec47389c68afa39f19da3534324914695343344260799a10deae6ca3de41bedf9b0c1de1f78dbe01a89b694c2aa6e265
 SHA512 
07344fa902ad169967ca39d19b09dfea24e698011031dd63dce3eb997a4cb86622ee9427b216976b3ef60e5cbabb710a621621447c6bfa2313748fc1a1cf4b06

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
deleted file mode 100644
index 64b28132085..000
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-FINDLIB_USE="ocaml"
-
-inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic 
usr-ldscript \
-   autotools udev systemd python-r1
-
-DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind 
person"
-HOMEPAGE="https://brltty.app/";
-SRC_URI="https://brltty.app/archive/${P}.tar.xz";
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 x86"
-IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
-   java +midi ncurses nls ocaml +pcm python usb +speech
-   tcl X"
-REQUIRED_USE="doc? ( api )
-   java? ( api )
-   ocaml? ( api )
-   python? ( api ${PYTHON_REQUIRED_USE} )
-   tcl? ( api )"
-
-COMMON_DEP="bluetooth? ( net-wireless/bluez )
-   gpm? ( >=sys-libs/gpm-1.20 )
-   iconv? ( virtual/libiconv )
-   icu? ( dev-libs/icu:= )
-   python? ( ${PYTHON_DEPS} )
-   ncurses? ( sys-libs/ncurses:0= )
-   nls? ( virtual/libintl )
-   tcl? ( >=dev-lang/tcl-8.4.15:0= )
-   usb? ( virtual/libusb:0 )
-   X? ( x11-libs/libXaw )"
-DEPEND="virtual/pkgconfig
-   java? ( >=virtual/jdk-1.4 )
-   python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
-   ${COMMON_DEP}"
-RDEPEND="java? ( >=virtual/jre-1.4 )
-   ${COMMON_DEP}"
-
-HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-5.2-fix-ldflags.patch
-   "${FILESDIR}"/${PN}-5.2-udev.patch
-   "${FILESDIR}"/${PN}-5.2-respect-AR.patch
-   "${FILESDIR}"/${PN}-5.2-sysmacros.patch
-)
-
-src_prepare() {
-   default
-
-   java-pkg-opt-2_src_prepare
-
-   # The code runs `pkg-config` directly instead of locating a suitable
-   # pkg-config wrapper (or respecting $PKG_CONFIG).
-   sed -i \
-   -e 's/\/${PKG_CONFIG:-pkg-config}/' \
-   aclocal.m4 configure.ac || die
-
-   # We run eautoconf instead of using eautoreconf because brltty uses
-   # a custom build system that uses autoconf without the rest of the
-   # autotools.
-   eautoconf
-   python_copy_sources
-}
-
-src_configure() {
-   append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
-   append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
-
-   tc-export AR LD PKG_CONFIG
-   # override prefix in order to install into /
-   # braille terminal needs to be available as soon in the boot process as
-   # possible
-   # Also override localstatedir so that the lib/brltty directory is 
installed
-   # correctly.
-   # Disable stripping since we do that ourselves.
-   local myconf=(
-   --prefix=/
-   --localedir=/usr/share/locale
-   --includedir=/usr/include
-   --localstatedir=/var
-   --disable-stripping
-   --with-install-root="${D}"
-   --with-writable-directory="/run/brltty"
-   $(use_enable api)
-   $(use_with beeper beep-package)
-   $(use_e

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

2019-03-22 Thread Lars Wendler

commit: 91f4f99d403ec7f89ec2c23a91bb1a1dce4d9f4e
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Mar 22 14:58:47 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Mar 22 14:59:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f4f99d

app-accessibility/brltty: Bump to version 6.0

Closes: https://bugs.gentoo.org/632630
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 app-accessibility/brltty/Manifest  |   1 +
 app-accessibility/brltty/brltty-6.0.ebuild | 194 +
 .../brltty/files/brltty-6.0-udev.patch |  27 +++
 app-accessibility/brltty/files/brltty.rc   |   4 +-
 4 files changed, 224 insertions(+), 2 deletions(-)

diff --git a/app-accessibility/brltty/Manifest 
b/app-accessibility/brltty/Manifest
index 018608d0bc4..2618e8dd7d8 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1 +1,2 @@
 DIST brltty-5.2.tar.xz 2532684 BLAKE2B 
9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f
 SHA512 
8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f
+DIST brltty-6.0.tar.xz 2879976 BLAKE2B 
31bd45b63838d119d940492c615deb27ec47389c68afa39f19da3534324914695343344260799a10deae6ca3de41bedf9b0c1de1f78dbe01a89b694c2aa6e265
 SHA512 
07344fa902ad169967ca39d19b09dfea24e698011031dd63dce3eb997a4cb86622ee9427b216976b3ef60e5cbabb710a621621447c6bfa2313748fc1a1cf4b06

diff --git a/app-accessibility/brltty/brltty-6.0.ebuild 
b/app-accessibility/brltty/brltty-6.0.ebuild
new file mode 100644
index 000..badd7a11678
--- /dev/null
+++ b/app-accessibility/brltty/brltty-6.0.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+FINDLIB_USE="ocaml"
+
+inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
+   autotools udev systemd python-r1
+
+DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind 
person"
+HOMEPAGE="http://brltty.com/";
+SRC_URI="http://brltty.com/archive/${P}.tar.xz";
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
+   java +midi ncurses nls ocaml +pcm python usb +speech
+   tcl X"
+REQUIRED_USE="doc? ( api )
+   java? ( api )
+   ocaml? ( api )
+   python? ( api ${PYTHON_REQUIRED_USE} )
+   tcl? ( api )"
+
+COMMON_DEP="bluetooth? ( net-wireless/bluez )
+   gpm? ( >=sys-libs/gpm-1.20 )
+   iconv? ( virtual/libiconv )
+   icu? ( dev-libs/icu:= )
+   python? ( ${PYTHON_DEPS} )
+   ncurses? ( sys-libs/ncurses:0= )
+   nls? ( virtual/libintl )
+   tcl? ( >=dev-lang/tcl-8.4.15:0= )
+   usb? ( virtual/libusb:0 )
+   X? ( x11-libs/libXaw )"
+DEPEND="${COMMON_DEP}"
+BDEPEND="
+   virtual/pkgconfig
+   java? ( >=virtual/jdk-1.4 )
+   python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
+"
+RDEPEND="java? ( >=virtual/jre-1.4 )
+   ${COMMON_DEP}"
+
+HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-6.0-udev.patch
+   "${FILESDIR}"/${PN}-5.2-respect-AR.patch
+)
+
+src_prepare() {
+   default
+
+   java-pkg-opt-2_src_prepare
+
+   # The code runs `pkg-config` directly instead of locating a suitable
+   # pkg-config wrapper (or respecting $PKG_CONFIG).
+   sed -i \
+   -e 's/\/${PKG_CONFIG:-pkg-config}/' \
+   aclocal.m4 configure.ac || die
+
+   # We run eautoconf instead of using eautoreconf because brltty uses
+   # a custom build system that uses autoconf without the rest of the
+   # autotools.
+   eautoconf
+   python_copy_sources
+}
+
+src_configure() {
+   tc-export AR LD PKG_CONFIG
+   # override prefix in order to install into /
+   # braille terminal needs to be available as soon in the boot process as
+   # possible
+   # Also override localstatedir so that the lib/brltty directory is 
installed
+   # correctly.
+   # Disable stripping since we do that ourselves.
+   local myconf=(
+   --prefix="${EPREFIX}"/
+   --localedir="${EPREFIX}"/usr/share/locale
+   --includedir="${EPREFIX}"/usr/include
+   --localstatedir="${EPREFIX}"/var
+   --disable-stripping
+   --with-install-root="${D}"
+   --with-writable-directory="${EPREFIX}"/run/brltty
+   $(use_enable api)
+   $(use_with beeper beep-package)
+   $(use_enable contracted-braille)
+   $(use_with fm fm-package)
+   $(use_enable gpm)
+   $(us

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

2017-12-04 Thread David Seifert

commit: 9972fed3f21b47e7315949e39f762d9b209c1fd5
Author: David Seifert  gentoo  org>
AuthorDate: Mon Dec  4 10:24:38 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Dec  4 10:25:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9972fed3

app-accessibility/brltty: [QA] Fix multiple issues

* Don't add dead python impls to PYTHON_COMPAT
* Don't remove python metadata vars (${PYTHON_REQUIRED_USE})
  from REQUIRED_USE
* Don't remove the SLOT specifier for sys-libs/ncurses
* Get rid of the awfully complicated, hacky and
  non-generalisable solution for the libtinfo split,
  which also doesn't generalise to Prefix.
  Using pkg-config is easier, safer, more portable and
  less brittle than the previous hacks.
* Get rid of the totally unnecessary code paths
  created by dispatching on glibc versions.
  'sys/sysmacros.h' can always be included on glibc,
  packages just have relied on this include implicitly.

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 app-accessibility/brltty/brltty-5.2-r1.ebuild| 12 +---
 .../brltty/files/brltty-5.2-sysmacros.patch  | 20 
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 12ea62ef94e..71cbc57d9d1 100644
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
 FINDLIB_USE="ocaml"
 
 inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
@@ -22,7 +22,7 @@ IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm 
iconv icu
 REQUIRED_USE="doc? ( api )
java? ( api )
ocaml? ( api )
-   python? ( api )
+   python? ( api ${PYTHON_REQUIRED_USE} )
tcl? ( api )"
 
 COMMON_DEP="bluetooth? ( net-wireless/bluez )
@@ -30,7 +30,7 @@ COMMON_DEP="bluetooth? ( net-wireless/bluez )
iconv? ( virtual/libiconv )
icu? ( dev-libs/icu:= )
python? ( ${PYTHON_DEPS} )
-   ncurses? ( sys-libs/ncurses:= )
+   ncurses? ( sys-libs/ncurses:0= )
nls? ( virtual/libintl )
tcl? ( >=dev-lang/tcl-8.4.15:0= )
usb? ( virtual/libusb:0 )
@@ -64,10 +64,8 @@ src_prepare() {
 }
 
 src_configure() {
-   filter-flags "_*_SOURCE*"
-   append-cppflags -D_DEFAULT_SOURCE
-   has_version ">=sys-libs/glibc-2.25-r5" && append-cppflags 
-DHAVE_SYS_SYSMACROS_H
-   has_version "sys-libs/ncurses[tinfo]" && append-libs -ltinfo
+   append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
+   append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
 
tc-export AR LD PKG_CONFIG
# override prefix in order to install into /

diff --git a/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch 
b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
index d45d6104e4b..f33e46a1890 100644
--- a/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
+++ b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
@@ -1,24 +1,20 @@
 a/Programs/system_linux.c  2017-12-02 12:54:34.098643832 -0800
-+++ b/Programs/system_linux.c  2017-12-02 12:59:00.683592161 -0800
-@@ -24,6 +24,9 @@
+--- a/Programs/system_linux.c
 b/Programs/system_linux.c
+@@ -24,6 +24,7 @@
  #include 
  #include 
  #include 
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include   /* major() w/newer glibc */
-+#endif
++#include 
  
  #include "log.h"
  #include "file.h"
 a/Programs/brlapi_client.c 2017-12-02 14:29:37.524205316 -0800
-+++ b/Programs/brlapi_client.c 2017-12-02 14:32:45.679948051 -0800
-@@ -73,6 +73,9 @@
+--- a/Programs/brlapi_client.c
 b/Programs/brlapi_client.c
+@@ -73,6 +73,7 @@
  #include 
  #include 
  #define MAXIMUM_VIRTUAL_CONSOLE MAX_NR_CONSOLES
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include   /* major() w/newer glibc */
-+#endif
++#include 
  #endif /* linux */
  
  #ifdef __OpenBSD__

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

2020-08-13 Thread Michał Górny

commit: fb676f5c2d2ebd24423e35585ed567566b269aa2
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Aug 13 20:13:57 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Aug 13 20:25:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb676f5c

app-accessibility/brltty: Remove old (py3.6)

Signed-off-by: Michał Górny  gentoo.org>

 app-accessibility/brltty/Manifest  |   1 -
 app-accessibility/brltty/brltty-5.2-r1.ebuild  | 197 -
 .../brltty/files/brltty-5.2-fix-ldflags.patch  |  56 --
 .../brltty/files/brltty-5.2-sysmacros.patch|  20 ---
 .../brltty/files/brltty-5.2-udev.patch |  27 ---
 5 files changed, 301 deletions(-)

diff --git a/app-accessibility/brltty/Manifest 
b/app-accessibility/brltty/Manifest
index 2618e8dd7d8..5057b79d6e5 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1,2 +1 @@
-DIST brltty-5.2.tar.xz 2532684 BLAKE2B 
9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f
 SHA512 
8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f
 DIST brltty-6.0.tar.xz 2879976 BLAKE2B 
31bd45b63838d119d940492c615deb27ec47389c68afa39f19da3534324914695343344260799a10deae6ca3de41bedf9b0c1de1f78dbe01a89b694c2aa6e265
 SHA512 
07344fa902ad169967ca39d19b09dfea24e698011031dd63dce3eb997a4cb86622ee9427b216976b3ef60e5cbabb710a621621447c6bfa2313748fc1a1cf4b06

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
deleted file mode 100644
index 64b28132085..000
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-FINDLIB_USE="ocaml"
-
-inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic 
usr-ldscript \
-   autotools udev systemd python-r1
-
-DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind 
person"
-HOMEPAGE="https://brltty.app/";
-SRC_URI="https://brltty.app/archive/${P}.tar.xz";
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 x86"
-IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
-   java +midi ncurses nls ocaml +pcm python usb +speech
-   tcl X"
-REQUIRED_USE="doc? ( api )
-   java? ( api )
-   ocaml? ( api )
-   python? ( api ${PYTHON_REQUIRED_USE} )
-   tcl? ( api )"
-
-COMMON_DEP="bluetooth? ( net-wireless/bluez )
-   gpm? ( >=sys-libs/gpm-1.20 )
-   iconv? ( virtual/libiconv )
-   icu? ( dev-libs/icu:= )
-   python? ( ${PYTHON_DEPS} )
-   ncurses? ( sys-libs/ncurses:0= )
-   nls? ( virtual/libintl )
-   tcl? ( >=dev-lang/tcl-8.4.15:0= )
-   usb? ( virtual/libusb:0 )
-   X? ( x11-libs/libXaw )"
-DEPEND="virtual/pkgconfig
-   java? ( >=virtual/jdk-1.4 )
-   python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
-   ${COMMON_DEP}"
-RDEPEND="java? ( >=virtual/jre-1.4 )
-   ${COMMON_DEP}"
-
-HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-5.2-fix-ldflags.patch
-   "${FILESDIR}"/${PN}-5.2-udev.patch
-   "${FILESDIR}"/${PN}-5.2-respect-AR.patch
-   "${FILESDIR}"/${PN}-5.2-sysmacros.patch
-)
-
-src_prepare() {
-   default
-
-   java-pkg-opt-2_src_prepare
-
-   # The code runs `pkg-config` directly instead of locating a suitable
-   # pkg-config wrapper (or respecting $PKG_CONFIG).
-   sed -i \
-   -e 's/\/${PKG_CONFIG:-pkg-config}/' \
-   aclocal.m4 configure.ac || die
-
-   # We run eautoconf instead of using eautoreconf because brltty uses
-   # a custom build system that uses autoconf without the rest of the
-   # autotools.
-   eautoconf
-   python_copy_sources
-}
-
-src_configure() {
-   append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
-   append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
-
-   tc-export AR LD PKG_CONFIG
-   # override prefix in order to install into /
-   # braille terminal needs to be available as soon in the boot process as
-   # possible
-   # Also override localstatedir so that the lib/brltty directory is 
installed
-   # correctly.
-   # Disable stripping since we do that ourselves.
-   local myconf=(
-   --prefix=/
-   --localedir=/usr/share/locale
-   --includedir=/usr/include
-   --localstatedir=/var
-   --disable-stripping
-   --with-install-root="${D}"
-   --with-writable-directory="/run/brltty"
-   $(use_enable api)
-   $(use_with beeper beep-package)
-   $(use_e

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

2018-03-26 Thread Aaron Bauman

commit: 6326de87e9f6e14fe2cd72839e21a4cb45534b18
Author: Marty E. Plummer  startmail  com>
AuthorDate: Thu Mar 22 11:54:34 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Mar 26 20:19:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6326de87

app-accessibility/brltty: bump to EAPI 6

Also readjusted the epatch call to an eapply call, added
HTML_DOCS/einstalldocs as dohtml is deprecated on EAPI=6,
and adjusted the keepdir call to point at the correct directory.

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/7590

 app-accessibility/brltty/brltty-5.2-r1.ebuild  | 43 --
 .../brltty/files/brltty-5.2-respect-AR.patch   |  5 +--
 .../brltty/files/brltty-5.2-udev.patch |  5 +--
 3 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 8b9f34c0e4f..3622819ef62 100644
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 FINDLIB_USE="ocaml"
@@ -42,11 +42,17 @@ DEPEND="virtual/pkgconfig
 RDEPEND="java? ( >=virtual/jre-1.4 )
${COMMON_DEP}"
 
+HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-5.2-fix-ldflags.patch
+   "${FILESDIR}"/${PN}-5.2-udev.patch
+   "${FILESDIR}"/${PN}-5.2-respect-AR.patch
+   "${FILESDIR}"/${PN}-5.2-sysmacros.patch
+)
+
 src_prepare() {
-   epatch "${FILESDIR}"/${P}-fix-ldflags.patch \
-   "${FILESDIR}"/${P}-udev.patch \
-   "${FILESDIR}"/${P}-respect-AR.patch \
-   "${FILESDIR}"/${P}-sysmacros.patch
+   default
 
java-pkg-opt-2_src_prepare
 
@@ -163,30 +169,29 @@ src_install() {
 
libdir="$(get_libdir)"
mkdir -p "${D}"/usr/${libdir}/
-   mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/
+   mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/ || die
gen_usr_ldscript libbrlapi.so
 
-   cd Documents
-   mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt
-   mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt
-   mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt
+   cd Documents || die
+   mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt || die
+   mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt || die
+   mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt || die
dodoc CONTRIBUTORS ChangeLog HISTORY README* TODO BRLTTY-*.txt
-   dohtml -r Manual-BRLTTY
if use doc; then
-   dohtml -r Manual-BrlAPI
dodoc BrlAPI-*.txt
+   HTML_DOCS="Manual-BRLTTY" einstalldocs
fi
 
-   keepdir /var/lib/brlapi
-   rmdir "${D}/run/brltty"
-   rmdir "${D}/run"
+   keepdir /var/lib/BrlAPI
+   rmdir "${D}/run/brltty" || die
+   rmdir "${D}/run" || die
 }
 
 pkg_postinst() {
elog
-   elog please be sure "${ROOT}"etc/brltty.conf is correct for your system.
+   elog "please be sure ${ROOT}etc/brltty.conf is correct for your system."
elog
-   elog To make brltty start on boot, type this command as root:
+   elog "To make brltty start on boot, type this command as root:"
elog
-   elog rc-update add brltty boot
+   elog "rc-update add brltty boot"
 }

diff --git a/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch 
b/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
index 95451dc98b7..c5698a2b939 100644
--- a/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
+++ b/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
@@ -1,6 +1,5 @@
-diff -Naur brltty-5.2/Programs/Makefile.in brltty-5.2-new/Programs/Makefile.in
 brltty-5.2/Programs/Makefile.in2014-11-06 07:28:41.0 -0800
-+++ brltty-5.2-new/Programs/Makefile.in2014-11-20 05:41:57.144219093 
-0800
+--- a/Programs/Makefile.in
 b/Programs/Makefile.in
 @@ -434,7 +434,7 @@
[ ! -f lib.def ] || mv lib.def $(API_DEF)
  

diff --git a/app-accessibility/brltty/files/brltty-5.2-udev.patch 
b/app-accessibility/brltty/files/brltty-5.2-udev.patch
index dbbc2989766..e6d56603b01 100644
--- a/app-accessibility/brltty/files/brltty-5.2-udev.patch
+++ b/app-accessibility/brltty/files/brltty-5.2-udev.patch
@@ -1,6 +1,5 @@
-diff -Naur brltty-5.2/Autostart/Udev/udev.rules 
brltty-5.2-new/Autostart/Udev/udev.rules
 brltty-5.2/Autostart/Udev/udev.rules   2014-11-06 07:28:41.0 
-0800
-+++ brltty-5.2-new/Autostart/Udev/udev.rules   2014-11-20 05:28:44.404885312 
-0800
+--- a/Autostart/Udev/udev.rules
 b/Autostart/Udev/udev.rules
 @@ -182,20 +182,22 @@
  # FreedomScientific [Focus Blue]
  ENV{PRODUCT}

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

2016-11-28 Thread Sergei Trofimovich

commit: 433c45c715bdee3e008e924a7475080e79e0aa25
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Nov 28 09:21:08 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Nov 28 09:21:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=433c45c7

app-accessibility/brltty: fix makedev() autodetection, bug #581130

Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/581130

Package-Manager: portage-2.3.2

 app-accessibility/brltty/brltty-5.2-r1.ebuild  |  5 +-
 .../brltty/files/brltty-5.2-major.patch| 59 ++
 2 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 80195c7..46daab6 100644
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -31,7 +31,7 @@ COMMON_DEP="bluetooth? ( net-wireless/bluez )
iconv? ( virtual/libiconv )
icu? ( dev-libs/icu:= )
python? ( ${PYTHON_DEPS} )
-   ncurses? ( sys-libs/ncurses )
+   ncurses? ( sys-libs/ncurses:0= )
nls? ( virtual/libintl )
tcl? ( >=dev-lang/tcl-8.4.15:0= )
usb? ( virtual/libusb:0 )
@@ -46,7 +46,8 @@ RDEPEND="java? ( >=virtual/jre-1.4 )
 src_prepare() {
epatch "${FILESDIR}"/${P}-fix-ldflags.patch \
"${FILESDIR}"/${P}-udev.patch \
-   "${FILESDIR}"/${P}-respect-AR.patch
+   "${FILESDIR}"/${P}-respect-AR.patch \
+   "${FILESDIR}"/${P}-major.patch
 
java-pkg-opt-2_src_prepare
 

diff --git a/app-accessibility/brltty/files/brltty-5.2-major.patch 
b/app-accessibility/brltty/files/brltty-5.2-major.patch
new file mode 100644
index ..7c591b1
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-5.2-major.patch
@@ -0,0 +1,59 @@
+Bug: https://bugs.gentoo.org/581130
+diff --git a/Programs/system_linux.c b/Programs/system_linux.c
+index c73bd39..ef7d807 100644
+--- a/Programs/system_linux.c
 b/Programs/system_linux.c
+@@ -25,6 +25,12 @@
+ #include 
+ #include 
+ 
++#ifdef MAJOR_IN_MKDEV
++#include 
++#elif defined MAJOR_IN_SYSMACROS
++#include 
++#endif
++
+ #include "log.h"
+ #include "file.h"
+ #include "device.h"
+diff --git a/configure.ac b/configure.ac
+index 96305f7..dcae1e1 100644
+--- a/configure.ac
 b/configure.ac
+@@ -555,6 +555,8 @@ BRLTTY_ARG_DISABLE(
+ ])
+ AC_SUBST([install_messages])
+ 
++AC_HEADER_MAJOR
++
+ AC_CHECK_FUNC([wcslen], [AC_CHECK_HEADERS([wchar.h], [dnl
+AC_CHECK_FUNCS([wcwidth])
+ ])])
+diff --git a/config.h.in b/config.h.in
+index 71341c6..ff201c2 100644
+--- a/config.h.in
 b/config.h.in
+@@ -457,2 +457,10 @@ extern "C" {
+ 
++/* Define to 1 if `major', `minor', and `makedev' are declared in .
++   */
++#undef MAJOR_IN_MKDEV
++
++/* Define to 1 if `major', `minor', and `makedev' are declared in
++   . */
++#undef MAJOR_IN_SYSMACROS
++
+ /* Define this to be a string containing the path to the root of the 
Mikropuhe package. */
+diff --git a/Programs/brlapi_client.c b/Programs/brlapi_client.c
+index bd6497b..df63b30 100644
+--- a/Programs/brlapi_client.c
 b/Programs/brlapi_client.c
+@@ -32,2 +32,8 @@
+ 
++#ifdef MAJOR_IN_MKDEV
++#include 
++#elif defined MAJOR_IN_SYSMACROS
++#include 
++#endif
++
+ #ifndef __MINGW32__

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

2020-08-13 Thread Michał Górny

commit: fb676f5c2d2ebd24423e35585ed567566b269aa2
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Aug 13 20:13:57 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Aug 13 20:25:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb676f5c

app-accessibility/brltty: Remove old (py3.6)

Signed-off-by: Michał Górny  gentoo.org>

 app-accessibility/brltty/Manifest  |   1 -
 app-accessibility/brltty/brltty-5.2-r1.ebuild  | 197 -
 .../brltty/files/brltty-5.2-fix-ldflags.patch  |  56 --
 .../brltty/files/brltty-5.2-sysmacros.patch|  20 ---
 .../brltty/files/brltty-5.2-udev.patch |  27 ---
 5 files changed, 301 deletions(-)

diff --git a/app-accessibility/brltty/Manifest 
b/app-accessibility/brltty/Manifest
index 2618e8dd7d8..5057b79d6e5 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1,2 +1 @@
-DIST brltty-5.2.tar.xz 2532684 BLAKE2B 
9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f
 SHA512 
8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f
 DIST brltty-6.0.tar.xz 2879976 BLAKE2B 
31bd45b63838d119d940492c615deb27ec47389c68afa39f19da3534324914695343344260799a10deae6ca3de41bedf9b0c1de1f78dbe01a89b694c2aa6e265
 SHA512 
07344fa902ad169967ca39d19b09dfea24e698011031dd63dce3eb997a4cb86622ee9427b216976b3ef60e5cbabb710a621621447c6bfa2313748fc1a1cf4b06

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
deleted file mode 100644
index 64b28132085..000
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-FINDLIB_USE="ocaml"
-
-inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic 
usr-ldscript \
-   autotools udev systemd python-r1
-
-DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind 
person"
-HOMEPAGE="https://brltty.app/";
-SRC_URI="https://brltty.app/archive/${P}.tar.xz";
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 x86"
-IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
-   java +midi ncurses nls ocaml +pcm python usb +speech
-   tcl X"
-REQUIRED_USE="doc? ( api )
-   java? ( api )
-   ocaml? ( api )
-   python? ( api ${PYTHON_REQUIRED_USE} )
-   tcl? ( api )"
-
-COMMON_DEP="bluetooth? ( net-wireless/bluez )
-   gpm? ( >=sys-libs/gpm-1.20 )
-   iconv? ( virtual/libiconv )
-   icu? ( dev-libs/icu:= )
-   python? ( ${PYTHON_DEPS} )
-   ncurses? ( sys-libs/ncurses:0= )
-   nls? ( virtual/libintl )
-   tcl? ( >=dev-lang/tcl-8.4.15:0= )
-   usb? ( virtual/libusb:0 )
-   X? ( x11-libs/libXaw )"
-DEPEND="virtual/pkgconfig
-   java? ( >=virtual/jdk-1.4 )
-   python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
-   ${COMMON_DEP}"
-RDEPEND="java? ( >=virtual/jre-1.4 )
-   ${COMMON_DEP}"
-
-HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-5.2-fix-ldflags.patch
-   "${FILESDIR}"/${PN}-5.2-udev.patch
-   "${FILESDIR}"/${PN}-5.2-respect-AR.patch
-   "${FILESDIR}"/${PN}-5.2-sysmacros.patch
-)
-
-src_prepare() {
-   default
-
-   java-pkg-opt-2_src_prepare
-
-   # The code runs `pkg-config` directly instead of locating a suitable
-   # pkg-config wrapper (or respecting $PKG_CONFIG).
-   sed -i \
-   -e 's/\/${PKG_CONFIG:-pkg-config}/' \
-   aclocal.m4 configure.ac || die
-
-   # We run eautoconf instead of using eautoreconf because brltty uses
-   # a custom build system that uses autoconf without the rest of the
-   # autotools.
-   eautoconf
-   python_copy_sources
-}
-
-src_configure() {
-   append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
-   append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
-
-   tc-export AR LD PKG_CONFIG
-   # override prefix in order to install into /
-   # braille terminal needs to be available as soon in the boot process as
-   # possible
-   # Also override localstatedir so that the lib/brltty directory is 
installed
-   # correctly.
-   # Disable stripping since we do that ourselves.
-   local myconf=(
-   --prefix=/
-   --localedir=/usr/share/locale
-   --includedir=/usr/include
-   --localstatedir=/var
-   --disable-stripping
-   --with-install-root="${D}"
-   --with-writable-directory="/run/brltty"
-   $(use_enable api)
-   $(use_with beeper beep-package)
-   $(use_e

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

2016-11-28 Thread Sergei Trofimovich

commit: 433c45c715bdee3e008e924a7475080e79e0aa25
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Nov 28 09:21:08 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Nov 28 09:21:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=433c45c7

app-accessibility/brltty: fix makedev() autodetection, bug #581130

Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/581130

Package-Manager: portage-2.3.2

 app-accessibility/brltty/brltty-5.2-r1.ebuild  |  5 +-
 .../brltty/files/brltty-5.2-major.patch| 59 ++
 2 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 80195c7..46daab6 100644
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -31,7 +31,7 @@ COMMON_DEP="bluetooth? ( net-wireless/bluez )
iconv? ( virtual/libiconv )
icu? ( dev-libs/icu:= )
python? ( ${PYTHON_DEPS} )
-   ncurses? ( sys-libs/ncurses )
+   ncurses? ( sys-libs/ncurses:0= )
nls? ( virtual/libintl )
tcl? ( >=dev-lang/tcl-8.4.15:0= )
usb? ( virtual/libusb:0 )
@@ -46,7 +46,8 @@ RDEPEND="java? ( >=virtual/jre-1.4 )
 src_prepare() {
epatch "${FILESDIR}"/${P}-fix-ldflags.patch \
"${FILESDIR}"/${P}-udev.patch \
-   "${FILESDIR}"/${P}-respect-AR.patch
+   "${FILESDIR}"/${P}-respect-AR.patch \
+   "${FILESDIR}"/${P}-major.patch
 
java-pkg-opt-2_src_prepare
 

diff --git a/app-accessibility/brltty/files/brltty-5.2-major.patch 
b/app-accessibility/brltty/files/brltty-5.2-major.patch
new file mode 100644
index ..7c591b1
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-5.2-major.patch
@@ -0,0 +1,59 @@
+Bug: https://bugs.gentoo.org/581130
+diff --git a/Programs/system_linux.c b/Programs/system_linux.c
+index c73bd39..ef7d807 100644
+--- a/Programs/system_linux.c
 b/Programs/system_linux.c
+@@ -25,6 +25,12 @@
+ #include 
+ #include 
+ 
++#ifdef MAJOR_IN_MKDEV
++#include 
++#elif defined MAJOR_IN_SYSMACROS
++#include 
++#endif
++
+ #include "log.h"
+ #include "file.h"
+ #include "device.h"
+diff --git a/configure.ac b/configure.ac
+index 96305f7..dcae1e1 100644
+--- a/configure.ac
 b/configure.ac
+@@ -555,6 +555,8 @@ BRLTTY_ARG_DISABLE(
+ ])
+ AC_SUBST([install_messages])
+ 
++AC_HEADER_MAJOR
++
+ AC_CHECK_FUNC([wcslen], [AC_CHECK_HEADERS([wchar.h], [dnl
+AC_CHECK_FUNCS([wcwidth])
+ ])])
+diff --git a/config.h.in b/config.h.in
+index 71341c6..ff201c2 100644
+--- a/config.h.in
 b/config.h.in
+@@ -457,2 +457,10 @@ extern "C" {
+ 
++/* Define to 1 if `major', `minor', and `makedev' are declared in .
++   */
++#undef MAJOR_IN_MKDEV
++
++/* Define to 1 if `major', `minor', and `makedev' are declared in
++   . */
++#undef MAJOR_IN_SYSMACROS
++
+ /* Define this to be a string containing the path to the root of the 
Mikropuhe package. */
+diff --git a/Programs/brlapi_client.c b/Programs/brlapi_client.c
+index bd6497b..df63b30 100644
+--- a/Programs/brlapi_client.c
 b/Programs/brlapi_client.c
+@@ -32,2 +32,8 @@
+ 
++#ifdef MAJOR_IN_MKDEV
++#include 
++#elif defined MAJOR_IN_SYSMACROS
++#include 
++#endif
++
+ #ifndef __MINGW32__

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

2019-03-22 Thread Lars Wendler

commit: 91f4f99d403ec7f89ec2c23a91bb1a1dce4d9f4e
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Mar 22 14:58:47 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Mar 22 14:59:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f4f99d

app-accessibility/brltty: Bump to version 6.0

Closes: https://bugs.gentoo.org/632630
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 app-accessibility/brltty/Manifest  |   1 +
 app-accessibility/brltty/brltty-6.0.ebuild | 194 +
 .../brltty/files/brltty-6.0-udev.patch |  27 +++
 app-accessibility/brltty/files/brltty.rc   |   4 +-
 4 files changed, 224 insertions(+), 2 deletions(-)

diff --git a/app-accessibility/brltty/Manifest 
b/app-accessibility/brltty/Manifest
index 018608d0bc4..2618e8dd7d8 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1 +1,2 @@
 DIST brltty-5.2.tar.xz 2532684 BLAKE2B 
9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f
 SHA512 
8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f
+DIST brltty-6.0.tar.xz 2879976 BLAKE2B 
31bd45b63838d119d940492c615deb27ec47389c68afa39f19da3534324914695343344260799a10deae6ca3de41bedf9b0c1de1f78dbe01a89b694c2aa6e265
 SHA512 
07344fa902ad169967ca39d19b09dfea24e698011031dd63dce3eb997a4cb86622ee9427b216976b3ef60e5cbabb710a621621447c6bfa2313748fc1a1cf4b06

diff --git a/app-accessibility/brltty/brltty-6.0.ebuild 
b/app-accessibility/brltty/brltty-6.0.ebuild
new file mode 100644
index 000..badd7a11678
--- /dev/null
+++ b/app-accessibility/brltty/brltty-6.0.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+FINDLIB_USE="ocaml"
+
+inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
+   autotools udev systemd python-r1
+
+DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind 
person"
+HOMEPAGE="http://brltty.com/";
+SRC_URI="http://brltty.com/archive/${P}.tar.xz";
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
+   java +midi ncurses nls ocaml +pcm python usb +speech
+   tcl X"
+REQUIRED_USE="doc? ( api )
+   java? ( api )
+   ocaml? ( api )
+   python? ( api ${PYTHON_REQUIRED_USE} )
+   tcl? ( api )"
+
+COMMON_DEP="bluetooth? ( net-wireless/bluez )
+   gpm? ( >=sys-libs/gpm-1.20 )
+   iconv? ( virtual/libiconv )
+   icu? ( dev-libs/icu:= )
+   python? ( ${PYTHON_DEPS} )
+   ncurses? ( sys-libs/ncurses:0= )
+   nls? ( virtual/libintl )
+   tcl? ( >=dev-lang/tcl-8.4.15:0= )
+   usb? ( virtual/libusb:0 )
+   X? ( x11-libs/libXaw )"
+DEPEND="${COMMON_DEP}"
+BDEPEND="
+   virtual/pkgconfig
+   java? ( >=virtual/jdk-1.4 )
+   python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
+"
+RDEPEND="java? ( >=virtual/jre-1.4 )
+   ${COMMON_DEP}"
+
+HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-6.0-udev.patch
+   "${FILESDIR}"/${PN}-5.2-respect-AR.patch
+)
+
+src_prepare() {
+   default
+
+   java-pkg-opt-2_src_prepare
+
+   # The code runs `pkg-config` directly instead of locating a suitable
+   # pkg-config wrapper (or respecting $PKG_CONFIG).
+   sed -i \
+   -e 's/\/${PKG_CONFIG:-pkg-config}/' \
+   aclocal.m4 configure.ac || die
+
+   # We run eautoconf instead of using eautoreconf because brltty uses
+   # a custom build system that uses autoconf without the rest of the
+   # autotools.
+   eautoconf
+   python_copy_sources
+}
+
+src_configure() {
+   tc-export AR LD PKG_CONFIG
+   # override prefix in order to install into /
+   # braille terminal needs to be available as soon in the boot process as
+   # possible
+   # Also override localstatedir so that the lib/brltty directory is 
installed
+   # correctly.
+   # Disable stripping since we do that ourselves.
+   local myconf=(
+   --prefix="${EPREFIX}"/
+   --localedir="${EPREFIX}"/usr/share/locale
+   --includedir="${EPREFIX}"/usr/include
+   --localstatedir="${EPREFIX}"/var
+   --disable-stripping
+   --with-install-root="${D}"
+   --with-writable-directory="${EPREFIX}"/run/brltty
+   $(use_enable api)
+   $(use_with beeper beep-package)
+   $(use_enable contracted-braille)
+   $(use_with fm fm-package)
+   $(use_enable gpm)
+   $(us

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

2018-03-26 Thread Aaron Bauman

commit: 6326de87e9f6e14fe2cd72839e21a4cb45534b18
Author: Marty E. Plummer  startmail  com>
AuthorDate: Thu Mar 22 11:54:34 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Mar 26 20:19:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6326de87

app-accessibility/brltty: bump to EAPI 6

Also readjusted the epatch call to an eapply call, added
HTML_DOCS/einstalldocs as dohtml is deprecated on EAPI=6,
and adjusted the keepdir call to point at the correct directory.

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/7590

 app-accessibility/brltty/brltty-5.2-r1.ebuild  | 43 --
 .../brltty/files/brltty-5.2-respect-AR.patch   |  5 +--
 .../brltty/files/brltty-5.2-udev.patch |  5 +--
 3 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 8b9f34c0e4f..3622819ef62 100644
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 FINDLIB_USE="ocaml"
@@ -42,11 +42,17 @@ DEPEND="virtual/pkgconfig
 RDEPEND="java? ( >=virtual/jre-1.4 )
${COMMON_DEP}"
 
+HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-5.2-fix-ldflags.patch
+   "${FILESDIR}"/${PN}-5.2-udev.patch
+   "${FILESDIR}"/${PN}-5.2-respect-AR.patch
+   "${FILESDIR}"/${PN}-5.2-sysmacros.patch
+)
+
 src_prepare() {
-   epatch "${FILESDIR}"/${P}-fix-ldflags.patch \
-   "${FILESDIR}"/${P}-udev.patch \
-   "${FILESDIR}"/${P}-respect-AR.patch \
-   "${FILESDIR}"/${P}-sysmacros.patch
+   default
 
java-pkg-opt-2_src_prepare
 
@@ -163,30 +169,29 @@ src_install() {
 
libdir="$(get_libdir)"
mkdir -p "${D}"/usr/${libdir}/
-   mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/
+   mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/ || die
gen_usr_ldscript libbrlapi.so
 
-   cd Documents
-   mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt
-   mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt
-   mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt
+   cd Documents || die
+   mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt || die
+   mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt || die
+   mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt || die
dodoc CONTRIBUTORS ChangeLog HISTORY README* TODO BRLTTY-*.txt
-   dohtml -r Manual-BRLTTY
if use doc; then
-   dohtml -r Manual-BrlAPI
dodoc BrlAPI-*.txt
+   HTML_DOCS="Manual-BRLTTY" einstalldocs
fi
 
-   keepdir /var/lib/brlapi
-   rmdir "${D}/run/brltty"
-   rmdir "${D}/run"
+   keepdir /var/lib/BrlAPI
+   rmdir "${D}/run/brltty" || die
+   rmdir "${D}/run" || die
 }
 
 pkg_postinst() {
elog
-   elog please be sure "${ROOT}"etc/brltty.conf is correct for your system.
+   elog "please be sure ${ROOT}etc/brltty.conf is correct for your system."
elog
-   elog To make brltty start on boot, type this command as root:
+   elog "To make brltty start on boot, type this command as root:"
elog
-   elog rc-update add brltty boot
+   elog "rc-update add brltty boot"
 }

diff --git a/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch 
b/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
index 95451dc98b7..c5698a2b939 100644
--- a/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
+++ b/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
@@ -1,6 +1,5 @@
-diff -Naur brltty-5.2/Programs/Makefile.in brltty-5.2-new/Programs/Makefile.in
 brltty-5.2/Programs/Makefile.in2014-11-06 07:28:41.0 -0800
-+++ brltty-5.2-new/Programs/Makefile.in2014-11-20 05:41:57.144219093 
-0800
+--- a/Programs/Makefile.in
 b/Programs/Makefile.in
 @@ -434,7 +434,7 @@
[ ! -f lib.def ] || mv lib.def $(API_DEF)
  

diff --git a/app-accessibility/brltty/files/brltty-5.2-udev.patch 
b/app-accessibility/brltty/files/brltty-5.2-udev.patch
index dbbc2989766..e6d56603b01 100644
--- a/app-accessibility/brltty/files/brltty-5.2-udev.patch
+++ b/app-accessibility/brltty/files/brltty-5.2-udev.patch
@@ -1,6 +1,5 @@
-diff -Naur brltty-5.2/Autostart/Udev/udev.rules 
brltty-5.2-new/Autostart/Udev/udev.rules
 brltty-5.2/Autostart/Udev/udev.rules   2014-11-06 07:28:41.0 
-0800
-+++ brltty-5.2-new/Autostart/Udev/udev.rules   2014-11-20 05:28:44.404885312 
-0800
+--- a/Autostart/Udev/udev.rules
 b/Autostart/Udev/udev.rules
 @@ -182,20 +182,22 @@
  # FreedomScientific [Focus Blue]
  ENV{PRODUCT}

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

2017-12-04 Thread David Seifert

commit: 9972fed3f21b47e7315949e39f762d9b209c1fd5
Author: David Seifert  gentoo  org>
AuthorDate: Mon Dec  4 10:24:38 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Dec  4 10:25:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9972fed3

app-accessibility/brltty: [QA] Fix multiple issues

* Don't add dead python impls to PYTHON_COMPAT
* Don't remove python metadata vars (${PYTHON_REQUIRED_USE})
  from REQUIRED_USE
* Don't remove the SLOT specifier for sys-libs/ncurses
* Get rid of the awfully complicated, hacky and
  non-generalisable solution for the libtinfo split,
  which also doesn't generalise to Prefix.
  Using pkg-config is easier, safer, more portable and
  less brittle than the previous hacks.
* Get rid of the totally unnecessary code paths
  created by dispatching on glibc versions.
  'sys/sysmacros.h' can always be included on glibc,
  packages just have relied on this include implicitly.

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 app-accessibility/brltty/brltty-5.2-r1.ebuild| 12 +---
 .../brltty/files/brltty-5.2-sysmacros.patch  | 20 
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 12ea62ef94e..71cbc57d9d1 100644
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
 FINDLIB_USE="ocaml"
 
 inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
@@ -22,7 +22,7 @@ IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm 
iconv icu
 REQUIRED_USE="doc? ( api )
java? ( api )
ocaml? ( api )
-   python? ( api )
+   python? ( api ${PYTHON_REQUIRED_USE} )
tcl? ( api )"
 
 COMMON_DEP="bluetooth? ( net-wireless/bluez )
@@ -30,7 +30,7 @@ COMMON_DEP="bluetooth? ( net-wireless/bluez )
iconv? ( virtual/libiconv )
icu? ( dev-libs/icu:= )
python? ( ${PYTHON_DEPS} )
-   ncurses? ( sys-libs/ncurses:= )
+   ncurses? ( sys-libs/ncurses:0= )
nls? ( virtual/libintl )
tcl? ( >=dev-lang/tcl-8.4.15:0= )
usb? ( virtual/libusb:0 )
@@ -64,10 +64,8 @@ src_prepare() {
 }
 
 src_configure() {
-   filter-flags "_*_SOURCE*"
-   append-cppflags -D_DEFAULT_SOURCE
-   has_version ">=sys-libs/glibc-2.25-r5" && append-cppflags 
-DHAVE_SYS_SYSMACROS_H
-   has_version "sys-libs/ncurses[tinfo]" && append-libs -ltinfo
+   append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
+   append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
 
tc-export AR LD PKG_CONFIG
# override prefix in order to install into /

diff --git a/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch 
b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
index d45d6104e4b..f33e46a1890 100644
--- a/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
+++ b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
@@ -1,24 +1,20 @@
 a/Programs/system_linux.c  2017-12-02 12:54:34.098643832 -0800
-+++ b/Programs/system_linux.c  2017-12-02 12:59:00.683592161 -0800
-@@ -24,6 +24,9 @@
+--- a/Programs/system_linux.c
 b/Programs/system_linux.c
+@@ -24,6 +24,7 @@
  #include 
  #include 
  #include 
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include   /* major() w/newer glibc */
-+#endif
++#include 
  
  #include "log.h"
  #include "file.h"
 a/Programs/brlapi_client.c 2017-12-02 14:29:37.524205316 -0800
-+++ b/Programs/brlapi_client.c 2017-12-02 14:32:45.679948051 -0800
-@@ -73,6 +73,9 @@
+--- a/Programs/brlapi_client.c
 b/Programs/brlapi_client.c
+@@ -73,6 +73,7 @@
  #include 
  #include 
  #define MAXIMUM_VIRTUAL_CONSOLE MAX_NR_CONSOLES
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include   /* major() w/newer glibc */
-+#endif
++#include 
  #endif /* linux */
  
  #ifdef __OpenBSD__

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

2019-03-22 Thread Lars Wendler

commit: 91f4f99d403ec7f89ec2c23a91bb1a1dce4d9f4e
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Mar 22 14:58:47 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Mar 22 14:59:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f4f99d

app-accessibility/brltty: Bump to version 6.0

Closes: https://bugs.gentoo.org/632630
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 app-accessibility/brltty/Manifest  |   1 +
 app-accessibility/brltty/brltty-6.0.ebuild | 194 +
 .../brltty/files/brltty-6.0-udev.patch |  27 +++
 app-accessibility/brltty/files/brltty.rc   |   4 +-
 4 files changed, 224 insertions(+), 2 deletions(-)

diff --git a/app-accessibility/brltty/Manifest 
b/app-accessibility/brltty/Manifest
index 018608d0bc4..2618e8dd7d8 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1 +1,2 @@
 DIST brltty-5.2.tar.xz 2532684 BLAKE2B 
9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f
 SHA512 
8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f
+DIST brltty-6.0.tar.xz 2879976 BLAKE2B 
31bd45b63838d119d940492c615deb27ec47389c68afa39f19da3534324914695343344260799a10deae6ca3de41bedf9b0c1de1f78dbe01a89b694c2aa6e265
 SHA512 
07344fa902ad169967ca39d19b09dfea24e698011031dd63dce3eb997a4cb86622ee9427b216976b3ef60e5cbabb710a621621447c6bfa2313748fc1a1cf4b06

diff --git a/app-accessibility/brltty/brltty-6.0.ebuild 
b/app-accessibility/brltty/brltty-6.0.ebuild
new file mode 100644
index 000..badd7a11678
--- /dev/null
+++ b/app-accessibility/brltty/brltty-6.0.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+FINDLIB_USE="ocaml"
+
+inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
+   autotools udev systemd python-r1
+
+DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind 
person"
+HOMEPAGE="http://brltty.com/";
+SRC_URI="http://brltty.com/archive/${P}.tar.xz";
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
+   java +midi ncurses nls ocaml +pcm python usb +speech
+   tcl X"
+REQUIRED_USE="doc? ( api )
+   java? ( api )
+   ocaml? ( api )
+   python? ( api ${PYTHON_REQUIRED_USE} )
+   tcl? ( api )"
+
+COMMON_DEP="bluetooth? ( net-wireless/bluez )
+   gpm? ( >=sys-libs/gpm-1.20 )
+   iconv? ( virtual/libiconv )
+   icu? ( dev-libs/icu:= )
+   python? ( ${PYTHON_DEPS} )
+   ncurses? ( sys-libs/ncurses:0= )
+   nls? ( virtual/libintl )
+   tcl? ( >=dev-lang/tcl-8.4.15:0= )
+   usb? ( virtual/libusb:0 )
+   X? ( x11-libs/libXaw )"
+DEPEND="${COMMON_DEP}"
+BDEPEND="
+   virtual/pkgconfig
+   java? ( >=virtual/jdk-1.4 )
+   python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
+"
+RDEPEND="java? ( >=virtual/jre-1.4 )
+   ${COMMON_DEP}"
+
+HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-6.0-udev.patch
+   "${FILESDIR}"/${PN}-5.2-respect-AR.patch
+)
+
+src_prepare() {
+   default
+
+   java-pkg-opt-2_src_prepare
+
+   # The code runs `pkg-config` directly instead of locating a suitable
+   # pkg-config wrapper (or respecting $PKG_CONFIG).
+   sed -i \
+   -e 's/\/${PKG_CONFIG:-pkg-config}/' \
+   aclocal.m4 configure.ac || die
+
+   # We run eautoconf instead of using eautoreconf because brltty uses
+   # a custom build system that uses autoconf without the rest of the
+   # autotools.
+   eautoconf
+   python_copy_sources
+}
+
+src_configure() {
+   tc-export AR LD PKG_CONFIG
+   # override prefix in order to install into /
+   # braille terminal needs to be available as soon in the boot process as
+   # possible
+   # Also override localstatedir so that the lib/brltty directory is 
installed
+   # correctly.
+   # Disable stripping since we do that ourselves.
+   local myconf=(
+   --prefix="${EPREFIX}"/
+   --localedir="${EPREFIX}"/usr/share/locale
+   --includedir="${EPREFIX}"/usr/include
+   --localstatedir="${EPREFIX}"/var
+   --disable-stripping
+   --with-install-root="${D}"
+   --with-writable-directory="${EPREFIX}"/run/brltty
+   $(use_enable api)
+   $(use_with beeper beep-package)
+   $(use_enable contracted-braille)
+   $(use_with fm fm-package)
+   $(use_enable gpm)
+   $(us

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

2017-12-04 Thread David Seifert

commit: 9972fed3f21b47e7315949e39f762d9b209c1fd5
Author: David Seifert  gentoo  org>
AuthorDate: Mon Dec  4 10:24:38 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Dec  4 10:25:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9972fed3

app-accessibility/brltty: [QA] Fix multiple issues

* Don't add dead python impls to PYTHON_COMPAT
* Don't remove python metadata vars (${PYTHON_REQUIRED_USE})
  from REQUIRED_USE
* Don't remove the SLOT specifier for sys-libs/ncurses
* Get rid of the awfully complicated, hacky and
  non-generalisable solution for the libtinfo split,
  which also doesn't generalise to Prefix.
  Using pkg-config is easier, safer, more portable and
  less brittle than the previous hacks.
* Get rid of the totally unnecessary code paths
  created by dispatching on glibc versions.
  'sys/sysmacros.h' can always be included on glibc,
  packages just have relied on this include implicitly.

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 app-accessibility/brltty/brltty-5.2-r1.ebuild| 12 +---
 .../brltty/files/brltty-5.2-sysmacros.patch  | 20 
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 12ea62ef94e..71cbc57d9d1 100644
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
 FINDLIB_USE="ocaml"
 
 inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
@@ -22,7 +22,7 @@ IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm 
iconv icu
 REQUIRED_USE="doc? ( api )
java? ( api )
ocaml? ( api )
-   python? ( api )
+   python? ( api ${PYTHON_REQUIRED_USE} )
tcl? ( api )"
 
 COMMON_DEP="bluetooth? ( net-wireless/bluez )
@@ -30,7 +30,7 @@ COMMON_DEP="bluetooth? ( net-wireless/bluez )
iconv? ( virtual/libiconv )
icu? ( dev-libs/icu:= )
python? ( ${PYTHON_DEPS} )
-   ncurses? ( sys-libs/ncurses:= )
+   ncurses? ( sys-libs/ncurses:0= )
nls? ( virtual/libintl )
tcl? ( >=dev-lang/tcl-8.4.15:0= )
usb? ( virtual/libusb:0 )
@@ -64,10 +64,8 @@ src_prepare() {
 }
 
 src_configure() {
-   filter-flags "_*_SOURCE*"
-   append-cppflags -D_DEFAULT_SOURCE
-   has_version ">=sys-libs/glibc-2.25-r5" && append-cppflags 
-DHAVE_SYS_SYSMACROS_H
-   has_version "sys-libs/ncurses[tinfo]" && append-libs -ltinfo
+   append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
+   append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
 
tc-export AR LD PKG_CONFIG
# override prefix in order to install into /

diff --git a/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch 
b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
index d45d6104e4b..f33e46a1890 100644
--- a/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
+++ b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
@@ -1,24 +1,20 @@
 a/Programs/system_linux.c  2017-12-02 12:54:34.098643832 -0800
-+++ b/Programs/system_linux.c  2017-12-02 12:59:00.683592161 -0800
-@@ -24,6 +24,9 @@
+--- a/Programs/system_linux.c
 b/Programs/system_linux.c
+@@ -24,6 +24,7 @@
  #include 
  #include 
  #include 
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include   /* major() w/newer glibc */
-+#endif
++#include 
  
  #include "log.h"
  #include "file.h"
 a/Programs/brlapi_client.c 2017-12-02 14:29:37.524205316 -0800
-+++ b/Programs/brlapi_client.c 2017-12-02 14:32:45.679948051 -0800
-@@ -73,6 +73,9 @@
+--- a/Programs/brlapi_client.c
 b/Programs/brlapi_client.c
+@@ -73,6 +73,7 @@
  #include 
  #include 
  #define MAXIMUM_VIRTUAL_CONSOLE MAX_NR_CONSOLES
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include   /* major() w/newer glibc */
-+#endif
++#include 
  #endif /* linux */
  
  #ifdef __OpenBSD__

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

2018-03-26 Thread Aaron Bauman

commit: 6326de87e9f6e14fe2cd72839e21a4cb45534b18
Author: Marty E. Plummer  startmail  com>
AuthorDate: Thu Mar 22 11:54:34 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Mar 26 20:19:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6326de87

app-accessibility/brltty: bump to EAPI 6

Also readjusted the epatch call to an eapply call, added
HTML_DOCS/einstalldocs as dohtml is deprecated on EAPI=6,
and adjusted the keepdir call to point at the correct directory.

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/7590

 app-accessibility/brltty/brltty-5.2-r1.ebuild  | 43 --
 .../brltty/files/brltty-5.2-respect-AR.patch   |  5 +--
 .../brltty/files/brltty-5.2-udev.patch |  5 +--
 3 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 8b9f34c0e4f..3622819ef62 100644
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 FINDLIB_USE="ocaml"
@@ -42,11 +42,17 @@ DEPEND="virtual/pkgconfig
 RDEPEND="java? ( >=virtual/jre-1.4 )
${COMMON_DEP}"
 
+HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-5.2-fix-ldflags.patch
+   "${FILESDIR}"/${PN}-5.2-udev.patch
+   "${FILESDIR}"/${PN}-5.2-respect-AR.patch
+   "${FILESDIR}"/${PN}-5.2-sysmacros.patch
+)
+
 src_prepare() {
-   epatch "${FILESDIR}"/${P}-fix-ldflags.patch \
-   "${FILESDIR}"/${P}-udev.patch \
-   "${FILESDIR}"/${P}-respect-AR.patch \
-   "${FILESDIR}"/${P}-sysmacros.patch
+   default
 
java-pkg-opt-2_src_prepare
 
@@ -163,30 +169,29 @@ src_install() {
 
libdir="$(get_libdir)"
mkdir -p "${D}"/usr/${libdir}/
-   mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/
+   mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/ || die
gen_usr_ldscript libbrlapi.so
 
-   cd Documents
-   mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt
-   mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt
-   mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt
+   cd Documents || die
+   mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt || die
+   mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt || die
+   mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt || die
dodoc CONTRIBUTORS ChangeLog HISTORY README* TODO BRLTTY-*.txt
-   dohtml -r Manual-BRLTTY
if use doc; then
-   dohtml -r Manual-BrlAPI
dodoc BrlAPI-*.txt
+   HTML_DOCS="Manual-BRLTTY" einstalldocs
fi
 
-   keepdir /var/lib/brlapi
-   rmdir "${D}/run/brltty"
-   rmdir "${D}/run"
+   keepdir /var/lib/BrlAPI
+   rmdir "${D}/run/brltty" || die
+   rmdir "${D}/run" || die
 }
 
 pkg_postinst() {
elog
-   elog please be sure "${ROOT}"etc/brltty.conf is correct for your system.
+   elog "please be sure ${ROOT}etc/brltty.conf is correct for your system."
elog
-   elog To make brltty start on boot, type this command as root:
+   elog "To make brltty start on boot, type this command as root:"
elog
-   elog rc-update add brltty boot
+   elog "rc-update add brltty boot"
 }

diff --git a/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch 
b/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
index 95451dc98b7..c5698a2b939 100644
--- a/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
+++ b/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
@@ -1,6 +1,5 @@
-diff -Naur brltty-5.2/Programs/Makefile.in brltty-5.2-new/Programs/Makefile.in
 brltty-5.2/Programs/Makefile.in2014-11-06 07:28:41.0 -0800
-+++ brltty-5.2-new/Programs/Makefile.in2014-11-20 05:41:57.144219093 
-0800
+--- a/Programs/Makefile.in
 b/Programs/Makefile.in
 @@ -434,7 +434,7 @@
[ ! -f lib.def ] || mv lib.def $(API_DEF)
  

diff --git a/app-accessibility/brltty/files/brltty-5.2-udev.patch 
b/app-accessibility/brltty/files/brltty-5.2-udev.patch
index dbbc2989766..e6d56603b01 100644
--- a/app-accessibility/brltty/files/brltty-5.2-udev.patch
+++ b/app-accessibility/brltty/files/brltty-5.2-udev.patch
@@ -1,6 +1,5 @@
-diff -Naur brltty-5.2/Autostart/Udev/udev.rules 
brltty-5.2-new/Autostart/Udev/udev.rules
 brltty-5.2/Autostart/Udev/udev.rules   2014-11-06 07:28:41.0 
-0800
-+++ brltty-5.2-new/Autostart/Udev/udev.rules   2014-11-20 05:28:44.404885312 
-0800
+--- a/Autostart/Udev/udev.rules
 b/Autostart/Udev/udev.rules
 @@ -182,20 +182,22 @@
  # FreedomScientific [Focus Blue]
  ENV{PRODUCT}

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

2020-08-13 Thread Michał Górny

commit: fb676f5c2d2ebd24423e35585ed567566b269aa2
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Aug 13 20:13:57 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Aug 13 20:25:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb676f5c

app-accessibility/brltty: Remove old (py3.6)

Signed-off-by: Michał Górny  gentoo.org>

 app-accessibility/brltty/Manifest  |   1 -
 app-accessibility/brltty/brltty-5.2-r1.ebuild  | 197 -
 .../brltty/files/brltty-5.2-fix-ldflags.patch  |  56 --
 .../brltty/files/brltty-5.2-sysmacros.patch|  20 ---
 .../brltty/files/brltty-5.2-udev.patch |  27 ---
 5 files changed, 301 deletions(-)

diff --git a/app-accessibility/brltty/Manifest 
b/app-accessibility/brltty/Manifest
index 2618e8dd7d8..5057b79d6e5 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1,2 +1 @@
-DIST brltty-5.2.tar.xz 2532684 BLAKE2B 
9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f
 SHA512 
8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f
 DIST brltty-6.0.tar.xz 2879976 BLAKE2B 
31bd45b63838d119d940492c615deb27ec47389c68afa39f19da3534324914695343344260799a10deae6ca3de41bedf9b0c1de1f78dbe01a89b694c2aa6e265
 SHA512 
07344fa902ad169967ca39d19b09dfea24e698011031dd63dce3eb997a4cb86622ee9427b216976b3ef60e5cbabb710a621621447c6bfa2313748fc1a1cf4b06

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
deleted file mode 100644
index 64b28132085..000
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-FINDLIB_USE="ocaml"
-
-inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic 
usr-ldscript \
-   autotools udev systemd python-r1
-
-DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind 
person"
-HOMEPAGE="https://brltty.app/";
-SRC_URI="https://brltty.app/archive/${P}.tar.xz";
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 x86"
-IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
-   java +midi ncurses nls ocaml +pcm python usb +speech
-   tcl X"
-REQUIRED_USE="doc? ( api )
-   java? ( api )
-   ocaml? ( api )
-   python? ( api ${PYTHON_REQUIRED_USE} )
-   tcl? ( api )"
-
-COMMON_DEP="bluetooth? ( net-wireless/bluez )
-   gpm? ( >=sys-libs/gpm-1.20 )
-   iconv? ( virtual/libiconv )
-   icu? ( dev-libs/icu:= )
-   python? ( ${PYTHON_DEPS} )
-   ncurses? ( sys-libs/ncurses:0= )
-   nls? ( virtual/libintl )
-   tcl? ( >=dev-lang/tcl-8.4.15:0= )
-   usb? ( virtual/libusb:0 )
-   X? ( x11-libs/libXaw )"
-DEPEND="virtual/pkgconfig
-   java? ( >=virtual/jdk-1.4 )
-   python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
-   ${COMMON_DEP}"
-RDEPEND="java? ( >=virtual/jre-1.4 )
-   ${COMMON_DEP}"
-
-HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-5.2-fix-ldflags.patch
-   "${FILESDIR}"/${PN}-5.2-udev.patch
-   "${FILESDIR}"/${PN}-5.2-respect-AR.patch
-   "${FILESDIR}"/${PN}-5.2-sysmacros.patch
-)
-
-src_prepare() {
-   default
-
-   java-pkg-opt-2_src_prepare
-
-   # The code runs `pkg-config` directly instead of locating a suitable
-   # pkg-config wrapper (or respecting $PKG_CONFIG).
-   sed -i \
-   -e 's/\/${PKG_CONFIG:-pkg-config}/' \
-   aclocal.m4 configure.ac || die
-
-   # We run eautoconf instead of using eautoreconf because brltty uses
-   # a custom build system that uses autoconf without the rest of the
-   # autotools.
-   eautoconf
-   python_copy_sources
-}
-
-src_configure() {
-   append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
-   append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
-
-   tc-export AR LD PKG_CONFIG
-   # override prefix in order to install into /
-   # braille terminal needs to be available as soon in the boot process as
-   # possible
-   # Also override localstatedir so that the lib/brltty directory is 
installed
-   # correctly.
-   # Disable stripping since we do that ourselves.
-   local myconf=(
-   --prefix=/
-   --localedir=/usr/share/locale
-   --includedir=/usr/include
-   --localstatedir=/var
-   --disable-stripping
-   --with-install-root="${D}"
-   --with-writable-directory="/run/brltty"
-   $(use_enable api)
-   $(use_with beeper beep-package)
-   $(use_e

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

2020-08-13 Thread Michał Górny

commit: fb676f5c2d2ebd24423e35585ed567566b269aa2
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Aug 13 20:13:57 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Aug 13 20:25:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb676f5c

app-accessibility/brltty: Remove old (py3.6)

Signed-off-by: Michał Górny  gentoo.org>

 app-accessibility/brltty/Manifest  |   1 -
 app-accessibility/brltty/brltty-5.2-r1.ebuild  | 197 -
 .../brltty/files/brltty-5.2-fix-ldflags.patch  |  56 --
 .../brltty/files/brltty-5.2-sysmacros.patch|  20 ---
 .../brltty/files/brltty-5.2-udev.patch |  27 ---
 5 files changed, 301 deletions(-)

diff --git a/app-accessibility/brltty/Manifest 
b/app-accessibility/brltty/Manifest
index 2618e8dd7d8..5057b79d6e5 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1,2 +1 @@
-DIST brltty-5.2.tar.xz 2532684 BLAKE2B 
9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f
 SHA512 
8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f
 DIST brltty-6.0.tar.xz 2879976 BLAKE2B 
31bd45b63838d119d940492c615deb27ec47389c68afa39f19da3534324914695343344260799a10deae6ca3de41bedf9b0c1de1f78dbe01a89b694c2aa6e265
 SHA512 
07344fa902ad169967ca39d19b09dfea24e698011031dd63dce3eb997a4cb86622ee9427b216976b3ef60e5cbabb710a621621447c6bfa2313748fc1a1cf4b06

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
deleted file mode 100644
index 64b28132085..000
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-FINDLIB_USE="ocaml"
-
-inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic 
usr-ldscript \
-   autotools udev systemd python-r1
-
-DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind 
person"
-HOMEPAGE="https://brltty.app/";
-SRC_URI="https://brltty.app/archive/${P}.tar.xz";
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 x86"
-IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
-   java +midi ncurses nls ocaml +pcm python usb +speech
-   tcl X"
-REQUIRED_USE="doc? ( api )
-   java? ( api )
-   ocaml? ( api )
-   python? ( api ${PYTHON_REQUIRED_USE} )
-   tcl? ( api )"
-
-COMMON_DEP="bluetooth? ( net-wireless/bluez )
-   gpm? ( >=sys-libs/gpm-1.20 )
-   iconv? ( virtual/libiconv )
-   icu? ( dev-libs/icu:= )
-   python? ( ${PYTHON_DEPS} )
-   ncurses? ( sys-libs/ncurses:0= )
-   nls? ( virtual/libintl )
-   tcl? ( >=dev-lang/tcl-8.4.15:0= )
-   usb? ( virtual/libusb:0 )
-   X? ( x11-libs/libXaw )"
-DEPEND="virtual/pkgconfig
-   java? ( >=virtual/jdk-1.4 )
-   python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
-   ${COMMON_DEP}"
-RDEPEND="java? ( >=virtual/jre-1.4 )
-   ${COMMON_DEP}"
-
-HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-5.2-fix-ldflags.patch
-   "${FILESDIR}"/${PN}-5.2-udev.patch
-   "${FILESDIR}"/${PN}-5.2-respect-AR.patch
-   "${FILESDIR}"/${PN}-5.2-sysmacros.patch
-)
-
-src_prepare() {
-   default
-
-   java-pkg-opt-2_src_prepare
-
-   # The code runs `pkg-config` directly instead of locating a suitable
-   # pkg-config wrapper (or respecting $PKG_CONFIG).
-   sed -i \
-   -e 's/\/${PKG_CONFIG:-pkg-config}/' \
-   aclocal.m4 configure.ac || die
-
-   # We run eautoconf instead of using eautoreconf because brltty uses
-   # a custom build system that uses autoconf without the rest of the
-   # autotools.
-   eautoconf
-   python_copy_sources
-}
-
-src_configure() {
-   append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
-   append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
-
-   tc-export AR LD PKG_CONFIG
-   # override prefix in order to install into /
-   # braille terminal needs to be available as soon in the boot process as
-   # possible
-   # Also override localstatedir so that the lib/brltty directory is 
installed
-   # correctly.
-   # Disable stripping since we do that ourselves.
-   local myconf=(
-   --prefix=/
-   --localedir=/usr/share/locale
-   --includedir=/usr/include
-   --localstatedir=/var
-   --disable-stripping
-   --with-install-root="${D}"
-   --with-writable-directory="/run/brltty"
-   $(use_enable api)
-   $(use_with beeper beep-package)
-   $(use_e

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

2016-11-28 Thread Sergei Trofimovich

commit: 433c45c715bdee3e008e924a7475080e79e0aa25
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Nov 28 09:21:08 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Nov 28 09:21:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=433c45c7

app-accessibility/brltty: fix makedev() autodetection, bug #581130

Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/581130

Package-Manager: portage-2.3.2

 app-accessibility/brltty/brltty-5.2-r1.ebuild  |  5 +-
 .../brltty/files/brltty-5.2-major.patch| 59 ++
 2 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 80195c7..46daab6 100644
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -31,7 +31,7 @@ COMMON_DEP="bluetooth? ( net-wireless/bluez )
iconv? ( virtual/libiconv )
icu? ( dev-libs/icu:= )
python? ( ${PYTHON_DEPS} )
-   ncurses? ( sys-libs/ncurses )
+   ncurses? ( sys-libs/ncurses:0= )
nls? ( virtual/libintl )
tcl? ( >=dev-lang/tcl-8.4.15:0= )
usb? ( virtual/libusb:0 )
@@ -46,7 +46,8 @@ RDEPEND="java? ( >=virtual/jre-1.4 )
 src_prepare() {
epatch "${FILESDIR}"/${P}-fix-ldflags.patch \
"${FILESDIR}"/${P}-udev.patch \
-   "${FILESDIR}"/${P}-respect-AR.patch
+   "${FILESDIR}"/${P}-respect-AR.patch \
+   "${FILESDIR}"/${P}-major.patch
 
java-pkg-opt-2_src_prepare
 

diff --git a/app-accessibility/brltty/files/brltty-5.2-major.patch 
b/app-accessibility/brltty/files/brltty-5.2-major.patch
new file mode 100644
index ..7c591b1
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-5.2-major.patch
@@ -0,0 +1,59 @@
+Bug: https://bugs.gentoo.org/581130
+diff --git a/Programs/system_linux.c b/Programs/system_linux.c
+index c73bd39..ef7d807 100644
+--- a/Programs/system_linux.c
 b/Programs/system_linux.c
+@@ -25,6 +25,12 @@
+ #include 
+ #include 
+ 
++#ifdef MAJOR_IN_MKDEV
++#include 
++#elif defined MAJOR_IN_SYSMACROS
++#include 
++#endif
++
+ #include "log.h"
+ #include "file.h"
+ #include "device.h"
+diff --git a/configure.ac b/configure.ac
+index 96305f7..dcae1e1 100644
+--- a/configure.ac
 b/configure.ac
+@@ -555,6 +555,8 @@ BRLTTY_ARG_DISABLE(
+ ])
+ AC_SUBST([install_messages])
+ 
++AC_HEADER_MAJOR
++
+ AC_CHECK_FUNC([wcslen], [AC_CHECK_HEADERS([wchar.h], [dnl
+AC_CHECK_FUNCS([wcwidth])
+ ])])
+diff --git a/config.h.in b/config.h.in
+index 71341c6..ff201c2 100644
+--- a/config.h.in
 b/config.h.in
+@@ -457,2 +457,10 @@ extern "C" {
+ 
++/* Define to 1 if `major', `minor', and `makedev' are declared in .
++   */
++#undef MAJOR_IN_MKDEV
++
++/* Define to 1 if `major', `minor', and `makedev' are declared in
++   . */
++#undef MAJOR_IN_SYSMACROS
++
+ /* Define this to be a string containing the path to the root of the 
Mikropuhe package. */
+diff --git a/Programs/brlapi_client.c b/Programs/brlapi_client.c
+index bd6497b..df63b30 100644
+--- a/Programs/brlapi_client.c
 b/Programs/brlapi_client.c
+@@ -32,2 +32,8 @@
+ 
++#ifdef MAJOR_IN_MKDEV
++#include 
++#elif defined MAJOR_IN_SYSMACROS
++#include 
++#endif
++
+ #ifndef __MINGW32__

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

2018-03-26 Thread Aaron Bauman

commit: 6326de87e9f6e14fe2cd72839e21a4cb45534b18
Author: Marty E. Plummer  startmail  com>
AuthorDate: Thu Mar 22 11:54:34 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Mar 26 20:19:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6326de87

app-accessibility/brltty: bump to EAPI 6

Also readjusted the epatch call to an eapply call, added
HTML_DOCS/einstalldocs as dohtml is deprecated on EAPI=6,
and adjusted the keepdir call to point at the correct directory.

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/7590

 app-accessibility/brltty/brltty-5.2-r1.ebuild  | 43 --
 .../brltty/files/brltty-5.2-respect-AR.patch   |  5 +--
 .../brltty/files/brltty-5.2-udev.patch |  5 +--
 3 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 8b9f34c0e4f..3622819ef62 100644
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 FINDLIB_USE="ocaml"
@@ -42,11 +42,17 @@ DEPEND="virtual/pkgconfig
 RDEPEND="java? ( >=virtual/jre-1.4 )
${COMMON_DEP}"
 
+HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-5.2-fix-ldflags.patch
+   "${FILESDIR}"/${PN}-5.2-udev.patch
+   "${FILESDIR}"/${PN}-5.2-respect-AR.patch
+   "${FILESDIR}"/${PN}-5.2-sysmacros.patch
+)
+
 src_prepare() {
-   epatch "${FILESDIR}"/${P}-fix-ldflags.patch \
-   "${FILESDIR}"/${P}-udev.patch \
-   "${FILESDIR}"/${P}-respect-AR.patch \
-   "${FILESDIR}"/${P}-sysmacros.patch
+   default
 
java-pkg-opt-2_src_prepare
 
@@ -163,30 +169,29 @@ src_install() {
 
libdir="$(get_libdir)"
mkdir -p "${D}"/usr/${libdir}/
-   mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/
+   mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/ || die
gen_usr_ldscript libbrlapi.so
 
-   cd Documents
-   mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt
-   mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt
-   mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt
+   cd Documents || die
+   mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt || die
+   mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt || die
+   mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt || die
dodoc CONTRIBUTORS ChangeLog HISTORY README* TODO BRLTTY-*.txt
-   dohtml -r Manual-BRLTTY
if use doc; then
-   dohtml -r Manual-BrlAPI
dodoc BrlAPI-*.txt
+   HTML_DOCS="Manual-BRLTTY" einstalldocs
fi
 
-   keepdir /var/lib/brlapi
-   rmdir "${D}/run/brltty"
-   rmdir "${D}/run"
+   keepdir /var/lib/BrlAPI
+   rmdir "${D}/run/brltty" || die
+   rmdir "${D}/run" || die
 }
 
 pkg_postinst() {
elog
-   elog please be sure "${ROOT}"etc/brltty.conf is correct for your system.
+   elog "please be sure ${ROOT}etc/brltty.conf is correct for your system."
elog
-   elog To make brltty start on boot, type this command as root:
+   elog "To make brltty start on boot, type this command as root:"
elog
-   elog rc-update add brltty boot
+   elog "rc-update add brltty boot"
 }

diff --git a/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch 
b/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
index 95451dc98b7..c5698a2b939 100644
--- a/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
+++ b/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
@@ -1,6 +1,5 @@
-diff -Naur brltty-5.2/Programs/Makefile.in brltty-5.2-new/Programs/Makefile.in
 brltty-5.2/Programs/Makefile.in2014-11-06 07:28:41.0 -0800
-+++ brltty-5.2-new/Programs/Makefile.in2014-11-20 05:41:57.144219093 
-0800
+--- a/Programs/Makefile.in
 b/Programs/Makefile.in
 @@ -434,7 +434,7 @@
[ ! -f lib.def ] || mv lib.def $(API_DEF)
  

diff --git a/app-accessibility/brltty/files/brltty-5.2-udev.patch 
b/app-accessibility/brltty/files/brltty-5.2-udev.patch
index dbbc2989766..e6d56603b01 100644
--- a/app-accessibility/brltty/files/brltty-5.2-udev.patch
+++ b/app-accessibility/brltty/files/brltty-5.2-udev.patch
@@ -1,6 +1,5 @@
-diff -Naur brltty-5.2/Autostart/Udev/udev.rules 
brltty-5.2-new/Autostart/Udev/udev.rules
 brltty-5.2/Autostart/Udev/udev.rules   2014-11-06 07:28:41.0 
-0800
-+++ brltty-5.2-new/Autostart/Udev/udev.rules   2014-11-20 05:28:44.404885312 
-0800
+--- a/Autostart/Udev/udev.rules
 b/Autostart/Udev/udev.rules
 @@ -182,20 +182,22 @@
  # FreedomScientific [Focus Blue]
  ENV{PRODUCT}

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

2019-03-22 Thread Lars Wendler

commit: 91f4f99d403ec7f89ec2c23a91bb1a1dce4d9f4e
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Mar 22 14:58:47 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Mar 22 14:59:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f4f99d

app-accessibility/brltty: Bump to version 6.0

Closes: https://bugs.gentoo.org/632630
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 app-accessibility/brltty/Manifest  |   1 +
 app-accessibility/brltty/brltty-6.0.ebuild | 194 +
 .../brltty/files/brltty-6.0-udev.patch |  27 +++
 app-accessibility/brltty/files/brltty.rc   |   4 +-
 4 files changed, 224 insertions(+), 2 deletions(-)

diff --git a/app-accessibility/brltty/Manifest 
b/app-accessibility/brltty/Manifest
index 018608d0bc4..2618e8dd7d8 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1 +1,2 @@
 DIST brltty-5.2.tar.xz 2532684 BLAKE2B 
9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f
 SHA512 
8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f
+DIST brltty-6.0.tar.xz 2879976 BLAKE2B 
31bd45b63838d119d940492c615deb27ec47389c68afa39f19da3534324914695343344260799a10deae6ca3de41bedf9b0c1de1f78dbe01a89b694c2aa6e265
 SHA512 
07344fa902ad169967ca39d19b09dfea24e698011031dd63dce3eb997a4cb86622ee9427b216976b3ef60e5cbabb710a621621447c6bfa2313748fc1a1cf4b06

diff --git a/app-accessibility/brltty/brltty-6.0.ebuild 
b/app-accessibility/brltty/brltty-6.0.ebuild
new file mode 100644
index 000..badd7a11678
--- /dev/null
+++ b/app-accessibility/brltty/brltty-6.0.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+FINDLIB_USE="ocaml"
+
+inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
+   autotools udev systemd python-r1
+
+DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind 
person"
+HOMEPAGE="http://brltty.com/";
+SRC_URI="http://brltty.com/archive/${P}.tar.xz";
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
+   java +midi ncurses nls ocaml +pcm python usb +speech
+   tcl X"
+REQUIRED_USE="doc? ( api )
+   java? ( api )
+   ocaml? ( api )
+   python? ( api ${PYTHON_REQUIRED_USE} )
+   tcl? ( api )"
+
+COMMON_DEP="bluetooth? ( net-wireless/bluez )
+   gpm? ( >=sys-libs/gpm-1.20 )
+   iconv? ( virtual/libiconv )
+   icu? ( dev-libs/icu:= )
+   python? ( ${PYTHON_DEPS} )
+   ncurses? ( sys-libs/ncurses:0= )
+   nls? ( virtual/libintl )
+   tcl? ( >=dev-lang/tcl-8.4.15:0= )
+   usb? ( virtual/libusb:0 )
+   X? ( x11-libs/libXaw )"
+DEPEND="${COMMON_DEP}"
+BDEPEND="
+   virtual/pkgconfig
+   java? ( >=virtual/jdk-1.4 )
+   python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
+"
+RDEPEND="java? ( >=virtual/jre-1.4 )
+   ${COMMON_DEP}"
+
+HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-6.0-udev.patch
+   "${FILESDIR}"/${PN}-5.2-respect-AR.patch
+)
+
+src_prepare() {
+   default
+
+   java-pkg-opt-2_src_prepare
+
+   # The code runs `pkg-config` directly instead of locating a suitable
+   # pkg-config wrapper (or respecting $PKG_CONFIG).
+   sed -i \
+   -e 's/\/${PKG_CONFIG:-pkg-config}/' \
+   aclocal.m4 configure.ac || die
+
+   # We run eautoconf instead of using eautoreconf because brltty uses
+   # a custom build system that uses autoconf without the rest of the
+   # autotools.
+   eautoconf
+   python_copy_sources
+}
+
+src_configure() {
+   tc-export AR LD PKG_CONFIG
+   # override prefix in order to install into /
+   # braille terminal needs to be available as soon in the boot process as
+   # possible
+   # Also override localstatedir so that the lib/brltty directory is 
installed
+   # correctly.
+   # Disable stripping since we do that ourselves.
+   local myconf=(
+   --prefix="${EPREFIX}"/
+   --localedir="${EPREFIX}"/usr/share/locale
+   --includedir="${EPREFIX}"/usr/include
+   --localstatedir="${EPREFIX}"/var
+   --disable-stripping
+   --with-install-root="${D}"
+   --with-writable-directory="${EPREFIX}"/run/brltty
+   $(use_enable api)
+   $(use_with beeper beep-package)
+   $(use_enable contracted-braille)
+   $(use_with fm fm-package)
+   $(use_enable gpm)
+   $(us

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

2017-12-04 Thread David Seifert

commit: 9972fed3f21b47e7315949e39f762d9b209c1fd5
Author: David Seifert  gentoo  org>
AuthorDate: Mon Dec  4 10:24:38 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Dec  4 10:25:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9972fed3

app-accessibility/brltty: [QA] Fix multiple issues

* Don't add dead python impls to PYTHON_COMPAT
* Don't remove python metadata vars (${PYTHON_REQUIRED_USE})
  from REQUIRED_USE
* Don't remove the SLOT specifier for sys-libs/ncurses
* Get rid of the awfully complicated, hacky and
  non-generalisable solution for the libtinfo split,
  which also doesn't generalise to Prefix.
  Using pkg-config is easier, safer, more portable and
  less brittle than the previous hacks.
* Get rid of the totally unnecessary code paths
  created by dispatching on glibc versions.
  'sys/sysmacros.h' can always be included on glibc,
  packages just have relied on this include implicitly.

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 app-accessibility/brltty/brltty-5.2-r1.ebuild| 12 +---
 .../brltty/files/brltty-5.2-sysmacros.patch  | 20 
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 12ea62ef94e..71cbc57d9d1 100644
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
 FINDLIB_USE="ocaml"
 
 inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
@@ -22,7 +22,7 @@ IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm 
iconv icu
 REQUIRED_USE="doc? ( api )
java? ( api )
ocaml? ( api )
-   python? ( api )
+   python? ( api ${PYTHON_REQUIRED_USE} )
tcl? ( api )"
 
 COMMON_DEP="bluetooth? ( net-wireless/bluez )
@@ -30,7 +30,7 @@ COMMON_DEP="bluetooth? ( net-wireless/bluez )
iconv? ( virtual/libiconv )
icu? ( dev-libs/icu:= )
python? ( ${PYTHON_DEPS} )
-   ncurses? ( sys-libs/ncurses:= )
+   ncurses? ( sys-libs/ncurses:0= )
nls? ( virtual/libintl )
tcl? ( >=dev-lang/tcl-8.4.15:0= )
usb? ( virtual/libusb:0 )
@@ -64,10 +64,8 @@ src_prepare() {
 }
 
 src_configure() {
-   filter-flags "_*_SOURCE*"
-   append-cppflags -D_DEFAULT_SOURCE
-   has_version ">=sys-libs/glibc-2.25-r5" && append-cppflags 
-DHAVE_SYS_SYSMACROS_H
-   has_version "sys-libs/ncurses[tinfo]" && append-libs -ltinfo
+   append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
+   append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
 
tc-export AR LD PKG_CONFIG
# override prefix in order to install into /

diff --git a/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch 
b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
index d45d6104e4b..f33e46a1890 100644
--- a/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
+++ b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
@@ -1,24 +1,20 @@
 a/Programs/system_linux.c  2017-12-02 12:54:34.098643832 -0800
-+++ b/Programs/system_linux.c  2017-12-02 12:59:00.683592161 -0800
-@@ -24,6 +24,9 @@
+--- a/Programs/system_linux.c
 b/Programs/system_linux.c
+@@ -24,6 +24,7 @@
  #include 
  #include 
  #include 
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include   /* major() w/newer glibc */
-+#endif
++#include 
  
  #include "log.h"
  #include "file.h"
 a/Programs/brlapi_client.c 2017-12-02 14:29:37.524205316 -0800
-+++ b/Programs/brlapi_client.c 2017-12-02 14:32:45.679948051 -0800
-@@ -73,6 +73,9 @@
+--- a/Programs/brlapi_client.c
 b/Programs/brlapi_client.c
+@@ -73,6 +73,7 @@
  #include 
  #include 
  #define MAXIMUM_VIRTUAL_CONSOLE MAX_NR_CONSOLES
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include   /* major() w/newer glibc */
-+#endif
++#include 
  #endif /* linux */
  
  #ifdef __OpenBSD__

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

2016-11-28 Thread Sergei Trofimovich

commit: 433c45c715bdee3e008e924a7475080e79e0aa25
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Nov 28 09:21:08 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Nov 28 09:21:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=433c45c7

app-accessibility/brltty: fix makedev() autodetection, bug #581130

Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/581130

Package-Manager: portage-2.3.2

 app-accessibility/brltty/brltty-5.2-r1.ebuild  |  5 +-
 .../brltty/files/brltty-5.2-major.patch| 59 ++
 2 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 80195c7..46daab6 100644
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -31,7 +31,7 @@ COMMON_DEP="bluetooth? ( net-wireless/bluez )
iconv? ( virtual/libiconv )
icu? ( dev-libs/icu:= )
python? ( ${PYTHON_DEPS} )
-   ncurses? ( sys-libs/ncurses )
+   ncurses? ( sys-libs/ncurses:0= )
nls? ( virtual/libintl )
tcl? ( >=dev-lang/tcl-8.4.15:0= )
usb? ( virtual/libusb:0 )
@@ -46,7 +46,8 @@ RDEPEND="java? ( >=virtual/jre-1.4 )
 src_prepare() {
epatch "${FILESDIR}"/${P}-fix-ldflags.patch \
"${FILESDIR}"/${P}-udev.patch \
-   "${FILESDIR}"/${P}-respect-AR.patch
+   "${FILESDIR}"/${P}-respect-AR.patch \
+   "${FILESDIR}"/${P}-major.patch
 
java-pkg-opt-2_src_prepare
 

diff --git a/app-accessibility/brltty/files/brltty-5.2-major.patch 
b/app-accessibility/brltty/files/brltty-5.2-major.patch
new file mode 100644
index ..7c591b1
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-5.2-major.patch
@@ -0,0 +1,59 @@
+Bug: https://bugs.gentoo.org/581130
+diff --git a/Programs/system_linux.c b/Programs/system_linux.c
+index c73bd39..ef7d807 100644
+--- a/Programs/system_linux.c
 b/Programs/system_linux.c
+@@ -25,6 +25,12 @@
+ #include 
+ #include 
+ 
++#ifdef MAJOR_IN_MKDEV
++#include 
++#elif defined MAJOR_IN_SYSMACROS
++#include 
++#endif
++
+ #include "log.h"
+ #include "file.h"
+ #include "device.h"
+diff --git a/configure.ac b/configure.ac
+index 96305f7..dcae1e1 100644
+--- a/configure.ac
 b/configure.ac
+@@ -555,6 +555,8 @@ BRLTTY_ARG_DISABLE(
+ ])
+ AC_SUBST([install_messages])
+ 
++AC_HEADER_MAJOR
++
+ AC_CHECK_FUNC([wcslen], [AC_CHECK_HEADERS([wchar.h], [dnl
+AC_CHECK_FUNCS([wcwidth])
+ ])])
+diff --git a/config.h.in b/config.h.in
+index 71341c6..ff201c2 100644
+--- a/config.h.in
 b/config.h.in
+@@ -457,2 +457,10 @@ extern "C" {
+ 
++/* Define to 1 if `major', `minor', and `makedev' are declared in .
++   */
++#undef MAJOR_IN_MKDEV
++
++/* Define to 1 if `major', `minor', and `makedev' are declared in
++   . */
++#undef MAJOR_IN_SYSMACROS
++
+ /* Define this to be a string containing the path to the root of the 
Mikropuhe package. */
+diff --git a/Programs/brlapi_client.c b/Programs/brlapi_client.c
+index bd6497b..df63b30 100644
+--- a/Programs/brlapi_client.c
 b/Programs/brlapi_client.c
+@@ -32,2 +32,8 @@
+ 
++#ifdef MAJOR_IN_MKDEV
++#include 
++#elif defined MAJOR_IN_SYSMACROS
++#include 
++#endif
++
+ #ifndef __MINGW32__

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

2019-03-22 Thread Lars Wendler

commit: 91f4f99d403ec7f89ec2c23a91bb1a1dce4d9f4e
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Mar 22 14:58:47 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Mar 22 14:59:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f4f99d

app-accessibility/brltty: Bump to version 6.0

Closes: https://bugs.gentoo.org/632630
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 app-accessibility/brltty/Manifest  |   1 +
 app-accessibility/brltty/brltty-6.0.ebuild | 194 +
 .../brltty/files/brltty-6.0-udev.patch |  27 +++
 app-accessibility/brltty/files/brltty.rc   |   4 +-
 4 files changed, 224 insertions(+), 2 deletions(-)

diff --git a/app-accessibility/brltty/Manifest 
b/app-accessibility/brltty/Manifest
index 018608d0bc4..2618e8dd7d8 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1 +1,2 @@
 DIST brltty-5.2.tar.xz 2532684 BLAKE2B 
9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f
 SHA512 
8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f
+DIST brltty-6.0.tar.xz 2879976 BLAKE2B 
31bd45b63838d119d940492c615deb27ec47389c68afa39f19da3534324914695343344260799a10deae6ca3de41bedf9b0c1de1f78dbe01a89b694c2aa6e265
 SHA512 
07344fa902ad169967ca39d19b09dfea24e698011031dd63dce3eb997a4cb86622ee9427b216976b3ef60e5cbabb710a621621447c6bfa2313748fc1a1cf4b06

diff --git a/app-accessibility/brltty/brltty-6.0.ebuild 
b/app-accessibility/brltty/brltty-6.0.ebuild
new file mode 100644
index 000..badd7a11678
--- /dev/null
+++ b/app-accessibility/brltty/brltty-6.0.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+FINDLIB_USE="ocaml"
+
+inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
+   autotools udev systemd python-r1
+
+DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind 
person"
+HOMEPAGE="http://brltty.com/";
+SRC_URI="http://brltty.com/archive/${P}.tar.xz";
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
+   java +midi ncurses nls ocaml +pcm python usb +speech
+   tcl X"
+REQUIRED_USE="doc? ( api )
+   java? ( api )
+   ocaml? ( api )
+   python? ( api ${PYTHON_REQUIRED_USE} )
+   tcl? ( api )"
+
+COMMON_DEP="bluetooth? ( net-wireless/bluez )
+   gpm? ( >=sys-libs/gpm-1.20 )
+   iconv? ( virtual/libiconv )
+   icu? ( dev-libs/icu:= )
+   python? ( ${PYTHON_DEPS} )
+   ncurses? ( sys-libs/ncurses:0= )
+   nls? ( virtual/libintl )
+   tcl? ( >=dev-lang/tcl-8.4.15:0= )
+   usb? ( virtual/libusb:0 )
+   X? ( x11-libs/libXaw )"
+DEPEND="${COMMON_DEP}"
+BDEPEND="
+   virtual/pkgconfig
+   java? ( >=virtual/jdk-1.4 )
+   python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
+"
+RDEPEND="java? ( >=virtual/jre-1.4 )
+   ${COMMON_DEP}"
+
+HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-6.0-udev.patch
+   "${FILESDIR}"/${PN}-5.2-respect-AR.patch
+)
+
+src_prepare() {
+   default
+
+   java-pkg-opt-2_src_prepare
+
+   # The code runs `pkg-config` directly instead of locating a suitable
+   # pkg-config wrapper (or respecting $PKG_CONFIG).
+   sed -i \
+   -e 's/\/${PKG_CONFIG:-pkg-config}/' \
+   aclocal.m4 configure.ac || die
+
+   # We run eautoconf instead of using eautoreconf because brltty uses
+   # a custom build system that uses autoconf without the rest of the
+   # autotools.
+   eautoconf
+   python_copy_sources
+}
+
+src_configure() {
+   tc-export AR LD PKG_CONFIG
+   # override prefix in order to install into /
+   # braille terminal needs to be available as soon in the boot process as
+   # possible
+   # Also override localstatedir so that the lib/brltty directory is 
installed
+   # correctly.
+   # Disable stripping since we do that ourselves.
+   local myconf=(
+   --prefix="${EPREFIX}"/
+   --localedir="${EPREFIX}"/usr/share/locale
+   --includedir="${EPREFIX}"/usr/include
+   --localstatedir="${EPREFIX}"/var
+   --disable-stripping
+   --with-install-root="${D}"
+   --with-writable-directory="${EPREFIX}"/run/brltty
+   $(use_enable api)
+   $(use_with beeper beep-package)
+   $(use_enable contracted-braille)
+   $(use_with fm fm-package)
+   $(use_enable gpm)
+   $(us

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

2020-08-13 Thread Michał Górny

commit: fb676f5c2d2ebd24423e35585ed567566b269aa2
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Aug 13 20:13:57 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Aug 13 20:25:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb676f5c

app-accessibility/brltty: Remove old (py3.6)

Signed-off-by: Michał Górny  gentoo.org>

 app-accessibility/brltty/Manifest  |   1 -
 app-accessibility/brltty/brltty-5.2-r1.ebuild  | 197 -
 .../brltty/files/brltty-5.2-fix-ldflags.patch  |  56 --
 .../brltty/files/brltty-5.2-sysmacros.patch|  20 ---
 .../brltty/files/brltty-5.2-udev.patch |  27 ---
 5 files changed, 301 deletions(-)

diff --git a/app-accessibility/brltty/Manifest 
b/app-accessibility/brltty/Manifest
index 2618e8dd7d8..5057b79d6e5 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1,2 +1 @@
-DIST brltty-5.2.tar.xz 2532684 BLAKE2B 
9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f
 SHA512 
8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f
 DIST brltty-6.0.tar.xz 2879976 BLAKE2B 
31bd45b63838d119d940492c615deb27ec47389c68afa39f19da3534324914695343344260799a10deae6ca3de41bedf9b0c1de1f78dbe01a89b694c2aa6e265
 SHA512 
07344fa902ad169967ca39d19b09dfea24e698011031dd63dce3eb997a4cb86622ee9427b216976b3ef60e5cbabb710a621621447c6bfa2313748fc1a1cf4b06

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
deleted file mode 100644
index 64b28132085..000
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-FINDLIB_USE="ocaml"
-
-inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic 
usr-ldscript \
-   autotools udev systemd python-r1
-
-DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind 
person"
-HOMEPAGE="https://brltty.app/";
-SRC_URI="https://brltty.app/archive/${P}.tar.xz";
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 x86"
-IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
-   java +midi ncurses nls ocaml +pcm python usb +speech
-   tcl X"
-REQUIRED_USE="doc? ( api )
-   java? ( api )
-   ocaml? ( api )
-   python? ( api ${PYTHON_REQUIRED_USE} )
-   tcl? ( api )"
-
-COMMON_DEP="bluetooth? ( net-wireless/bluez )
-   gpm? ( >=sys-libs/gpm-1.20 )
-   iconv? ( virtual/libiconv )
-   icu? ( dev-libs/icu:= )
-   python? ( ${PYTHON_DEPS} )
-   ncurses? ( sys-libs/ncurses:0= )
-   nls? ( virtual/libintl )
-   tcl? ( >=dev-lang/tcl-8.4.15:0= )
-   usb? ( virtual/libusb:0 )
-   X? ( x11-libs/libXaw )"
-DEPEND="virtual/pkgconfig
-   java? ( >=virtual/jdk-1.4 )
-   python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
-   ${COMMON_DEP}"
-RDEPEND="java? ( >=virtual/jre-1.4 )
-   ${COMMON_DEP}"
-
-HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-5.2-fix-ldflags.patch
-   "${FILESDIR}"/${PN}-5.2-udev.patch
-   "${FILESDIR}"/${PN}-5.2-respect-AR.patch
-   "${FILESDIR}"/${PN}-5.2-sysmacros.patch
-)
-
-src_prepare() {
-   default
-
-   java-pkg-opt-2_src_prepare
-
-   # The code runs `pkg-config` directly instead of locating a suitable
-   # pkg-config wrapper (or respecting $PKG_CONFIG).
-   sed -i \
-   -e 's/\/${PKG_CONFIG:-pkg-config}/' \
-   aclocal.m4 configure.ac || die
-
-   # We run eautoconf instead of using eautoreconf because brltty uses
-   # a custom build system that uses autoconf without the rest of the
-   # autotools.
-   eautoconf
-   python_copy_sources
-}
-
-src_configure() {
-   append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
-   append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
-
-   tc-export AR LD PKG_CONFIG
-   # override prefix in order to install into /
-   # braille terminal needs to be available as soon in the boot process as
-   # possible
-   # Also override localstatedir so that the lib/brltty directory is 
installed
-   # correctly.
-   # Disable stripping since we do that ourselves.
-   local myconf=(
-   --prefix=/
-   --localedir=/usr/share/locale
-   --includedir=/usr/include
-   --localstatedir=/var
-   --disable-stripping
-   --with-install-root="${D}"
-   --with-writable-directory="/run/brltty"
-   $(use_enable api)
-   $(use_with beeper beep-package)
-   $(use_e

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

2019-03-22 Thread Lars Wendler

commit: 91f4f99d403ec7f89ec2c23a91bb1a1dce4d9f4e
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Mar 22 14:58:47 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Mar 22 14:59:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f4f99d

app-accessibility/brltty: Bump to version 6.0

Closes: https://bugs.gentoo.org/632630
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 app-accessibility/brltty/Manifest  |   1 +
 app-accessibility/brltty/brltty-6.0.ebuild | 194 +
 .../brltty/files/brltty-6.0-udev.patch |  27 +++
 app-accessibility/brltty/files/brltty.rc   |   4 +-
 4 files changed, 224 insertions(+), 2 deletions(-)

diff --git a/app-accessibility/brltty/Manifest 
b/app-accessibility/brltty/Manifest
index 018608d0bc4..2618e8dd7d8 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1 +1,2 @@
 DIST brltty-5.2.tar.xz 2532684 BLAKE2B 
9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f
 SHA512 
8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f
+DIST brltty-6.0.tar.xz 2879976 BLAKE2B 
31bd45b63838d119d940492c615deb27ec47389c68afa39f19da3534324914695343344260799a10deae6ca3de41bedf9b0c1de1f78dbe01a89b694c2aa6e265
 SHA512 
07344fa902ad169967ca39d19b09dfea24e698011031dd63dce3eb997a4cb86622ee9427b216976b3ef60e5cbabb710a621621447c6bfa2313748fc1a1cf4b06

diff --git a/app-accessibility/brltty/brltty-6.0.ebuild 
b/app-accessibility/brltty/brltty-6.0.ebuild
new file mode 100644
index 000..badd7a11678
--- /dev/null
+++ b/app-accessibility/brltty/brltty-6.0.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+FINDLIB_USE="ocaml"
+
+inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
+   autotools udev systemd python-r1
+
+DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind 
person"
+HOMEPAGE="http://brltty.com/";
+SRC_URI="http://brltty.com/archive/${P}.tar.xz";
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
+   java +midi ncurses nls ocaml +pcm python usb +speech
+   tcl X"
+REQUIRED_USE="doc? ( api )
+   java? ( api )
+   ocaml? ( api )
+   python? ( api ${PYTHON_REQUIRED_USE} )
+   tcl? ( api )"
+
+COMMON_DEP="bluetooth? ( net-wireless/bluez )
+   gpm? ( >=sys-libs/gpm-1.20 )
+   iconv? ( virtual/libiconv )
+   icu? ( dev-libs/icu:= )
+   python? ( ${PYTHON_DEPS} )
+   ncurses? ( sys-libs/ncurses:0= )
+   nls? ( virtual/libintl )
+   tcl? ( >=dev-lang/tcl-8.4.15:0= )
+   usb? ( virtual/libusb:0 )
+   X? ( x11-libs/libXaw )"
+DEPEND="${COMMON_DEP}"
+BDEPEND="
+   virtual/pkgconfig
+   java? ( >=virtual/jdk-1.4 )
+   python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
+"
+RDEPEND="java? ( >=virtual/jre-1.4 )
+   ${COMMON_DEP}"
+
+HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-6.0-udev.patch
+   "${FILESDIR}"/${PN}-5.2-respect-AR.patch
+)
+
+src_prepare() {
+   default
+
+   java-pkg-opt-2_src_prepare
+
+   # The code runs `pkg-config` directly instead of locating a suitable
+   # pkg-config wrapper (or respecting $PKG_CONFIG).
+   sed -i \
+   -e 's/\/${PKG_CONFIG:-pkg-config}/' \
+   aclocal.m4 configure.ac || die
+
+   # We run eautoconf instead of using eautoreconf because brltty uses
+   # a custom build system that uses autoconf without the rest of the
+   # autotools.
+   eautoconf
+   python_copy_sources
+}
+
+src_configure() {
+   tc-export AR LD PKG_CONFIG
+   # override prefix in order to install into /
+   # braille terminal needs to be available as soon in the boot process as
+   # possible
+   # Also override localstatedir so that the lib/brltty directory is 
installed
+   # correctly.
+   # Disable stripping since we do that ourselves.
+   local myconf=(
+   --prefix="${EPREFIX}"/
+   --localedir="${EPREFIX}"/usr/share/locale
+   --includedir="${EPREFIX}"/usr/include
+   --localstatedir="${EPREFIX}"/var
+   --disable-stripping
+   --with-install-root="${D}"
+   --with-writable-directory="${EPREFIX}"/run/brltty
+   $(use_enable api)
+   $(use_with beeper beep-package)
+   $(use_enable contracted-braille)
+   $(use_with fm fm-package)
+   $(use_enable gpm)
+   $(us

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

2020-08-13 Thread Michał Górny

commit: fb676f5c2d2ebd24423e35585ed567566b269aa2
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Aug 13 20:13:57 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Aug 13 20:25:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb676f5c

app-accessibility/brltty: Remove old (py3.6)

Signed-off-by: Michał Górny  gentoo.org>

 app-accessibility/brltty/Manifest  |   1 -
 app-accessibility/brltty/brltty-5.2-r1.ebuild  | 197 -
 .../brltty/files/brltty-5.2-fix-ldflags.patch  |  56 --
 .../brltty/files/brltty-5.2-sysmacros.patch|  20 ---
 .../brltty/files/brltty-5.2-udev.patch |  27 ---
 5 files changed, 301 deletions(-)

diff --git a/app-accessibility/brltty/Manifest 
b/app-accessibility/brltty/Manifest
index 2618e8dd7d8..5057b79d6e5 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1,2 +1 @@
-DIST brltty-5.2.tar.xz 2532684 BLAKE2B 
9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f
 SHA512 
8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f
 DIST brltty-6.0.tar.xz 2879976 BLAKE2B 
31bd45b63838d119d940492c615deb27ec47389c68afa39f19da3534324914695343344260799a10deae6ca3de41bedf9b0c1de1f78dbe01a89b694c2aa6e265
 SHA512 
07344fa902ad169967ca39d19b09dfea24e698011031dd63dce3eb997a4cb86622ee9427b216976b3ef60e5cbabb710a621621447c6bfa2313748fc1a1cf4b06

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
deleted file mode 100644
index 64b28132085..000
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-FINDLIB_USE="ocaml"
-
-inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic 
usr-ldscript \
-   autotools udev systemd python-r1
-
-DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind 
person"
-HOMEPAGE="https://brltty.app/";
-SRC_URI="https://brltty.app/archive/${P}.tar.xz";
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 x86"
-IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
-   java +midi ncurses nls ocaml +pcm python usb +speech
-   tcl X"
-REQUIRED_USE="doc? ( api )
-   java? ( api )
-   ocaml? ( api )
-   python? ( api ${PYTHON_REQUIRED_USE} )
-   tcl? ( api )"
-
-COMMON_DEP="bluetooth? ( net-wireless/bluez )
-   gpm? ( >=sys-libs/gpm-1.20 )
-   iconv? ( virtual/libiconv )
-   icu? ( dev-libs/icu:= )
-   python? ( ${PYTHON_DEPS} )
-   ncurses? ( sys-libs/ncurses:0= )
-   nls? ( virtual/libintl )
-   tcl? ( >=dev-lang/tcl-8.4.15:0= )
-   usb? ( virtual/libusb:0 )
-   X? ( x11-libs/libXaw )"
-DEPEND="virtual/pkgconfig
-   java? ( >=virtual/jdk-1.4 )
-   python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
-   ${COMMON_DEP}"
-RDEPEND="java? ( >=virtual/jre-1.4 )
-   ${COMMON_DEP}"
-
-HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-5.2-fix-ldflags.patch
-   "${FILESDIR}"/${PN}-5.2-udev.patch
-   "${FILESDIR}"/${PN}-5.2-respect-AR.patch
-   "${FILESDIR}"/${PN}-5.2-sysmacros.patch
-)
-
-src_prepare() {
-   default
-
-   java-pkg-opt-2_src_prepare
-
-   # The code runs `pkg-config` directly instead of locating a suitable
-   # pkg-config wrapper (or respecting $PKG_CONFIG).
-   sed -i \
-   -e 's/\/${PKG_CONFIG:-pkg-config}/' \
-   aclocal.m4 configure.ac || die
-
-   # We run eautoconf instead of using eautoreconf because brltty uses
-   # a custom build system that uses autoconf without the rest of the
-   # autotools.
-   eautoconf
-   python_copy_sources
-}
-
-src_configure() {
-   append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
-   append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
-
-   tc-export AR LD PKG_CONFIG
-   # override prefix in order to install into /
-   # braille terminal needs to be available as soon in the boot process as
-   # possible
-   # Also override localstatedir so that the lib/brltty directory is 
installed
-   # correctly.
-   # Disable stripping since we do that ourselves.
-   local myconf=(
-   --prefix=/
-   --localedir=/usr/share/locale
-   --includedir=/usr/include
-   --localstatedir=/var
-   --disable-stripping
-   --with-install-root="${D}"
-   --with-writable-directory="/run/brltty"
-   $(use_enable api)
-   $(use_with beeper beep-package)
-   $(use_e

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

2016-11-28 Thread Sergei Trofimovich

commit: 433c45c715bdee3e008e924a7475080e79e0aa25
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Nov 28 09:21:08 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Nov 28 09:21:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=433c45c7

app-accessibility/brltty: fix makedev() autodetection, bug #581130

Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/581130

Package-Manager: portage-2.3.2

 app-accessibility/brltty/brltty-5.2-r1.ebuild  |  5 +-
 .../brltty/files/brltty-5.2-major.patch| 59 ++
 2 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 80195c7..46daab6 100644
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -31,7 +31,7 @@ COMMON_DEP="bluetooth? ( net-wireless/bluez )
iconv? ( virtual/libiconv )
icu? ( dev-libs/icu:= )
python? ( ${PYTHON_DEPS} )
-   ncurses? ( sys-libs/ncurses )
+   ncurses? ( sys-libs/ncurses:0= )
nls? ( virtual/libintl )
tcl? ( >=dev-lang/tcl-8.4.15:0= )
usb? ( virtual/libusb:0 )
@@ -46,7 +46,8 @@ RDEPEND="java? ( >=virtual/jre-1.4 )
 src_prepare() {
epatch "${FILESDIR}"/${P}-fix-ldflags.patch \
"${FILESDIR}"/${P}-udev.patch \
-   "${FILESDIR}"/${P}-respect-AR.patch
+   "${FILESDIR}"/${P}-respect-AR.patch \
+   "${FILESDIR}"/${P}-major.patch
 
java-pkg-opt-2_src_prepare
 

diff --git a/app-accessibility/brltty/files/brltty-5.2-major.patch 
b/app-accessibility/brltty/files/brltty-5.2-major.patch
new file mode 100644
index ..7c591b1
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-5.2-major.patch
@@ -0,0 +1,59 @@
+Bug: https://bugs.gentoo.org/581130
+diff --git a/Programs/system_linux.c b/Programs/system_linux.c
+index c73bd39..ef7d807 100644
+--- a/Programs/system_linux.c
 b/Programs/system_linux.c
+@@ -25,6 +25,12 @@
+ #include 
+ #include 
+ 
++#ifdef MAJOR_IN_MKDEV
++#include 
++#elif defined MAJOR_IN_SYSMACROS
++#include 
++#endif
++
+ #include "log.h"
+ #include "file.h"
+ #include "device.h"
+diff --git a/configure.ac b/configure.ac
+index 96305f7..dcae1e1 100644
+--- a/configure.ac
 b/configure.ac
+@@ -555,6 +555,8 @@ BRLTTY_ARG_DISABLE(
+ ])
+ AC_SUBST([install_messages])
+ 
++AC_HEADER_MAJOR
++
+ AC_CHECK_FUNC([wcslen], [AC_CHECK_HEADERS([wchar.h], [dnl
+AC_CHECK_FUNCS([wcwidth])
+ ])])
+diff --git a/config.h.in b/config.h.in
+index 71341c6..ff201c2 100644
+--- a/config.h.in
 b/config.h.in
+@@ -457,2 +457,10 @@ extern "C" {
+ 
++/* Define to 1 if `major', `minor', and `makedev' are declared in .
++   */
++#undef MAJOR_IN_MKDEV
++
++/* Define to 1 if `major', `minor', and `makedev' are declared in
++   . */
++#undef MAJOR_IN_SYSMACROS
++
+ /* Define this to be a string containing the path to the root of the 
Mikropuhe package. */
+diff --git a/Programs/brlapi_client.c b/Programs/brlapi_client.c
+index bd6497b..df63b30 100644
+--- a/Programs/brlapi_client.c
 b/Programs/brlapi_client.c
+@@ -32,2 +32,8 @@
+ 
++#ifdef MAJOR_IN_MKDEV
++#include 
++#elif defined MAJOR_IN_SYSMACROS
++#include 
++#endif
++
+ #ifndef __MINGW32__

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

2017-12-04 Thread David Seifert

commit: 9972fed3f21b47e7315949e39f762d9b209c1fd5
Author: David Seifert  gentoo  org>
AuthorDate: Mon Dec  4 10:24:38 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Dec  4 10:25:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9972fed3

app-accessibility/brltty: [QA] Fix multiple issues

* Don't add dead python impls to PYTHON_COMPAT
* Don't remove python metadata vars (${PYTHON_REQUIRED_USE})
  from REQUIRED_USE
* Don't remove the SLOT specifier for sys-libs/ncurses
* Get rid of the awfully complicated, hacky and
  non-generalisable solution for the libtinfo split,
  which also doesn't generalise to Prefix.
  Using pkg-config is easier, safer, more portable and
  less brittle than the previous hacks.
* Get rid of the totally unnecessary code paths
  created by dispatching on glibc versions.
  'sys/sysmacros.h' can always be included on glibc,
  packages just have relied on this include implicitly.

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 app-accessibility/brltty/brltty-5.2-r1.ebuild| 12 +---
 .../brltty/files/brltty-5.2-sysmacros.patch  | 20 
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 12ea62ef94e..71cbc57d9d1 100644
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
 FINDLIB_USE="ocaml"
 
 inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
@@ -22,7 +22,7 @@ IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm 
iconv icu
 REQUIRED_USE="doc? ( api )
java? ( api )
ocaml? ( api )
-   python? ( api )
+   python? ( api ${PYTHON_REQUIRED_USE} )
tcl? ( api )"
 
 COMMON_DEP="bluetooth? ( net-wireless/bluez )
@@ -30,7 +30,7 @@ COMMON_DEP="bluetooth? ( net-wireless/bluez )
iconv? ( virtual/libiconv )
icu? ( dev-libs/icu:= )
python? ( ${PYTHON_DEPS} )
-   ncurses? ( sys-libs/ncurses:= )
+   ncurses? ( sys-libs/ncurses:0= )
nls? ( virtual/libintl )
tcl? ( >=dev-lang/tcl-8.4.15:0= )
usb? ( virtual/libusb:0 )
@@ -64,10 +64,8 @@ src_prepare() {
 }
 
 src_configure() {
-   filter-flags "_*_SOURCE*"
-   append-cppflags -D_DEFAULT_SOURCE
-   has_version ">=sys-libs/glibc-2.25-r5" && append-cppflags 
-DHAVE_SYS_SYSMACROS_H
-   has_version "sys-libs/ncurses[tinfo]" && append-libs -ltinfo
+   append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
+   append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
 
tc-export AR LD PKG_CONFIG
# override prefix in order to install into /

diff --git a/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch 
b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
index d45d6104e4b..f33e46a1890 100644
--- a/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
+++ b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
@@ -1,24 +1,20 @@
 a/Programs/system_linux.c  2017-12-02 12:54:34.098643832 -0800
-+++ b/Programs/system_linux.c  2017-12-02 12:59:00.683592161 -0800
-@@ -24,6 +24,9 @@
+--- a/Programs/system_linux.c
 b/Programs/system_linux.c
+@@ -24,6 +24,7 @@
  #include 
  #include 
  #include 
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include   /* major() w/newer glibc */
-+#endif
++#include 
  
  #include "log.h"
  #include "file.h"
 a/Programs/brlapi_client.c 2017-12-02 14:29:37.524205316 -0800
-+++ b/Programs/brlapi_client.c 2017-12-02 14:32:45.679948051 -0800
-@@ -73,6 +73,9 @@
+--- a/Programs/brlapi_client.c
 b/Programs/brlapi_client.c
+@@ -73,6 +73,7 @@
  #include 
  #include 
  #define MAXIMUM_VIRTUAL_CONSOLE MAX_NR_CONSOLES
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include   /* major() w/newer glibc */
-+#endif
++#include 
  #endif /* linux */
  
  #ifdef __OpenBSD__

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

2018-03-26 Thread Aaron Bauman

commit: 6326de87e9f6e14fe2cd72839e21a4cb45534b18
Author: Marty E. Plummer  startmail  com>
AuthorDate: Thu Mar 22 11:54:34 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Mar 26 20:19:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6326de87

app-accessibility/brltty: bump to EAPI 6

Also readjusted the epatch call to an eapply call, added
HTML_DOCS/einstalldocs as dohtml is deprecated on EAPI=6,
and adjusted the keepdir call to point at the correct directory.

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/7590

 app-accessibility/brltty/brltty-5.2-r1.ebuild  | 43 --
 .../brltty/files/brltty-5.2-respect-AR.patch   |  5 +--
 .../brltty/files/brltty-5.2-udev.patch |  5 +--
 3 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 8b9f34c0e4f..3622819ef62 100644
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 FINDLIB_USE="ocaml"
@@ -42,11 +42,17 @@ DEPEND="virtual/pkgconfig
 RDEPEND="java? ( >=virtual/jre-1.4 )
${COMMON_DEP}"
 
+HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-5.2-fix-ldflags.patch
+   "${FILESDIR}"/${PN}-5.2-udev.patch
+   "${FILESDIR}"/${PN}-5.2-respect-AR.patch
+   "${FILESDIR}"/${PN}-5.2-sysmacros.patch
+)
+
 src_prepare() {
-   epatch "${FILESDIR}"/${P}-fix-ldflags.patch \
-   "${FILESDIR}"/${P}-udev.patch \
-   "${FILESDIR}"/${P}-respect-AR.patch \
-   "${FILESDIR}"/${P}-sysmacros.patch
+   default
 
java-pkg-opt-2_src_prepare
 
@@ -163,30 +169,29 @@ src_install() {
 
libdir="$(get_libdir)"
mkdir -p "${D}"/usr/${libdir}/
-   mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/
+   mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/ || die
gen_usr_ldscript libbrlapi.so
 
-   cd Documents
-   mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt
-   mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt
-   mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt
+   cd Documents || die
+   mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt || die
+   mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt || die
+   mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt || die
dodoc CONTRIBUTORS ChangeLog HISTORY README* TODO BRLTTY-*.txt
-   dohtml -r Manual-BRLTTY
if use doc; then
-   dohtml -r Manual-BrlAPI
dodoc BrlAPI-*.txt
+   HTML_DOCS="Manual-BRLTTY" einstalldocs
fi
 
-   keepdir /var/lib/brlapi
-   rmdir "${D}/run/brltty"
-   rmdir "${D}/run"
+   keepdir /var/lib/BrlAPI
+   rmdir "${D}/run/brltty" || die
+   rmdir "${D}/run" || die
 }
 
 pkg_postinst() {
elog
-   elog please be sure "${ROOT}"etc/brltty.conf is correct for your system.
+   elog "please be sure ${ROOT}etc/brltty.conf is correct for your system."
elog
-   elog To make brltty start on boot, type this command as root:
+   elog "To make brltty start on boot, type this command as root:"
elog
-   elog rc-update add brltty boot
+   elog "rc-update add brltty boot"
 }

diff --git a/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch 
b/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
index 95451dc98b7..c5698a2b939 100644
--- a/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
+++ b/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
@@ -1,6 +1,5 @@
-diff -Naur brltty-5.2/Programs/Makefile.in brltty-5.2-new/Programs/Makefile.in
 brltty-5.2/Programs/Makefile.in2014-11-06 07:28:41.0 -0800
-+++ brltty-5.2-new/Programs/Makefile.in2014-11-20 05:41:57.144219093 
-0800
+--- a/Programs/Makefile.in
 b/Programs/Makefile.in
 @@ -434,7 +434,7 @@
[ ! -f lib.def ] || mv lib.def $(API_DEF)
  

diff --git a/app-accessibility/brltty/files/brltty-5.2-udev.patch 
b/app-accessibility/brltty/files/brltty-5.2-udev.patch
index dbbc2989766..e6d56603b01 100644
--- a/app-accessibility/brltty/files/brltty-5.2-udev.patch
+++ b/app-accessibility/brltty/files/brltty-5.2-udev.patch
@@ -1,6 +1,5 @@
-diff -Naur brltty-5.2/Autostart/Udev/udev.rules 
brltty-5.2-new/Autostart/Udev/udev.rules
 brltty-5.2/Autostart/Udev/udev.rules   2014-11-06 07:28:41.0 
-0800
-+++ brltty-5.2-new/Autostart/Udev/udev.rules   2014-11-20 05:28:44.404885312 
-0800
+--- a/Autostart/Udev/udev.rules
 b/Autostart/Udev/udev.rules
 @@ -182,20 +182,22 @@
  # FreedomScientific [Focus Blue]
  ENV{PRODUCT}

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

2016-11-28 Thread Sergei Trofimovich

commit: 433c45c715bdee3e008e924a7475080e79e0aa25
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Nov 28 09:21:08 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Nov 28 09:21:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=433c45c7

app-accessibility/brltty: fix makedev() autodetection, bug #581130

Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/581130

Package-Manager: portage-2.3.2

 app-accessibility/brltty/brltty-5.2-r1.ebuild  |  5 +-
 .../brltty/files/brltty-5.2-major.patch| 59 ++
 2 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 80195c7..46daab6 100644
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -31,7 +31,7 @@ COMMON_DEP="bluetooth? ( net-wireless/bluez )
iconv? ( virtual/libiconv )
icu? ( dev-libs/icu:= )
python? ( ${PYTHON_DEPS} )
-   ncurses? ( sys-libs/ncurses )
+   ncurses? ( sys-libs/ncurses:0= )
nls? ( virtual/libintl )
tcl? ( >=dev-lang/tcl-8.4.15:0= )
usb? ( virtual/libusb:0 )
@@ -46,7 +46,8 @@ RDEPEND="java? ( >=virtual/jre-1.4 )
 src_prepare() {
epatch "${FILESDIR}"/${P}-fix-ldflags.patch \
"${FILESDIR}"/${P}-udev.patch \
-   "${FILESDIR}"/${P}-respect-AR.patch
+   "${FILESDIR}"/${P}-respect-AR.patch \
+   "${FILESDIR}"/${P}-major.patch
 
java-pkg-opt-2_src_prepare
 

diff --git a/app-accessibility/brltty/files/brltty-5.2-major.patch 
b/app-accessibility/brltty/files/brltty-5.2-major.patch
new file mode 100644
index ..7c591b1
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-5.2-major.patch
@@ -0,0 +1,59 @@
+Bug: https://bugs.gentoo.org/581130
+diff --git a/Programs/system_linux.c b/Programs/system_linux.c
+index c73bd39..ef7d807 100644
+--- a/Programs/system_linux.c
 b/Programs/system_linux.c
+@@ -25,6 +25,12 @@
+ #include 
+ #include 
+ 
++#ifdef MAJOR_IN_MKDEV
++#include 
++#elif defined MAJOR_IN_SYSMACROS
++#include 
++#endif
++
+ #include "log.h"
+ #include "file.h"
+ #include "device.h"
+diff --git a/configure.ac b/configure.ac
+index 96305f7..dcae1e1 100644
+--- a/configure.ac
 b/configure.ac
+@@ -555,6 +555,8 @@ BRLTTY_ARG_DISABLE(
+ ])
+ AC_SUBST([install_messages])
+ 
++AC_HEADER_MAJOR
++
+ AC_CHECK_FUNC([wcslen], [AC_CHECK_HEADERS([wchar.h], [dnl
+AC_CHECK_FUNCS([wcwidth])
+ ])])
+diff --git a/config.h.in b/config.h.in
+index 71341c6..ff201c2 100644
+--- a/config.h.in
 b/config.h.in
+@@ -457,2 +457,10 @@ extern "C" {
+ 
++/* Define to 1 if `major', `minor', and `makedev' are declared in .
++   */
++#undef MAJOR_IN_MKDEV
++
++/* Define to 1 if `major', `minor', and `makedev' are declared in
++   . */
++#undef MAJOR_IN_SYSMACROS
++
+ /* Define this to be a string containing the path to the root of the 
Mikropuhe package. */
+diff --git a/Programs/brlapi_client.c b/Programs/brlapi_client.c
+index bd6497b..df63b30 100644
+--- a/Programs/brlapi_client.c
 b/Programs/brlapi_client.c
+@@ -32,2 +32,8 @@
+ 
++#ifdef MAJOR_IN_MKDEV
++#include 
++#elif defined MAJOR_IN_SYSMACROS
++#include 
++#endif
++
+ #ifndef __MINGW32__

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

2017-12-04 Thread David Seifert

commit: 9972fed3f21b47e7315949e39f762d9b209c1fd5
Author: David Seifert  gentoo  org>
AuthorDate: Mon Dec  4 10:24:38 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Dec  4 10:25:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9972fed3

app-accessibility/brltty: [QA] Fix multiple issues

* Don't add dead python impls to PYTHON_COMPAT
* Don't remove python metadata vars (${PYTHON_REQUIRED_USE})
  from REQUIRED_USE
* Don't remove the SLOT specifier for sys-libs/ncurses
* Get rid of the awfully complicated, hacky and
  non-generalisable solution for the libtinfo split,
  which also doesn't generalise to Prefix.
  Using pkg-config is easier, safer, more portable and
  less brittle than the previous hacks.
* Get rid of the totally unnecessary code paths
  created by dispatching on glibc versions.
  'sys/sysmacros.h' can always be included on glibc,
  packages just have relied on this include implicitly.

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 app-accessibility/brltty/brltty-5.2-r1.ebuild| 12 +---
 .../brltty/files/brltty-5.2-sysmacros.patch  | 20 
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 12ea62ef94e..71cbc57d9d1 100644
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
 FINDLIB_USE="ocaml"
 
 inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
@@ -22,7 +22,7 @@ IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm 
iconv icu
 REQUIRED_USE="doc? ( api )
java? ( api )
ocaml? ( api )
-   python? ( api )
+   python? ( api ${PYTHON_REQUIRED_USE} )
tcl? ( api )"
 
 COMMON_DEP="bluetooth? ( net-wireless/bluez )
@@ -30,7 +30,7 @@ COMMON_DEP="bluetooth? ( net-wireless/bluez )
iconv? ( virtual/libiconv )
icu? ( dev-libs/icu:= )
python? ( ${PYTHON_DEPS} )
-   ncurses? ( sys-libs/ncurses:= )
+   ncurses? ( sys-libs/ncurses:0= )
nls? ( virtual/libintl )
tcl? ( >=dev-lang/tcl-8.4.15:0= )
usb? ( virtual/libusb:0 )
@@ -64,10 +64,8 @@ src_prepare() {
 }
 
 src_configure() {
-   filter-flags "_*_SOURCE*"
-   append-cppflags -D_DEFAULT_SOURCE
-   has_version ">=sys-libs/glibc-2.25-r5" && append-cppflags 
-DHAVE_SYS_SYSMACROS_H
-   has_version "sys-libs/ncurses[tinfo]" && append-libs -ltinfo
+   append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
+   append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
 
tc-export AR LD PKG_CONFIG
# override prefix in order to install into /

diff --git a/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch 
b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
index d45d6104e4b..f33e46a1890 100644
--- a/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
+++ b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
@@ -1,24 +1,20 @@
 a/Programs/system_linux.c  2017-12-02 12:54:34.098643832 -0800
-+++ b/Programs/system_linux.c  2017-12-02 12:59:00.683592161 -0800
-@@ -24,6 +24,9 @@
+--- a/Programs/system_linux.c
 b/Programs/system_linux.c
+@@ -24,6 +24,7 @@
  #include 
  #include 
  #include 
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include   /* major() w/newer glibc */
-+#endif
++#include 
  
  #include "log.h"
  #include "file.h"
 a/Programs/brlapi_client.c 2017-12-02 14:29:37.524205316 -0800
-+++ b/Programs/brlapi_client.c 2017-12-02 14:32:45.679948051 -0800
-@@ -73,6 +73,9 @@
+--- a/Programs/brlapi_client.c
 b/Programs/brlapi_client.c
+@@ -73,6 +73,7 @@
  #include 
  #include 
  #define MAXIMUM_VIRTUAL_CONSOLE MAX_NR_CONSOLES
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include   /* major() w/newer glibc */
-+#endif
++#include 
  #endif /* linux */
  
  #ifdef __OpenBSD__

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

2018-03-26 Thread Aaron Bauman

commit: 6326de87e9f6e14fe2cd72839e21a4cb45534b18
Author: Marty E. Plummer  startmail  com>
AuthorDate: Thu Mar 22 11:54:34 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Mar 26 20:19:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6326de87

app-accessibility/brltty: bump to EAPI 6

Also readjusted the epatch call to an eapply call, added
HTML_DOCS/einstalldocs as dohtml is deprecated on EAPI=6,
and adjusted the keepdir call to point at the correct directory.

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/7590

 app-accessibility/brltty/brltty-5.2-r1.ebuild  | 43 --
 .../brltty/files/brltty-5.2-respect-AR.patch   |  5 +--
 .../brltty/files/brltty-5.2-udev.patch |  5 +--
 3 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild 
b/app-accessibility/brltty/brltty-5.2-r1.ebuild
index 8b9f34c0e4f..3622819ef62 100644
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 FINDLIB_USE="ocaml"
@@ -42,11 +42,17 @@ DEPEND="virtual/pkgconfig
 RDEPEND="java? ( >=virtual/jre-1.4 )
${COMMON_DEP}"
 
+HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-5.2-fix-ldflags.patch
+   "${FILESDIR}"/${PN}-5.2-udev.patch
+   "${FILESDIR}"/${PN}-5.2-respect-AR.patch
+   "${FILESDIR}"/${PN}-5.2-sysmacros.patch
+)
+
 src_prepare() {
-   epatch "${FILESDIR}"/${P}-fix-ldflags.patch \
-   "${FILESDIR}"/${P}-udev.patch \
-   "${FILESDIR}"/${P}-respect-AR.patch \
-   "${FILESDIR}"/${P}-sysmacros.patch
+   default
 
java-pkg-opt-2_src_prepare
 
@@ -163,30 +169,29 @@ src_install() {
 
libdir="$(get_libdir)"
mkdir -p "${D}"/usr/${libdir}/
-   mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/
+   mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/ || die
gen_usr_ldscript libbrlapi.so
 
-   cd Documents
-   mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt
-   mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt
-   mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt
+   cd Documents || die
+   mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt || die
+   mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt || die
+   mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt || die
dodoc CONTRIBUTORS ChangeLog HISTORY README* TODO BRLTTY-*.txt
-   dohtml -r Manual-BRLTTY
if use doc; then
-   dohtml -r Manual-BrlAPI
dodoc BrlAPI-*.txt
+   HTML_DOCS="Manual-BRLTTY" einstalldocs
fi
 
-   keepdir /var/lib/brlapi
-   rmdir "${D}/run/brltty"
-   rmdir "${D}/run"
+   keepdir /var/lib/BrlAPI
+   rmdir "${D}/run/brltty" || die
+   rmdir "${D}/run" || die
 }
 
 pkg_postinst() {
elog
-   elog please be sure "${ROOT}"etc/brltty.conf is correct for your system.
+   elog "please be sure ${ROOT}etc/brltty.conf is correct for your system."
elog
-   elog To make brltty start on boot, type this command as root:
+   elog "To make brltty start on boot, type this command as root:"
elog
-   elog rc-update add brltty boot
+   elog "rc-update add brltty boot"
 }

diff --git a/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch 
b/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
index 95451dc98b7..c5698a2b939 100644
--- a/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
+++ b/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch
@@ -1,6 +1,5 @@
-diff -Naur brltty-5.2/Programs/Makefile.in brltty-5.2-new/Programs/Makefile.in
 brltty-5.2/Programs/Makefile.in2014-11-06 07:28:41.0 -0800
-+++ brltty-5.2-new/Programs/Makefile.in2014-11-20 05:41:57.144219093 
-0800
+--- a/Programs/Makefile.in
 b/Programs/Makefile.in
 @@ -434,7 +434,7 @@
[ ! -f lib.def ] || mv lib.def $(API_DEF)
  

diff --git a/app-accessibility/brltty/files/brltty-5.2-udev.patch 
b/app-accessibility/brltty/files/brltty-5.2-udev.patch
index dbbc2989766..e6d56603b01 100644
--- a/app-accessibility/brltty/files/brltty-5.2-udev.patch
+++ b/app-accessibility/brltty/files/brltty-5.2-udev.patch
@@ -1,6 +1,5 @@
-diff -Naur brltty-5.2/Autostart/Udev/udev.rules 
brltty-5.2-new/Autostart/Udev/udev.rules
 brltty-5.2/Autostart/Udev/udev.rules   2014-11-06 07:28:41.0 
-0800
-+++ brltty-5.2-new/Autostart/Udev/udev.rules   2014-11-20 05:28:44.404885312 
-0800
+--- a/Autostart/Udev/udev.rules
 b/Autostart/Udev/udev.rules
 @@ -182,20 +182,22 @@
  # FreedomScientific [Focus Blue]
  ENV{PRODUCT}

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

2023-10-09 Thread Sam James

commit: 81a72b436df07cca118495976262e92792b12d7c
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 10 05:41:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 10 05:44:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81a72b43

app-accessibility/brltty: add 6.6

Closes: https://bugs.gentoo.org/905695
Closes: https://bugs.gentoo.org/911229
Closes: https://bugs.gentoo.org/913019
Signed-off-by: Sam James  gentoo.org>

 app-accessibility/brltty/Manifest  |   1 +
 app-accessibility/brltty/brltty-6.6.ebuild | 224 +
 .../brltty/files/brltty-6.6-cython3.patch  |  41 
 3 files changed, 266 insertions(+)

diff --git a/app-accessibility/brltty/Manifest 
b/app-accessibility/brltty/Manifest
index aa6a15780e20..1ce7c10b2556 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1 +1,2 @@
 DIST brltty-6.5.tar.xz 3631628 BLAKE2B 
b2e5f82f15dff9a99bf3d75523f6ec48d531d413d860079af0023b9efdc07a93563226c6388cc89ce025f8d13b1635e883680f0ddb8a688ffcc4cd9c335d7aee
 SHA512 
bbfbb89b1c3ba5063ad3bc0aa97b859dd23acea1feb79dab20c57dc74ff2f26649942fcecc7030a3f7096f4d9d35cd05616af2a8e101d4d56b4c471a6ad3
+DIST brltty-6.6.tar.xz 3684592 BLAKE2B 
c1ae05b925384f3869d3c90ccc06197da2a592691830504ff01a530da87319d463e25cd7b387805c199562be815ca4e79f3679f592f3a1107025e3aba17ec159
 SHA512 
852bfd9179570be7b0da8b1279f84bdfedc14a319988d9c2eac5a20a9ce8977f31fdee167e8e96bb411184a1d72f4cdc633944c7b3f55bddae411fc71a9e6898

diff --git a/app-accessibility/brltty/brltty-6.6.ebuild 
b/app-accessibility/brltty/brltty-6.6.ebuild
new file mode 100644
index ..c01143a96851
--- /dev/null
+++ b/app-accessibility/brltty/brltty-6.6.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+FINDLIB_USE="ocaml"
+JAVA_PKG_WANT_SOURCE="1.8"
+JAVA_PKG_WANT_TARGET="1.8"
+
+inherit findlib toolchain-funcs java-pkg-opt-2 autotools python-r1 tmpfiles
+
+DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind 
person"
+HOMEPAGE="https://brltty.app/";
+SRC_URI="https://brltty.app/archive/${P}.tar.xz";
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+api +beeper bluetooth doc +fm gpm iconv icu
+   java louis +midi ncurses nls ocaml +pcm policykit python
+   usb systemd +speech tcl xml X"
+REQUIRED_USE="doc? ( api )
+   java? ( api )
+   ocaml? ( api )
+   python? ( api ${PYTHON_REQUIRED_USE} )
+   tcl? ( api )"
+
+DEPEND="
+   acct-group/brltty
+   acct-user/brltty
+   dev-libs/libpcre2[pcre32]
+   bluetooth? (
+   sys-apps/dbus
+   net-wireless/bluez
+   )
+   gpm? ( >=sys-libs/gpm-1.20 )
+   iconv? ( virtual/libiconv )
+   icu? ( dev-libs/icu:= )
+   louis? ( dev-libs/liblouis:= )
+   midi? ( media-libs/alsa-lib )
+   ncurses? ( sys-libs/ncurses:0= )
+   pcm? ( media-libs/alsa-lib )
+   policykit? ( sys-auth/polkit )
+   python? ( ${PYTHON_DEPS} )
+   speech? (
+   app-accessibility/espeak-ng
+   app-accessibility/flite
+   app-accessibility/speech-dispatcher
+   )
+   systemd? ( sys-apps/systemd )
+   tcl? ( >=dev-lang/tcl-8.6.13-r1:= )
+   usb? ( virtual/libusb:1 )
+   xml? ( dev-libs/expat )
+   X? (
+   app-accessibility/at-spi2-core:2
+   sys-apps/dbus
+   x11-libs/libX11
+   x11-libs/libXaw
+   x11-libs/libXfixes
+   x11-libs/libXt
+   x11-libs/libXtst
+   )"
+RDEPEND="${DEPEND}
+   java? ( >=virtual/jre-1.8:* )
+"
+BDEPEND="
+   virtual/pkgconfig
+   java? ( >=virtual/jdk-1.8:* )
+   nls? ( virtual/libintl )
+   python? ( dev-python/cython[${PYTHON_USEDEP}] )
+"
+
+HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-6.4-respect-AR.patch
+   "${FILESDIR}"/${P}-cython3.patch
+)
+
+src_prepare() {
+   default
+
+   java-pkg-opt-2_src_prepare
+
+   # We run eautoconf instead of using eautoreconf because brltty uses
+   # a custom build system that uses autoconf without the rest of the
+   # autotools.
+   eautoconf
+   use python && python_copy_sources
+}
+
+src_configure() {
+   tc-export AR LD PKG_CONFIG
+
+   export JAVAC=""
+   export JAVA_JNI_FLAGS=""
+   if use java; then
+   export JAVA_HOME="$(java-config -g JAVA_HOME)"
+   export JAVAC_HOME="${JAVA_HOME}/bin"
+   export JAVA_JNI_FLAGS="$(java-pkg_get-jni-cflags)"
+   export JAVAC="$(java-pkg_get-javac) -encoding UTF-8 
$(java-pkg_javac-args)"
+   fi
+
+   # Override bindir for backward compatibility.
+   # Also o

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

2023-06-30 Thread David Seifert

commit: 845076c13583b59e67fa858ef90482d503da12c0
Author: David Seifert  gentoo  org>
AuthorDate: Fri Jun 30 11:50:33 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Jun 30 11:50:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=845076c1

app-accessibility/brltty: fix gettext 0.22 breakage

* fixed upstream in
  
https://github.com/brltty/brltty/commit/31061173fd80c7ed0f83e8d20d62c59dbedcebe0

Closes: https://bugs.gentoo.org/908897
Signed-off-by: David Seifert  gentoo.org>

 app-accessibility/brltty/brltty-6.5-r1.ebuild  |  3 +-
 .../brltty/files/brltty-6.5-gettext-0.22.patch | 49 ++
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/app-accessibility/brltty/brltty-6.5-r1.ebuild 
b/app-accessibility/brltty/brltty-6.5-r1.ebuild
index 8bb86f80887c..99fb58bf9796 100644
--- a/app-accessibility/brltty/brltty-6.5-r1.ebuild
+++ b/app-accessibility/brltty/brltty-6.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 FINDLIB_USE="ocaml"
 JAVA_PKG_WANT_SOURCE="1.8"
 JAVA_PKG_WANT_TARGET="1.8"
@@ -75,6 +75,7 @@ HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
 
 PATCHES=(
"${FILESDIR}"/${PN}-6.4-respect-AR.patch
+   "${FILESDIR}"/${PN}-6.5-gettext-0.22.patch
 )
 
 src_prepare() {

diff --git a/app-accessibility/brltty/files/brltty-6.5-gettext-0.22.patch 
b/app-accessibility/brltty/files/brltty-6.5-gettext-0.22.patch
new file mode 100644
index ..7cf62f74221c
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-6.5-gettext-0.22.patch
@@ -0,0 +1,49 @@
+https://bugs.gentoo.org/908897
+fix: 
https://github.com/brltty/brltty/commit/31061173fd80c7ed0f83e8d20d62c59dbedcebe0
+
+From 31061173fd80c7ed0f83e8d20d62c59dbedcebe0 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz 
+Date: Tue, 27 Jun 2023 15:07:09 -0400
+Subject: [PATCH] Add gettext header to ru.po
+
+Building with gettext-0.22 fails for lack of this header:
+
+/usr/bin/msgfmt: input file doesn't contain a header entry with a
+charset specification
+--- a/Messages/ru.po
 b/Messages/ru.po
+@@ -1,3 +1,34 @@
++# BRLTTY - A background process providing access to the console screen (when 
in
++#  text mode) for a blind person using a refreshable braille display.
++#
++# Copyright (C) 1995-2022 by The BRLTTY Developers.
++#
++# BRLTTY comes with ABSOLUTELY NO WARRANTY.
++#
++# This is free software, placed under the terms of the
++# GNU Lesser General Public License, as published by the Free Software
++# Foundation; either version 2.1 of the License, or (at your option) any
++# later version. Please see the file LICENSE-LGPL for details.
++#
++# Web Page: http://brltty.app/
++#
++# This software is maintained by Dave Mielke .
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: brltty 4.5\n"
++"Report-Msgid-Bugs-To: brl...@brltty.app\n"
++"POT-Creation-Date: 2021-01-27 11:47-0500\n"
++"PO-Revision-Date: 2021-02-07 08:18-0500\n"
++"Last-Translator: Маргарита Мельникова \n"
++"Language-Team: Friends of BRLTTY \n"
++"Language: ru\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
++"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
++
+ #: Programs/brltty.c:167
+ #, c-format
+ msgid "\"%s\" started as \"%s\"\n"

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

2023-01-14 Thread Sam James

commit: da4aa367ca27abdbf1bcdff86dc7e4a37732cbed
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 14 13:53:57 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 14 13:54:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da4aa367

app-accessibility/brltty: drop 6.1, 6.1-r1, 6.4, 6.4-r1

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

 app-accessibility/brltty/Manifest  |   2 -
 app-accessibility/brltty/brltty-6.1-r1.ebuild  | 218 
 app-accessibility/brltty/brltty-6.1.ebuild | 218 
 app-accessibility/brltty/brltty-6.4-r1.ebuild  | 221 -
 app-accessibility/brltty/brltty-6.4.ebuild | 210 
 .../brltty/files/brltty-5.2-respect-AR.patch   |  11 -
 .../brltty/files/brltty-6.0-udev.patch |  27 ---
 app-accessibility/brltty/metadata.xml  |   1 -
 8 files changed, 908 deletions(-)

diff --git a/app-accessibility/brltty/Manifest 
b/app-accessibility/brltty/Manifest
index 447bf8b37e8f..aa6a15780e20 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1,3 +1 @@
-DIST brltty-6.1.tar.xz 3394852 BLAKE2B 
03e6358721dcd5c3bdee3301a1ed827a690128ec339669543279c7e9a115bef6c5d8630e4af2d0b214b9c7c3eaa9001ab4c54ae7fb899cb3bc675985f51d6933
 SHA512 
030ef60ef7a9a60dc2fba2a64ea0a0868395eee6f2f86876b4e4111e804a05b44f798a154a69a8f5e0f6358130993c360a550f7decac0535450f9cf939231eaf
-DIST brltty-6.4.tar.xz 3669296 BLAKE2B 
2824b212c7e4fea0f65c7ae111432071805aa63117a7e9a9932d7720ef2157f1e6fd33e3e91e4515c7131bd066db8f910969fb186d2007b63bc83efcbe2332b1
 SHA512 
384848d05f78732952079d6f5170046927fcb35f400ece71ca897415a793c0aa1047934f8cd5e9e781536fb0b7cb71273283f3bba21e59f082ba8f6f2416352e
 DIST brltty-6.5.tar.xz 3631628 BLAKE2B 
b2e5f82f15dff9a99bf3d75523f6ec48d531d413d860079af0023b9efdc07a93563226c6388cc89ce025f8d13b1635e883680f0ddb8a688ffcc4cd9c335d7aee
 SHA512 
bbfbb89b1c3ba5063ad3bc0aa97b859dd23acea1feb79dab20c57dc74ff2f26649942fcecc7030a3f7096f4d9d35cd05616af2a8e101d4d56b4c471a6ad3

diff --git a/app-accessibility/brltty/brltty-6.1-r1.ebuild 
b/app-accessibility/brltty/brltty-6.1-r1.ebuild
deleted file mode 100644
index c0f6357bb416..
--- a/app-accessibility/brltty/brltty-6.1-r1.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_9 )
-FINDLIB_USE="ocaml"
-JAVA_PKG_WANT_SOURCE="1.8"
-JAVA_PKG_WANT_TARGET="1.8"
-
-inherit findlib multilib toolchain-funcs java-pkg-opt-2 flag-o-matic 
usr-ldscript \
-   autotools udev systemd python-r1 tmpfiles
-
-DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind 
person"
-HOMEPAGE="https://brltty.app/";
-SRC_URI="https://brltty.app/archive/${P}.tar.xz";
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv x86"
-IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
-   java louis +midi ncurses nls ocaml +pcm policykit python
-   usb systemd +speech tcl xml X"
-REQUIRED_USE="doc? ( api )
-   java? ( api )
-   ocaml? ( api )
-   python? ( api ${PYTHON_REQUIRED_USE} )
-   tcl? ( api )"
-
-DEPEND="
-   app-accessibility/at-spi2-core:2
-   dev-libs/libpcre2[pcre32]
-   sys-apps/dbus
-   bluetooth? ( net-wireless/bluez )
-   gpm? ( >=sys-libs/gpm-1.20 )
-   iconv? ( virtual/libiconv )
-   icu? ( dev-libs/icu:= )
-   louis? ( dev-libs/liblouis:= )
-   midi? ( media-libs/alsa-lib )
-   ncurses? ( sys-libs/ncurses:0= )
-   pcm? ( media-libs/alsa-lib )
-   policykit? ( sys-auth/polkit )
-   python? ( ${PYTHON_DEPS} )
-   speech? (
-   app-accessibility/espeak
-   app-accessibility/flite
-   app-accessibility/speech-dispatcher
-   )
-   systemd? ( sys-apps/systemd )
-   tcl? ( >=dev-lang/tcl-8.4.15:0= )
-   usb? ( virtual/libusb:0 )
-   xml? ( dev-libs/expat )
-   X? (
-   x11-libs/libX11
-   x11-libs/libXaw
-   x11-libs/libXfixes
-   x11-libs/libXt
-   x11-libs/libXtst
-   )"
-RDEPEND="${DEPEND}
-   java? ( >=virtual/jre-1.8:* )
-"
-BDEPEND="
-   virtual/pkgconfig
-   java? ( >=virtual/jdk-1.8:* )
-   nls? ( virtual/libintl )
-   python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
-"
-
-HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-6.0-udev.patch
-   "${FILESDIR}"/${PN}-5.2-respect-AR.patch
-)
-
-src_prepare() {
-   default
-
-   java-pkg-opt-2_src_prepare
-
-   # We run eautoconf instead of using eautoreconf because brltty uses
-   # a custom build system that uses autoconf without the rest of the
-   # autotools.
-   eautoconf
-   use python &&

53 matches

Mail list logo