gentoo resync : 04.01.2022

3 files changed, 49 insertions, 20 deletions

diff --git a/sys-apps/pcmciautils/Manifest b/sys-apps/pcmciautils/Manifest
index cf00a08b8ac6..0750de78c7c4 100644
--- a/sys-apps/pcmciautils/Manifest
+++ b/sys-apps/pcmciautils/Manifest
@@ -1,5 +1,6 @@
 AUX pcmciautils-018_p8-flex-2.6.3-fix.patch 593 BLAKE2B bff765ae6c80daf3d2413528c4d42aefb7af7e3823590d33315c7089a5221d99c82802378cf9b51502b53bd920e0b5b4b68aaa82d50a92e83f5dfe7207c39a49 SHA512 b96f9bc3176f1eeb936a31f8fab5a495ce14218e92fbae2350aa970328b53bd6732ade90721f1ca55d80a94436189773f83a300aa8af7c43ecc5ed62c95f3557
+AUX pcmciautils-018_p8-musl-unsigned-type.patch 648 BLAKE2B dd82e800e032eb95dc1160424157f13f56ca8f000fe7c857cbaf40010dc2e65914e5d38ee8910607ea45859a7464d64f6aa9ff1f7b4c6a8412fc4d0ad2f10378 SHA512 7d140e327421f70007728e7330042dbf6d16988d6ecdc2372321a3d0a6e1c240549a5e9d110d9e6d5b74c1bdcb1caa13f52d3ad75a35dbf70d1602c46e50d358
 DIST pcmciautils_018-8.debian.tar.gz 11213 BLAKE2B cf28ecf71ebfd5c4ad7d882cbadab71b787f407adb2d20258cdc1157ca7d542bf398ff09207037d1d6e933d43e477b50b28ca3f0ac0e557fbaefb9f31656843e SHA512 8a00d776e208b43d01fe22b9d4e889bc1b2c5982aa1bf225bdd613ffb0f5b37f5266ccc1cb91df9ac49c4ee3e3653ebb29807b61fff53c585e2cfed5aa2cd9e9
 DIST pcmciautils_018.orig.tar.gz 48516 BLAKE2B 0b197cdd7d0940e5c0eee2da961f0f4dd972a3178ba5d07a6492185d0ab156cd61f5343c8f9d812cff402f04af76a15baa3db564d14317d3817e5325dd8811fb SHA512 f0af1fc6155686ae61c1c85a6451b032088a3880dfbc05c1d1ed33ca8e975745f9d4bedb0f3ee0a1252461aa008bed8014c73ff850cddd89d930524a6d68d47d
-EBUILD pcmciautils-018_p8-r3.ebuild 1557 BLAKE2B 90448cde1db5171cf70625a282053eae80e81a98b853a451082abedb2159acf374d27291580ec89ed6d2801799aaea3361d47ce50a45a24417de6c586d0f45d6 SHA512 504430423b2080260abe11f0010e92f54d8782ae03e230ac993647a405d8fa492fc8ca0dcc6942cc6324be7db2cba27188329ea47e5ca4fc968c247a84c6b2a1
+EBUILD pcmciautils-018_p8-r3.ebuild 1632 BLAKE2B aaae3b06f9288c32cbd42721b522c9ca4a46166d172b1e862124672b013cbc9e25c4589ad0c4497a780d8ab5a5e277508c3a2f007460385e2ae0b67220ffc644 SHA512 e2e485f5087afa06cb851ed8b421afd2084cb904997e59dd87ab2236ad192b511558929a585f03a6a9f4e47b303cf5361e4750c21cf4be6d2d0e961ff2705b17
 MISC metadata.xml 245 BLAKE2B 7c3776457ba60210a6b5e9b1a0d81ca8fa5cebad8aa6b06001104cf7bbe9dc65ca4fe70b827f3423fc6d0f6de56d8bb5484580e47331655fd4b07e58e2ced33c SHA512 e05491fb93b9ea6296bd0ebdbf9a8027b413e9d8d798a815c65c566b44cfb76b601a82b6da42a5bcea6d8b9ff31d721248d944891abd71cff844537dd4e50cc4
