gentoo resync : 03.12.2017

6 files changed, 40 insertions, 12 deletions

diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index cf9622d9c671..8c0ca2c39013 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index 0fae28101066..4f34271651e1 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1,9 +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-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 SHA256 f1293940317a675d0eaeaf3f363bbfe4bfaa5225c2116123a61ce2d3c71943f7 SHA512 8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f WHIRLPOOL 33fcf326be381309f2baa3f59807145a0ca3a614f32b0b27e4b76af1c1f46f6459f7be1d629002538588ce71ab017b52bfc642fc06aa2c3f883aba272e61f20e
-EBUILD brltty-5.2-r1.ebuild 5006 BLAKE2B dc56d0075f429a036035fab311fa609afd30ee38d5c59527de8a9fa8d67ccc003dc7097d2b663f1007cf01839bbc944e0c2e94df61a4ecf3a14bcb8f288ab4b4 SHA512 8fcaf6f0cfdcf88686b9063c8b4b3c3ef732ed08814a0e20f9d41b3b3809407d96434a223c752738cc34ee070673f9f07cfe7f27c56dc946d923b3f7c6910284
+DIST brltty-5.2.tar.xz 2532684 BLAKE2B 9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f SHA512 8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f
+EBUILD brltty-5.2-r1.ebuild 5196 BLAKE2B 60d9aa930fa67463003111b02fe339bf8f4c73282c67d29165273263b852fe51dadb7e1b0468ddf26ed27ba986ba4f67a5ee100cdc36dc9f8ddcfe815c057fce SHA512 2c2be3c79a3b8054f82adc5ea06ee00864b72325cf7da0ffeaa50019a13b763fd40b6d4d0918ecb935698daf2b20527b83136ec3f940829053f7141a9fac9df3
 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 59aa9142308b..12ea62ef94e3 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_4 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
 FINDLIB_USE="ocaml"
 
 inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
@@ -15,14 +15,14 @@ SRC_URI="http://brltty.com/archive/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 x86"
+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} )
+	python? ( api )
 	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:0= )
+	ncurses? ( sys-libs/ncurses:= )
 	nls? ( virtual/libintl )
 	tcl? ( >=dev-lang/tcl-8.4.15:0= )
 	usb? ( virtual/libusb:0 )
@@ -46,7 +46,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-fix-ldflags.patch \
 		"${FILESDIR}"/${P}-udev.patch \
 		"${FILESDIR}"/${P}-respect-AR.patch \
-		"${FILESDIR}"/${P}-major.patch
+		"${FILESDIR}"/${P}-sysmacros.patch
 
 	java-pkg-opt-2_src_prepare
 
@@ -64,6 +64,11 @@ 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
+
 	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
diff --git a/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
new file mode 100644
index 000000000000..d45d6104e4bb
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch
@@ -0,0 +1,24 @@
+--- 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 @@
+ #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 "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 @@
+ #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
+ #endif /* linux */
+ 
+ #ifdef __OpenBSD__
diff --git a/app-accessibility/simon/Manifest b/app-accessibility/simon/Manifest
index 35c12ee51aa0..f2d061e2a367 100644
--- a/app-accessibility/simon/Manifest
+++ b/app-accessibility/simon/Manifest
@@ -4,7 +4,7 @@ AUX simon-0.4.1-no-qtwebkit.patch 639 BLAKE2B a406f45b45a7ce460b7c3f6ff304444278
 AUX simon-0.4.1-opencv-include.patch 729 BLAKE2B 607f753e06ffa8698e52b783e18db816b925fd88c95f451ea3fbe22aa01323b5e866900bcfe5769354d7fdaee2bf139713a6719172caa61cc1e860f0eb64d4f7 SHA512 f84629d51a241589c9977dd2ab412dd155435a27cb5544848b6fe73d2a292bf3aef2b07ede226e5a89d616a50f50fa6d505a281118ea7f6f333e3479c423ed0a
 AUX simon-0.4.1-sphinx.patch 881 BLAKE2B c3641d631d1011bf0ad682d8c15d8a86014fe3e4e256b2a11b548866eec342a9f52680b36d142a91fca0a66a011fb80e5c71895a97e418ae265304949c78a710 SHA512 93b0ff4ee18a51b868a89a4baa93a0b4f19ade6e0b3b7ed876f128eb3de480e8df8625abfb31d586cb0159092cac4e3e911cfcef47c5242c138019ddfb87f6d8
 DIST simon-0.4.1.tar.bz2 23856024 SHA256 8d55bc3f607a89e15efd51b844d93daf67d9967ad243f54efae324754859342d SHA512 d7349af3ec2482f18d8407891eeea7beea75630cc85aeade9f4105e3b84e82fde6284338688bbf84824d43c68de102eb34f3c21068cbe8a3307aa0586732b30d WHIRLPOOL 4c512bdfed8676cb5cfb896eacb14c66e3497abebe97a4faeb6804feb8ba36ed9101bc79a6efa573470d4a4d7eb6dfc94e3315dac488554563d35a397a066acb
