gentoo resync : 25.11.2020

4 files changed, 50 insertions, 75 deletions

diff --git a/media-sound/snapcast/Manifest b/media-sound/snapcast/Manifest
index 42c23f526a5a..d800cdcee755 100644
--- a/media-sound/snapcast/Manifest
+++ b/media-sound/snapcast/Manifest
@@ -3,7 +3,7 @@ AUX snapclient.confd 641 BLAKE2B 74bae4c2c11fb7c1a7d4f2bd0f199c92a5ee11f68efb71d
 AUX snapclient.initd 381 BLAKE2B defa09df346dac279f1ed903adaf88842b060b34d774cfd987fa51e9885f4968b0144106883a1a48e502c3e3558ca408babd38c46663b13ee56215caa108c3be SHA512 f429dfef7abd5705a8afc38f68125a7a6e5a812cd68733c8f47a65c7fb6aa22fc665c91e557726b8f35edbaced7b2e72ffad0ba123a6ed33bf8a6d333e8c1bae
 AUX snapserver.confd 1010 BLAKE2B 9d29348f1618dd399c5a9c500d1ec89fd6719243f472dbb666cfa16e6128411a83c9ac9401a1754b79ae4b560643d1f38c3f00f6f6d0a2301ad6e3fa2168c884 SHA512 98818d75e965d54082b33fa36769b74810b3137f07693eac00d10313c3716e72170e9148faa0ac25fefc7868bb7a206ac5ca6d18396fa71d1a74efcc14485548
 AUX snapserver.initd 386 BLAKE2B a88d150fd5dc0e11b20fad8d07111ca9ef0074bd79d66179fc952b636296ee1b1d151a90d8774ad419cd7ec982305da3da3ddda43d55f5ad47c45d98adb72649 SHA512 d8f6b72d1a5be5f2ddd9266fac33b6d24b046993c532f204e68824919ed09f41988923a59ba722c3c9c748b87c1fdda1c91026f8e591993f34188ef3c488f379
-DIST snapcast-0.15.0.tar.gz 667452 BLAKE2B 0bf7e28ba52356c8fff8066ded3d741243c2ba88cdc6cefda113c0d6866fe14b2fea6198d7809e564cd61d32a336a2c30ee22f6f5d6ae77368a6f3e254cc5065 SHA512 3751eeaa9be4ffd5c7633b8770f36e87360ab83004f090a8350e377f60a79d9502b92b92c5c9c35f513705e6484d113de9942f0a896824d7c5f806ba0010e84e
-EBUILD snapcast-0.15.0-r1.ebuild 2036 BLAKE2B 6221864068dd147e0c642269a979969d0ab3d13b929c0724dfa69963404c8af29d1c1476db4dac01548256e6a37c2319f0f724b702f651b62ed89d60e7a057e0 SHA512 48a7583b6bebb86f55663a37465b7614f99e8eaac0412ff67837ada3f6124a212d1d4c773b3cd4eb6af625aa27eb8ed0dda2ab76b4992e1b0d70cae32cb6c0ef
-EBUILD snapcast-9999.ebuild 1975 BLAKE2B 6c93cb43de41804b2b4a89b22605b42ccc897c8f40eff5d0cd067e4691c72a9b1ad1851e6d2db3178336b78a79e8349c4e75de86b01736ecb78fd5a7dca987e7 SHA512 4a378e359b9727a45b8cb5c2a2ae7169848e5d89617ed5d89de62d89d847226fdaa8e00a665d624ef19608093d7a1848592b5c033cc3f67d36ba6774e2df2681
-MISC metadata.xml 959 BLAKE2B d4b44404f4c57a17bf2d995848175c105956ade8ec89e8680de754f3d0efba4b834ef1f2418e1acd39aafecd393534a5d261ba0cb5e3b4632d108fee8cdecfc7 SHA512 ca08cff7c2bc7e4924df7c39999068ebca369de57af174ebae7f8532c0103d1129dbd8e627506fe41c6e99abe24f4313fd9c208f68cfb17ae3bb4bd467536fa7
+DIST snapcast-0.20.0.tar.gz 729346 BLAKE2B 01a937b74d12f40717cec049e9af0c03f01cc957a97aa0c7316cac2c90f29d8a79dae99a0ae390b72e1a6ff8dce8e6134d40c83ac051641a97bbcd8df90ef64e SHA512 55542a5d915e359b4d8dcb69292dc8ee61067c5b35318151542d875b47a357b8713780ec03fb247ee424645457e68371499e84bae38fbb197737b1369dc7b622
+EBUILD snapcast-0.20.0.ebuild 1657 BLAKE2B 0c009f0083f15d91e64164692d820aed1c6b5138348d2c3846a2c8a12614b017390740ed53c43cb5ae7e41b79663d759b17c76ea4377d3c7f0c1a7661b532f78 SHA512 60259ffd6baac10b38b05d16b4513e346b340ec393c50434287a2fd0848b77934043d4f401211e3d0e78429ce1f8d1fbed23ab526f02729928580523213ffb1c
+EBUILD snapcast-9999.ebuild 1657 BLAKE2B 0c009f0083f15d91e64164692d820aed1c6b5138348d2c3846a2c8a12614b017390740ed53c43cb5ae7e41b79663d759b17c76ea4377d3c7f0c1a7661b532f78 SHA512 60259ffd6baac10b38b05d16b4513e346b340ec393c50434287a2fd0848b77934043d4f401211e3d0e78429ce1f8d1fbed23ab526f02729928580523213ffb1c
+MISC metadata.xml 1160 BLAKE2B e83d0f2140876511608032fc416c0b12861005cb4db45aaea56602e6e86f4bfa3d48df7c97d7cf56b4ba78ef635cea275ccd1c164991eecd99a6f19bd8998e44 SHA512 f1de473f51108a4f25e503404071830284ba0dfbaa458530fa93b737385e7cd651fb28bf27b841dba259f215b5603ea6f425120f74f559c8fdaf47a9e01fbe76
diff --git a/media-sound/snapcast/metadata.xml b/media-sound/snapcast/metadata.xml
index 820ffc2b0d8b..a11864f7a852 100644
--- a/media-sound/snapcast/metadata.xml
+++ b/media-sound/snapcast/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="client">Build and install Snapcast client component</flag>
 		<flag name="server">Build and install Snapcast server component</flag>
