gentoo auto-resync : 08:10:2023 - 00:01:40

4 files changed, 27 insertions, 125 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index f8f010ff61c3..7c06ba9a3208 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gtkglext/Manifest b/x11-libs/gtkglext/Manifest
index 822b7a63ec72..48d873b71efa 100644
--- a/x11-libs/gtkglext/Manifest
+++ b/x11-libs/gtkglext/Manifest
@@ -1,6 +1,6 @@
 AUX gtkglext-1.2.0-gcc8-fixes.patch 791 BLAKE2B d0f17c83bccd6e92c640383fecdce384cd0ecb92868f3f70d87b16aed8a85357e9391134c3c233549f7471d64e02416bde03ff92028d8d2f19eacd3802542875 SHA512 b6240ce1f293e3bd37d71a09233417c4acfa2a7fce05ba65ba364181e6075f86fc72797586b93fb81e057ab8de2191ad345415bd6cc6e29e38945cfb4362f3cb
 AUX gtkglext-1.2.0-gl-configure.patch 11350 BLAKE2B ad0cadfa12bda13866da64433935520bcbb77a9fb430640d31c66b14ffb867a1ae1cb236e459b9d13c0493279185dbe8c8eddafce86abd14b2ab4b2d0a59a0f9 SHA512 b164b8e64ff8fbe6d9b3437100c35d1352056094c4395fc1df4a40d8c91edf7543317ec05e3a05af1da9fe432817e312e7a8fc80fd3343824365d4579046f8fb
-AUX gtkglext-1.2.0-no-pangox.patch 5636 BLAKE2B 3c871cb2c37199d10cce761be9658090b630fa4b83bded75db4210f65986f70cc9f7eb4f2689d48f0a6c3d6ca79167532fedaee2baf0022545c8b0a8ba458987 SHA512 ccec3aae5a577cec6fdb7146af4faaa54afd9830942f83c400d7d083d2e53a1f684624d70590a53cc0e54d6fd1de90f13d7926fdee03b49bbec5f365f05214ee
+AUX gtkglext-1.2.0-no-pangox.patch 2642 BLAKE2B c5d2e71671e370c2e267fa04d2aef5e68f7c55a056e40248231d4ff3deb6f9e89e72a5ac81a9d020fea6dd8f6a09e6ee01e5e9c73ff2876bde98739c990b7d6a SHA512 1117c3dc9a375c3a2f12e841a7601442ec46ff975047bac6f59e6cc7b6e18c155f90178b8fc9d403af684d4874f0f99717b5030b966030e008a7b8675e58158b
 DIST gtkglext-1.2.0.tar.bz2 703821 BLAKE2B 985d84cf1b87a23cfebcf536cecb087bbfd050f5131cf70b2a09e9a2e556e7f2549ed1b4b26ec6eccf790a383e3530d27171a553145614b641437c7c2d8462b5 SHA512 c5452b7594195da3c1428dc3021a041d70bb8079a514b7310fe7b66f638748ad2399adead36047b52b60b033757581e72f0532c0301e033019bf909f7365071d
-EBUILD gtkglext-1.2.0-r5.ebuild 1617 BLAKE2B 46c83bb703b76e40389c64634234dc606f3bf4960583fa6dcc3d80b113869b4281f81c2ac3a3b8947baec16f52d768da927be0db4c8054990e69a94fdff6ea45 SHA512 dcb297a87c4bc7b79df57692d2709d058d779642fc9ae406709204eb3ea2d2cf1c6395d15fe240e40365d8f9fcf9e2dee379bf504d2ccea07eaac77ce17323ff
+EBUILD gtkglext-1.2.0-r6.ebuild 1508 BLAKE2B 948dca5dfae5f818dd6d3ac283f3ffb08480f5240b2351fd4376663d534b1059c30162c0b23229d8f4075cc77bc2847c7d72c55f6acf5b69948b9b9d6dd6c5f2 SHA512 4250c5cbe6e660e2c7aa2fb582163b4882b24b924ef96d2e396b3f1b7ef7ac9480e0632e546585ff0fe3b9d92a01a583b1a97670237b0c14776fc23437622588
 MISC metadata.xml 332 BLAKE2B 79fc244fae58275829c8b97d085f3ab08c3c0bfe98174bfa927288961561c152b9028cc0b0861f7f81ec6eb3fd7bc92687d0f802834de260e0e1c46986fbcc03 SHA512 6f638585589780b2c98b7e5faf9166c90c60f7db78d08f2d9468dc10e539e360c74fe796bf10ed0e320e43de78fa0f1b3e66bb74ea29494b1cbbf4d48df6dd3a
