gentoo resync : 22.01.2019

4 files changed, 8 insertions, 84 deletions

diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index 449cd522cd46..616e1c8127fa 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -1,7 +1,5 @@
-DIST cheese-3.26.0.tar.xz 1841856 BLAKE2B 302a4a12511866197df8cf62ec00ade122f2e5dc6a4adcb78cd252594b23373c328845179135e8ae44526432ec1b6b9a8c26d2808a533833221076be0496a591 SHA512 6fd58623ca257dff0a53b3577005a8b818b706f5c3da4eab51de9a7f6368847b4fe62885f3a7ba6350ac782cbee51c7b35a0c055bf11bb270934041b15388297
 DIST cheese-3.28.0.tar.xz 1544904 BLAKE2B cdad63b4175bb52c3a77ee5ed0058afdd8b5d509ef17b5931d2f01457b9ff327d3ad270ad963e3185c928ddc7203b00163137a789683669d3f8c39d5a9926da8 SHA512 c52b083b132a8c885df55def3d6bf96180fc93c8b7368f48412c8dd63e073a268ff0e86959a977bd8bf372a53e127419b96046d92cb3a96674f86cfb3477ceea
 DIST cheese-3.30.0.tar.xz 1546680 BLAKE2B 32cfc9553e1c9ebfe7d3eb5fdf19d74b49e9f69ea005f4c79097d69caa2125803c5c319e98ccd3e8f72157a5fd86c018f1be7af7045f6541ecd36d4162c5cdd1 SHA512 622910cedc8eadec4161f60e2bb3f02cbe11352b2431fdd9783f724b4119ffae6254b1566e1144c25491067f9c683a55eb85b265ef28992d852adce02fbdc8b4
-EBUILD cheese-3.26.0.ebuild 1891 BLAKE2B ec91cff21e7a455cb5f62392b3cbd81cafe267e35e6ceb7dde3a26eba6b3e8da9a532d8f79a0a6861fa182000b904297280523ae2e01f06bf120a4b4086ccc14 SHA512 b8ff632cc912151e425d53dfeae989ecc7a0f422244ed0fc9891ed689629eededc852ecb6705ccd8ac2d4b42291bfba872412ca5e0c9c1be638f0848f1c45723
-EBUILD cheese-3.28.0.ebuild 1914 BLAKE2B 16a5f3d9700937e9a148f159a54dcf6b93fdd097a4ebecacb15484b5f20a88ad8f69aa1b36effd4a2aee485957216987039c5e77bdcfa3e27b8472bb98744287 SHA512 ac5cc8112eb52116ca68d8536f1bc0a5600994e0cd71e73499a144dd14864e3fd7d483855b3b05b28014ece14c226995411eace1216bc1dc8b35c24984fb1b00
-EBUILD cheese-3.30.0.ebuild 1916 BLAKE2B f5b32a8170f075f8a534aadf65bb227345aaf9b46525c9f5aaac2193c3a150bb13de1a88b65726b00653c3c242bee34ac890d665f8458b5a57dbafd930a2c9ef SHA512 2e53f96527dacdb3c6e1fa9b3391991a43ef8e99819639370b7ec1448f45b6bdba1f89df7a53dab529270a52d09de97a0bf55364124966da1c4cae51d04b773c
+EBUILD cheese-3.28.0.ebuild 1945 BLAKE2B 23d2e6235267695c768c794a05c8eb65cc72973e32625fa503ae3fd9164c9593af8718da63916f0c850036c30f67cd0ba34207ec234a8437cdff6031d4dc9b30 SHA512 eb57dbc50a60508250a0d55368e13bb39a0bc918adf5538f03166e3330d7d531e0928dba906b928c157635544a8a10923842538f9a7fc557860e4898b32fb4dc
+EBUILD cheese-3.30.0.ebuild 1947 BLAKE2B 399e483f6d3151823ba1ccd9833e315e18538447a127556b537fbadbe5017082455d589507f51d53dd0f9d41da8521eab959cccde4166bae9b77bc282b898f25 SHA512 50ce5832dfc33ea893e0ddbd6bd9c1eb9170b45905904a06b1b6a0eda49a615185ff847eea40e9bc9a09208906cd81c3a823103971923d48442838864276121e
 MISC metadata.xml 428 BLAKE2B 3a6b33697b144cba857668b55e04897b8b6c6c4323f09be85ce827843ef50c9c6d988a4e60ffde4ecf1e66a73d70f0e71f2f05371f33f3853429107684abbc9a SHA512 cbe065cc8fe75a86d8f16788dc2ddeafda2b1c27858427f6c9ec83841730e3d9c1c9f7815718c86e19626098b96782a1017b614bac5a0121c92af04b11a30a22
