gentoo resync : 02.04.2018

5 files changed, 41 insertions, 23 deletions

diff --git a/media-libs/libilbc/Manifest b/media-libs/libilbc/Manifest
index fea9310d8933..2b883bb5835d 100644
--- a/media-libs/libilbc/Manifest
+++ b/media-libs/libilbc/Manifest
@@ -1,7 +1,7 @@
-AUX libilbc-2.0.2-ppc_ppc64.patch 398 BLAKE2B 8dbe883575abf02cced551d99578a99a06311b2df0f644764f8fac9a269bb5af7499209d7c72c306a588df2579c947ec70f3418a8ad4c6e95f1c31a3db3e2c45 SHA512 03657ee2b846b56716745058cb446cead8359ecfcccc60c8e0011d63f1ca4567a8f128f72f9aa6dca9c78bf080b20cdd07873b6f2301041158c4daf2ee6087d1
+AUX libilbc-2.0.2-ppc_ppc64_sparc.patch 933 BLAKE2B 90bb615cb33dfb1eae9d276b08df85ed37b47f127fe9e88a983120d25c57cf669ed0e166d63b3b51e5ac29701107b9be9b683bb36b3e868177bdb2efb1b22e88 SHA512 6a468dff6c42d2e0628466cb9c71639052a17640c78134ee98634c473e4da60296b86eec8f8b8214f64d298d80587dcd03722a9cfc2e588efb73f72f4954eba1
 DIST libilbc-1.1.1.tar.xz 302324 BLAKE2B 726d53fc638f9d019b6d50a3ec463350efd59510ce15b9d6af30fc0ad6094f5acc53c4a5c2e77d17fdcd35f3e63bceb310716eb175e82ca7226dec023cb96df4 SHA512 7c9fa6da4d8b32fd49ea62f9e876e385930501c9caedcafac94ea74b9372722b06dd28062dc4fcca765ad6c519cfb52bb595d396ca50d361f563c715f6679845
 DIST libilbc-2.0.2.tar.bz2 392643 BLAKE2B 1b1772c415a823a63c2fdb64913eeee8becdda0438c3942e74dc0be5dc6e000538c8f0feb796d23eb815e792d9b9e695f598869a31dd69a90c1fb12823a09e28 SHA512 ad0ef3326144fa1e9b6983be9aeefcec0064930a0124980f0fa2b38967f145e4cef7be75d8eae72f4a9650f297f15968944e73ef256e642116125dea326d8ba8
 EBUILD libilbc-1.1.1.ebuild 738 BLAKE2B a62dd1e51dc9829091d0391f3f55a213a7c9650530afe630917ceb9d6ebe62345b763e351533aabca791dbce7f6f55628b464bda3e723b444bbd4e780dec0f29 SHA512 5b57dfc0be813d600f23a129fe31982ecc40d0b376f2f3bd9566f5a2f52f96bc99d6db71cec3a9fc63bfa20f2f8db5a1e2185030a1388ec4e117db74c5f7afbc
-EBUILD libilbc-2.0.2.ebuild 718 BLAKE2B 746a0e4d9c50f9fc36e581db33bb69aef67560cfab26c4b2e51309944aec7156385160cffbb5eb8b68dbc33d156c84eff71303270e8aaea3553b0af0b811382b SHA512 aeca10a4ece0220705b3dda4262d22bd41c810d6382678475684331b5fa420c3c118a674be05de331b6554c0b908f1cfbd4a0bd5dd6b1b97e08d0c56eb013b15
-EBUILD libilbc-9999.ebuild 723 BLAKE2B 8631200184f22ea685370f465b7c39655ff3166a6d60139c11ec8a9d1c368fca9d8d29d20c31db60590e2268d6664290551c35278d359d57d09542b6ad9a8d2e SHA512 2fb11ce93a4a169bd9a6210ec7039404c62ff9e581089e53134b28356fffc9524fbc1652c4c8e1322b1912df2b2474c33ea198d3dde7e69594ac56ab6d217cd6
+EBUILD libilbc-2.0.2.ebuild 731 BLAKE2B 8e267c429336cf72f7a1f17bee435c83dfc10bb2a43a4c13291ac1c6c17a1287ddc0b3964368acc06de485c1501e5a8cb4a47593e1631053ed3f8811118a470c SHA512 1cb9e81d6af7af0eae4b444a3fe152d35249735afc00393da1d59f8b0bd820bd377023d04c7ce0dfd7455cb52fee763784d4189d3eac41629a9b580046f07aa0
+EBUILD libilbc-9999.ebuild 673 BLAKE2B 4c40b095479be75fc7dd4e5c9a1e3200c0b176806c4d1ef44a1eab2aab5f0a59801748127dc2d2aae7136eb4e50a287fa6caf13d413f5266b6c699126b4ca466 SHA512 ab966edff2f696b7debd2449e289f196cc78e93e70c2017475be209952eaeef372c0e5ed1782437eedb7c10ced11ebc66959cec40802091c9429c9ff5a3164cd
 MISC metadata.xml 415 BLAKE2B 424981b7c747af54e0658541f8ed279ee5f0a66f3ddf92c62497c185f497341fb3b1a583c4786c6ffe8eea335fd0537802bfcff4567ca5f3c9f2482f0e526748 SHA512 f0be09fd8270ae30e2fc499de10ae5d7416a6ea50a787d6383428b81df8959ee4d18383011aca0d423549919982b6b05faa964c6378d2727d8be5bd82d4417ce
