gentoo resync : 28.11.2020

4 files changed, 57 insertions, 19 deletions

diff --git a/net-dialup/mwavem/Manifest b/net-dialup/mwavem/Manifest
index 06fd3341b516..b7eea7b87e7d 100644
--- a/net-dialup/mwavem/Manifest
+++ b/net-dialup/mwavem/Manifest
@@ -1,8 +1,10 @@
 AUX mwave-dev-handler 210 BLAKE2B 0b5e6285e3c05279920a446b174a03ff2fc594639597a6b120cc38fc0f10533872a11ac7f4111be941e78e1b9a952db8f84a8e41307d9eb21b482b94c6dadb8a SHA512 5f9806aa690f465a188ec48692ac27e755b58480f8e329e519dd64766ceed20bb7342b15fd7d8981fefe133975a8dd593f2ed03c673bccfcb95582c990901248
 AUX mwave.devfs 150 BLAKE2B 8eb566bce37c62b96b32324ac65cad1ceb5b60cfd34b0bab0f2daf8324de2ff7544899ee1037b178c391d5ee74eaf1381e3a59f3d159a89ba05fec42cbda6cdb SHA512 e283fa56e535e69ac5ae602301bf36ae1bf58e6e3a4abf68056c0082bc0bbf82b20cd0293c2853ff10bcc09fc39ebb294f812086cc39ef8e2d06e07b9ace128b
 AUX mwave.modules 30 BLAKE2B 6dd8f901ed35314e8ea4b6b1bc5e56943bb2d9f7ba5dccd9bd666af2a280b1c65d935ae7e6d7d1244a80c8bc23b64f4b128f8fa73c01398ba7350d766dd48a64 SHA512 062bb44acbb71fba0a1807a4c0a618d80e40be7c31c5185441be6e8c845e29aa9c702391081e1c28eb65bb19b2c1dca1cabacc96c8c0b26b4d132406374cd145
+AUX mwavem-2.0-ar.patch 218 BLAKE2B 433f97b0b9417d98aa420e148db4efcfb6c6b0f3bdc95aa9959e1a0126be7e0498cd767fb653bdf48327779c961c5eeb1982dcedcdaa103ca9a62108fc8ca47c SHA512 5c9b3e65e2d05d84222c50f393b1ba8ba7c442b61169910131d3d8711946773f8821664dec16c3376c477d490f7fff18d5abb6501dacfb04195b51886e187da6
+AUX mwavem-2.0-fno-common.patch 648 BLAKE2B 29ea7460a86caae6c2033923f1ef6e9c43db4202f1802061e03fcc8f9eb16db6fde5a907960644bdeead3514a01a7f9901288d3a535f9bc657ef4bbfb1e3a3e9 SHA512 6087f5c42a3b3a57a87367e6fae41fccfdefbfcba681406903230c1ae88305787da0acb969c56f19b24255f78f4a44f35627e3ec2ba8417c9babff86a7bbf452
 AUX mwavem-2.0-gentoo.patch 1010 BLAKE2B 1a3d7126af9201bf8bcd2440f362b13a7037c8f4b3e6356f87103b2c315508b292d20946c87e93d8d939f19d95a9f781b3948c8caf0d003578fb8fe223f2eaaa SHA512 e0a97cfe59d7ecffc1199e9ad1380c9965546e554536747f593a69e0920f022e9667554fcb6633e1814163243b98ffc695ec25d98471d41b2e08ed112653dccf
 AUX mwavem-2.0-glibc-2.10.patch 1389 BLAKE2B 93073cdb8ef48b89b6f2603730d5a970e04202d1f249b1afeb3edbbde413fced88cfd31c2b56e0e9f981271a3830725047b98c1b3f9e8914460a730b5a86403a SHA512 a946530d607361c189d4cda8d8dcd3454caed695894dea8e7c25f53a2ae33a0e4684f738527f635eb0ddcbd238ce5007b9bd54c0c34f5b78d83d49ad530ba474
 DIST mwavem-2.0.tar.gz 1443167 BLAKE2B d70e3088b13a83f5dfd93690e67fa68497ef793b840fa3cba45efe4e72448abeba5312e0bbf1176825a62c366d47829ebd135461bf9600ba1b971b1db00a55e7 SHA512 e1bb3c7e5511abc784b0359b844498389a9cb970fe46752775aaae6146d8cf25998a6e12dfc70df5c5f4287fd57abb49252f81a00528db5f7c2c96e3e7efb516