diff --git a/sys-apps/pcmciautils/files/pcmciautils-018_p8-musl-unsigned-type.patch b/sys-apps/pcmciautils/files/pcmciautils-018_p8-musl-unsigned-type.patch
new file mode 100644
index 000000000000..6039b8147096
--- /dev/null
+++ b/sys-apps/pcmciautils/files/pcmciautils-018_p8-musl-unsigned-type.patch
@@ -0,0 +1,24 @@
+https://git.alpinelinux.org/aports/plain/main/pcmciautils/unsigned.patch
+https://bugs.gentoo.org/716120
+--- a/src/read-cis.c
++++ b/src/read-cis.c
+@@ -51,7 +51,7 @@
+ 		/* Get indirect link from the MFC tuple */
+ 		read_cis(tuple->Flags.link_space,
+ 			       tuple->LinkOffset, 5, link);
+-		ofs = *(u_int *)(link+1);
++		ofs = *(unsigned int *)(link+1);
+ 		tuple->Flags.space = (link[0] == CISTPL_MFC_ATTR);
+ 		/* Move to the next indirect link */
+ 		tuple->LinkOffset += 5;
+--- a/src/yacc_config.y
++++ b/src/yacc_config.y
+@@ -40,7 +40,7 @@
+ 
+ %union {
+     char *str;
+-    u_long num;
++    unsigned long num;
+     struct adjust_list_t *adjust;
+ }
+ 
diff --git a/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild b/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild
index d27c8288425f..9d5b1a167818 100644
--- a/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild
+++ b/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit flag-o-matic linux-info toolchain-funcs udev
 
 DEB_REV=${PV#*_p}
@@ -11,6 +12,7 @@ DESCRIPTION="PCMCIA userspace utilities for Linux"
 HOMEPAGE="https://packages.qa.debian.org/pcmciautils"
 SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}.orig.tar.gz
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}-${DEB_REV}.debian.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_PV}
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,13 +24,31 @@ DEPEND="${RDEPEND}
 	virtual/yacc
 	sys-devel/flex"
 
-S=${WORKDIR}/${PN}-${MY_PV}
+PATCHES=(
+	"${WORKDIR}"/debian/patches/no-modprobe-rules.patch
+	"${WORKDIR}"/debian/patches/remove-libsysfs-dep.patch
+	"${FILESDIR}"/${P}-flex-2.6.3-fix.patch
+	"${FILESDIR}"/${PN}-018_p8-musl-unsigned-type.patch
+)
 
 pkg_setup() {
 	CONFIG_CHECK="~PCMCIA"
 	linux-info_pkg_setup
 
 	kernel_is lt 2 6 32 && ewarn "${P} requires at least kernel 2.6.32."
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/CFLAGS/s:-fomit-frame-pointer::' \
+		-e '/dir/s:sbin:bin:g' \
+		Makefile || die
+}
+
+src_configure() {
+	use debug && append-cppflags -DDEBUG
 
 	mypcmciaopts=(
 		STARTUP=$(usex staticsocket false true)
@@ -44,23 +64,7 @@ pkg_setup() {
 		STRIP=true
 		RANLIB="$(tc-getRANLIB)"
 		OPTIMIZATION="${CFLAGS} ${CPPFLAGS}"
-		)
-
-	use debug && append-cppflags -DDEBUG
-}
-
-PATCHES=(
-	"${WORKDIR}"/debian/patches/no-modprobe-rules.patch
-	"${WORKDIR}"/debian/patches/remove-libsysfs-dep.patch
-	"${FILESDIR}"/${P}-flex-2.6.3-fix.patch
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/CFLAGS/s:-fomit-frame-pointer::' \
-		-e '/dir/s:sbin:bin:g' \
-		Makefile || die
+	)
 }
 
 src_compile() {