gentoo resync : 16.09.2020

4 files changed, 38 insertions, 3 deletions

diff --git a/media-sound/darkice/Manifest b/media-sound/darkice/Manifest
index effa2b2df1a4..ec6d3e29e315 100644
--- a/media-sound/darkice/Manifest
+++ b/media-sound/darkice/Manifest
@@ -1,5 +1,6 @@
+AUX darkice-1.3-include.patch 636 BLAKE2B 3598cf32c662453b1d4d7607b5c032e637a951fcd67943515f28bcccafb6e1110f64916563de9406a96d439990ee683a4151805ceafe08d8a44b52d49c30ae51 SHA512 14b461fe4282f9389d8a97d4b4942c0b7866860aabd91589bd6294a34796b6a0e74658ed8a0e43273fdc72bf776c14b6cf8889a1f31975ab6609f34021fdb434
 DIST darkice-1.3.tar.gz 371411 BLAKE2B 45684ba4a14dc7cc6271400af11f4aa610fe3d079d1f497f277af866fef92f58080efb6fa6d230288444e78ea93e5cd1257d441d75cbbb7a9ce1696091ed0fe0 SHA512 710dde580005e999e9b11981affdefab6c01868710e9de29d93fb0f40db3321dfe3ab6ed2dc1887bb22ac9a0789fe1648d948f4453c92feb312f7af97c253674
 DIST darkice-1.4.tar.gz 364782 BLAKE2B 6097ddc022c4ac8dfba2deea2b6ab6e6ad86e49cc542d573572643faf6091a2ed2996f0e5c24045c22a60e972e4222c2ecd80342b2641fae52610778b9775aee SHA512 708ab08a45e216dce350f6cd36374e10d4606f77f0cde4dfbf35675d9d0778fb7a013b49fd62d713039d5fcfb9e7d66e6b7ae14acf1e5f142685eecdf7a865bc
-EBUILD darkice-1.3.ebuild 1256 BLAKE2B d52b4d5ea2d885e1fdc23e8dc8fb531073ffea47633eb1b7c5d2f27db47f02a734638de1e77e30f09e5923d0376740d68b4da596a95a5a7945f6f4cd3e5eda42 SHA512 5fdde41f5a0874799e41a89e737e559ee4f58351c884979f8e39e0050517ffb6d4ec8fe1eb76b871a4b92dcadef179b402baf6e26c829ea3703bc963781a5a13
-EBUILD darkice-1.4.ebuild 1277 BLAKE2B d5106bb22bd49f0561ffcac079d1ceafc96ece74ef2d96d9d7828d834e46df9bb54faa5677933a6e4baf9806d04079cf936aedc33fec236c4b217a26ab5db5c4 SHA512 bc8061f7ff7545b317af30ad76bd7910d4ed00a730adf1a8cb3cd7b77e4aa4b1908203b77a58be4266a478b7ba596c6fb1ee1aefe9abaad3bacf7b8dd2e39c20
+EBUILD darkice-1.3.ebuild 1303 BLAKE2B c3c2ce08898fc8c1808db54aedd80e8f8a0dfb8fd1230de5c7b8a4d08d7901989887ac747c8c7cac8f98d1824bf34fda8be76ab4c3068e414739880862f48803 SHA512 55e372760bb5265c0514e0065339e03534a139ba3be66b1d0c56097a315e1e1ac9bdda7db8ecad905662eb6d07d8ecce0bd523b88c9ed080abc631bb27336f2b
+EBUILD darkice-1.4.ebuild 1326 BLAKE2B 484448a936363221c9101fa1db80c5b5df5aa37a1cbbbb33279b55ba952454f0f5289a48567c5094fdfa040df5c4539bc82a7f3453168c4210c8a501dada6e68 SHA512 6373f691ef14d967c176126aa0cc78a8ff940f47e58e20d42be4f0ba02beb7965db7644b0907899eae0949dd445bcc86dd12e53fea35dd9a41bfb3c3be1986bb
 MISC metadata.xml 524 BLAKE2B 05c3bdca6fd593bae9aa6dd13f05e5953ad8143737121a3f021b4862d3d20c90448efec42a3d37bb17e3e3651247a0c7d3f3f486bfd42ceb2508f8bc33cd9bef SHA512 4acf731ab9d985087d227f1090c5ffdd1130c6d9e20add6f2bd69aaf381c0e18e4a85852346f7a91f27e785065e14a6ad6aa6bedf47cc23a18f172c969d164e3
diff --git a/media-sound/darkice/darkice-1.3.ebuild b/media-sound/darkice/darkice-1.3.ebuild
index 630f69949edd..20d7d39cbaf0 100644
--- a/media-sound/darkice/darkice-1.3.ebuild
+++ b/media-sound/darkice/darkice-1.3.ebuild
@@ -27,6 +27,10 @@ DEPEND="${RDEPEND}"
 REQUIRED_USE="|| ( aac aacplus mp3 opus twolame vorbis )
 		|| ( alsa jack pulseaudio )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-include.patch"
+)
+
 src_configure() {
 	local myeconfargs=(
 		$(use_enable debug)
diff --git a/media-sound/darkice/darkice-1.4.ebuild b/media-sound/darkice/darkice-1.4.ebuild
index 0c54f4f70ac0..b7a41066988a 100644
--- a/media-sound/darkice/darkice-1.4.ebuild
+++ b/media-sound/darkice/darkice-1.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/rafael2k/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ppc sparc x86"
 IUSE="aac aacplus alsa debug jack libsamplerate mp3 opus pulseaudio twolame vorbis"
 
 RDEPEND="aac? ( media-libs/faac )
@@ -29,6 +29,10 @@ REQUIRED_USE="|| ( aac aacplus mp3 opus twolame vorbis )
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README TODO )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3-include.patch"
+)
+
 src_configure() {
 	local myeconfargs=(
 		$(use_enable debug)
diff --git a/media-sound/darkice/files/darkice-1.3-include.patch b/media-sound/darkice/files/darkice-1.3-include.patch
new file mode 100644
index 000000000000..dd2e135e8782
--- /dev/null
+++ b/media-sound/darkice/files/darkice-1.3-include.patch
@@ -0,0 +1,26 @@
+diff --git a/src/FaacEncoder.cpp b/src/FaacEncoder.cpp
+index 873c560..3f7dc75 100644
+--- a/src/FaacEncoder.cpp
++++ b/src/FaacEncoder.cpp
+@@ -36,7 +36,7 @@
+ // compile the whole file only if faac support configured in
+ #ifdef HAVE_FAAC_LIB
+ 
+-
++#include <string.h>
+ 
+ #include "Exception.h"
+ #include "Util.h"
+diff --git a/src/aacPlusEncoder.cpp b/src/aacPlusEncoder.cpp
+index 70831b6..1f2ec20 100644
+--- a/src/aacPlusEncoder.cpp
++++ b/src/aacPlusEncoder.cpp
+@@ -36,7 +36,7 @@
+ // compile the whole file only if aacplus support configured in
+ #ifdef HAVE_AACPLUS_LIB
+ 
+-
++#include <string.h>
+ 
+ #include "Exception.h"
+ #include "Util.h"