gentoo resync : 22.05.2021

4 files changed, 19 insertions, 132 deletions

diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index 05db5607e3c4..bcf4319b08e5 100644
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -2,6 +2,7 @@ AUX svgalib-1.9.19-pic.patch 487 BLAKE2B aed4fbb6ba2d0590ce6dc189f0b675ab34cd8fa
 AUX svgalib-1.9.25-ar.patch 355 BLAKE2B e57dfe83294c27acbd57752bcc83e0cc965041a4afa713abfa31f9dd3877ea3ad69a89cb81ddf208e52bf264a18d070339aa69301855eb3bf1d324991daab390 SHA512 7c431b89ed9f8da3c12ff752ad4c0783c0f40f94c2faca04aebea1783297b1486cf40748e024e2cf52caeb62efa68fca800dc493c8606b3807ef0fd02fce8c62
 AUX svgalib-1.9.25-build.patch 2163 BLAKE2B 66fb7fcb2d006dd7419e78dd2c98254acb856689638fc09a2d8f4e849ac5137ad683fdaa66895a7180c494101e810a9e1073878c64bdd49f3aca370d6098d00e SHA512 87cb6458bb427d2e73bc275d6e77987919587dec1b2f52944191087e628aaa4eba46148bf8cd2f89f5c51a5c9f5433f3262d378173ed16e894fd962d8bada4e5
 AUX svgalib-1.9.25-fix_buffer.patch 302 BLAKE2B a3e49949702305d6ee973134a50c7105ccf46fb732b54351616af5c2831712aa178b00d8dd2f040cbfd93b3cdd08a215103319508a89b6329d7cc6339188908b SHA512 e238a5e05db06623abe04a6058345a4c4b91953c73ef02c3b4bd0b4606f9a57f2b20ef18aa2a91c50465bd3c048ba2ffd4792d62dcfadd94320afffa826641f1
+AUX svgalib-1.9.25-gl-asm-width.patch 561 BLAKE2B 8c6fcbff330fc2a96259e34311157af79e03fd5e70f219ed367aa3ca4b7a76b1be0c72443da7f2e5280c09c66f830c032019e4777ebfab1ba21fd7ccc3f1fe7b SHA512 00bedbcfea7d8b14f29a1588d3dc4d8bd1de686ad6f4daa38ce27ba0a27ea648351dceb2c1c47d1f4bdb197afcd6918e51d31f68eeacf39cd0970fad8d013d7a
 AUX svgalib-1.9.25-glibc210.patch 3842 BLAKE2B 99cfb6151d38fa75adaaa9fb0ff490430e71b416e9a5fb9b6fe228de4b937a8c36a5c645fa3a413c1cdfe3d4764720a961a7a97d9e00ff549283698dbda9bee1 SHA512 43813c240eaff58d993c0ed839bee0d5d73515e4954e7793536a981d149c882808ea79187b0bfe8511afcde78fd31b6e9ad94aaf20d28c8e96577d5f0e530d96
 AUX svgalib-1.9.25-linux_2.6.28.patch 1672 BLAKE2B f5a18701cb29307a3d09656115bcca74ca3191eedf5f7c5c0e0d42ed38c548b2c51c06dfc9d0bd7cfc70832fc31c5b9738b5c989d2966f825927fb4adbac436b SHA512 ba3fcfb870768bc5d7e2d7acfe0381d6602b2e42d40e1d8b37246a60343e6e2f0b251c2a5fb32467773b565f4a0f38fdd5cba7c51fdf7fd36b0e5b988fcf2416
 AUX svgalib-1.9.25-linux_2.6.36-r1.patch 1244 BLAKE2B ce52fd031092c6ed038e854723704a5aa3b380c296f88a27e99a906ac4072f37d86189e5021362a1aae9dc296161ff9f3b66a65f71b597e527fd3df8ad05fd33 SHA512 0a14679ee0029931e54387ff413aee43a01b107c277ff1fde52b1fb862d5ca56571028a527118b6f6c05a9485c00890b0eab35df4537e394bb4cc81e771e9ae0
