net-misc/networkmanager: Drop old

Package-Manager: portage-2.3.0

2 files changed, 0 insertions, 97 deletions

diff --git a/net-misc/networkmanager/files/1.2.4-upower.patch b/net-misc/networkmanager/files/1.2.4-upower.patch
deleted file mode 100644
index a08e34ae370e..000000000000
--- a/net-misc/networkmanager/files/1.2.4-upower.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From f864c58cfe87533c69dcf00e3ea236809392a8e0 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Thu, 4 Aug 2016 16:25:30 +0200
-Subject: build: fix build with '--with-suspend-resume=upower'
-
-Now we have a single file for all suspend APIs and the selection is
-done through the preprocessor: remove stale AM_CONDITIONALs and define
-SUSPEND_RESUME_UPOWER when needed.
-
-Fixes: c76eb3e8f7a80b69c570b513ee3eb16bea1b34bd
-(cherry picked from commit e4b2c989dc51818e52906b5120ea6a0659274631)
-
-diff --git a/configure.ac b/configure.ac
-index 46775c3..7869f07 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -472,7 +472,9 @@ if test "z$with_suspend_resume" = "z"; then
- fi
- 
- case $with_suspend_resume in
--    upower) ;;
-+    upower)
-+        AC_DEFINE([SUSPEND_RESUME_UPOWER], 1, [Define to 1 to use UPower suspend api])
-+	;;
-     systemd)
-         PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd >= 209],,
-                           [PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd-login >= 183])])
-@@ -485,9 +487,6 @@ case $with_suspend_resume in
-         AC_MSG_ERROR(--with-suspend-resume must be one of [upower, systemd, consolekit])
-         ;;
- esac
--AM_CONDITIONAL(SUSPEND_RESUME_UPOWER, test "x$with_suspend_resume" = "xupower")
--AM_CONDITIONAL(SUSPEND_RESUME_SYSTEMD, test "x$with_suspend_resume" = "xsystemd")
--AM_CONDITIONAL(SUSPEND_RESUME_CONSOLEKIT, test "x$with_suspend_resume" = "xconsolekit")
- 
- # SELinux support
- AC_ARG_WITH(selinux, AS_HELP_STRING([--with-selinux=yes|no|auto], [Build with SELinux (default: auto)]),,[with_selinux=auto])
--- 
-cgit v0.10.2
-
---- a/config.h.in
-+++ b/config.h.in
-@@ -216,6 +216,9 @@
- /* Define to 1 to use systemd suspend api */
- #undef SUSPEND_RESUME_SYSTEMD
- 
-+/* Define to 1 to use UPower suspend api */
-+#undef SUSPEND_RESUME_UPOWER
-+
- /* Define to 1 if libsystemd-journald is available */
- #undef SYSTEMD_JOURNAL
- 
---- a/configure
-+++ b/configure
-@@ -22776,7 +22776,11 @@
- fi
- 
- case $with_suspend_resume in
--    upower) ;;
-+    upower)
-+
-+$as_echo "#define SUSPEND_RESUME_UPOWER 1" >>confdefs.h
-+
-+       ;;
-     systemd)
- 
- pkg_failed=no
diff --git a/net-misc/networkmanager/files/networkmanager-1.2.2-sleep-monitor-upower-include.patch b/net-misc/networkmanager/files/networkmanager-1.2.2-sleep-monitor-upower-include.patch
deleted file mode 100644
index 52a21c44738e..000000000000
--- a/net-misc/networkmanager/files/networkmanager-1.2.2-sleep-monitor-upower-include.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 10ba492047b1ad80adeeb878e7f155a13638da7f Mon Sep 17 00:00:00 2001
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 18 May 2016 10:43:51 +0200
-Subject: [PATCH] sleep-monitor-upower: add missing include
-
-Otherwise building fails with:
-
-  nm-sleep-monitor-upower.c:132:45: error: expected declaration specifiers or '...' before 'nm_sleep_monitor_get'
-  nm-sleep-monitor-upower.c:132:67: error: expected declaration specifiers or '...' before '(' token
-
-https://mail.gnome.org/archives/networkmanager-list/2016-May/msg00053.html
----
- src/nm-sleep-monitor-upower.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c
-index 5f0ff24..8d07190 100644
---- a/src/nm-sleep-monitor-upower.c
-+++ b/src/nm-sleep-monitor-upower.c
-@@ -24,6 +24,7 @@
- #include <sys/stat.h>
- 
- #include "nm-core-internal.h"
-+#include "NetworkManagerUtils.h"
- 
- #include "nm-sleep-monitor.h"
- 
--- 
-2.9.0
-