8 files changed, 63 insertions, 4 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 8686dfc1ebd2..60c54af9ee12 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libtraceevent/Manifest b/dev-libs/libtraceevent/Manifest
index ecce022668f3..b0be84d68600 100644
--- a/dev-libs/libtraceevent/Manifest
+++ b/dev-libs/libtraceevent/Manifest
@@ -3,5 +3,5 @@ DIST libtraceevent-1.7.2.tar.gz 148242 BLAKE2B 03eae9ea7a8cdf6b015af95031d6fbe86
 DIST libtraceevent-1.7.3.tar.gz 152363 BLAKE2B dcbca01f2246045f4f2377f91118e2468bca4344686b9e0349d04270543fea5648d5c227bdaf6e716d623bab8d03cec7a869bf67d03ca6a7836014854bbe40b8 SHA512 81302cb24a3fc71e8bd6a0ba975a2699eaa629ac0e90837bf8fc8e23e04156827d19b25544cdb506b0bf76d5f08699264c9ecb979f9218bdee6b0b0e7339b1e0
 EBUILD libtraceevent-1.6.3.ebuild 1130 BLAKE2B 96e73e54f224a57aa827a06a74854398a14b87521385897fd25f59ce56b5779465559a5dfd57be19096343dbc8ef844c7148c6aa9556d8d86541fef16e02fdf0 SHA512 09e950c4c01d66df24b35502816abd6cf664f80dbcb75aa64872becf66ebfb43f9e3d1fe3feb8be2434c7631268b67c06be838d210dc6791080d4441ffa68c24
 EBUILD libtraceevent-1.7.2.ebuild 1270 BLAKE2B d099253c44efb9452004c8e7dbc5b24d0df1cdebf5aaec3e7a2529759065f2049ee215b87b1afc245d9d412105b71cec244607c1130bbec4aa50d57e3f58feb4 SHA512 c0cb01d5ddbfdc3f127acd40614c4ec80b2aaeb6a75cf01fd2363dd4ddb24b95d2239067ab4cb328092ae2493c3a82ec4c010dfc007658a5edbc3385a57c34d2
-EBUILD libtraceevent-1.7.3.ebuild 993 BLAKE2B 08e3ce1c6221dd1be9073c2a08ae9b4814b6ccf81943c91d159be1d88f78729a9f39d18d78c76d7d98826b2081bb32240e2d33b907f84840e086cd63ec7732a9 SHA512 48f1295c3299c6df31cc38e98b180491efc3ae2e11fc737b34fab00eb27b410899bf92b4e3c0d861c58ae438bd50bcacceafb28a5700fc1ccbb5195b32ad8947
+EBUILD libtraceevent-1.7.3.ebuild 992 BLAKE2B c6850cf2a56f944642281de7ebd1718a7469a1dc6a69459cc0acedb771813fd9f3190b3b9fed455474d82c34df6863d7c8836e02e8f38445b16de14ee8586d78 SHA512 ca7a829329fd94da83d2ea1edddb307436dcacfa8d13bc6b0ba0917d570b4a1f1ff1cbddf2a8ea050d001d1506e2287b500662daea441b265767d161d51da571
 MISC metadata.xml 363 BLAKE2B e7330c25a8a87a9811793ee730e7822000fdf1cbdda003302e5d542118204d905583a4acd07a5f37a15952bbe6265ff606d44978db823905c724b5f142d5d2ae SHA512 7be0cfa3fd15ef0cfc0647c73d69a7efc5f00d8b7f9d85c6092326d638132e7f989b855fe5f3bd9ab770e860e7858f8d462f8727b9ddeee64a0c44f7e66acf9c
