gentoo resync : 21.10.2017

3 files changed, 32 insertions, 1 deletions

diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 229ca090b1cd..558ff0a055b0 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -4,10 +4,11 @@ AUX mythbackend.init-r2 2050 SHA256 2307a5794bb0c8ea1294527084224bd0dde6b366b951
 AUX mythbackend.service-28 2689 SHA256 25f6083a610d691c6ce933514ae893f83eb45dca8a1e0bc603d90d9213056539 SHA512 945cd721c7114e7c9a334063c6f85de40c2dd8a40271b1755b31881ae2c067b67d34685e1cb2d9b09fdaa9bf58ea2763e4e314b288e53f8bfcef7b6942ce5dd1 WHIRLPOOL 5cc1fb186df853a8c6ea35a3e5dbd54e1abb309f49b4ab2afc31905f0604249ef960a057bc40ed0dd702893a76409735deb3b1bbfd3b9e83311d9d451d74891a
 AUX mythfrontend.conf 474 SHA256 8aa8de5df71905490448b7eeb9960599f2c813c8b576e95ff6fcba5986340a3f SHA512 8b3967f5e7d719fefe50b8868dc1b974c3f6337335e7e65799ddb331abe07df0fadb4cb619758fefeaa0c4d0d1dac6f00e0982736cab5acac993bdaced0051c2 WHIRLPOOL a369da19de64fe3cf97a0c346d386de724671aa41cc10c1fef780ce49eeb23c2515e7725e682843ba9f8c142a88e9cbd7b463738e251e039b7ae407ecfd77b04
 AUX mythfrontend.wrapper 794 SHA256 db90ac5ff3bec3f2a81f376cc94c553d2cce026fd921bc822a6e3428fd8fa2e0 SHA512 d69676d3b981c76988bbe60277f74028668c851db7db3c37a60ecc95ae18d9f77cd38511fcd3deb95d1f87bf659d7b0bcd7f1dd469801950d28f7b3f6f6947e3 WHIRLPOOL dd47702ed5c130c2c407e1c0b107eac6d9378b0e4635806caed510aba8a38dd65818151eae3bc9ed59055f4f8b1c0c2cb7ddd7f35bdc353bd207ca93979053ae
+AUX mythtv-0.28.1-glibc225.patch 927 SHA256 0dde53aa179bc04d3e576de66fa74cbda8794ff05227bb9c3c5c28e54314c178 SHA512 626e1f80ea2ffd5774a3df5919ddb618ee6fc5b5c12133891d3c9cbf0068c5e349508d0f3c90e3ca1e49afa9df92a4243950fa51a0c9b8ca26d9e19e463cfe36 WHIRLPOOL f32c1ac30904e418d19b550c260733508df5eb121584f21d1f695f7e4df48cf0dfbd2debe17d796fc0b9e93466ea75323a7932b73daa84628b40fa1675b531c0
 AUX mythtv.logrotate.d-r4 235 SHA256 322817abac79967e996f9afdd00b8814e38f51954babca910612127b8cfd5891 SHA512 8dd8936599acabfa55ad7efb870de431e03cb86c3c96156c2c0eee6675962dcc527391260f2ba66e3d54c1d41373001ef25c9d2421e83940c686d14b5f29fff7 WHIRLPOOL ea31e6635b0cd6dccc92878c6c1ec477c448ce894835a11e8131f8855c3f42c00cde91e5f4a3b97dd3aa1340a800453d4eb03e3b8db7a24bffdb342be42aa0e7
 AUX xinitrc-r1 234 SHA256 0b335cc6d1e22d71f61bacfdcfed6cc450fecf7ff10bdb4bad50fd085bd7b2db SHA512 885adfe395fe553f6d5cf518856be7be9a6bf6073888f8e055271ed7c3d9ad85a162e9e9ff95a68e54047948ac280796c69ef55d0b4e549eb0beabbf0fec1188 WHIRLPOOL 6796d4d83ff200bd36cc02e3765222efd77dd7baa69ed9d6845b7ecb836fcd0b110f7ce644af1e2c4af3f76c4c924f7e69499b0b4f9f511ace31f3f9cc804240
 DIST mythtv-0.28.1.tar.gz 104477892 SHA256 73dd4de0de6fe5688c290781b76de6380b256a87159f2c6e3dad66870389da1f SHA512 67a81858cd19b90f519113b234119ecc248366d8545c862d887755f256cddf04d9ca16a7bf67f63e06f7628730e7dbde2a2099ca8aaeb9061b2e55a5a0b7d5e7 WHIRLPOOL 370f3a528438d50d302ab6adadba5089b32749f8127cbf270b85ef16d35ca15026e0947e292920a3dd6acf2ed65de68af8754d985944bd59f3310a42b03551de
