gentoo resync : 16.09.2020

3 files changed, 41 insertions, 1 deletions

diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest
index 8974e1b512bf..ef6c120b5f0a 100644
--- a/dev-games/irrlicht/Manifest
+++ b/dev-games/irrlicht/Manifest
@@ -1,4 +1,5 @@
+AUX irrlicht-1.8.4-remove-sys-sysctl.h.patch 1101 BLAKE2B 186373a614e3e15330559784eba9d56f19d915d3db7d29db1f919c10b17ef4c2242cfc0acfb6e5b3e56599a64e77171721ef4b4d5e1fe5ff1ddcc94ccf58e23a SHA512 a1a7bbc1c25ce8ddb4aefd323c420085d99463600cda2f633279cf16f97fb38094841b6b6d2f434710e16eb5b25374f51c420518567b1f855e4da37c02f85f08
 DIST irrlicht-1.8.4-patchset.tar.bz2 4813 BLAKE2B acad0f0dcc2ff5778608d0620063e7c70935838447f4bd1b241e08fb24f69531c29d96e95de394a3018e239fd7865bc3b50dc9ed5d54dd171b7b51df6c740b4d SHA512 5035cdf42fd26449d03e849ca248f6abcfcea1b0e9827683f00be2545ce90e3979e41c94fd487cfb1c67450e2e973f872d11d233c5a5b654700cec2ccb7f5602
 DIST irrlicht-1.8.4.zip 27927144 BLAKE2B 2c2d7e1306b169e537258152f88b11578d8a33c0ebe58e7ee48242048b70b9ba01069fcf272e44e18f7afbd1e6ec89d6bd86289d203929388e6b96871c048a98 SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1
-EBUILD irrlicht-1.8.4-r1.ebuild 1834 BLAKE2B 6ec3a94c9af80d88a5c7aaad3c77c1d53f3f27c5c5bbb5ca88b7689ddb1a315c910af80a26da732df82839fb3d858fa1d4882ae86cb544940cc8892b4a743c28 SHA512 69f2c3cf903d5cd9193cbc79f741919ff7918c59232e6861d3d727e7195859a0aed09e51f5e2329ed9eaadba3c0691b262b2484bb8b15ca1166092bf80600422
+EBUILD irrlicht-1.8.4-r1.ebuild 1880 BLAKE2B b1fd187e1deb25f5005bb660d7380b09cfc3b818c5c2101f67cdddb1a494fc33e4274efa818af651af2624ef24eb538fa177d6fd07cdc6f3212967bf364fca36 SHA512 717b5436c722cbf35e25c89ece1ad33a3f983b8a779463a00dd43660c2db7e14959566fd7af4158dbab212306a8e967c2edd5a39b703cb784963677f339a5e31
 MISC metadata.xml 964 BLAKE2B 53a776bc251d381e194ad54eb4f0a24e3d1b0729281d69e1f48d1b744a1de1f33b7e5b400123d4cd04aa74a3e5db0a00682a67f389744fd33c4307437d0e5a30 SHA512 858c0cf4a2ac22ca6728a1449e59fd7a8c098a01587cd039e725b26ee71feb13217036f24bb5de2cbde6f27855eeb0347b43887a56f64a6f7a98f47b0f481503
diff --git a/dev-games/irrlicht/files/irrlicht-1.8.4-remove-sys-sysctl.h.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-remove-sys-sysctl.h.patch
new file mode 100644
index 000000000000..2e5fc63e6f8a
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.4-remove-sys-sysctl.h.patch
@@ -0,0 +1,38 @@
+From 5382142d37730f6758753b758c91e257ffd5892c Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Sun, 9 Apr 2017 22:20:19 +0200
+Subject: [PATCH] remove sys/sysctl.h
+
+With musl irrlicht doesn't build due to missing sys/sysctl.h
+
+fatal error: sys/sysctl.h: No such file or directory
+
+From [1]
+"sysctl does not work, and NEVER worked. using it is bogus.
+it was a bogus experimental syscall that was deprecated before
+it was ever used (basically, a broken binary version of
+/proc/sys, without any stability between kernel versions for
+what the binary constants meant)."
+
+[1] https://devsonacid.wordpress.com/tag/musl/
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ source/Irrlicht/COSOperator.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/source/Irrlicht/COSOperator.cpp b/source/Irrlicht/COSOperator.cpp
+index 0899d1d..ccf5ef5 100644
+--- a/source/Irrlicht/COSOperator.cpp
++++ b/source/Irrlicht/COSOperator.cpp
+@@ -13,7 +13,6 @@
+ #include <unistd.h>
+ #ifndef _IRR_SOLARIS_PLATFORM_
+ #include <sys/types.h>
+-#include <sys/sysctl.h>
+ #endif
+ #endif
+ 
+-- 
+2.9.3
+
diff --git a/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild b/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild
index 938b141e5e0f..8a74c20ddcfb 100644
--- a/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild
+++ b/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
 	"${WORKDIR}"/${P}-patchset/${P}-demoMake.patch
 	"${WORKDIR}"/${P}-patchset/${P}-mesa-10.x.patch
 	"${WORKDIR}"/${P}-patchset/${P}-jpeg-9a.patch
+	"${FILESDIR}/${P}-remove-sys-sysctl.h.patch"
 )
 
 DOCS=( changes.txt readme.txt )