-DIST simon-0.4.90.tar.xz 25257276 SHA256 e3a947c3b0b3f033cce43e2e7a5df86e0e8beec0442b2c19397f69f39a33307b SHA512 88b225e6d0168b87241649019376c8726fb3cc96ccbb985fd3dac5f5b67ed2d84de2756537300d7944797bceb7e340cdaf1c5aed731c1a7e2873d284ca3f94c1 WHIRLPOOL dca0174065a8c06269a02fdfdd6133e10e3f944ab2574259d1330b6210db5ddc381bd0f19f7566e225c0a73b3e2ba716e6fccbcf938e9a89f94cfbfba177f7c4
+DIST simon-0.4.90.tar.xz 25257276 BLAKE2B d5f78c721dc55387db415a740b00831471d6325d3aa2a0282e476132d2c7e378c4b024500527fd54a4073e972494e6ecc6f094022b5651b163d78ff6fcb20fcf SHA512 88b225e6d0168b87241649019376c8726fb3cc96ccbb985fd3dac5f5b67ed2d84de2756537300d7944797bceb7e340cdaf1c5aed731c1a7e2873d284ca3f94c1
 EBUILD simon-0.4.1.ebuild 2129 BLAKE2B 708580477838ffceaa89a5e4fcd69c38613eb00449d444a038e4632096793145c158cd91424629bd501f108ae374cde409c1de57509355d408326f17a2dc279e SHA512 1321c489ebf1622e53cb27139994373cb9183fd8a39fdb6bd6548f528482651e77c0533460d4a139079ccdc27a5b3eb81f02f05f94c7c00a83eba460e60cc27a
-EBUILD simon-0.4.90.ebuild 1610 BLAKE2B 9b1340547eea13dcbfa911bd3770919351d133aa3cd0f87f13cdaad8692e63c5ef213bbfd9b5a7982fde62d334c27a7822a5ececbe66da04e9dc7a6ec1ff96ac SHA512 1a47f2398d29b992e6900d8260f577389fac96f94461e0b4b06726f65ca4fc08061e26d6931acebed2ef9c7bf94e3cbcb9c8b3d5b7354567d5b2c9d0fa8425af
+EBUILD simon-0.4.90-r1.ebuild 1465 BLAKE2B e3bcca0657538ca3732b7db89a17b352cff7e362a8dbe8349230f629b936ecaab108b0a4be8d8b0516ea784e6e3d4f3d862783433ca4d3ba310eac815b0d5d28 SHA512 756b003d4323fd2e4887346c4d4277c6f202e30d09b5a14d3ecc3afc982656e4b479cd74b5516bed24aa5eefb4864239e4aeb9b0a0d78adc474ae3e2d2d4739f
 MISC metadata.xml 451 BLAKE2B ffc1a52ac33bd8599c4067408a58046ca8bcc4e331ad5d339c7f0bf2e45e2351e7e6596b2e6880b8412fa4de8c61ecd28846d5c5183deaeb7ef1be0af8aa8246 SHA512 eb8227475d109a54c445968c6e7ad98da678e7647547b42d04e369ad9dfe3fa8029398fe903ceff8bcb6ef61bb35298584363fb7d40fa2f7fed763d0e97f7b89
diff --git a/app-accessibility/simon/simon-0.4.90.ebuild b/app-accessibility/simon/simon-0.4.90-r1.ebuild
index c5c349f0a267..7233beeb2d23 100644
--- a/app-accessibility/simon/simon-0.4.90.ebuild
+++ b/app-accessibility/simon/simon-0.4.90-r1.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=6
 
-KDE_LINGUAS="ast bs ca ca@valencia cs da de el en_GB es et fa fi fr ga gl
-hu ia ja kk lt mr nds nl pl pt pt_BR sk sl sv tr ug uk zh_CN zh_TW"
 SQL_REQUIRED="always"
 inherit kde4-base
 
@@ -21,7 +19,7 @@ RDEPEND="
 	media-libs/alsa-lib
 	x11-libs/libX11
 	x11-libs/libXtst
-	x11-libs/qwt:6[qt4(+)]
+	x11-libs/qwt:6[qt4]
 	libsamplerate? ( media-libs/libsamplerate )
 	opencv? ( media-libs/opencv )
 	sphinx? (