gentoo resync : 31.05.2021

3 files changed, 2 insertions, 68 deletions

diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest
index 702228348eba..50220c043e57 100644
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@@ -1,5 +1,3 @@
-DIST libgdata-0.17.13.tar.xz 849888 BLAKE2B a364f6175828dcf6d870ddf8489da3703b987587639675ed5cbe851de8761d918da9ef91531d2b992ef5188b51f00f4bc13c3ce3b36afe6d07c4e162a93b2889 SHA512 b074097bd3cc78951638f0d726a948c9ba994c64c85c0cfe713c3d87419a9a96b66688bde88732dfb529325dca2b8251bd161337532bffaf9564f7f5819b9343
 DIST libgdata-0.18.1.tar.xz 851584 BLAKE2B 860cc42c4d0bdbdd6ca1a1001ec7ea5acc26dd1339052365554123e6524fddce65704a11614c8a081eb3eef10395fb1b4d2dfd3cf942dd1ae3556507af4c7c52 SHA512 15ff708760ca5023b692fd565c26a7c3acf035073534c0cd3f1f90e46ee0c60d14dedf360d3ac146d37135e200d9c2bc4b657e81468d0efde4821a9219875b98
-EBUILD libgdata-0.17.13.ebuild 1739 BLAKE2B b4f8b0057d3d15c247eb622fcec1eedfb4fd7387447c1c30f0b84b7c3cd3095a4047ac5306a23a6e9531f6b6a33866fd808a19744cf2cc053866a24266dc7024 SHA512 617a4a847ea87f9ae8a0b3bc82dbe9c105142b7a4139b51b34ddb37a230a1378514a9a5e8389ee7128b31f3435b87984ae2c50940d4b6d1e253d731b48b86f14
-EBUILD libgdata-0.18.1.ebuild 1743 BLAKE2B 9a1827aa873c81475639d4e2ea10d9f252e97cc71a89804f5a9e5c67087ecbe8906a1bda96390b5d84839751506d32b0f852ba67cd5b0d10527bac25a20c9e6b SHA512 21656a73beb7f340b8f6521fa9fc273bc84ceebeaca768dfb3b3942992a927ef60b64a21e97a64503dccc6b6ab3ecb500cd65c0bf4c70f6d52ac9a45026c0dc8
+EBUILD libgdata-0.18.1.ebuild 1736 BLAKE2B 4bd8940b84241e22878f5d0a2c3e10c13515f86eae5dc0abfed83937d14112c3aa9e8df4f30020678368d9d043ad612013120c112d7638009b53860669676d46 SHA512 dac29b6737f18ee4b93bd6fd0eb3eef6fba0ceb62b7cc65f9e9fcb92b22fbac31daa0fcbc02b084a0bf5e5e38e7030da547e5e4cbeb6b57dd3667fd8e4224bc2
 MISC metadata.xml 496 BLAKE2B c1ea319b0bfe89f579895ad4422216a26b3b8709d75bf9680278c22e3fa4e3e771f4573b89eb3db2704a33196149883f0c7028b7e39cdde833df510e350f560b SHA512 e12832d53a97dcaba6d2f669ece3ff9dbd504951a7539f00cce52e88e28d4c28034b203b9f1def27c812f39e5ad21532789b62cd0ab2814facf90b7b789e82dd
diff --git a/dev-libs/libgdata/libgdata-0.17.13.ebuild b/dev-libs/libgdata/libgdata-0.17.13.ebuild
deleted file mode 100644
index 214315f26395..000000000000
--- a/dev-libs/libgdata/libgdata-0.17.13.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson vala xdg
-
-DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol"
-HOMEPAGE="https://wiki.gnome.org/Projects/libgdata"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/22" # subslot = libgdata soname version
-
-IUSE="+crypt gnome-online-accounts gtk-doc +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/json-glib-0.15[introspection?]
-	>=dev-libs/libxml2-2:2
-	>=net-libs/libsoup-2.55.90:2.4[introspection?,vala?]
-	crypt? ( app-crypt/gcr:= )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.25
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( >=net-libs/uhttpmock-0.5.0
-		>=x11-libs/gdk-pixbuf-2.14:2
-	)
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-	# Don't waste time building a couple small demos that aren't installed
-	sed -i -e '/subdir.*demos/d' meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dgtk=disabled # only for demos
-		$(meson_feature crypt gnome)
-		$(meson_feature gnome-online-accounts goa)
-		-Doauth1=disabled
-		$(meson_use test always_build_tests)
-		-Dinstalled_tests=false
-		-Dman=true
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libgdata/libgdata-0.18.1.ebuild b/dev-libs/libgdata/libgdata-0.18.1.ebuild
index 4b2bee552d91..7e95bbe440a6 100644
--- a/dev-libs/libgdata/libgdata-0.18.1.ebuild
+++ b/dev-libs/libgdata/libgdata-0.18.1.ebuild
@@ -16,7 +16,7 @@ IUSE="+crypt gnome-online-accounts gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44.0:2