gentoo resync : 09.07.2022

4 files changed, 78 insertions, 20 deletions

diff --git a/media-libs/liblscp/Manifest b/media-libs/liblscp/Manifest
index 1254bb63db89..c80d4d4176b4 100644
--- a/media-libs/liblscp/Manifest
+++ b/media-libs/liblscp/Manifest
@@ -1,4 +1,7 @@
+AUX liblscp-0.9.6-conditional.patch 350 BLAKE2B 5354ef415e5905d3dd03879372f6a434e1b0fb50ab6e5db750a0c61a6bb89ecce714d020b1e79fd09ef13fda947ad9c161d7302302ea34f4189803b33c86298c SHA512 c2db8ae9044138353ead1d4b992cb8bbb83038a96c1a20d953762f0c30ccd493d2503648c2f6588a97aa3e72edbb959e30e8629e7d3e1d7a74c7c2f5617863f5
 DIST liblscp-0.9.4.tar.gz 697219 BLAKE2B f1824c75237e478888ffcd95c15b72e4746cbc8997924f70cced966baddb68877526cbbcd56ff419fa1eb5f1ca6a1537ce5db368ba41cac39e51813921720e9b SHA512 6aa9b15d538925edf3327ca05023bac8285611902703fec20572416dde5cd7300ed429a7db464d92b9f6c1d524b89066888f8cbd0d56283ff3c78074605f396a
+DIST liblscp-0.9.6.tar.gz 100811 BLAKE2B a86a5e9e6d52dfd2449274e1c800e40887094dcea3e39d257670dded8b3805f2cdf575b41f640b0df95cd008656d3e7c8ca93d5bc5360c8727b80d6d2695ed83 SHA512 51c3b0b3dfe3947ac5d7cfec18fec597a4282aacc489cdda5a30d5853c3a43778e207ddf2f211c28ba04386fd6f30a09eed62dc2a33177e5aeccd7f77b4ef520
 EBUILD liblscp-0.9.4.ebuild 637 BLAKE2B 8f259597f3b0360dba84efbae838531fdf0524f7a962717ba691f4cc324a2a24d07163afd1efa0641db6fcc3a8bbb754bbef6c83580d703c52e1dd91139a39ae SHA512 659b7dfa673a2b07220b56e58ab84f9fa008a9727dae2bacdf5644e5453c49708cbc3491851f88d86977a90d7df74c9ad4b8f52158c7c1ae3e8e8b93bce7d374
-EBUILD liblscp-9999.ebuild 666 BLAKE2B 6d46b9205a46720401495db41bd03e090e29b1b4f23bac9b41d4d6d86f187a3d3d69d0eac2849a623a30f2b4ce8f43a2ddd85b7e1d8f951cd88f0bfd884eeb78 SHA512 676ddb8b98247c647b70f8283dddaebd318a2a0a2944a3da931492c01aec648042b9ae1d58854a285fa0b23199d8d831b09efbda6ca51d7f61cc82b62c0432d4
+EBUILD liblscp-0.9.6.ebuild 750 BLAKE2B 4ec1fd94a04806df5a2c8ec18f12a21cb53159a933be39253bbf2ad3d2e505e8cc71d8bfcb8bfeb751da7fc60c18437d63c74c05e4a723f94106f1d4717bb4c7 SHA512 fdcb708593aec437922f534f90a1bee1040d68c5659d56645052f933f7dec512767d70b359f535db3d7fec4dd6677dda306e0c205be565b25a48d470290e687f
+EBUILD liblscp-9999.ebuild 750 BLAKE2B 4ec1fd94a04806df5a2c8ec18f12a21cb53159a933be39253bbf2ad3d2e505e8cc71d8bfcb8bfeb751da7fc60c18437d63c74c05e4a723f94106f1d4717bb4c7 SHA512 fdcb708593aec437922f534f90a1bee1040d68c5659d56645052f933f7dec512767d70b359f535db3d7fec4dd6677dda306e0c205be565b25a48d470290e687f
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-libs/liblscp/files/liblscp-0.9.6-conditional.patch b/media-libs/liblscp/files/liblscp-0.9.6-conditional.patch
new file mode 100644
index 000000000000..a7f1cdf5c45f
--- /dev/null
+++ b/media-libs/liblscp/files/liblscp-0.9.6-conditional.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cf38831..a13f094 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -129,8 +129,10 @@ endif ()
+ #
+ 
+ add_subdirectory (src)
+-add_subdirectory (doc)
+-add_subdirectory (examples)
++
++if (BUILD_DOC)
++  add_subdirectory (doc)
++endif ()
+ 
+ configure_file (liblscp.spec.in liblscp.spec IMMEDIATE @ONLY)
+ 
diff --git a/media-libs/liblscp/liblscp-0.9.6.ebuild b/media-libs/liblscp/liblscp-0.9.6.ebuild
new file mode 100644
index 000000000000..5d0c3733b0ff
--- /dev/null
+++ b/media-libs/liblscp/liblscp-0.9.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="C++ library for the Linux Sampler control protocol"
+HOMEPAGE="https://www.linuxsampler.org"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit subversion
+	ESVN_REPO_URI="https://svn.linuxsampler.org/svn/liblscp/trunk"
+else
+	SRC_URI="https://www.rncbc.org/archive/${P}.tar.gz
+		https://download.linuxsampler.org/packages/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="doc"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.6-conditional.patch"
+)
+
+DOCS=( ChangeLog README )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOC=$(usex doc)
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/liblscp/liblscp-9999.ebuild b/media-libs/liblscp/liblscp-9999.ebuild
index f456569bf546..5d0c3733b0ff 100644
--- a/media-libs/liblscp/liblscp-9999.ebuild
+++ b/media-libs/liblscp/liblscp-9999.ebuild
@@ -1,36 +1,37 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools subversion
+inherit cmake
 
 DESCRIPTION="C++ library for the Linux Sampler control protocol"
 HOMEPAGE="https://www.linuxsampler.org"
-ESVN_REPO_URI="https://svn.linuxsampler.org/svn/liblscp/trunk"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit subversion
+	ESVN_REPO_URI="https://svn.linuxsampler.org/svn/liblscp/trunk"
+else
+	SRC_URI="https://www.rncbc.org/archive/${P}.tar.gz
+		https://download.linuxsampler.org/packages/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
 IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
 
-DOCS=( AUTHORS ChangeLog TODO NEWS README )
-
-src_prepare() {
-	default
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.6-conditional.patch"
+)
 
-	emake -f Makefile.git
-	eautoreconf
-}
+DOCS=( ChangeLog README )
 
 src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	default
-	find "${D}" -name '*.la' -delete || die
+	local mycmakeargs=(
+		-DBUILD_DOC=$(usex doc)
+	)
+	cmake_src_configure
 }