diff --git a/dev-libs/libtraceevent/libtraceevent-1.7.3.ebuild b/dev-libs/libtraceevent/libtraceevent-1.7.3.ebuild
index ad5f964c4d7b..e19e80f863c1 100644
--- a/dev-libs/libtraceevent/libtraceevent-1.7.3.ebuild
+++ b/dev-libs/libtraceevent/libtraceevent-1.7.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} =~ [9]{4,} ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~loong ppc ppc64 ~riscv x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/dev-libs/libtracefs/Manifest b/dev-libs/libtracefs/Manifest
index b55a1a27dabf..a4560f6e3439 100644
--- a/dev-libs/libtracefs/Manifest
+++ b/dev-libs/libtracefs/Manifest
@@ -5,5 +5,5 @@ DIST libtracefs-1.7.0.tar.gz 205716 BLAKE2B 7e11ed75e65ddfb6e95fa67db2d3a3000e72
 EBUILD libtracefs-1.6.1-r2.ebuild 1363 BLAKE2B 63ca275f16bb40d52273defab3eaf43f08fe73af13efa9c416ef3eb3d4698ff542ee9618fc575993ee806682b464d04d1fe0ad9e0f0834ecdc21ae29dabda159 SHA512 5cdf431afd163ff14c4234664f31e61f822da1a5f7dc2d44e404c60e7deb0b2311cc673067bf3df610ef778da3f4dcdf77134c971bee4816877b6d0537ad6ca5
 EBUILD libtracefs-1.6.3-r2.ebuild 1371 BLAKE2B 12e8b123542412df2707f66ddc9abc443e050d8c8f32151e08b7e9a99f721680be69dbaa3160045c87702c9eb0d75da526ff69d3cf47c65e9f16805e617438f4 SHA512 05b300f1a3debab95185f49040f7969e299483b2708dfec8a641d4eebe7741e2990363144cb6cb29e70b92e6ff6a45ecf0d744fe146ae8607c35caba087becf0
 EBUILD libtracefs-1.6.4-r1.ebuild 1502 BLAKE2B abb1fe6eba5ae91aa8032f8c86ccf6bde0c9eeb108510f4ad36f0204651bf5b7a0dbd947e1e833a913edb3a0cc177383eb3e652180a99ce1760d72771bcc4618 SHA512 2231af6f8a2f58afb0fd702395bea1637c498d53915bdfae55e65197257ef97cfdbd9e5675be0c8e2da5a3473e0cede8089b4e10c98e5a2948dd32cb7c1a0911
-EBUILD libtracefs-1.7.0.ebuild 1151 BLAKE2B a51f0f9f18fcbf9206a8b2399e07518e6fca4d00489463e0dea55564390eb4e23889c1c6d37ee09d972b8ccb39cbd6a7269f15c2f33b00ee29759e6ea6d6a070 SHA512 f5f438159bb544059702bbb2bf4b282e6cb57d9d696eea63118540ee7ee243b51dd8aad313d2656af0dccbde5a456e781c1152db2efb10691378c85e8e1c4725
+EBUILD libtracefs-1.7.0.ebuild 1150 BLAKE2B af045d49b27568fc3546a41cc866e624090ac1b7ca4f61d5cdafa008000d2a6a3e05e98274f363cb31ce334c8f71e481fc771ba73573ca2238a90a8291c2484c SHA512 64b558c92a98f6494dd0b37df22d250161c6b1ae8fc1ad16eee18df6a2275037476c1170b68c8c71c7a177aec05fd1c50d94016a502ac471da072ac0310e0d55
 MISC metadata.xml 363 BLAKE2B e7330c25a8a87a9811793ee730e7822000fdf1cbdda003302e5d542118204d905583a4acd07a5f37a15952bbe6265ff606d44978db823905c724b5f142d5d2ae SHA512 7be0cfa3fd15ef0cfc0647c73d69a7efc5f00d8b7f9d85c6092326d638132e7f989b855fe5f3bd9ab770e860e7858f8d462f8727b9ddeee64a0c44f7e66acf9c
