gentoo resync : 25.08.2020

4 files changed, 88 insertions, 6 deletions

diff --git a/media-libs/lvtk/Manifest b/media-libs/lvtk/Manifest
index f25d08b3eeac..561857bfffe9 100644
--- a/media-libs/lvtk/Manifest
+++ b/media-libs/lvtk/Manifest
@@ -1,4 +1,7 @@
 AUX lvtk-1.2.0-boost-system-underlinking.patch 535 BLAKE2B 371119bce2f368e0ee5cb0db987dcf631da27b01db2a3883b1b0c4d6f9f4775bb2841a76cc540f60aea4149977eb8c304bc5788f5bae5da6c39900bdcdad7914 SHA512 80cbe3d091975120e0293c1aed26e26d579bed0ef51d4bbf30ac62d3f544a5501be01f01c24f374dab21d9c76e1d3fa64c9641a5d2b13edf136b8d8cca4bdeb0
+AUX lvtk-1.2.0-py3.patch 358 BLAKE2B 8ee7f4ba685e6327f261358bf637ae05598e8a06b417139d1513200436677bde04259b27d7f4317760196b4d22bf728bb26776fd4f76a6d7db2c965e97a37ad8 SHA512 982ebd8884d0633a5f7e4bedc970a76f390523ba5a2ef58c382dbf521d17fa05cc9b00825f35f04a515cf6ebccb612b16eb79142b04fbf6da9a0f05802cadf8f
 DIST lvtk-1.2.0.tar.gz 201146 BLAKE2B d6aa47f5d89e861393b95d60fe53a232f8047c77f8593dc7dcfc700c3933d2bc37e3e499d1d63a84854e0bcfc2232c170cc92b69fd8b01be30f0f581b216a4a9 SHA512 f193ec28103cb2f6353ff0f96f8790041baf1ae99472c5d04017c23b42d0179b1f5e1de6722e17080410311d0e7e1de4ca0ae9ab76fb3bf8a02d9dc1451d8db7
-EBUILD lvtk-1.2.0.ebuild 1445 BLAKE2B 0f29698da7296c17974eb97784471d8a440126022ae67906d8dd24d52dc3442e23d47445223e8e31952121d2e149edcbba44e00ff0bcbd01fd3d85361e384e7b SHA512 62310db51ba8e4cc1a01c55383996abfa312e44afe93881901958c13bdf153f872c5a479fbbc5c0b506d3ad7adac0d88df38de8a2f4e673cbeb05ec44f99b98d
+DIST waf-2.0.20 104725 BLAKE2B c9467b5205f596cd1b5d4b6ccb97806e9fa1f4d4eb9109d378a0978179ab49a029926cb86876ca2088878378f88eb292d899840b4a072e62fc6542b93bc2d894 SHA512 72de1c5a78eb353da4b4a6ea4fbf52d232ed6dd08e972872744e3727b952f813f44e47f0b47106bd6f05ce7fa137c4685ac313fb0b0d70e5fc85dc34918e66f0
+EBUILD lvtk-1.2.0-r1.ebuild 1662 BLAKE2B 34fafc56d5f52b316ffb4c181ecdf09e38f16bdc4dfcf298ed305edcc1f8403284b52efcaed4eb8ba7c819e8878a00eea8da7e88d424e874955140c61801f9d8 SHA512 4879b729e3c70155f796b7f809008aa6aa002700c53234caba1886673c6c46db07c9dc733caf4c3cbc0d5dbdcd3044caf62c06fcf671f89d6b703a7ee261ff00
+EBUILD lvtk-1.2.0.ebuild 1432 BLAKE2B 1df30c38ec5709ec5bd8d921ca064648d631e92ad35e8956e0863bec9d62fee0aba41604d16fce66b9185a61d22e0491d221397c49cbb17e760e585db7e22c3f SHA512 d288b6c258c07aa0527e651592e2a0657e25776cb0a6b4c2073a8297a93d03685cad34b9ff3e54f85b4e8448a50f1f03556aa41a1bc6224de1de7ce07804bfdf
 MISC metadata.xml 502 BLAKE2B d786aa20ddf92b3f0a61bc1df1774624e17a4028bcaad6bdbf220838e0fd834281bf9c08c53ed87d2b4fd7edfb6729a22bb529f563259860ce106e8ddd712f55 SHA512 7d4eca504306d8c96bb766728cdac0f5c61c72ffa784c5923364a16d3ae7c2b9fa89e57f1e00533dc8571d01d0bfa319445f0904373e453bd66970b893fdda45
