gentoo resync : 22.05.2021

3 files changed, 2 insertions, 95 deletions

diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 976a25f94031..8c12fd1dd797 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -1,6 +1,4 @@
 AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c524d3c7953d722b3b03d57ad68297fee6757330c1a2d90f36bcfe52d1d9ef4d95b81eeb19109bc8957f671ac40d31573 SHA512 cc9aec06f6acdfdf538de7043f9f753768e0e4c26fa9eef7e52b4e42aa6fd3836185c18ffd51abfc2aa3e6f5b2472e68914112230d2b8856e8a3c61e9d865ecf
-DIST glade-3.36.0.tar.xz 4466808 BLAKE2B ebc93c9471225782bcbcbafc4a475638e77ad763d607188d95e8ac77b3de70f76fefe963027bb6b32ae71adeb1daafdb1a2c98363b25030d83f20f767613f68e SHA512 c984613ade26e3fe68a700a48cccadf5ac96eb716a6e90aad36f3de684faeb607d9aaf112d74a048cd33e222a02388ee6583ca915648486f0259cc805e16d243
 DIST glade-3.38.2.tar.xz 2709224 BLAKE2B 2bcd447b90d6e67abc44dd273f0f5d7fc1d6848ef0bd878481f2c10e8846828e63fbf9c9c96e5effe8126b4aec7eb05886606ca1dc5fb94943bc5d1d8d0ef4e2 SHA512 2df8c8363206905663cd3ac9196da44445425a888b64f1b3b3ac6cd41e14c4a82a5d2c299730ef0606c3970a04dd8f245bb5639218794eb67dcbd26fae17565e
-EBUILD glade-3.36.0.ebuild 2291 BLAKE2B e14a55178057ebc2f8feaa1be8e1f1fdcaa2eaca28b16bd6f2641f6683d99aa15fdf4dbbc012006bb212354bcb43eafbe7265f8e64c8926b9f8e8e2b81634c3e SHA512 fc273664dfc8f9766bd92a8314ff786a2c232727d62ef0160e547728758e332e4f3ea1857527a3a86c0c07908e60a10d91aa49b2c982887d06e8f0f6e990e720
-EBUILD glade-3.38.2.ebuild 1895 BLAKE2B 3925044e5d6f9a3cc030362770e05ab40376c8d83a06cb7e9964f5b2496afa8f71fa32ecb435009c2ed7fddee24353ccaf35bef5b47cd8b4b40a8dbf19d23bb2 SHA512 44459a61b2b6b42e2f521d85e67102f55a8df73f8544605445be4e274d19008b103a505c242ccb81555a17a1e7fb38bc6382a0f676d64f1ac31d2e934c8d28c6
+EBUILD glade-3.38.2.ebuild 1901 BLAKE2B fffc06f96b689fb79a3a4205a1548381515ad4684eac495f776f9ce1204c30dad405c359258efb2030e64f7d6186490bc242fbcd040b456a4fdfa823995377b9 SHA512 9f04fc0e8caed1df5254bc9f7fd7ae5350f4a598fd374c8b047c52af8f587767d8716011166f162947e1edcbd66232577b80d95eb8f43099779521c6626d02ff
 MISC metadata.xml 442 BLAKE2B aff6c373736411da1244bc230767cce9e4edd0d10f51f4157f1cfecbb134b54f282d2504901b621e988e7973fc43e5253d6b0aaefa3c3015ddace6c0790ba13b SHA512 c819e5ce58646f681aa536d6c859bba6e847aa27ba651ea0574bd81008030e359610eb68663a610a20a899a8aa4e94fa215a4085524eed09ab84d5c50fd9a536
diff --git a/dev-util/glade/glade-3.36.0.ebuild b/dev-util/glade/glade-3.36.0.ebuild
deleted file mode 100644
index a7dccec404bf..000000000000
--- a/dev-util/glade/glade-3.36.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit gnome2 python-single-r1 virtualx
-
-DESCRIPTION="A user interface designer for GTK+ and GNOME"
-HOMEPAGE="https://glade.gnome.org/"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="3.10/12" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-
-IUSE="+introspection python webkit"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/atk[introspection?]
-	>=dev-libs/glib-2.53.2:2
-	>=dev-libs/libxml2-2.4.0:2
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.22.0:3[introspection?]
-	x11-libs/pango[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	python? (
-		${PYTHON_DEPS}
-		x11-libs/gtk+:3[introspection]
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.8:3[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	webkit? ( >=net-libs/webkit-gtk-2.12.0:4 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.13
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-# eautoreconf requires:
-#	app-text/yelp-tools
-#	dev-libs/gobject-introspection-common
-#	gnome-base/gnome-common
-
-RESTRICT="test" # https://gitlab.gnome.org/GNOME/glade/issues/333
-
-PATCHES=(
-	# To avoid file collison with other slots, rename help module.
-	# Prevent the UI from loading glade:3's gladeui devhelp documentation.
-	"${FILESDIR}"/${PN}-3.14.1-doc-version.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--disable-debug \
-		--enable-gladeui \
-		--enable-libtool-lock \
-		$(use_enable introspection) \
-		$(use_enable python) \
-		$(use_enable webkit webkit2gtk)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	# modify name in .devhelp2 file to avoid shadowing with glade:3 docs
-	sed -e 's:name="gladeui":name="gladeui-2":' \
-		-i doc/html/gladeui.devhelp2 || die "sed of gladeui.devhelp2 failed"
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if ! has_version dev-util/devhelp ; then
-		elog "You may want to install dev-util/devhelp for integration API"
-		elog "documentation support."
-	fi
-}
diff --git a/dev-util/glade/glade-3.38.2.ebuild b/dev-util/glade/glade-3.38.2.ebuild
index ebf254857d28..532d2e1e78e7 100644
--- a/dev-util/glade/glade-3.38.2.ebuild
+++ b/dev-util/glade/glade-3.38.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://glade.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="3.10/13" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 
 IUSE="gjs gtk-doc +introspection python webkit"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"