gentoo resync : 12.01.2019

4 files changed, 6 insertions, 110 deletions

diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 2c4362bd4ee9..065aae7f975c 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -2,9 +2,7 @@ AUX gerbera-1.0.0.confd 531 BLAKE2B 712304e55ec4f2be59fdfb7a03f8a52e173f44e6903e
 AUX gerbera-1.0.0.config 6164 BLAKE2B f16c1e32be600b778e6818267b76bff34a26653d8a8bb3958ff7096d95c96b225f679ceb3ffe306bb1b3a03c2300fa433c4edffd9cdd79fb2fac3ee2aa5621fc SHA512 5a4c44d71e7bb4f1e9be2de61ab831d6b8871ab432ed31b58799957e7812e23c382f81c32062c0db44712287643e495fd66e1fa214676df3e0b18d7e1bb2f23d
 AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d
 AUX gerbera-1.1.0-build-failure.patch 455 BLAKE2B f8c52b6d37b999f3ba6765fa61c732a8b5b00151a8b2dc4bb0292b39282e6cbc28b7348eca41b645fd95997731fa36cc628c8850d43366e048c91d57abcea079 SHA512 5def64f7d94b9005890d56b16385df8b78701fb139dbc379f29818413f4bea03eb1e2b87db0e4b4206b710d9e80f646061dd223f3370deced72667ece9b5f25d
-DIST gerbera-1.1.0.tar.gz 1308827 BLAKE2B bb8d59702fef7b1048cc11d19d5de73ad5d5ca92908831b3c0d7d075c2a3c00d94a6a6bb5f5ba45a6cf0ef688294d041e1b71ac98e19235bce0f050928a5f873 SHA512 975b6f2f5d7538d94eec55ef76467be6b2c94e78cc1735c364053f1cc08dc3b59f8d1c8987dbef3b8fc82896c433f69228d713f03addce5f3ddc643fe4c05d8b
 DIST gerbera-1.2.0.tar.gz 2910704 BLAKE2B b0d0f52dcfbcefe09d96e6b63a73005fb069176fb42af16cf9a4729742988d5c5a0b68109ab50b93ba65ec604c3ced7a827fb75300d6c3409bdde77e18346589 SHA512 5472136b0605e4cc9645219ab9fbe9ae4240a4b80f52fc611456cef0336a7eac8136448132f30fab04655d4bdb0f85f5a37e92e2830ec976f71c6b294935e1dc