diff --git a/media-video/cheese/cheese-3.26.0.ebuild b/media-video/cheese/cheese-3.26.0.ebuild
deleted file mode 100644
index fb4adf9d212d..000000000000
--- a/media-video/cheese/cheese-3.26.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.26"
-
-inherit gnome2 vala virtualx
-
-DESCRIPTION="A cheesy program to take pictures and videos from your webcam"
-HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
-
-LICENSE="GPL-2+"
-SLOT="0/8" # subslot = libcheese soname version
-IUSE="+introspection test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.39.90:2
-	>=x11-libs/gtk+-3.13.4:3[introspection?]
-	>=gnome-base/gnome-desktop-2.91.6:3=
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=media-libs/clutter-1.13.2:1.0[introspection?]
-	>=media-libs/clutter-gtk-1:1.0
-	media-libs/clutter-gst:3.0
-	media-libs/cogl:1.0=[introspection?]
-
-	media-video/gnome-video-effects
-	x11-libs/gdk-pixbuf:2[jpeg,introspection?]
-	x11-libs/libX11
-	x11-libs/libXtst
-
-	>=media-libs/gstreamer-1.4:1.0[introspection?]
-	>=media-libs/gst-plugins-base-1.4:1.0[introspection?,ogg,pango,theora,vorbis,X]
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=media-libs/gst-plugins-bad-1.4:1.0
-	>=media-libs/gst-plugins-good-1.4:1.0
-
-	>=media-plugins/gst-plugins-jpeg-1.4:1.0
-	>=media-plugins/gst-plugins-v4l2-1.4:1.0
-	>=media-plugins/gst-plugins-vpx-1.4:1.0
-"
-# libxml2+gdk-pixbuf required for glib-compile-resources
-DEPEND="${COMMON_DEPEND}
-	$(vala_depend)
-	app-text/docbook-xml-dtd:4.3
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.50
-	dev-util/itstool
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	test? ( dev-libs/glib:2[utils] )
-"
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		GST_INSPECT=$(type -P true) \
-		$(use_enable introspection) \
-		--disable-lcov \
-		--disable-static
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/media-video/cheese/cheese-3.28.0.ebuild b/media-video/cheese/cheese-3.28.0.ebuild
index 449a1884018e..cdb01a015217 100644
--- a/media-video/cheese/cheese-3.28.0.ebuild
+++ b/media-video/cheese/cheese-3.28.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -44,16 +44,17 @@ RDEPEND="${COMMON_DEPEND}
 # libxml2+gdk-pixbuf required for glib-compile-resources
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.3
-	app-text/yelp-tools
 	dev-libs/appstream-glib
 	dev-libs/libxml2:2
 	dev-libs/libxslt
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.14
 	>=dev-util/intltool-0.50
 	dev-util/itstool
 	virtual/pkgconfig
 	x11-base/xorg-proto
 "
+# eautoreconf needs yelp-tools
 
 src_configure() {
 	gnome2_src_configure \
diff --git a/media-video/cheese/cheese-3.30.0.ebuild b/media-video/cheese/cheese-3.30.0.ebuild
index 31bc873f0bfe..2b118686f999 100644
--- a/media-video/cheese/cheese-3.30.0.ebuild
+++ b/media-video/cheese/cheese-3.30.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -44,16 +44,17 @@ RDEPEND="${COMMON_DEPEND}
 # libxml2+gdk-pixbuf required for glib-compile-resources
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.3
-	app-text/yelp-tools
 	dev-libs/appstream-glib
 	dev-libs/libxml2:2
 	dev-libs/libxslt
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.14
 	>=dev-util/intltool-0.50
 	dev-util/itstool
 	virtual/pkgconfig
 	x11-base/xorg-proto
 "
+# eautoreconf needs yelp-tools
 
 src_configure() {
 	gnome2_src_configure \