[gentoo-commits] repo/gentoo:master commit in: media-libs/liblscp/, media-libs/liblscp/files/

[Miroslav Šulc]

commit:     9ceb40e5ded62ce22d1014134d3477fa5bc9c937
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  1 13:28:44 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jul  1 13:29:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ceb40e5

media-libs/liblscp: bump to 0.9.6, switched to cmake, eapi8, updated live

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-libs/liblscp/Manifest                        |  1 +
 .../liblscp/files/liblscp-0.9.6-conditional.patch  | 17 ++++++++++
 media-libs/liblscp/liblscp-0.9.6.ebuild            | 37 ++++++++++++++++++++
 media-libs/liblscp/liblscp-9999.ebuild             | 39 +++++++++++-----------
 4 files changed, 75 insertions(+), 19 deletions(-)

diff --git a/media-libs/liblscp/Manifest b/media-libs/liblscp/Manifest
index ea071a9a9f86..d12d04f5f7e9 100644
--- a/media-libs/liblscp/Manifest
+++ b/media-libs/liblscp/Manifest
@@ -1 +1,2 @@
 DIST liblscp-0.9.4.tar.gz 697219 BLAKE2B f1824c75237e478888ffcd95c15b72e4746cbc8997924f70cced966baddb68877526cbbcd56ff419fa1eb5f1ca6a1537ce5db368ba41cac39e51813921720e9b SHA512 6aa9b15d538925edf3327ca05023bac8285611902703fec20572416dde5cd7300ed429a7db464d92b9f6c1d524b89066888f8cbd0d56283ff3c78074605f396a
+DIST liblscp-0.9.6.tar.gz 100811 BLAKE2B a86a5e9e6d52dfd2449274e1c800e40887094dcea3e39d257670dded8b3805f2cdf575b41f640b0df95cd008656d3e7c8ca93d5bc5360c8727b80d6d2695ed83 SHA512 51c3b0b3dfe3947ac5d7cfec18fec597a4282aacc489cdda5a30d5853c3a43778e207ddf2f211c28ba04386fd6f30a09eed62dc2a33177e5aeccd7f77b4ef520

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
 }