-EBUILD mwavem-2.0-r2.ebuild 1162 BLAKE2B b1e70d390d1d61066e7e1da9d301545d82db93339819c5cc73f08465951514412ca8ff546f2ad2b9ad1ebac38ec8de45ddc63b7df62f80eabc48d3397392f32f SHA512 901a041819af6daf5177141570273f75748c14d353d58bbcffcb115c82b025f6ffbab434886a4c8cc66c587bc239ce7c41e92927b830aad9ae6c08f00981c0d1
+EBUILD mwavem-2.0-r2.ebuild 1201 BLAKE2B 129960805253e8e17fd41188bb9ca40125352bf762067e868bec343ebad84fde9ad3e6c993a9236f73efcd5a8b0ce756435a8ca431eb58283ae6bbd8d19cd3f4 SHA512 6788d27903f4e1d7ec0c4d57453a3e8a899f436b6373956a38ccc2747c8fea44e45e459dac6b365227cc853f3ed19387c095bff5f817d2869cdd2a6c7206a1c1
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dialup/mwavem/files/mwavem-2.0-ar.patch b/net-dialup/mwavem/files/mwavem-2.0-ar.patch
new file mode 100644
index 000000000000..b0ce341ae6fe
--- /dev/null
+++ b/net-dialup/mwavem/files/mwavem-2.0-ar.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -12,6 +12,7 @@ dnl Find programs for building and installation.
+ AC_PROG_CC
+ AC_PROG_RANLIB
+ AC_PROG_INSTALL
++AM_PROG_AR
+ 
+ dnl Check for libraries
+ AC_CHECK_LIB(pthread, main)
diff --git a/net-dialup/mwavem/files/mwavem-2.0-fno-common.patch b/net-dialup/mwavem/files/mwavem-2.0-fno-common.patch
new file mode 100644
index 000000000000..02e5b4780fd2
--- /dev/null
+++ b/net-dialup/mwavem/files/mwavem-2.0-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/src/include/unidiags.h
++++ b/src/include/unidiags.h
+@@ -65,7 +65,7 @@ bits    Source bits     Definition
+ 
+ #define BIT(x)                (1<<x)
+ 
+-UINT shit;
++extern UINT shit;
+ 
+ typedef struct _V34INFO {                /* for key 18 */
+        UINT INFOa_bits4049  :10;
+--- a/src/manager/dspsrv.c
++++ b/src/manager/dspsrv.c
+@@ -75,7 +75,7 @@ HANDLE                hMwThread;
+ DWORD                 MwThreadId;
+ /* @TBD CRITICAL_SECTION      MwTerminateSection; */
+ BOOL                  MwTerminate = FALSE;
+-HANDLE                hDrv;
++extern HANDLE                hDrv;
+ HANDLE                hMwProcess;
+ 
+ BOOL AllocateHeaps( void );
diff --git a/net-dialup/mwavem/mwavem-2.0-r2.ebuild b/net-dialup/mwavem/mwavem-2.0-r2.ebuild
index c682b08f9ea8..fa58e465d95f 100644
--- a/net-dialup/mwavem/mwavem-2.0-r2.ebuild
+++ b/net-dialup/mwavem/mwavem-2.0-r2.ebuild
@@ -1,12 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-AT_M4DIR="m4"
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils
+inherit autotools
 
 DESCRIPTION="User level application for IBM Mwave modem"
 HOMEPAGE="http://oss.software.ibm.com/acpmodem/"
@@ -16,37 +13,44 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-DOCS=( AUTHORS ChangeLog FAQ NEWS README README.devfs THANKS )
-
 PATCHES=(
-	"${FILESDIR}/${P}-gentoo.patch"
-	"${FILESDIR}/${P}-glibc-2.10.patch"
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-glibc-2.10.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-ar.patch
 )
 
+HTML_DOCS=( doc/mwave.html )
+
+src_prepare() {
+	default
+	rm README.freebsd || die
+	mv configure.{in,ac} || die
+	AT_M4DIR=m4 eautoreconf
+}
+
 src_install() {
-	autotools-utils_src_install
+	default
 
-	dosbin "${FILESDIR}/mwave-dev-handler"
+	dosbin "${FILESDIR}"/mwave-dev-handler
 
 	insinto /etc/devfs.d
-	newins "${FILESDIR}/mwave.devfs" mwave
+	newins "${FILESDIR}"/mwave.devfs mwave
 
 	insinto /etc/modprobe.d
-	newins "${FILESDIR}/mwave.modules" mwave.conf
+	newins "${FILESDIR}"/mwave.modules mwave.conf
 
-	docinto doc
 	dodoc doc/mwave.sgml doc/mwave.txt
-	dohtml doc/mwave.html
 }
 
 pkg_postinst() {
-	if [ -e "${ROOT}/dev/.devfsd" ]; then
+	if [[ -e "${EROOT}"/dev/.devfsd ]]; then
 		# device node is created by devfs
 		ebegin "Restarting devfsd to reread devfs rules"
 			killall -HUP devfsd
 		eend $?
 	else
 		elog "Create device node if needed, using command like this:"
-		elog "# mknod --mode=0660 \"${ROOT}/dev/modems/mwave\" c 10 219"
+		elog "# mknod --mode=0660 \"${EROOT}/dev/modems/mwave\" c 10 219"
 	fi
 }