diff --git a/dev-libs/libtracefs/libtracefs-1.7.0.ebuild b/dev-libs/libtracefs/libtracefs-1.7.0.ebuild
index 5541b7c8720d..4102ebe264f6 100644
--- a/dev-libs/libtracefs/libtracefs-1.7.0.ebuild
+++ b/dev-libs/libtracefs/libtracefs-1.7.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} =~ [9]{4,} ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~loong ppc ppc64 ~riscv x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/dev-libs/libx86/Manifest b/dev-libs/libx86/Manifest
index 502c0fdbf232..a1d7f2fca289 100644
--- a/dev-libs/libx86/Manifest
+++ b/dev-libs/libx86/Manifest
@@ -1,6 +1,8 @@
 AUX libx86-0.99-ifmask.patch 511 BLAKE2B 3045d7a7bf7120e3fb3f560a33723a924eed9f6fad66fd8881540d6c5f2b3234f7440338c857244af4316594a0619e6749e0895e09a849f20c188e1b7e71a099 SHA512 f716f9f24deeb3e3361c55055d15b179a0bc03983619f5eddea3a12e5c0b0a0dcb545a8f8671d8998405410f59220e1dbb1160ae00d75579da4f4182c769986b
+AUX libx86-1.1-c99.patch 426 BLAKE2B 903be70ac3c548cb7f250a35a6031dede8a1816d3d1f66539a3d830518582a2a1c981c9418ccef472c98d349a0e3a565374541cd775baf15af820386b21b48e9 SHA512 982f89166a71141106fa298e8d102dc3232c43f115da9511b30db267af95a906d878b5d45f66b3131f958d1c4f67fab34916f9928cce5659dc7e677861e2c571
 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-r5.ebuild 958 BLAKE2B 9bc1b3ec2dfb6743af01386b1c6676b7b75e2d95787a12d1d505824859979452eac5b90049c6262e37009fc2c4c0073e3887da8b8000493748e0aeb75da3bfec SHA512 aac69bf341e4b01cf959ccb2f61feaf1f75a730cb28337c0b939447dc52f38ffad39255d86e0acfc37b5b71754d829916473ffdb4b2069b7366c1c26a56ee41f
+EBUILD libx86-1.1-r6.ebuild 990 BLAKE2B cc866396c1a085763a8f8f7ff4d4ec0a3bfb60facfe20cf3bcc0838ea95fac9ba1d5d8ce986f305af6b8a368d228618ce9e7b81f3d98e18bbc591f84d66e33fb SHA512 b1b82287053b6dccfec7c43ee834cd2b5dab7d3a400da3d4bbee676ddb24992addbf96e488072239dd14283568ce1770753d6c4d51e50cc2a5a5e8f8a3ccf9fe
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-libs/libx86/files/libx86-1.1-c99.patch b/dev-libs/libx86/files/libx86-1.1-c99.patch
new file mode 100644
index 000000000000..619ecfefeb03
--- /dev/null
+++ b/dev-libs/libx86/files/libx86-1.1-c99.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/880429
+https://src.fedoraproject.org/rpms/libx86/blob/rawhide/f/libx86-c99-2.patch
+--- a/thunk.c
++++ b/thunk.c
+@@ -157,10 +157,10 @@ int LRMI_init() {
+ 	X86EMU_pioFuncs pioFuncs = {
+ 		(&x_inb),
+ 		(&x_inw),
+-		(&x_inl),
++		((x86emuu32 (*)(X86EMU_pioAddr)) &x_inl),
+ 		(&x_outb),
+ 		(&x_outw),
+-		(&x_outl)
++		((void (*)(X86EMU_pioAddr,  x86emuu32)) &x_outl)
+ 	};
+ 	
+ 	X86EMU_setupPioFuncs(&pioFuncs);
diff --git a/dev-libs/libx86/libx86-1.1-r6.ebuild b/dev-libs/libx86/libx86-1.1-r6.ebuild
new file mode 100644
index 000000000000..924c7e02a2ab
--- /dev/null
+++ b/dev-libs/libx86/libx86-1.1-r6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 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
+	"${FILESDIR}"/${P}-c99.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
+}