gentoo resync : 15.01.2020

4 files changed, 3 insertions, 85 deletions

diff --git a/x11-themes/gnome-themes-standard/Manifest b/x11-themes/gnome-themes-standard/Manifest
index 15f3ad00e890..4a1b898c6564 100644
--- a/x11-themes/gnome-themes-standard/Manifest
+++ b/x11-themes/gnome-themes-standard/Manifest
@@ -1,7 +1,4 @@
-AUX gnome-themes-standard-3.14.2.3-srcdir.patch 1081 BLAKE2B 5c5569b531d9191ebd2302be679f2c277036dbeb403466c990292e53c0514db5ef5d5d93e659255a16d4114da83f4f389c73848fa2665a5ea100fac1220f99bc SHA512 9b7d404aa13d56c77f1dc1098e72594ed3613b3ab293570e7f9cd1c165eef6fc14e703912ed24dec9724e659ec2b6a66bf46f0e230d02f0295bbc0ff24bc0a1b
 AUX gnome-themes-standard-3.22.2-exclude-engine.patch 1893 BLAKE2B 416f89fb438ced13d04ed94cb7a8504fd0cf664bd61a8a30e703f8c0e9afb16407c34ed14dcb395f9c9a4d19d3d90c1d73f2a64f2acb3de34b6d9ba6a649afe8 SHA512 9b7f4efdce158485850e12566dce91a7b3494bae8191bcacb581a737dde15bcce9b10af8f28ab920605e86008744ad380312f26fc3d624bada910599501159f9
 DIST gnome-themes-extra-3.28.tar.xz 2953272 BLAKE2B 122ff5f1d95086c5cad6818efa79763ab574b7d6792b846198ac7ed5b521747d4357025ebd0ac6b5ea1161bf1dd3482ac2e867822bf863928b05a8486172ba0d SHA512 bccc446e86b12476b86a0fe2e3354500c8fb3eef62a85c3823d69aaa259e032e1f94e7993bf633397b669c425ef42635b0cf17b376f0b7cf1869bb1d7160ede0
-DIST gnome-themes-standard-3.22.3.tar.xz 2904736 BLAKE2B bc1dad2f6ce913a40bd532064f590c38e7c3db05a1e0564bbde8bf5d0349ca96a8e0d7e7683a5bd1b22ce404f7f6dc1efeb3a02a9177186c6e6686045451ddf0 SHA512 aa2f3ad4d867732cd09df6adb4f48ed2757e3f28930ef791ba97a82007332c810d84dd1074ca518ec0fe71bd7d8b95404854bd799e3b1fe616e1809e8ee33501
-EBUILD gnome-themes-standard-3.22.3-r1.ebuild 1196 BLAKE2B d1aea8e9e920f1ba9db85ca2c1b0e179c8cd8f0652717eb09030e8bfd3300d3525ec37c2de88b5161bc2b79614aef19255c470ad3e7fd065b5767f6ff259f14f SHA512 9021144714acc53106740071dde29b3123edb229287df18e40a9104b3726854412d70d7fb6ede67da349d0a406513b7d0cea0713ee0d6f0ee725eae6905e307f
-EBUILD gnome-themes-standard-3.28.ebuild 1038 BLAKE2B b3d4e0e9f20aa2c755f9db426064260715ef1143a881966de23859104c9e6cd6efba076f03fcd3cd3b8698e51175354079d0069dfdcdc6232ff4a07201f29ae1 SHA512 cda947e7cf1cc03bdde8fe6e6b7d23a42331d28e8d2c1bbc65fd4724d26a7b1e71438c92c9346d615d277c69e28dca806279cdf99729ff84a09fbe2dbf8f2ed0
+EBUILD gnome-themes-standard-3.28.ebuild 1037 BLAKE2B 451bba98e9efed58c46c7fbeeb4e3fcee0bb89986797988614a90467167e075c99f36f95d9db6ded146a2ecf88a5499f51587549fd23989d0a6035a38629775c SHA512 3a0c4d9b2920046ceebd316e75f8e2d91a2ef7ca2e7634cc8431e0c08bc25e91b0c7aa4e43086bdafe3de15c0463de7722c50ab3f8ceb9dee05de5f97b57373d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-themes/gnome-themes-standard/files/gnome-themes-standard-3.14.2.3-srcdir.patch b/x11-themes/gnome-themes-standard/files/gnome-themes-standard-3.14.2.3-srcdir.patch
deleted file mode 100644
index 717613b45ea2..000000000000
--- a/x11-themes/gnome-themes-standard/files/gnome-themes-standard-3.14.2.3-srcdir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From db1e859fa27a4d3ca8a45937c2730f83c34405c6 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 28 Mar 2015 00:28:16 -0400
-Subject: [PATCH] HC: fix out-of-tree builds
-
-https://bugzilla.gnome.org/show_bug.cgi?id=746920
----
- themes/HighContrast/icons/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/themes/HighContrast/icons/Makefile.am b/themes/HighContrast/icons/Makefile.am
-index 76e824d..5545157 100644
---- a/themes/HighContrast/icons/Makefile.am
-+++ b/themes/HighContrast/icons/Makefile.am
-@@ -6,7 +6,7 @@ render_sizes = "16x16" "22x22" "24x24" "32x32" "48x48" "256x256" "scalable"
- THEME_DIRS=$(shell SIZES="$(render_sizes)"; for size in $$SIZES; do for dir in `find $(srcdir)/$$size/* -type d`; do printf "$$dir,"; done; done;)
- 
- %.theme: %.theme.in Makefile
--	dirs="`echo $(THEME_DIRS) | sed -e 's#\./##g'`"; \
-+	dirs="`echo $(THEME_DIRS) | sed -e \"s#$(srcdir)/*##g\"`"; \
- 	sed -e "s|\@THEME_DIRS\@|$$dirs|g" < $< > $@; \
- 	echo "" >> $@; \
- 	for dir in `echo $$dirs | sed -e "s/,/ /g"`; do \
--- 
-2.3.3
-
diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.22.3-r1.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.22.3-r1.ebuild
deleted file mode 100644
index 804daa4f04ca..000000000000
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.22.3-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome.org gnome2-utils
-
-DESCRIPTION="Standard Themes for GNOME Applications"
-HOMEPAGE="https://git.gnome.org/browse/gnome-themes-standard/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE=""
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-
-# Depend on gsettings-desktop-schemas-3.4 to make sure 3.2 users don't lose
-# their default background image
-RDEPEND="
-	>=gnome-base/gsettings-desktop-schemas-3.4
-"
-DEPEND="
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# https://bugzilla.gnome.org/show_bug.cgi?id=746920
-	"${FILESDIR}"/${PN}-3.14.2.3-srcdir.patch
-	# Leave build of gtk+:2 engine to x11-themes/gtk-engines-adwaita
-	"${FILESDIR}"/${PN}-3.22.2-exclude-engine.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-static \
-		--disable-gtk2-engine \
-		--disable-gtk3-engine \
-		GTK_UPDATE_ICON_CACHE=$(type -P true)
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.28.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.28.ebuild
index b6602c5b7e3f..3b5e135966ca 100644
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.28.ebuild
+++ b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.28.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=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-themes-extra"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 # Depend on gsettings-desktop-schemas-3.4 to make sure 3.2 users don't lose
 # their default background image