gentoo resync : 20.03.2022

5 files changed, 85 insertions, 166 deletions

diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 0449189eaeb0..e7a3b6d5142c 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -1,9 +1,7 @@
 AUX gerbera-1.0.0.confd 531 BLAKE2B 712304e55ec4f2be59fdfb7a03f8a52e173f44e6903e91b9e542e3e9ac0bd51992c6c024ead3c9643e067430eefec9305ea3e8c9c4592a254da518baead245fe SHA512 7e02ce95ab75665c75463a07255a23832a6392a073c432304fc971eaf3a338c401e6f6d706798301b813c24bee2c4a5cbb0ab6cd13b73f6c7f60d0b2a99a0931
 AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d
 AUX gerbera-1.3.0.config 6342 BLAKE2B 519b2b0f79803bb516b5bd43a692af38039a273318a3486b67c9f040ab9061fb9a2b2aef484fb9e22b584fa7f5d1e0a4f7e61f896f6f9b1ce4f657349506b873 SHA512 e551413ad62ca849561991880ba9049ebb6662ec06ff21d5483bbcc2499df04c72ac170fc4235ebd05c5d95926cdd7fc4db27083cb10fa4fe38f10a1141bf417
-DIST gerbera-1.8.2.tar.gz 3589779 BLAKE2B 120654d5a9d1ac7dd29da401f2ca040e3331a27dd22a52fdc9c9a958a1a8e918ae6ca76926e636184f3b91475797432728462106eb4fbdc146737e88da07d8e7 SHA512 3831030b4960613e487bdba92323a4b8d7ed63352c1c9eb1ca5eacd3c91d4864d48ef1d1bec19a98b6abed0a827d18ba7940a814fe174b44c2808ad7b85a8756
-DIST gerbera-1.9.2.tar.gz 3671452 BLAKE2B 1553370fe35c32ca5925559da05fb4a27db4c8b765eeecabf9c5be967dbd2bd99c2726129e0c2e49930b8e95ddbabb7829c65107c75cda4d6885ff72b695b512 SHA512 91c7215b0bae000d4d8b29797947b29609e81c9387547e199936ce385ef679048a7554d24cd80ab73fc83c4288b29fc4928a23add6f67a1da05501c87afdf7a3
-EBUILD gerbera-1.8.2.ebuild 2289 BLAKE2B d3f4d822ce1143179c7823b989882c05a63d5e3e9bab8e4493cb368238969bc282b7e25f8ddc826e4d8eab0899cab218fe388995d40ca625bf25a7b97f909c7c SHA512 ca08c3e4fdcf5081f1a620050a7566a80d4cf67b66c8014ce68f95047d7ff40f4cb784dd81c6076651beb8a72d2103a6262fb05688ee414ae1eb3d0f72dbef68
-EBUILD gerbera-1.9.2.ebuild 2257 BLAKE2B e75036b2fa785d928adba86f899da90b98bf78d24329e6a27d3cf79750fb0f217ed0ec3070bb6abbbec7191702c2496ef71951e7f475280ae27ad6b1c7ec6b70 SHA512 5df45a7c41fa91063faf09f555760eff315a1f5a7dcfc3bf7a39bea4f927ae69438ff29e4198ce33cbb078182689200c7b061df5455305c00c39a0bc71727fdc
-EBUILD gerbera-9999.ebuild 2289 BLAKE2B d3f4d822ce1143179c7823b989882c05a63d5e3e9bab8e4493cb368238969bc282b7e25f8ddc826e4d8eab0899cab218fe388995d40ca625bf25a7b97f909c7c SHA512 ca08c3e4fdcf5081f1a620050a7566a80d4cf67b66c8014ce68f95047d7ff40f4cb784dd81c6076651beb8a72d2103a6262fb05688ee414ae1eb3d0f72dbef68
-MISC metadata.xml 991 BLAKE2B ead3fd232d1355d3521a1837587f21d1de1bd264f86a809554cf5ed83678b9fa4f5dda2d986f43d7c4dfb645a0281e7e56266adfd6de455619f9a81b7dd520c0 SHA512 0b50e94de7c65f0ccc0db9cbdf5097ecfa6321a8ef370e2e44a2d000c875b6dd89d67d92847be1a786ee5520d65100dae58f240e9d400f45d7be751684479ccd
+DIST gerbera-1.10.0.tar.gz 3960516 BLAKE2B 9240ff4334f6f018ed27489f3984bd8439eb1ae9784712d23e778f9c3054c37241036a32167fc1c19303f4d68db3862ae09e35b7a3f4c15ee1e960a1aa78086c SHA512 9bb605b6475bddc5b683433bc9c50818e4986fc134bb0a6daaa444d1733624164c6ff7440789af95da2ec3c04b6c2f4fd46a29744b4ef793b10d9fab0c65a881
+EBUILD gerbera-1.10.0.ebuild 2243 BLAKE2B d01c18d7a95217703f4c3e4e5155716418c5d6fdb59cf4cf29f10695d5213bb881b949f7450c7636939339f833c094b192e906ef01b3ee4729d8137a867703d2 SHA512 fdeaf5d80a85f3d3b5a491e07c01dff949409ca494e18284312bb4587bab7c8db796b6f92f7c01016ce180686c1b168feaa36f8f3351446b41e4a6fb8526862c
+EBUILD gerbera-9999.ebuild 2243 BLAKE2B d01c18d7a95217703f4c3e4e5155716418c5d6fdb59cf4cf29f10695d5213bb881b949f7450c7636939339f833c094b192e906ef01b3ee4729d8137a867703d2 SHA512 fdeaf5d80a85f3d3b5a491e07c01dff949409ca494e18284312bb4587bab7c8db796b6f92f7c01016ce180686c1b168feaa36f8f3351446b41e4a6fb8526862c
+MISC metadata.xml 1205 BLAKE2B f0fbdc991782018368d65f2d5475ede1a1a0cb2a8a16de4e7c4ed7586057cac18a2d6fe9bb405c8267337e453b26c69e69042dac3bfd5ef858f23fa7c468ef2c SHA512 a231be2b6829fb2f59fa3e66c830a16358782c915e806bfbee919a6f7ebdf9d33d53aa6860814ba5a5c7251ce2562f313af592ab5fcda701a7673b334627b1a0
diff --git a/net-misc/gerbera/gerbera-1.9.2.ebuild b/net-misc/gerbera/gerbera-1.10.0.ebuild
index 49bd780a49a0..f069b91f13cf 100644
--- a/net-misc/gerbera/gerbera-1.9.2.ebuild
+++ b/net-misc/gerbera/gerbera-1.10.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake linux-info
 
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/gerbera/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/gerbera/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S="${WORKDIR}/${P}"
 fi