diff --git a/x11-libs/gtkglext/files/gtkglext-1.2.0-no-pangox.patch b/x11-libs/gtkglext/files/gtkglext-1.2.0-no-pangox.patch
index 1a0799959be6..f1d282d6cde5 100644
--- a/x11-libs/gtkglext/files/gtkglext-1.2.0-no-pangox.patch
+++ b/x11-libs/gtkglext/files/gtkglext-1.2.0-no-pangox.patch
@@ -1,7 +1,6 @@
-diff -up gtkglext-1.2.0/configure.in.nopangox gtkglext-1.2.0/configure.in
---- gtkglext-1.2.0/configure.in.nopangox	2006-02-04 22:17:19.000000000 -0500
-+++ gtkglext-1.2.0/configure.in	2020-07-13 15:52:42.616448758 -0400
-@@ -59,10 +59,6 @@ m4_define([gmodule_required_version], [2
+--- a/configure.in
++++ b/configure.in
+@@ -59,10 +59,6 @@
  m4_define([pango_pkg], [pango])
  m4_define([pango_required_version], [1.0.0])
  
@@ -12,7 +11,7 @@ diff -up gtkglext-1.2.0/configure.in.nopangox gtkglext-1.2.0/configure.in
  # PangoFT2
  m4_define([pangoft2_pkg], [pangoft2])
  m4_define([pangoft2_required_version], [1.0.0])
-@@ -349,7 +345,6 @@ PKG_CHECK_MODULES([BASE_DEPENDENCIES], [
+@@ -350,7 +346,6 @@
  gtk_pkg >= gtk_required_version \
  gdk_pkg >= gdk_required_version \
  pango_pkg >= pango_required_version \
@@ -20,108 +19,17 @@ diff -up gtkglext-1.2.0/configure.in.nopangox gtkglext-1.2.0/configure.in
  gmodule_pkg >= gmodule_required_version \
  ])
  
-@@ -794,7 +789,7 @@ LIBS="$save_LIBS"
+@@ -570,7 +565,7 @@
  # CFLAGS and LIBS
  ##################################################
  
 -GDKGLEXT_PACKAGES="gdk_pkg pango_pkg pangox_pkg gmodule_pkg"
 +GDKGLEXT_PACKAGES="gdk_pkg pango_pkg gmodule_pkg"
  GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS"
- GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS"
+ GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GLU_LIBS $GDKGLEXT_WIN_LIBS"
  GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`"
-diff -up gtkglext-1.2.0/configure.nopangox gtkglext-1.2.0/configure
---- gtkglext-1.2.0/configure.nopangox	2006-02-04 22:17:47.000000000 -0500
-+++ gtkglext-1.2.0/configure	2020-07-13 15:52:42.619448711 -0400
-@@ -19880,14 +19880,12 @@ if test -n "$PKG_CONFIG"; then
- gtk+-2.0 >= 2.0.0 \\
- gdk-2.0 >= 2.0.0 \\
- pango >= 1.0.0 \\
--pangox >= 1.0.0 \\
- gmodule-2.0 >= 2.0.0 \\
- \"") >&5
-   ($PKG_CONFIG --exists --print-errors "\
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
--pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- ") 2>&5
-   ac_status=$?
-@@ -19897,7 +19895,6 @@ gmodule-2.0 >= 2.0.0 \
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
--pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- " 2>/dev/null`
- else
-@@ -19916,14 +19913,12 @@ if test -n "$PKG_CONFIG"; then
- gtk+-2.0 >= 2.0.0 \\
- gdk-2.0 >= 2.0.0 \\
- pango >= 1.0.0 \\
--pangox >= 1.0.0 \\
- gmodule-2.0 >= 2.0.0 \\
- \"") >&5
-   ($PKG_CONFIG --exists --print-errors "\
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
--pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- ") 2>&5
-   ac_status=$?
-@@ -19933,7 +19928,6 @@ gmodule-2.0 >= 2.0.0 \
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
--pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- " 2>/dev/null`
- else
-@@ -19958,7 +19952,6 @@ fi
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
--pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- "`
-         else
-@@ -19966,7 +19959,6 @@ gmodule-2.0 >= 2.0.0 \
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
--pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- "`
-         fi
-@@ -19977,7 +19969,6 @@ gmodule-2.0 >= 2.0.0 \
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
--pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- ) were not met:
- 
-@@ -19994,7 +19985,6 @@ echo "$as_me: error: Package requirement
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
--pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- ) were not met:
- 
-@@ -25420,7 +25410,7 @@ LIBS="$save_LIBS"
- # CFLAGS and LIBS
- ##################################################
- 
--GDKGLEXT_PACKAGES="gdk-2.0 pango pangox gmodule-2.0"
-+GDKGLEXT_PACKAGES="gdk-2.0 pango gmodule-2.0"
- GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS"
- GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS"
- GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`"
-diff -up gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c.nopangox gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c
---- gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c.nopangox	2004-02-20 04:38:14.000000000 -0500
-+++ gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c	2020-07-13 15:55:19.720973082 -0400
+--- a/gdk/x11/gdkglfont-x11.c
++++ b/gdk/x11/gdkglfont-x11.c
 @@ -18,7 +18,8 @@
  
  #include <string.h>
@@ -132,7 +40,7 @@ diff -up gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c.nopangox gtkglext-1.2.0/gdk/x11/
  
  #include "gdkglx.h"
  #include "gdkglprivate-x11.h"
-@@ -77,9 +78,9 @@ gdk_gl_font_use_pango_font_common (Pango
+@@ -77,9 +78,9 @@
  {
    PangoFont *font = NULL;
    gchar *charset = NULL;
@@ -144,7 +52,7 @@ diff -up gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c.nopangox gtkglext-1.2.0/gdk/x11/
    XFontStruct *fs;
  
    GDK_GL_NOTE_FUNC_PRIVATE ();
-@@ -91,6 +92,7 @@ gdk_gl_font_use_pango_font_common (Pango
+@@ -91,6 +92,7 @@
        goto FAIL;
      }
  
@@ -152,7 +60,7 @@ diff -up gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c.nopangox gtkglext-1.2.0/gdk/x11/
    charset = gdk_gl_font_charset_for_locale ();
    if (!pango_x_find_first_subfont (font, &charset, 1, &subfont_id))
      {
-@@ -114,6 +116,7 @@ gdk_gl_font_use_pango_font_common (Pango
+@@ -114,6 +116,7 @@
    glXUseXFont (fs->fid, first, count, list_base);
  
    pango_x_font_cache_unload (font_cache, fs);
@@ -160,7 +68,7 @@ diff -up gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c.nopangox gtkglext-1.2.0/gdk/x11/
  
   FAIL:
  
-@@ -149,11 +152,7 @@ gdk_gl_font_use_pango_font (const PangoF
+@@ -149,11 +152,7 @@
  
    GDK_GL_NOTE_FUNC ();
  
@@ -173,7 +81,7 @@ diff -up gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c.nopangox gtkglext-1.2.0/gdk/x11/
  
    return gdk_gl_font_use_pango_font_common (font_map, font_desc,
                                              first, count, list_base);
-@@ -187,7 +186,7 @@ gdk_gl_font_use_pango_font_for_display (
+@@ -187,7 +186,7 @@
  
    GDK_GL_NOTE_FUNC ();
  
diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r5.ebuild b/x11-libs/gtkglext/gtkglext-1.2.0-r6.ebuild
index ff4f55ef3255..ab2a5140f426 100644
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r5.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r6.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit autotools gnome2 multilib-minimal
+GNOME2_EAUTORECONF=yes
+inherit gnome2 multilib-minimal
 
 DESCRIPTION="GL extensions for Gtk+ 2.0"
 HOMEPAGE="http://gtkglext.sourceforge.net/"
@@ -12,7 +13,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
@@ -23,33 +23,27 @@ RDEPEND="
 	>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
 	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/glib-utils
 	>=sys-devel/autoconf-archive-2014.02.28
 	virtual/pkgconfig
 "
 
-src_prepare() {
+PATCHES=(
 	# Fix build issues with gcc patch from Fedora, bug #649718
-	eapply "${FILESDIR}"/${P}-gcc8-fixes.patch
+	"${FILESDIR}"/${P}-gcc8-fixes.patch
 
 	# Ancient configure.in with broken multilib gl detection (bug #543050)
 	# Backport some configure updates from upstream git master to fix
-	eapply "${FILESDIR}"/${P}-gl-configure.patch
+	"${FILESDIR}"/${P}-gl-configure.patch
 
 	# Drop pangox-compat dep with patch from Fedora, bugs #698950, #706344
-	eapply "${FILESDIR}"/${P}-no-pangox.patch
-
-	mv configure.{in,ac} || die "mv failed"
-	eautoreconf
-
-	gnome2_src_prepare
-}
+	"${FILESDIR}"/${P}-no-pangox.patch
+)
 
 multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--disable-static
+	ECONF_SOURCE="${S}" gnome2_src_configure
 }
 
 multilib_src_install() {