| 1 |
commit: cdd959ac7981ae073eade185e03a37b24ab08c5c |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 26 14:53:38 2020 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 26 14:57:01 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdd959ac |
| 7 |
|
| 8 |
gnome-extra/nm-applet: drop legacy libnm-gtk unconditionally |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
| 12 |
|
| 13 |
gnome-extra/nm-applet/metadata.xml | 1 - |
| 14 |
.../{nm-applet-1.8.24.ebuild => nm-applet-1.8.24-r1.ebuild} | 5 ++--- |
| 15 |
gnome-extra/nm-applet/nm-applet-1.8.25.ebuild | 5 ++--- |
| 16 |
3 files changed, 4 insertions(+), 7 deletions(-) |
| 17 |
|
| 18 |
diff --git a/gnome-extra/nm-applet/metadata.xml b/gnome-extra/nm-applet/metadata.xml |
| 19 |
index 7bbb6fe7064..0c7d192a978 100644 |
| 20 |
--- a/gnome-extra/nm-applet/metadata.xml |
| 21 |
+++ b/gnome-extra/nm-applet/metadata.xml |
| 22 |
@@ -7,7 +7,6 @@ |
| 23 |
</maintainer> |
| 24 |
<use> |
| 25 |
<flag name="gcr">Enable advanced certificate chooser, requires <pkg>app-crypt/gcr</pkg></flag> |
| 26 |
- <flag name="gtk">Enable legacy library libnm-gtk</flag> |
| 27 |
<flag name="lto">Enable link time optimization</flag> |
| 28 |
<flag name="modemmanager">Enable support for mobile broadband devices |
| 29 |
using <pkg>net-misc/modemmanager</pkg></flag> |
| 30 |
|
| 31 |
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.24.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.24-r1.ebuild |
| 32 |
similarity index 92% |
| 33 |
rename from gnome-extra/nm-applet/nm-applet-1.8.24.ebuild |
| 34 |
rename to gnome-extra/nm-applet/nm-applet-1.8.24-r1.ebuild |
| 35 |
index 24baa03f859..d1811905673 100644 |
| 36 |
--- a/gnome-extra/nm-applet/nm-applet-1.8.24.ebuild |
| 37 |
+++ b/gnome-extra/nm-applet/nm-applet-1.8.24-r1.ebuild |
| 38 |
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" |
| 39 |
|
| 40 |
LICENSE="GPL-2+" |
| 41 |
SLOT="0" |
| 42 |
-IUSE="ayatana gtk +introspection +gcr +modemmanager selinux teamd" |
| 43 |
+IUSE="ayatana +introspection +gcr +modemmanager selinux teamd" |
| 44 |
KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86" |
| 45 |
|
| 46 |
RDEPEND=" |
| 47 |
@@ -33,7 +33,6 @@ RDEPEND=" |
| 48 |
ayatana? ( |
| 49 |
dev-libs/libappindicator:3 |
| 50 |
>=dev-libs/libdbusmenu-16.04.0 ) |
| 51 |
- gtk? ( <net-misc/networkmanager-1.19 ) |
| 52 |
introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) |
| 53 |
virtual/freedesktop-icon-theme |
| 54 |
gcr? ( >=app-crypt/gcr-3.14:=[gtk] ) |
| 55 |
@@ -56,7 +55,7 @@ PATCHES=( |
| 56 |
src_configure() { |
| 57 |
local myconf=( |
| 58 |
--with-appindicator=$(usex ayatana ubuntu no) |
| 59 |
- $(use_with gtk libnm-gtk) |
| 60 |
+ --without-libnm-gtk |
| 61 |
--without-libnma-gtk4 |
| 62 |
--disable-lto |
| 63 |
--disable-ld-gc |
| 64 |
|
| 65 |
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.25.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.25.ebuild |
| 66 |
index 18462f2d74e..94ff1ec2fb9 100644 |
| 67 |
--- a/gnome-extra/nm-applet/nm-applet-1.8.25.ebuild |
| 68 |
+++ b/gnome-extra/nm-applet/nm-applet-1.8.25.ebuild |
| 69 |
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.gnome.org/GNOME/network-manager-applet/-/archive/${PV}-d |
| 70 |
LICENSE="GPL-2+" |
| 71 |
SLOT="0" |
| 72 |
KEYWORDS="~amd64 ~x86" |
| 73 |
-IUSE="ayatana doc gtk introspection lto modemmanager selinux teamd test wwan" |
| 74 |
+IUSE="ayatana doc introspection lto modemmanager selinux teamd test wwan" |
| 75 |
|
| 76 |
DEPEND=" |
| 77 |
app-crypt/libsecret |
| 78 |
@@ -26,7 +26,6 @@ DEPEND=" |
| 79 |
dev-libs/libappindicator:3 |
| 80 |
dev-libs/libdbusmenu |
| 81 |
) |
| 82 |
- gtk? ( ~net-misc/networkmanager-1.18.4 ) |
| 83 |
introspection? ( dev-libs/gobject-introspection:= ) |
| 84 |
modemmanager? ( net-misc/modemmanager ) |
| 85 |
selinux? ( sys-libs/libselinux ) |
| 86 |
@@ -43,7 +42,7 @@ S="${WORKDIR}"/network-manager-applet-${PV}-dev |
| 87 |
|
| 88 |
src_configure() { |
| 89 |
local emesonargs=( |
| 90 |
- $(meson_use gtk libnm_gtk) |
| 91 |
+ -Dlibnm_gtk=false |
| 92 |
-Dlibnma_gtk4=false |
| 93 |
-Dappindicator=$(usex ayatana yes no) |
| 94 |
$(meson_use wwan) |
Archives