@@ -14,6 +15,5 @@ AUX svgalib-1.9.25-vga_reset.patch 747 BLAKE2B 73e459c902be26584bc727bdb4c48398e
 AUX svgalib-1.9.25-wrapdemo-buf-overflow.patch 516 BLAKE2B 504bdd01a0bde6858648f5e640fda34f337e6cef3f08f46b77fa453741fd556964fc09b48f494cf30b644fc1ff416c9728750d1c58502811d292d9b96ad415cc SHA512 e4e58a065f721f3c71d13f9ba0ffecf35ff32b25c6e46217eb9a0184b012e5be13c96c597df153ad7a27a5e41cc5a845cecae04d2d6c3dc6771bc238f8c75232
 AUX svgalib.udev.rules.d.2 44 BLAKE2B 513532c74e5172a5f2882df1912508f12adf1347c3af1bf0a44f66781d139a28b7aa332f5a5e630d099b381b9a94931ba0b7ad787393228bf694878f442279ab SHA512 41336ddd1fc2a033c684dee1a442ee20ed58fdd1395346913502e4b0c5f798ad0e4cffe69de3dcdfa993dc8b480910c422d38e0483eacfea8f8ad24c41060c82
 DIST svgalib-1.9.25.tar.gz 987084 BLAKE2B 0ca81483d754796d8c96abef2940c506dd8c6f69ac015f0b34995a81db91c0540f405271f3c9e337ead551c783e9d6a336ef53bfb1531481115bd1228b679ea8 SHA512 697e417e6fb4fc3c41f47945a87bd0252f33b565ac1b20d98f984168c6b3ac0f04887e929fbf912ef7bb7b0a3b0a1763cc7cf3e316b62235cc926ca4b1ed96f7
