commit: 62161903c542cbd02fa42f84cd640d50e5b039ec Author: Ian Whyman <thev00d00 <AT> gentoo <DOT> org> AuthorDate: Wed Jan 29 21:22:35 2020 +0000 Commit: Ian Whyman <thev00d00 <AT> gentoo <DOT> org> CommitDate: Wed Jan 29 21:22:48 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62161903
net-misc/gerbera: Version Bump, EAPI 7, GLEP 81 Closes: https://bugs.gentoo.org/701236 Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Ian Whyman <thev00d00 <AT> gentoo.org> net-misc/gerbera/Manifest | 3 +- net-misc/gerbera/gerbera-1.2.0-r1.ebuild | 101 --------------------- .../{gerbera-1.3.5.ebuild => gerbera-1.4.0.ebuild} | 33 +++---- net-misc/gerbera/gerbera-9999.ebuild | 33 +++---- net-misc/gerbera/metadata.xml | 3 +- 5 files changed, 26 insertions(+), 147 deletions(-) diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest index ce9babc8219..d49cd27e01d 100644 --- a/net-misc/gerbera/Manifest +++ b/net-misc/gerbera/Manifest @@ -1,2 +1 @@ -DIST gerbera-1.2.0.tar.gz 2910704 BLAKE2B b0d0f52dcfbcefe09d96e6b63a73005fb069176fb42af16cf9a4729742988d5c5a0b68109ab50b93ba65ec604c3ced7a827fb75300d6c3409bdde77e18346589 SHA512 5472136b0605e4cc9645219ab9fbe9ae4240a4b80f52fc611456cef0336a7eac8136448132f30fab04655d4bdb0f85f5a37e92e2830ec976f71c6b294935e1dc -DIST gerbera-1.3.5.tar.gz 2893767 BLAKE2B eb4be515a4a2a3d1f10b8bff5737272355403faf6ed1fc8243c7d199e022e9c1bb7e756d6dc2c93a1730f48347d0c1f0ab05e0d3dca7eed7ba7bcbf1c16ac794 SHA512 8a5809684cd4997da8b5cf2db644f220e3688bcb0ba3bfa6c358e74fc950caec9ddafa78eab4369c64d39d8b7512f49a58954643790a8e4c40c54cccb2680a80 +DIST gerbera-1.4.0.tar.gz 2896853 BLAKE2B 52271c67170a1dd20a35959dd24f52bdef1fbb4653ecf8b77e9b2aea6c7943249bc4c7c633312129e8318fd7d249c8513f2f808b68309518d5ba78cc8e3569e5 SHA512 989716bc60bc7e171448e18aff58d8f17dbbed28ca31cfeaa7dc0e6f1cb646da88041deff6481e15ba398090a01f07e00f74b12e84c423b7ca5b82eb97b918cd diff --git a/net-misc/gerbera/gerbera-1.2.0-r1.ebuild b/net-misc/gerbera/gerbera-1.2.0-r1.ebuild deleted file mode 100644 index c3f775019bb..00000000000 --- a/net-misc/gerbera/gerbera-1.2.0-r1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils eutils linux-info systemd tmpfiles user - -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 (Based on MediaTomb)" -HOMEPAGE="https://github.com/gerbera/gerbera"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib" - -DEPEND=" - !!net-misc/mediatomb - >=net-libs/libupnp-1.8.3[ipv6,reuseaddr] - >=dev-db/sqlite-3 - dev-libs/expat - 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? ( - libav? ( >=media-video/libav-10:0= ) - !libav? ( >=media-video/ffmpeg-2.2:0= ) - ) - ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) - curl? ( net-misc/curl net-misc/youtube-dl ) - magic? ( sys-apps/file ) - sys-apps/util-linux - sys-libs/zlib - virtual/libiconv -" -RDEPEND="${DEPEND}" - -CONFIG_CHECK="~INOTIFY_USER" - -pkg_setup() { - linux-info_pkg_setup - - enewgroup ${PN} - enewuser ${PN} -1 -1 /dev/null ${PN} -} - -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_MYSQL="$(usex mysql)" - -DWITH_PROTOCOL_EXTENSIONS="$(usex protocol-extensions)" \ - -DWITH_SYSTEMD="$(usex systemd)" \ - -DWITH_TAGLIB="$(usex taglib)" \ - -DWITH_INOTIFY=1 - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_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.0.0.config" config.xml - fperms 0640 /etc/${PN}/config.xml - fowners root:gerbera /etc/${PN}/config.xml - - keepdir /var/lib/${PN} - fowners ${PN}:${PN} /var/lib/${PN} -} - -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-1.3.5.ebuild b/net-misc/gerbera/gerbera-1.4.0.ebuild similarity index 76% rename from net-misc/gerbera/gerbera-1.3.5.ebuild rename to net-misc/gerbera/gerbera-1.4.0.ebuild index 1b1129c4725..122b20de3f6 100644 --- a/net-misc/gerbera/gerbera-1.3.5.ebuild +++ b/net-misc/gerbera/gerbera-1.4.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils eutils linux-info systemd tmpfiles user +inherit cmake eutils linux-info systemd tmpfiles if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/gerbera/${PN}.git"; @@ -16,16 +16,16 @@ else S="${WORKDIR}/${P}" fi -DESCRIPTION="UPnP Media Server (Based on MediaTomb)" -HOMEPAGE="https://github.com/gerbera/gerbera"; +DESCRIPTION="UPnP Media Server" +HOMEPAGE="https://gerbera.io"; LICENSE="GPL-2" SLOT="0" -IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib" +IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic +matroska mysql systemd +taglib" DEPEND=" - !!net-misc/mediatomb - >=net-libs/libupnp-1.8.3[ipv6,reuseaddr] + acct-user/gerbera + >=net-libs/libupnp-1.8.3:=[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( dev-db/mysql-connector-c ) @@ -41,6 +41,7 @@ DEPEND=" ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) + matroska? ( media-libs/libmatroska ) sys-apps/util-linux sys-libs/zlib virtual/libiconv @@ -49,13 +50,6 @@ RDEPEND="${DEPEND}" CONFIG_CHECK="~INOTIFY_USER" -pkg_setup() { - linux-info_pkg_setup - - enewgroup ${PN} - enewuser ${PN} -1 -1 /dev/null ${PN} -} - src_configure() { local mycmakeargs=( -DWITH_CURL="$(usex curl)" \ @@ -67,18 +61,18 @@ src_configure() { -DWITH_JS="$(usex javascript)" \ -DWITH_LASTFM="$(usex lastfm)" \ -DWITH_MAGIC="$(usex magic)" \ + -DWITH_MATROSKA="$(usex matroska)" \ -DWITH_MYSQL="$(usex mysql)" - -DWITH_PROTOCOL_EXTENSIONS="$(usex protocol-extensions)" \ -DWITH_SYSTEMD="$(usex systemd)" \ -DWITH_TAGLIB="$(usex taglib)" \ -DWITH_INOTIFY=1 ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}" newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}" @@ -87,9 +81,6 @@ src_install() { newins "${FILESDIR}/${PN}-1.3.0.config" config.xml fperms 0640 /etc/${PN}/config.xml fowners root:gerbera /etc/${PN}/config.xml - - keepdir /var/lib/${PN} - fowners ${PN}:${PN} /var/lib/${PN} } pkg_postinst() { diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild index 1b1129c4725..122b20de3f6 100644 --- a/net-misc/gerbera/gerbera-9999.ebuild +++ b/net-misc/gerbera/gerbera-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils eutils linux-info systemd tmpfiles user +inherit cmake eutils linux-info systemd tmpfiles if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/gerbera/${PN}.git"; @@ -16,16 +16,16 @@ else S="${WORKDIR}/${P}" fi -DESCRIPTION="UPnP Media Server (Based on MediaTomb)" -HOMEPAGE="https://github.com/gerbera/gerbera"; +DESCRIPTION="UPnP Media Server" +HOMEPAGE="https://gerbera.io"; LICENSE="GPL-2" SLOT="0" -IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib" +IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic +matroska mysql systemd +taglib" DEPEND=" - !!net-misc/mediatomb - >=net-libs/libupnp-1.8.3[ipv6,reuseaddr] + acct-user/gerbera + >=net-libs/libupnp-1.8.3:=[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( dev-db/mysql-connector-c ) @@ -41,6 +41,7 @@ DEPEND=" ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) + matroska? ( media-libs/libmatroska ) sys-apps/util-linux sys-libs/zlib virtual/libiconv @@ -49,13 +50,6 @@ RDEPEND="${DEPEND}" CONFIG_CHECK="~INOTIFY_USER" -pkg_setup() { - linux-info_pkg_setup - - enewgroup ${PN} - enewuser ${PN} -1 -1 /dev/null ${PN} -} - src_configure() { local mycmakeargs=( -DWITH_CURL="$(usex curl)" \ @@ -67,18 +61,18 @@ src_configure() { -DWITH_JS="$(usex javascript)" \ -DWITH_LASTFM="$(usex lastfm)" \ -DWITH_MAGIC="$(usex magic)" \ + -DWITH_MATROSKA="$(usex matroska)" \ -DWITH_MYSQL="$(usex mysql)" - -DWITH_PROTOCOL_EXTENSIONS="$(usex protocol-extensions)" \ -DWITH_SYSTEMD="$(usex systemd)" \ -DWITH_TAGLIB="$(usex taglib)" \ -DWITH_INOTIFY=1 ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}" newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}" @@ -87,9 +81,6 @@ src_install() { newins "${FILESDIR}/${PN}-1.3.0.config" config.xml fperms 0640 /etc/${PN}/config.xml fowners root:gerbera /etc/${PN}/config.xml - - keepdir /var/lib/${PN} - fowners ${PN}:${PN} /var/lib/${PN} } pkg_postinst() { diff --git a/net-misc/gerbera/metadata.xml b/net-misc/gerbera/metadata.xml index 2ea8b3e052b..81ff4d9fecf 100644 --- a/net-misc/gerbera/metadata.xml +++ b/net-misc/gerbera/metadata.xml @@ -11,8 +11,7 @@ <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="protocol-extensions">Enable partial DLNA 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>
