gentoo resync : 31.03.2018

3 files changed, 39 insertions, 2 deletions

diff --git a/media-gfx/videorbits/Manifest b/media-gfx/videorbits/Manifest
index 972e63982625..871b695f7e36 100644
--- a/media-gfx/videorbits/Manifest
+++ b/media-gfx/videorbits/Manifest
@@ -1,8 +1,9 @@
 AUX videorbits-2.201-libpng15.patch 826 BLAKE2B e3051587a3198b2d3df970e01b4a38ec138b9d5c5dfe81269eb19ef6b13b258ff68dc8070fd8987a5f6db41121dbb480ba62d318e00d9047789d6247c35eae75 SHA512 6fd83e3524afb791f7c68755741651052fcb2b531efc0f4d7dc223ba1206999fd1ebcb6374eca9c5938246a0c077de309cd1450e9385b231fd73d12a9ed2cc3a
 AUX videorbits-2.205-fix-buildsystem.patch 635 BLAKE2B 89499ec57ce08722b0e8fcaa0bfc37cabf11627fe867e905b0cb329323453052cbe92ccd00f06d26beef11a134d5430163ac158b40fb398bdf448087f9709b6f SHA512 46462bdf437424f3af86526c1f2dfef68884f504646357ff3e5779f4629fdf22742a26e2dcf9df9b03a20da8125e87cb3b4772600d7590428d6d0a31f711ae9a
 AUX videorbits-2.205-qa-implicit-declarations.patch 712 BLAKE2B 5b24e38dc2951659f2c45ad50e853796d91338e59b1c55e6ffc396c4d3c221e80a559dc0aceb999a3e594ca9b61beeffcd0177d98c5daa6758582af2a25e314a SHA512 cfcab0079719ca2595b83e65ded05b8154a139304c23184823f0c957bb06af09465d486f8763a83baf8cc298b16f9e3b0b53f6218977972555bf2142ab3e43f8
+AUX videorbits-2.205-remove-bits-nan.patch 969 BLAKE2B bae9ba484c80c25c5eeb6e2bd1f9de5a49e3f5cf552e74bd9953985cbea5bff6002bd34c90cae057cd8a41272232760310f510418c0fef5c1ae9fbe3a93b1fb5 SHA512 cca1aa22cab689537248b9c0026acbf33114b359c1ab7b66cf23ac6f038dfb7653c48229b0b581552b23ced35ccdeae00b3676059745775aeac91ee7f5fe8d7e
 DIST videorbits-2.201.tgz 648187 BLAKE2B c279c6bb045412d3a2fbecc7a0955694b761c929ea3f0c73b6e64b1ff9a14e69a168b37eadeb8f99e6e1a2daf4863be87a268b74a619f16efaaeacc4e708ebb3 SHA512 eeb233487ac33702ff58f9434ff1850aac5ede9ecfebe4b1d313f07451c1cbb911ba6adca013136639bc0d01480acd71e5cffddcbf48af5aef58d40f48d6655a
 DIST videorbits-2.205.tgz 672377 BLAKE2B e111d48c3a7e8c3fc1bf878249a07c799879fa3c68e8555c539fd4089800fd7695f1758188295f65aa62fababfc6cc3c534abae384eb820f80bb1bbe0eb4b92d SHA512 faad5a7ab98167d67b7748b4b9aca1ced0e802ed85cba55ba9966d08c48045daa8fef8d387c576dcfa50ace8c4962bb0043bb83e3ba741844ede67d331e4fbf8
 EBUILD videorbits-2.201.ebuild 839 BLAKE2B 0723c77e35508dd0fb030c4b082fced02ade44190c57428870da4788c78da86b030bdfbdc0fba7c7298bb6385540d971a3a12b6e6b9c6fc26abbc9395b9ffa2b SHA512 03e5513d9354c81464e54f3718653bd5e726d507b0eed2089e4ee7f8f57e239a6804f48167fb756ad11a606370b83d0cfb552e2b4caaa18ef740a230004443a5
