| 1 |
commit: 9972fed3f21b47e7315949e39f762d9b209c1fd5 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 4 10:24:38 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 4 10:25:12 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9972fed3 |
| 7 |
|
| 8 |
app-accessibility/brltty: [QA] Fix multiple issues |
| 9 |
|
| 10 |
* Don't add dead python impls to PYTHON_COMPAT |
| 11 |
* Don't remove python metadata vars (${PYTHON_REQUIRED_USE}) |
| 12 |
from REQUIRED_USE |
| 13 |
* Don't remove the SLOT specifier for sys-libs/ncurses |
| 14 |
* Get rid of the awfully complicated, hacky and |
| 15 |
non-generalisable solution for the libtinfo split, |
| 16 |
which also doesn't generalise to Prefix. |
| 17 |
Using pkg-config is easier, safer, more portable and |
| 18 |
less brittle than the previous hacks. |
| 19 |
* Get rid of the totally unnecessary code paths |
| 20 |
created by dispatching on glibc versions. |
| 21 |
'sys/sysmacros.h' can always be included on glibc, |
| 22 |
packages just have relied on this include implicitly. |
| 23 |
|
| 24 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
| 25 |
|
| 26 |
app-accessibility/brltty/brltty-5.2-r1.ebuild | 12 +++++------- |
| 27 |
.../brltty/files/brltty-5.2-sysmacros.patch | 20 ++++++++------------ |
| 28 |
2 files changed, 13 insertions(+), 19 deletions(-) |
| 29 |
|
| 30 |
diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild b/app-accessibility/brltty/brltty-5.2-r1.ebuild |
| 31 |
index 12ea62ef94e..71cbc57d9d1 100644 |
| 32 |
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild |
| 33 |
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild |
| 34 |
@@ -3,7 +3,7 @@ |
| 35 |
|
| 36 |
EAPI=5 |
| 37 |
|
| 38 |
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 ) |
| 39 |
+PYTHON_COMPAT=( python2_7 python3_{4,5} ) |
| 40 |
FINDLIB_USE="ocaml" |
| 41 |
|
| 42 |
inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \ |
| 43 |
@@ -22,7 +22,7 @@ IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu |
| 44 |
REQUIRED_USE="doc? ( api ) |
| 45 |
java? ( api ) |
| 46 |
ocaml? ( api ) |
| 47 |
- python? ( api ) |
| 48 |
+ python? ( api ${PYTHON_REQUIRED_USE} ) |
| 49 |
tcl? ( api )" |
| 50 |
|
| 51 |
COMMON_DEP="bluetooth? ( net-wireless/bluez ) |
| 52 |
@@ -30,7 +30,7 @@ COMMON_DEP="bluetooth? ( net-wireless/bluez ) |
| 53 |
iconv? ( virtual/libiconv ) |
| 54 |
icu? ( dev-libs/icu:= ) |
| 55 |
python? ( ${PYTHON_DEPS} ) |
| 56 |
- ncurses? ( sys-libs/ncurses:= ) |
| 57 |
+ ncurses? ( sys-libs/ncurses:0= ) |
| 58 |
nls? ( virtual/libintl ) |
| 59 |
tcl? ( >=dev-lang/tcl-8.4.15:0= ) |
| 60 |
usb? ( virtual/libusb:0 ) |
| 61 |
@@ -64,10 +64,8 @@ src_prepare() { |
| 62 |
} |
| 63 |
|
| 64 |
src_configure() { |
| 65 |
- filter-flags "_*_SOURCE*" |
| 66 |
- append-cppflags -D_DEFAULT_SOURCE |
| 67 |
- has_version ">=sys-libs/glibc-2.25-r5" && append-cppflags -DHAVE_SYS_SYSMACROS_H |
| 68 |
- has_version "sys-libs/ncurses[tinfo]" && append-libs -ltinfo |
| 69 |
+ append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)" |
| 70 |
+ append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)" |
| 71 |
|
| 72 |
tc-export AR LD PKG_CONFIG |
| 73 |
# override prefix in order to install into / |
| 74 |
|
| 75 |
diff --git a/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch |
| 76 |
index d45d6104e4b..f33e46a1890 100644 |
| 77 |
--- a/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch |
| 78 |
+++ b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch |
| 79 |
@@ -1,24 +1,20 @@ |
| 80 |
---- a/Programs/system_linux.c 2017-12-02 12:54:34.098643832 -0800 |
| 81 |
-+++ b/Programs/system_linux.c 2017-12-02 12:59:00.683592161 -0800 |
| 82 |
-@@ -24,6 +24,9 @@ |
| 83 |
+--- a/Programs/system_linux.c |
| 84 |
++++ b/Programs/system_linux.c |
| 85 |
+@@ -24,6 +24,7 @@ |
| 86 |
#include <fcntl.h> |
| 87 |
#include <sys/ioctl.h> |
| 88 |
#include <sys/stat.h> |
| 89 |
-+#ifdef HAVE_SYS_SYSMACROS_H |
| 90 |
-+#include <sys/sysmacros.h> /* major() w/newer glibc */ |
| 91 |
-+#endif |
| 92 |
++#include <sys/sysmacros.h> |
| 93 |
|
| 94 |
#include "log.h" |
| 95 |
#include "file.h" |
| 96 |
---- a/Programs/brlapi_client.c 2017-12-02 14:29:37.524205316 -0800 |
| 97 |
-+++ b/Programs/brlapi_client.c 2017-12-02 14:32:45.679948051 -0800 |
| 98 |
-@@ -73,6 +73,9 @@ |
| 99 |
+--- a/Programs/brlapi_client.c |
| 100 |
++++ b/Programs/brlapi_client.c |
| 101 |
+@@ -73,6 +73,7 @@ |
| 102 |
#include <linux/tty.h> |
| 103 |
#include <linux/vt.h> |
| 104 |
#define MAXIMUM_VIRTUAL_CONSOLE MAX_NR_CONSOLES |
| 105 |
-+#ifdef HAVE_SYS_SYSMACROS_H |
| 106 |
-+#include <sys/sysmacros.h> /* major() w/newer glibc */ |
| 107 |
-+#endif |
| 108 |
++#include <sys/sysmacros.h> |
| 109 |
#endif /* linux */ |
| 110 |
|
| 111 |
#ifdef __OpenBSD__ |
Archives