From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 40E4B139083 for ; Mon, 4 Dec 2017 10:27:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2118BE0F3D; Mon, 4 Dec 2017 10:27:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E1F9FE0F3D for ; Mon, 4 Dec 2017 10:27:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0DBAA33BEC7 for ; Mon, 4 Dec 2017 10:26:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9C9AAAC4C for ; Mon, 4 Dec 2017 10:26:57 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1512383112.9972fed3f21b47e7315949e39f762d9b209c1fd5.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-accessibility/brltty/files/, app-accessibility/brltty/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-accessibility/brltty/brltty-5.2-r1.ebuild app-accessibility/brltty/files/brltty-5.2-sysmacros.patch X-VCS-Directories: app-accessibility/brltty/files/ app-accessibility/brltty/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 9972fed3f21b47e7315949e39f762d9b209c1fd5 X-VCS-Branch: master Date: Mon, 4 Dec 2017 10:26:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fabd7e41-5725-4e52-8ecf-e8bda0bdf9be X-Archives-Hash: bedf22f17311e954976fefeb1dac99e2 commit: 9972fed3f21b47e7315949e39f762d9b209c1fd5 Author: David Seifert gentoo org> AuthorDate: Mon Dec 4 10:24:38 2017 +0000 Commit: David Seifert gentoo org> CommitDate: Mon Dec 4 10:25:12 2017 +0000 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__