gentoo resync : 15.12.2019

5 files changed, 87 insertions, 9 deletions

diff --git a/media-libs/slv2/Manifest b/media-libs/slv2/Manifest
index d3f1359cb6d7..1634b346a1d5 100644
--- a/media-libs/slv2/Manifest
+++ b/media-libs/slv2/Manifest
@@ -1,5 +1,7 @@
-AUX ldconfig.patch 441 BLAKE2B 2d09de5800627c4c7c725bad1dba0bd7422dc32e027afe5f6765aec262fed8d44215ded6fcabe53912a8c72024323f492574f0403176db5ec7952357fc0e2fa2 SHA512 0b42b212448ba01f92a324146d5a39dac20532dae9c5a5be1af8ddb10503e431eb8b1391bc091f0459706cc309cab92cd39ac00f94f0da7c6354b24cb35c6c7a
+AUX ldconfig.patch 407 BLAKE2B f88ea3421336605fc6f1221028fbf1ad98dd1cf1c5d893b68f872d74fab4e013614ddd487d8743eee73803997e05bcb1a61fccddd325e891f6a6add00960509f SHA512 7099cb8e13cb3b16a51df0e55f7bee64c961224aa5308117c32762aa1db5c6331abcd33936057633edf697204df0ccf6b66e50f495dff82a058bf2c54f725912
+AUX slv2-0.6.6-python3.patch 730 BLAKE2B d54f5e3c26d1ba23b7f60b48ac77a65bf0ef5f9d0576722cbdf5563449fa5fe03163958156d937e7c5466ecac494c7802fbfb852d01e5e520914232c8868d1f9 SHA512 1b478920e30ba4efa92a708a7643e9e797d8a2b94a18c180cd1a3d77e1af976be24a82202a63e853f21c017bb38bb87f79a97cb07dcda2a120a0d5bffbf4af7a
 AUX slv2-0.6.6-raptor2-link.patch 1127 BLAKE2B ed06ce40cc7da13cd02f114223e6bd5e9a06fd7308559dfd4d0273d48062211d2eefb3c72b861b54f993406131b314ecb7f80e2e6569e5df12e53c7f98020f56 SHA512 a906f820e7fb423636845ab3466060c5d6c180334f4701187c6dfcdde641836534faa4c896cb1f93f1ba1f1168b079bc4b1156f2a24c9fd37482e5c3a9eccf36
 DIST slv2-0.6.6.tar.bz2 170859 BLAKE2B 167ca7a1b1c27f54e8896874689a8a65c46ad9797d8090651c27f918fd42bc8a0ce83796ef521da1d69e52ca4ea8db5bf194381c888eade60969aeec0d787f83 SHA512 b9751b944e4a4d9639fcbfe73cdb31bc4d7f1256c0b1b75f9ab58f5f951767d12a4dd6bb8fc95743de9f6787c663e6815c3e41c025299a4228325d0568b08359
