gentoo auto-resync : 30:03:2024 - 01:13:30

4 files changed, 104 insertions, 1 deletions

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 678ef1906729..5613098cf9d7 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/libglade/Manifest b/gnome-base/libglade/Manifest
index 2f17a64c7ba0..551a14f6a3ff 100644
--- a/gnome-base/libglade/Manifest
+++ b/gnome-base/libglade/Manifest
@@ -3,5 +3,6 @@ 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-r3.ebuild 2464 BLAKE2B 1f4627af1b6dd58d7f4384ff0157118f8cd87ff1027eb5f65ae3e78aaa95d9b80a5ffd0d25c3b67ab8889db8e23b37c62bd28523862e12346c2c4acf9c8852f8 SHA512 d83b9355a84b8f2587e1381239617c688c68fc9ea5debb0627025b0d63cef426a3cc7021607fd4cf5f7e1b5a932ab3dc83df41ff92e4f2980bb0c8d6d336e8d9
+EBUILD libglade-2.6.4-r3.ebuild 2643 BLAKE2B 8fb80601ead855deec3bf7d6e95d878d52baaf6c41d8f124d0815f31995f7809d1628fa0da3742d4cb1c86a30da3b77e1af81cf9bc60c525524726abff7fed29 SHA512 9baae066615cd682ec41d864a20d833e4c0b737f7c0e015534177f9ae56639b24110f69141e1aacd1d83994e521cd455c4da0a3f3a4b95eb618fcb8ecb61f9e0
+EBUILD libglade-2.6.4-r4.ebuild 2609 BLAKE2B a41c8e9beb86ae85202432d6c065cbc0c4f213855cc1a24ee8a55137278abe86d7ce067537bad37c9ebd46a8a7257a47a63d4851a107ce55bdadcf40e77d2520 SHA512 1801a629e14f0745cd8cb05550185c84d9965d6fa960d8eaa7b1f5f3fb79fad86b0a567143d6e0d3ef04920e410f36884c65524a2fc801c88b0c61eb05230f53
 MISC metadata.xml 351 BLAKE2B cc4d6563ceb784367a57c977106f98baf09152743858fcc001abf480100fd3ba640f8af3c3bab3d3ae7adc1ffaca91affa027522155fdc2d332256e37b9df17d SHA512 20a0f8c79d16071643e9fe5a0bef748deb237e16b54ce83007cfbdeffe588d53294516a08a909ea77a4f06be954e8c65738ed655591416e93b85e67fa899eee8
diff --git a/gnome-base/libglade/libglade-2.6.4-r3.ebuild b/gnome-base/libglade/libglade-2.6.4-r3.ebuild
index 27bc8a768063..658e633a8348 100644
--- a/gnome-base/libglade/libglade-2.6.4-r3.ebuild
+++ b/gnome-base/libglade/libglade-2.6.4-r3.ebuild
@@ -45,6 +45,10 @@ src_prepare() {
 		sed 's/ tests//' -i Makefile.am Makefile.in || die "sed failed"
 	fi
 
+	# Deprecated macro that does nothing. Provided by gnome-base/gnome-common
+	# but adding an additional bdep for this is silly.
+	sed -i '/GNOME_COMMON_INIT/d' configure.in || die
+
 	mv configure.in configure.ac || die
 	gnome2_src_prepare
 }
diff --git a/gnome-base/libglade/libglade-2.6.4-r4.ebuild b/gnome-base/libglade/libglade-2.6.4-r4.ebuild
new file mode 100644
index 000000000000..f66e17c1d37c
--- /dev/null
+++ b/gnome-base/libglade/libglade-2.6.4-r4.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GNOME_TARBALL_SUFFIX="bz2"
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2 multilib-minimal 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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+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}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-build/gtk-doc-am
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# patch to stop make install installing the xml catalog
+	# because we do it ourselves in postinst()
+	"${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
+	"${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
+	"${FILESDIR}/${P}-gold-glib-2.32.patch"
+
+	# Needed for solaris, else gcc finds a syntax error in /usr/include/signal.h
+	"${FILESDIR}/${P}-enable-extensions.patch"
+)
+
+src_prepare() {
+	if ! use test; then
+		sed 's/ tests//' -i Makefile.am Makefile.in || die "sed failed"
+	fi
+
+	# Deprecated macro that does nothing. Provided by gnome-base/gnome-common
+	# but adding an additional bdep for this is silly.
+	sed -i '/GNOME_COMMON_INIT/d' configure.in || die
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	export am_cv_pathless_PYTHON=none
+
+	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() {
+	virtx emake 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
+}