summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakov Smolic <jakov.smolic@sartura.hr>2020-11-26 11:32:45 +0100
committerDavid Seifert <soap@gentoo.org>2020-11-26 11:32:45 +0100
commitc3868b2816dccb819eb62eb0570be4d0eb57e413 (patch)
tree209a1506cf9ca72c71d6a58f747271eaf6de17f3
parentsys-apps/restartd: fix build with gcc-10 (diff)
downloadgentoo-c3868b2816dccb819eb62eb0570be4d0eb57e413.tar.gz
gentoo-c3868b2816dccb819eb62eb0570be4d0eb57e413.tar.bz2
gentoo-c3868b2816dccb819eb62eb0570be4d0eb57e413.zip
net-dialup/mwavem: port to EAPI 7
Closes: https://github.com/gentoo/gentoo/pull/18402 Closes: https://bugs.gentoo.org/724974 Closes: https://bugs.gentoo.org/707684 Package-Manager: Portage-3.0.9, Repoman-3.0.1 Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr> Signed-off-by: David Seifert <soap@gentoo.org>
-rw-r--r--net-dialup/mwavem/files/mwavem-2.0-ar.patch10
-rw-r--r--net-dialup/mwavem/files/mwavem-2.0-fno-common.patch22
-rw-r--r--net-dialup/mwavem/mwavem-2.0-r2.ebuild40
3 files changed, 54 insertions, 18 deletions
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 00000000000..b0ce341ae6f
--- /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 00000000000..02e5b4780fd
--- /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 c682b08f9ea..fa58e465d95 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
}