@@ -21,41 +21,43 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib"
 
-DEPEND="
+RDEPEND="
 	acct-user/gerbera
-	>=net-libs/libupnp-1.14.0:=[ipv6,reuseaddr,-blocking-tcp]
-	>=dev-db/sqlite-3
-	dev-libs/spdlog:=
-	dev-libs/pugixml
-	dev-libs/libfmt:0=
+	dev-db/sqlite
 	dev-libs/libebml:=
-	mysql? ( dev-db/mysql-connector-c )
-	javascript? ( dev-lang/duktape:= )
-	taglib? ( >=media-libs/taglib-1.11 )
-	lastfm? ( >=media-libs/lastfmlib-0.4 )
+	dev-libs/libfmt:=
+	dev-libs/pugixml
+	dev-libs/spdlog:=
+	>=net-libs/libupnp-1.14.12:=[ipv6,reuseaddr,-blocking-tcp]
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libiconv
+	curl? ( net-misc/curl )
 	exif? ( media-libs/libexif )
 	exiv2? ( media-gfx/exiv2 )
-	ffmpeg? (  >=media-video/ffmpeg-2.2:0= )
+	ffmpeg? ( media-video/ffmpeg:= )
 	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
-	curl? ( net-misc/curl )
+	javascript? ( dev-lang/duktape:= )
+	lastfm? ( media-libs/lastfmlib )
 	magic? ( sys-apps/file )
 	matroska? ( media-libs/libmatroska:= )
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libiconv
+	mysql? ( dev-db/mysql-connector-c )
+	taglib? ( media-libs/taglib )
 "