-EBUILD gerbera-1.1.0-r1.ebuild 2568 BLAKE2B c9fefab7500b37b5e131e07aef0fd8bb0d1f42ada759732462d48ef24961521d96191b23468796eae11b81a52fe466bcd42c0e11f13368a027199b1b015228c0 SHA512 d06efa376c453b02e2288de8e759a675242b8b9c2940f2155072c1abf3c8730f6a22fbd5c4654600a18ca5f0ef1284dcafc8a94e9d2cab1aa53f5ecf7c53fcf5
-EBUILD gerbera-1.2.0-r1.ebuild 2550 BLAKE2B ee61c800fd3199a7ee85e6acd09b97ea4a2d0af54350df57ae757f042d0f985806db720edbbd24172e86117d93530f2d85b2564d0ed6857b526ab3b41e889074 SHA512 3e89539be06f7b0a735f8bbd7bd86d4241daebbd818ed6193a402466b85cfc80c498a7b9506c47222ad657182462717f1a914bc541e004000513c0559c55a97a
-EBUILD gerbera-9999.ebuild 2546 BLAKE2B e4aa8ba229f02ce99a5919efa5067b2949f46c2d1bc3550283d705789c1556746373a67650c68aec53726161d3bc8148833451cb40bb9fc5cda8d5965a311684 SHA512 40ec0a3190befc41b40a92a45971d9ced41cb76ea51719118a63ad7b557c5cc6c80e4d532b7198edcbc2a8d6aae75b780d6aabb70e43efe60bb04ee188ea8f26
+EBUILD gerbera-1.2.0-r1.ebuild 2558 BLAKE2B c5f81e11241cb74d63428c263cd0141d61a90f595f8c42ad4f2987d73f885ff6275b85f9ad772b8ff8862847119dd953206972ebe8461e659cf5bc9476b3da89 SHA512 57b790ea36d49c2ecff0116d0aa2e583a8a6bc9847e79396d93061156c06d2b9380f9725a543e4f1cd6f91574b6cd77c26fec65b77552308998b886f6f993495
+EBUILD gerbera-9999.ebuild 2554 BLAKE2B 24fbd4b31248cebce80d7732b5b3e884adfe72f83986e0d0b44f573ae856bc50170d3b253db0fb67848495bf44f1f1de389c389dbd84546a713f4da55d75fba3 SHA512 8082eab99d34aeb588f4ece501de7f45e8acd34eac5af3380053c81a1c96b97d768bba05301563f69b29b8e7e9ef74d56bb163542a6e4e5d3475952e3e51e086
 MISC metadata.xml 1209 BLAKE2B b724abc66f5a3111c66a94331e61f9a50ae67344dab4695e7fc68154ddc9843e0295c7a12438e342be409b9429a4f9c60abce02422594df708d7933521bf9673 SHA512 c91dddacee6beab0a3cec3ab317810f77d3715a84384ceeafd3bdc872fff6d352d6bd4312d8194b59a159604794b0197780db6c27b20a327afa1e7bb9cba6a26
diff --git a/net-misc/gerbera/gerbera-1.1.0-r1.ebuild b/net-misc/gerbera/gerbera-1.1.0-r1.ebuild
deleted file mode 100644
index efac2f23345f..000000000000
--- a/net-misc/gerbera/gerbera-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib"
-
-DEPEND="
-	!!net-misc/mediatomb
-	<=net-libs/libupnp-1.8.2:1.8[ipv6,reuseaddr]
-	>=dev-db/sqlite-3
-	dev-libs/expat
-	mysql? ( virtual/mysql )
-	javascript? ( dev-lang/duktape )
-	taglib? ( >=media-libs/taglib-1.11 )
-	lastfm? ( >=media-libs/lastfmlib-0.4 )
-	exif? ( media-libs/libexif )
-	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"
-
-PATCHES=( "${FILESDIR}/${P}-build-failure.patch" )
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /dev/null ${PN}
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_CURL="$(usex curl)" \
-		-DWITH_LOGGING=1 \
-		-DWITH_DEBUG_LOGGING="$(usex debug)" \
-		-DWITH_EXIF="$(usex exif)" \
-		-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.2.0-r1.ebuild b/net-misc/gerbera/gerbera-1.2.0-r1.ebuild
index 80b003ed0721..c3f775019bbf 100644
--- a/net-misc/gerbera/gerbera-1.2.0-r1.ebuild
+++ b/net-misc/gerbera/gerbera-1.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,7 @@ DEPEND="
 	>=net-libs/libupnp-1.8.3[ipv6,reuseaddr]
 	>=dev-db/sqlite-3
 	dev-libs/expat
-	mysql? ( virtual/mysql )
+	mysql? ( dev-db/mysql-connector-c )
 	javascript? ( dev-lang/duktape )
 	taglib? ( >=media-libs/taglib-1.11 )
 	lastfm? ( >=media-libs/lastfmlib-0.4 )
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
index 50806deadb0c..ff9299acd184 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,7 @@ DEPEND="
 	net-libs/libupnp:1.8[ipv6,reuseaddr]
 	>=dev-db/sqlite-3
 	dev-libs/expat
-	mysql? ( virtual/mysql )
+	mysql? ( dev-db/mysql-connector-c )
 	javascript? ( dev-lang/duktape )
 	taglib? ( >=media-libs/taglib-1.11 )
 	lastfm? ( >=media-libs/lastfmlib-0.4 )