gentoo auto-resync : 28:07:2022 - 03:03:20

6 files changed, 51 insertions, 64 deletions

diff --git a/dev-libs/libx86/Manifest b/dev-libs/libx86/Manifest
index 5ee2684b8216..34820aede20c 100644
--- a/dev-libs/libx86/Manifest
+++ b/dev-libs/libx86/Manifest
@@ -1,6 +1,6 @@
-AUX libx86-0.99-ifmask.patch 584 BLAKE2B 33c0ebeb0ca32b892cebf4bdd91bb2f82fefa3caa3c7c30c31e806aaeb96b36215f41d9389242ba45c2e8c69b4eedd1742092be77b113a7a0311e826cd863206 SHA512 781ea16e535ca1c0a54552b51d67b0901102f20ab63ff5ff39f9f2bb513abb53867eb5e52089e72afa6c313380b2033881f17cfe233b09a38ed5a9e95ad8d5f8
-AUX libx86-1.1-makefile.patch 853 BLAKE2B 48a25cd96bacd2e39bc8ecb4fd7988ab3775441f259bfe56fedf0f39f8cb894f3f4bcd64a03a6a5357ed064f9dc0e0b578cccbd760cd2056c564f2502f065d6c SHA512 a61e21ab31b1f22d898799ecc3db57e6816146488d436d3d33817f0ac19d420562830411111bacd8ca4c80a446c088fb931ee293522828076d0a1cae6e7ee0a6
-AUX libx86-1.1-x86emu.patch 1194 BLAKE2B e4f721ca09e081fb9f528ec95ea491a8267a9be8a169a12ebfd05d18425d473b89fe3e6d121ece254b6764a66a4adaeee9d811e619c6db1ce0c62178185d1ac5 SHA512 476d0bc7d3e903c1b1dff75577ea0caa80a5dd06618a08b24300367031ccb578322fcc267746285bcb671583407f22bfb7165374eeb2301ed67177ee18ec549e
+AUX libx86-0.99-ifmask.patch 511 BLAKE2B 3045d7a7bf7120e3fb3f560a33723a924eed9f6fad66fd8881540d6c5f2b3234f7440338c857244af4316594a0619e6749e0895e09a849f20c188e1b7e71a099 SHA512 f716f9f24deeb3e3361c55055d15b179a0bc03983619f5eddea3a12e5c0b0a0dcb545a8f8671d8998405410f59220e1dbb1160ae00d75579da4f4182c769986b
+AUX libx86-1.1-makefile.patch 780 BLAKE2B 76700465271145a274232c7c8108a29bf0f1084209444017a0cab101cf6b8b9132c84505338d4ddd1acd252dc44464d551b1843d85bf537e1d46d459a090870d SHA512 2f3a9af34fd85af463a493f49b10cc1d943685601ef09088448a64d3a0d6fa1073b45ff4694ff6cf1f6f9664d299b8592000de120aed94bd53557b7e316e1645
+AUX libx86-1.1-x86emu.patch 871 BLAKE2B dbe290cb89f5dd6607c8aa0c39fa41a3f6f3abef058f7c2f18c6221ba5d3af15f68e3123ca1ea141fe89733599fc519fd1710cb335e6b0778ff27201da631eb7 SHA512 80a68aba6d4dec84ee5a39eec97916ac7e13fb5f4ab1c65bf93f8292ec94bbd33d226b8cab56cbf258ce3cce72346c843c8c8c9937a39cd2d69d03e466e7f793
 DIST libx86-1.1.tar.gz 87428 BLAKE2B cee90a446994816ce925a5b9edb3de5256f404bcadd9853ad197f13bdf4c86bf4c2def6d38e342ed9af5eba9e87400bfb76cad56852d44583b183853b65dcfff SHA512 b946555a45405a06fdf00b3e2522fc99dd7c61349c32726221aa60117a8d3da6da4b44188b1ebb208368e12b396f26055437cebcc8a0e6df10c7a006182c9280
-EBUILD libx86-1.1-r4.ebuild 1242 BLAKE2B f982484fc4e2b7f8d4c8c92171ba039ed808eb503ccd205b366a6a29a4d8f0d0de6048921be7538055948c1fb379b0bbe1241d7dccff07a98e29f2a096ca450c SHA512 1a39f419d07d2bf5200ae07e5a4aa0669a96d728be24f2d2a5e6a1c1d5b9eb371d02c890c1a7c35b6742dc09de254a07424ff68aa279bc9dc7dced4b5b654cfb
+EBUILD libx86-1.1-r5.ebuild 958 BLAKE2B 9bc1b3ec2dfb6743af01386b1c6676b7b75e2d95787a12d1d505824859979452eac5b90049c6262e37009fc2c4c0073e3887da8b8000493748e0aeb75da3bfec SHA512 aac69bf341e4b01cf959ccb2f61feaf1f75a730cb28337c0b939447dc52f38ffad39255d86e0acfc37b5b71754d829916473ffdb4b2069b7366c1c26a56ee41f
 MISC metadata.xml 248 BLAKE2B 66e4449d4247cee6b9b5f83956e415b9dbb08cf64770a96cbf98d9be71b52f99633ac4724d01684446f72c07e8604ea59c12df34cefda37386d3f43ab1606425 SHA512 01f5f77d52fbb159724187a68a6d5f9fe00ddd3f04657629c8c432dc8290d499779b3920fd3feeb21a8408bacf3c4064fe14827384569c7e044eb6d81dd9dd93
