gentoo resync : 24.12.2018

3 files changed, 3 insertions, 93 deletions

diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index 277ea7a292b6..a7e1c613ef81 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -1,7 +1,5 @@
 DIST grilo-0.2.15.tar.xz 627196 BLAKE2B 3277f2588413e364835954f971c986451837b6992858d48273280d511a4d1ef4a8075924aaa3d4426818952e9f4d65c1b2dff7d3e255b2cbf30a8f73f740f91a SHA512 ac0a76d9075e5383fe1a56277b23986a8ec8e86f01f3f782ac7dc79539904712c22295c679243604b619f24088a1210622e0699b5601678264bd7651012ded3e
-DIST grilo-0.3.4.tar.xz 644616 BLAKE2B 4e8a7ba7da065b91cf780e4ec5da96b7a63534c2ef22d80cea21853a9373bca59359d2384e6f549689221a4eb1da495037c88e9adaea6c786005963c97a9aa1e SHA512 d3800a1873364dc8b56748924eee71928f9e08ad82d8ee2ffaf265cca7e26476081e543f42f26db57c088b2b063f86244e6718116710fc39fdea623868992145
 DIST grilo-0.3.6.tar.xz 653864 BLAKE2B 58570975b2c4623b2a43b441c60d88146080327a86018bfd1a37967d35b6389e5102915296ceba1a8ebf23d27a3e4f8d23eeb59555a6c5cd0ca596b5ab674878 SHA512 175cf61a43aea8456a41f4dce7694fac50e854cf6340ed0671f233e6188fa34347c1e7308aac99bc49d081c36747776b9a8c1c5cc7c0be00a1df2c9d015d8849
 EBUILD grilo-0.2.15.ebuild 2168 BLAKE2B 194275416887ac3e9d0c02cc68bac9945f3d0b7b35967ea0322a8b3ad6fbf962feff735f02c761cf02eb89c2215880eda473bab60a87345ddd795374a1dce12a SHA512 a3c16193769a111bf219382eec548de6bde3088646c02c579a553f5adad9e8949791fb9d06547bb58aab1b67505965c39bb8063cdc708b549779fed31c7109d2
-EBUILD grilo-0.3.4.ebuild 2297 BLAKE2B dae2b80d83636ffd8f331e59bb38e0ae5e513aa9e4812dc35f55308b5f27e8a6852ec735a934e64e9f1141429883d9bfd87ed42144e8d7bdaa38210ed854ddda SHA512 9e0ec9c435a33a9b3d19dc9ae1a6d5d352fd2ad2377c22999d18a0f0ef2d308d85a9dbd51024d304767503659e2d278f2de2916d699097e9b1f5e0b91d3efbd9
-EBUILD grilo-0.3.6.ebuild 2367 BLAKE2B 0854ce5e61acb79994f34dfc265c527f93903ff77022fc6e7b7e8ed0c8345e49e724f766ee748ea2fa7f31c384b638e526308bf7455fe7908ab51f5c5a95e06e SHA512 ee03de4daa9ac75dd030cf6c6d0ce0f22ad19e3a055aef314648b386a78d01ee862913dc6982b2b49ef061c15a20a7b8001128dfad7dc1f2a431ce643cdca286
+EBUILD grilo-0.3.6.ebuild 2362 BLAKE2B 1e99d886f7a4b334366f0b579763e1ce0654a19fe80f410910e869b5698ce7534b776181971108327e7f1636c99d6cd1929c737d3f4eaae3d524a60956b75d32 SHA512 b7703ecad923fd1411e2be10596b028e0226b4d7e8fe1ea01c277aceb4b8c36ba29408a15b8b030967b4babb14b05015f5a3cf3c66013034d70d65a7af49f879
 MISC metadata.xml 484 BLAKE2B 56ca18d39e67d361c060c6b08bb8da562257cdf8a3f8ca208a745cc628ebd4607bb3bd84f2269d54c914fcd83123b152258ed888691c510b856d8f16f3eaf2ab SHA512 b72030308a92f0c105f71df30321e2aa52d7e7bedcaaa8a2ddc9eb42e4e70981f6015ee8d00c81e50ce6460ab91396742619b8962c95cf664125f283ecc4e229
diff --git a/media-libs/grilo/grilo-0.3.4.ebuild b/media-libs/grilo/grilo-0.3.4.ebuild
deleted file mode 100644
index 8226d721b9b7..000000000000
--- a/media-libs/grilo/grilo-0.3.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-VALA_MIN_API_VERSION="0.28"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="A framework for easy media discovery and browsing"
-HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.3/0" # subslot is libgrilo-0.3 soname suffix
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="gtk examples +introspection +network playlist test vala"
-REQUIRED_USE="test? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	dev-libs/libxml2:2
-	net-libs/liboauth
-	gtk? ( >=x11-libs/gtk+-3:3 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9:= )
-	network? ( >=net-libs/libsoup-2.41.3:2.4 )
-	playlist? ( >=dev-libs/totem-pl-parser-3.4.1 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-	test? (
-		${PYTHON_DEPS}
-		media-plugins/grilo-plugins:${SLOT%/*} )
-"
-# eautoreconf requires gnome-common
-
-pkg_setup() {
-	# Python tests are currently commented out, but this is done via in exit(0) in testrunner.py
-	# thus it still needs $PYTHON set up, which python-any-r1_pkg_setup will do for us
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -e "s:GETTEXT_PACKAGE=grilo$:GETTEXT_PACKAGE=grilo-${SLOT%/*}:" \
-		-i configure.ac configure || die "sed configure.ac configure failed"
-
-	# Don't build examples
-	sed -e '/SUBDIRS/s/examples//' \
-		-i Makefile.am -i Makefile.in || die
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --enable-debug only changes CFLAGS, useless for us
-	gnome2_src_configure \
-		--disable-static \
-		--disable-debug \
-		$(use_enable gtk test-ui) \
-		$(use_enable introspection) \
-		$(use_enable network grl-net) \
-		$(use_enable playlist grl-pls) \
-		$(use_enable test tests) \
-		$(use_enable vala)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	gnome2_src_install
-	# Upstream made this conditional on gtk-doc build...
-	DOC_MODULE_VERSION=${SLOT%/*} \
-	emake -C doc install DESTDIR="${ED}"
-
-	if use examples; then
-		# Install example code
-		insinto /usr/share/doc/${PF}/examples
-		doins "${S}"/examples/*.c
-	fi
-}
diff --git a/media-libs/grilo/grilo-0.3.6.ebuild b/media-libs/grilo/grilo-0.3.6.ebuild
index 74dbd08d841b..3a8200f3a8ca 100644
--- a/media-libs/grilo/grilo-0.3.6.ebuild
+++ b/media-libs/grilo/grilo-0.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.3/0" # subslot is libgrilo-0.3 soname suffix
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="gtk examples +introspection +network playlist test vala"
 REQUIRED_USE="test? ( introspection )"