gentoo resync : 20.03.2021

4 files changed, 75 insertions, 7 deletions

diff --git a/media-libs/portaudio/Manifest b/media-libs/portaudio/Manifest
index fe6e9c604950..1a34f5cdcf7a 100644
--- a/media-libs/portaudio/Manifest
+++ b/media-libs/portaudio/Manifest
@@ -1,5 +1,6 @@
 AUX portaudio-19.06.00-AR.patch 349 BLAKE2B 0653ad46ccfff8b50c127471395c1f6bdc493c42a0376f6604544c5c242794ac9f4abd7c4b3d617a9d07cbc6e3c3907023f98243bdf67a44b8bb64d9fb0c2a95 SHA512 106acc5c072e9fa39763ce10a905c4a1c5b7f46951109c3cb06c8b2fba0e56791e8fd88f1bb3b0254ad0bd305d5e32bee3a19a44b0d49e633e3f8c86e6a3be35
+AUX portaudio-19.06.00-slibtool.patch 1722 BLAKE2B 938ad05ed0dc708d3617503273cb1fbd4ee1885ce7cd96025f115ec9073c831a9d500c4d43ece1ce0b2c38591faa8823ab24c9b54fb8523ab6d8db7349d26425 SHA512 7e472350e3bfdaad566ce68333bcacbf5d3353743d003916d7b8f0036cfe2bcee2cd619f05d955723f7ef58188ab5096620fafbb074f153e9b88cff1ed30ccd9
 DIST pa_stable_v190600_20161030.tgz 1450572 BLAKE2B 3cd63cca55ff222f452d306a1ab9035739545f48dbc9bc58196052cb51e518d86568059c7528533a6932c39c68d1a5210e06470a16343b92c7e4132b71cc552e SHA512 7ec692cbd8c23878b029fad9d9fd63a021f57e60c4921f602995a2fca070c29f17a280c7f2da5966c4aad29d28434538452f4c822eacf3a60af59a6dc8e9704c
 DIST portaudio-19.06.00-audacity-portmixer.patch 8722 BLAKE2B 2b69bcf26e55be46d354dc44756fd03b16031fa86a334b776eb4326a4c64a7e22abd6bf60794847526102391c8e65813b41338cf94c647e3e9b68d82ea5dc5f5 SHA512 f693aef477b516c7a03eb021260cbecb23200422a927a117e3e59a1b4e6c6c2983fbea8ee3a3714ebc55728933654bd7909327a0bab4450ccf4e6a02c86a63b5
