[gentoo-commits] repo/gentoo:master commit in: net-misc/gerbera/

["Ian Whyman" <thev00d00@gentoo.org>]

commit:     9e4b693a9ba8ab129141a352fe7d4a31fa63361e
Author:     Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 30 15:34:22 2017 +0000
Commit:     Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
CommitDate: Sat Sep 30 15:34:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e4b693a

net-misc/gerbera: Version bump

Fixes 632486

Package-Manager: Portage-2.3.10, Repoman-2.3.3

 net-misc/gerbera/Manifest                                          | 2 +-
 net-misc/gerbera/{gerbera-1.0.0-r2.ebuild => gerbera-1.1.0.ebuild} | 6 ++----
 net-misc/gerbera/gerbera-9999.ebuild                               | 6 ++----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index a0e6539fedc..a8e50e601fa 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -1 +1 @@
-DIST gerbera-1.0.0.tar.gz 805102 SHA256 297c26e0b4223ea96cc6db403e2a2e8f81c51b64284535f3bc644abf24f66975 SHA512 ddc269ce65ba6cd4778c3a7d7dd7f368d659e2813cee962ed167e1ab5a887d8dae32c0197e95733a799c2bb4835904c94f11e1411d4dfab4ed05f39519d4f42d WHIRLPOOL fc568d3e0c58b415b4cfe45a36418c821afcd3909dfd08a99c4ace1c8995d51ea8f7a8f90e13858d60605d5c8ab6aa08b1cb2a10cb02133cef45bfdc2d320ec0
+DIST gerbera-1.1.0.tar.gz 1308827 SHA256 225247e94983d24d50c0877cd7c9ef1e013091f2ec43fac7e2a3c3b82c11d5bd SHA512 975b6f2f5d7538d94eec55ef76467be6b2c94e78cc1735c364053f1cc08dc3b59f8d1c8987dbef3b8fc82896c433f69228d713f03addce5f3ddc643fe4c05d8b WHIRLPOOL 876625f2669dd32dd67e88bc60ca98e216f6bf01f3729d8a629e42f6871c69f53dbc62fdce9b9ea98aecc77a5f4fe1da17530586227546c6929ae762c9ecb49a

diff --git a/net-misc/gerbera/gerbera-1.0.0-r2.ebuild b/net-misc/gerbera/gerbera-1.1.0.ebuild
similarity index 94%
rename from net-misc/gerbera/gerbera-1.0.0-r2.ebuild
rename to net-misc/gerbera/gerbera-1.1.0.ebuild
index 98b91521521..86fe0131d52 100644
--- a/net-misc/gerbera/gerbera-1.0.0-r2.ebuild
+++ b/net-misc/gerbera/gerbera-1.1.0.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://github.com/v00d00/gerbera"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="curl debug +exif +ffmpeg +javascript lastfm libav +magic mysql +taglib"
+IUSE="curl debug +exif +ffmpeg +javascript lastfm libav +magic mysql systemd +taglib"
 
 DEPEND="
 	!!net-misc/mediatomb
@@ -65,6 +65,7 @@ src_configure() {
 		-DWITH_LASTFM="$(usex lastfm)" \
 		-DWITH_MAGIC="$(usex magic)" \
 		-DWITH_MYSQL="$(usex mysql)"
+		-DWITH_SYSTEMD="$(usex systemd)" \
 		-DWITH_TAGLIB="$(usex taglib)"
 	)
 
@@ -74,9 +75,6 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 
-	systemd_dounit "${S}/scripts/systemd/${PN}.service"
-	use mysql && systemd_dounit "${S}/scripts/systemd/${PN}-mysql.service"
-
 	newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}"
 	newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}"
 

diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
index 98b91521521..86fe0131d52 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://github.com/v00d00/gerbera"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="curl debug +exif +ffmpeg +javascript lastfm libav +magic mysql +taglib"
+IUSE="curl debug +exif +ffmpeg +javascript lastfm libav +magic mysql systemd +taglib"
 
 DEPEND="
 	!!net-misc/mediatomb
@@ -65,6 +65,7 @@ src_configure() {
 		-DWITH_LASTFM="$(usex lastfm)" \
 		-DWITH_MAGIC="$(usex magic)" \
 		-DWITH_MYSQL="$(usex mysql)"
+		-DWITH_SYSTEMD="$(usex systemd)" \
 		-DWITH_TAGLIB="$(usex taglib)"
 	)
 
@@ -74,9 +75,6 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 
-	systemd_dounit "${S}/scripts/systemd/${PN}.service"
-	use mysql && systemd_dounit "${S}/scripts/systemd/${PN}-mysql.service"
-
 	newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}"
 	newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}"