diff --git a/media-libs/lvtk/files/lvtk-1.2.0-py3.patch b/media-libs/lvtk/files/lvtk-1.2.0-py3.patch
new file mode 100644
index 000000000000..a639c62f2256
--- /dev/null
+++ b/media-libs/lvtk/files/lvtk-1.2.0-py3.patch
@@ -0,0 +1,13 @@
+diff --git a/wscript b/wscript
+index e69c0e0..08ba66f 100644
+--- a/wscript
++++ b/wscript
+@@ -155,7 +155,7 @@ def build(bld):
+ 
+ def release_tag(ctx):
+     tag = git.tag_version(VERSION, "Release: v" + VERSION , "lvtk-")
+-    if tag : print "Git Tag Created: " + tag
++    if tag : print("Git Tag Created: " + tag)
+ 
+ def dist(ctx):
+     z=ctx.options.ziptype
diff --git a/media-libs/lvtk/lvtk-1.2.0-r1.ebuild b/media-libs/lvtk/lvtk-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..091d531606eb
--- /dev/null
+++ b/media-libs/lvtk/lvtk-1.2.0-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit python-single-r1 waf-utils
+
+WAF_VER=2.0.20
+
+DESCRIPTION="A set of C++ wrappers around the LV2 C API"
+HOMEPAGE="https://lvtk.org/"
+SRC_URI="https://github.com/lvtk/lvtk/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://waf.io/waf-${WAF_VER}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc examples +gtk2 +tools"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="media-libs/lv2
+	>=dev-libs/boost-1.40.0
+	${PYTHON_DEPS}
+	gtk2? ( dev-cpp/gtkmm:2.4 )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen
+		media-gfx/graphviz )
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-boost-system-underlinking.patch"
+	"${FILESDIR}/${P}-py3.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz || die
+
+	# we need newer version of waf to work with py3
+	cp "${DISTDIR}/waf-${WAF_VER}" "${S}/waf" || die
+}
+
+src_configure() {
+	local mywafconfargs=(
+		"--docdir=${EPREFIX}/usr/share/doc/${PF}"
+		"--lv2dir=${EPREFIX}/usr/$(get_libdir)/lv2"
+	)
+	use debug    && mywafconfargs+=( "--debug" )
+	use doc      && mywafconfargs+=( "--docs" )
+	use examples || mywafconfargs+=( "--disable-examples" )
+	use tools    || mywafconfargs+=( "--disable-tools" )
+	use gtk2     || mywafconfargs+=( "--disable-ui" )
+	waf-utils_src_configure ${mywafconfargs[@]}
+}
+
+src_install() {
+	waf-utils_src_install
+
+	# It does not respect docdir properly, reported upstream
+	if use doc; then
+		mv "${ED}/usr/share/doc/${PF}/lvtk-1/html" "${ED}/usr/share/doc/${PF}/html" || die
+		rmdir "${ED}/usr/share/doc/${PF}/lvtk-1" || die
+	fi
+}
diff --git a/media-libs/lvtk/lvtk-1.2.0.ebuild b/media-libs/lvtk/lvtk-1.2.0.ebuild
index f55c8072ffcc..62eaf591939f 100644
--- a/media-libs/lvtk/lvtk-1.2.0.ebuild
+++ b/media-libs/lvtk/lvtk-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,12 +9,12 @@ PYTHON_REQ_USE="threads(+)"
 inherit python-single-r1 waf-utils
 
 DESCRIPTION="A set of C++ wrappers around the LV2 C API"
-HOMEPAGE="http://lvtoolkit.org/"
+HOMEPAGE="https://lvtk.org/"
 SRC_URI="https://github.com/lvtk/lvtk/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug doc examples +gtk2 +tools"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -49,7 +49,7 @@ src_install() {
 
 	# It does not respect docdir properly, reported upstream
 	if use doc; then
-		mv "${ED}/usr/share/doc/${PF}/lvtk-1.0/html" "${ED}/usr/share/doc/${PF}/html" || die
-		rmdir "${ED}/usr/share/doc/${PF}/lvtk-1.0" || die
+		mv "${ED}/usr/share/doc/${PF}/lvtk-1/html" "${ED}/usr/share/doc/${PF}/html" || die
+		rmdir "${ED}/usr/share/doc/${PF}/lvtk-1" || die
 	fi
 }