| 1 |
commit: 4a43031d7e76be66e1a94059dbe1eefcdb1efdcd |
| 2 |
Author: Dmitrii Tochanskii <tochansky <AT> tochlab <DOT> net> |
| 3 |
AuthorDate: Sat May 22 10:23:33 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 25 03:32:02 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a43031d |
| 7 |
|
| 8 |
net-vpn/networkmanager-l2tp: use correct ppp plugin path |
| 9 |
|
| 10 |
By default /usr/lib64/pppd/2.4.7/ path used. This will use right path from portage. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/722718 |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/20926 |
| 14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 15 |
|
| 16 |
...-l2tp-1.8.2.ebuild => networkmanager-l2tp-1.8.2-r1.ebuild} | 11 ++++++++--- |
| 17 |
1 file changed, 8 insertions(+), 3 deletions(-) |
| 18 |
|
| 19 |
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 |
| 20 |
similarity index 76% |
| 21 |
rename from net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.2.ebuild |
| 22 |
rename to net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.2-r1.ebuild |
| 23 |
index ec5ca2a6dde..0db9addd396 100644 |
| 24 |
--- a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.2.ebuild |
| 25 |
+++ b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.2-r1.ebuild |
| 26 |
@@ -20,7 +20,7 @@ IUSE="gnome static-libs" |
| 27 |
RDEPEND=" |
| 28 |
>=net-misc/networkmanager-1.2[ppp] |
| 29 |
dev-libs/dbus-glib |
| 30 |
- net-dialup/ppp[eap-tls] |
| 31 |
+ net-dialup/ppp:=[eap-tls] |
| 32 |
net-dialup/xl2tpd |
| 33 |
>=dev-libs/glib-2.32 |
| 34 |
|| ( |
| 35 |
@@ -32,8 +32,8 @@ RDEPEND=" |
| 36 |
app-crypt/libsecret |
| 37 |
gnome-extra/nm-applet |
| 38 |
)" |
| 39 |
- |
| 40 |
-BDEPEND="${RDEPEND} |
| 41 |
+DEPEND="${RDEPEND}" |
| 42 |
+BDEPEND=" |
| 43 |
sys-devel/gettext |
| 44 |
dev-util/intltool |
| 45 |
virtual/pkgconfig" |
| 46 |
@@ -46,8 +46,13 @@ src_prepare() { |
| 47 |
} |
| 48 |
|
| 49 |
src_configure() { |
| 50 |
+ local PPPD_VER=$(best_version net-dialup/ppp) |
| 51 |
+ PPPD_VER=${PPPD_VER#*/*-} # reduce it to ${PV}-${PR} |
| 52 |
+ PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision |
| 53 |
+ |
| 54 |
local myeconfargs=( |
| 55 |
--localstatedir=/var |
| 56 |
+ --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} |
| 57 |
$(use_with gnome) |
| 58 |
$(use_enable static-libs static) |
| 59 |
) |
Archives