-EBUILD svgalib-1.9.25-r7.ebuild 3561 BLAKE2B 1bcc24d53ddf425a5dc0a2c46889f584933be7cb9be7b1db175ef81c91c691dd263d1fde43a0ad2ae1d565df6f3c5afb9f18cbbbfb372ce8a8cf8516fbd5a024 SHA512 f8912ee94857c5bf31a4b1ed59b1db81aa40c3a0be8cb1720634493b67d54140adf51e537e84a541300d365c13f8ec627ebcdc3572a62acd6f72043732546a9e
-EBUILD svgalib-1.9.25-r8.ebuild 3456 BLAKE2B 514c65ea6a896d91e36a659aa242b106b40b959a75c95e0a35fad4056aaebe4f772607e1b9668ed8aa8f74863cac93442a0b7e26a0767cdb9244a27681889e0e SHA512 4a47755b107909177ada3457676a2605537a6dde33d0865a1fe9df3f0426fd583c00eba753c1c6e372c6f982e1f8a5649b320d3828e0c96831af32816d470f66
+EBUILD svgalib-1.9.25-r8.ebuild 3502 BLAKE2B 150bd395483c32965bf3858fcb0d42b7834af751e3bdfabbaa5adcb4822792da735324956469c17e1b440dea51cd701b0504d20770b3c1b08c17165967efa8a2 SHA512 3f8004bfc89776162dbe4c5c99219d4c90b737c5e5a8e76bd5746960eb9362fe2601837d75e18cb0dbb75694de491df7957c67a002f1b332e7756ff9c26026d8
 MISC metadata.xml 325 BLAKE2B eee2dcb0d80f8fa891865f3074139f3a9db2af0339f342f0f82512dc1195e7a95616a36ae9917e8724d12f15c1b5c056c3c5d242c32e989c354b39a7d6fbd5da SHA512 7d2874207eaab21b41da8bd8b9afb5cda10351e3c88fe09ae1856664115b3c86d13362a82695a016911390e5ff6762a86409b437a3d76b077e01ac0ff6662d5d
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-gl-asm-width.patch b/media-libs/svgalib/files/svgalib-1.9.25-gl-asm-width.patch
new file mode 100644
index 000000000000..8204ea163bd4
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.9.25-gl-asm-width.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/show_bug.cgi?id=789747
+--- svgalib-1.9.25/gl/driver.c.orig	2021-05-16 13:24:38.937410767 +0300
++++ svgalib-1.9.25/gl/driver.c	2021-05-16 13:24:47.263441562 +0300
+@@ -38,9 +38,9 @@
+ 	    ((c >> 8) & 0xff) << 8 |
+ 	    ((c >> 16) & 0xff) << 0;
+ #else
+-	asm("rorw  $8, %0\n"	/* 0RGB -> 0RBG */
++	asm("rorw  $8, %w0\n"	/* 0RGB -> 0RBG */
+ 	    "rorl $16, %0\n"	/* 0RBG -> BG0R */
+-	    "rorw  $8, %0\n"	/* BG0R -> BGR0 */
++	    "rorw  $8, %w0\n"	/* BG0R -> BGR0 */
+ 	    "shrl  $8, %0\n"	/* 0BGR -> 0BGR */
+       : "=q"(c):"0"(c));
+ #endif
diff --git a/media-libs/svgalib/svgalib-1.9.25-r7.ebuild b/media-libs/svgalib/svgalib-1.9.25-r7.ebuild
deleted file mode 100644
index d6e517631e72..000000000000
--- a/media-libs/svgalib/svgalib-1.9.25-r7.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic linux-mod toolchain-funcs
-
-DESCRIPTION="A library for running svga graphics on the console"
-HOMEPAGE="http://www.svgalib.org/"
-SRC_URI="http://www.arava.co.il/matan/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE="build +kernel-helper"
-
-MODULE_NAMES="svgalib_helper(misc:${S}/kernel/svgalib_helper)"
-BUILD_TARGETS="default"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.25-linux_2.6.patch
-	"${FILESDIR}"/${PN}-1.9.19-pic.patch
-	"${FILESDIR}"/${PN}-1.9.25-build.patch
-	"${FILESDIR}"/${PN}-1.9.25-linux_2.6.28.patch
-	"${FILESDIR}"/${PN}-1.9.25-glibc210.patch
-	"${FILESDIR}"/${PN}-1.9.25-linux_2.6.36-r1.patch
-	"${FILESDIR}"/${PN}-1.9.25-fix_buffer.patch
-	"${FILESDIR}"/${PN}-1.9.25-vga_reset.patch
-	"${FILESDIR}"/${PN}-1.9.25-missing_include.patch
-	"${FILESDIR}"/${PN}-1.9.25-linux_3.4.patch
-	"${FILESDIR}"/${PN}-1.9.25-linux_3.9.patch
-)
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KDIR=${KV_OUT_DIR}"
-}
-
-src_prepare() {
-	default
-	sed -i -e '/linux\/smp_lock.h/d' kernel/svgalib_helper/main.c || die
-}
-
-src_compile() {
-	use kernel-helper || export NO_HELPER=y
-
-	export CC=$(tc-getCC)
-	# C89 extern inlines are needed, see #576260
-	append-cflags -fgnu89-inline
-
-	# First build static
-	emake OPTIMIZE="${CFLAGS}" static
-	# Then build shared ...
-	emake OPTIMIZE="${CFLAGS}" shared
-	# Missing in some cases ...
-	ln -s libvga.so.${PV} sharedlib/libvga.so
-	# Build lrmi and tools ...
-	emake OPTIMIZE="${CFLAGS}" LDFLAGS+=" -L../sharedlib" \
-		textutils lrmi utils
-	# Build the gl stuff tpp
-	emake OPTIMIZE="${CFLAGS}" -C gl
-	emake OPTIMIZE="${CFLAGS}" -C gl libvgagl.so.${PV}
-	# Missing in some cases ...
-	ln -s libvgagl.so.${PV} sharedlib/libvgagl.so
-	emake OPTIMIZE="${CFLAGS}" -C src libvga.so.${PV}
-	cp -pPR src/libvga.so.${PV} sharedlib/
-	# Build threeDKit ...
-	emake OPTIMIZE="${CFLAGS}" LDFLAGS+=" -L../sharedlib" \
-		-C threeDKit lib3dkit.a
-	# Build demo's ...
-	emake OPTIMIZE="${CFLAGS} -I../gl" LDFLAGS+=" -L../sharedlib" \
-		demoprogs
-
-	! use build && use kernel-helper && linux-mod_src_compile
-}
-
-src_install() {
-	local x
-
-	dodir /etc/svgalib /usr/{include,lib,bin,share/man}
-
-	emake \
-		TOPDIR="${D}" OPTIMIZE="${CFLAGS}" INSTALLMODULE="" \
-		install
-	! use build && use kernel-helper && linux-mod_src_install
-
-	insinto /usr/include
-	doins gl/vgagl.h
-	dolib.a staticlib/libvga.a
-	dolib.a gl/libvgagl.a
-	dolib.a threeDKit/lib3dkit.a
-	dolib.so gl/libvgagl.so.${PV}
-	local abiver=$(sed -n '/^MAJOR_VER.*=/{s:.*=[ ]*::;p}' Makefile.cfg)
-	for x in lib3dkit libvga libvgagl ; do
-		dosym ${x}.so.${PV} /usr/lib/${x}.so
-		dosym ${x}.so.${PV} /usr/lib/${x}.so.${abiver}
-	done
-
-	insinto /usr/include
-	doins src/vga.h gl/vgagl.h src/mouse/vgamouse.h src/joystick/vgajoystick.h
-	doins src/keyboard/vgakeyboard.h kernel/svgalib_helper/svgalib_helper.h
-
-	insinto /lib/udev/rules.d
-	newins "${FILESDIR}"/svgalib.udev.rules.d.2 30-svgalib.rules
-
-	exeinto /usr/lib/svgalib/demos
-	for x in "${S}"/demos/* ; do
-		[[ -x ${x} ]] && doexe ${x}
-	done
-
-	cd "${S}"/threeDKit
-	exeinto /usr/lib/svgalib/threeDKit
-	local THREED_PROGS="plane wrapdemo"
-	doexe ${THREED_PROGS}
-
-	cd "${S}"
-	dodoc 0-README
-	cd "${S}"/doc
-	dodoc CHANGES DESIGN TODO
-	docinto txt
-	dodoc Driver-programming-HOWTO add_driver svgalib.lsm \
-		README.{joystick,keymap,multi-monitor,patching,vesa}
-	# avoid installation of a broken symlink
-	newdoc ../lrmi-0.6m/README README.lrmi
-}
-
-pkg_postinst() {
-	! use build && use kernel-helper && linux-mod_pkg_postinst
-}
diff --git a/media-libs/svgalib/svgalib-1.9.25-r8.ebuild b/media-libs/svgalib/svgalib-1.9.25-r8.ebuild
index 87dea240053f..9fea5896e39d 100644
--- a/media-libs/svgalib/svgalib-1.9.25-r8.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.25-r8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.arava.co.il/matan/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* x86"
 IUSE="build +kernel-helper"
 
 MODULE_NAMES="svgalib_helper(misc:${S}/kernel/svgalib_helper)"
@@ -32,6 +32,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.9.25-no-man-compression.patch
 	"${FILESDIR}"/${PN}-1.9.25-wrapdemo-buf-overflow.patch
 	"${FILESDIR}"/${PN}-1.9.25-ar.patch
+	"${FILESDIR}"/${PN}-1.9.25-gl-asm-width.patch
 )
 
 pkg_setup() {