gentoo resync : 23.09.2020

3 files changed, 1 insertions, 108 deletions

diff --git a/gnome-base/libglade/Manifest b/gnome-base/libglade/Manifest
index 1de6b989e727..8f1db6da788b 100644
--- a/gnome-base/libglade/Manifest
+++ b/gnome-base/libglade/Manifest
@@ -3,6 +3,5 @@ AUX libglade-2.6.3-fix_tests-page_size.patch 369 BLAKE2B 0994633712e71d4d1919dbf
 AUX libglade-2.6.4-enable-extensions.patch 225 BLAKE2B 668fb60395b401e3acc9f93ab049a13621e404b7e3e9a7ee265bac6850eae20db0957064726fe9b4a8f9403ec60398585dec2c7762c65daef824eb8f444b295a SHA512 e9cf514612790984110f9c5dc8fe12f5e2b4707ea469a803f0db24dc1ff7561411e6e47faafa71037e23daa1a21b1bc8ac7fc6e699508c76e9cb5b4cf8c10fde
 AUX libglade-2.6.4-gold-glib-2.32.patch 544 BLAKE2B 0a7b0c89eab5e17788528743aa894f485e19bcc84f2175e1a4c64363ef3c0924e9fd7fdd7b20ff01a899cfbdb549ac00fc375e4b47cef98bc118a288ca332621 SHA512 d2d77d6e4d2bfe426222231dbca29b6003d33e3964ea6ab25f2f2c11d3b52ed9d1379c5f5d727980ad16b6db8d7bab2dc540830e169b70ce24e9afd8c170a1d8
 DIST libglade-2.6.4.tar.bz2 356119 BLAKE2B 7132a12affc4b6954eb9565236ca64a0f13f369dba630c14fdbb66a35d2273e8dd371baaad80ce97fd4480a6795629dd7f3bbee90a34b09c85041907a054f5c3 SHA512 b725842febaf4c1f0d305a629ae1c61ea2de24dd6f41937e806c078fada2cea483195ef40f5238ce2045e47130c92559e984f677de667b840dd7fff0f8559735
-EBUILD libglade-2.6.4-r2.ebuild 2833 BLAKE2B 9a427b6a95d8d9387b20b27cf327d57c81a668871cf0853193f499b980144caacad0ee6bcd3e0cf48655d5d4c668f8cdc43674243495d62f200925789dca4145 SHA512 3ba8b42f9a076a5bbfc103be2864494345e4095a1b4274a185af2dd00dcf92a57abbd23e7bc6bbfbaaeaf083ec36a75b88c652ebd39980c3f624f70aa5bd0fec
 EBUILD libglade-2.6.4-r3.ebuild 2488 BLAKE2B 588a99f621abb8c59661867b66fc9dec1b3209b52b6f615010b822805b343a100f6278f935a6ad2b57762197a5782c94e136902aabad89861263caacef9834ea SHA512 2ed21ab6dca7653e829fc7dd26fbef32aa66d354ada006ee798f0483a5c9907a9264fbd367320cd12f55e728a880c5da1b105cee73b2df6a4a6642e317e0ac7d
-MISC metadata.xml 336 BLAKE2B c8f534b3eb5adf1f4e4b71a95b4dd7ecb6ddcf954d617eaf960a08d6ee43818c948c9ed72cbe252159a4185feaddef8a294e41277416618237a271ec84e90e5e SHA512 20b4ab7e8cf4ef4f714003fb96a18e249ab4a0fb5956e7f1475e827ff9dcbca0901abfeaab2b3d52e58745f21e0d09cfd20f58668d5074db8bc6d0a34438a5e3
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-base/libglade/libglade-2.6.4-r2.ebuild b/gnome-base/libglade/libglade-2.6.4-r2.ebuild
deleted file mode 100644
index 5e004a473cb6..000000000000
--- a/gnome-base/libglade/libglade-2.6.4-r2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="bz2"
-GNOME2_LA_PUNT="yes"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='xml(+)'
-
-inherit autotools eutils gnome2 multilib-minimal python-single-r1 virtualx
-
-DESCRIPTION="Library to construct graphical interfaces at runtime"
-HOMEPAGE="https://library.gnome.org/devel/libglade/stable/"
-
-LICENSE="LGPL-2"
-SLOT="2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs test tools"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="tools? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
-	>=dev-libs/atk-2.10.0[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-	tools? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	use tools && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# patch to stop make install installing the xml catalog
-	# because we do it ourselves in postinst()
-	epatch "${FILESDIR}"/Makefile.in.am-2.4.2-xmlcatalog.patch
-
-	# patch to not throw a warning with gtk+-2.14 during tests, as it triggers abort
-	epatch "${FILESDIR}/${PN}-2.6.3-fix_tests-page_size.patch"
-
-	# Fails with gold due to recent changes in glib-2.32's pkg-config files
-	epatch "${FILESDIR}/${P}-gold-glib-2.32.patch"
-
-	# Needed for solaris, else gcc finds a syntax error in /usr/include/signal.h
-	epatch "${FILESDIR}/${P}-enable-extensions.patch"
-
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
-		glade/Makefile.am glade/Makefile.in || die
-
-	if ! use test; then
-		sed 's/ tests//' -i Makefile.am Makefile.in || die "sed failed"
-	fi
-
-	gnome2_src_prepare
-	AT_NOELIBTOOLIZE=yes eautoreconf
-}
-
-multilib_src_configure() {
-	if ! multilib_is_native_abi || ! use tools; then
-		export am_cv_pathless_PYTHON=none
-	fi
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(use_enable static-libs static)
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/html doc/html || die
-	fi
-}
-
-multilib_src_test() {
-	Xemake check || die "make check failed"
-}
-
-multilib_src_install() {
-	dodir /etc/xml
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	local DOCS=( AUTHORS ChangeLog NEWS README )
-	einstalldocs
-}
-
-pkg_postinst() {
-	echo ">>> Updating XML catalog"
-	"${EPREFIX}"/usr/bin/xmlcatalog --noout --add "system" \
-		"https://glade.gnome.org/glade-2.0.dtd" \
-		"${EPREFIX}"/usr/share/xml/libglade/glade-2.0.dtd /etc/xml/catalog
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	echo ">>> removing entries from the XML catalog"
-	"${EPREFIX}"/usr/bin/xmlcatalog --noout --del \
-		"${EPREFIX}"/usr/share/xml/libglade/glade-2.0.dtd /etc/xml/catalog
-}
diff --git a/gnome-base/libglade/metadata.xml b/gnome-base/libglade/metadata.xml
index be1a70fa45d5..996e7cacd217 100644
--- a/gnome-base/libglade/metadata.xml
+++ b/gnome-base/libglade/metadata.xml
@@ -5,7 +5,4 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="tools">Install libglade-convert Python script.</flag>
-	</use>
 </pkgmetadata>