gentoo resync : 15.01.2020

5 files changed, 3 insertions, 175 deletions

diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index e2107ae69315..768cbb9dec08 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -1,10 +1,5 @@
-AUX atk-2.30.0-use-basename-instead-of-filename.patch 2528 BLAKE2B 7a81c6ed9c73c3cdd4a674446250b34ba06bf3de0f348b3bcabfa3ebe69d556b1fd0f63a46aea9e87674028e22f48dc4be6fbd465249a998d3ce257038128e27 SHA512 ba6fed3b6da993541a3033c1dace0f9bac6ec1b1603080e2d20db0b69491c52916c7f116aa6ec614384405c7984b3db87b051a503f2eb6adc2ef173aab638d81
-DIST atk-2.28.1.tar.xz 712508 BLAKE2B 71aee8bc937e1e37d40e6a9820d0002bcc763dbf87385ede2484ec6fe17a9924d5753d74dc3a769602746c915d0c46da8eea78cc80c706e3c38faca2e5050364 SHA512 aa61e7718b3f4d9c33ec2b4747e35f894a51550ef39ecc4a7af5705811c029645bd3c728071f446b075a0b7aef0c35c1b73406a210cd30171838f24a8dfc0abb
-DIST atk-2.30.0.tar.xz 290264 BLAKE2B dec44abf3bd4937f417cd0b75bee32fdd073ccca1e44d883293d060afbbc30909aac483007e293231fafe0c5481df94d1113d287a0002a823f4e9c8e7bd647c2 SHA512 03f311378fdb91442f27ed542fa36edd2c9c036837c9f25ff37468bf7f743277d0b9253621563d15894e0da9d37e8df0a0e2c0e47e6aae33a38b13744c3b8b8e
 DIST atk-2.32.0.tar.xz 292088 BLAKE2B 15f093db60cc54d1a5a18dc78cb9d64fa73e18dadb724fe5143956199f4ff1aa4ea9daf0796b14f228a1d91f1d44e88749c67fe5a6a84bd001916d78be4680f9 SHA512 8cd2a3ee006f21835f3e564f2e1de4ae61bd9529b4c0b4f2e3ece88e905e2dd36b67affb089f41582806a1397576602a526a4b8698303708894f20af97ecac22
 DIST atk-2.34.1.tar.xz 293140 BLAKE2B 8ae280583867460734ca001eb01963eefcc519eb09658e2e793cd1a07831e8e5ade20a4d38bb5925a1103da206d9d6283a2b1892c671f12090b3eefac04b34e1 SHA512 a7c8ec7c2166bb8734b065402bf7700cdc69f56c0958663e88596b155a20063e4cfbf1754d8b8ed94a4e509db2e97e2603b0a8037e61028acc85930e631a633e
-EBUILD atk-2.28.1.ebuild 1446 BLAKE2B 3e9c9e8b1b047c59cc66bc9646e20a82a41f3b2ba6b58bff75de5ea9c5341e17640bf814f49c951db080e4c3fbb3e26e8580b1b047eaaf27a9208a2211b1c97f SHA512 4bacb9f02f8d7d067dd2bef3788b80cf0b36f0a0fd48eace9549efa082fd01f2ede7054f8b9d2b4fac04c83b4d001c70f30a641ea355dea52e0a660c7a8634eb
-EBUILD atk-2.30.0.ebuild 1227 BLAKE2B 0a21234fffdf74308704e199dd20ae4c4b6229c29d0265ce2734d0ece6b5fcfb9298ce65e6496b53f0a757863856e73dcc7d7a8287ab33b9371c65b0cb064c8c SHA512 7a23da2f804ef760dd5fc941f77f745c259203cb7e58c6cc218300a52c901e75c1efbd427245e7ec484ad8eaa57802d8855a0005c48e25a086b6d52e34863aa6
-EBUILD atk-2.32.0.ebuild 1167 BLAKE2B 77292c0b375f95f1985a7ccc4426a6c1f3615b7a482fb2dfa749e66cb3ea775374c3b2a66753b555814781fa88e2b90be81c40c4c311c9ae3fff2b8db134abca SHA512 efbe20f0687c83825aa8ca24b1c57712626898f1deae925ea466d89fb1a81731957d1be818e00dbf0193601c4610e38589f5728db6f4c778a46061ef15d560c7
+EBUILD atk-2.32.0.ebuild 1164 BLAKE2B 691dab81bfaff32036d7dabcb449131f5dbf9e4cac30fb2d99c966e3bb30fabb3cbb27dccc1852763dc05de1909e9d3220686e1cad8e493e07f77d5fb7faf6cb SHA512 1991872e63c0028df601bcafc22f5ba8dc81c6d59fb2b9126d08fdadc948f81811158817e62a8920bb6d6a775dcb99a7461251b8d60e65ac1adc05ba8398a43d
 EBUILD atk-2.34.1.ebuild 1175 BLAKE2B 212f9032adf2df7804cde272f7d512a8668907b0086d0dae909c6c1026abc10099100536548dca08ac029b2395a64714ed08bb6c046aa38e5b0a3f0e23fcf019 SHA512 ed002c44722328bb6a36883177dd24d0c47acc568173c16884ecb9ff5e6ee7883d81d8701aaaefe667d359354abc0928decfcada3b2d268de68249bb2d5f9ae7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/atk/atk-2.28.1.ebuild b/dev-libs/atk/atk-2.28.1.ebuild