diff --git a/media-libs/libilbc/files/libilbc-2.0.2-ppc_ppc64.patch b/media-libs/libilbc/files/libilbc-2.0.2-ppc_ppc64.patch
deleted file mode 100644
index ae24dde38cf9..000000000000
--- a/media-libs/libilbc/files/libilbc-2.0.2-ppc_ppc64.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- libilbc-2.0.2/typedefs.h
-+++ libilbc-2.0.2/typedefs.h
-@@ -47,6 +47,13 @@
- #elif defined(__pnacl__)
- #define WEBRTC_ARCH_32_BITS
- #define WEBRTC_ARCH_LITTLE_ENDIAN
-+#elif defined(__PPC__)
-+#define WEBRTC_ARCH_BIG_ENDIAN
-+#if defined(__PPC64__)
-+#define WEBRTC_ARCH_64_BITS
-+#else
-+#define WEBRTC_ARCH_32_BITS
-+#endif
- #else
- #error Please add support for your architecture in typedefs.h
- #endif
diff --git a/media-libs/libilbc/files/libilbc-2.0.2-ppc_ppc64_sparc.patch b/media-libs/libilbc/files/libilbc-2.0.2-ppc_ppc64_sparc.patch
new file mode 100644
index 000000000000..dcca9c2ac321
--- /dev/null
+++ b/media-libs/libilbc/files/libilbc-2.0.2-ppc_ppc64_sparc.patch
@@ -0,0 +1,35 @@
+From 4d0c2edf1f9477f80e361e17de638806b1399a51 Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer <eike@sf-mail.de>
+Date: Fri, 23 Mar 2018 01:08:17 +0100
+Subject: [PATCH] add platform definitions for PPC and Sparc (#23)
+
+The PPC flags are taken from a Gentoo patch.
+---
+ typedefs.h | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/typedefs.h b/typedefs.h
+index 669451626..2f9fe77ea 100644
+--- a/typedefs.h
++++ b/typedefs.h
+@@ -47,6 +47,20 @@
+ #elif defined(__pnacl__)
+ #define WEBRTC_ARCH_32_BITS
+ #define WEBRTC_ARCH_LITTLE_ENDIAN
++#elif defined(__PPC__)
++#define WEBRTC_ARCH_BIG_ENDIAN
++#if defined(__PPC64__)
++#define WEBRTC_ARCH_64_BITS
++#else
++#define WEBRTC_ARCH_32_BITS
++#endif
++#elif defined(__sparc__)
++#define WEBRTC_ARCH_BIG_ENDIAN
++#if __SIZEOF_LONG__ == 8
++#define WEBRTC_ARCH_64_BITS
++#else
++#define WEBRTC_ARCH_32_BITS
++#endif
+ #else
+ #error Please add support for your architecture in typedefs.h
+ #endif
diff --git a/media-libs/libilbc/libilbc-2.0.2.ebuild b/media-libs/libilbc/libilbc-2.0.2.ebuild
index 65a7182ed61f..e71021ba2c61 100644
--- a/media-libs/libilbc/libilbc-2.0.2.ebuild
+++ b/media-libs/libilbc/libilbc-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]] ; then
 	SRC_URI=""
 else
 	SRC_URI="https://github.com/TimothyGu/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-	KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
+	KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~sparc x86"
 fi
 
 inherit eutils multilib ${SCM} autotools-multilib
@@ -22,7 +22,7 @@ SLOT="0"
 IUSE="static-libs"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.2-ppc_ppc64.patch
+	epatch "${FILESDIR}"/${PN}-2.0.2-ppc_ppc64_sparc.patch
 	[[ ${PV} == *9999 ]] && eautoreconf
 	autotools-multilib_src_prepare
 }
diff --git a/media-libs/libilbc/libilbc-9999.ebuild b/media-libs/libilbc/libilbc-9999.ebuild
index c3aa37fdd755..a7ac81e5c6d4 100644
--- a/media-libs/libilbc/libilbc-9999.ebuild
+++ b/media-libs/libilbc/libilbc-9999.ebuild
@@ -22,7 +22,6 @@ SLOT="0"
 IUSE="static-libs"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.2-ppc_ppc64.patch
 	[[ ${PV} == *9999 ]] && eautoreconf
 	autotools-multilib_src_prepare
 }