gentoo auto-resync : 14:05:2024 - 00:01:24

10 files changed, 83 insertions, 638 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index bdf7b0c21a5d..c124655d4d22 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/hercules-sdl/Manifest b/app-emulation/hercules-sdl/Manifest
index a1ec3b0877bb..5874205c7622 100644
--- a/app-emulation/hercules-sdl/Manifest
+++ b/app-emulation/hercules-sdl/Manifest
@@ -1,10 +1,5 @@
 AUX gen_hashes.sh 706 BLAKE2B 85e0f867ea7012a9859f75cf8802ce85b50b23c2a7b48a117983874e3e47a8695042da20eb26c9d47933fa5b9d4e8f1de644542be703d544693d287e978ca070 SHA512 060b413470ffd57b304dc091a57cbdac4cfb8c44f23230607ba16d133840fd27a4da47ed3965aaca6a65a14960cb5835675ee2d76f2345dc95add06de946f14b
-AUX hercules-3.13-htmldir.patch 960 BLAKE2B 2eccc3c00c2cbc6025d65c1baff374b7f86edee3b0c4eec8d3ca791bed84e13b8c6c2cc0cde7b890c2f138f74e9d22fc9014bcd94c22dbb336009ccc84c7f851 SHA512 42b35915ee13fb94187e67baf969098327f8a2bb118a8b356236cba89a3d8dc360366bae1aec7e9542474ed57df2a733d8fd756bac19fd735750fc63cb704a82
-AUX hercules-3.13-posix-test.patch 1184 BLAKE2B 4d87fe365de07270b3adea242e940ee2a8eea8c946b5f1c67ba0c4abfe3b51a656c5cba2b0154f2b8ff05d8a7a3414255c760eaa0e5a3922631c61d4355bf875 SHA512 23755468397fedc6dca0e1dd6c0c65323ebb32d29f642ee677279fcc00df369327eb8e0b7de6e1e9bbc90d591b6bdd0fedc7c150bea002617fb06ab6bf3d0ef6
-AUX hercules-3.13-unbundle-libltdl.patch 14102 BLAKE2B 45862802246327ae89a7778e2c27939dcc2e3d9db5cc0774d5c457799987a43093e07980add8d86cf3ab8010d9c0c66b6a7e8b315634f83a0df0a087c77305db SHA512 3be153d1baf29e066109e996fe9e3ec06c723f4ccbba997098a79b887324cd3041665d59eb3a1fa08698608e441a4755e9c52130e10624062d364d4ff91c926f
-AUX hercules-3.13-user-install.patch 655 BLAKE2B 1ec0fc4628312180ec0fbdc24f2da9b6dc4344143b4a92dad1d4cc90c8aaa8ca632800e0dfdb2a7af0795d4b2fa356ea73b340cfe01cce799ab284d69cf501df SHA512 e2ee00e9efb582bd5d02f9bbd1481b38db7eee91e721ebf4d3158a8b7e22086ba09b72b07b08f1a815ae24e0211b5e1181e3a3ae4f0316206ae3f8dc6c704d2a
 AUX hercules-sdl-4.4.1-htmldir.patch 774 BLAKE2B 3cf3c50c60059ae0bd042333c2220669f87aa37cf632d1bc2cec738e02ca5f74a2a4302e484a73b6e9df32edb8c4bf2c0a2198c32e1242cab970e4a819c254c1 SHA512 bae45addb0c4f339b93d9709119b7df5d330978e60b982349244b98a72b157f86180454fa82ff9918a082f705a06a379ff3212f59bd5c1777090bb0cf03b9795
-AUX hercules-sdl-4.4.1-unbundle-libltdl.patch 8078 BLAKE2B ff2e892071142067fce6f9a545c185cd62d167888948a0c45eefee8dd2f4a04fc0687593fff325eeef0dbae0c2c4787d618c83f53fd447e46387fae8f6e4cd1b SHA512 87d5ef1da708ce72f6244de1f12deacb49550acda47f62bb4a5320c909f9b4519ac489c2442c4a1778c9228d2f38c50b2f9f2c1c7450952e9a1101199d2bb7fa
 DIST hercules-sdl-4.7.tar.gz 25439384 BLAKE2B 78a8d2df947c80e23d0e956a25a4f009dd32b09f2834cc06373f685badf9f1e657bf0f4e4408c7085371c46085718998076f3a6063caf80c9161b1fa7caa91eb SHA512 9d7060c4e2687358b9547b59b47362d642cbf2bf009085fdd41e485170d0f81029ee3d04d12b905a3a266cd26a9087e92c231c3f4600c32a8535a6140656b7b0
 EBUILD hercules-sdl-4.7.0.ebuild 2604 BLAKE2B 916d399a2d0a53ade95495d1788399543ebe41000cb480307af7425c78cfe2adeaa53a753f9e66eedb3786a9d875794f1f44ef15a80653718bc02a8ed01add2d SHA512 1c4242b251e4b4d0ecf84b7e796a242ded35adeb686726bfe4833c0c4c1c69b0705f3216e6a31f24e9876a39b6315d228d65d149d8ca66a08cc77755f27abf47
 MISC metadata.xml 1141 BLAKE2B b630c058fe32f2410985e53779d387fc007759f2bd36ad8240a2b6a2157b6c5921cfb4aa14ed3b513e0f787d9838bab46a6ceadd031d33daa2a3190d2ca64095 SHA512 fe090b27c7d46e6a9fee40a9d948f4124814d134cb64ff7f7d7b2d341f1db9313f5d071e5c34a312a3dacbe643c8083ba98a3b0058fa3886b9d024d6ecb17575