-EBUILD portaudio-19.06.00-r3.ebuild 1643 BLAKE2B 6a0aa9824a5facd8bad84d4ce4255121d128673a8a330b42416c9011a12d2bf53fedc138713f032665f05eb0c1e60cc8c88d2d7464ecc858a2765bc1c280be21 SHA512 5dd1e9534fc80211e082d568ad24a2f6287d0a4f8a37be0ce51de977699b713ca0a9f6edb49c51b585c5945d6910e06e3eab208deb4b4a4a83fb192344667304
-MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
+EBUILD portaudio-19.06.00-r3.ebuild 1686 BLAKE2B 6dce2932001d865f65a4c84eb143666b33f6ffc5205b9e4e5d9a1a3eed980cb849b856600d60f311696751c463494641ce83a766be94738ffbc45720423fcefe SHA512 40d0ffea3bee3e14d09cf05c762a4a9a783817d0128bca890160df9a23012a8eb9770d873bfef6c5eebf00b051fe6719a9bb61068e9328e7e4031a12e1834b72
+MISC metadata.xml 337 BLAKE2B 2cb92258419e17576d907f759334b87c17eadf1402a9fbf73bb781602b7c1e73485a3f3c094d4166ec79d7d8b5b4ab10302da160bef0f66fe00abc1d08d9e363 SHA512 032d3d8605d98fb6b1a3c32647ffd15d2d8600be271628f417100b5e5dc9e751e93b3fe0d9b75699f80db127b1baf5eaa37c534af7637d74ebd8fc06cde19ad9
diff --git a/media-libs/portaudio/files/portaudio-19.06.00-slibtool.patch b/media-libs/portaudio/files/portaudio-19.06.00-slibtool.patch
new file mode 100644
index 000000000000..d7b67cf101f8
--- /dev/null
+++ b/media-libs/portaudio/files/portaudio-19.06.00-slibtool.patch
@@ -0,0 +1,60 @@
+https://bugs.gentoo.org/777072
+https://github.com/PortAudio/portaudio/pull/451
+https://github.com/PortAudio/portaudio/pull/452
+
+From ef36b577c844d28e90ac276c59c0b4d0fbf853c7 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Wed, 20 Jan 2021 18:23:43 -0800
+Subject: [PATCH] autoconf build: add src dir src/hostapi/skeleton to fix out
+ of tree builds."
+
+---
+ Makefile.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.in b/Makefile.in
+index 5e1a7648..967bba38 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -146,6 +146,7 @@ SRC_DIRS = \
+ 	src/hostapi/dsound \
+ 	src/hostapi/jack \
+ 	src/hostapi/oss \
++	src/hostapi/skeleton \
+ 	src/hostapi/wasapi \
+ 	src/hostapi/wdmks \
+ 	src/hostapi/wmme \
+From c2dd992caa33b0927fb45228f0de0a2d51401f65 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Wed, 20 Jan 2021 21:46:12 -0800
+Subject: [PATCH] build: Fix builds with parallel make.
+
+---
+ Makefile.in | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 5e1a7648..10f8e8ed 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -220,16 +220,16 @@ clean:
+ distclean: clean
+ 	$(RM) config.log config.status Makefile libtool portaudio-2.0.pc
+ 
+-%.o: %.c $(MAKEFILE) $(PAINC)
++%.o: %.c $(MAKEFILE) $(PAINC) lib-stamp
+ 	$(CC) -c $(CFLAGS) $< -o $@
+ 
+-%.lo: %.c $(MAKEFILE) $(PAINC)
++%.lo: %.c $(MAKEFILE) $(PAINC) lib-stamp
+ 	$(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< -o $@
+ 
+-%.lo: %.cpp $(MAKEFILE) $(PAINC)
++%.lo: %.cpp $(MAKEFILE) $(PAINC) lib-stamp
+ 	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) -c $(CXXFLAGS) $< -o $@
+ 
+-%.o: %.cpp $(MAKEFILE) $(PAINC)
++%.o: %.cpp $(MAKEFILE) $(PAINC) lib-stamp
+ 	$(CXX) -c $(CXXFLAGS) $< -o $@
+ 
+ %.o: %.asm
diff --git a/media-libs/portaudio/metadata.xml b/media-libs/portaudio/metadata.xml
index c870d0eef0ab..f6d41702b01d 100644
--- a/media-libs/portaudio/metadata.xml
+++ b/media-libs/portaudio/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">PortAudio/portaudio</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/portaudio/portaudio-19.06.00-r3.ebuild b/media-libs/portaudio/portaudio-19.06.00-r3.ebuild
index d7d2cd1ee3e4..d19d45237994 100644
--- a/media-libs/portaudio/portaudio-19.06.00-r3.ebuild
+++ b/media-libs/portaudio/portaudio-19.06.00-r3.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools multilib-minimal
 
 DESCRIPTION="A free, cross-platform, open-source, audio I/O library"
@@ -29,6 +30,7 @@ DOCS=( README.txt )
 PATCHES=(
 	"${DISTDIR}/${PN}-19.06.00-audacity-portmixer.patch"
 	"${FILESDIR}"/${PN}-19.06.00-AR.patch # bug #720966, trigger reconf
+	"${FILESDIR}"/${PN}-19.06.00-slibtool.patch
 )
 
 src_prepare() {
@@ -66,7 +68,9 @@ src_compile() {
 }
 
 multilib_src_install_all() {
-	einstalldocs
+	default
+
 	use doc && dodoc -r doc/html
+
 	find "${ED}" -name "*.la" -delete || die
 }