commit:     f266f45b0aa27911a71f5eea26fa4cacbe176fc5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 16 15:04:54 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 16 18:01:31 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f266f45b

x11-libs/gtkglext: treeclean

Closes: https://bugs.gentoo.org/698950 (pkgremoved)
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 profiles/package.mask                              |   5 -
 x11-libs/gtkglext/Manifest                         |   1 -
 .../gtkglext/files/gtkglext-1.2.0-gcc8-fixes.patch |  34 --
 .../files/gtkglext-1.2.0-gl-configure.patch        | 362 ---------------------
 .../gtkglext/files/gtkglext-1.2.0-no-pangox.patch  |  92 ------
 x11-libs/gtkglext/gtkglext-1.2.0-r6.ebuild         |  56 ----
 x11-libs/gtkglext/metadata.xml                     |  11 -
 7 files changed, 561 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index e8614f22e99c..3b399c7a31c4 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -246,11 +246,6 @@ app-emulation/gallium-nine-standalone
 # Version yanked due to "unintended change in behavior".
 =dev-python/click-8.2.2
 
-# Andreas Sturmlechner <[email protected]> (2025-08-19)
-# x11-libs/gtkglext is finally without revdeps, tracker bug #698950
-# Removal on 2025-09-16
-x11-libs/gtkglext
-
 # Hans de Graaff <[email protected]> (2025-08-08)
 # ruby-openid fails tests and is archived upstream. Last release 6 years
 # ago. rack-openid is the only reverse dependency.

diff --git a/x11-libs/gtkglext/Manifest b/x11-libs/gtkglext/Manifest
deleted file mode 100644
index 6b12617c928e..000000000000
--- a/x11-libs/gtkglext/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gtkglext-1.2.0.tar.bz2 703821 BLAKE2B 
985d84cf1b87a23cfebcf536cecb087bbfd050f5131cf70b2a09e9a2e556e7f2549ed1b4b26ec6eccf790a383e3530d27171a553145614b641437c7c2d8462b5
 SHA512 
c5452b7594195da3c1428dc3021a041d70bb8079a514b7310fe7b66f638748ad2399adead36047b52b60b033757581e72f0532c0301e033019bf909f7365071d

diff --git a/x11-libs/gtkglext/files/gtkglext-1.2.0-gcc8-fixes.patch 
b/x11-libs/gtkglext/files/gtkglext-1.2.0-gcc8-fixes.patch
deleted file mode 100644
index 266f5fefc1ed..000000000000
--- a/x11-libs/gtkglext/files/gtkglext-1.2.0-gcc8-fixes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 1fe275cd7dfa9f3a6db771b0cb945d96787e72cf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <[email protected]>
-Date: Thu, 15 Mar 2018 15:56:20 +0100
-Subject: [PATCH 2/2] GCC-8 fixes.
-
----
- gdk/gdkglshapes.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gdk/gdkglshapes.c b/gdk/gdkglshapes.c
-index f72abba..9d1197f 100644
---- a/gdk/gdkglshapes.c
-+++ b/gdk/gdkglshapes.c
-@@ -544,7 +544,7 @@ static GLfloat idata[12][3] =
-   {-Z, -X, 0}
- };
- 
--static int index[20][3] =
-+static int iindex[20][3] =
- {
-   {0, 4, 1},
-   {0, 9, 4},
-@@ -574,7 +574,7 @@ icosahedron(GLenum shadeType)
-   int i;
- 
-   for (i = 19; i >= 0; i--) {
--    drawtriangle(i, idata, index, shadeType);
-+    drawtriangle(i, idata, iindex, shadeType);
-   }
- }
- 
--- 
-2.14.3
-

