gentoo resync : 25.08.2020

3 files changed, 98 insertions, 2 deletions

diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 3f65065bea41..c48cf22a03c1 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -6,5 +6,6 @@ DIST gerbera-1.4.0.tar.gz 2896853 BLAKE2B 52271c67170a1dd20a35959dd24f52bdef1fbb
 DIST gerbera-1.5.0.tar.gz 2876447 BLAKE2B afd619d22dd3c4455dae5926e964ecd2e5cb65bf4d0e2bd537b95139029163291a3967c1a1237d9c0d09ad45c5e58edf9e1f904755a488e0ef8b094f59e52b70 SHA512 dec7b329691cef53b99a591e3c49b24d92e52ee23c1cbaf370b61360716031dfc0552b88f07d1691f4b3a6b268e3edc3d56e6ef07a98e59053486970d9aa5c96
 EBUILD gerbera-1.4.0-r1.ebuild 2285 BLAKE2B 87c3342dddc9931f53654b2c948187472110628b0d49fc936908b44d7e4276b8a74dbba2b387b6f8ec9679f12fb69b1b20b55e55296a825e05c07566694271df SHA512 326481ecaadb0e04da9bbbb2e428bb19fbd45b15f4f040c89ca86f9ddb0756b0132a0b1cc670d4d0f6a42e8df55f0fab0ff6698dbcb38c23621910781ef497d2
 EBUILD gerbera-1.5.0-r1.ebuild 2376 BLAKE2B 536362d7fddae6d2dc9b1846889e8757635512218edc73a909775b0b230d62429d721580e7cfbe7748faa93e0c1fa4710d778dc7e523e43e06eab027b5575070 SHA512 323b9a355a8691e7a76db7a28f4a151d840552de2f32b200e17e783aaa426b3d96bf0fc94c873db5860ac3f558fda03da2023806ab58a6cadb85a6eb1688bca7
-EBUILD gerbera-9999.ebuild 2311 BLAKE2B 4b344fd4a4d5951b490a97a23e5af37cd45a3a2bb2c7a73e6bf629cef25fbb76a95dad8cda6f1fa08f23761f7be0c7d455ddc8c45565615e2b3a94ac1fdcf79b SHA512 7b4330253af4df08e7aee9a66361f79762711511400cf211e5d4dc6655bf85614e395c853926ffd582e7b252cc83a96195ac4f32e27494f552ea84618b90c977
+EBUILD gerbera-1.5.0-r2.ebuild 2375 BLAKE2B f47ccf1d0d0dff9e7ebbb0720d56fe3215ad18f4f91fd057dfb116c250cdf489dfacd83a1c5408e471332dee44dc9e7029de169f88a9192026c3ee97aee901d7 SHA512 6c7e7a0cebef43e0a4b8eb700438696f2bdc3c41f72449e81cad0808a29c9f6a717e23c9e19a9a75d3c32e453b56b44b288a3487ca3e1268149d4ea4e0863ea6
+EBUILD gerbera-9999.ebuild 2310 BLAKE2B 03da9d17449ebd6f00cf0460cead7a3772ac86d473a11f4b249e53cf50502cf1b932417e64cd1e432cd863fa3e896138fc6a9dd802ecd90e482652030bccdbe4 SHA512 320e649c649417b44fd7f87a4a10d21aa6489e284482167b7ee49afc6789a13d7433dc0bf05f1c6941934479be21e5b4b03b97082d98ffc6a14c7992a795777c
 MISC metadata.xml 1074 BLAKE2B 35bccb59d384c80ef6a3a62e9e2e68a9be6e559c3573fc4d7b342b775aff91b969e9fb15b23fe106b467e4f78f0e1771ae2bda7a7bb23d0ea2fab0f19beb2c99 SHA512 b3abb9ac765a6c770134f6ade055786c50d7af8e2d051a638dcec412963d876a7273d7531a3a26491cca9e3bb93a1842952fd9de0f76adc60de0747fd8182f09
diff --git a/net-misc/gerbera/gerbera-1.5.0-r2.ebuild b/net-misc/gerbera/gerbera-1.5.0-r2.ebuild
new file mode 100644
index 000000000000..5357c3346ff8
--- /dev/null
+++ b/net-misc/gerbera/gerbera-1.5.0-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake eutils linux-info systemd tmpfiles
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/gerbera/${PN}.git"
+	KEYWORDS=""
+	SRC_URI=""
+	inherit git-r3
+else
+	SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~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.12.1:=[ipv6,reuseaddr]
+	>=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"
+
+PATCHES=(
+	"${FILESDIR}/${P}-incomplete-type-iohandler.patch"
+)
+
+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 7a452ed244cc..219386720083 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -29,7 +29,7 @@ DEPEND="
 	>=dev-db/sqlite-3
 	dev-libs/spdlog:=
 	dev-libs/pugixml
-	dev-libs/libfmt:0/6
+	dev-libs/libfmt:0=
 	mysql? ( dev-db/mysql-connector-c )
 	javascript? ( dev-lang/duktape )
 	taglib? ( >=media-libs/taglib-1.11 )