-RDEPEND="${DEPEND}"
+
+DEPEND="${RDEPEND}"
 
 CONFIG_CHECK="~INOTIFY_USER"
 
 src_configure() {
 	local mycmakeargs=(
+		-DWITH_AVCODEC=$(usex ffmpeg)
 		-DWITH_CURL=$(usex curl)
 		-DWITH_DEBUG=$(usex debug)
 		-DWITH_EXIF=$(usex exif)
 		-DWITH_EXIV2=$(usex exiv2)
-		-DWITH_AVCODEC=$(usex ffmpeg)
 		-DWITH_FFMPEGTHUMBNAILER=$(usex ffmpegthumbnailer)
+		-DWITH_INOTIFY=1
 		-DWITH_JS=$(usex javascript)
 		-DWITH_LASTFM=$(usex lastfm)
 		-DWITH_MAGIC=$(usex magic)
@@ -63,7 +65,6 @@ src_configure() {
 		-DWITH_MYSQL=$(usex mysql)
 		-DWITH_SYSTEMD=$(usex systemd)
 		-DWITH_TAGLIB=$(usex taglib)
-		-DWITH_INOTIFY=1
 	)
 
 	cmake_src_configure
@@ -82,7 +83,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if use mysql ; then
+	if use mysql; then
 		elog "Gerbera has been built with MySQL support and needs"
 		elog "to be configured before being started. By default"
 		elog "SQLite will be used."
diff --git a/net-misc/gerbera/gerbera-1.8.2.ebuild b/net-misc/gerbera/gerbera-1.8.2.ebuild
deleted file mode 100644
index d68414c66ed6..000000000000
--- a/net-misc/gerbera/gerbera-1.8.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-info
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/gerbera/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	S="${WORKDIR}/${P}"
-fi
-
-DESCRIPTION="UPnP Media Server"
-HOMEPAGE="https://gerbera.io"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib"
-
-DEPEND="
-	acct-user/gerbera
-	>=net-libs/libupnp-1.14.0:=[ipv6,reuseaddr,-blocking-tcp]
-	>=dev-db/sqlite-3
-	dev-libs/spdlog:=
-	dev-libs/pugixml
-	dev-libs/libfmt:0=
-	mysql? ( dev-db/mysql-connector-c )
-	javascript? ( dev-lang/duktape:= )
-	taglib? ( >=media-libs/taglib-1.11 )
-	lastfm? ( >=media-libs/lastfmlib-0.4 )
-	exif? ( media-libs/libexif )
-	exiv2? ( media-gfx/exiv2 )
-	ffmpeg? (  >=media-video/ffmpeg-2.2:0= )
-	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
-	curl? ( net-misc/curl )
-	magic? ( sys-apps/file )
-	matroska? ( media-libs/libmatroska )
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libiconv
-"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_CURL="$(usex curl)" \
-		-DWITH_DEBUG="$(usex debug)" \
-		-DWITH_EXIF="$(usex exif)" \
-		-DWITH_EXIV2="$(usex exiv2)" \
-		-DWITH_AVCODEC="$(usex ffmpeg)" \
-		-DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \
-		-DWITH_JS="$(usex javascript)" \
-		-DWITH_LASTFM="$(usex lastfm)" \
-		-DWITH_MAGIC="$(usex magic)" \
-		-DWITH_MATROSKA="$(usex matroska)" \
-		-DWITH_MYSQL="$(usex mysql)"
-		-DWITH_SYSTEMD="$(usex systemd)" \
-		-DWITH_TAGLIB="$(usex taglib)" \
-		-DWITH_INOTIFY=1
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}"
-
-	insinto /etc/${PN}
-	newins "${FILESDIR}/${PN}-1.3.0.config" config.xml
-	fperms 0640 /etc/${PN}/config.xml
-	fowners root:gerbera /etc/${PN}/config.xml
-}
-
-pkg_postinst() {
-	if use mysql ; then
-		elog "Gerbera has been built with MySQL support and needs"
-		elog "to be configured before being started. By default"
-		elog "SQLite will be used."
-	fi
-}
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
index d68414c66ed6..f069b91f13cf 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake linux-info
 
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/gerbera/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/gerbera/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S="${WORKDIR}/${P}"
 fi
@@ -21,48 +21,50 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib"
 
-DEPEND="
+RDEPEND="
 	acct-user/gerbera
-	>=net-libs/libupnp-1.14.0:=[ipv6,reuseaddr,-blocking-tcp]
-	>=dev-db/sqlite-3
-	dev-libs/spdlog:=
+	dev-db/sqlite
+	dev-libs/libebml:=
+	dev-libs/libfmt:=
 	dev-libs/pugixml
-	dev-libs/libfmt:0=
-	mysql? ( dev-db/mysql-connector-c )
-	javascript? ( dev-lang/duktape:= )
-	taglib? ( >=media-libs/taglib-1.11 )
-	lastfm? ( >=media-libs/lastfmlib-0.4 )
+	dev-libs/spdlog:=
+	>=net-libs/libupnp-1.14.12:=[ipv6,reuseaddr,-blocking-tcp]
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libiconv
+	curl? ( net-misc/curl )
 	exif? ( media-libs/libexif )
 	exiv2? ( media-gfx/exiv2 )
-	ffmpeg? (  >=media-video/ffmpeg-2.2:0= )
+	ffmpeg? ( media-video/ffmpeg:= )
 	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
-	curl? ( net-misc/curl )
+	javascript? ( dev-lang/duktape:= )
+	lastfm? ( media-libs/lastfmlib )
 	magic? ( sys-apps/file )
-	matroska? ( media-libs/libmatroska )
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libiconv
+	matroska? ( media-libs/libmatroska:= )
+	mysql? ( dev-db/mysql-connector-c )
+	taglib? ( media-libs/taglib )
 "
