summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Franzke <benjaminfranzke@googlemail.com>2012-05-22 08:26:00 +0200
committerBenjamin Franzke <benjaminfranzke@googlemail.com>2012-05-22 08:26:00 +0200
commit5f06719b5330e7663f272fc1f920567ff0519414 (patch)
treeffc6c2ca097b8bed5932b1c3afce5435ed8ca8bd
parentAdd dblatex-0.3.2 ebuild (diff)
downloadbenf-5f06719b5330e7663f272fc1f920567ff0519414.tar.gz
benf-5f06719b5330e7663f272fc1f920567ff0519414.tar.bz2
benf-5f06719b5330e7663f272fc1f920567ff0519414.zip
Remove unneeded networkmanager ebuild
-rw-r--r--net-misc/networkmanager/Manifest7
-rw-r--r--net-misc/networkmanager/files/01-org.freedesktop.NetworkManager.settings.modify.system.pkla6
-rw-r--r--net-misc/networkmanager/files/10-openrc-status27
-rw-r--r--net-misc/networkmanager/files/networkmanager-0.9.2.0-init-provide-net.patch61
-rw-r--r--net-misc/networkmanager/files/nm-system-settings.conf2
-rw-r--r--net-misc/networkmanager/files/nm-system-settings.conf-ifnet6
-rw-r--r--net-misc/networkmanager/networkmanager-0.9.3.990.ebuild185
7 files changed, 0 insertions, 294 deletions
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
deleted file mode 100644
index 0c28916..0000000
--- a/net-misc/networkmanager/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 01-org.freedesktop.NetworkManager.settings.modify.system.pkla 187 RMD160 a6de26825439432c62cfaa7be847fa39181747fa SHA1 cae5a2c5d8ab0af2830f17e7fe375468c8d5b151 SHA256 909356b25e2d887a31c0f9f2a23a466957f27b163bbd5172fa852988a1db1860
-AUX 10-openrc-status 912 RMD160 621ef49695f344ca5731e0761f9f79bd99f1b2e7 SHA1 aba0cf91c2c771824fcc29e3b1884f43b3d736b6 SHA256 85621ae323f3ba09361ded68532e6c71522268e8dba699574bf5550bc900c004
-AUX networkmanager-0.9.2.0-init-provide-net.patch 1957 RMD160 20dac26714191f4eb1e7ec28eab515bd060f7b25 SHA1 39b7aa225e76b22c5d9795061b6a13980dc881d7 SHA256 76a39cf52925c863da9958d3b3ced9be3ba68b7fe98bad070ba3a3b3b9999d81
-AUX nm-system-settings.conf 23 RMD160 6d66c702b345bde668a420a15716feea6005fbd1 SHA1 49ba558d20f5ca5a201e027e13b878dd5ac3569c SHA256 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21
-AUX nm-system-settings.conf-ifnet 70 RMD160 c0d2be147383999b62cead86ab4333169e4ef277 SHA1 679ec8052b610969c148a2d34cd4da7a41484a76 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f
-DIST NetworkManager-0.9.3.990.tar.xz 1841712 RMD160 f8712f694b30a96153b3d3cf04cc124224d28931 SHA1 aa0c3285e2d2b65e10f8e819a53e8258ca1255e5 SHA256 d2d15be0e197ef65f9ba46976e1f73633b5ab98ac3b30e9393fdf3e42d3fb675
-EBUILD networkmanager-0.9.3.990.ebuild 5773 RMD160 2667c88c1acf82ae9b1d9cd1224baa3e91a6134d SHA1 7bf41441ff99e076c4619cff9dbd33bc895db390 SHA256 2b80f7b4ce3f5a0497106d58c0a7ae4379deece38de6f34d3afd66f752dbfc1c
diff --git a/net-misc/networkmanager/files/01-org.freedesktop.NetworkManager.settings.modify.system.pkla b/net-misc/networkmanager/files/01-org.freedesktop.NetworkManager.settings.modify.system.pkla
deleted file mode 100644
index d443327..0000000
--- a/net-misc/networkmanager/files/01-org.freedesktop.NetworkManager.settings.modify.system.pkla
+++ /dev/null
@@ -1,6 +0,0 @@
-[Let users in plugdev group modify NetworkManager]
-Identity=unix-group:plugdev
-Action=org.freedesktop.NetworkManager.settings.modify.system
-ResultAny=no
-ResultInactive=no
-ResultActive=yes \ No newline at end of file
diff --git a/net-misc/networkmanager/files/10-openrc-status b/net-misc/networkmanager/files/10-openrc-status
deleted file mode 100644
index b3c5bc1..0000000
--- a/net-misc/networkmanager/files/10-openrc-status
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2012 Alexandre Rostovtsev
-# Released under the 2-clause BSD license.
-
-# Ensures that the NetworkManager OpenRC service is marked as started and
-# providing net only when it has a successful connection.
-
-# Exit if no valid interface name given
-if [ -z "$1" -o "x$1" = "xnone" ]; then
- exit
-fi
-
-# Ensure rc-service is in PATH
-PATH="${PATH}:@EPREFIX@/sbin:@EPREFIX@/usr/sbin"
-
-# Exit if the NetworkManager OpenRC service is not running
-rc-service NetworkManager status 2>&1 | grep -Eq "status: (starting|started|inactive|stopping)" || exit 0
-
-# Call rc-service in background mode so that the start/stop functions update
-# NetworkManager service status to started or inactive instead of actually
-# starting or stopping the daemon
-export IN_BACKGROUND=YES
-
-case "$2" in
- up|vpn-up) exec rc-service NetworkManager start ;;
- down|vpn-down) exec rc-service NetworkManager stop ;;
-esac
diff --git a/net-misc/networkmanager/files/networkmanager-0.9.2.0-init-provide-net.patch b/net-misc/networkmanager/files/networkmanager-0.9.2.0-init-provide-net.patch
deleted file mode 100644
index 886fe1a..0000000
--- a/net-misc/networkmanager/files/networkmanager-0.9.2.0-init-provide-net.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From dbb1ed70eca25d57da3c12534c241cd38134627b Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Wed, 1 Feb 2012 05:51:20 -0500
-Subject: [PATCH] gentoo: provide net and use inactive status when not
- connected
-
-The status will be reset to started via a dispatcher script on up/down
-events. See https://bugs.gentoo.org/show_bug.cgi?id=252137
----
- initscript/Gentoo/NetworkManager.in | 24 +++++++++++++++++++++++-
- 1 files changed, 23 insertions(+), 1 deletions(-)
-
-diff --git a/initscript/Gentoo/NetworkManager.in b/initscript/Gentoo/NetworkManager.in
-index 7db410b..d26996d 100755
---- a/initscript/Gentoo/NetworkManager.in
-+++ b/initscript/Gentoo/NetworkManager.in
-@@ -3,18 +3,40 @@
- # Distributed under the terms of the GNU General Purpose License v2
- # $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/files/networkmanager-0.9.2.0-init-provide-net.patch,v 1.1 2012/02/02 00:34:59 tetromino Exp $
-
-+description="NetworkManager daemon. The service is marked as started only \
-+when a network connection is established."
-+
- depend() {
- need dbus
-+ provide net
-+}
-+
-+_is_connected() {
-+ [ "x$(LC_ALL=C nmcli -t -f state nm 2> /dev/null)" = "xconnected" ]
-+ return $?
- }
-
- start() {
-+ if yesno "${IN_BACKGROUND}"; then
-+ _is_connected && mark_service_started
-+ return
-+ fi
- ebegin "Starting NetworkManager"
- start-stop-daemon --start --quiet --pidfile /var/run/NetworkManager.pid \
- --exec /usr/sbin/NetworkManager -- --pid-file /var/run/NetworkManager.pid
-- eend $?
-+ local _retval=$?
-+ eend "${_retval}"
-+ if [ "x${_retval}" = 'x0' ]; then
-+ _is_connected || mark_service_inactive
-+ fi
-+ return "${_retval}"
- }
-
- stop() {
-+ if yesno "${IN_BACKGROUND}"; then
-+ _is_connected || mark_service_inactive
-+ return
-+ fi
- ebegin "Stopping NetworkManager"
- start-stop-daemon --stop --quiet --pidfile /var/run/NetworkManager.pid
- eend $?
---
-1.7.8.4
-
diff --git a/net-misc/networkmanager/files/nm-system-settings.conf b/net-misc/networkmanager/files/nm-system-settings.conf
deleted file mode 100644
index c37b596..0000000
--- a/net-misc/networkmanager/files/nm-system-settings.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[main]
-plugins=keyfile
diff --git a/net-misc/networkmanager/files/nm-system-settings.conf-ifnet b/net-misc/networkmanager/files/nm-system-settings.conf-ifnet
deleted file mode 100644
index 4d14ee7..0000000
--- a/net-misc/networkmanager/files/nm-system-settings.conf-ifnet
+++ /dev/null
@@ -1,6 +0,0 @@
-[main]
-plugins=ifnet,keyfile
-
-[ifnet]
-managed=true
-auto_refresh=false
diff --git a/net-misc/networkmanager/networkmanager-0.9.3.990.ebuild b/net-misc/networkmanager/networkmanager-0.9.3.990.ebuild
deleted file mode 100644
index 496e808..0000000
--- a/net-misc/networkmanager/networkmanager-0.9.3.990.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.2.0-r3.ebuild,v 1.3 2012/02/02 00:34:59 tetromino Exp $
-
-EAPI="4"
-GNOME_ORG_MODULE="NetworkManager"
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/NetworkManager/NetworkManager"
-
-inherit autotools eutils gnome.org linux-info systemd
-
-DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="avahi bluetooth doc +nss gnutls dhclient +dhcpcd +introspection
- kernel_linux +ppp resolvconf connection-sharing wimax systemd"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-REQUIRED_USE="
- ^^ ( nss gnutls )
- ^^ ( dhclient dhcpcd )"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-# libnl:1.1 is needed for linking to net-wireless/wimax libraries
-# XXX: on bump, check that net-wireless/wimax is still using libnl:1.1 !
-# TODO: Qt support?
-
-#>=net-wireless/wireless-tools-28_pre9
-
-COMMON_DEPEND=">=sys-apps/dbus-1.2
- >=dev-libs/dbus-glib-0.75
- || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] )
- >=dev-libs/glib-2.26
- >=sys-auth/polkit-0.97
- dev-libs/libnl:1.1
- >=net-wireless/wpa_supplicant-0.7.3-r3[dbus]
- bluetooth? ( >=net-wireless/bluez-4.82 )
- avahi? ( net-dns/avahi[autoipd] )
- gnutls? (
- dev-libs/libgcrypt
- net-libs/gnutls )
- nss? ( >=dev-libs/nss-3.11 )
- dhclient? ( net-misc/dhcp )
- dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
- introspection? ( >=dev-libs/gobject-introspection-0.10.3 )
- ppp? (
- >=net-misc/modemmanager-0.4
- >=net-dialup/ppp-2.4.5 )
- resolvconf? ( net-dns/openresolv )
- connection-sharing? (
- net-dns/dnsmasq
- net-firewall/iptables )
- wimax? ( >=net-wireless/wimax-1.5.1 )
- systemd? ( sys-apps/systemd )"
-
-
-RDEPEND="${COMMON_DEPEND}
- !systemd? ( sys-auth/consolekit ) "
-
-DEPEND="${COMMON_DEPEND}
- dev-util/pkgconfig
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- doc? ( >=dev-util/gtk-doc-1.8 )"
-
-sysfs_deprecated_check() {
- ebegin "Checking for SYSFS_DEPRECATED support"
-
- if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
- eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
- eerror "or NetworkManager will not work correctly."
- eerror "See http://bugs.gentoo.org/333639 for more info."
- die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
- fi
- eend $?
-}
-
-pkg_pretend() {
- if use kernel_linux; then
- get_version
- if linux_config_exists; then
- sysfs_deprecated_check
- else
- ewarn "Was unable to determine your kernel .config"
- ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
- ewarn "See http://bugs.gentoo.org/333639 for more info."
- fi
-
- fi
-}
-
-pkg_setup() {
- enewgroup plugdev
-}
-
-src_prepare() {
- # Don't build tests
- #epatch "${FILESDIR}/${PN}-0.9_rc3-fix-tests.patch"
- # Build against libnl:1.1 for net-wireless/wimax-1.5.2 compatibility
- #epatch "${FILESDIR}/${PN}-0.9.1.95-force-libnl1.1.patch"
- # Migrate to openrc style
- #epatch "${FILESDIR}/${P}-ifnet-openrc-style.patch"
- # Ignore per-user connections
- #epatch "${FILESDIR}/${P}-ifnet-ignore-user-connections.patch"
- # Remove system prefix
- #epatch "${FILESDIR}/${P}-ifnet-remove-system-prefix.patch"
- # Correctly deal with single quotes in /etc/conf.d/hostname
- #epatch "${FILESDIR}/${P}-ifnet-unquote-hostname.patch"
- # Update init.d script to provide net and use inactive status if not connected
- epatch "${FILESDIR}/networkmanager-0.9.2.0-init-provide-net.patch"
-
- eautoreconf
- default
-}
-
-src_configure() {
- ECONF="--disable-more-warnings
- --disable-static
- --localstatedir=/var
- --with-distro=gentoo
- --with-dbus-sys-dir=/etc/dbus-1/system.d
- --with-udev-dir=/lib/udev
- --with-iptables=/sbin/iptables
- $(use_enable doc gtk-doc)
- $(use_enable introspection)
- $(use_enable ppp)
- $(use_enable wimax)
- $(use_with dhclient)
- $(use_with dhcpcd)
- $(use_with doc docs)
- $(use_with resolvconf)
- $(systemd_with_unitdir)"
-
- if use systemd ; then
- ECONF="${ECONF} --with-session-tracking=systemd"
- elif use consolekit; then
- ECONF="${ECONF} --with-session-tracking=ck"
- else
- ECONF="${ECONF} --with-session-tracking=none"
- fi
-
- if use nss ; then
- ECONF="${ECONF} $(use_with nss crypto=nss)"
- else
- ECONF="${ECONF} $(use_with gnutls crypto=gnutls)"
- fi
-
- econf ${ECONF}
-}
-
-src_install() {
- default
- # /var/run/NetworkManager is used by some distros, but not by Gentoo
- rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed"
-
- # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
- keepdir /etc/NetworkManager/dispatcher.d
-
- # Provide openrc net dependency only when nm is connected
- exeinto /etc/NetworkManager/dispatcher.d
- doexe "${FILESDIR}/10-openrc-status"
- sed -e "s:@EPREFIX@:${EPREFIX}:g" \
- -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
- # Add keyfile plugin support
- keepdir /etc/NetworkManager/system-connections
- chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765
- insinto /etc/NetworkManager
- newins "${FILESDIR}/nm-system-settings.conf-ifnet" nm-system-settings.conf
-
- # Allow users in plugdev group to modify system connections
- insinto /etc/polkit-1/localauthority/10-vendor.d
- doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.pkla"
-
- # Remove useless .la files
- find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
-}
-
-pkg_postinst() {
- elog "To modify system network connections without needing to enter the"
- elog "root password, add your user account to the 'plugdev' group."
-}