commit:     acb3ab40f45e7b6021682e289c901204263e1bbd
Author:     Christian Tietz <christian.tietz <AT> mailbox <DOT> org>
AuthorDate: Wed Mar 16 22:47:35 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 22:54:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acb3ab40

net-misc/gerbera: Sync live ebuild

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Tietz <christian.tietz <AT> mailbox.org>
Closes: https://github.com/gentoo/gentoo/pull/24576
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/gerbera/gerbera-9999.ebuild | 74 ++++++++++++++++++------------------
 1 file changed, 38 insertions(+), 36 deletions(-)

diff --git a/net-misc/gerbera/gerbera-9999.ebuild 
b/net-misc/gerbera/gerbera-9999.ebuild
index d68414c66ed6..6d93837953a1 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."

Reply via email to