gentoo (valentine's day) resync : 14.02.2021

6 files changed, 4 insertions, 72 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 8a1302d652cd..1de0b63fe212 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index 31f7c798f799..e6c44ae1020a 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,5 +1,3 @@
-DIST goffice-0.10.47.tar.xz 2400616 BLAKE2B 16a92b3aa5c6e53cb0fe3f51d3ce03a9df6a18f50c0d6890da6ca2529f9e90e3ba30bef63b3c840697d229f58a723957731f985bf02ba80ec4d63bc93d6b7c1a SHA512 0db26fbd049893ee9274ee492e1dc3f10ae789cf99cc0b9dda3f1c2f106423e4679cc56515eb08bbf752aaf48492212777eee08d43a9fefb0b22048e883f5a76
 DIST goffice-0.10.48.tar.xz 2413400 BLAKE2B dce2a4fe1aa7399ce28974383f382f7a46a4b84ee2e8106ad72cf9631926767d59784ce14b2cfec9abea2367b026f83d4bf488464ca87af961f66f6e0243036b SHA512 90ce49c666a164205f8f78dca9fa40c81ddf0312b1b7f76808b8813d168868b5ce46c307fd5405a1314b0a475a4e52e95ab379b2dc751c1626e085ecf846d0f3
-EBUILD goffice-0.10.47.ebuild 1433 BLAKE2B 27245a4417af2d02a716e2a1d15150e51cec6ff313bf3e71672fa9c65bba7002f5caaa43ced59f322ed22e8ae50b98ffebadff79e6acbae18e1636c38dea5c9b SHA512 2e86d28586e2fc09a316f601d123d6dafbc3f66be7a933d3560584ac0474bc773f5d63bbf1e0dd25bd8052aacaa5202a3c1f02ff1df221c71703eee0ef01c655
-EBUILD goffice-0.10.48.ebuild 1441 BLAKE2B 70c0abf8168da790783dad16186f8e7723b506dc5979aa0440a59cbd1b481454969527b9d83f80bebd8d889d1cc5ccc33514ebff60306c30189f8b6f23da5afc SHA512 221079e03a85bfb284e98209672a73d5d81bd80ec45506e70de9a626c1822553220c8d100f8064dcb7497aa9d6e04d4058b3119c4ffefd63b8a73e24d3a60d85
+EBUILD goffice-0.10.48.ebuild 1440 BLAKE2B 0fac9a8296d2ec38cea48e618be127bd48263c1e56a0f6b78792a82cce873fff65ad613152ed115247c8e60d014d4d7f977795adc1b9fd68977f8b6acfc08795 SHA512 5299d0c6cbb87efb14cebed00b550f113ba015f0403c7d7dabf10e6742c3d8bb1eb694b57d8b7ead31be091ad31538a12aeac267774ff23a5e42a63e68dd3fd3
 MISC metadata.xml 441 BLAKE2B d1239d813165b887ed43610e0b9a09afd739164ecf52a0b6a94e957550b5dec5e18dbf5777e4b7bf8e1d665edf89bc5777ad90ebd93caeab5af6fc2882eb3469 SHA512 69e822f6c8ecb89ae952b30074c2527e8283eeabe32ac6555d043576b21d0f5a40b968b0211574ce8b1836dac85370070ee86905551bdd8cf2418cdc2ac6c3ce
diff --git a/x11-libs/goffice/goffice-0.10.47.ebuild b/x11-libs/goffice/goffice-0.10.47.ebuild
deleted file mode 100644
index e6023df8247a..000000000000
--- a/x11-libs/goffice/goffice-0.10.47.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org libtool
-
-DESCRIPTION="A library of document-centric objects and utilities"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/goffice/"
-
-LICENSE="GPL-2"
-SLOT="0.10"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="+introspection"
-
-# FIXME: add lasem to tree
-RDEPEND="
-	>=app-text/libspectre-0.2.6:=
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/libxml2-2.4.12:2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.22:2
-	>=gnome-extra/libgsf-1.14.24:=[introspection?]
-	>=x11-libs/cairo-1.10:=[svg]
-	>=x11-libs/gdk-pixbuf-2.22:2
-	>=x11-libs/gtk+-3.20:3
-	>=x11-libs/pango-1.24:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	introspection? (
-		>=dev-libs/gobject-introspection-1:=
-		>=gnome-extra/libgsf-1.14.23:=
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.12
-	>=dev-util/intltool-0.35
-	virtual/perl-Compress-Raw-Zlib
-	virtual/perl-Getopt-Long
-	virtual/perl-IO-Compress
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-gtk-doc \
-		--disable-maintainer-mode \
-		--without-lasem \
-		--with-gtk \
-		--with-config-backend=gsettings \
-		$(use_enable introspection)
-}
-
-src_install() {
-	default
-	dodoc MAINTAINERS
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/x11-libs/goffice/goffice-0.10.48.ebuild b/x11-libs/goffice/goffice-0.10.48.ebuild
index f40e08daebd7..1d6c1e6eefdc 100644
--- a/x11-libs/goffice/goffice-0.10.48.ebuild
+++ b/x11-libs/goffice/goffice-0.10.48.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/goffice/"
 
 LICENSE="GPL-2"
 SLOT="0.10"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="+introspection"
 
 # FIXME: add lasem to tree
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index aa8722840956..a870e32102ee 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -12,6 +12,6 @@ DIST gtk+-3.24.24.tar.xz 21341240 BLAKE2B a48024c008061b7e9c6ce8fe787e6c2f734923
 EBUILD gtk+-2.24.32-r1.ebuild 9834 BLAKE2B 75f9eb737608fc5ffe7748c68b6592bb96f1cad3d5f326f5567a906222dbe2db96beeacbb32e89499d5f3122b84d4b81cdbcd2fb5f253fc7f6721725e1978c8f SHA512 0a04b09bc637fda2d76c5be5b1807f6cba88af36bab11279d55dfdb8639272df743a9e717ae5916f500e7bff6f24bb017a75c95e0fbbfb905f5f9b50fb7a715a
 EBUILD gtk+-3.24.20.ebuild 7256 BLAKE2B 4ef2d43f69c935f272c9f6644138ffc8be51e0f2538a6203082926261c2a8204aa9b84289922026c925dba40e7765cdc7459663f18f7c3dc2e63da1a0fe4e284 SHA512 ec9d464d131e09ef295f2cd9f947eccbf67785878b2552c02cd313d1ca5d3953e9bf4a26a5a075401ad5e9c4d9fe61e9d79b5e43778ab24d9843d7830ba853c7
 EBUILD gtk+-3.24.22.ebuild 7256 BLAKE2B 4ef2d43f69c935f272c9f6644138ffc8be51e0f2538a6203082926261c2a8204aa9b84289922026c925dba40e7765cdc7459663f18f7c3dc2e63da1a0fe4e284 SHA512 ec9d464d131e09ef295f2cd9f947eccbf67785878b2552c02cd313d1ca5d3953e9bf4a26a5a075401ad5e9c4d9fe61e9d79b5e43778ab24d9843d7830ba853c7
-EBUILD gtk+-3.24.24-r1.ebuild 7304 BLAKE2B 863951e10d6b50d5b95d80aecca3dde61a0e7d294dc9f7449ef06d59b2724645b15ac607f37605660ba3f35af0d5693bb5247db9eb658afd9e89f17bab3e2540 SHA512 f1236cbf991ee189b7e84c547462c57484921ce060af51188cbb44c37279a58a29837f326ac92b280eeb970ac1c6abfab6a88bbeb94f6e800a33c82be3b93dbc
+EBUILD gtk+-3.24.24-r1.ebuild 7301 BLAKE2B 104a0450e1a5743f69c664a44ba8860c281ee5312f01979794bc1f3e2e087a91d98a609dd69d605907767360a1f21decc6b52e57e757e98545214ee696b0d755 SHA512 0d1931b9432b9a3a16ba374bfdb88c9e4dd5bf5725088c66372aa4490900889d5e9ba7b2478fae466e69e88f40b3ed534c69bceb27241161a88d8d3c68d28c29
 EBUILD gtk+-3.24.24.ebuild 7420 BLAKE2B 9aee21b006d166d6f9e47f12ad966cc05648254ce869bbe2b4b141290349415ef7bf98167d077dab6f7b5eaea20bfd8bef0af8a7dc1ee9d24a55d52195644ef7 SHA512 be0c566c3c41655e280ae7cf09a92fa8ba7d5e17ea3b58ce71cddbe8fffd88fc55dc79c37e75395762dda436a7794fd065b31039a41fbed2b8ea85f8c2105b1b
 MISC metadata.xml 947 BLAKE2B 9024c57cf454b89700ce48a267162ce4672c1cd486f3b6218bfb2334154a1abdbe7c446cbe5c96e5d3abeed887891579c56ad26675e3ee833c5c3691fc4fc7ed SHA512 60065a6e79ea076dbe4b06e6ddcf222c9498ba755e7d5a214ac5401c4a9c7b61d170989c64771de69898524b0cc040aa036592a3cbeeb452e1dc5406b93e09fb
diff --git a/x11-libs/gtk+/gtk+-3.24.24-r1.ebuild b/x11-libs/gtk+/gtk+-3.24.24-r1.ebuild
index 656f2d2dfcee..e15bc77b2c75 100644
--- a/x11-libs/gtk+/gtk+-3.24.24-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.24-r1.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1