gentoo resync : 06.12.2017

2 files changed, 0 insertions, 60 deletions

diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index 35b3840f09f5..f0ed5182b602 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1,5 +1,4 @@
 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 458 BLAKE2B ed2f09ed3a137758603d0067ec18708bbfc24fb3cad90954905ebeac4900dd70b679ccfc1d64c6f23fc9d4c7de0275a760222f8dcd935086541ef16cfd9ac963 SHA512 8e1ea5351c963df01603ff2469ff01079896fac40fbc1b91bb88f976749b639b4c925382e041f402f1cfef8a16716fb46109650b173539d69131f1e275ee1392
 AUX brltty-5.2-udev.patch 1208 BLAKE2B c8fc47d9ea27ca78c4634be47d43f406ba0875eb1b4a19048c264faa602918ac96024b03f56c642722cc9eabdbbe9a9f9005ca4de0d39538f746ed4ecadce3dd SHA512 0a1873dbdee7b97385199bd1f7158847bd8c52f7678783add4353c990ad5a93bc5378f38e52e3b1b30d071167802750cfccad227260dab8eba52e88cb230cefd
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 7c591b1cc0e9..000000000000
--- 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 <sys/ioctl.h>
- #include <sys/stat.h>
- 
-+#ifdef MAJOR_IN_MKDEV
-+#include <sys/mkdev.h>
-+#elif defined MAJOR_IN_SYSMACROS
-+#include <sys/sysmacros.h>
-+#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 <mkdev.h>.
-+   */
-+#undef MAJOR_IN_MKDEV
-+
-+/* Define to 1 if `major', `minor', and `makedev' are declared in
-+   <sysmacros.h>. */
-+#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 <sys/mkdev.h>
-+#elif defined MAJOR_IN_SYSMACROS
-+#include <sys/sysmacros.h>
-+#endif
-+
- #ifndef __MINGW32__