commit: 4a43031d7e76be66e1a94059dbe1eefcdb1efdcd Author: Dmitrii Tochanskii <tochansky <AT> tochlab <DOT> net> AuthorDate: Sat May 22 10:23:33 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jul 25 03:32:02 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a43031d
net-vpn/networkmanager-l2tp: use correct ppp plugin path By default /usr/lib64/pppd/2.4.7/ path used. This will use right path from portage. Bug: https://bugs.gentoo.org/722718 Closes: https://github.com/gentoo/gentoo/pull/20926 Signed-off-by: Sam James <sam <AT> gentoo.org> ...-l2tp-1.8.2.ebuild => networkmanager-l2tp-1.8.2-r1.ebuild} | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.2.ebuild b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.2-r1.ebuild similarity index 76% rename from net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.2.ebuild rename to net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.2-r1.ebuild index ec5ca2a6dde..0db9addd396 100644 --- a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.2.ebuild +++ b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.2-r1.ebuild @@ -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) )
