| 1 |
commit: 62161903c542cbd02fa42f84cd640d50e5b039ec |
| 2 |
Author: Ian Whyman <thev00d00 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 29 21:22:35 2020 +0000 |
| 4 |
Commit: Ian Whyman <thev00d00 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 29 21:22:48 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62161903 |
| 7 |
|
| 8 |
net-misc/gerbera: Version Bump, EAPI 7, GLEP 81 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/701236 |
| 11 |
Package-Manager: Portage-2.3.85, Repoman-2.3.20 |
| 12 |
Signed-off-by: Ian Whyman <thev00d00 <AT> gentoo.org> |
| 13 |
|
| 14 |
net-misc/gerbera/Manifest | 3 +- |
| 15 |
net-misc/gerbera/gerbera-1.2.0-r1.ebuild | 101 --------------------- |
| 16 |
.../{gerbera-1.3.5.ebuild => gerbera-1.4.0.ebuild} | 33 +++---- |
| 17 |
net-misc/gerbera/gerbera-9999.ebuild | 33 +++---- |
| 18 |
net-misc/gerbera/metadata.xml | 3 +- |
| 19 |
5 files changed, 26 insertions(+), 147 deletions(-) |
| 20 |
|
| 21 |
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest |
| 22 |
index ce9babc8219..d49cd27e01d 100644 |
| 23 |
--- a/net-misc/gerbera/Manifest |
| 24 |
+++ b/net-misc/gerbera/Manifest |
| 25 |
@@ -1,2 +1 @@ |
| 26 |
-DIST gerbera-1.2.0.tar.gz 2910704 BLAKE2B b0d0f52dcfbcefe09d96e6b63a73005fb069176fb42af16cf9a4729742988d5c5a0b68109ab50b93ba65ec604c3ced7a827fb75300d6c3409bdde77e18346589 SHA512 5472136b0605e4cc9645219ab9fbe9ae4240a4b80f52fc611456cef0336a7eac8136448132f30fab04655d4bdb0f85f5a37e92e2830ec976f71c6b294935e1dc |
| 27 |
-DIST gerbera-1.3.5.tar.gz 2893767 BLAKE2B eb4be515a4a2a3d1f10b8bff5737272355403faf6ed1fc8243c7d199e022e9c1bb7e756d6dc2c93a1730f48347d0c1f0ab05e0d3dca7eed7ba7bcbf1c16ac794 SHA512 8a5809684cd4997da8b5cf2db644f220e3688bcb0ba3bfa6c358e74fc950caec9ddafa78eab4369c64d39d8b7512f49a58954643790a8e4c40c54cccb2680a80 |
| 28 |
+DIST gerbera-1.4.0.tar.gz 2896853 BLAKE2B 52271c67170a1dd20a35959dd24f52bdef1fbb4653ecf8b77e9b2aea6c7943249bc4c7c633312129e8318fd7d249c8513f2f808b68309518d5ba78cc8e3569e5 SHA512 989716bc60bc7e171448e18aff58d8f17dbbed28ca31cfeaa7dc0e6f1cb646da88041deff6481e15ba398090a01f07e00f74b12e84c423b7ca5b82eb97b918cd |
| 29 |
|
| 30 |
diff --git a/net-misc/gerbera/gerbera-1.2.0-r1.ebuild b/net-misc/gerbera/gerbera-1.2.0-r1.ebuild |
| 31 |
deleted file mode 100644 |
| 32 |
index c3f775019bb..00000000000 |
| 33 |
--- a/net-misc/gerbera/gerbera-1.2.0-r1.ebuild |
| 34 |
+++ /dev/null |
| 35 |
@@ -1,101 +0,0 @@ |
| 36 |
-# Copyright 1999-2019 Gentoo Authors |
| 37 |
-# Distributed under the terms of the GNU General Public License v2 |
| 38 |
- |
| 39 |
-EAPI=6 |
| 40 |
- |
| 41 |
-inherit cmake-utils eutils linux-info systemd tmpfiles user |
| 42 |
- |
| 43 |
-if [[ ${PV} == 9999 ]]; then |
| 44 |
- EGIT_REPO_URI="https://github.com/gerbera/${PN}.git" |
| 45 |
- KEYWORDS="" |
| 46 |
- SRC_URI="" |
| 47 |
- inherit git-r3 |
| 48 |
-else |
| 49 |
- SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 50 |
- KEYWORDS="~amd64 ~x86" |
| 51 |
- S="${WORKDIR}/${P}" |
| 52 |
-fi |
| 53 |
- |
| 54 |
-DESCRIPTION="UPnP Media Server (Based on MediaTomb)" |
| 55 |
-HOMEPAGE="https://github.com/gerbera/gerbera" |
| 56 |
- |
| 57 |
-LICENSE="GPL-2" |
| 58 |
-SLOT="0" |
| 59 |
-IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib" |
| 60 |
- |
| 61 |
-DEPEND=" |
| 62 |
- !!net-misc/mediatomb |
| 63 |
- >=net-libs/libupnp-1.8.3[ipv6,reuseaddr] |
| 64 |
- >=dev-db/sqlite-3 |
| 65 |
- dev-libs/expat |
| 66 |
- mysql? ( dev-db/mysql-connector-c ) |
| 67 |
- javascript? ( dev-lang/duktape ) |
| 68 |
- taglib? ( >=media-libs/taglib-1.11 ) |
| 69 |
- lastfm? ( >=media-libs/lastfmlib-0.4 ) |
| 70 |
- exif? ( media-libs/libexif ) |
| 71 |
- exiv2? ( media-gfx/exiv2 ) |
| 72 |
- ffmpeg? ( |
| 73 |
- libav? ( >=media-video/libav-10:0= ) |
| 74 |
- !libav? ( >=media-video/ffmpeg-2.2:0= ) |
| 75 |
- ) |
| 76 |
- ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) |
| 77 |
- curl? ( net-misc/curl net-misc/youtube-dl ) |
| 78 |
- magic? ( sys-apps/file ) |
| 79 |
- sys-apps/util-linux |
| 80 |
- sys-libs/zlib |
| 81 |
- virtual/libiconv |
| 82 |
-" |
| 83 |
-RDEPEND="${DEPEND}" |
| 84 |
- |
| 85 |
-CONFIG_CHECK="~INOTIFY_USER" |
| 86 |
- |
| 87 |
-pkg_setup() { |
| 88 |
- linux-info_pkg_setup |
| 89 |
- |
| 90 |
- enewgroup ${PN} |
| 91 |
- enewuser ${PN} -1 -1 /dev/null ${PN} |
| 92 |
-} |
| 93 |
- |
| 94 |
-src_configure() { |
| 95 |
- local mycmakeargs=( |
| 96 |
- -DWITH_CURL="$(usex curl)" \ |
| 97 |
- -DWITH_DEBUG="$(usex debug)" \ |
| 98 |
- -DWITH_EXIF="$(usex exif)" \ |
| 99 |
- -DWITH_EXIV2="$(usex exiv2)" \ |
| 100 |
- -DWITH_AVCODEC="$(usex ffmpeg)" \ |
| 101 |
- -DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \ |
| 102 |
- -DWITH_JS="$(usex javascript)" \ |
| 103 |
- -DWITH_LASTFM="$(usex lastfm)" \ |
| 104 |
- -DWITH_MAGIC="$(usex magic)" \ |
| 105 |
- -DWITH_MYSQL="$(usex mysql)" |
| 106 |
- -DWITH_PROTOCOL_EXTENSIONS="$(usex protocol-extensions)" \ |
| 107 |
- -DWITH_SYSTEMD="$(usex systemd)" \ |
| 108 |
- -DWITH_TAGLIB="$(usex taglib)" \ |
| 109 |
- -DWITH_INOTIFY=1 |
| 110 |
- ) |
| 111 |
- |
| 112 |
- cmake-utils_src_configure |
| 113 |
-} |
| 114 |
- |
| 115 |
-src_install() { |
| 116 |
- cmake-utils_src_install |
| 117 |
- |
| 118 |
- newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}" |
| 119 |
- newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}" |
| 120 |
- |
| 121 |
- insinto /etc/${PN} |
| 122 |
- newins "${FILESDIR}/${PN}-1.0.0.config" config.xml |
| 123 |
- fperms 0640 /etc/${PN}/config.xml |
| 124 |
- fowners root:gerbera /etc/${PN}/config.xml |
| 125 |
- |
| 126 |
- keepdir /var/lib/${PN} |
| 127 |
- fowners ${PN}:${PN} /var/lib/${PN} |
| 128 |
-} |
| 129 |
- |
| 130 |
-pkg_postinst() { |
| 131 |
- if use mysql ; then |
| 132 |
- elog "Gerbera has been built with MySQL support and needs" |
| 133 |
- elog "to be configured before being started. By default" |
| 134 |
- elog "SQLite will be used." |
| 135 |
- fi |
| 136 |
-} |
| 137 |
|
| 138 |
diff --git a/net-misc/gerbera/gerbera-1.3.5.ebuild b/net-misc/gerbera/gerbera-1.4.0.ebuild |
| 139 |
similarity index 76% |
| 140 |
rename from net-misc/gerbera/gerbera-1.3.5.ebuild |
| 141 |
rename to net-misc/gerbera/gerbera-1.4.0.ebuild |
| 142 |
index 1b1129c4725..122b20de3f6 100644 |
| 143 |
--- a/net-misc/gerbera/gerbera-1.3.5.ebuild |
| 144 |
+++ b/net-misc/gerbera/gerbera-1.4.0.ebuild |
| 145 |
@@ -1,9 +1,9 @@ |
| 146 |
-# Copyright 1999-2019 Gentoo Authors |
| 147 |
+# Copyright 1999-2020 Gentoo Authors |
| 148 |
# Distributed under the terms of the GNU General Public License v2 |
| 149 |
|
| 150 |
-EAPI=6 |
| 151 |
+EAPI=7 |
| 152 |
|
| 153 |
-inherit cmake-utils eutils linux-info systemd tmpfiles user |
| 154 |
+inherit cmake eutils linux-info systemd tmpfiles |
| 155 |
|
| 156 |
if [[ ${PV} == 9999 ]]; then |
| 157 |
EGIT_REPO_URI="https://github.com/gerbera/${PN}.git" |
| 158 |
@@ -16,16 +16,16 @@ else |
| 159 |
S="${WORKDIR}/${P}" |
| 160 |
fi |
| 161 |
|
| 162 |
-DESCRIPTION="UPnP Media Server (Based on MediaTomb)" |
| 163 |
-HOMEPAGE="https://github.com/gerbera/gerbera" |
| 164 |
+DESCRIPTION="UPnP Media Server" |
| 165 |
+HOMEPAGE="https://gerbera.io" |
| 166 |
|
| 167 |
LICENSE="GPL-2" |
| 168 |
SLOT="0" |
| 169 |
-IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib" |
| 170 |
+IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic +matroska mysql systemd +taglib" |
| 171 |
|
| 172 |
DEPEND=" |
| 173 |
- !!net-misc/mediatomb |
| 174 |
- >=net-libs/libupnp-1.8.3[ipv6,reuseaddr] |
| 175 |
+ acct-user/gerbera |
| 176 |
+ >=net-libs/libupnp-1.8.3:=[ipv6,reuseaddr] |
| 177 |
>=dev-db/sqlite-3 |
| 178 |
dev-libs/expat |
| 179 |
mysql? ( dev-db/mysql-connector-c ) |
| 180 |
@@ -41,6 +41,7 @@ DEPEND=" |
| 181 |
ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) |
| 182 |
curl? ( net-misc/curl net-misc/youtube-dl ) |
| 183 |
magic? ( sys-apps/file ) |
| 184 |
+ matroska? ( media-libs/libmatroska ) |
| 185 |
sys-apps/util-linux |
| 186 |
sys-libs/zlib |
| 187 |
virtual/libiconv |
| 188 |
@@ -49,13 +50,6 @@ RDEPEND="${DEPEND}" |
| 189 |
|
| 190 |
CONFIG_CHECK="~INOTIFY_USER" |
| 191 |
|
| 192 |
-pkg_setup() { |
| 193 |
- linux-info_pkg_setup |
| 194 |
- |
| 195 |
- enewgroup ${PN} |
| 196 |
- enewuser ${PN} -1 -1 /dev/null ${PN} |
| 197 |
-} |
| 198 |
- |
| 199 |
src_configure() { |
| 200 |
local mycmakeargs=( |
| 201 |
-DWITH_CURL="$(usex curl)" \ |
| 202 |
@@ -67,18 +61,18 @@ src_configure() { |
| 203 |
-DWITH_JS="$(usex javascript)" \ |
| 204 |
-DWITH_LASTFM="$(usex lastfm)" \ |
| 205 |
-DWITH_MAGIC="$(usex magic)" \ |
| 206 |
+ -DWITH_MATROSKA="$(usex matroska)" \ |
| 207 |
-DWITH_MYSQL="$(usex mysql)" |
| 208 |
- -DWITH_PROTOCOL_EXTENSIONS="$(usex protocol-extensions)" \ |
| 209 |
-DWITH_SYSTEMD="$(usex systemd)" \ |
| 210 |
-DWITH_TAGLIB="$(usex taglib)" \ |
| 211 |
-DWITH_INOTIFY=1 |
| 212 |
) |
| 213 |
|
| 214 |
- cmake-utils_src_configure |
| 215 |
+ cmake_src_configure |
| 216 |
} |
| 217 |
|
| 218 |
src_install() { |
| 219 |
- cmake-utils_src_install |
| 220 |
+ cmake_src_install |
| 221 |
|
| 222 |
newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}" |
| 223 |
newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}" |
| 224 |
@@ -87,9 +81,6 @@ src_install() { |
| 225 |
newins "${FILESDIR}/${PN}-1.3.0.config" config.xml |
| 226 |
fperms 0640 /etc/${PN}/config.xml |
| 227 |
fowners root:gerbera /etc/${PN}/config.xml |
| 228 |
- |
| 229 |
- keepdir /var/lib/${PN} |
| 230 |
- fowners ${PN}:${PN} /var/lib/${PN} |
| 231 |
} |
| 232 |
|
| 233 |
pkg_postinst() { |
| 234 |
|
| 235 |
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild |
| 236 |
index 1b1129c4725..122b20de3f6 100644 |
| 237 |
--- a/net-misc/gerbera/gerbera-9999.ebuild |
| 238 |
+++ b/net-misc/gerbera/gerbera-9999.ebuild |
| 239 |
@@ -1,9 +1,9 @@ |
| 240 |
-# Copyright 1999-2019 Gentoo Authors |
| 241 |
+# Copyright 1999-2020 Gentoo Authors |
| 242 |
# Distributed under the terms of the GNU General Public License v2 |
| 243 |
|
| 244 |
-EAPI=6 |
| 245 |
+EAPI=7 |
| 246 |
|
| 247 |
-inherit cmake-utils eutils linux-info systemd tmpfiles user |
| 248 |
+inherit cmake eutils linux-info systemd tmpfiles |
| 249 |
|
| 250 |
if [[ ${PV} == 9999 ]]; then |
| 251 |
EGIT_REPO_URI="https://github.com/gerbera/${PN}.git" |
| 252 |
@@ -16,16 +16,16 @@ else |
| 253 |
S="${WORKDIR}/${P}" |
| 254 |
fi |
| 255 |
|
| 256 |
-DESCRIPTION="UPnP Media Server (Based on MediaTomb)" |
| 257 |
-HOMEPAGE="https://github.com/gerbera/gerbera" |
| 258 |
+DESCRIPTION="UPnP Media Server" |
| 259 |
+HOMEPAGE="https://gerbera.io" |
| 260 |
|
| 261 |
LICENSE="GPL-2" |
| 262 |
SLOT="0" |
| 263 |
-IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib" |
| 264 |
+IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic +matroska mysql systemd +taglib" |
| 265 |
|
| 266 |
DEPEND=" |
| 267 |
- !!net-misc/mediatomb |
| 268 |
- >=net-libs/libupnp-1.8.3[ipv6,reuseaddr] |
| 269 |
+ acct-user/gerbera |
| 270 |
+ >=net-libs/libupnp-1.8.3:=[ipv6,reuseaddr] |
| 271 |
>=dev-db/sqlite-3 |
| 272 |
dev-libs/expat |
| 273 |
mysql? ( dev-db/mysql-connector-c ) |
| 274 |
@@ -41,6 +41,7 @@ DEPEND=" |
| 275 |
ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) |
| 276 |
curl? ( net-misc/curl net-misc/youtube-dl ) |
| 277 |
magic? ( sys-apps/file ) |
| 278 |
+ matroska? ( media-libs/libmatroska ) |
| 279 |
sys-apps/util-linux |
| 280 |
sys-libs/zlib |
| 281 |
virtual/libiconv |
| 282 |
@@ -49,13 +50,6 @@ RDEPEND="${DEPEND}" |
| 283 |
|
| 284 |
CONFIG_CHECK="~INOTIFY_USER" |
| 285 |
|
| 286 |
-pkg_setup() { |
| 287 |
- linux-info_pkg_setup |
| 288 |
- |
| 289 |
- enewgroup ${PN} |
| 290 |
- enewuser ${PN} -1 -1 /dev/null ${PN} |
| 291 |
-} |
| 292 |
- |
| 293 |
src_configure() { |
| 294 |
local mycmakeargs=( |
| 295 |
-DWITH_CURL="$(usex curl)" \ |
| 296 |
@@ -67,18 +61,18 @@ src_configure() { |
| 297 |
-DWITH_JS="$(usex javascript)" \ |
| 298 |
-DWITH_LASTFM="$(usex lastfm)" \ |
| 299 |
-DWITH_MAGIC="$(usex magic)" \ |
| 300 |
+ -DWITH_MATROSKA="$(usex matroska)" \ |
| 301 |
-DWITH_MYSQL="$(usex mysql)" |
| 302 |
- -DWITH_PROTOCOL_EXTENSIONS="$(usex protocol-extensions)" \ |
| 303 |
-DWITH_SYSTEMD="$(usex systemd)" \ |
| 304 |
-DWITH_TAGLIB="$(usex taglib)" \ |
| 305 |
-DWITH_INOTIFY=1 |
| 306 |
) |
| 307 |
|
| 308 |
- cmake-utils_src_configure |
| 309 |
+ cmake_src_configure |
| 310 |
} |
| 311 |
|
| 312 |
src_install() { |
| 313 |
- cmake-utils_src_install |
| 314 |
+ cmake_src_install |
| 315 |
|
| 316 |
newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}" |
| 317 |
newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}" |
| 318 |
@@ -87,9 +81,6 @@ src_install() { |
| 319 |
newins "${FILESDIR}/${PN}-1.3.0.config" config.xml |
| 320 |
fperms 0640 /etc/${PN}/config.xml |
| 321 |
fowners root:gerbera /etc/${PN}/config.xml |
| 322 |
- |
| 323 |
- keepdir /var/lib/${PN} |
| 324 |
- fowners ${PN}:${PN} /var/lib/${PN} |
| 325 |
} |
| 326 |
|
| 327 |
pkg_postinst() { |
| 328 |
|
| 329 |
diff --git a/net-misc/gerbera/metadata.xml b/net-misc/gerbera/metadata.xml |
| 330 |
index 2ea8b3e052b..81ff4d9fecf 100644 |
| 331 |
--- a/net-misc/gerbera/metadata.xml |
| 332 |
+++ b/net-misc/gerbera/metadata.xml |
| 333 |
@@ -11,8 +11,7 @@ |
| 334 |
<flag name="exiv2">Use <pkg>media-gfx/exiv2</pkg> to extract EXIF information</flag> |
| 335 |
<flag name="ffmpegthumbnailer">Enable video thumbnail support with <pkg>media-video/ffmpegthumbnailer</pkg></flag> |
| 336 |
<flag name="lastfm">Enable last.fm support</flag> |
| 337 |
- <flag name="mysql">Use <pkg>dev-db/mysql</pkg> as backend rather than SQLite3</flag> |
| 338 |
- <flag name="protocol-extensions">Enable partial DLNA support</flag> |
| 339 |
+ <flag name="mysql">Use <pkg>dev-db/mysql</pkg> as backend rather than SQLite3</flag> |
| 340 |
<flag name="taglib">Use <pkg>media-libs/taglib</pkg> for reading files' metadata</flag> |
| 341 |
</use> |
| 342 |
<upstream> |
Archives