commit:     51d704954d453a85c858646dbc10d3ee26cc0bc4
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 16 17:54:53 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jun 16 17:54:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51d70495

net-misc/networkmanager: Drop old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-misc/networkmanager/Manifest                   |   4 -
 .../networkmanager/networkmanager-1.10.0.ebuild    | 325 ---------------------
 .../networkmanager/networkmanager-1.10.2.ebuild    | 325 ---------------------
 .../networkmanager/networkmanager-1.8.0.ebuild     | 323 --------------------
 .../networkmanager/networkmanager-1.8.2.ebuild     | 324 --------------------
 5 files changed, 1301 deletions(-)

diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 2d76ba41e29..a2cc516d288 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,8 +1,4 @@
-DIST NetworkManager-1.10.0.tar.xz 3884396 BLAKE2B 
62f6ce759188fe1c4337922d4c23145da5029ed6fa70eae1de122bd4ce00209b0f7a0d1fdf0b65083baa9a9b304471a6ec79de63ea8e79779f2e27c1cec26e19
 SHA512 
f1c479396fe50faaca9dfd90b165ec3158148a2fb5a2d7a71cd8d573597566520610d572d6a8ec2b1d27ac2e5409a2ba899f46f9f38c114c5b90f0431e370958
 DIST NetworkManager-1.10.10.tar.xz 4038552 BLAKE2B 
a0a3c2a74dd641d25267ec7932f0801e30720334cb905c86abfaeb9bc3c60a2c1e9372b738b1eb43c55a34edf952905d94e3513cef653ea62e470d56bc575b65
 SHA512 
e536598b19064e0ab7fe3e92362de9c380281ff53a1481438216c2247b2d5287244e735be41c56c53040a5861bf36bbb979e36578244fabd6448a50ea42c4645
-DIST NetworkManager-1.10.2.tar.xz 3937636 BLAKE2B 
b99a115233e6f2761fc042b8b9599db096edea7c35894beed1663013d3845212028f436d92e088c086e0e31941013ad4e75b5601fac0c9db9264ebfa04c53382
 SHA512 
bc372b334120bc62ce4d9f78baf9f46a880fe6fa24181bcefe71eb1c67868c32edb4c5b323e63aa720284b13189a0704e0b3d13a2c6e6a9be72e5bfb6bca9072
 DIST NetworkManager-1.10.6.tar.xz 4029656 BLAKE2B 
0fa99dbb54c3f51755329f229f941e408d883aeff24bbcf0f9df143544190ab59ed5742caca42ea7cced949de0891ecc148394fbff1b9cd87b26c3a84f2a728e
 SHA512 
8406ed561efff13b63dc218babdd2ad9e2816bcc829ba3ef2ce942bb5fa027640de28660381203016fa9cddb61412d3cd5102b7cbd29d0e284b5cb8d13dd8610
 DIST NetworkManager-1.4.4.tar.xz 3762664 BLAKE2B 
430f5a15540c43d067c27927b627ecb1c7935f42566e9b14b82b6f70cf7dae3ed7398bb45647911e91d8ce14558b1eccc0f6ffa97eae852dd524219dcc536a90
 SHA512 
a73e423e88b0e2694a46dc04f492a656d766796aa987b2e4644147a5939a6fdeb22ff5d8b36c723444bc0ab3d8740b80fa82c2f5e07f073998841695978d6e14
-DIST NetworkManager-1.8.0.tar.xz 3811100 BLAKE2B 
ad8026891ed0f29e80d217d0cbc7965bdc67065462e88068cc6f8cd989ddbcec7095b5d98eab85d8e6fba4f5af5485b2ec0feecafcb6d8324c3ee3c257a0dd64
 SHA512 
1f261a9bbba1013ec7ac88672f2ebdfdb9447874eb711ccfa7383534f003f37aabbcddb51aa868e14cec1d76c33d33a99d681a3858ea6239112fe6fce81a9c6c
-DIST NetworkManager-1.8.2.tar.xz 3818844 BLAKE2B 
97929ae1d071b3e88dbacf9bd1131840066edb031df2e2fe7e15ef5029029d0029efff8836df3f2cf857e95728bfd8f77f6a81cadf45ae8c76a986aba1649709
 SHA512 
7bebea66d8f494c052313224e9d5b1b4cf665482f07ee5d93defc3543f32296545a2d1097ab1fff27dbebb58e07a4bc47fbc0101163db92953ae66ac9b95524d
 DIST NetworkManager-1.8.4.tar.xz 3821500 BLAKE2B 
7db1c95af5b8006cd3b7e1d960f9763c05caf5aadcc139bbe349a12ef996821afc38250afe4b078fd4d1953be19c1f16c6813562c5f4792e6c17f28ee0521c06
 SHA512 
e9aa26e2abe4537c6cbba53e281493e32be8a9f0624d5323212848f286d1279ad2ab79a39de34ad0ea188c888b1b61c4ba4d4d053c4d227e68f9236955f69bb1

