Gentoo Archives: gentoo-commits

From: Ian Whyman <thev00d00@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/gerbera/
Date: Sat, 30 Sep 2017 15:34:52
Message-Id: 1506785683.9e4b693a9ba8ab129141a352fe7d4a31fa63361e.thev00d00@gentoo
1 commit: 9e4b693a9ba8ab129141a352fe7d4a31fa63361e
2 Author: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 30 15:34:22 2017 +0000
4 Commit: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 30 15:34:43 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e4b693a
7
8 net-misc/gerbera: Version bump
9
10 Fixes 632486
11
12 Package-Manager: Portage-2.3.10, Repoman-2.3.3
13
14 net-misc/gerbera/Manifest | 2 +-
15 net-misc/gerbera/{gerbera-1.0.0-r2.ebuild => gerbera-1.1.0.ebuild} | 6 ++----
16 net-misc/gerbera/gerbera-9999.ebuild | 6 ++----
17 3 files changed, 5 insertions(+), 9 deletions(-)
18
19 diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
20 index a0e6539fedc..a8e50e601fa 100644
21 --- a/net-misc/gerbera/Manifest
22 +++ b/net-misc/gerbera/Manifest
23 @@ -1 +1 @@
24 -DIST gerbera-1.0.0.tar.gz 805102 SHA256 297c26e0b4223ea96cc6db403e2a2e8f81c51b64284535f3bc644abf24f66975 SHA512 ddc269ce65ba6cd4778c3a7d7dd7f368d659e2813cee962ed167e1ab5a887d8dae32c0197e95733a799c2bb4835904c94f11e1411d4dfab4ed05f39519d4f42d WHIRLPOOL fc568d3e0c58b415b4cfe45a36418c821afcd3909dfd08a99c4ace1c8995d51ea8f7a8f90e13858d60605d5c8ab6aa08b1cb2a10cb02133cef45bfdc2d320ec0
25 +DIST gerbera-1.1.0.tar.gz 1308827 SHA256 225247e94983d24d50c0877cd7c9ef1e013091f2ec43fac7e2a3c3b82c11d5bd SHA512 975b6f2f5d7538d94eec55ef76467be6b2c94e78cc1735c364053f1cc08dc3b59f8d1c8987dbef3b8fc82896c433f69228d713f03addce5f3ddc643fe4c05d8b WHIRLPOOL 876625f2669dd32dd67e88bc60ca98e216f6bf01f3729d8a629e42f6871c69f53dbc62fdce9b9ea98aecc77a5f4fe1da17530586227546c6929ae762c9ecb49a
26
27 diff --git a/net-misc/gerbera/gerbera-1.0.0-r2.ebuild b/net-misc/gerbera/gerbera-1.1.0.ebuild
28 similarity index 94%
29 rename from net-misc/gerbera/gerbera-1.0.0-r2.ebuild
30 rename to net-misc/gerbera/gerbera-1.1.0.ebuild
31 index 98b91521521..86fe0131d52 100644
32 --- a/net-misc/gerbera/gerbera-1.0.0-r2.ebuild
33 +++ b/net-misc/gerbera/gerbera-1.1.0.ebuild
34 @@ -21,7 +21,7 @@ HOMEPAGE="https://github.com/v00d00/gerbera"
35
36 LICENSE="GPL-2"
37 SLOT="0"
38 -IUSE="curl debug +exif +ffmpeg +javascript lastfm libav +magic mysql +taglib"
39 +IUSE="curl debug +exif +ffmpeg +javascript lastfm libav +magic mysql systemd +taglib"
40
41 DEPEND="
42 !!net-misc/mediatomb
43 @@ -65,6 +65,7 @@ src_configure() {
44 -DWITH_LASTFM="$(usex lastfm)" \
45 -DWITH_MAGIC="$(usex magic)" \
46 -DWITH_MYSQL="$(usex mysql)"
47 + -DWITH_SYSTEMD="$(usex systemd)" \
48 -DWITH_TAGLIB="$(usex taglib)"
49 )
50
51 @@ -74,9 +75,6 @@ src_configure() {
52 src_install() {
53 cmake-utils_src_install
54
55 - systemd_dounit "${S}/scripts/systemd/${PN}.service"
56 - use mysql && systemd_dounit "${S}/scripts/systemd/${PN}-mysql.service"
57 -
58 newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}"
59 newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}"
60
61
62 diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
63 index 98b91521521..86fe0131d52 100644
64 --- a/net-misc/gerbera/gerbera-9999.ebuild
65 +++ b/net-misc/gerbera/gerbera-9999.ebuild
66 @@ -21,7 +21,7 @@ HOMEPAGE="https://github.com/v00d00/gerbera"
67
68 LICENSE="GPL-2"
69 SLOT="0"
70 -IUSE="curl debug +exif +ffmpeg +javascript lastfm libav +magic mysql +taglib"
71 +IUSE="curl debug +exif +ffmpeg +javascript lastfm libav +magic mysql systemd +taglib"
72
73 DEPEND="
74 !!net-misc/mediatomb
75 @@ -65,6 +65,7 @@ src_configure() {
76 -DWITH_LASTFM="$(usex lastfm)" \
77 -DWITH_MAGIC="$(usex magic)" \
78 -DWITH_MYSQL="$(usex mysql)"
79 + -DWITH_SYSTEMD="$(usex systemd)" \
80 -DWITH_TAGLIB="$(usex taglib)"
81 )
82
83 @@ -74,9 +75,6 @@ src_configure() {
84 src_install() {
85 cmake-utils_src_install
86
87 - systemd_dounit "${S}/scripts/systemd/${PN}.service"
88 - use mysql && systemd_dounit "${S}/scripts/systemd/${PN}-mysql.service"
89 -
90 newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}"
91 newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}"