diff --git a/dev-libs/libx86/files/libx86-0.99-ifmask.patch b/dev-libs/libx86/files/libx86-0.99-ifmask.patch
index c99eeb819f72..2a6aaa6fbe47 100644
--- a/dev-libs/libx86/files/libx86-0.99-ifmask.patch
+++ b/dev-libs/libx86/files/libx86-0.99-ifmask.patch
@@ -1,5 +1,5 @@
---- lrmi.c.orig	2008-09-06 12:24:36.070136428 +0200
-+++ lrmi.c	2008-09-06 12:28:10.584287458 +0200
+--- a/lrmi.c
++++ b/lrmi.c
 @@ -55,6 +55,18 @@ OTHER DEALINGS IN THE SOFTWARE.
  #include "x86-common.h"
  
diff --git a/dev-libs/libx86/files/libx86-1.1-makefile.patch b/dev-libs/libx86/files/libx86-1.1-makefile.patch
index 471c3fbc78fd..4cea20c81a08 100644
--- a/dev-libs/libx86/files/libx86-1.1-makefile.patch
+++ b/dev-libs/libx86/files/libx86-1.1-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2013-02-11 16:35:56.834368910 +0400
-+++ Makefile	2013-02-11 16:36:02.587369368 +0400
+--- a/Makefile
++++ b/Makefile
 @@ -22,7 +22,7 @@
  	$(AR) cru libx86.a $(OBJECTS)
  
diff --git a/dev-libs/libx86/files/libx86-1.1-x86emu.patch b/dev-libs/libx86/files/libx86-1.1-x86emu.patch
index 7b4fe428e1b3..685c7a9ff6de 100644
--- a/dev-libs/libx86/files/libx86-1.1-x86emu.patch
+++ b/dev-libs/libx86/files/libx86-1.1-x86emu.patch
@@ -1,6 +1,5 @@
-diff -Naur libx86-1.1+ds1.orig/Makefile libx86-1.1+ds1/Makefile
---- a/libx86-1.1/Makefile	2008-05-19 12:28:59.000000000 +0300
-+++ b/libx86-1.1/Makefile	2012-02-20 01:32:03.750068423 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -5,6 +5,7 @@
  ifeq ($(BACKEND),x86emu)
  	OBJECTS += thunk.o x86emu/decode.o x86emu/debug.o x86emu/fpu.o \
@@ -9,9 +8,8 @@ diff -Naur libx86-1.1+ds1.orig/Makefile libx86-1.1+ds1/Makefile
  else
  	OBJECTS += lrmi.o
  endif
-diff -Naur libx86-1.1+ds1.orig/thunk.c libx86-1.1+ds1/thunk.c
---- a/libx86-1.1+ds1.orig/thunk.c	2008-04-03 03:48:00.000000000 +0300
-+++ b/libx86-1.1/thunk.c	2012-02-20 01:12:56.468820192 +0200
+--- a/thunk.c
++++ b/thunk.c
 @@ -32,6 +32,7 @@
  #define TRUE 1
  #define FALSE 0
diff --git a/dev-libs/libx86/libx86-1.1-r4.ebuild b/dev-libs/libx86/libx86-1.1-r4.ebuild
deleted file mode 100644
index 350a47c4a088..000000000000
--- a/dev-libs/libx86/libx86-1.1-r4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="A hardware-independent library for executing real-mode x86 code"
-HOMEPAGE="https://www.codon.org.uk/~mjg59/libx86/"
-SRC_URI="https://www.codon.org.uk/~mjg59/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm -ppc -riscv -sparc x86"
-IUSE="static-libs"
-
-src_prepare() {
-	# fix compile failure with linux-headers-2.6.26, bug 235599
-	eapply -p0 "${FILESDIR}/${PN}-0.99-ifmask.patch"
-	# Patch for bugs #236888 and #456648
-	eapply -p0 "${FILESDIR}/${P}-makefile.patch"
-	# Wider arch compatibility, bug #579682
-	eapply -p2 "${FILESDIR}/${P}-x86emu.patch"
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC AR
-	append-flags -fno-delete-null-pointer-checks #523276
-}
-
-src_compile() {
-	local ARGS
-	use x86 || ARGS="BACKEND=x86emu"
-	emake ${ARGS} LIBRARY=shared shared
-	if use static-libs; then
-		emake ${ARGS} objclean
-		emake ${ARGS} LIBRARY=static static
-	fi
-}
-
-src_install() {
-	local install_static;
-	use static-libs && install_static='install-static'
-	emake \
-		LIBDIR="/usr/$(get_libdir)" \
-		DESTDIR="${D}" \
-		install-header install-shared ${install_static}
-}
diff --git a/dev-libs/libx86/libx86-1.1-r5.ebuild b/dev-libs/libx86/libx86-1.1-r5.ebuild
new file mode 100644
index 000000000000..ac4aa8723d12
--- /dev/null
+++ b/dev-libs/libx86/libx86-1.1-r5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="A hardware-independent library for executing real-mode x86 code"
+HOMEPAGE="https://www.codon.org.uk/~mjg59/libx86/"
+SRC_URI="https://www.codon.org.uk/~mjg59/${PN}/downloads/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm -ppc -riscv -sparc x86"
+
+PATCHES=(
+	# fix compile failure with linux-headers-2.6.26, bug 235599
+	"${FILESDIR}"/${PN}-0.99-ifmask.patch
+	# Patch for bugs #236888 and #456648
+	"${FILESDIR}"/${P}-makefile.patch
+	# Wider arch compatibility, bug #579682
+	"${FILESDIR}"/${P}-x86emu.patch
+)
+
+src_configure() {
+	tc-export AR CC
+	append-cflags -fno-delete-null-pointer-checks #523276
+}
+
+src_compile() {
+	emake $(usev !x86 BACKEND=x86emu) LIBRARY=shared shared
+}
+
+src_install() {
+	emake \
+		LIBDIR=/usr/$(get_libdir) \
+		DESTDIR="${ED}" \
+		install-header install-shared
+}