diff --git a/net-misc/networkmanager/networkmanager-1.10.0.ebuild 
b/net-misc/networkmanager/networkmanager-1.10.0.ebuild
deleted file mode 100644
index 48b1dd56d0d..00000000000
--- a/net-misc/networkmanager/networkmanager-1.10.0.ebuild
+++ /dev/null
@@ -1,325 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
-       user readme.gentoo-r1 toolchain-funcs vala versionator virtualx udev 
multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and 
straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager";
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname 
version
-
-IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind 
gnutls +introspection json kernel_linux +nss +modemmanager ncurses ofono ovs 
policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
-
-REQUIRED_USE="
-       modemmanager? ( ppp )
-       vala? ( introspection )
-       wext? ( wifi )
-       ^^ ( nss gnutls )
-       ?? ( consolekit elogind systemd )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-COMMON_DEPEND="
-       >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
-       >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
-       >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
-       >=dev-libs/libnl-3.2.8:3=[${MULTILIB_USEDEP}]
-       policykit? ( >=sys-auth/polkit-0.106 )
-       net-libs/libndp[${MULTILIB_USEDEP}]
-       >=net-misc/curl-7.24
-       net-misc/iputils
-       sys-apps/util-linux[${MULTILIB_USEDEP}]
-       sys-libs/readline:0=
-       >=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-       audit? ( sys-process/audit )
-       bluetooth? ( >=net-wireless/bluez-5 )
-       connection-sharing? (
-               net-dns/dnsmasq[dbus,dhcp]
-               net-firewall/iptables )
-       consolekit? ( >=sys-auth/consolekit-1.0.0 )
-       dhclient? ( >=net-misc/dhcp-4[client] )
-       dhcpcd? ( net-misc/dhcpcd )
-       elogind? ( >=sys-auth/elogind-219 )
-       gnutls? (
-               dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-               >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
-       introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-       json? ( dev-libs/jansson[${MULTILIB_USEDEP}] )
-       modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
-       ncurses? ( >=dev-libs/newt-0.52.15 )
-       nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
-       ofono? ( net-misc/ofono )
-       ovs? ( dev-libs/jansson )
-       ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-       resolvconf? ( net-dns/openresolv )
-       selinux? ( sys-libs/libselinux )
-       systemd? ( >=sys-apps/systemd-209:0= )
-       teamd? (
-               dev-libs/jansson
-               >=net-misc/libteam-1.9
-       )
-"
-RDEPEND="${COMMON_DEPEND}
-       || (
-               net-misc/iputils[arping(+)]
-               net-analyzer/arping
-       )
-       wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-       dev-util/gdbus-codegen
-       dev-util/gtk-doc-am
-       >=dev-util/intltool-0.40
-       >=sys-devel/gettext-0.17
-       >=sys-kernel/linux-headers-2.6.29
-       virtual/pkgconfig[${MULTILIB_USEDEP}]
-       introspection? (
-               $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-               dev-lang/perl
-               dev-libs/libxslt
-       )
-       vala? ( $(vala_depend) )
-       test? (
-               $(python_gen_any_dep '
-                       dev-python/dbus-python[${PYTHON_USEDEP}]
-                       dev-python/pygobject:3[${PYTHON_USEDEP}]')
-       )
-"
-
-python_check_deps() {
-       if use introspection; then
-               has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-       fi
-       if use test; then
-               has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-               has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-       fi
-}
-
-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 https://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 https://bugs.gentoo.org/333639 for more 
info."
-               fi
-
-       fi
-}
-
-pkg_setup() {
-       if use connection-sharing; then
-               CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-               linux-info_pkg_setup
-       fi
-       enewgroup plugdev
-       if use introspection || use test; then
-               python-any-r1_pkg_setup
-       fi
-}
-
-src_prepare() {
-       DOC_CONTENTS="To modify system network connections without needing to 
enter the
-               root password, add your user account to the 'plugdev' group."
-
-       use vala && vala_src_prepare
-       gnome2_src_prepare
-}
-
-multilib_src_configure() {
-       local myconf=(
-               --disable-more-warnings
-               --disable-static
-               --localstatedir=/var
-               --disable-lto
-               --disable-config-plugin-ibft
-               # ifnet plugin always disabled until someone volunteers to 
actively
-               # maintain and fix it
-               --disable-ifnet
-               --disable-qt
-               --without-netconfig
-               --with-dbus-sys-dir=/etc/dbus-1/system.d
-               # We need --with-libnm-glib (and dbus-glib dep) as reverse deps 
are
-               # still not ready for removing that lib
-               --with-libnm-glib
-               --with-nmcli=yes
-               --with-udev-dir="$(get_udevdir)"
-               --with-config-plugins-default=keyfile
-               --with-iptables=/sbin/iptables
-               $(multilib_native_enable concheck)
-               --with-crypto=$(usex nss nss gnutls)
-               --with-session-tracking=$(multilib_native_usex systemd systemd 
$(multilib_native_usex elogind elogind $(multilib_native_usex consolekit 
consolekit no)))
-               --with-suspend-resume=$(multilib_native_usex systemd systemd 
$(multilib_native_usex elogind elogind consolekit))
-               $(multilib_native_use_with audit libaudit)
-               $(multilib_native_use_enable bluetooth bluez5-dun)
-               $(use_with dhclient)
-               $(use_with dhcpcd)
-               $(multilib_native_use_enable introspection)
-               $(use_enable json json-validation)
-               $(multilib_native_use_enable ppp)
-               --without-libpsl
-               $(multilib_native_use_with modemmanager modem-manager-1)
-               $(multilib_native_use_with ncurses nmtui)
-               $(multilib_native_use_with ofono)
-               $(multilib_native_use_enable ovs)
-               $(multilib_native_use_with resolvconf)
-               $(multilib_native_use_with selinux)
-               $(multilib_native_use_with systemd systemd-journal)
-               $(multilib_native_use_enable teamd teamdctl)
-               $(multilib_native_use_enable test tests)
-               $(multilib_native_use_enable vala)
-               --without-valgrind
-               $(multilib_native_use_with wext)
-               $(multilib_native_use_enable wifi)
-       )
-
-       if multilib_is_native_abi && use policykit; then
-               myconf+=( --enable-polkit=yes )
-       else
-               myconf+=( --enable-polkit=disabled )
-       fi
-
-       # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug 
#519986
-       if use ppp; then
-               local PPPD_VER=`best_version net-dialup/ppp`
-               PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-               PPPD_VER=${PPPD_VER%%[_-]*} # main version without 
beta/pre/patch/revision
-               myconf+=( 
--with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-       fi
-
-       # unit files directory needs to be passed only when systemd is enabled,
-       # otherwise systemd support is not disabled completely, bug #524534
-       use systemd && myconf+=( 
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
-       if multilib_is_native_abi; then
-               # work-around man out-of-source brokenness, must be done before 
configure
-               ln -s "${S}/docs" docs || die
-               ln -s "${S}/man" man || die
-       fi
-
-       ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-       if multilib_is_native_abi; then
-               emake
-       else
-               local targets=(
-                       libnm/libnm.la
-                       libnm-util/libnm-util.la
-                       libnm-glib/libnm-glib.la
-                       libnm-glib/libnm-glib-vpn.la
-               )
-               emake "${targets[@]}"
-       fi
-}
-
-multilib_src_test() {
-       if use test && multilib_is_native_abi; then
-               python_setup
-               virtx emake check
-       fi
-}
-
-multilib_src_install() {
-       if multilib_is_native_abi; then
-               # Install completions at proper place, bug #465100
-               gnome2_src_install completiondir="$(get_bashcompdir)"
-       else
-               local targets=(
-                       install-libLTLIBRARIES
-                       install-libdeprecatedHEADERS
-                       install-libnm_glib_libnmvpnHEADERS
-                       install-libnm_glib_libnmincludeHEADERS
-                       install-libnm_util_libnm_util_includeHEADERS
-                       install-libnmincludeHEADERS
-                       install-nodist_libnm_glib_libnmincludeHEADERS
-                       install-nodist_libnm_glib_libnmvpnHEADERS
-                       install-nodist_libnm_util_libnm_util_includeHEADERS
-                       install-nodist_libnmincludeHEADERS
-                       install-pkgconfigDATA
-               )
-               emake DESTDIR="${D}" "${targets[@]}"
-       fi
-}
-
-multilib_src_install_all() {
-       ! use systemd && readme.gentoo_create_doc
-
-       newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager
-       newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-       # 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
-       newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-       sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-               -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || 
die
-
-       keepdir /etc/NetworkManager/system-connections
-       chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug 
#383765, upstream bug #754594
-
-       # Allow users in plugdev group to modify system connections
-       insinto /usr/share/polkit-1/rules.d/
-       doins 
"${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-}
-
-pkg_postinst() {
-       gnome2_pkg_postinst
-       systemd_reenable NetworkManager.service
-       ! use systemd && readme.gentoo_print_elog
-
-       if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
-               ewarn "The ${PN} system configuration file has moved to a new 
location."
-               ewarn "You must migrate your settings from 
${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-               ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
-               ewarn
-               ewarn "After doing so, you can remove 
${EROOT}etc/NetworkManager/nm-system-settings.conf"
-       fi
-
-       # NM fallbacks to plugin specified at compile time (upstream bug 
#738611)
-       # but still show a warning to remember people to have cleaner config 
file
-       if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
-               if grep plugins 
"${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-                       ewarn
-                       ewarn "You seem to use 'ifnet' plugin in 
${EROOT}etc/NetworkManager/NetworkManager.conf"
-                       ewarn "Since it won't be used, you will need to stop 
setting ifnet plugin there."
-                       ewarn
-               fi
-       fi
-
-       # NM shows lots of errors making nmcli neither unusable, bug #528748 
upstream bug #690457
-       if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-               ewarn "You have psk-flags=1 setting in above files, you will 
need to"
-               ewarn "either reconfigure affected networks or, at least, set 
the flag"
-               ewarn "value to '0'."
-       fi
-}

diff --git a/net-misc/networkmanager/networkmanager-1.10.2.ebuild 
b/net-misc/networkmanager/networkmanager-1.10.2.ebuild
deleted file mode 100644
index 48b1dd56d0d..00000000000
--- a/net-misc/networkmanager/networkmanager-1.10.2.ebuild
+++ /dev/null
@@ -1,325 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
-       user readme.gentoo-r1 toolchain-funcs vala versionator virtualx udev 
multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and 
straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager";
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname 
version
-
-IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind 
gnutls +introspection json kernel_linux +nss +modemmanager ncurses ofono ovs 
policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
-
-REQUIRED_USE="
-       modemmanager? ( ppp )
-       vala? ( introspection )
-       wext? ( wifi )
-       ^^ ( nss gnutls )
-       ?? ( consolekit elogind systemd )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-COMMON_DEPEND="
-       >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
-       >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
-       >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
-       >=dev-libs/libnl-3.2.8:3=[${MULTILIB_USEDEP}]
-       policykit? ( >=sys-auth/polkit-0.106 )
-       net-libs/libndp[${MULTILIB_USEDEP}]
-       >=net-misc/curl-7.24
-       net-misc/iputils
-       sys-apps/util-linux[${MULTILIB_USEDEP}]
-       sys-libs/readline:0=
-       >=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-       audit? ( sys-process/audit )
-       bluetooth? ( >=net-wireless/bluez-5 )
-       connection-sharing? (
-               net-dns/dnsmasq[dbus,dhcp]
-               net-firewall/iptables )
-       consolekit? ( >=sys-auth/consolekit-1.0.0 )
-       dhclient? ( >=net-misc/dhcp-4[client] )
-       dhcpcd? ( net-misc/dhcpcd )
-       elogind? ( >=sys-auth/elogind-219 )
-       gnutls? (
-               dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-               >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
-       introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-       json? ( dev-libs/jansson[${MULTILIB_USEDEP}] )
-       modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
-       ncurses? ( >=dev-libs/newt-0.52.15 )
-       nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
-       ofono? ( net-misc/ofono )
-       ovs? ( dev-libs/jansson )
-       ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-       resolvconf? ( net-dns/openresolv )
-       selinux? ( sys-libs/libselinux )
-       systemd? ( >=sys-apps/systemd-209:0= )
-       teamd? (
-               dev-libs/jansson
-               >=net-misc/libteam-1.9
-       )
-"
-RDEPEND="${COMMON_DEPEND}
-       || (
-               net-misc/iputils[arping(+)]
-               net-analyzer/arping
-       )
-       wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-       dev-util/gdbus-codegen
-       dev-util/gtk-doc-am
-       >=dev-util/intltool-0.40
-       >=sys-devel/gettext-0.17
-       >=sys-kernel/linux-headers-2.6.29
-       virtual/pkgconfig[${MULTILIB_USEDEP}]
-       introspection? (
-               $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-               dev-lang/perl
-               dev-libs/libxslt
-       )
-       vala? ( $(vala_depend) )
-       test? (
-               $(python_gen_any_dep '
-                       dev-python/dbus-python[${PYTHON_USEDEP}]
-                       dev-python/pygobject:3[${PYTHON_USEDEP}]')
-       )
-"
-
-python_check_deps() {
-       if use introspection; then
-               has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-       fi
-       if use test; then
-               has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-               has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-       fi
-}
-
-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 https://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 https://bugs.gentoo.org/333639 for more 
info."
-               fi
-
-       fi
-}
-
-pkg_setup() {
-       if use connection-sharing; then
-               CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-               linux-info_pkg_setup
-       fi
-       enewgroup plugdev
-       if use introspection || use test; then
-               python-any-r1_pkg_setup
-       fi
-}
-
-src_prepare() {
-       DOC_CONTENTS="To modify system network connections without needing to 
enter the
-               root password, add your user account to the 'plugdev' group."
-
-       use vala && vala_src_prepare
-       gnome2_src_prepare
-}
-
-multilib_src_configure() {
-       local myconf=(
-               --disable-more-warnings
-               --disable-static
-               --localstatedir=/var
-               --disable-lto
-               --disable-config-plugin-ibft
-               # ifnet plugin always disabled until someone volunteers to 
actively
-               # maintain and fix it
-               --disable-ifnet
-               --disable-qt
-               --without-netconfig
-               --with-dbus-sys-dir=/etc/dbus-1/system.d
-               # We need --with-libnm-glib (and dbus-glib dep) as reverse deps 
are
-               # still not ready for removing that lib
-               --with-libnm-glib
-               --with-nmcli=yes
-               --with-udev-dir="$(get_udevdir)"
-               --with-config-plugins-default=keyfile
-               --with-iptables=/sbin/iptables
-               $(multilib_native_enable concheck)
-               --with-crypto=$(usex nss nss gnutls)
-               --with-session-tracking=$(multilib_native_usex systemd systemd 
$(multilib_native_usex elogind elogind $(multilib_native_usex consolekit 
consolekit no)))
-               --with-suspend-resume=$(multilib_native_usex systemd systemd 
$(multilib_native_usex elogind elogind consolekit))
-               $(multilib_native_use_with audit libaudit)
-               $(multilib_native_use_enable bluetooth bluez5-dun)
-               $(use_with dhclient)
-               $(use_with dhcpcd)
-               $(multilib_native_use_enable introspection)
-               $(use_enable json json-validation)
-               $(multilib_native_use_enable ppp)
-               --without-libpsl
-               $(multilib_native_use_with modemmanager modem-manager-1)
-               $(multilib_native_use_with ncurses nmtui)
-               $(multilib_native_use_with ofono)
-               $(multilib_native_use_enable ovs)
-               $(multilib_native_use_with resolvconf)
-               $(multilib_native_use_with selinux)
-               $(multilib_native_use_with systemd systemd-journal)
-               $(multilib_native_use_enable teamd teamdctl)
-               $(multilib_native_use_enable test tests)
-               $(multilib_native_use_enable vala)
-               --without-valgrind
-               $(multilib_native_use_with wext)
-               $(multilib_native_use_enable wifi)
-       )
-
-       if multilib_is_native_abi && use policykit; then
-               myconf+=( --enable-polkit=yes )
-       else
-               myconf+=( --enable-polkit=disabled )
-       fi
-
-       # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug 
#519986
-       if use ppp; then
-               local PPPD_VER=`best_version net-dialup/ppp`
-               PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-               PPPD_VER=${PPPD_VER%%[_-]*} # main version without 
beta/pre/patch/revision
-               myconf+=( 
--with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-       fi
-
-       # unit files directory needs to be passed only when systemd is enabled,
-       # otherwise systemd support is not disabled completely, bug #524534
-       use systemd && myconf+=( 
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
-       if multilib_is_native_abi; then
-               # work-around man out-of-source brokenness, must be done before 
configure
-               ln -s "${S}/docs" docs || die
-               ln -s "${S}/man" man || die
-       fi
-
-       ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-       if multilib_is_native_abi; then
-               emake
-       else
-               local targets=(
-                       libnm/libnm.la
-                       libnm-util/libnm-util.la
-                       libnm-glib/libnm-glib.la
-                       libnm-glib/libnm-glib-vpn.la
-               )
-               emake "${targets[@]}"
-       fi
-}
-
-multilib_src_test() {
-       if use test && multilib_is_native_abi; then
-               python_setup
-               virtx emake check
-       fi
-}
-
-multilib_src_install() {
-       if multilib_is_native_abi; then
-               # Install completions at proper place, bug #465100
-               gnome2_src_install completiondir="$(get_bashcompdir)"
-       else
-               local targets=(
-                       install-libLTLIBRARIES
-                       install-libdeprecatedHEADERS
-                       install-libnm_glib_libnmvpnHEADERS
-                       install-libnm_glib_libnmincludeHEADERS
-                       install-libnm_util_libnm_util_includeHEADERS
-                       install-libnmincludeHEADERS
-                       install-nodist_libnm_glib_libnmincludeHEADERS
-                       install-nodist_libnm_glib_libnmvpnHEADERS
-                       install-nodist_libnm_util_libnm_util_includeHEADERS
-                       install-nodist_libnmincludeHEADERS
-                       install-pkgconfigDATA
-               )
-               emake DESTDIR="${D}" "${targets[@]}"
-       fi
-}
-
-multilib_src_install_all() {
-       ! use systemd && readme.gentoo_create_doc
-
-       newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager
-       newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-       # 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
-       newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-       sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-               -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || 
die
-
-       keepdir /etc/NetworkManager/system-connections
-       chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug 
#383765, upstream bug #754594
-
-       # Allow users in plugdev group to modify system connections
-       insinto /usr/share/polkit-1/rules.d/
-       doins 
"${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-}
-
-pkg_postinst() {
-       gnome2_pkg_postinst
-       systemd_reenable NetworkManager.service
-       ! use systemd && readme.gentoo_print_elog
-
-       if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
-               ewarn "The ${PN} system configuration file has moved to a new 
location."
-               ewarn "You must migrate your settings from 
${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-               ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
-               ewarn
-               ewarn "After doing so, you can remove 
${EROOT}etc/NetworkManager/nm-system-settings.conf"
-       fi
-
-       # NM fallbacks to plugin specified at compile time (upstream bug 
#738611)
-       # but still show a warning to remember people to have cleaner config 
file
-       if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
-               if grep plugins 
"${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-                       ewarn
-                       ewarn "You seem to use 'ifnet' plugin in 
${EROOT}etc/NetworkManager/NetworkManager.conf"
-                       ewarn "Since it won't be used, you will need to stop 
setting ifnet plugin there."
-                       ewarn
-               fi
-       fi
-
-       # NM shows lots of errors making nmcli neither unusable, bug #528748 
upstream bug #690457
-       if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-               ewarn "You have psk-flags=1 setting in above files, you will 
need to"
-               ewarn "either reconfigure affected networks or, at least, set 
the flag"
-               ewarn "value to '0'."
-       fi
-}

diff --git a/net-misc/networkmanager/networkmanager-1.8.0.ebuild 
b/net-misc/networkmanager/networkmanager-1.8.0.ebuild
deleted file mode 100644
index ccf11ee170c..00000000000
--- a/net-misc/networkmanager/networkmanager-1.8.0.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
-       user readme.gentoo-r1 toolchain-funcs vala versionator virtualx udev 
multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and 
straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager";
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname 
version
-
-IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind 
gnutls +introspection json kernel_linux +nss +modemmanager ncurses ofono 
policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
-
-REQUIRED_USE="
-       modemmanager? ( ppp )
-       vala? ( introspection )
-       wext? ( wifi )
-       ^^ ( nss gnutls )
-       ?? ( consolekit elogind systemd )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-# TODO: need multilib janson (linked to libnm.so)
-COMMON_DEPEND="
-       >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
-       >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
-       >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
-       >=dev-libs/libnl-3.2.8:3=[${MULTILIB_USEDEP}]
-       policykit? ( >=sys-auth/polkit-0.106 )
-       net-libs/libndp[${MULTILIB_USEDEP}]
-       net-misc/curl
-       net-misc/iputils
-       sys-apps/util-linux[${MULTILIB_USEDEP}]
-       sys-libs/readline:0=
-       >=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-       audit? ( sys-process/audit )
-       bluetooth? ( >=net-wireless/bluez-5 )
-       connection-sharing? (
-               net-dns/dnsmasq[dbus,dhcp]
-               net-firewall/iptables )
-       consolekit? ( >=sys-auth/consolekit-1.0.0 )
-       dhclient? ( >=net-misc/dhcp-4[client] )
-       dhcpcd? ( net-misc/dhcpcd )
-       elogind? ( sys-auth/elogind )
-       gnutls? (
-               dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-               >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
-       introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-       json? ( dev-libs/jansson )
-       modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
-       ncurses? ( >=dev-libs/newt-0.52.15 )
-       nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
-       ofono? ( net-misc/ofono )
-       ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-       resolvconf? ( net-dns/openresolv )
-       selinux? ( sys-libs/libselinux )
-       systemd? ( >=sys-apps/systemd-209:0= )
-       teamd? (
-               dev-libs/jansson
-               >=net-misc/libteam-1.9
-       )
-"
-RDEPEND="${COMMON_DEPEND}
-       || (
-               net-misc/iputils[arping(+)]
-               net-analyzer/arping
-       )
-       wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-       dev-util/gdbus-codegen
-       dev-util/gtk-doc-am
-       >=dev-util/intltool-0.40
-       >=sys-devel/gettext-0.17
-       >=sys-kernel/linux-headers-2.6.29
-       virtual/pkgconfig[${MULTILIB_USEDEP}]
-       introspection? (
-               $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-               dev-lang/perl
-               dev-libs/libxslt
-       )
-       vala? ( $(vala_depend) )
-       test? (
-               $(python_gen_any_dep '
-                       dev-python/dbus-python[${PYTHON_USEDEP}]
-                       dev-python/pygobject:3[${PYTHON_USEDEP}]')
-       )
-"
-
-python_check_deps() {
-       if use introspection; then
-               has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-       fi
-       if use test; then
-               has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-               has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-       fi
-}
-
-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 https://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 https://bugs.gentoo.org/333639 for more 
info."
-               fi
-
-       fi
-}
-
-pkg_setup() {
-       if use connection-sharing; then
-               CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-               linux-info_pkg_setup
-       fi
-       enewgroup plugdev
-       if use introspection || use test; then
-               python-any-r1_pkg_setup
-       fi
-}
-
-src_prepare() {
-       DOC_CONTENTS="To modify system network connections without needing to 
enter the
-               root password, add your user account to the 'plugdev' group."
-
-       use vala && vala_src_prepare
-       gnome2_src_prepare
-}
-
-multilib_src_configure() {
-       local myconf=(
-               --disable-more-warnings
-               --disable-static
-               --localstatedir=/var
-               --disable-lto
-               --disable-config-plugin-ibft
-               # ifnet plugin always disabled until someone volunteers to 
actively
-               # maintain and fix it
-               --disable-ifnet
-               --disable-qt
-               --without-netconfig
-               --with-dbus-sys-dir=/etc/dbus-1/system.d
-               # We need --with-libnm-glib (and dbus-glib dep) as reverse deps 
are
-               # still not ready for removing that lib
-               --with-libnm-glib
-               --with-nmcli=yes
-               --with-udev-dir="$(get_udevdir)"
-               --with-config-plugins-default=keyfile
-               --with-iptables=/sbin/iptables
-               $(multilib_native_enable concheck)
-               --with-crypto=$(usex nss nss gnutls)
-               --with-session-tracking=$(multilib_native_usex systemd systemd 
$(multilib_native_usex elogind elogind $(multilib_native_usex consolekit 
consolekit no)))
-               --with-suspend-resume=$(multilib_native_usex systemd systemd 
$(multilib_native_usex elogind elogind consolekit))
-               $(multilib_native_use_with audit libaudit)
-               $(multilib_native_use_enable bluetooth bluez5-dun)
-               $(use_with dhclient)
-               $(use_with dhcpcd)
-               $(multilib_native_use_enable introspection)
-               $(multilib_native_use_enable json json-validation)
-               $(multilib_native_use_enable ppp)
-               --without-libpsl
-               $(multilib_native_use_with modemmanager modem-manager-1)
-               $(multilib_native_use_with ncurses nmtui)
-               $(multilib_native_use_with ofono)
-               $(multilib_native_use_with resolvconf)
-               $(multilib_native_use_with selinux)
-               $(multilib_native_use_with systemd systemd-journal)
-               $(multilib_native_use_enable teamd teamdctl)
-               $(multilib_native_use_enable test tests)
-               $(multilib_native_use_enable vala)
-               --without-valgrind
-               $(multilib_native_use_with wext)
-               $(multilib_native_use_enable wifi)
-       )
-
-       if multilib_is_native_abi && use policykit; then
-               myconf+=( --enable-polkit=yes )
-       else
-               myconf+=( --enable-polkit=disabled )
-       fi
-
-       # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug 
#519986
-       if use ppp; then
-               local PPPD_VER=`best_version net-dialup/ppp`
-               PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-               PPPD_VER=${PPPD_VER%%[_-]*} # main version without 
beta/pre/patch/revision
-               myconf+=( 
--with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-       fi
-
-       # unit files directory needs to be passed only when systemd is enabled,
-       # otherwise systemd support is not disabled completely, bug #524534
-       use systemd && myconf+=( 
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
-       if multilib_is_native_abi; then
-               # work-around man out-of-source brokenness, must be done before 
configure
-               ln -s "${S}/docs" docs || die
-               ln -s "${S}/man" man || die
-       fi
-
-       ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-       if multilib_is_native_abi; then
-               emake
-       else
-               local targets=(
-                       libnm/libnm.la
-                       libnm-util/libnm-util.la
-                       libnm-glib/libnm-glib.la
-                       libnm-glib/libnm-glib-vpn.la
-               )
-               emake "${targets[@]}"
-       fi
-}
-
-multilib_src_test() {
-       if use test && multilib_is_native_abi; then
-               python_setup
-               virtx emake check
-       fi
-}
-
-multilib_src_install() {
-       if multilib_is_native_abi; then
-               # Install completions at proper place, bug #465100
-               gnome2_src_install completiondir="$(get_bashcompdir)"
-       else
-               local targets=(
-                       install-libLTLIBRARIES
-                       install-libdeprecatedHEADERS
-                       install-libnm_glib_libnmvpnHEADERS
-                       install-libnm_glib_libnmincludeHEADERS
-                       install-libnm_util_libnm_util_includeHEADERS
-                       install-libnmincludeHEADERS
-                       install-nodist_libnm_glib_libnmincludeHEADERS
-                       install-nodist_libnm_glib_libnmvpnHEADERS
-                       install-nodist_libnm_util_libnm_util_includeHEADERS
-                       install-nodist_libnmincludeHEADERS
-                       install-pkgconfigDATA
-               )
-               emake DESTDIR="${D}" "${targets[@]}"
-       fi
-}
-
-multilib_src_install_all() {
-       ! use systemd && readme.gentoo_create_doc
-
-       newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager
-       newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-       # 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
-       newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-       sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-               -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || 
die
-
-       keepdir /etc/NetworkManager/system-connections
-       chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug 
#383765, upstream bug #754594
-
-       # Allow users in plugdev group to modify system connections
-       insinto /usr/share/polkit-1/rules.d/
-       doins 
"${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-}
-
-pkg_postinst() {
-       gnome2_pkg_postinst
-       ! use systemd && readme.gentoo_print_elog
-
-       if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
-               ewarn "The ${PN} system configuration file has moved to a new 
location."
-               ewarn "You must migrate your settings from 
${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-               ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
-               ewarn
-               ewarn "After doing so, you can remove 
${EROOT}etc/NetworkManager/nm-system-settings.conf"
-       fi
-
-       # NM fallbacks to plugin specified at compile time (upstream bug 
#738611)
-       # but still show a warning to remember people to have cleaner config 
file
-       if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
-               if grep plugins 
"${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-                       ewarn
-                       ewarn "You seem to use 'ifnet' plugin in 
${EROOT}etc/NetworkManager/NetworkManager.conf"
-                       ewarn "Since it won't be used, you will need to stop 
setting ifnet plugin there."
-                       ewarn
-               fi
-       fi
-
-       # NM shows lots of errors making nmcli neither unusable, bug #528748 
upstream bug #690457
-       if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-               ewarn "You have psk-flags=1 setting in above files, you will 
need to"
-               ewarn "either reconfigure affected networks or, at least, set 
the flag"
-               ewarn "value to '0'."
-       fi
-}

diff --git a/net-misc/networkmanager/networkmanager-1.8.2.ebuild 
b/net-misc/networkmanager/networkmanager-1.8.2.ebuild
deleted file mode 100644
index 55ec2f85cec..00000000000
--- a/net-misc/networkmanager/networkmanager-1.8.2.ebuild
+++ /dev/null
@@ -1,324 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
-       user readme.gentoo-r1 toolchain-funcs vala versionator virtualx udev 
multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and 
straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager";
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname 
version
-
-IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind 
gnutls +introspection json kernel_linux +nss +modemmanager ncurses ofono 
policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
-
-REQUIRED_USE="
-       modemmanager? ( ppp )
-       vala? ( introspection )
-       wext? ( wifi )
-       ^^ ( nss gnutls )
-       ?? ( consolekit elogind systemd )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-# TODO: need multilib janson (linked to libnm.so)
-COMMON_DEPEND="
-       >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
-       >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
-       >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
-       >=dev-libs/libnl-3.2.8:3=[${MULTILIB_USEDEP}]
-       policykit? ( >=sys-auth/polkit-0.106 )
-       net-libs/libndp[${MULTILIB_USEDEP}]
-       >=net-misc/curl-7.24
-       net-misc/iputils
-       sys-apps/util-linux[${MULTILIB_USEDEP}]
-       sys-libs/readline:0=
-       >=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-       audit? ( sys-process/audit )
-       bluetooth? ( >=net-wireless/bluez-5 )
-       connection-sharing? (
-               net-dns/dnsmasq[dbus,dhcp]
-               net-firewall/iptables )
-       consolekit? ( >=sys-auth/consolekit-1.0.0 )
-       dhclient? ( >=net-misc/dhcp-4[client] )
-       dhcpcd? ( net-misc/dhcpcd )
-       elogind? ( >=sys-auth/elogind-219 )
-       gnutls? (
-               dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-               >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
-       introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-       json? ( dev-libs/jansson )
-       modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
-       ncurses? ( >=dev-libs/newt-0.52.15 )
-       nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
-       ofono? ( net-misc/ofono )
-       ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-       resolvconf? ( net-dns/openresolv )
-       selinux? ( sys-libs/libselinux )
-       systemd? ( >=sys-apps/systemd-209:0= )
-       teamd? (
-               dev-libs/jansson
-               >=net-misc/libteam-1.9
-       )
-"
-RDEPEND="${COMMON_DEPEND}
-       || (
-               net-misc/iputils[arping(+)]
-               net-analyzer/arping
-       )
-       wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-       dev-util/gdbus-codegen
-       dev-util/gtk-doc-am
-       >=dev-util/intltool-0.40
-       >=sys-devel/gettext-0.17
-       >=sys-kernel/linux-headers-2.6.29
-       virtual/pkgconfig[${MULTILIB_USEDEP}]
-       introspection? (
-               $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-               dev-lang/perl
-               dev-libs/libxslt
-       )
-       vala? ( $(vala_depend) )
-       test? (
-               $(python_gen_any_dep '
-                       dev-python/dbus-python[${PYTHON_USEDEP}]
-                       dev-python/pygobject:3[${PYTHON_USEDEP}]')
-       )
-"
-
-python_check_deps() {
-       if use introspection; then
-               has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-       fi
-       if use test; then
-               has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-               has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-       fi
-}
-
-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 https://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 https://bugs.gentoo.org/333639 for more 
info."
-               fi
-
-       fi
-}
-
-pkg_setup() {
-       if use connection-sharing; then
-               CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-               linux-info_pkg_setup
-       fi
-       enewgroup plugdev
-       if use introspection || use test; then
-               python-any-r1_pkg_setup
-       fi
-}
-
-src_prepare() {
-       DOC_CONTENTS="To modify system network connections without needing to 
enter the
-               root password, add your user account to the 'plugdev' group."
-
-       use vala && vala_src_prepare
-       gnome2_src_prepare
-}
-
-multilib_src_configure() {
-       local myconf=(
-               --disable-more-warnings
-               --disable-static
-               --localstatedir=/var
-               --disable-lto
-               --disable-config-plugin-ibft
-               # ifnet plugin always disabled until someone volunteers to 
actively
-               # maintain and fix it
-               --disable-ifnet
-               --disable-qt
-               --without-netconfig
-               --with-dbus-sys-dir=/etc/dbus-1/system.d
-               # We need --with-libnm-glib (and dbus-glib dep) as reverse deps 
are
-               # still not ready for removing that lib
-               --with-libnm-glib
-               --with-nmcli=yes
-               --with-udev-dir="$(get_udevdir)"
-               --with-config-plugins-default=keyfile
-               --with-iptables=/sbin/iptables
-               $(multilib_native_enable concheck)
-               --with-crypto=$(usex nss nss gnutls)
-               --with-session-tracking=$(multilib_native_usex systemd systemd 
$(multilib_native_usex elogind elogind $(multilib_native_usex consolekit 
consolekit no)))
-               --with-suspend-resume=$(multilib_native_usex systemd systemd 
$(multilib_native_usex elogind elogind consolekit))
-               $(multilib_native_use_with audit libaudit)
-               $(multilib_native_use_enable bluetooth bluez5-dun)
-               $(use_with dhclient)
-               $(use_with dhcpcd)
-               $(multilib_native_use_enable introspection)
-               $(multilib_native_use_enable json json-validation)
-               $(multilib_native_use_enable ppp)
-               --without-libpsl
-               $(multilib_native_use_with modemmanager modem-manager-1)
-               $(multilib_native_use_with ncurses nmtui)
-               $(multilib_native_use_with ofono)
-               $(multilib_native_use_with resolvconf)
-               $(multilib_native_use_with selinux)
-               $(multilib_native_use_with systemd systemd-journal)
-               $(multilib_native_use_enable teamd teamdctl)
-               $(multilib_native_use_enable test tests)
-               $(multilib_native_use_enable vala)
-               --without-valgrind
-               $(multilib_native_use_with wext)
-               $(multilib_native_use_enable wifi)
-       )
-
-       if multilib_is_native_abi && use policykit; then
-               myconf+=( --enable-polkit=yes )
-       else
-               myconf+=( --enable-polkit=disabled )
-       fi
-
-       # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug 
#519986
-       if use ppp; then
-               local PPPD_VER=`best_version net-dialup/ppp`
-               PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-               PPPD_VER=${PPPD_VER%%[_-]*} # main version without 
beta/pre/patch/revision
-               myconf+=( 
--with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-       fi
-
-       # unit files directory needs to be passed only when systemd is enabled,
-       # otherwise systemd support is not disabled completely, bug #524534
-       use systemd && myconf+=( 
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
-       if multilib_is_native_abi; then
-               # work-around man out-of-source brokenness, must be done before 
configure
-               ln -s "${S}/docs" docs || die
-               ln -s "${S}/man" man || die
-       fi
-
-       ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-       if multilib_is_native_abi; then
-               emake
-       else
-               local targets=(
-                       libnm/libnm.la
-                       libnm-util/libnm-util.la
-                       libnm-glib/libnm-glib.la
-                       libnm-glib/libnm-glib-vpn.la
-               )
-               emake "${targets[@]}"
-       fi
-}
-
-multilib_src_test() {
-       if use test && multilib_is_native_abi; then
-               python_setup
-               virtx emake check
-       fi
-}
-
-multilib_src_install() {
-       if multilib_is_native_abi; then
-               # Install completions at proper place, bug #465100
-               gnome2_src_install completiondir="$(get_bashcompdir)"
-       else
-               local targets=(
-                       install-libLTLIBRARIES
-                       install-libdeprecatedHEADERS
-                       install-libnm_glib_libnmvpnHEADERS
-                       install-libnm_glib_libnmincludeHEADERS
-                       install-libnm_util_libnm_util_includeHEADERS
-                       install-libnmincludeHEADERS
-                       install-nodist_libnm_glib_libnmincludeHEADERS
-                       install-nodist_libnm_glib_libnmvpnHEADERS
-                       install-nodist_libnm_util_libnm_util_includeHEADERS
-                       install-nodist_libnmincludeHEADERS
-                       install-pkgconfigDATA
-               )
-               emake DESTDIR="${D}" "${targets[@]}"
-       fi
-}
-
-multilib_src_install_all() {
-       ! use systemd && readme.gentoo_create_doc
-
-       newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager
-       newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-       # 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
-       newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-       sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-               -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || 
die
-
-       keepdir /etc/NetworkManager/system-connections
-       chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug 
#383765, upstream bug #754594
-
-       # Allow users in plugdev group to modify system connections
-       insinto /usr/share/polkit-1/rules.d/
-       doins 
"${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-}
-
-pkg_postinst() {
-       gnome2_pkg_postinst
-       systemd_reenable NetworkManager.service
-       ! use systemd && readme.gentoo_print_elog
-
-       if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
-               ewarn "The ${PN} system configuration file has moved to a new 
location."
-               ewarn "You must migrate your settings from 
${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-               ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
-               ewarn
-               ewarn "After doing so, you can remove 
${EROOT}etc/NetworkManager/nm-system-settings.conf"
-       fi
-
-       # NM fallbacks to plugin specified at compile time (upstream bug 
#738611)
-       # but still show a warning to remember people to have cleaner config 
file
-       if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
-               if grep plugins 
"${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-                       ewarn
-                       ewarn "You seem to use 'ifnet' plugin in 
${EROOT}etc/NetworkManager/NetworkManager.conf"
-                       ewarn "Since it won't be used, you will need to stop 
setting ifnet plugin there."
-                       ewarn
-               fi
-       fi
-
-       # NM shows lots of errors making nmcli neither unusable, bug #528748 
upstream bug #690457
-       if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-               ewarn "You have psk-flags=1 setting in above files, you will 
need to"
-               ewarn "either reconfigure affected networks or, at least, set 
the flag"
-               ewarn "value to '0'."
-       fi
-}

Reply via email to