commit:     4fc2bc12abe37076c9739398d69fcbd23814d48f
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 26 10:53:14 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 10:55:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fc2bc12

net-vpn/networkmanager-sstp: disable libnm-glib usage, fix some deps

* Ensure libnm-glib and co usage is always disabled
* Fix USE=gtk deps; libnma was missing, even after --without-libnm-glib
* Add missing gdbus-codegen build dep
* Drop dbus-glib dep, long ported to GDBus; dep on needed minimum glib
  as per upstream
* Drop ltprune.eclass usage and unused eutils.eclass inherit
* Other small min dep tweaks per configure.ac

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 ...-1.2.0.ebuild => networkmanager-sstp-1.2.0-r1.ebuild} | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/net-vpn/networkmanager-sstp/networkmanager-sstp-1.2.0.ebuild 
b/net-vpn/networkmanager-sstp/networkmanager-sstp-1.2.0-r1.ebuild
similarity index 80%
rename from net-vpn/networkmanager-sstp/networkmanager-sstp-1.2.0.ebuild
rename to net-vpn/networkmanager-sstp/networkmanager-sstp-1.2.0-r1.ebuild
index cfd469aae6b..e3d6d9c1d49 100644
--- a/net-vpn/networkmanager-sstp/networkmanager-sstp-1.2.0.ebuild
+++ b/net-vpn/networkmanager-sstp/networkmanager-sstp-1.2.0-r1.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=6
 
-inherit eutils ltprune
-
 MY_PN="NetworkManager-sstp"
 MY_P="${MY_PN}-${PV}"
 
@@ -17,17 +15,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gtk"
 
-RDEPEND=">=dev-libs/dbus-glib-0.74
+RDEPEND="
+       >=dev-libs/glib-2.32:2
        net-misc/sstp-client
-       >=net-misc/networkmanager-${PV}
+       >=net-misc/networkmanager-1.1.0
        net-dialup/ppp:=
        gtk? (
-               x11-libs/gtk+:3
+               >=x11-libs/gtk+-3.4:3
+               >=net-libs/libnma-1.1.0
                app-crypt/libsecret
        )
 "
 
 DEPEND="${RDEPEND}
+       dev-util/gdbus-codegen
        virtual/pkgconfig
        sys-devel/gettext
        dev-util/intltool
@@ -42,10 +43,11 @@ src_configure() {
                --disable-static \
                --with-dist-version=Gentoo \
                
--with-pppd-plugin-dir="${EPREFIX}/usr/$(get_libdir)/pppd/${PPPD_VERSION}" \
-                $(use_with gtk gnome)
+                $(use_with gtk gnome) \
+                --without-libnm-glib
 }
 
 src_install() {
        default
-       prune_libtool_files
+       find "${ED}" -type f -name '*.la' -delete || die
 }

Reply via email to