-EBUILD videorbits-2.205.ebuild 770 BLAKE2B 6622024d1cd1f69f58839a657a9d07fa36c5529648515ba67f5c22c5599346cb750b946e8403f75b1002d3532c7ffa7c4c6d1c9e47c326c232c14af9992d364e SHA512 b7dfe3e15555495d7bda7736ec606f4efa6d8f19d6247cbf1378a2e9027440b7d14e76124783b3e13c7f39dafef076825e1a6f5b1318065878620ef4c3cad2cd
+EBUILD videorbits-2.205.ebuild 812 BLAKE2B c114fa756c9324dd891f52f4241fe7f9ce58120b79b5baf776f83c73eecc86bda8f6c8e4cf4c53d2b22f0df8b3bc35cefde510afd7fc8bc41f902fbbc1883e12 SHA512 602a97746d18fcb6648d66c1e28e46e29b1eea1aff97358094b96ea681653b9bc015b6400cecd180f436293f07fdb9638940d2d20f7c89366d540c6aa0485d3f
 MISC metadata.xml 250 BLAKE2B 50ea93eb13d7a17cbaaa68accbae08e643330655c4af46a99440edbec4d7ef50111c45d91dfa2490de8cc9c77fb8be16e9f4b285f67c91522cbee316db6a860d SHA512 c18112cc613181bf7e1d339de4f2283d8d4f1c8a6492025a9c0e4c54dedeeed696713e844edd437eb1bd3e9659e4eb33cc49132450ff3ec7efa109a0238b3596
diff --git a/media-gfx/videorbits/files/videorbits-2.205-remove-bits-nan.patch b/media-gfx/videorbits/files/videorbits-2.205-remove-bits-nan.patch
new file mode 100644
index 000000000000..822b8dd8167a
--- /dev/null
+++ b/media-gfx/videorbits/files/videorbits-2.205-remove-bits-nan.patch
@@ -0,0 +1,35 @@
+From 27db38e20d2f1c685c9a4aa01cfbde96b0555d80 Mon Sep 17 00:00:00 2001
+From: Harri Nieminen <moikkis@gmail.com>
+Date: Tue, 27 Mar 2018 19:45:19 +0300
+Subject: [PATCH] Don't include bits/nan.h
+
+---
+ src/cement.c     | 1 -
+ src/cementinit.c | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/src/cement.c b/src/cement.c
+index 3dfb6f9..23c424c 100644
+--- a/src/cement.c
++++ b/src/cement.c
+@@ -1,7 +1,6 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <math.h>
+-#include <bits/nan.h>
+ #include <limits.h>
+ #include <string.h>
+ #include <errno.h>
+diff --git a/src/cementinit.c b/src/cementinit.c
+index 95850d9..afa160e 100644
+--- a/src/cementinit.c
++++ b/src/cementinit.c
+@@ -1,5 +1,4 @@
+ #include <math.h>
+-#include <bits/nan.h>
+ /* NB:  supposedly nan.h is included from math.h when -std=c99 is on the
+  *      gcc compile line but that doesn't work so its included it directly.
+  *      Not having this line makes nan become unreliable, sometime it is
+-- 
+2.16.3
+
diff --git a/media-gfx/videorbits/videorbits-2.205.ebuild b/media-gfx/videorbits/videorbits-2.205.ebuild
index 030eb3b53d0e..52a423416d45 100644
--- a/media-gfx/videorbits/videorbits-2.205.ebuild
+++ b/media-gfx/videorbits/videorbits-2.205.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,6 +26,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.201-libpng15.patch"
 	"${FILESDIR}/${P}-qa-implicit-declarations.patch"
 	"${FILESDIR}/${P}-fix-buildsystem.patch"
+	"${FILESDIR}/${P}-remove-bits-nan.patch"
 )
 DOCS=( AUTHORS README README.MORE )