summaryrefslogtreecommitdiff
path: root/app-emulation/ski
diff options
context:
space:
mode:
Diffstat (limited to 'app-emulation/ski')
-rw-r--r--app-emulation/ski/Manifest17
-rw-r--r--app-emulation/ski/files/ski-1.3.2-AC_C_BIGENDIAN.patch75
-rw-r--r--app-emulation/ski/files/ski-1.3.2-binutils-2.34.patch22
-rw-r--r--app-emulation/ski/files/ski-1.3.2-binutils.patch31
-rw-r--r--app-emulation/ski/files/ski-1.3.2-configure-withval.patch22
-rw-r--r--app-emulation/ski/files/ski-1.3.2-gcc-10.patch22
-rw-r--r--app-emulation/ski/files/ski-1.3.2-glibc-2.28.patch8
-rw-r--r--app-emulation/ski/files/ski-1.3.2-lex-deps.patch17
-rw-r--r--app-emulation/ski/files/ski-1.3.2-ncurses-config.patch25
-rw-r--r--app-emulation/ski/files/ski-1.3.2-no-local-ltdl.patch22
-rw-r--r--app-emulation/ski/files/ski-1.3.2-prototypes.patch31
-rw-r--r--app-emulation/ski/files/ski-1.3.2-remove-hayes.patch14
-rw-r--r--app-emulation/ski/files/ski-1.3.2-syscall-linux-includes.patch18
-rw-r--r--app-emulation/ski/files/ski-1.3.2-uselib.patch18
-rw-r--r--app-emulation/ski/ski-1.3.2-r4.ebuild63
-rw-r--r--app-emulation/ski/ski-1.4.0.ebuild2
16 files changed, 2 insertions, 405 deletions
diff --git a/app-emulation/ski/Manifest b/app-emulation/ski/Manifest
index 669a59628910..fc27da8813e8 100644
--- a/app-emulation/ski/Manifest
+++ b/app-emulation/ski/Manifest
@@ -1,18 +1,3 @@
-AUX ski-1.3.2-AC_C_BIGENDIAN.patch 2266 BLAKE2B 26ca07d5e23acd9c3e0a7b3fba78e5b16e2957aa657340b1886458d17f2b97f21c1eca0bff9319d667a28b10efbb72666788d39ca5ba7068eef867302c6945dd SHA512 0970007c99f29dd19d4e64f433cd7addec8a316ec68a7e3c07c11ec3849d70086ba262883eb82f66c0517b9bf2c77399d69d72345ca0e8d9cb3723086fe4a6a0
-AUX ski-1.3.2-binutils-2.34.patch 706 BLAKE2B 194f293bcf45acc1c5678004e36dfeb974f645367e32460f7382b8b29dc436e93105883ec40acc6c0918334a6a43b9b879b901df955586d3313a8c7ea4edb955 SHA512 97ec902f92c51d1158975c9ad44586f293c7602d2c17d0fbaa1911294b5f145526b64f186bfa23778e4e33460d4d8b2a285ca1065cf13170f41d40e8a33d5233
-AUX ski-1.3.2-binutils.patch 1039 BLAKE2B 72a03fc70b3473ba760297f97cd8722c6f3b9a2dc247f57c07669ab16c112edff5250b5c79bff192ea28bdbc2024bd746a4139863904c32916f969e6e97f4b83 SHA512 b473ed658a5496c849cbb82dfeaa1913834dde60e2da17d09a4a882e87067236ecf25b807281921c86fc4a2cca5461f2a608e1a4c301d4cfda39507bdfcc4d6a
-AUX ski-1.3.2-configure-withval.patch 634 BLAKE2B 3a32acdfd37d7b2622f6add89ebdb5ca0d55a9ef6bb13f78bc4b6d82638ba63c2473bf12f1971a1aaca83f10ad0061a2d16a031bee50f9dcba5cc2c01efcd86f SHA512 38e612baf0a3fee74c3d3fa0f106b6169eb5d5594b5cfd437ab65f888dfaf151863a0d5b312ebe0b4ff882937fa4a5c2a3b6b0064fc0dabe6fd57990de4eb9ec
-AUX ski-1.3.2-gcc-10.patch 538 BLAKE2B aed07964852d344b9d2888dd4c86a31fd7b2b0c89067fb01cf2c513289faccee1f4bfffafda98298e7a2268d5b4a4c8abdc54c089408b94df0dd7dba0275e25b SHA512 9e4e4c852fce92c6566df35d95e9b35d9c655ab8fe0eb3fb8eef6a76a8241a6b882b2587ec99510368a905e2ddb5d29ffa8aef19316cd7078d94ca87ed258844
-AUX ski-1.3.2-glibc-2.28.patch 240 BLAKE2B 279fe68c7ddb734554fbe7e098eb049d710439c9f3cc63dda231c5f8f1e9551909017bd9945f390a4fe1acd82d8bb9f7ead5ac75bfea4103b4af908397df8d40 SHA512 84913716d3b6ed9ccdfac4bb15ddece97013967c5ae4e22dd6ddc7235e013832131e3f21bcba76bc07cbce4d949e149c8b8df6a59ff2141308f7a550eedbfcdc
-AUX ski-1.3.2-lex-deps.patch 358 BLAKE2B fbb49379ae9608cd23bfc30a6182b2d63782474a3b2fe660c300fef6fd89b3e1e840733ef4932e09d392d4ddcc01ffe1efb1d69addc1d31efa937f6171b2dcf2 SHA512 a987ba9bd4c3de6d5a2d095118e594d70b28ede82b9e8e34f1eed50c7d43033c0887b0546b9cffc54b1f4e3608a1e38f4df04d4fc86e02aac00f9a59ff0dedf2
-AUX ski-1.3.2-ncurses-config.patch 584 BLAKE2B a6876394e368f1f793bce339618c668e9d117c9206455e7d3cf74372b3214c9984fde52753fb453e73d390a3f57011c7a3406a40daaaee04fc8231fbb40d34d1 SHA512 64bd0b4ee7d7e9117f9907eaf71f92b0b74dc4d1c4724845de31820a9853199f8834d3d01afdfb725c389d45f353e2d8b99264aa5ddff5c3067c22e990cd967e
-AUX ski-1.3.2-no-local-ltdl.patch 366 BLAKE2B 1d4de13c62a474c41aa77ec91db2c6c0da51d65992d2d1dcc15518dd34fbdcd101c9df2a50585ef6cc54b71197d9354ad1f4092b80de2e1714986e7744ae83c6 SHA512 70ecc14b4449065ade95b00b18b79cd6106f3efc1553310b2ae3b6df10f1f31886c9d7c3832e727daf51bd0ce22d53f818fb30b9e8c11dea597315bbeb442f81
-AUX ski-1.3.2-prototypes.patch 656 BLAKE2B 6f85c3acd7eff720f7f25fbad77389c16c203a31d3cc00494b0624e38b333fd694912ad5882abc61efefaa033042e9bbb28c932870e29bc7336565345428aba3 SHA512 d1f37e57a0aaea4621a749b94453121f16cd3ce6c51cae4cdde8b6258f5a4a7a63c5b35e8bc50cf43d5462ab8be9abfc4196443e329641622ab848f56e27616d
-AUX ski-1.3.2-remove-hayes.patch 682 BLAKE2B 5a304115ac6353b1c61ae4ddeeebc821cedb7c277e2b38a86499c5a9486af6d79c0241b4bb2457ee29dab9751ecbff322a2e6d020497107477ca4b2db8ec7dd2 SHA512 efbaac0e9c6d1423def13d22b361aa9e7766b8959f2def6e146e12e74393f142b0212e2234ba2753aa71e19b6a0c30e86a74a05026efba2db01229d1a7e43a5e
-AUX ski-1.3.2-syscall-linux-includes.patch 397 BLAKE2B dfb72fef3be8110ab5acacb8fa0f33e8c68fc5de873b92398dd4a048307f3d4db47eb2d04a8323ce3748e893e190d42ca5168de442c892edff92834544edad52 SHA512 f0784af8eb8ecc8df92f96f1ce2f714f4cb1a9e60409a06c02cf300316a9680b01be6b6d1f83854b1fb3bd364cf0b08262a99a63190695fd9722691ef1fa3d6f
-AUX ski-1.3.2-uselib.patch 582 BLAKE2B b0d91fed1a01c6d4c2db464a1dbe6c4855a0302eacb21367865a3510b081a95756f1b09f79a015a1e20b3cb87d31e08785a5abed4a661203aec82a4a311538bf SHA512 f119e1a18ef08f40758fa1ddde61a88533b432c75111bba38ffc134edfee66f28ee01336509ed106461bddfc438d1eac48213ab4940e82f5128b924e584b974e
-DIST ski-1.3.2.tar.gz 2715791 BLAKE2B 5e6b237ea21bf410e44dbaa88150d980f2af66728effeab4e8bcef02f27c24069c4bcaf42d3814ad15c3bd759819d468f163b6c64a89408c09d1ffbdc9302c0f SHA512 21f2e1dd87cb517602d4d6ef62707ec6042c1b6ec5dfd063db7315d13bbc3fb47b491c15b7efb0433fc82f27c7924e2d50b2f57fe24e49aeb864ce2c3c2c8bd0
DIST ski-1.4.0.tar.xz 2373876 BLAKE2B c9c20582274dd6db6e216c709a1793b55ac2c1aaf26c5e235bffdd190e9e7dca4c7ef37f96309c61ba9b5f03229966710a65405e2a345d65a08b9163f545c85b SHA512 855bc73c2cd93d890cd532db524eecc122d5f3eddf189efdbf34069d1c9bd7b7f98d5e593387fdc31b38fc8630f00b6b126f5c1a1f22dab57447e024b9015cf5
-EBUILD ski-1.3.2-r4.ebuild 1531 BLAKE2B 917a47a85d73ed9b592da58b1bfe7cccbb126284473655c1c372955ad19b7ef3b549bfbe28558c06f539e6e1eda3db77cafa63e4ae4985c9f8cd1353c7091b83 SHA512 945d2cef715de334ad495e2ec060c6ebdef1406c2e1cf167542ef9ca769d47589f40202fd10383b08bda50cf44fd43ec20e118fca78a21b0b9114c97edb0941b
-EBUILD ski-1.4.0.ebuild 854 BLAKE2B ea556308386607363fe65ff161228dc43c2c69393d85bb699f522fd44710b38a18b741c67668be0c888b51e686efef55d07d5245f3971a20d1c2a31d0e3081d2 SHA512 c269a9ca3a53588eb40a43075d166d06abbecc7fa8b8d67b8c76dd02d14e0b6c3726c6805a13e38ce48a6b0690f34667930a2e0b462449c70cbeeb5622ee84f1
+EBUILD ski-1.4.0.ebuild 855 BLAKE2B 76c8b759a33bd8a133b7e36560682d0e2b6e4c9a701b90879bb723987fa0990ec7fd69260b4db991bf89f62a501bb84852ac9b87114ed938c38d5485185d7304 SHA512 d804d9deb45f78b6738f12ccc4c931ae3b55ca911381372798f0d5b701bc3874fea01ba3bd457276e5185004ebffe4ac26ff7a90b7c992c593f4a91c98065d78
MISC metadata.xml 411 BLAKE2B d9b6023db6462b087fa1acb3767fd0b29ab4f02014a7a3aff864ee518d689bbb95980fdd6d7d561c424b1cda2dac45fc12e8c885af877877206deda14f7f4b2f SHA512 3dbce520f1b8ce4beea04f912341167e8283cf6e6be3a9db796d393219cafff6408f93b1af60f39b3e521f96dd1c5f7a4b214002aad29bf64249a4fa30dfc00f
diff --git a/app-emulation/ski/files/ski-1.3.2-AC_C_BIGENDIAN.patch b/app-emulation/ski/files/ski-1.3.2-AC_C_BIGENDIAN.patch
deleted file mode 100644
index 34a7d8183702..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-AC_C_BIGENDIAN.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-use standard AC_C_BIGENDIAN macro rather than trying to define it manually
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -155,52 +155,24 @@ AC_SUBST(GSKI_CFLAGS)
- AC_SUBST(GSKI_LIBS)
- AM_CONDITIONAL(WITH_GTK_INTERFACE, test "x$with_gtk" = "xyes")
-
--dnl Target endianness
--AC_ARG_ENABLE(bigendian,
--AC_HELP_STRING([--enable-bigendian],
-- [the target is big endian default=no]),
--ski_cv_c_target_bigendian=${enableval}, ski_cv_c_target_bigendian=no)
--
- dnl Check for host endianness
- AC_CACHE_CHECK([whether host byte ordering is defined in sys/param.h],
- ski_cv_c_bigendian_compile,
- [AC_TRY_COMPILE([
- #include <sys/types.h>
- #include <sys/param.h>
- ],[
- #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
- #error bogus endian macros
- #endif
- ],
- ski_cv_c_bigendian_compile=yes, ski_cv_c_bigendian_compile=no)])
-
- if test "x$ski_cv_c_bigendian_compile" = xyes; then
- AC_DEFINE(ENDIANESS_IN_SYS_PARAM_H, 1,
- [define if sys/param.h defines the endiness])
--else
--AC_CACHE_CHECK([whether host byte ordering is big endian],
--ski_cv_c_bigendian,
--[AC_TRY_RUN([int main () {
-- union {
-- long l;
-- char c[sizeof (long)];
-- } u;
-- u.l = 1;
-- return (u.c[sizeof (long) - 1] == 1);
--}],
--ski_cv_c_bigendian=no, ski_cv_c_bigendian=yes,
--AC_MSG_ERROR([cannot detect host endianness]))])
--
--AC_DEFINE(BIG_ENDIAN, 4321, [define to 4321 if missing from sys/param.h])
--AC_DEFINE(LITTLE_ENDIAN, 1234, [define to 4321 if missing from sys/param.h])
--if test "x$ski_cv_c_bigendian" = xyes; then
-- AC_DEFINE(BYTE_ORDER, 4321,
-- [define to 4321 if host is big endian, 1234 if little endian])
--else
-- AC_DEFINE(BYTE_ORDER, 1234,
-- [define to 4321 if host is big endian, 1234 if little endian])
--fi
- fi
-+AC_C_BIGENDIAN
-
- dnl Check for variables & functions
-
---- a/src/std.h
-+++ b/src/std.h
-@@ -62,6 +62,14 @@ extern unsigned long long __strtoull(const char *, char **, int);
- # define BIG_ENDIAN 4321
- # define LITTLE_ENDIAN 1234
- # define BYTE_ORDER BIG_ENDIAN
-+# else
-+# define BIG_ENDIAN 4321
-+# define LITTLE_ENDIAN 1234
-+# ifdef WORDS_BIGENDIAN
-+# define BYTE_ORDER BIG_ENDIAN
-+# else
-+# define BYTE_ORDER LITTLE_ENDIAN
-+# endif
- # endif /* !defined HAVE_CONFIG_H */
- #endif /* !defined ENDIANESS_IN_SYS_PARAM_H */
-
diff --git a/app-emulation/ski/files/ski-1.3.2-binutils-2.34.patch b/app-emulation/ski/files/ski-1.3.2-binutils-2.34.patch
deleted file mode 100644
index dcb3f6793fba..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-binutils-2.34.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/linux/dwarf-linux.c b/src/linux/dwarf-linux.c
-index 73be0e6..c4051a3 100644
---- a/src/linux/dwarf-linux.c
-+++ b/src/linux/dwarf-linux.c
-@@ -116,14 +116,14 @@ find_in_section (bfd * bfd, asection * sect, PTR obj)
- /*
- * we're looking at loadable code only
- */
-- if ((bfd_get_section_flags (bfd, sect) & (SEC_CODE | SEC_ALLOC)) == 0)
-+ if ((bfd_section_flags (sect) & (SEC_CODE | SEC_ALLOC)) == 0)
- return;
-
- /*
- * check if address belongs to this section
- */
-- vma = bfd_get_section_vma (bfd, sect);
-- size = bfd_section_size (bfd, sect);
-+ vma = bfd_section_vma (sect);
-+ size = bfd_section_size (sect);
-
- offset = info->address - vma;
- if (offset >= size)
diff --git a/app-emulation/ski/files/ski-1.3.2-binutils.patch b/app-emulation/ski/files/ski-1.3.2-binutils.patch
deleted file mode 100644
index 71094f3bf4b6..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-binutils.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 30d3253c6b413ba22ca0ca30dcd4c4c24daec2e1 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Tue, 19 Aug 2014 09:42:43 +0300
-Subject: [PATCH] Fix build failure against binutils-2.16.1 and upper.
-
-Follow binutils' upstream change from 2004:
-
- https://sourceware.org/git/?p=binutils.git;a=commitdiff;h=7e2dd9e4c3e0b69dcb7d471b891879b5fd28687e
- > section.c (struct sec): Rename "_cooked_size" to "size".
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- src/linux/dwarf-linux.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/linux/dwarf-linux.c b/src/linux/dwarf-linux.c
-index 1941a1f..73be0e6 100644
---- a/src/linux/dwarf-linux.c
-+++ b/src/linux/dwarf-linux.c
-@@ -155,7 +155,7 @@ find_in_section (bfd * bfd, asection * sect, PTR obj)
- first.function = function;
- first.line = line;
- first.num_lines = 1;
-- first.limit = sect->_cooked_size;
-+ first.limit = sect->size;
- last_line = line;
- }
- if (line > last_line
---
-2.0.4
-
diff --git a/app-emulation/ski/files/ski-1.3.2-configure-withval.patch b/app-emulation/ski/files/ski-1.3.2-configure-withval.patch
deleted file mode 100644
index 7bb3ce9fc85c..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-configure-withval.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-fix handling of 3rd/4th args to AC_ARG_WITH()
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -130,7 +130,7 @@ dnl See if we build X11
- AC_ARG_WITH(x11,
- AC_HELP_STRING([--with-x11],
- [Enable the Motif based X11 interface default=no]),
-- [with_x11=yes],[with_x11=no])
-+ [with_x11=$withval])
-
- if test "x$with_x11" = "xyes"; then
- dnl Check for motif, error out if not found
-@@ -144,7 +144,7 @@ dnl See if we build GTK
- AC_ARG_WITH(gtk,
- AC_HELP_STRING([--with-gtk],
- [Enable building the GTK Ski interface default=no]),
-- [with_gtk=yes],[with_gtk=no]
-+ [with_gtk=$withval]
- )
-
- if test "x$with_gtk" = "xyes"; then
diff --git a/app-emulation/ski/files/ski-1.3.2-gcc-10.patch b/app-emulation/ski/files/ski-1.3.2-gcc-10.patch
deleted file mode 100644
index bfe5de33acbf..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-gcc-10.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/linux/syscall-linux.c
-+++ b/src/linux/syscall-linux.c
-@@ -538,7 +538,7 @@ pid_t cons_pid = -1;
- static int cfd = -1;
- BOOL trace_syscalls;
- char *consLog = NULL;
--extern BOOL noConsole;
-+BOOL noConsole;
- extern BOOL userint;
- static struct termios sane_ttyIos;
-
---- a/src/platform.c
-+++ b/src/platform.c
-@@ -29,7 +29,7 @@
- #include "platform.h"
- #include "state.h"
-
--BOOL autoAlloc, noConsole;
-+extern BOOL autoAlloc, noConsole;
- extern char *consLog;
- extern unsigned va_len, pa_len, rid_len, key_len;
- extern unsigned mips;
diff --git a/app-emulation/ski/files/ski-1.3.2-glibc-2.28.patch b/app-emulation/ski/files/ski-1.3.2-glibc-2.28.patch
deleted file mode 100644
index f09c5b410563..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-glibc-2.28.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/src/dos.c
-+++ b/src/dos.c
-@@ -51,5 +51,2 @@ extern int localtime_r(const __time_t *, __struct_tm *);
- #include <unistd.h> /* Also #includes <utime.h> */
--#if !defined(__FreeBSD__)
--#include <ustat.h>
--#endif
- #include <sys/utsname.h>
diff --git a/app-emulation/ski/files/ski-1.3.2-lex-deps.patch b/app-emulation/ski/files/ski-1.3.2-lex-deps.patch
deleted file mode 100644
index 1dc8470864e2..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-lex-deps.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-escan.l depends on generated eparse.h.
-If eparse.h is not present yet escan.o
-could be built before ${YACC) is ran.
-
-https://bugs.gentoo.org/744676
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -113,7 +113,8 @@ BUILT_SOURCES= \
- $(DAS_INSTR_DERIVED) \
- $(ASM_HASH_DERIVED) \
- $(ICNT_DERIVED) \
-- instr.c
-+ instr.c \
-+ eparse.h
-
- ski_SOURCES= \
- main.c
diff --git a/app-emulation/ski/files/ski-1.3.2-ncurses-config.patch b/app-emulation/ski/files/ski-1.3.2-ncurses-config.patch
deleted file mode 100644
index 4317df415efa..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-ncurses-config.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-use pkg-config to look up ncurses deps to support things like split tinfo
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -93,6 +93,7 @@
- AC_PROG_SED
- AC_PROG_YACC
- AM_PROG_LEX
-+PKG_PROG_PKG_CONFIG
-
- AC_C_INLINE
- AC_C_CONST
-@@ -304,9 +305,9 @@
- fi
-
- if test "x$check_curses" != xno; then
--AC_CHECK_LIB(curses, tgetent, [],
-- [AC_CHECK_LIB(ncurses, tgetent, ,
-- [AC_MSG_ERROR(Required curses library not found.)])])
-+ PKG_CHECK_MODULES([NCURSES], [ncurses])
-+ CFLAGS="$CFLAGS $NCURSES_CFLAGS"
-+ LIBS="$LIBS $NCURSES_LIBS"
- fi
-
- AC_CHECK_LIB(elf, elf_begin, [],
diff --git a/app-emulation/ski/files/ski-1.3.2-no-local-ltdl.patch b/app-emulation/ski/files/ski-1.3.2-no-local-ltdl.patch
deleted file mode 100644
index aa75146668b5..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-no-local-ltdl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-build against the system ltdl rather than the local copy
-
---- ski-1.3.2/src/Makefile.am
-+++ ski-1.3.2/src/Makefile.am
-@@ -181,8 +181,7 @@
- eparse.h \
- libdas.h \
- netdev.h \
-- osload.h \
-- ltdl.h
-+ osload.h
-
- EXTRA_linux_FILES = \
- linux/dwarf-linux.c \
-@@ -279,7 +278,6 @@
- eparse.y \
- escan.l \
- load.c \
-- ltdl.c \
- platform.c \
- libdas.c \
- libsrs.c
diff --git a/app-emulation/ski/files/ski-1.3.2-prototypes.patch b/app-emulation/ski/files/ski-1.3.2-prototypes.patch
deleted file mode 100644
index b66614368708..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-prototypes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-fix up prototypes to avoid -Wimplicit-function-declaration warnings
-
---- a/src/coreui.h
-+++ b/src/coreui.h
-@@ -177,6 +177,7 @@
- void stepIt_setupGtk(CTR cnt);
-
- void runIt_setupX(void);
-+void runIt_setupGtk(void);
-
-
- /*--------------------------------------------------------------------------
---- a/src/ssGtk.c
-+++ b/src/ssGtk.c
-@@ -82,6 +82,7 @@
-
- /* externals */
- extern dataStart;
-+ADDR iAinstAddr(ADDR baseAddr, BYTE iAmode, int delta);
-
- static GtkLabel* instcount_label;
- /* sits in a background loop */
-@@ -100,7 +101,7 @@
- }
-
-
--void runIt_setupGtk(void *data)
-+void runIt_setupGtk(void)
- {
- g_idle_add(runItGtk, NULL);
- stopPressed = NO;
diff --git a/app-emulation/ski/files/ski-1.3.2-remove-hayes.patch b/app-emulation/ski/files/ski-1.3.2-remove-hayes.patch
deleted file mode 100644
index 3e9de483fd17..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-remove-hayes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-## Description: Remove references to HAYES
-## Origin/Author: Andreas Moog <amoog@ubuntu.com>
-## Bug-Ubuntu: https://bugs.launchpad.net/bugs/756157
---- ski//src/linux/syscall-linux.c
-+++ ski.new//src/linux/syscall-linux.c
-@@ -2250,8 +2250,6 @@
- case TIOCSERSETMULTI: /* Set multiport config */
- case TIOCMIWAIT: /* wait for a change on serial input line(s) */
- case TIOCGICOUNT: /* read serial port inline interrupt counts */
-- case TIOCGHAYESESP: /* Get Hayes ESP configuration */
-- case TIOCSHAYESESP: /* Set Hayes ESP configuration */
- case SIOCRTMSG: /* call to routing system */
- case SIOCSIFLINK: /* set iface channel */
- case SIOCGIFMEM: /* get memory address (BSD) */
diff --git a/app-emulation/ski/files/ski-1.3.2-syscall-linux-includes.patch b/app-emulation/ski/files/ski-1.3.2-syscall-linux-includes.patch
deleted file mode 100644
index e3c1083687ac..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-syscall-linux-includes.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- ski-1.3.2/src/linux/syscall-linux.c
-+++ ski-1.3.2/src/linux/syscall-linux.c
-@@ -45,7 +45,6 @@
- #include <linux/posix_types.h>
- #include <linux/personality.h>
- #include <linux/sockios.h>
--#include <sys/io.h>
-
- #include <sys/file.h>
- #include <sys/fsuid.h>
-@@ -72,7 +71,6 @@
- #include <sys/uio.h>
-
- #include <linux/serial.h>
--#include <asm/page.h>
- #include <asm/unistd.h>
-
- #include "std.h"
diff --git a/app-emulation/ski/files/ski-1.3.2-uselib.patch b/app-emulation/ski/files/ski-1.3.2-uselib.patch
deleted file mode 100644
index d600cb2ce3fa..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-uselib.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://bugs.gentoo.org/592226
-
-patch taken from Fedora
-
-glibc-2.23+ no longer exports the uselib function. make the syscall directly.
-
---- ski-1.3.2/src/linux/syscall-linux.c
-+++ ski-1.3.2/src/linux/syscall-linux.c
-@@ -554,7 +554,8 @@
- extern void munmapSyms (ADDR, ADDR);
- extern void dynBlock (ADDR, ADDR);
- extern void memFree (ADDR);
--extern int uselib (const char *libname); /* Linux specific */
-+#include <sys/syscall.h>
-+#define uselib(libname) syscall(__NR_uselib, libname)
-
- extern int setresuid (uid_t, uid_t, uid_t);
- extern int getresuid (uid_t *, uid_t *, uid_t *);
diff --git a/app-emulation/ski/ski-1.3.2-r4.ebuild b/app-emulation/ski/ski-1.3.2-r4.ebuild
deleted file mode 100644
index ae695b1a8056..000000000000
--- a/app-emulation/ski/ski-1.3.2-r4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="ia64 instruction set simulator"
-HOMEPAGE="http://ski.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug motif"
-
-RDEPEND="dev-libs/libltdl:0=
- sys-libs/ncurses:0=
- virtual/libelf
- debug? ( sys-libs/binutils-libs:0= )
- motif? ( x11-libs/motif:0= )"
-DEPEND="${RDEPEND}
- app-alternatives/yacc
- app-alternatives/lex
- dev-util/gperf"
-
-# games-sports/ski and app-emulation/ski both install 'ski' binary, bug #653110
-RDEPEND="${RDEPEND} !!games-sports/ski"
-
-PATCHES=(
- "${FILESDIR}"/${P}-syscall-linux-includes.patch
- "${FILESDIR}"/${P}-remove-hayes.patch
- "${FILESDIR}"/${P}-no-local-ltdl.patch
- "${FILESDIR}"/${P}-AC_C_BIGENDIAN.patch
- "${FILESDIR}"/${P}-configure-withval.patch
- "${FILESDIR}"/${P}-binutils.patch
- "${FILESDIR}"/${P}-uselib.patch #592226
- "${FILESDIR}"/${P}-ncurses-config.patch
- "${FILESDIR}"/${P}-prototypes.patch
- "${FILESDIR}"/${P}-glibc-2.28.patch
- "${FILESDIR}"/${P}-gcc-10.patch #707144
- "${FILESDIR}"/${P}-lex-deps.patch #744676
-)
-
-src_prepare() {
- default
-
- if has_version ">=sys-libs/binutils-libs-2.34"; then
- eapply "${FILESDIR}"/${PN}-1.3.2-binutils-2.34.patch
- fi
-
- rm -rf libltdl src/ltdl.[ch] macros/ltdl.m4
-
- AT_M4DIR="macros" eautoreconf
-}
-
-src_configure() {
- econf \
- --without-included-ltdl \
- --without-gtk \
- $(use_with motif x11) \
- $(use_with debug bfd)
-}
diff --git a/app-emulation/ski/ski-1.4.0.ebuild b/app-emulation/ski/ski-1.4.0.ebuild
index 1867d53df65f..fbb3ebc06623 100644
--- a/app-emulation/ski/ski-1.4.0.ebuild
+++ b/app-emulation/ski/ski-1.4.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
inherit flag-o-matic
DESCRIPTION="ia64 instruction set simulator"
-HOMEPAGE="https://github.com/trofi/ski http://ski.sourceforge.net/"
+HOMEPAGE="https://github.com/trofi/ski https://ski.sourceforge.net/"
SRC_URI="https://github.com/trofi/ski/releases/download/v${PV}/${P}.tar.xz"
LICENSE="GPL-2"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 00:47:29 +0000