From 08d759cd0d30319dad072e50db3a50f77be89acf Mon Sep 17 00:00:00 2001 From: Martin Väth Date: Sun, 29 Nov 2015 08:29:52 +0100 Subject: Bump to EAPI=6 --- .../martian-modem/martian-modem-20100123-r2.ebuild | 35 ++++++++++++---------- 1 file changed, 19 insertions(+), 16 deletions(-) (limited to 'net-dialup/martian-modem/martian-modem-20100123-r2.ebuild') diff --git a/net-dialup/martian-modem/martian-modem-20100123-r2.ebuild b/net-dialup/martian-modem/martian-modem-20100123-r2.ebuild index 915fb342..0c6dbe0a 100644 --- a/net-dialup/martian-modem/martian-modem-20100123-r2.ebuild +++ b/net-dialup/martian-modem/martian-modem-20100123-r2.ebuild @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -inherit eutils linux-mod readme.gentoo +EAPI=6 +inherit linux-mod readme.gentoo MY_P="martian-full-${PV}" DESCRIPTION="ltmodem alternative driver providing support for Agere Systems winmodems" @@ -46,20 +46,11 @@ MODULE_NAMES="martian_dev(ltmodem::kmodule)" CONFIG_CHECK="SERIAL_8250" SERIAL_8250_ERROR="This driver requires you to compile your kernel with serial core (CONFIG_SERIAL_8250) support." -pkg_setup() { - linux-mod_pkg_setup - - if kernel_is 2 4; then - eerror "This driver works only with 2.6 kernels!" - die "unsupported kernel detected" - fi -} - src_prepare() { # Exclude Makefile kernel version check, we used kernel_is above. # TODO: More exactly, martian-modem-full-20100123 is for >kernel-2.6.20! - epatch "${FILESDIR}/${P}-makefile.patch" - epatch "${FILESDIR}/${P}-grsecurity.patch" + eapply "${FILESDIR}/${P}-makefile.patch" + eapply -p0 "${FILESDIR}/${P}-grsecurity.patch" # fix compile on amd64 sed -i -e "/^HOST.*$/s:uname -i:uname -m:" modem/Makefile || die "sed failed" @@ -68,9 +59,20 @@ src_prepare() { BUILD_PARAMS="KERNEL_DIR='${KV_DIR}' SUBLEVEL='${KV_PATCH}'" if kernel_is ge 3 8 - then epatch "${FILESDIR}/${PN}-kernel-3.8.patch" + then + # Per Gentoo Bug #543702, CONFIG_HOTPLUG is going away as an option. As of + # Linux Kernel 3.8, the __dev* markings need to be removed. This patch removes + # the use of __devinit, __devexit_p, and __devexit as the type cast simply isn't + # needed any longer. + eapply "${FILESDIR}/${P}-linux-3.8.patch" + # Per Gentoo Bug #543702, "proc_dir_entry" and "create_proc_entry" Linux + # Kernel header definition was moved and only accessible internally as of + # Linux Kernel 3.10. This patch originates from Paul McClay (2014.05.28) + # and posted to Ubuntu Launchpad. + # It contains version checking code, hence can be applied unconditionally + eapply "${FILESDIR}/${P}-linux-3.10.patch" fi - epatch_user + eapply_user } src_install() { @@ -80,6 +82,7 @@ src_install() { dosbin modem/martian_modem newconfd "${FILESDIR}/${PN}.conf.d" ${PN} newinitd "${FILESDIR}/${PN}.init.d" ${PN} + readme.gentoo_create_doc } pkg_postinst() { @@ -89,5 +92,5 @@ pkg_postinst() { elog "You have SMP (symmetric multi processor) support enabled in kernel." elog "You should run martian-modem with --smp enabled in MARTIAN_OPTS." fi - readme.gentoo_pkg_postinst + readme.gentoo_print_elog } -- cgit v1.2.3-18-g5258