-EBUILD slv2-0.6.6-r2.ebuild 957 BLAKE2B 021d3948a5018dfd0fe7f5571329497b96fa164431576b57308f19340283d7258e1d0d43946c6a5b970117cdd2aa73f959c3a4fffd2f07c8c7a17abf55d90bfd SHA512 c9217995e51db02e5d0befc54611c95fe09e51c09f07f1623f8382a729a7df5d65ebd7e1903d8fe4049aab7b8d95b03e8112efc3ad9e9e0e192905533dff54cb
+EBUILD slv2-0.6.6-r2.ebuild 1059 BLAKE2B c8aaff2051c924512f081e8bd967773c66205ca6a80711f6afdc4631c285ca197587babe86df266c910e4f491fe432fa07a78f411aadffe6b0bc632d84ad413a SHA512 b5b166238dd2d03662f03a9a634e31e167b61fe80bfd46c7bc4bdc6287700c8d70788be54410136841b88563fbde127ba49e7d49b04225bf3efb0a6071bfc36a
+EBUILD slv2-0.6.6-r3.ebuild 1141 BLAKE2B 8a29f541f60d5f9c2f17b964fec34743b51f0808cb22afecf4200a12c9e3770d4e8e7ea79849ff8cb253abff3486642d857bdf7dabd5aa6257394c4c66598141 SHA512 61d48ba455c48f3471b3008bb2925791f4ae68b9e06a5fb77ed50efe97a87899b432be6349917ae06763fd5aa6fa690412d4ff02c72bb65d631d750ae89e8f5e
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/slv2/files/ldconfig.patch b/media-libs/slv2/files/ldconfig.patch
index f53ff9e7df59..ea0492bd1d3a 100644
--- a/media-libs/slv2/files/ldconfig.patch
+++ b/media-libs/slv2/files/ldconfig.patch
@@ -1,9 +1,9 @@
-Index: slv2-0.6.2/autowaf.py
-===================================================================
---- slv2-0.6.2.orig/autowaf.py
-+++ slv2-0.6.2/autowaf.py
-@@ -324,8 +324,5 @@ def build_dox(bld, name, version, srcdir
- 	out1.command_is_external = True
+diff --git a/autowaf.py b/autowaf.py
+index 4797ea3..f32f994 100644
+--- a/autowaf.py
++++ b/autowaf.py
+@@ -375,8 +375,5 @@ def build_version_files(header_path, source_path, domain, major, minor, micro):
+ 	return None
  
  def shutdown():
 -	# This isn't really correct (for packaging), but people asking is annoying
diff --git a/media-libs/slv2/files/slv2-0.6.6-python3.patch b/media-libs/slv2/files/slv2-0.6.6-python3.patch
new file mode 100644
index 000000000000..651c761d988c
--- /dev/null
+++ b/media-libs/slv2/files/slv2-0.6.6-python3.patch
@@ -0,0 +1,22 @@
+diff --git a/autowaf.py b/autowaf.py
+index 4797ea3..90db9be 100644
+--- a/autowaf.py
++++ b/autowaf.py
+@@ -354,7 +354,7 @@ def build_version_files(header_path, source_path, domain, major, minor, micro):
+ 		o.write(text)
+ 		o.close()
+ 	except IOError:
+-		print "Could not open", source_path, " for writing\n"
++		print("Could not open", source_path, " for writing\n")
+ 		sys.exit(-1)
+ 
+ 	text  = "#ifndef __" + domain + "_version_h__\n"
+@@ -369,7 +369,7 @@ def build_version_files(header_path, source_path, domain, major, minor, micro):
+ 		o.write(text)
+ 		o.close()
+ 	except IOError:
+-		print "Could not open", header_path, " for writing\n"
++		print("Could not open", header_path, " for writing\n")
+ 		sys.exit(-1)
+ 		
+ 	return None
diff --git a/media-libs/slv2/slv2-0.6.6-r2.ebuild b/media-libs/slv2/slv2-0.6.6-r2.ebuild
index a2d0bf16a6d1..39c9070abce8 100644
--- a/media-libs/slv2/slv2-0.6.6-r2.ebuild
+++ b/media-libs/slv2/slv2-0.6.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch "${FILESDIR}"/ldconfig.patch
 	epatch "${FILESDIR}"/${P}-raptor2-link.patch
+
+	 has_version ">=media-libs/lv2-1.16.0" && (sed -i "s/lv2core/lv2/" wscript || die "Failed to fix lv2")
 }
 
 src_configure() {
diff --git a/media-libs/slv2/slv2-0.6.6-r3.ebuild b/media-libs/slv2/slv2-0.6.6-r3.ebuild
new file mode 100644
index 000000000000..24cd431efebd
--- /dev/null
+++ b/media-libs/slv2/slv2-0.6.6-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+inherit eutils multilib python-any-r1 toolchain-funcs waf-utils
+
+DESCRIPTION="A library to make the use of LV2 plugins as simple as possible for applications"
+HOMEPAGE="http://wiki.drobilla.net/SLV2"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc jack"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+CDEPEND="
+	>=dev-libs/redland-1.0.6
+	jack? ( virtual/jack )
+	media-libs/lv2
+"
+RDEPEND="${CDEPEND}"
+DEPEND="
+	${CDEPEND}
+	${PYTHON_DEPS}
+"
+
+PATCHES=(
+	"${FILESDIR}"/ldconfig.patch
+	"${FILESDIR}"/${P}-raptor2-link.patch
+	"${FILESDIR}"/${P}-python3.patch
+)
+
+src_prepare() {
+	default
+	 has_version ">=media-libs/lv2-1.16.0" && (sed -i "s/lv2core/lv2/" wscript || die "Failed to fix lv2")
+}
+
+src_configure() {
+	waf-utils_src_configure \
+		--prefix=/usr \
+		--libdir=/usr/$(get_libdir) \
+		--htmldir=/usr/share/doc/${PF}/html \
+		$(use doc && echo --build-docs) \
+		$(use jack || echo --no-jack)
+}