From 20bcfc2f16449573c6188cfd4b47550b7963eedf Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Sat, 6 Feb 2021 11:37:35 +0200 Subject: gnome-extra/nm-applet: remove old Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Mart Raudsepp --- gnome-extra/nm-applet/Manifest | 2 - .../nm-applet/files/1.8.24-fix-bashisms.patch | 130 --------------------- gnome-extra/nm-applet/metadata.xml | 1 - gnome-extra/nm-applet/nm-applet-1.16.0.ebuild | 52 --------- gnome-extra/nm-applet/nm-applet-1.8.24-r1.ebuild | 72 ------------ 5 files changed, 257 deletions(-) delete mode 100644 gnome-extra/nm-applet/files/1.8.24-fix-bashisms.patch delete mode 100644 gnome-extra/nm-applet/nm-applet-1.16.0.ebuild delete mode 100644 gnome-extra/nm-applet/nm-applet-1.8.24-r1.ebuild (limited to 'gnome-extra') diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest index 4561874c8bf9..2f3267e97990 100644 --- a/gnome-extra/nm-applet/Manifest +++ b/gnome-extra/nm-applet/Manifest @@ -1,3 +1 @@ -DIST network-manager-applet-1.16.0.tar.xz 1944244 BLAKE2B b5181474da55d9b320d217638a960a9bba1c103d8ff69f171aea57458d425ee8347e8a525b051f1b72888cf33d9b20a850b9e10fb0a487998a5502d2acb92105 SHA512 0ad8ac1d05cf76b9a82602c6f8f7034ae52fc11bae0b5ee17cf5bd89c6c91ba3ef7b07f770397b22484d54fd69e7a9a73f8c08a4d3d9f492f11d09d0b0379ff5 DIST network-manager-applet-1.18.0.tar.xz 1950696 BLAKE2B d89f4d3c94af2c6bf514fc388fc445415b50508bf7e26f7888d8e212a63879abb24bf860002372bcae71eee94c3b8e9f2bfa9f16814a3537b0f81c486f82e396 SHA512 adca7c723600ec1cb2eed0110e369cf707fde1d64a81489440a167516d178a501fe883c08db06371b8aac896188eb2037a7577ecca721d764be33f4025a386d4 -DIST network-manager-applet-1.8.24.tar.xz 2062132 BLAKE2B fed75ab78e05b59a4f20c7570b84ac6fe3dd2cf6f8ad060f6c65bc9e2a32e29d295fc919de1037ba30c2609d35079dccb3f625ffc019150c9c69cfa94388e2c8 SHA512 76e914ec4f2e6eadd21ccc3e1f613fb97cb72d9551730a1dc09454177365dcaa2cdeea4b855c53732ad6a22cfa5e62e03f09fc8b04a277ce213dcf8c3beaf77c diff --git a/gnome-extra/nm-applet/files/1.8.24-fix-bashisms.patch b/gnome-extra/nm-applet/files/1.8.24-fix-bashisms.patch deleted file mode 100644 index 36851e1ca3af..000000000000 --- a/gnome-extra/nm-applet/files/1.8.24-fix-bashisms.patch +++ /dev/null @@ -1,130 +0,0 @@ -From 64143dc3da8f04478acc7a875b7e9d6cb0d653b9 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -Date: Sun, 19 Apr 2020 15:08:20 +0200 -Subject: [PATCH] Remove subshells and fix invalid test syntax - ---- - configure.ac | 22 +++++++++++----------- - m4/introspection.m4 | 4 ++-- - 2 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 22f34589..56a56fee 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -126,7 +126,7 @@ dnl - GTK_DOC_CHECK(1.0) - - AC_ARG_WITH(libnm-gtk, AS_HELP_STRING([--with-libnm-gtk], [build legacy library libnm-gtk which depends on libnm-glib/libnm-util/dbus-glib (deprecated)])) --if test "$with_libnm_gtk" == yes; then -+if test "$with_libnm_gtk" = yes; then - PKG_CHECK_MODULES(LIBNM_GLIB, - [gio-2.0 >= 2.38 - NetworkManager >= 1.7 -@@ -145,7 +145,7 @@ Configure without --with-libnm-gtk if you do not need the legacy library])]) - else - with_libnm_gtk=no - fi --AM_CONDITIONAL(WITH_LIBNM_GTK, test "$with_libnm_gtk" == "yes") -+AM_CONDITIONAL(WITH_LIBNM_GTK, test "$with_libnm_gtk" = "yes") - - PKG_CHECK_MODULES(LIBNM, [libnm >= 1.7 gio-2.0 >= 2.38 gmodule-export-2.0]) - LIBNM_CFLAGS="$LIBNM_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38" -@@ -166,7 +166,7 @@ PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.10) - GTK3_CFLAGS="$GTK3_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_10 -DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_10" - - AC_ARG_WITH(libnma-gtk4, AS_HELP_STRING([--with-libnma-gtk4], [build EXPERIMENTAL libnma-gtk4 library for use with GTK4])) --if test "$with_libnma_gtk4" == yes; then -+if test "$with_libnma_gtk4" = yes; then - PKG_CHECK_MODULES(GTK4, gtk4 >= 3.94) - GTK4_CFLAGS="$GTK4_CFLAGS -DGTK_VERSION_MIN_REQUIRED=GTK_VERSION_3_96 -DGTK_VERSION_MAX_ALLOWED=GTK_VERSION_3_96" - else -@@ -214,7 +214,7 @@ AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes") - - dnl ModemManager1 with libmm-glib for WWAN support - AC_ARG_WITH(wwan, AS_HELP_STRING([--with-wwan], [Enable WWAN support (default: yes)])) --if (test "${with_wwan}" == "no"); then -+if test "${with_wwan}" = "no"; then - AC_DEFINE(WITH_WWAN, 0, [Define if you have ModemManager/WWAN support]) - else - PKG_CHECK_MODULES(MM_GLIB, -@@ -229,7 +229,7 @@ PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 147) - - dnl SELinux - AC_ARG_WITH(selinux, AS_HELP_STRING([--with-selinux], [Enable support for adjusting SELinux labels in configuration editor (default: yes)])) --if (test "${with_selinux}" == "no"); then -+if test "${with_selinux}" = "no"; then - AC_DEFINE(WITH_SELINUX, 0, [Define if libselinux is available]) - else - PKG_CHECK_MODULES(SELINUX, -@@ -241,7 +241,7 @@ AM_CONDITIONAL(WITH_SELINUX, test "${with_selinux}" != "no") - - dnl Jansson for team configuration editing - AC_ARG_WITH(team, AS_HELP_STRING([--with-team], [Enable team configuration editor (default: yes)])) --if (test "${with_team}" == "no"); then -+if test "${with_team}" = "no"; then - AC_DEFINE(WITH_JANSSON, 0, [Define if Jansson is available]) - else - PKG_CHECK_MODULES(JANSSON, -@@ -253,7 +253,7 @@ AM_CONDITIONAL(WITH_JANSSON, test "${with_team}" != "no") - - dnl GCR for PKCS#11 enabled certificate chooser - AC_ARG_WITH(gcr, AS_HELP_STRING([--with-gcr], [Enable advanced certificate chooser (default: auto)])) --if (test "${with_gcr}" == "no"); then -+if test "${with_gcr}" = "no"; then - have_gcr=no - else - PKG_CHECK_MODULES(GCR, -@@ -311,15 +311,15 @@ else - have_gcr=no); - fi - --if (test "${have_gcr}" == "yes"); then -+if test "${have_gcr}" = "yes"; then - AC_DEFINE(WITH_GCR, 1, [Define if Gcr is available]) - else -- if (test "${with_gcr}" == "yes"); then -+ if test "${with_gcr}" = "yes"; then - AC_MSG_ERROR([gcr support was requested, but the gcr library is not available.]) - fi - AC_DEFINE(WITH_GCR, 0, [Define if Gcr is available]) - fi --AM_CONDITIONAL(WITH_GCR, test "${have_gcr}" == "yes") -+AM_CONDITIONAL(WITH_GCR, test "${have_gcr}" = "yes") - - dnl Check for gobject introspection - GOBJECT_INTROSPECTION_CHECK([0.9.6]) -@@ -334,7 +334,7 @@ NM_LD_GC - - # Disable extra compiler warning until GTK4 doesn't trigger it via graphene - # https://github.com/ebassi/graphene/issues/134 --if test "$with_libnma_gtk4" == yes; then -+if test "$with_libnma_gtk4" = yes; then - _CFLAGS_SAVED="$CFLAGS" - CFLAGS="$CFLAGS $GTK4_CFLAGS" - NM_COMPILER_WARNING([_CFLAGS], [float-equal], [#include ]) -diff --git a/m4/introspection.m4 b/m4/introspection.m4 -index f3bda0e7..8c64bd04 100644 ---- a/m4/introspection.m4 -+++ b/m4/introspection.m4 -@@ -31,7 +31,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], - INTROSPECTION_GIRDIR= - INTROSPECTION_TYPELIBDIR= - -- if test "x$enable_introspection" == "xno"; then -+ if test "x$enable_introspection" = "xno"; then - found_introspection="no" - else - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], [ -@@ -53,7 +53,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], - AC_MSG_RESULT([$found_introspection]) - ], [found_introspection="no (not installed)"]) - -- if test "x$enable_introspection" == "xyes"; then -+ if test "x$enable_introspection" = "xyes"; then - if test "x$found_introspection" != "xyes"; then - AC_MSG_ERROR([introspection enabled but can't be used]) - fi --- -2.26.0 - diff --git a/gnome-extra/nm-applet/metadata.xml b/gnome-extra/nm-applet/metadata.xml index 7cb30b744ca5..96fdf3e479a4 100644 --- a/gnome-extra/nm-applet/metadata.xml +++ b/gnome-extra/nm-applet/metadata.xml @@ -6,7 +6,6 @@ Gentoo GNOME Desktop - Enable advanced certificate chooser, requires app-crypt/gcr Enable support for mobile broadband devices using net-misc/modemmanager Enable teamd configuration editor diff --git a/gnome-extra/nm-applet/nm-applet-1.16.0.ebuild b/gnome-extra/nm-applet/nm-applet-1.16.0.ebuild deleted file mode 100644 index 49e66011c5f5..000000000000 --- a/gnome-extra/nm-applet/nm-applet-1.16.0.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -GNOME_ORG_MODULE="network-manager-applet" - -inherit gnome.org meson xdg - -DESCRIPTION="NetworkManager connection editor and applet" -HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="appindicator modemmanager selinux teamd" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -RDEPEND=" - >=dev-libs/glib-2.38:2 - >=app-crypt/libsecret-0.18 - >=net-libs/libnma-1.8.27 - >=x11-libs/gtk+-3.10:3 - >=dev-libs/libgudev-147:= - >=x11-libs/libnotify-0.7.0 - >=net-misc/networkmanager-1.16:=[modemmanager?,teamd?] - appindicator? ( - dev-libs/libappindicator:3 - >=dev-libs/libdbusmenu-16.04.0 - ) - modemmanager? ( net-misc/modemmanager ) - selinux? ( sys-libs/libselinux ) - teamd? ( >=dev-libs/jansson-2.7 ) - - virtual/freedesktop-icon-theme -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-libs/libxml2 - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -src_configure() { - local emesonargs=( - -Dappindicator=$(usex appindicator ubuntu no) - $(meson_use modemmanager wwan) - $(meson_use selinux) - $(meson_use teamd team) - -Dmore_asserts=0 - -Dld_gc=false - ) - meson_src_configure -} diff --git a/gnome-extra/nm-applet/nm-applet-1.8.24-r1.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.24-r1.ebuild deleted file mode 100644 index b606dc264603..000000000000 --- a/gnome-extra/nm-applet/nm-applet-1.8.24-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -GNOME_ORG_MODULE="network-manager-applet" -GNOME2_EAUTORECONF="yes" - -inherit gnome2 - -DESCRIPTION="GNOME applet for NetworkManager" -HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="appindicator +introspection +gcr +modemmanager selinux teamd" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86" - -RDEPEND=" - >=app-crypt/libsecret-0.18 - >=dev-libs/glib-2.38:2[dbus] - >=dev-libs/dbus-glib-0.88 - dev-libs/libgudev:= - >=sys-apps/dbus-1.4.1 - >=sys-auth/polkit-0.96-r1 - >=x11-libs/gtk+-3.10:3[introspection?] - >=x11-libs/libnotify-0.7.0 - - app-text/iso-codes - >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] - net-misc/mobile-broadband-provider-info - - appindicator? ( - dev-libs/libappindicator:3 - >=dev-libs/libdbusmenu-16.04.0 ) - introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) - virtual/freedesktop-icon-theme - gcr? ( >=app-crypt/gcr-3.14:=[gtk] ) - modemmanager? ( net-misc/modemmanager ) - selinux? ( sys-libs/libselinux ) - teamd? ( >=dev-libs/jansson-2.7 ) -" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.0 - >=sys-devel/gettext-0.18 - virtual/pkgconfig -" - -PDEPEND="virtual/notification-daemon" #546134 - -PATCHES=( - "${FILESDIR}"/${PV}-fix-bashisms.patch -) - -src_configure() { - local myconf=( - --with-appindicator=$(usex appindicator ubuntu no) - --without-libnm-gtk - --without-libnma-gtk4 - --disable-lto - --disable-ld-gc - --disable-more-warnings - --disable-static - --localstatedir=/var - $(use_enable introspection) - $(use_with gcr) - $(use_with modemmanager wwan) - $(use_with selinux) - $(use_with teamd team) - ) - gnome2_src_configure "${myconf[@]}" -} -- cgit v1.2.3-65-gdbad