-RDEPEND="${DEPEND}"
+
+DEPEND="${RDEPEND}"
 
 CONFIG_CHECK="~INOTIFY_USER"
 
 src_configure() {
 	local mycmakeargs=(
-		-DWITH_CURL="$(usex curl)" \
-		-DWITH_DEBUG="$(usex debug)" \
-		-DWITH_EXIF="$(usex exif)" \
-		-DWITH_EXIV2="$(usex exiv2)" \
-		-DWITH_AVCODEC="$(usex ffmpeg)" \
-		-DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \
-		-DWITH_JS="$(usex javascript)" \
-		-DWITH_LASTFM="$(usex lastfm)" \
-		-DWITH_MAGIC="$(usex magic)" \
-		-DWITH_MATROSKA="$(usex matroska)" \
-		-DWITH_MYSQL="$(usex mysql)"
-		-DWITH_SYSTEMD="$(usex systemd)" \
-		-DWITH_TAGLIB="$(usex taglib)" \
+		-DWITH_AVCODEC=$(usex ffmpeg)
+		-DWITH_CURL=$(usex curl)
+		-DWITH_DEBUG=$(usex debug)
+		-DWITH_EXIF=$(usex exif)
+		-DWITH_EXIV2=$(usex exiv2)
+		-DWITH_FFMPEGTHUMBNAILER=$(usex ffmpegthumbnailer)
 		-DWITH_INOTIFY=1
+		-DWITH_JS=$(usex javascript)
+		-DWITH_LASTFM=$(usex lastfm)
+		-DWITH_MAGIC=$(usex magic)
+		-DWITH_MATROSKA=$(usex matroska)
+		-DWITH_MYSQL=$(usex mysql)
+		-DWITH_SYSTEMD=$(usex systemd)
+		-DWITH_TAGLIB=$(usex taglib)
 	)
 
 	cmake_src_configure
@@ -71,17 +73,17 @@ src_configure() {
 src_install() {
 	cmake_src_install
 
-	newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}"
+	newinitd "${FILESDIR}"/${PN}-1.0.0.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}-1.0.0.confd ${PN}
 
 	insinto /etc/${PN}
-	newins "${FILESDIR}/${PN}-1.3.0.config" config.xml
+	newins "${FILESDIR}"/${PN}-1.3.0.config config.xml
 	fperms 0640 /etc/${PN}/config.xml
 	fowners root:gerbera /etc/${PN}/config.xml
 }
 
 pkg_postinst() {
-	if use mysql ; then
+	if use mysql; then
 		elog "Gerbera has been built with MySQL support and needs"
 		elog "to be configured before being started. By default"
 		elog "SQLite will be used."
diff --git a/net-misc/gerbera/metadata.xml b/net-misc/gerbera/metadata.xml
index 2196a8fa3a35..46cb19df5ff3 100644
--- a/net-misc/gerbera/metadata.xml
+++ b/net-misc/gerbera/metadata.xml
@@ -1,17 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>Gerbera is a UPnP media server which allows you to stream your digital media through your home network and consume it on a variety of UPnP compatible devices.</longdescription>
-  <use>
-    <flag name="curl">Support HTTP media sources (e.g. internet radio)</flag>
-    <flag name="exiv2">Use <pkg>media-gfx/exiv2</pkg> to extract EXIF information</flag>
-    <flag name="ffmpegthumbnailer">Enable video thumbnail support with <pkg>media-video/ffmpegthumbnailer</pkg></flag>
-    <flag name="lastfm">Enable last.fm support</flag>
-    <flag name="mysql">Use <pkg>dev-db/mysql</pkg> as backend rather than SQLite3</flag>    
-    <flag name="taglib">Use <pkg>media-libs/taglib</pkg> for reading files' metadata</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">gerbera/gerbera</remote-id>
-  </upstream>
+	<maintainer type="person" proxied="yes">
+		<email>christian.tietz@mailbox.org</email>
+		<name>Christian Tietz</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>Gerbera is a UPnP media server which allows you to stream your digital media through your home network and consume it on a variety of UPnP compatible devices.</longdescription>
+	<use>
+		<flag name="curl">Support HTTP media sources (e.g. internet radio)</flag>
+		<flag name="exiv2">Use <pkg>media-gfx/exiv2</pkg> to extract EXIF information</flag>
+		<flag name="ffmpegthumbnailer">Enable video thumbnail support with <pkg>media-video/ffmpegthumbnailer</pkg></flag>
+		<flag name="lastfm">Enable last.fm support</flag>
+		<flag name="mysql">Use <pkg>dev-db/mysql</pkg> as backend rather than SQLite3</flag>
+		<flag name="taglib">Use <pkg>media-libs/taglib</pkg> for reading files' metadata</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">gerbera/gerbera</remote-id>
+	</upstream>
 </pkgmetadata>