diff --git a/x11-libs/gtkglext/files/gtkglext-1.2.0-gl-configure.patch 
b/x11-libs/gtkglext/files/gtkglext-1.2.0-gl-configure.patch
deleted file mode 100644
index b408dba94156..000000000000
--- a/x11-libs/gtkglext/files/gtkglext-1.2.0-gl-configure.patch
+++ /dev/null
@@ -1,362 +0,0 @@
-Fix broken multilib gl and glu detection
-https://bugs.gentoo.org/543050
-https://bugs.gentoo.org/578482
-
---- gtkglext-1.2.0/configure.in
-+++ gtkglext-1.2.0/configure.in
-@@ -139,6 +139,7 @@
- AC_ISC_POSIX
- #AM_DISABLE_STATIC
- AC_LIBTOOL_WIN32_DLL
-+AC_PROG_CXX
- AC_PROG_LIBTOOL
- 
- platform_win32=no
-@@ -502,275 +503,59 @@
- # Checks for OpenGL
- ##################################################
- 
--GL_CFLAGS=""
--GL_LDFLAGS=""
--GL_LIBS=""
--
--AC_ARG_WITH([gl-prefix],
--            [AC_HELP_STRING([--with-gl-prefix=DIR],
--                            [OpenGL (Mesa) is installed in DIR 
[default=auto]])], ,
--            [with_gl_prefix=auto])
--
--AC_ARG_WITH([gl-includedir],
--            [AC_HELP_STRING([--with-gl-includedir=DIR],
--                            [OpenGL (Mesa) headers are in DIR 
[default=auto]])], ,
--            [with_gl_includedir=auto])
--
--AC_ARG_WITH([gl-libdir],
--            [AC_HELP_STRING([--with-gl-libdir=DIR],
--                            [OpenGL (Mesa) libraries are in DIR 
[default=auto]])], ,
--            [with_gl_libdir=auto])
--
--if test "x$with_gl_includedir" != "xauto"; then
--  GL_CFLAGS="-I$with_gl_includedir"
--elif test "x$with_gl_prefix" != "xauto"; then
--  GL_CFLAGS="-I$with_gl_prefix/include"
--fi
--
--if test "x$with_gl_libdir" != "xauto"; then
--  GL_LDFLAGS="-L$with_gl_libdir"
--elif test "x$with_gl_prefix" != "xauto"; then
--  GL_LDFLAGS="-L$with_gl_prefix/lib"
--fi
--
--save_CPPFLAGS="$CPPFLAGS"
--CPPFLAGS="$CPPFLAGS $GL_CFLAGS $WINDOWING_CFLAGS"
--save_LIBS="$LIBS"
--LIBS="$LIBS $GL_LDFLAGS $WINDOWING_LIBS $MATH_LIB"
--
- if test "x$gdktarget" = "xx11"; then
--  AC_CHECK_HEADERS([GL/glx.h], ,
--                   [AC_MSG_ERROR([Cannot find GLX header])])
-+  with_gl=x
- fi
- 
--AC_CHECK_HEADERS([GL/gl.h GL/glu.h], ,
--                 [AC_MSG_ERROR([Cannot find OpenGL headers])])
--
--if test "x$gdktarget" = "xx11"; then
--
--  # for X11
--
--  THREAD_LIB="-lpthread"
--  STDCXX_LIB="-lstdc++"
--
--  have_GL=no
--  GL_LIB_NAME=GL
--
--  # GLcore and GL (SGI)
--  AC_CHECK_LIB([GLcore], [glVertex3d],
--               [GL_LIBS="-lGLcore"])
--  if test "x$ac_cv_lib_GLcore_glVertex3d" = "xyes" ; then
--    # if GLcore found, then also check for GL
--    AC_CHECK_LIB([GL], [glXCreateContext],
--                 [GL_LIBS="-lGL $GL_LIBS"
--                  have_GL=yes])
--  fi
--
--  # GL
--  if test "x$have_GL" = "xno" ; then
--    # if no GLcore and GL, check for GL
--    AC_CHECK_LIB([GL], [glVertex3d],
--                 [GL_LIBS="-lGL"
--                  have_GL=yes])
--    if test "x$ac_cv_lib_GL_glVertex3d" = "xno" ; then
--      # GL may need to be linked with the thread library explicitly
--      AC_CHECK_LIB([GL], [glVertex3f],
--                   [GL_LIBS="-lGL $THREAD_LIB"
--                    have_GL=yes], ,
--                   [$THREAD_LIB])
--      if test "x$ac_cv_lib_GL_glVertex3f" = "xno" ; then
--        # GL may need to be linked with std C++ library explicitly
--        AC_CHECK_LIB([GL], [glVertex3i],
--                     [GL_LIBS="-lGL $STDCXX_LIB"
--                      have_GL=yes], ,
--                     [$STDCXX_LIB])
--        if test "x$ac_cv_lib_GL_glVertex3i" = "xno" ; then
--          # GL may need to be linked with std C++ and thread libraries 
explicitly
--          AC_CHECK_LIB([GL], [glVertex3s],
--                       [GL_LIBS="-lGL $STDCXX_LIB $THREAD_LIB"
--                        have_GL=yes], ,
--                       [$STDCXX_LIB $THREAD_LIB])
--        fi
--      fi
--    fi
--  fi
--
--  # MesaGL
--  if test "x$have_GL" = "xno" ; then
--    # if no GL, check for MesaGL
--    AC_CHECK_LIB([MesaGL], [glVertex3d],
--                 [GL_LIBS="-lMesaGL"
--                  have_GL=yes
--                  GL_LIB_NAME=MesaGL])
--  fi
--
--  if test "x$have_GL" = "xno" ; then
--    # no GL found
--    AC_MSG_ERROR([Cannot find GL library])
--  fi
--
--  # GLU
--
--  have_GLU=no
--  have_SGI_GLU=no
--
--  AC_CHECK_LIB([GLU], [gluSphere],
--               [GL_LIBS="-lGLU $GL_LIBS"
--                have_GLU=yes], ,
--               [$GL_LIBS])
--  if test "x$ac_cv_lib_GLU_gluSphere" = "xno" ; then
--    # GLU may need to be linked with the thread library explicitly
--    AC_CHECK_LIB([GLU], [gluCylinder],
--                 [GL_LIBS="-lGLU $GL_LIBS $THREAD_LIB"
--                  have_GLU=yes], ,
--                 [$GL_LIBS $THREAD_LIB])
--    if test "x$ac_cv_lib_GLU_gluCylinder" = "xno" ; then
--      # GLU may need to be linked with std C++ library explicitly
--      AC_CHECK_LIB([GLU], [gluDisk],
--                   [GL_LIBS="-lGLU $GL_LIBS $STDCXX_LIB"
--                    have_GLU=yes
--                    have_SGI_GLU=yes], ,
--                   [$GL_LIBS $STDCXX_LIB])
--      if test "x$ac_cv_lib_GLU_gluDisk" = "xno" ; then
--        # GLU may need to be linked with std C++ and thread libraries 
explicitly
--        AC_CHECK_LIB([GLU], [gluPartialDisk],
--                     [GL_LIBS="-lGLU $GL_LIBS $STDCXX_LIB $THREAD_LIB"
--                      have_GLU=yes
--                      have_SGI_GLU=yes], ,
--                     [$GL_LIBS $STDCXX_LIB $THREAD_LIB])
--      fi
--    fi
--  fi
--
--  if test "x$have_GLU" = "xno" ; then
--    # if no GLU, check for MesaGLU
--    AC_CHECK_LIB([MesaGLU], [gluSphere],
--                 [GL_LIBS="-lMesaGLU $GL_LIBS"
--                  have_GLU=yes], ,
--                 [$GL_LIBS])
--  fi
--
--  if test "x$have_GLU" = "xno" ; then
--    # no GLU found
--    AC_MSG_ERROR([Cannot find GLU library])
--  fi
--
--  # Checks for SGI's GLU library
--  if test "x$have_SGI_GLU" = "xno" ; then
--    # Try static linking
--    save_LDFLAGS="$LDFLAGS"
--    LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
--
--    AC_CHECK_LIB([GLU], [gluBeginCurve],
--                 [have_SGI_GLU=no], ,
--                 [$GL_LIBS])
--    if test "x$ac_cv_lib_GLU_gluBeginCurve" = "xno" ; then
--      AC_CHECK_LIB([GLU], [gluBeginPolygon],
--                   [GL_LIBS="$GL_LIBS $STDCXX_LIB"
--                    have_SGI_GLU=yes], ,
--                   [$GL_LIBS $STDCXX_LIB])
--    fi
--
--    LDFLAGS="$save_LDFLAGS"
--  fi
--
--  AC_MSG_CHECKING([whether libGLU needs to be linked with the std C++ 
library])
--  AC_MSG_RESULT([$have_SGI_GLU])
--
--  # Checks for some types in gdk/GL/glxext.h
--
--  # GLXFBConfigSGIX
--  GDKGLEXT_NEED_GLXFBCONFIGSGIX_TYPEDEF=no
--  AC_CHECK_TYPES([GLXFBConfigSGIX], , ,
--                 [#include <GL/glx.h>])
--  if test "x$ac_cv_type_GLXFBConfigSGIX" = "xno" ; then
--    GDKGLEXT_NEED_GLXFBCONFIGSGIX_TYPEDEF=yes
--  fi
--
--  # GLXFBConfigIDSGIX
--  GDKGLEXT_NEED_GLXFBCONFIGIDSGIX_TYPEDEF=no
--  AC_CHECK_TYPES([GLXFBConfigIDSGIX], , ,
--                 [#include <GL/glx.h>])
--  if test "x$ac_cv_type_GLXFBConfigIDSGIX" = "xno" ; then
--    GDKGLEXT_NEED_GLXFBCONFIGIDSGIX_TYPEDEF=yes
--  fi
--
--  # GLXPbufferSGIX
--  GDKGLEXT_NEED_GLXPBUFFERSGIX_TYPEDEF=no
--  AC_CHECK_TYPES([GLXPbufferSGIX], , ,
--                 [#include <GL/glx.h>])
--  if test "x$ac_cv_type_GLXPbufferSGIX" = "xno" ; then
--    GDKGLEXT_NEED_GLXPBUFFERSGIX_TYPEDEF=yes
--  fi
--
--  # GLXVideoSourceSGIX
--  GDKGLEXT_NEED_GLXVIDEOSOURCESGIX_TYPEDEF=no
--  AC_CHECK_TYPES([GLXVideoSourceSGIX], , ,
--                 [#include <GL/glx.h>])
--  if test "x$ac_cv_type_GLXVideoSourceSGIX" = "xno" ; then
--    GDKGLEXT_NEED_GLXVIDEOSOURCESGIX_TYPEDEF=yes
--  fi
--
--  # __GLXextFuncPtr
--  GDKGLEXT_NEED_GLXEXTFUNCPTR_TYPEDEF=no
--  AC_CHECK_TYPES([__GLXextFuncPtr], , ,
--                 [#include <GL/glx.h>])
--  if test "x$ac_cv_type___GLXextFuncPtr" = "xno" ; then
--    GDKGLEXT_NEED_GLXEXTFUNCPTR_TYPEDEF=yes
--  fi
--
--else
--
--  # for Win32
--
--  AC_MSG_CHECKING([for glNewList in -lopengl32])
--  have_opengl32=no
--  LIBS="-lopengl32 $LIBS"
--  AC_TRY_LINK([#include <windows.h>
--               #include <GL/gl.h>], 
--              [glVertex3d(0.0, 0.0, 0.0);], 
--              [GL_LIBS="-lopengl32"
--               have_opengl32=yes])
--  AC_MSG_RESULT([$have_opengl32])
--  if test "x$have_opengl32" = "xno" ; then
--    AC_MSG_ERROR([Cannot find GL library])
--  fi
--
--  AC_MSG_CHECKING([for gluNewQuadric in -lglu32])
--  have_glu32=no
--  LIBS="-lglu32 $LIBS"
--  AC_TRY_LINK([#include <windows.h>
--               #include <GL/gl.h>
--               #include <GL/glu.h>], 
--              [gluNewQuadric();], 
--              [GL_LIBS="-lglu32 $GL_LIBS"
--               have_glu32=yes])
--  AC_MSG_RESULT([$have_glu32])
--  if test "x$have_glu32" = "xno" ; then
--    AC_MSG_ERROR([Cannot find GLU library])
--  fi
--
--dnl   AC_CHECK_LIB(opengl32, glNewList,
--dnl                GL_LIBS="-lopengl32",
--dnl                AC_MSG_ERROR(Cannot find GL library))
--
--dnl   AC_CHECK_LIB(glu32, gluNewQuadric,
--dnl                GL_LIBS="-lglu32 $GL_LIBS",
--dnl                AC_MSG_ERROR(Cannot find GLU library),
--dnl                $GL_LIBS)
--
-+AX_CHECK_GL
-+AS_IF([test X$no_gl = Xyes],
-+      [AC_MSG_FAILURE([OpenGL is required.])])
-+AX_CHECK_GLU
-+# FIXME: AX_CHECK_GLU's behavior diverges from common autoconf conventions
-+AM_CONDITIONAL([GLU],[test "$no_glu" != yes])
-+
-+# Checks for some types in gdk/GL/glxext.h
-+
-+# GLXFBConfigSGIX
-+GDKGLEXT_NEED_GLXFBCONFIGSGIX_TYPEDEF=no
-+AC_CHECK_TYPES([GLXFBConfigSGIX], , ,
-+               [#include <GL/glx.h>])
-+if test "x$ac_cv_type_GLXFBConfigSGIX" = "xno" ; then
-+  GDKGLEXT_NEED_GLXFBCONFIGSGIX_TYPEDEF=yes
-+fi
-+
-+# GLXFBConfigIDSGIX
-+GDKGLEXT_NEED_GLXFBCONFIGIDSGIX_TYPEDEF=no
-+AC_CHECK_TYPES([GLXFBConfigIDSGIX], , ,
-+               [#include <GL/glx.h>])
-+if test "x$ac_cv_type_GLXFBConfigIDSGIX" = "xno" ; then
-+  GDKGLEXT_NEED_GLXFBCONFIGIDSGIX_TYPEDEF=yes
-+fi
-+
-+# GLXPbufferSGIX
-+GDKGLEXT_NEED_GLXPBUFFERSGIX_TYPEDEF=no
-+AC_CHECK_TYPES([GLXPbufferSGIX], , ,
-+               [#include <GL/glx.h>])
-+if test "x$ac_cv_type_GLXPbufferSGIX" = "xno" ; then
-+  GDKGLEXT_NEED_GLXPBUFFERSGIX_TYPEDEF=yes
-+fi
-+
-+# GLXVideoSourceSGIX
-+GDKGLEXT_NEED_GLXVIDEOSOURCESGIX_TYPEDEF=no
-+AC_CHECK_TYPES([GLXVideoSourceSGIX], , ,
-+               [#include <GL/glx.h>])
-+if test "x$ac_cv_type_GLXVideoSourceSGIX" = "xno" ; then
-+  GDKGLEXT_NEED_GLXVIDEOSOURCESGIX_TYPEDEF=yes
-+fi
-+
-+# __GLXextFuncPtr
-+GDKGLEXT_NEED_GLXEXTFUNCPTR_TYPEDEF=no
-+AC_CHECK_TYPES([__GLXextFuncPtr], , ,
-+               [#include <GL/glx.h>])
-+if test "x$ac_cv_type___GLXextFuncPtr" = "xno" ; then
-+  GDKGLEXT_NEED_GLXEXTFUNCPTR_TYPEDEF=yes
- fi
- 
--dnl # if using mesa, check for xmesa.h
--dnl if test "x$ac_cv_lib_MesaGL_glNewList" = "xyes" ; then
--dnl   AC_CHECK_HEADERS([GL/xmesa.h])
--dnl   AM_CONDITIONAL(ENABLE_XMESA_FX, \
--dnl                  test "x$ac_cv_header_GL_xmesa_h" = "xyes")
--dnl else
--dnl   # force a failed check
--dnl   AM_CONDITIONAL(ENABLE_XMESA_FX, test "no" = "yes")
--dnl fi
--
- # Checks for typedefs in gdk/GL/glext.h
- 
- # GLhalfNV
-@@ -781,22 +566,13 @@
-   GDKGLEXT_NEED_GLHALFNV_TYPEDEF=yes
- fi
- 
--GL_LIBS="$GL_LDFLAGS $GL_LIBS"
--
--AC_SUBST([GL_CFLAGS])
--AC_SUBST([GL_LIBS])
--
--CPPFLAGS="$save_CPPFLAGS"
--LIBS="$save_LIBS"
--
--
- ##################################################
- # CFLAGS and LIBS
- ##################################################
- 
- GDKGLEXT_PACKAGES="gdk_pkg pango_pkg pangox_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`"
- GDKGLEXT_DEP_LIBS="$GDKGLEXT_EXTRA_LIBS `$PKG_CONFIG --libs 
$GDKGLEXT_PACKAGES` $MATH_LIB"
- AC_SUBST([GDKGLEXT_PACKAGES])

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
deleted file mode 100644
index f1d282d6cde5..000000000000
--- a/x11-libs/gtkglext/files/gtkglext-1.2.0-no-pangox.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -59,10 +59,6 @@
- m4_define([pango_pkg], [pango])
- m4_define([pango_required_version], [1.0.0])
- 
--# Pangox
--m4_define([pangox_pkg], [pangox])
--m4_define([pangox_required_version], [1.0.0])
--
- # PangoFT2
- m4_define([pangoft2_pkg], [pangoft2])
- m4_define([pangoft2_required_version], [1.0.0])
-@@ -350,7 +346,6 @@
- gtk_pkg >= gtk_required_version \
- gdk_pkg >= gdk_required_version \
- pango_pkg >= pango_required_version \
--pangox_pkg >= pangox_required_version \
- gmodule_pkg >= gmodule_required_version \
- ])
- 
-@@ -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 $GLU_LIBS $GDKGLEXT_WIN_LIBS"
- GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags 
$GDKGLEXT_PACKAGES`"
---- a/gdk/x11/gdkglfont-x11.c
-+++ b/gdk/x11/gdkglfont-x11.c
-@@ -18,7 +18,8 @@
- 
- #include <string.h>
- 
--#include <pango/pangox.h>
-+//#include <pango/pangox.h>
-+#include <pango/pangocairo.h>
- 
- #include "gdkglx.h"
- #include "gdkglprivate-x11.h"
-@@ -77,9 +78,9 @@
- {
-   PangoFont *font = NULL;
-   gchar *charset = NULL;
--  PangoXSubfont subfont_id;
-+  //PangoXSubfont subfont_id;
-   gchar *xlfd = NULL;
--  PangoXFontCache *font_cache;
-+  //PangoXFontCache *font_cache;
-   XFontStruct *fs;
- 
-   GDK_GL_NOTE_FUNC_PRIVATE ();
-@@ -91,6 +92,7 @@
-       goto FAIL;
-     }
- 
-+  /*
-   charset = gdk_gl_font_charset_for_locale ();
-   if (!pango_x_find_first_subfont (font, &charset, 1, &subfont_id))
-     {
-@@ -114,6 +116,7 @@
-   glXUseXFont (fs->fid, first, count, list_base);
- 
-   pango_x_font_cache_unload (font_cache, fs);
-+  */
- 
-  FAIL:
- 
-@@ -149,11 +152,7 @@
- 
-   GDK_GL_NOTE_FUNC ();
- 
--#ifdef GDKGLEXT_MULTIHEAD_SUPPORT
--  font_map = pango_x_font_map_for_display (GDK_DISPLAY_XDISPLAY 
(gdk_display_get_default ()));
--#else  /* GDKGLEXT_MULTIHEAD_SUPPORT */
--  font_map = pango_x_font_map_for_display (gdk_x11_get_default_xdisplay ());
--#endif /* GDKGLEXT_MULTIHEAD_SUPPORT */
-+  font_map = pango_cairo_font_map_get_default ();
- 
-   return gdk_gl_font_use_pango_font_common (font_map, font_desc,
-                                             first, count, list_base);
-@@ -187,7 +186,7 @@
- 
-   GDK_GL_NOTE_FUNC ();
- 
--  font_map = pango_x_font_map_for_display (GDK_DISPLAY_XDISPLAY (display));
-+  font_map = pango_cairo_font_map_get_default ();
- 
-   return gdk_gl_font_use_pango_font_common (font_map, font_desc,
-                                             first, count, list_base);

diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r6.ebuild 
b/x11-libs/gtkglext/gtkglext-1.2.0-r6.ebuild
deleted file mode 100644
index fda38717ebd8..000000000000
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-GNOME2_EAUTORECONF=yes
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="GL extensions for Gtk+ 2.0"
-HOMEPAGE="http://gtkglext.sourceforge.net/";
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2";
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
-
-RDEPEND="
-       >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-       >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
-       >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
-       >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-       >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
-       >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-       >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-       dev-util/glib-utils
-       >=dev-build/autoconf-archive-2014.02.28
-       virtual/pkgconfig
-"
-
-PATCHES=(
-       # Fix build issues with gcc patch from Fedora, bug #649718
-       "${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
-       "${FILESDIR}"/${P}-gl-configure.patch
-
-       # Drop pangox-compat dep with patch from Fedora, bugs #698950, #706344
-       "${FILESDIR}"/${P}-no-pangox.patch
-)
-
-multilib_src_configure() {
-       ECONF_SOURCE="${S}" gnome2_src_configure
-}
-
-multilib_src_install() {
-       gnome2_src_install
-}
-
-multilib_src_install_all() {
-       local DOCS=( AUTHORS ChangeLog{,.pre-1-0} NEWS README TODO )
-       einstalldocs
-}

diff --git a/x11-libs/gtkglext/metadata.xml b/x11-libs/gtkglext/metadata.xml
deleted file mode 100644
index d6d3335b6c63..000000000000
--- a/x11-libs/gtkglext/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Gentoo GNOME Desktop</name>
-       </maintainer>
-       <upstream>
-               <remote-id type="sourceforge">gtkglext</remote-id>
-       </upstream>
-</pkgmetadata>

Reply via email to