diff --git a/media-sound/snapcast/snapcast-0.15.0-r1.ebuild b/media-sound/snapcast/snapcast-0.20.0.ebuild
index ee8268aab953..6228cd7ec667 100644
--- a/media-sound/snapcast/snapcast-0.15.0-r1.ebuild
+++ b/media-sound/snapcast/snapcast-0.20.0.ebuild
@@ -1,32 +1,38 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
+
+inherit cmake
 
 DESCRIPTION="Synchronous multi-room audio player"
 HOMEPAGE="https://github.com/badaix/snapcast"
 
-if [[ ${PV} == *9999 ]] ; then
-	inherit user cmake-utils git-r3
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
 
 	EGIT_REPO_URI="https://github.com/badaix/snapcast.git"
 	EGIT_BRANCH="develop"
 else
-	inherit user cmake-utils
-
 	SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
 	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="+client +flac +server static-libs tremor +vorbis +zeroconf"
+IUSE="+client +expat +flac +opus +server static-libs tremor +vorbis +zeroconf"
 
 REQUIRED_USE="|| ( server client )"
 
-RDEPEND="client? ( media-libs/alsa-lib )
+RDEPEND="client? (
+		acct-user/snapclient
+		media-libs/alsa-lib )
+	expat? ( dev-libs/expat )
 	flac? ( media-libs/flac )
+	opus? ( media-libs/opus )
+	server? (
+		acct-group/snapserver
+		acct-user/snapserver )
 	tremor? ( media-libs/tremor )
 	vorbis? ( media-libs/libvorbis )
 	zeroconf? ( net-dns/avahi[dbus] )"
@@ -35,23 +41,12 @@ DEPEND="${RDEPEND}
 	>=dev-cpp/asio-1.12.1
 	>=dev-cpp/popl-1.2.0"
 
