diff options
Diffstat (limited to 'app-accessibility')
| -rw-r--r-- | app-accessibility/Manifest.gz | bin | 6557 -> 6553 bytes | |||
| -rw-r--r-- | app-accessibility/brltty/Manifest | 4 | ||||
| -rw-r--r-- | app-accessibility/brltty/brltty-5.2-r1.ebuild | 12 | ||||
| -rw-r--r-- | app-accessibility/brltty/files/brltty-5.2-sysmacros.patch | 20 |
4 files changed, 15 insertions, 21 deletions
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz Binary files differindex 8c0ca2c39013..aefe6738d33c 100644 --- a/app-accessibility/Manifest.gz +++ b/app-accessibility/Manifest.gz diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest index 4f34271651e1..35b3840f09f5 100644 --- a/app-accessibility/brltty/Manifest +++ b/app-accessibility/brltty/Manifest @@ -1,10 +1,10 @@ AUX brltty-5.2-fix-ldflags.patch 2168 BLAKE2B c75da04cfb57b550634a18f67c81fb0fef857122795ff1a28c5d8fd654849cd4fe25a436b72aa851cb746f6eea52e7c2a52f5ba40f3d64797341678b4035070f SHA512 72ce6b722e90deb9e3d6d537b54ce2f8625154a5920eb555fb5fab1b65703a4ff88a2e0907b74a11454231507ebd9741533ee9b77ec5dfeffd3870179ebd98e8 AUX brltty-5.2-major.patch 1511 BLAKE2B 69ee1619d30241bae78e70c0876f7d9df664fef38ef4666bc34d3da8a45bc55f1b278f735169724f6882c408135f5dc51e7e75af9a0adf74351db4b324a0b66d SHA512 88d1eb5340e105c8e975e89071d8f9f7818d417931442c69cd1fff5cdb197dc1c40e4618c6a9b62b15f972e03523ac9d3a18deb0e7d1be6b6c1aed1b309e29cf AUX brltty-5.2-respect-AR.patch 433 BLAKE2B 20fc18a063bc568925646d6d21fe6c59c33105957f9de155ea9046cac95bf1319bdeab3cecf5d0016d72a5a2f484534bb6eec8aa9d4ae4f6f5d325a6ee6c27bd SHA512 ce778cded4ee6f9ac45faedd3727c58746e780cff944d2c39ff71f792905c7f214b104641aef72a233d07df74a92cc2a596ac6bac1b76873d82d2c1383e994e9 -AUX brltty-5.2-sysmacros.patch 750 BLAKE2B 8d6955bf3a4792d460e85869951a8fd10e4d99014a79e3f56257b65be3acb36db1dca299f7af75995fd3bfb33619548531ad4fab31734b3503a2048945e17732 SHA512 f64cfd6351d20807624ed398d1f1c466b92d8f281934cecbeeeadf1f0faf360f33e2e3764c7b9f7467ccf62af206368986c41867f6f3f54ff966be78902119e2 +AUX brltty-5.2-sysmacros.patch 458 BLAKE2B ed2f09ed3a137758603d0067ec18708bbfc24fb3cad90954905ebeac4900dd70b679ccfc1d64c6f23fc9d4c7de0275a760222f8dcd935086541ef16cfd9ac963 SHA512 8e1ea5351c963df01603ff2469ff01079896fac40fbc1b91bb88f976749b639b4c925382e041f402f1cfef8a16716fb46109650b173539d69131f1e275ee1392 AUX brltty-5.2-udev.patch 1208 BLAKE2B c8fc47d9ea27ca78c4634be47d43f406ba0875eb1b4a19048c264faa602918ac96024b03f56c642722cc9eabdbbe9a9f9005ca4de0d39538f746ed4ecadce3dd SHA512 0a1873dbdee7b97385199bd1f7158847bd8c52f7678783add4353c990ad5a93bc5378f38e52e3b1b30d071167802750cfccad227260dab8eba52e88cb230cefd AUX brltty.rc 242 BLAKE2B 68fc8de846cdaff11b2b6377d49985c8cbad1342dad03e60f3a3ef2e8aeb728994c05f6b9bb9378e5434c1e4cd03ead0716abf7344dea3f993ac10d9c12edc23 SHA512 067dc15ca297774ad773512f57e0b828ce97a07ac7156e4c72fc25b8b045eeca313ae566564c954193be83c72928dc3a26e1fadc4b2cc1755c607f515590cb9a AUX brltty.tmpfiles.conf 31 BLAKE2B e51c4c6e98da2d68ebd2aca39d3015ca28b40dbee5528155f9efb87ef8ec5264b382c78acf748514bd1f3902dbedcd471f4e18b0361c6a924108a950c75aceb9 SHA512 3d52a11e0d266ac508ab5447b6515f006f610e3bcb2ec396c3fe4c58a68874c9568f7fd6a143829f69c1b87680f1157953eae9fe326f5db3723c7e4b46390bf7 DIST brltty-5.2.tar.xz 2532684 BLAKE2B 9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f SHA512 8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f -EBUILD brltty-5.2-r1.ebuild 5196 BLAKE2B 60d9aa930fa67463003111b02fe339bf8f4c73282c67d29165273263b852fe51dadb7e1b0468ddf26ed27ba986ba4f67a5ee100cdc36dc9f8ddcfe815c057fce SHA512 2c2be3c79a3b8054f82adc5ea06ee00864b72325cf7da0ffeaa50019a13b763fd40b6d4d0918ecb935698daf2b20527b83136ec3f940829053f7141a9fac9df3 +EBUILD brltty-5.2-r1.ebuild 5110 BLAKE2B a4721ce01383f259b44457f3c1f49998d319a96888a9c94e82ca98dd3e12d58e7753a86425fae215b1c7accced2cd561447a95de4845e0ae0e12176204c447f1 SHA512 714da26e215f751c0fa2d438e2e9008e8634d8f56ce71b1aec8db5662e719103b83b05d7a2156e6736b74249fec6f44f6478b1913c9c07244367d39650117d54 MISC metadata.xml 1502 BLAKE2B 75f1750b615a2d6d022ed682f65ce6d0d45908e0d5724a162220a915371ae357cd904b0c09083153fb0f07facbc89024604fe86e3386e58a7d409a82f3865835 SHA512 337bf98d4e2ffac2ea0721a042bd31958809de5089090b0a79d73457f700d57fb8ffe637f4ad9e896992e98a13fdbe1ac9a3f7758d8ad2703334db8edfb7c32c diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild b/app-accessibility/brltty/brltty-5.2-r1.ebuild index 12ea62ef94e3..71cbc57d9d13 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 d45d6104e4bb..f33e46a1890c 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 <fcntl.h> #include <sys/ioctl.h> #include <sys/stat.h> -+#ifdef HAVE_SYS_SYSMACROS_H -+#include <sys/sysmacros.h> /* major() w/newer glibc */ -+#endif ++#include <sys/sysmacros.h> #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 <linux/tty.h> #include <linux/vt.h> #define MAXIMUM_VIRTUAL_CONSOLE MAX_NR_CONSOLES -+#ifdef HAVE_SYS_SYSMACROS_H -+#include <sys/sysmacros.h> /* major() w/newer glibc */ -+#endif ++#include <sys/sysmacros.h> #endif /* linux */ #ifdef __OpenBSD__ |