deleted file mode 100644
index 6df4ce591ae7..000000000000
--- a/dev-libs/atk/atk-2.28.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="GTK+ & GNOME Accessibility Toolkit"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="+introspection nls test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.25
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	nls? ( >=sys-devel/gettext-0.19.2 )
-"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	if ! use test; then
-		# don't waste time building tests (bug #226353)
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-
-	# Building out of sources fails, https://bugzilla.gnome.org/show_bug.cgi?id=752507
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-#	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(multilib_native_use_enable introspection)
-
-	# work-around gtk-doc out-of-source brokedness
-#	if multilib_is_native_abi; then
-#		ln -s "${S}"/docs/html docs/html || die
-#	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/dev-libs/atk/atk-2.30.0.ebuild b/dev-libs/atk/atk-2.30.0.ebuild
deleted file mode 100644
index 29a7ef911b61..000000000000
--- a/dev-libs/atk/atk-2.30.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome.org meson multilib-minimal xdg
-
-DESCRIPTION="GTK+ & GNOME Accessibility Toolkit"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="gtk-doc +introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.25
-		app-text/docbook-xml-dtd:4.3 )
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	>=sys-devel/gettext-0.19.8
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-use-basename-instead-of-filename.patch
-)
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddocs=$(multilib_native_usex gtk-doc true false)
-		-Dintrospection=$(multilib_native_usex introspection true false)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/dev-libs/atk/atk-2.32.0.ebuild b/dev-libs/atk/atk-2.32.0.ebuild
index 8b62f7db6a39..aeafaeb7dcae 100644
--- a/dev-libs/atk/atk-2.32.0.ebuild
+++ b/dev-libs/atk/atk-2.32.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/dev-libs/atk/files/atk-2.30.0-use-basename-instead-of-filename.patch b/dev-libs/atk/files/atk-2.30.0-use-basename-instead-of-filename.patch
deleted file mode 100644
index 763a15056702..000000000000
--- a/dev-libs/atk/files/atk-2.30.0-use-basename-instead-of-filename.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 14115cc94086fb2a0a5cd32e67c70f623847df64 Mon Sep 17 00:00:00 2001
-From: Samuel Thibault <samuel.thibault@ens-lyon.org>
-Date: Thu, 30 Aug 2018 11:39:25 +0200
-Subject: [PATCH] build: use @basename instead of @filename
-
-Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=789619
----
- atk/atk-enum-types.c.template | 2 +-
- atk/atk-enum-types.h.template | 2 +-
- atk/makefile.msc              | 4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/atk/atk-enum-types.c.template b/atk/atk-enum-types.c.template
-index df2f546..b3c0b13 100644
---- a/atk/atk-enum-types.c.template
-+++ b/atk/atk-enum-types.c.template
-@@ -7,7 +7,7 @@
- 
- /*** BEGIN file-production ***/
- 
--/* enumerations from "@filename@" */
-+/* enumerations from "@basename@" */
- /*** END file-production ***/
- 
- /*** BEGIN value-header ***/
-diff --git a/atk/atk-enum-types.h.template b/atk/atk-enum-types.h.template
-index 7b4cec4..8321c24 100644
---- a/atk/atk-enum-types.h.template
-+++ b/atk/atk-enum-types.h.template
-@@ -14,7 +14,7 @@ G_BEGIN_DECLS
- 
- /*** BEGIN file-production ***/
- 
--/* enumerations from "@filename@" */
-+/* enumerations from "@basename@" */
- /*** END file-production ***/
- 
- /*** BEGIN value-header ***/
-diff --git a/atk/makefile.msc b/atk/makefile.msc
-index f407b7d..ed4656b 100644
---- a/atk/makefile.msc
-+++ b/atk/makefile.msc
-@@ -104,7 +104,7 @@ atkmarshal.c : atkmarshal.list
- atk-enum-types.h : $(atk_headers) makefile.msc
- 	$(PERL) $(GLIB)\gobject\glib-mkenums \
- 		--fhead "#ifndef __ATK_ENUM_TYPES_H__\n#define __ATK_ENUM_TYPES_H__\n" \
--		--fprod "/* enumerations from \"@filename@\" */\n" \
-+		--fprod "/* enumerations from \"@basename@\" */\n" \
- 		--vhead "GType @enum_name@_get_type (void);\n#define ATK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n"         \
- 		--ftail "#endif /* __ATK_ENUM_TYPES_H__ */" \
- 		$(atk_headers) > atk-enum-types.h
-@@ -115,7 +115,7 @@ atk-enum-types.h : $(atk_headers) makefile.msc
- atk-enum-types.c: $(atk_headers) makefile.msc
- 	$(PERL) $(GLIB)\gobject\glib-mkenums \
- 		--fhead "#include <atk.h>" \
--		--fprod "\n/* enumerations from \"@filename@\" */" \
-+		--fprod "\n/* enumerations from \"@basename@\" */" \
- 		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {"     \
- 		--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
- 		--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
--- 
-2.19.2
-