-PATCHES=( "${FILESDIR}/${PN}-options-for-use-flags.patch" )
-
-pkg_setup() {
-	if use server ; then
-		enewgroup "snapserver"
-		enewuser "snapserver" -1 -1 /var/lib/snapserver snapserver
-	fi
-
-	if use client ; then
-		enewuser "snapclient" -1 -1 /var/lib/snapclient audio
-	fi
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_CLIENT=$(usex client)
+		-DBUILD_WITH_EXPAT=$(usex expat)
 		-DBUILD_WITH_FLAC=$(usex flac)
+		-DBUILD_WITH_OPUS=$(usex opus)
 		-DBUILD_SERVER=$(usex server)
 		-DBUILD_STATIC_LIBS=$(usex static-libs)
 		-DBUILD_TESTS=no
@@ -60,11 +55,11 @@ src_configure() {
 		-DBUILD_WITH_AVAHI=$(usex zeroconf)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	for bin in server client ; do
 		if use ${bin} ; then
@@ -74,16 +69,4 @@ src_install() {
 			newinitd "${FILESDIR}/snap${bin}.initd" "snap${bin}"
 		fi
 	done
-
-	if use client ; then
-		keepdir /var/lib/snapclient
-		fowners snapclient:audio /var/lib/snapclient
-		fperms 0770 /var/lib/snapclient
-	fi
-
-	if use server ; then
-		keepdir /var/lib/snapserver
-		fowners snapserver:snapserver /var/lib/snapserver
-		fperms 0770 /var/lib/snapserver
-	fi
 }
diff --git a/media-sound/snapcast/snapcast-9999.ebuild b/media-sound/snapcast/snapcast-9999.ebuild
index 09e72be8ff2e..6228cd7ec667 100644
--- a/media-sound/snapcast/snapcast-9999.ebuild
+++ b/media-sound/snapcast/snapcast-9999.ebuild
@@ -1,32 +1,38 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
+
+inherit cmake
 
 DESCRIPTION="Synchronous multi-room audio player"
 HOMEPAGE="https://github.com/badaix/snapcast"
 
-if [[ ${PV} == *9999 ]] ; then
-	inherit user cmake-utils git-r3
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
 
 	EGIT_REPO_URI="https://github.com/badaix/snapcast.git"
 	EGIT_BRANCH="develop"
 else
-	inherit user cmake-utils
-
 	SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
 	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="+client +flac +server static-libs tremor +vorbis +zeroconf"
+IUSE="+client +expat +flac +opus +server static-libs tremor +vorbis +zeroconf"
 
 REQUIRED_USE="|| ( server client )"
 
-RDEPEND="client? ( media-libs/alsa-lib )
+RDEPEND="client? (
+		acct-user/snapclient
+		media-libs/alsa-lib )
+	expat? ( dev-libs/expat )
 	flac? ( media-libs/flac )
+	opus? ( media-libs/opus )
+	server? (
+		acct-group/snapserver
+		acct-user/snapserver )
 	tremor? ( media-libs/tremor )
 	vorbis? ( media-libs/libvorbis )
 	zeroconf? ( net-dns/avahi[dbus] )"
@@ -35,21 +41,12 @@ DEPEND="${RDEPEND}
 	>=dev-cpp/asio-1.12.1
 	>=dev-cpp/popl-1.2.0"
 
-pkg_setup() {
-	if use server ; then
-		enewgroup "snapserver"
-		enewuser "snapserver" -1 -1 /var/lib/snapserver snapserver
-	fi
-
-	if use client ; then
-		enewuser "snapclient" -1 -1 /var/lib/snapclient audio
-	fi
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_CLIENT=$(usex client)
+		-DBUILD_WITH_EXPAT=$(usex expat)
 		-DBUILD_WITH_FLAC=$(usex flac)
+		-DBUILD_WITH_OPUS=$(usex opus)
 		-DBUILD_SERVER=$(usex server)
 		-DBUILD_STATIC_LIBS=$(usex static-libs)
 		-DBUILD_TESTS=no
@@ -58,11 +55,11 @@ src_configure() {
 		-DBUILD_WITH_AVAHI=$(usex zeroconf)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	for bin in server client ; do
 		if use ${bin} ; then
@@ -72,16 +69,4 @@ src_install() {
 			newinitd "${FILESDIR}/snap${bin}.initd" "snap${bin}"
 		fi
 	done
-
-	if use client ; then
-		keepdir /var/lib/snapclient
-		fowners snapclient:audio /var/lib/snapclient
-		fperms 0770 /var/lib/snapclient
-	fi
-
-	if use server ; then
-		keepdir /var/lib/snapserver
-		fowners snapserver:snapserver /var/lib/snapserver
-		fperms 0770 /var/lib/snapserver
-	fi
 }