gentoo resync : 08.01.2021

4 files changed, 36 insertions, 19 deletions

diff --git a/net-dialup/kpnadsl4linux/Manifest b/net-dialup/kpnadsl4linux/Manifest
index 1868c46020ee..386c43d3e786 100644
--- a/net-dialup/kpnadsl4linux/Manifest
+++ b/net-dialup/kpnadsl4linux/Manifest
@@ -1,5 +1,6 @@
-AUX kpnadsl4linux-1.11-Makefile.patch 637 BLAKE2B 1d980cfe80d302330d3d651b6b329f1d55b99b60f6135ec9b122e859b3f0f58a8bf3b9efab259eec1dd22d62b52aec3423aaa8f606020c83db60651ad3d86184 SHA512 011a541cd696670871f950f53cd8b11f6c91006bf2806500e610fcc8320143401aaa5c7c976b8df1b3ccc84d29e79e3ff1bfe10735784c5646cda02d5623bbe1
+AUX kpnadsl4linux-1.11-Makefile.patch 604 BLAKE2B a08bbcbefe390ff7ec12c60aec09b9637a03bf9bdde55c82749d71ceed0d7101e6c61ac7dc742d44f9e6e0021f270cc57116fec8557fa33aee7d395bca1059f4 SHA512 dba59f48074c55863cf5114d84616df712190e1b14d9f6a0079b36df74ca8674fc26fdc95765d4cf165e82e90bd51edafd37a26388c22d8fb6e05e3d24e2ecee
+AUX kpnadsl4linux-1.11-fno-common.patch 415 BLAKE2B 8cfbd57d50df13b9aacaf3f65d33ec0a243a37c9d027f03e36fa05739a9d63692475a828ef0ade3caf08b25ba72e9e2e6a1f5d8ed234578abdd9c9077afd5b22 SHA512 641671e70c053981d9a833abc3aaf9cbc6a754f7c3ff2353350b7da8b2a009115ba9ddd2f26d278c7cc87de6c4675ba0f8b4b54e0ca0298d0a074858b1776317
 AUX kpnadsl4linux-config 3773 BLAKE2B bfc568a6e6c2dc6a09c99b3a251ecd1cb03f3420fea502cca10bab3041e5cdfb6d469941f0d88f6bdee7c735ac8c22594a7fd98a2bc10c59aa9e435d16a15f9e SHA512 6f2fa43a33b111aadad0253aceafafff3850a46dba05d00752f72215dc2f37fa825337b20292a3f1d17af1a967dcbf425ce4ba4dfea7b84a3d01ede2f035d99a
 DIST kpnadsl4linux-1.11.tar.gz 15068 BLAKE2B 2199414df46df750ce5df12f44eadee29114e3b8211283a39bca26b0d2f697609aeaf3f022679fa165971b1182e175e8e15c17e7afd0315feca75a3302252e5a SHA512 050c879aff115169e6cb0f0bf081a8172a3f4735f7231d1e5d1f245b34a1b522691e7640d146eac3c894a17c2901e59f1f942f7be5a2eed5ce1eb8c96bfef201
-EBUILD kpnadsl4linux-1.11.ebuild 1129 BLAKE2B d5def33a48948040374a21579e277b66ad4d83d507a62213c876b5de7fbfc485d97c657b94b288b287933eccd4ee7274a96bddc7b5c2299fab71696472d848cc SHA512 d1f4c3f4947a6db876ed919a7d97ecaf920d5540244d8bcd5fbb7bf4e70e6b05ad11ba49393298bba5114ecc0e0ca8e9c21d52e71132882a14eeaa68f91b56d3
+EBUILD kpnadsl4linux-1.11.ebuild 1110 BLAKE2B b7dba250a84d6dcde4b154d43ff96c9166ffd770a3125fd5155c4a93665a4cc6b5f44537e17b0aa3b709f31b1cbc683ec9b502a88700f96bd112f2eaacead411 SHA512 59fcc2afdbb8f51f9f7b9ef221ba81e1959825b76869e71734ee524804f9cc5710642c891a9e6995d005c8d392e98fc3b0175fc1b42beca927d23b6775115acb
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dialup/kpnadsl4linux/files/kpnadsl4linux-1.11-Makefile.patch b/net-dialup/kpnadsl4linux/files/kpnadsl4linux-1.11-Makefile.patch
index f7d20bf348a6..051dffe47fc5 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 000000000000..586b517822fe
--- /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 658aea979dcf..988a1e9b2bee 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 Authors
 # 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() {