[gentoo-commits] repo/gentoo:master commit in: dev-libs/libx86emu/, dev-libs/libx86emu/files/

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libx86emu/, dev-libs/libx86emu/files/

[Petr Vaněk]

commit:     9a27609d268a12c38fc2c7ec175345bf43927fb5
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 10 12:55:59 2024 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Tue Sep 10 13:20:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a27609d

dev-libs/libx86emu: drop 1.1-r1

Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>

 dev-libs/libx86emu/Manifest                        |  1 -
 .../files/libx86emu-1.1-fix-makefile.patch         | 82 ----------------------
 .../files/libx86emu-1.1-gcc10-fno-common.patch     | 13 ----
 dev-libs/libx86emu/libx86emu-1.1-r1.ebuild         | 28 --------
 4 files changed, 124 deletions(-)

diff --git a/dev-libs/libx86emu/Manifest b/dev-libs/libx86emu/Manifest
index 5d5926c5b067..f62861582911 100644
--- a/dev-libs/libx86emu/Manifest
+++ b/dev-libs/libx86emu/Manifest
@@ -1,2 +1 @@
-DIST libx86emu-1.1-9.8.src.rpm 59517 BLAKE2B 6ae5b7792b9b67b93d12e9908e9941417e4149ed6289e0d02b23710ae4295d74aae806d85b0a0aa719eee6d63725b161dd8870d92b5352383a0beee5ce7827c9 SHA512 cb44306bb76feb47d46f1f3dd92cc6bf694dcc2c42d191fd9ff9f0b68744aeb25e99b29336e5ffe67e9a3d02c51d56690429b892d7fd26438dcc1d6603e18bcb
 DIST libx86emu-3.5.tar.gz 144969 BLAKE2B 3bba65ca6b42e92ad578a1bdacc94b5aad1f38f51d1e1fde1db65590db9611823a9e750675feb9c20fc7706e19181fe334e127a9c861159cea03aa5ea33d90a7 SHA512 079a8b5a7166802cd9bf781436dccc36a064c7e05c199bb41cc4d225e43afad4cc99654b3cb58389f7f806ffa625b5d793468064fdd9fa758ae0415496b18a9e

diff --git a/dev-libs/libx86emu/files/libx86emu-1.1-fix-makefile.patch b/dev-libs/libx86emu/files/libx86emu-1.1-fix-makefile.patch
deleted file mode 100644
index 6e565340e67b..000000000000
--- a/dev-libs/libx86emu/files/libx86emu-1.1-fix-makefile.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,15 +1,4 @@
--ARCH	:= $(shell uname -m)
--ifneq ($(filter i386 i486 i586 i686, $(ARCH)),)
--ARCH	:= i386
--endif
--
--CC	= gcc
--CFLAGS	= -g -O2 -fPIC -fomit-frame-pointer -Wall
--ifneq ($(filter x86_64, $(ARCH)),)
--LIBDIR	= /usr/lib64
--else
--LIBDIR	= /usr/lib
--endif
-+CFLAGS	+= -fPIC -Wall
- LIBX86	= libx86emu
- 
- VERSION		:= $(shell cat VERSION)
-@@ -24,9 +13,6 @@
- 
- .PHONY: all shared install test clean
- 
--%.o: %.c
--	$(CC) -c $(CFLAGS) $<
--
- all: shared
- 
- shared: $(LIB_NAME)
-@@ -38,13 +24,15 @@
- 	install -m 644 -D include/x86emu.h $(DESTDIR)/usr/include/x86emu.h
- 
- $(LIB_NAME): .depend $(OBJS)
--	$(CC) -shared -Wl,-soname,$(LIB_SONAME) $(OBJS) -o $(LIB_NAME)
-+	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIB_SONAME) $(OBJS) -o $(LIB_NAME)
-+	ln -snf $(LIB_NAME) $(LIB_SONAME)
-+	ln -snf $(LIB_SONAME) $(LIBX86).so
- 
--test:
--	make -C test
-+check:
-+	$(MAKE) -C test
- 
- clean:
--	make -C test clean
-+	$(MAKE) -C test clean
- 	rm -f *.o *~ include/*~ *.so.* .depend
- 
- ifneq "$(MAKECMDGOALS)" "clean"
---- a/test/Makefile
-+++ b/test/Makefile
-@@ -1,9 +1,10 @@
--CC         = gcc
--CFLAGS     = -g -Wall -fomit-frame-pointer -O2
-+CFLAGS	 += -fPIC -Wall
-+CPPFLAGS += -I../include
- TST_FILES  = $(wildcard *.tst)
- INIT_FILES = $(addsuffix .init,$(basename $(wildcard *.tst)))
- RES_FILES  = $(addsuffix .result,$(basename $(wildcard *.tst)))
- TEST_OPTS  = --verbose --show code,regs,data,acc,io,ints,attr,time
-+LDLIBS = -L.. -lx86emu
- 
- .PHONY: all test clean
- .SECONDARY: $(INIT_FILES)
-@@ -12,13 +13,12 @@
- 
- all: x86test
- 	@./prepare_test *.tst
--	@./x86test $(TEST_OPTS) *.init
-+	@LD_LIBRARY_PATH=.. ./x86test $(TEST_OPTS) *.init
- 
--x86test: x86test.c
--	$(CC) $(CFLAGS) $< -lx86emu -o $@
-+x86test: x86test.o
- 
--%.result: %.init
--	@./x86test $(TEST_OPTS) $<
-+%.result: %.init x86test
-+	@LD_LIBRARY_PATH=.. ./x86test $(TEST_OPTS) $<
- 
- %.init: %.tst
- 	@./prepare_test $<

diff --git a/dev-libs/libx86emu/files/libx86emu-1.1-gcc10-fno-common.patch b/dev-libs/libx86emu/files/libx86emu-1.1-gcc10-fno-common.patch
deleted file mode 100644
index 8d69e874523d..000000000000
--- a/dev-libs/libx86emu/files/libx86emu-1.1-gcc10-fno-common.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/include/ops.h
-+++ b/include/ops.h
-@@ -39,8 +39,8 @@
- #ifndef __X86EMU_OPS_H
- #define __X86EMU_OPS_H
- 
--void (*x86emu_optab[0x100])(u8 op1) L_SYM;
--void (*x86emu_optab2[0x100])(u8 op2) L_SYM;
-+extern void (*x86emu_optab[0x100])(u8 op1) L_SYM;
-+extern void (*x86emu_optab2[0x100])(u8 op2) L_SYM;
- 
- void decode_cond(int type) L_SYM;
- 

diff --git a/dev-libs/libx86emu/libx86emu-1.1-r1.ebuild b/dev-libs/libx86emu/libx86emu-1.1-r1.ebuild
deleted file mode 100644
index d9350ff29d80..000000000000
--- a/dev-libs/libx86emu/libx86emu-1.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rpm toolchain-funcs
-
-DESCRIPTION="A library for emulating x86"
-HOMEPAGE="https://www.opensuse.org/"
-SRC_URI="https://download.opensuse.org/source/factory/repo/oss/suse/src/${P}-9.8.src.rpm"
-
-LICENSE="HPND"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1-fix-makefile.patch
-	"${FILESDIR}"/${PN}-1.1-gcc10-fno-common.patch
-)
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
-	dodoc Changelog README
-}