From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/, profiles/
Date: Tue, 22 Dec 2020 19:56:22 +0000 (UTC) [thread overview]
Message-ID: <1608666972.292933c82b06f3a1a3a64716476ab1287846aafd.marecki@gentoo> (raw)
commit: 292933c82b06f3a1a3a64716476ab1287846aafd
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 22 19:54:28 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Dec 22 19:56:12 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=292933c8
net-dialup/accel-ppp: migrate to lua-single.eclass
Locked to lua5.1 by upstream build scripts.
Closes: https://bugs.gentoo.org/752792
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
...uild => accel-ppp-1.12.0_p20200913-r100.ebuild} | 25 ++++++++++++++++------
net-dialup/accel-ppp/accel-ppp-9999.ebuild | 10 ++++++---
profiles/package.mask | 1 +
3 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913-r100.ebuild
similarity index 80%
copy from net-dialup/accel-ppp/accel-ppp-9999.ebuild
copy to net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913-r100.ebuild
index 3f8aec7348a..7443db97680 100644
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913-r100.ebuild
@@ -3,19 +3,20 @@
EAPI=7
-EGIT_REPO_URI="https://github.com/accel-ppp/accel-ppp.git"
-inherit cmake flag-o-matic git-r3 linux-info linux-mod
+LUA_COMPAT=( lua5-1 )
+
+inherit cmake flag-o-matic linux-info linux-mod lua-single
DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
-SRC_URI=""
+SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
IUSE="debug doc ipoe lua postgres radius shaper snmp valgrind"
-RDEPEND="lua? ( dev-lang/lua:0 )
+RDEPEND="lua? ( ${LUA_DEPS} )
postgres? ( dev-db/postgresql:* )
snmp? ( net-analyzer/net-snmp )
dev-libs/libpcre
@@ -28,7 +29,14 @@ DOCS=( README )
CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
-REQUIRED_USE="valgrind? ( debug )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+ valgrind? ( debug )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.11.1-socklen.patch"
+)
+
+S="${WORKDIR}"
pkg_setup() {
if use ipoe; then
@@ -37,6 +45,7 @@ pkg_setup() {
else
linux-info_pkg_setup
fi
+ use lua && lua-single_pkg_setup
}
src_prepare() {
@@ -48,6 +57,10 @@ src_prepare() {
drivers/ipoe/CMakeLists.txt \
drivers/vlan_mon/CMakeLists.txt || die
+ # Fix version
+ sed -i -e "s/1.11/${PV}/" drivers/ipoe/ipoe.c || die
+ sed -i -e "s/1.11/${PV}/" drivers/vlan_mon/vlan_mon.c || die
+
# Bug #549918
append-ldflags -Wl,-z,lazy
diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
index 3f8aec7348a..fd43b44ecd2 100644
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
@@ -3,8 +3,10 @@
EAPI=7
+LUA_COMPAT=( lua5-1 )
+
EGIT_REPO_URI="https://github.com/accel-ppp/accel-ppp.git"
-inherit cmake flag-o-matic git-r3 linux-info linux-mod
+inherit cmake flag-o-matic git-r3 linux-info linux-mod lua-single
DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
@@ -15,7 +17,7 @@ SLOT="0"
KEYWORDS=""
IUSE="debug doc ipoe lua postgres radius shaper snmp valgrind"
-RDEPEND="lua? ( dev-lang/lua:0 )
+RDEPEND="lua? ( ${LUA_DEPS} )
postgres? ( dev-db/postgresql:* )
snmp? ( net-analyzer/net-snmp )
dev-libs/libpcre
@@ -28,7 +30,8 @@ DOCS=( README )
CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
-REQUIRED_USE="valgrind? ( debug )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+ valgrind? ( debug )"
pkg_setup() {
if use ipoe; then
@@ -37,6 +40,7 @@ pkg_setup() {
else
linux-info_pkg_setup
fi
+ use lua && lua-single_pkg_setup
}
src_prepare() {
diff --git a/profiles/package.mask b/profiles/package.mask
index 9aa573146ec..af34e5ed319 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -550,6 +550,7 @@ kde-apps/kdebase-meta:5
>=net-analyzer/suricata-6.0.1-r100
>=net-analyzer/tracebox-0.4.4-r100
>=net-analyzer/wireshark-3.4.2-r100
+>=net-dialup/accel-ppp-1.12.0_p20200913-r100
>=net-dns/dnsmasq-2.82-r100
>=net-im/prosody-0.11.7-r100
>=net-im/swift-4.0.2-r100
reply other threads:[~2020-12-22 19:56 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1608666972.292933c82b06f3a1a3a64716476ab1287846aafd.marecki@gentoo \
--to=marecki@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox