diff options
| author |   Sam James <sam@gentoo.org> | 2021-07-25 04:39:32 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-07-25 04:43:35 +0100 |
| commit | e536315bf9bbe10a71e1b7c35ba5258971955ff1 (patch) | |
| tree | 0b59ee8d91348851c618390371f2187f50a7693c /net-vpn/networkmanager-l2tp | |
| parent | net-vpn/networkmanager-l2tp: version bump to 1.8.6 (diff) | |
| download | gentoo-e536315bf9bbe10a71e1b7c35ba5258971955ff1.tar.gz gentoo-e536315bf9bbe10a71e1b7c35ba5258971955ff1.tar.bz2 gentoo-e536315bf9bbe10a71e1b7c35ba5258971955ff1.zip | |
net-vpn/networkmanager-l2tp: rebase 1.8.6 on fixed 1.8.2-r1
Bug: https://bugs.gentoo.org/722718
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-vpn/networkmanager-l2tp')
| -rw-r--r-- | net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.6.ebuild | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.6.ebuild b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.6.ebuild index dd22005826d3..0db9addd3960 100644 --- a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.6.ebuild +++ b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.6.ebuild @@ -6,7 +6,7 @@ EAPI=7 MY_PN="NetworkManager-l2tp" MY_P="${MY_PN}-${PV}" -inherit eutils gnome.org autotools +inherit gnome.org autotools DESCRIPTION="NetworkManager L2TP plugin" HOMEPAGE="https://github.com/nm-l2tp/network-manager-l2tp" @@ -20,7 +20,7 @@ IUSE="gnome static-libs" RDEPEND=" >=net-misc/networkmanager-1.2[ppp] dev-libs/dbus-glib - net-dialup/ppp[eap-tls] + net-dialup/ppp:=[eap-tls] net-dialup/xl2tpd >=dev-libs/glib-2.32 || ( @@ -32,8 +32,8 @@ RDEPEND=" app-crypt/libsecret gnome-extra/nm-applet )" - -BDEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" sys-devel/gettext dev-util/intltool virtual/pkgconfig" @@ -46,8 +46,13 @@ src_prepare() { } src_configure() { + local PPPD_VER=$(best_version net-dialup/ppp) + PPPD_VER=${PPPD_VER#*/*-} # reduce it to ${PV}-${PR} + PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision + local myeconfargs=( --localstatedir=/var + --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} $(use_with gnome) $(use_enable static-libs static) ) |