gentoo auto-resync : 08:06:2024 - 00:08:11

4 files changed, 109 insertions, 10 deletions

diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 9b06d9c0746f..b4eca37782bf 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -3,6 +3,8 @@ AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f
 AUX gerbera-1.12.1-gcc14.patch 2571 BLAKE2B cdebe5f239de5136d646e4efb249deda94daa95944dcfd701d9b664f39150adcce86cb96c628fc09e3b3b17103e84181e441a59c2f115f3e659b2fdf49fe8fb9 SHA512 6661d5cfc5bfdbfa97f059d8c715cc3e6a24f89f55fba44d2a0333795e336039076f0165b4f03866947aa3fdf43d2bf0c3b19e56832f925ea429d6be9843130b
 AUX gerbera-1.3.0.config 6342 BLAKE2B 519b2b0f79803bb516b5bd43a692af38039a273318a3486b67c9f040ab9061fb9a2b2aef484fb9e22b584fa7f5d1e0a4f7e61f896f6f9b1ce4f657349506b873 SHA512 e551413ad62ca849561991880ba9049ebb6662ec06ff21d5483bbcc2499df04c72ac170fc4235ebd05c5d95926cdd7fc4db27083cb10fa4fe38f10a1141bf417
 DIST gerbera-1.12.1.tar.gz 4368573 BLAKE2B 870b1296b89d51086048c5c5a52109f336facbf0bce02313487cb5c80ca4bb9a5590f64683f5ac92a3c3026ef9c3e22275a38fdc52fd8cbe887ec6f3c7b38ab9 SHA512 54f4b9fe38f4890d1cac16d433bd70cb2892f3659fffcd5f52814d2f9377c4a8eb68deb3a13053531609727f7ae6cb5ee12bbf652bc41dd1eabd83e6f8dcc1f2
+DIST gerbera-2.1.0.tar.gz 5828980 BLAKE2B d611b9db723e52d417c64ce6ff8bfd77009ad7b7c2454b8f722810aacfde76b892894e8a70cf4e25474f970b13353eb770d4663f91ac59ac87cea858928005fb SHA512 5069ffb470dc10c5b7e6f95e9d61794e00d8a4473835860e7bca63ff1c34f2b8544b3a7fed8373a20e6bbddb2bc016ecb39a8321e930813e65e444b653e5a24f
 EBUILD gerbera-1.12.1-r1.ebuild 2247 BLAKE2B 03d0a04315f26bb90825d4018a6c823631f0e574c6309d7d20d9a733ad7fad5a71d3a92eddfe8039a21acfea7baabba32f1b783ab1f95daec73e957f79c8a680 SHA512 2c36f21d4cbe8ef9dce7e9c21b6b10198ec36553024e146de1d6368497791327ebb4d1f03b34b77bf28a8ee3fed5dd62967adf33d12823fc6bc6b8db430eb23a
-EBUILD gerbera-9999.ebuild 2195 BLAKE2B 178eac044ee2fcc40d490807d4bc8474eafb3e8ad6e0c2a23688685b6d75fff96beb1e1c7db66ec07303094f4895dc774afda7361b15fd5f6154eabf31404c9e SHA512 c6f232bf998e3cccf014abec46dc8c9d299dc48c34cd589dd7a07585368d3aacb182296ff5bceb443aea3c563560109d48fb37f5f0ec8beac952273801730e68
-MISC metadata.xml 915 BLAKE2B 580104478de8c2042ac33e891783bb2ad473bb3f65ee4f66ac406b66b7bdfb66545c2795562524003eefb2a4b861a963566a8c9fa6a516d3f0b82cf0bd1f6189 SHA512 96e0f7915ecfebad068ca9dc55b47a0a364f6f9d2712608393c496a477d25338eedf1d0da97b5c24ff518009624970b0a3e837b6260fcd558f4ea81fad6747ca
+EBUILD gerbera-2.1.0.ebuild 2187 BLAKE2B d1da6e1c5d560914b8b15fa47cbb651307047834da549b08758127dbfa1ca46aeeda51bfbf06d6e2b7915465c3239459415073f7a458d6b8749a6bd602bbfcf0 SHA512 d4ac9b9d07c31d4f18a8798f778103b2af78b495206779d03e6f86bc157d62638366456a5d41df5506e94a2d2207151717f6a2dfe410ddb9b208fa49afa7d510
+EBUILD gerbera-9999.ebuild 2187 BLAKE2B d1da6e1c5d560914b8b15fa47cbb651307047834da549b08758127dbfa1ca46aeeda51bfbf06d6e2b7915465c3239459415073f7a458d6b8749a6bd602bbfcf0 SHA512 d4ac9b9d07c31d4f18a8798f778103b2af78b495206779d03e6f86bc157d62638366456a5d41df5506e94a2d2207151717f6a2dfe410ddb9b208fa49afa7d510
+MISC metadata.xml 1153 BLAKE2B 160ec07f27637335374b7c1232c65942d661b66ab89f9e145ffcbadd510ea454a52cef9ab8e544ed46c0c11f56f69b1c659b4f604b0c65ada19f66f1d857586e SHA512 95da4ff4383a5fa1467ea5674c38cb6c8b7939fa01e7a66bac42bb2e3d21dfc020c2585bc6e81af602a227c978e3fe1dc3950ef962b17cbbc11a0cea0413d9b3
diff --git a/net-misc/gerbera/gerbera-2.1.0.ebuild b/net-misc/gerbera/gerbera-2.1.0.ebuild
new file mode 100644
index 000000000000..b3c80239e4c7
--- /dev/null
+++ b/net-misc/gerbera/gerbera-2.1.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake linux-info
+
+DESCRIPTION="UPnP Media Server"
+HOMEPAGE="https://gerbera.io"
+
+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/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${P}"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript +magic +matroska mysql systemd +taglib"
+
+RDEPEND="
+	acct-user/gerbera
+	dev-db/sqlite
+	dev-libs/libebml:=
+	dev-libs/libfmt:=
+	dev-libs/pugixml
+	dev-libs/spdlog:=
+	net-libs/libupnp:=[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:= )
+	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
+	javascript? ( dev-lang/duktape:= )
+	magic? ( sys-apps/file )
+	matroska? ( media-libs/libmatroska:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	taglib? ( media-libs/taglib )
+"
+
+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_FFMPEGTHUMBNAILER=$(usex ffmpegthumbnailer)
+		-DWITH_INOTIFY=1
+		-DWITH_JS=$(usex javascript)
+		-DWITH_LASTFM=NO
+		-DWITH_MAGIC=$(usex magic)
+		-DWITH_MATROSKA=$(usex matroska)
+		-DWITH_MYSQL=$(usex mysql)
+		-DWITH_SYSTEMD=$(usex systemd)
+		-DWITH_TAGLIB=$(usex taglib)
+	)
+
+	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 2691f65a7c4f..b3c80239e4c7 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit cmake linux-info
 
+DESCRIPTION="UPnP Media Server"
+HOMEPAGE="https://gerbera.io"
+
 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/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S="${WORKDIR}/${P}"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
-DESCRIPTION="UPnP Media Server"
-HOMEPAGE="https://gerbera.io"
-
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript +magic +matroska mysql systemd +taglib"
@@ -28,7 +28,7 @@ RDEPEND="
 	dev-libs/libfmt:=
 	dev-libs/pugixml
 	dev-libs/spdlog:=
-	>=net-libs/libupnp-1.14.12:=[ipv6(+),reuseaddr,-blocking-tcp]
+	net-libs/libupnp:=[ipv6(+),reuseaddr,-blocking-tcp]
 	sys-apps/util-linux
 	sys-libs/zlib
 	virtual/libiconv
@@ -40,7 +40,7 @@ RDEPEND="
 	javascript? ( dev-lang/duktape:= )
 	magic? ( sys-apps/file )
 	matroska? ( media-libs/libmatroska:= )
-	mysql? ( dev-db/mysql-connector-c )
+	mysql? ( dev-db/mysql-connector-c:= )
 	taglib? ( media-libs/taglib )
 "
 
diff --git a/net-misc/gerbera/metadata.xml b/net-misc/gerbera/metadata.xml
index cf60dbc1bf7e..6463221bb5fe 100644
--- a/net-misc/gerbera/metadata.xml
+++ b/net-misc/gerbera/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<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>