gentoo resync : 07.04.2018

3 files changed, 11 insertions, 9 deletions

diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 769d4f88bf4f..5704e652a7c6 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -4,5 +4,5 @@ AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f
 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
 EBUILD gerbera-1.1.0-r1.ebuild 2568 BLAKE2B c9fefab7500b37b5e131e07aef0fd8bb0d1f42ada759732462d48ef24961521d96191b23468796eae11b81a52fe466bcd42c0e11f13368a027199b1b015228c0 SHA512 d06efa376c453b02e2288de8e759a675242b8b9c2940f2155072c1abf3c8730f6a22fbd5c4654600a18ca5f0ef1284dcafc8a94e9d2cab1aa53f5ecf7c53fcf5
-EBUILD gerbera-9999.ebuild 2508 BLAKE2B e283d466b40434f1613ff0677ea80de1c80b000812a02c8cda6a879b2a8df61f5dbec72527a72383c92e03756adfaf7f60b8ec347b514d53b571b26bdaeb63f5 SHA512 053d702146225c24421d8d83466121996997917a7bd2dd462304ad6fbe488b6fd03a609712dd46e9bd8a4ec803702323ae0e3fc508b84a71757bfe6966ff7963
-MISC metadata.xml 1154 BLAKE2B 460042ab99add3291902174f2e8623505be246a191cec1792afed2c385ea47c2ba42c5bf3dd01aca0ee9d73c192bff5e501b8f7c46652e2378ae4f1574750f27 SHA512 3048a14a5414888be83baade4f1961161cd07097aa9574cd60225d54001d35df4bac8855c10ca529595baa82fd6137b310f64aff79af3057495b16fcd6cfd558
+EBUILD gerbera-9999.ebuild 2546 BLAKE2B e4aa8ba229f02ce99a5919efa5067b2949f46c2d1bc3550283d705789c1556746373a67650c68aec53726161d3bc8148833451cb40bb9fc5cda8d5965a311684 SHA512 40ec0a3190befc41b40a92a45971d9ced41cb76ea51719118a63ad7b557c5cc6c80e4d532b7198edcbc2a8d6aae75b780d6aabb70e43efe60bb04ee188ea8f26
+MISC metadata.xml 1209 BLAKE2B b724abc66f5a3111c66a94331e61f9a50ae67344dab4695e7fc68154ddc9843e0295c7a12438e342be409b9429a4f9c60abce02422594df708d7933521bf9673 SHA512 c91dddacee6beab0a3cec3ab317810f77d3715a84384ceeafd3bdc872fff6d352d6bd4312d8194b59a159604794b0197780db6c27b20a327afa1e7bb9cba6a26
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
index 7f6f95dd5c36..50806deadb0c 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ 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"
+IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib"
 
 DEPEND="
 	!!net-misc/mediatomb
@@ -33,6 +33,7 @@ DEPEND="
 	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= )
@@ -58,9 +59,9 @@ pkg_setup() {
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_CURL="$(usex curl)" \
-		-DWITH_LOGGING=1 \
-		-DWITH_DEBUG_LOGGING="$(usex debug)" \
+		-DWITH_DEBUG="$(usex debug)" \
 		-DWITH_EXIF="$(usex exif)" \
+		-DWITH_EXIV2="$(usex exiv2)" \
 		-DWITH_AVCODEC="$(usex ffmpeg)" \
 		-DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \
 		-DWITH_JS="$(usex javascript)" \
diff --git a/net-misc/gerbera/metadata.xml b/net-misc/gerbera/metadata.xml
index 1c5747db8ebf..22d6ba3fd3c0 100644
--- a/net-misc/gerbera/metadata.xml
+++ b/net-misc/gerbera/metadata.xml
@@ -7,15 +7,16 @@
   </maintainer>
   <longdescription>Gerbera is a UPnP media server which allows you to stream your digital media through your home network and consume it on a variety of UPnP compatible devices.</longdescription>
   <use>
-    <flag name="curl">Support YouTube and external media sources (e.g. internet radio)</flag>
+    <flag name="curl">Support HTTP media sources (e.g. internet radio)</flag>
+    <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="magic">Use libmagic to determine file types</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="taglib">Use <pkg>media-libs/taglib</pkg> for reading files' metadata rather than id3lib</flag>
+    <flag name="taglib">Use <pkg>media-libs/taglib</pkg> for reading files' metadata</flag>
   </use>
   <upstream>
-    <remote-id type="github">v00d00/gerbera</remote-id>
+    <remote-id type="github">gerbera/gerbera</remote-id>
   </upstream>
 </pkgmetadata>