diff --git a/app-emulation/hercules-sdl/files/hercules-3.13-htmldir.patch b/app-emulation/hercules-sdl/files/hercules-3.13-htmldir.patch
deleted file mode 100644
index 962611b87edd..000000000000
--- a/app-emulation/hercules-sdl/files/hercules-3.13-htmldir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/html/Makefile.am
-+++ b/html/Makefile.am
-@@ -1,4 +1,4 @@
--dist_pkgdata_DATA =   cckddasd.html fishgui.html  hercconf.html hercfaq.html     \
-+dist_html_DATA =   cckddasd.html fishgui.html  hercconf.html hercfaq.html     \
-         hercinst.html herclic.html  hercload.html hercmsca.html hercmscf.html  \
-         hercmscp.html hercmsct.html hercmscu.html hercmsda.html hercmsdc.html \
-         hercmsdg.html hercmsdi.html hercmsdl.html hercmsds.html hercmsdt.html \
-@@ -12,7 +12,7 @@
- 
- include_sources = include/header.htmlpart include/footer.htmlpart
- 
--include_pkgdatadir = $(pkgdatadir)/include
-+include_pkgdatadir = $(htmldir)/include
- 
- dist_include_pkgdata_DATA = $(include_sources)
- 
-@@ -33,6 +33,6 @@
-         images/interruptu.gif images/redu.gif images/waitonu.gif \
-         images/loadd.gif images/restartd.gif
- 
--images_pkgdatadir = $(pkgdatadir)/images
-+images_pkgdatadir = $(htmldir)/images
- 
- dist_images_pkgdata_DATA = $(images_sources)
diff --git a/app-emulation/hercules-sdl/files/hercules-3.13-posix-test.patch b/app-emulation/hercules-sdl/files/hercules-3.13-posix-test.patch
deleted file mode 100644
index abee4b0cc5ed..000000000000
--- a/app-emulation/hercules-sdl/files/hercules-3.13-posix-test.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://github.com/rbowler/spinhawk/pull/106
-
-From 9a9f7182069b8fe0483383c177882218244bad16 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 18 Nov 2021 02:32:02 -0500
-Subject: [PATCH] avoid bashism in test call
-
-POSIX test only supports =, not ==.
----
- autoconf/hercules.m4 | 2 +-
- configure.ac         | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f12d47058562..8dd420af8d13 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -562,7 +562,7 @@ AC_CHECK_DECLS( SIOCADDRT,            [hc_cv_have_siocaddrt=yes],           [hc_
- AC_CHECK_DECLS( SIOCDELRT,            [hc_cv_have_siocdelrt=yes],           [hc_cv_have_siocdelrt=no],           [#include <linux/sockios.h>] )
- AC_CHECK_DECLS( SIOCDIFADDR,          [hc_cv_have_siocdifaddr=yes],         [hc_cv_have_siocdifaddr=no],         [#include <linux/sockios.h>] )
- 
--if test "$hc_cv_have_sys_mtio_h" == "yes"; then
-+if test "$hc_cv_have_sys_mtio_h" = "yes"; then
-     AC_CHECK_DECLS( MTEWARN,          [hc_cv_have_mtewarn=yes],             [hc_cv_have_mtewarn=no],             [#include <sys/mtio.h>] )
- else
-     hc_cv_have_mtewarn=no
--- 
-2.33.0
-
diff --git a/app-emulation/hercules-sdl/files/hercules-3.13-unbundle-libltdl.patch b/app-emulation/hercules-sdl/files/hercules-3.13-unbundle-libltdl.patch
deleted file mode 100644
index c96831d96ad2..000000000000
--- a/app-emulation/hercules-sdl/files/hercules-3.13-unbundle-libltdl.patch
+++ /dev/null
@@ -1,379 +0,0 @@
---- a/bootstrap.c
-+++ b/bootstrap.c
-@@ -11,7 +11,7 @@
- #include "hstdinc.h"
- #include "hercules.h"
- #if defined(HDL_USE_LIBTOOL)
--#include "ltdl.h"
-+#include <ltdl.h>
- #endif
- 
- #if !defined( _MSVC_ )
---- a/configure.ac
-+++ b/configure.ac
-@@ -12,7 +12,7 @@
- AC_REVISION($Revision$)          # (the version of this configure.ac)
- AC_CONFIG_AUX_DIR(autoconf)             # (directory containing auxillary build tools)
- AM_INIT_AUTOMAKE(hercules,3.13)         # (the version of our software package)
--AM_CONFIG_HEADER(config.h)              # (the file the resulting configure script will produce)
-+AC_CONFIG_HEADERS(config.h)              # (the file the resulting configure script will produce)
- AM_MAINTAINER_MODE()
- AC_CANONICAL_HOST()                     # (sets $host_cpu, $host_vendor, and $host_os)
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-@@ -38,154 +38,8 @@
- modexecdir='$(libdir)/$(PACKAGE)'
- AC_SUBST(modexecdir)
- 
--
--# -----------------------------------------------------------------------------
--#
--#  AC_LIBTOOL_DLOPEN
--#
--#       Enable checking for dlopen support. This macro should be used if the
--#       package makes use of the '-dlopen' and '-dlpreopen' flags, otherwise
--#       libtool will assume that the system does not support dlopening. The
--#       macro must be called before AC_PROG_LIBTOOL.
--#
--# -----------------------------------------------------------------------------
--
--AC_LIBTOOL_DLOPEN()                     # (we need libtool's dlopen support)
--
--
--# -----------------------------------------------------------------------------
--#
--#  AC_LIBTOOL_WIN32_DLL
--#
--#       This macro should be used if the package has been ported to build
--#       clean dlls on win32 platforms. Usually this means that any library
--#       data items are exported with __declspec(dllexport) and imported with
--#       __declspec(dllimport). If this macro is not used, libtool will assume
--#       that the package libraries are not dll clean and will build only static
--#       libraries on win32 hosts.
--#
--#       This macro must be called before AC_PROG_LIBTOOL, and provision must
--#       be made to pass '-no-undefined' to libtool in link mode from the package
--#       Makefile. Naturally, if you pass '-no-undefined', you must ensure that
--#       all the library symbols really are defined at link time!
--#
--# -----------------------------------------------------------------------------
--
--AC_LIBTOOL_WIN32_DLL()                  # (we need Win32 support in libtool)
--
--
--# -----------------------------------------------------------------------------
--#  See: 'AC_PROG_LIBTOOL' below.
--# -----------------------------------------------------------------------------
--
--AC_DISABLE_STATIC()                     # (forces libtool to build shared
--
--                                        #  libraries instead of static ones)
--# -----------------------------------------------------------------------------
--#  AC_PROG_LIBTOOL
--#
--#       Add support for the '--enable-shared' and '--disable-shared'
--#       configure flags. By default, this macro turns on shared libraries
--#       if they are available, and also enables static libraries if they
--#       don't conflict with the shared libraries. You can modify these
--#       defaults by calling either the AC_DISABLE_SHARED or AC_DISABLE_STATIC
--#       macros.
--#
--#       Hercules REQUIRES shared libraries (i.e. DLLs), so we do indeed use
--#       the AC_DISABLE_STATIC macro above.
--#
--# -----------------------------------------------------------------------------
--
--AC_PROG_LIBTOOL()                       # (we build libtool for ourselves)
--
--
--# -----------------------------------------------------------------------------
--#
--#  AC_LIB_LTDL
--#
--#       Even though libltdl is installed together with libtool, you may wish
--#       to include libltdl in the distribution of your package, for the convenience
--#       of users of your package that don't have libtool or libltdl installed.
--#
--#       The most simplistic way to add libltdl to your package is to copy the
--#       source files, 'ltdl.c' and 'ltdl.h', to a source directory withing your
--#       package and to build and link them along with the rest of your sources.
--#
--#       To do this, you must add a call to the 'AC_LIB_LTDL' macro to your package's
--#       'configure.in' to perform the required configure time checks in order that
--#       'ltdl.o' is built correctly.
--#
--#       This method does have its problems though: if you try to link the package
--#       binaries with an installed libltdl, or a library which depends on libltdl,
--#       you may have problems with duplicate symbol definitions.
--#
--#       In order to enable this flavor of libltdl, you should add the line
--#       'AC_LIBLTDL_CONVENIENCE' to your `configure.in', before 'AC_PROG_LIBTOOL'.
--#
--#       In order to select the installable version of libltdl, you should add a
--#       call of the macro 'AC_LIBLTDL_INSTALLABLE' to your 'configure.in' before
--#       'AC_PROG_LIBTOOL'. This macro will check whether libltdl is already
--#       installed and, if not, request the libltdl embedded in your package to be
--#       built and installed.
--#
--#       Whatever macro you use, it is up to you to ensure that your 'configure.in'
--#       will configure libltdl, using 'AC_CONFIG_SUBDIRS', and that your 'Makefile's
--#       will start sub-makes within libltdl's directory, using automake's SUBDIRS,
--#       for example. Both macros define the shell variables LIBLTDL, to the link flag
--#       that you should use to link with libltdl, and LTDLINCL, to the preprocessor
--#       flag that you should use to compile with programs that include 'ltdl.h'. It
--#       is up to you to use 'AC_SUBST' to ensure that this variable will be available
--#       in 'Makefile's, or add them to variables that are 'AC_SUBST'ed by default,
--#       such as LIBS and CPPFLAGS.
--#
--#       So, when you want to link a program with libltdl, be it a convenience,
--#       installed or installable library, just compile with '$(LTDLINCL)' and link
--#       it with '$(LIBLTDL)', using libtool.
--#
--#       You should probably also add 'AC_LIBTOOL_DLOPEN' to your 'configure.in' before
--#       'AC_PROG_LIBTOOL', otherwise libtool will assume no dlopening mechanism is
--#       supported, and revert to dlpreopening, which is probably not what you want.
--#
--#       The following example shows you how to embed the convenience libltdl
--#       in your package. In order to use the installable variant just replace
--#       'AC_LIBLTDL_CONVENIENCE' with 'AC_LIBLTDL_INSTALLABLE'. We assume that libltdl
--#       was embedded using 'libtoolize --ltdl':
--#
--#           configure.in:
--#
--#               ...
--#               dnl Enable building of the convenience library
--#               dnl and set LIBLTDL accordingly
--#               AC_LIBLTDL_CONVENIENCE
--#               dnl Substitute LTDLINCL and LIBLTDL in the Makefiles
--#               AC_SUBST(LTDLINCL)
--#               AC_SUBST(LIBLTDL)
--#               dnl Check for dlopen support
--#               AC_LIBTOOL_DLOPEN
--#               dnl Configure libtool
--#               AC_PROG_LIBTOOL
--#               dnl Configure libltdl
--#               AC_CONFIG_SUBDIRS(libltdl)
--#               ...
--#
--#           Makefile.am:
--#
--#               ...
--#               SUBDIRS = libltdl
--#
--#               INCLUDES = $(LTDLINCL)
--#
--#               myprog_LDFLAGS = -export-dynamic
--#               # The quotes around -dlopen below fool automake <= 1.4 into accepting it
--#               myprog_LDADD = $(LIBLTDL) "-dlopen" self "-dlopen" foo1.la
--#               myprog_DEPENDENCIES = $(LIBLTDL) foo1.la
--#               ...
--#
--# -----------------------------------------------------------------------------
--
--AC_LIB_LTDL()                           # (we need the ltdl libtool library)
--AC_SUBST([LIBTOOL_DEPS])                # (see PROGRAMMING NOTE above)
--
-+LT_PREREQ([2.2.6])
-+LT_INIT([dlopen win32-dll disable-static])
- 
- # -----------------------------------------------------------------------------
- # (See comments in the 'AC_CHECK_LIB' Libraries section further below)
---- a/crypto/Makefile.am
-+++ b/crypto/Makefile.am
-@@ -23,7 +23,6 @@
- 
- if OPTION_DYNAMIC_LOAD
-   DYNSRC         =
--  LTDL           = ../ltdl.c
- 
-   DYNMOD_LD_FLAGS = -module         \
-                    -no-undefined   \
-@@ -31,7 +30,7 @@
-                    -export-dynamic \
-                    -avoid-version
- 
--  DYNMOD_LD_ADD   = $(LDADD)
-+  DYNMOD_LD_ADD   = $(LDADD) -lltdl
- 
-   LIB_LD_FLAGS    = -export-dynamic  \
-                    $(XSTATIC)       \
-@@ -39,7 +38,6 @@
-                    -avoid-version
- else
-   DYNSRC         = $(dyndev_SRC)
--  LTDL           =
-   DYNMOD_LD_FLAGS =
-   DYNMOD_LD_ADD =
-   LIB_LD_FLAGS    = $(XSTATIC)    \
---- a/decNumber/Makefile.am
-+++ b/decNumber/Makefile.am
-@@ -37,13 +37,13 @@
- endif
- 
- if OPTION_DYNAMIC_LOAD
--  LTDL  	 = ../ltdl.c
-+  LIB_LD_ADD      = -lltdl
-   LIB_LD_FLAGS    = -export-dynamic  \
- 		   $(XSTATIC)       \
- 		   -no-undefined    \
- 		   -avoid-version
- else
--  LTDL  	 =
-+  LIB_LD_ADD      =
-   LIB_LD_FLAGS    = $(XSTATIC)    \
- 		   -no-undefined \
- 		   -avoid-version
-@@ -56,7 +56,7 @@
- 
-   libdecNumber_la_SOURCES = $(decNumber_SRC)
-   libdecNumber_la_LDFLAGS = $(LIB_LD_FLAGS)
--  libdecNumber_la_LIBADD  = $(LDADD)
-+  libdecNumber_la_LIBADD  = $(LDADD) $(LIB_LD_ADD)
- 
- noinst_HEADERS = decContext.h      \
- 		 decDPD.h          \
---- a/fillfnam.c
-+++ b/fillfnam.c
-@@ -5,6 +5,8 @@
- #include "hercules.h"
- #include "fillfnam.h"
- 
-+#include <dirent.h>
-+
- /* On Solaris 2.9 (SunOS 5.9) and earlier, there is no scandir
-    and alphasort function. In this case fillfnam does nothing
-    and the tab command is effectively a no-operation */
---- a/herclin.c
-+++ b/herclin.c
-@@ -26,7 +26,7 @@
- /* This must be included if HDL uses the   */
- /* libtool ltdl convenience library        */
- 
--#include "ltdl.h"
-+#include <ltdl.h>
- #endif
- 
- 
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -98,7 +98,7 @@
- 
- if OPTION_DYNAMIC_LOAD
-   DYNSRC         =
--  LTDL           = ltdl.c
-+  LIB_LD_ADD     = -lltdl
- 
-   DYNMOD_LD_FLAGS = -module         \
-                    -no-undefined    \
-@@ -109,7 +109,8 @@
-   DYNMOD_LD_ADD   = libherc.la    \
-                    libhercs.la    \
-                    libhercu.la    \
--                   $(LDADD)
-+                   $(LDADD)       \
-+                   $(LIB_LD_ADD)
- 
-   LIB_LD_FLAGS    = -export-dynamic  \
-                    $(XSTATIC)        \
-@@ -117,7 +118,6 @@
-                    -avoid-version
- else
-   DYNSRC         = $(dyndev_SRC)
--  LTDL           =
-   DYNMOD_LD_FLAGS =
-   DYNMOD_LD_ADD =
-   LIB_LD_FLAGS    = $(XSTATIC)    \
-@@ -295,12 +295,11 @@
-                         memrchr.c    \
-                         parser.c     \
-                         pttrace.c    \
--                        $(FTHREADS)  \
--                        $(LTDL)
-+                        $(FTHREADS)
- 
-   libhercu_la_LDFLAGS = $(LIB_LD_FLAGS)
- 
--  libhercu_la_LIBADD  = $(LDADD) libhercs.la
-+  libhercu_la_LIBADD  = $(LDADD) libhercs.la $(LIB_LD_ADD)
- 
- #
- # Core Hercules (shared) library
-@@ -372,8 +371,7 @@
-                              memrchr.c        \
-                              $(dynamic_SRC)   \
-                              $(extra_SRC)     \
--                             $(dyndev_SRC)    \
--                             ltdl.c
-+                             $(dyndev_SRC)
- 
-   libherc_la_LDFLAGS = $(LIB_LD_FLAGS)
- 
-@@ -383,7 +381,8 @@
-                       libhercd.la     \
-                       decNumber/libdecNumber.la \
-                       softfloat/libsoftfloat.la \
--                      $(LDADD)
-+                      $(LDADD) \
-+                      $(LIB_LD_ADD)
- 
- #
- # THIS is the hercules executable.
-@@ -440,7 +439,7 @@
-   hercules_SOURCES      = bootstrap.c  \
-                           hdlmain.c
- 
--  hercules_LDADD        = libherc.la libhercs.la $(LDADD)
-+  hercules_LDADD        = libherc.la libhercs.la $(LDADD) $(LIB_LD_ADD)
- 
-   hercules_LDFLAGS      = $(HLDFLAGS)
- 
-@@ -656,7 +655,6 @@
-                  hdl.h          \
-                  crypto.h       \
-                  sockdev.h      \
--                 ltdl.h         \
-                  herc_getopt.h  \
-                  service.h      \
-                  chsc.h         \
---- a/softfloat/Makefile.am
-+++ b/softfloat/Makefile.am
-@@ -22,13 +22,11 @@
- endif
- 
- if OPTION_DYNAMIC_LOAD
--  LTDL  	 = ../ltdl.c
-   LIB_LD_FLAGS    = -export-dynamic  \
- 		   $(XSTATIC)       \
- 		   -no-undefined    \
- 		   -avoid-version
- else
--  LTDL  	 =
-   LIB_LD_FLAGS    = $(XSTATIC)    \
- 		   -no-undefined \
- 		   -avoid-version
---- a/autoconf/hercules.m4
-+++ b/autoconf/hercules.m4
-@@ -270,7 +270,7 @@
- 
-     else
- 
--        if test $(./libtool --features | fgrep "enable shared libraries" | wc -l) -ne 1; then
-+        if test "$enable_shared" != "yes"; then
- 
-             #  Libtool doesn't support shared libraries,
-             #  and thus our wrapper kludge is not needed.
-@@ -280,11 +280,11 @@
-                 }
- DUPGETOPT2
- 
--            ./libtool --mode=compile ${CC-cc} conftest1.c -c -o conftest1.lo > /dev/null 2>&1
--            ./libtool --mode=compile ${CC-cc} conftest2.c -c -o conftest2.lo > /dev/null 2>&1
-+            libtool --mode=compile ${CC-cc} conftest1.c -c -o conftest1.lo > /dev/null 2>&1
-+            libtool --mode=compile ${CC-cc} conftest2.c -c -o conftest2.lo > /dev/null 2>&1
- 
--            ./libtool --mode=link ${CC-cc} -shared -rpath /lib -no-undefined conftest1.lo                 -o libconftest1.la > /dev/null 2>&1
--            ./libtool --mode=link ${CC-cc} -shared -rpath /lib -no-undefined conftest2.lo libconftest1.la -o libconftest2.la > /dev/null 2>&1
-+            libtool --mode=link ${CC-cc} -shared -rpath /lib -no-undefined conftest1.lo                 -o libconftest1.la > /dev/null 2>&1
-+            libtool --mode=link ${CC-cc} -shared -rpath /lib -no-undefined conftest2.lo libconftest1.la -o libconftest2.la > /dev/null 2>&1
- 
-             if test $? = 0; then
- 
diff --git a/app-emulation/hercules-sdl/files/hercules-3.13-user-install.patch b/app-emulation/hercules-sdl/files/hercules-3.13-user-install.patch
deleted file mode 100644
index bcde1181e873..000000000000
--- a/app-emulation/hercules-sdl/files/hercules-3.13-user-install.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-the ebuild will handle these, so no need to do it directly which will fail when
-building as non-root.
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -730,15 +730,6 @@ endif
- 	(cd $(DESTDIR)$(bindir); @LN_S@ ./dasdcopy$(EXEEXT) cfba2fba$(EXEEXT))
- 	rm -f $(DESTDIR)$(bindir)/cckd2ckd$(EXEEXT)
- 	(cd $(DESTDIR)$(bindir); @LN_S@ ./dasdcopy$(EXEEXT) cckd2ckd$(EXEEXT))
--if SETUID_HERCIFC
--	chown root $(DESTDIR)$(bindir)/hercifc
--if HERCIFC_GROUPSET
--	chgrp $(HERCIFC_GROUPNAME) $(DESTDIR)$(bindir)/hercifc
--endif
--	chmod 0750 $(DESTDIR)$(bindir)/hercifc
--	chmod +s   $(DESTDIR)$(bindir)/hercifc
--	rm                             hercifc
--endif
- 
- uninstall-local:
- 
diff --git a/app-emulation/hercules-sdl/files/hercules-sdl-4.4.1-unbundle-libltdl.patch b/app-emulation/hercules-sdl/files/hercules-sdl-4.4.1-unbundle-libltdl.patch
deleted file mode 100644
index e5bb86fbebcf..000000000000
--- a/app-emulation/hercules-sdl/files/hercules-sdl-4.4.1-unbundle-libltdl.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-diff --git a/autoconf/hercules.m4 b/autoconf/hercules.m4
-index cb962f5..31d641c 100755
---- a/autoconf/hercules.m4
-+++ b/autoconf/hercules.m4
-@@ -263,7 +263,7 @@ AC_DEFUN([_HC_CHECK_NEED_GETOPT_WRAPPER],
- 
-     else
- 
--        if test $(libtool --features | fgrep "enable shared libraries" | wc -l) -ne 1; then
-+        if test "$enable_shared" != "yes"; then
- 
-             #  Libtool doesn't support shared libraries,
-             #  and thus our wrapper kludge is not needed.
-diff --git a/configure.ac b/configure.ac
-index c657251..af23407 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -325,41 +325,6 @@ fi
- modexecdir='$(libdir)/$(PACKAGE)'
- AC_SUBST(modexecdir)
- 
--
--# -----------------------------------------------------------------------------
--#
--#  AC_LIBTOOL_DLOPEN
--#
--#       Enable checking for dlopen support. This macro should be used if the
--#       package makes use of the '-dlopen' and '-dlpreopen' flags, otherwise
--#       libtool will assume that the system does not support dlopening. The
--#       macro must be called before AC_PROG_LIBTOOL.
--#
--# -----------------------------------------------------------------------------
--
--AC_LIBTOOL_DLOPEN()                     # (we need libtool's dlopen support)
--
--
--# -----------------------------------------------------------------------------
--#
--#  AC_LIBTOOL_WIN32_DLL
--#
--#       This macro should be used if the package has been ported to build
--#       clean dlls on win32 platforms. Usually this means that any library
--#       data items are exported with __declspec(dllexport) and imported with
--#       __declspec(dllimport). If this macro is not used, libtool will assume
--#       that the package libraries are not dll clean and will build only static
--#       libraries on win32 hosts.
--#
--#       This macro must be called before AC_PROG_LIBTOOL, and provision must
--#       be made to pass '-no-undefined' to libtool in link mode from the package
--#       Makefile. Naturally, if you pass '-no-undefined', you must ensure that
--#       all the library symbols really are defined at link time!
--#
--# -----------------------------------------------------------------------------
--
--AC_LIBTOOL_WIN32_DLL()                  # (we need Win32 support in libtool)
--
- # -----------------------------------------------------------------------------
- #  This is a hack:
- #
-@@ -395,117 +360,8 @@ case $host_os in
-       ;;
- esac
- 
--# -----------------------------------------------------------------------------
--#  See: 'AC_PROG_LIBTOOL' below.
--# -----------------------------------------------------------------------------
--
--AC_DISABLE_STATIC()                     # (forces libtool to build shared
--                                        #  libraries instead of static ones)
--
--# -----------------------------------------------------------------------------
--#  AC_PROG_LIBTOOL
--#
--#       Add support for the '--enable-shared' and '--disable-shared'
--#       configure flags. By default, this macro turns on shared libraries
--#       if they are available, and also enables static libraries if they
--#       don't conflict with the shared libraries. You can modify these
--#       defaults by calling either the AC_DISABLE_SHARED or AC_DISABLE_STATIC
--#       macros.
--#
--#       Hercules REQUIRES shared libraries (i.e. DLLs), so we do indeed use
--#       the AC_DISABLE_STATIC macro above.
--#
--# -----------------------------------------------------------------------------
--
--AC_PROG_LIBTOOL()                       # (we build libtool for ourselves)
--
--
--# -----------------------------------------------------------------------------
--#
--#  AC_LIB_LTDL
--#
--#       Even though libltdl is installed together with libtool, you may wish
--#       to include libltdl in the distribution of your package, for the convenience
--#       of users of your package that don't have libtool or libltdl installed.
--#
--#       The most simplistic way to add libltdl to your package is to copy the
--#       source files, 'ltdl.c' and 'ltdl.h', to a source directory withing your
--#       package and to build and link them along with the rest of your sources.
--#
--#       To do this, you must add a call to the 'AC_LIB_LTDL' macro to your package's
--#       'configure.in' to perform the required configure time checks in order that
--#       'ltdl.o' is built correctly.
--#
--#       This method does have its problems though: if you try to link the package
--#       binaries with an installed libltdl, or a library which depends on libltdl,
--#       you may have problems with duplicate symbol definitions.
--#
--#       In order to enable this flavor of libltdl, you should add the line
--#       'AC_LIBLTDL_CONVENIENCE' to your `configure.in', before 'AC_PROG_LIBTOOL'.
--#
--#       In order to select the installable version of libltdl, you should add a
--#       call of the macro 'AC_LIBLTDL_INSTALLABLE' to your 'configure.in' before
--#       'AC_PROG_LIBTOOL'. This macro will check whether libltdl is already
--#       installed and, if not, request the libltdl embedded in your package to be
--#       built and installed.
--#
--#       Whatever macro you use, it is up to you to ensure that your 'configure.in'
--#       will configure libltdl, using 'AC_CONFIG_SUBDIRS', and that your 'Makefile's
--#       will start sub-makes within libltdl's directory, using automake's SUBDIRS,
--#       for example. Both macros define the shell variables LIBLTDL, to the link flag
--#       that you should use to link with libltdl, and LTDLINCL, to the preprocessor
--#       flag that you should use to compile with programs that include 'ltdl.h'. It
--#       is up to you to use 'AC_SUBST' to ensure that this variable will be available
--#       in 'Makefile's, or add them to variables that are 'AC_SUBST'ed by default,
--#       such as LIBS and CPPFLAGS.
--#
--#       So, when you want to link a program with libltdl, be it a convenience,
--#       installed or installable library, just compile with '$(LTDLINCL)' and link
--#       it with '$(LIBLTDL)', using libtool.
--#
--#       You should probably also add 'AC_LIBTOOL_DLOPEN' to your 'configure.in' before
--#       'AC_PROG_LIBTOOL', otherwise libtool will assume no dlopening mechanism is
--#       supported, and revert to dlpreopening, which is probably not what you want.
--#
--#       The following example shows you how to embed the convenience libltdl
--#       in your package. In order to use the installable variant just replace
--#       'AC_LIBLTDL_CONVENIENCE' with 'AC_LIBLTDL_INSTALLABLE'. We assume that libltdl
--#       was embedded using 'libtoolize --ltdl':
--#
--#           configure.in:
--#
--#               ...
--#               dnl Enable building of the convenience library
--#               dnl and set LIBLTDL accordingly
--#               AC_LIBLTDL_CONVENIENCE
--#               dnl Substitute LTDLINCL and LIBLTDL in the Makefiles
--#               AC_SUBST(LTDLINCL)
--#               AC_SUBST(LIBLTDL)
--#               dnl Check for dlopen support
--#               AC_LIBTOOL_DLOPEN
--#               dnl Configure libtool
--#               AC_PROG_LIBTOOL
--#               dnl Configure libltdl
--#               AC_CONFIG_SUBDIRS(libltdl)
--#               ...
--#
--#           Makefile.am:
--#
--#               ...
--#               SUBDIRS = libltdl
--#
--#               INCLUDES = $(LTDLINCL)
--#
--#               myprog_LDFLAGS = -export-dynamic
--#               # The quotes around -dlopen below fool automake <= 1.4 into accepting it
--#               myprog_LDADD = $(LIBLTDL) "-dlopen" self "-dlopen" foo1.la
--#               myprog_DEPENDENCIES = $(LIBLTDL) foo1.la
--#               ...
--#
--# -----------------------------------------------------------------------------
--
--AC_LIB_LTDL()                           # (we need the ltdl libtool library)
--AC_SUBST([LIBTOOL_DEPS])                # (see PROGRAMMING NOTE above)
-+LT_PREREQ([2.2.6])
-+LT_INIT([dlopen win32-dll disable-static])
- 
- # -----------------------------------------------------------------------------
- # (See comments in the 'AC_CHECK_LIB' Libraries section further below)
diff --git a/app-emulation/x48/Manifest b/app-emulation/x48/Manifest
index 662bd241fa18..8d6341dd51f4 100644
--- a/app-emulation/x48/Manifest
+++ b/app-emulation/x48/Manifest
@@ -1,5 +1,7 @@
+AUX x48-0.6.4-configure.patch 274 BLAKE2B 04f73a74ba030608019e5f3df21d77a5258bb4f6b65865fd118944ccf35cd0ce3edef909b2a631d9b2b1153d75ec8f072a170b0d7f14ecd5797dcca7dab9a0f8 SHA512 f865c3a1461bd271c76a2520aa1c7e7d8e867fe53d8c0be011d982a32c4d76868ab4d4db2b628cba39e3f92cbacba34c44cf0e30adc587c7cb0637ef77ff56c4
 AUX x48-0.6.4-static.patch 317 BLAKE2B 0ba80504f6dfdb992735496198808445778d6f75ecd7d21f276801857efcbf5a6d215d081b8ea79031fe5fcadf2dc1875854f80f6003575d9e2be03c2f7cb21f SHA512 22c97b2236b78c148cab19386718ea0be333eef8ab356da20f80d7805fdae4e73a1552faab15bd86a4644e2b149a924f65ba57cba5bef8f740ecb69930e7b794
 AUX x48-0.6.4-void_return.patch 657 BLAKE2B d72125691d4cabe90ea326f03204061ef3eca46e2b47cc43c91a67b3a994f8f995fbc313d368bbec1d3782d1aff46ff7064ebaf65f503efa28f0d468874f1256 SHA512 48d8fffff6f7a9727c813dbbc6332577d8d9f8622466af9658c135a2503a2b5b961f4c193cab3127352308716a9ab92bb6eb120897bdca9ae52482eacd12ac6e
 DIST x48-0.6.4.tar.bz2 227991 BLAKE2B 8db2962860eeb161a8efc9d46730c71d95d0331157e3e2481a978385ad54b04b7a4eb601c68e7df966194b23e0cd04bed4e80511d22695bb7ccdd3959d8fd8d7 SHA512 60fdba1171a02e4a5f9bcefb29fff9398fdbda50553c3d3b952fab0b4ebf87b219d4615139ca3673b1c61ff6d6559aab3e93218334aa6cdb442d4861347138ce
 EBUILD x48-0.6.4-r2.ebuild 1673 BLAKE2B 3a12391074a827fcd6ea827bed2c496ecde27aeb7bedd00856eb062c41db354bb37766c27993c096d4b6fffd240b18552254d2cb838b8e859d285aa611db86a0 SHA512 f777fdb3dedaec66ce412ca7fb2b1614ba884e81ceff4340441672121b34dbb82d22f66d6e4948f1f41d0fe4d1b5d035fa79c21dc45988f52cdcf8cdcba5cb23
+EBUILD x48-0.6.4-r3.ebuild 1737 BLAKE2B 7cddf1c7fb8473935e2e1d9a24f8aec2a20576754a7fa6bec1eb4c80ba6972708f02e5a0e40aba6b4d1a10a5897c585e832d1fafe11c1e336aa37ef4d7fda0af SHA512 3b635bbf96f6bbdebc877a0c4a81000425b58cae10cb303cc073cb812e6d875d49d28414f0c88f9f9ad7c0e6c846e67751f3847057f1f93128e7605a085c0d66
 MISC metadata.xml 426 BLAKE2B d00a2da134019be301b01a2ad9e1b9fe683cc04fff89a6795d5888ef2c502c915784259491fab3a3d76af100652115aa0e3e544cb2ec3f02fb6fc28339a61a96 SHA512 ac188c36cf417a91598db0ea673cb92eb5661d8b2d3bdcff9982098957df05152d71fe3b0df66bb37ed5191ae81df0a75d0b3554470268c9c05c0209eaeea40f
diff --git a/app-emulation/x48/files/x48-0.6.4-configure.patch b/app-emulation/x48/files/x48-0.6.4-configure.patch
new file mode 100644
index 000000000000..ea3a883991a8
--- /dev/null
+++ b/app-emulation/x48/files/x48-0.6.4-configure.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2024-05-12 12:01:50.591368113 -0000
++++ b/configure.ac	2024-05-12 12:05:39.116023749 -0000
+@@ -10,6 +10,8 @@
+ AC_CONFIG_SRCDIR([config.h.in])
+ AC_CONFIG_HEADER([config.h])
+ 
++
++AC_USE_SYSTEM_EXTENSIONS
+ # Checks for programs.
+ AC_PROG_CC
+ AC_PROG_INSTALL
diff --git a/app-emulation/x48/x48-0.6.4-r3.ebuild b/app-emulation/x48/x48-0.6.4-r3.ebuild
new file mode 100644
index 000000000000..c584c99e820a
--- /dev/null
+++ b/app-emulation/x48/x48-0.6.4-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="HP48 Calculator Emulator"
+HOMEPAGE="https://sourceforge.net/projects/x48.berlios/"
+SRC_URI="https://downloads.sourceforge.net/x48.berlios/${P}.tar.bz2"
+S=${WORKDIR}
+
+LICENSE="GPL-3"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="readline"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	readline? ( sys-libs/readline:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-libs/libXt"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-static.patch
+	"${FILESDIR}"/${P}-void_return.patch
+	"${FILESDIR}"/${P}-configure.patch
+	)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable readline)
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/"${PN}"/romdump
+	doins -r romdump/{README,ROMDump*}
+}
+
+pkg_postinst() {
+	elog "The X48 emulator requires an HP48 ROM image to run."
+	elog
+	elog "If you own an HP-48 calculator, you can use the ROMDump utility"
+	elog "included with this package to obtain it from your calculator."
+	elog "The instructions of how to do this are included in the package."
+	elog
+	elog "Alternatively, HP has provided the ROM images for non-commercial"
+	elog "use only."
+	elog
+	elog "Due to confusion over the legal status of these ROMs you must"
+	elog "manually download one from http://www.hpcalc.org/hp48/pc/emulators/"
+	elog
+	elog "If you do not know which one to use, try 'HP 48GX Revision R ROM.'"
+	elog
+	elog "Once you have a ROM, you will need to install it by running:"
+	elog
+	elog "x48 -rom gxrom-r"
+	elog
+	elog "You will only have to do this the first time you run X48. The"
+	elog "ROM will be stored in ~/.hp48/rom for future runs."
+}