-EBUILD mythtv-0.28.1-r1.ebuild 10105 SHA256 d6a4e1a0cd091b272e047f89abf95132c9ea03c53f7f0c1dbcc44001f8dde0b8 SHA512 360609fa43a4ead2ed4d5800af54fee9f914f37c24b5fa51995e159f0ff14a27858c7e4b6bcf141b42a197d4900486e58a59f72455524bce43fda73a91d0c54b WHIRLPOOL 275486c3b42520f872873045ee62b4ac54d63bc624feb1339949aa1c133f1ae50d840ec6bf1190865ff761bfa48ad7bf881f6bd29ccae021ff19d1eecc6d86fd
+EBUILD mythtv-0.28.1-r1.ebuild 10147 SHA256 ed73e3dda70f005fce744ccc60af3b05ad94b400856f6232b2818b1a76954b63 SHA512 23f45a9cba8793bf25238ae889d03de3e378afbd08528b748810c0cb43520b33d40ec3822243c5298c8996156c8b1f30f0ddf14fbd9b538aa2b91054660a4383 WHIRLPOOL e5a277da6837795206b9c7784dafcc0f05426c65564f0c53b7e412f043809c462ec6afe757fa3e567554c0f951d6e5d26d36f3345dcddfdd3eea290409a3c6f2
 MISC ChangeLog 10904 SHA256 309d32b9ca07ba393dc4b6d03907746917d85b3f11486d72543e65538eb8b4cd SHA512 d0fc7f72414aaebdb26651bc8b1715b6feb38e0f4533372cb1c02989ba6cfe8133e535f181bc404f4f357c305b2a6533e55409aa1f90c272b4c45199bf759efe WHIRLPOOL 40cd374bca79222a5c6c56fef4a66ae1ce0b41658f4589c83a51c9a734ff9960ddcd0b30f942f56b1a5af6c13bb99c9ac98f37f246c8454034dfdebc544d8851
 MISC ChangeLog-2015 82055 SHA256 4d13079f06f3b39715485dddc585ec44b066a7af69e19b35be4316d41b819b95 SHA512 c4b170ea2c09681cd65f15a6d6814d2dbc11b28d335468ed2ea8ea755ee8cc0db32758c533d18c288a8a43c66e03295ec28d7dbd5ca3382b2822378b393b8813 WHIRLPOOL 578892bdd904fcb626acaa691e0174053fa96550f62de4f531c6d16bf9fd049021596327fc9b7dff1c5e5499602e673caef748deb380c34164473185ae08db3b
 MISC metadata.xml 3168 SHA256 89b5f955ab578dac50b2d17b0bbb5f249195338e111ee4f786b284404ee63835 SHA512 4bf85c050f41bfee848e52c45fd7e8bf577a07b4448b63b57448caa18abe9026827a07d90a8c7bb1d9f24ff5e61523a93725a3c8a2c6bf547e01f7de0a49d417 WHIRLPOOL 2e432187b55e103cacd862862e94a4fd33376c78b7eebf1e78dc39b8360964699bad81d56cd28ecd4615a1fededd5c5275b81969510700dce01b0a7494b88479
diff --git a/media-tv/mythtv/files/mythtv-0.28.1-glibc225.patch b/media-tv/mythtv/files/mythtv-0.28.1-glibc225.patch
new file mode 100644
index 000000000000..343a808076e6
--- /dev/null
+++ b/media-tv/mythtv/files/mythtv-0.28.1-glibc225.patch
@@ -0,0 +1,29 @@
+From b012ff0f6b284969183863d42a6a14eb77ed0a1d Mon Sep 17 00:00:00 2001
+From: Stuart Auchterlonie <stuarta@mythtv.org>
+Date: Tue, 6 Jun 2017 22:39:03 +0100
+Subject: [PATCH] Refs #13047 - major() and minor() are defined in
+ <sys/sysmacros.h>
+
+On BSD platforms they remain defined in <sys/types.h>
+
+(cherry picked from commit eca27c542b70deb58e50ad4581b2d6f6b2e1d3c2)
+---
+ mythtv/libs/libmythtv/videosource.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/mythtv/libs/libmythtv/videosource.cpp b/mythtv/libs/libmythtv/videosource.cpp
+index 97618adc80..09dd95073d 100644
+--- a/mythtv/libs/libmythtv/videosource.cpp
++++ b/mythtv/libs/libmythtv/videosource.cpp
+@@ -3,7 +3,11 @@
+ // Standard UNIX C headers
+ #include <unistd.h>
+ #include <fcntl.h>
++#if defined(__FreeBSD__) || CONFIG_DARWIN || defined(__OpenBSD__)
+ #include <sys/types.h>
++#else
++#include <sys/sysmacros.h>
++#endif
+ #include <sys/stat.h>
+ 
+ // C++ headers
diff --git a/media-tv/mythtv/mythtv-0.28.1-r1.ebuild b/media-tv/mythtv/mythtv-0.28.1-r1.ebuild
index ac83e415065f..4d9566ab9533 100644
--- a/media-tv/mythtv/mythtv-0.28.1-r1.ebuild
+++ b/media-tv/mythtv/mythtv-0.28.1-r1.ebuild
@@ -159,6 +159,7 @@ src_prepare() {
 
 	echo "setting.extra -= -ldconfig" >> "${S}"/programs/mythfrontend/mythfrontend.pro
 
+	epatch "${FILESDIR}/${P}-glibc225.patch"
 	epatch_user
 }