commit: 3cfa87436e51cd873c1c222212db8eb794d49288 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Sat Jan 2 14:26:23 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Jan 2 14:26:23 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cfa8743
net-dialup/kpnadsl4linux: Port to EAPI 7 Closes: https://github.com/gentoo/gentoo/pull/18908 Closes: https://bugs.gentoo.org/670402 Closes: https://bugs.gentoo.org/707276 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> Signed-off-by: David Seifert <soap <AT> gentoo.org> .../files/kpnadsl4linux-1.11-Makefile.patch | 12 +++++------ .../files/kpnadsl4linux-1.11-fno-common.patch | 13 +++++++++++ net-dialup/kpnadsl4linux/kpnadsl4linux-1.11.ebuild | 25 ++++++++++++---------- 3 files changed, 33 insertions(+), 17 deletions(-) diff --git a/net-dialup/kpnadsl4linux/files/kpnadsl4linux-1.11-Makefile.patch b/net-dialup/kpnadsl4linux/files/kpnadsl4linux-1.11-Makefile.patch index f7d20bf348a..051dffe47fc 100644 --- a/net-dialup/kpnadsl4linux/files/kpnadsl4linux-1.11-Makefile.patch +++ b/net-dialup/kpnadsl4linux/files/kpnadsl4linux-1.11-Makefile.patch @@ -1,5 +1,5 @@ ---- Makefile.orig 2013-04-14 16:50:26.676698258 +0400 -+++ Makefile 2013-04-14 16:51:14.107695809 +0400 +--- a/Makefile ++++ b/Makefile @@ -1,18 +1,18 @@ # Makefile for ADSL4Linux 1.11 Gentoo Edition @@ -7,19 +7,19 @@ adsl: adsl.o adslstatus.o adslstatus.h adsl.h - gcc adsl.o adslstatus.o -o adsl -+ $(CC) $(LDFLAGS) adsl.o adslstatus.o -o adsl ++ $(CC) $(LDFLAGS) adsl.o adslstatus.o -o adsl $(LIBS) adsl.o: adsl.c adsl.h - gcc -c adsl.c -+ $(CC) $(CFLAGS) -c adsl.c ++ $(CC) $(CPPFLAGS) $(CFLAGS) -c adsl.c adslstatus: adslstatus.o adslstatus.h adsl.h - gcc adslstatus.o -o adslstatus -+ $(CC) $(LDFLAGS) adslstatus.o -o adslstatus ++ $(CC) $(LDFLAGS) adslstatus.o -o adslstatus $(LIBS) adslstatus.o: adslstatus.c adslstatus.h adsl.h - gcc -c adslstatus.c -+ $(CC) $(CFLAGS) -c adslstatus.c ++ $(CC) $(CPPFLAGS) $(CFLAGS) -c adslstatus.c clean: rm adsl *.o diff --git a/net-dialup/kpnadsl4linux/files/kpnadsl4linux-1.11-fno-common.patch b/net-dialup/kpnadsl4linux/files/kpnadsl4linux-1.11-fno-common.patch new file mode 100644 index 00000000000..586b517822f --- /dev/null +++ b/net-dialup/kpnadsl4linux/files/kpnadsl4linux-1.11-fno-common.patch @@ -0,0 +1,13 @@ +--- a/adslstatus.c ++++ b/adslstatus.c +@@ -40,8 +40,8 @@ version 0.13 moved logging to /var/log/kpnadsl4linux (by Sam Besselink <sambesse + #define FOURGB 4294967296.0 + + /* global variables */ +-time_t tmNow; +-uid_t uid; ++extern time_t tmNow; ++extern uid_t uid; + char pppBuf[256]; /* textbuffer containing ppp0 info */ + struct stat st; /* contains filestatus of STATFILE */ + double received, sent ; diff --git a/net-dialup/kpnadsl4linux/kpnadsl4linux-1.11.ebuild b/net-dialup/kpnadsl4linux/kpnadsl4linux-1.11.ebuild index 658aea979dc..1236eaed5a2 100644 --- a/net-dialup/kpnadsl4linux/kpnadsl4linux-1.11.ebuild +++ b/net-dialup/kpnadsl4linux/kpnadsl4linux-1.11.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2021 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="ADSL4Linux, a PPTP start/stop/etc. program especially for Dutch users" HOMEPAGE="http://www.adsl4linux.nl/"; @@ -14,18 +14,21 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc ppc64 x86" -RDEPEND=">=net-dialup/pptpclient-1.7.0 - >=net-dialup/ppp-2.4.2" +RDEPEND=" + net-dialup/ppp + net-dialup/pptpclient" + +PATCHES=( + "${FILESDIR}"/${P}-Makefile.patch + "${FILESDIR}"/${P}-fno-common.patch +) src_prepare() { - # Respect CC, CFLAGS and LDFLAGS. Bug #336109 - epatch "${FILESDIR}/${P}-Makefile.patch" tc-export CC + default - # Fix a typo - sed -i -e 's:* at first:/\0:' adslstatus.c || die 'sed on adslstatuc.c failed' - - epatch_user + sed -i -e 's:* at first:/\0:' adslstatus.c || die + sed -i -e 's/runscript/openrc-run/g' init.d.adsl || die } src_install() {
