Permalink
Browse files

FL-212: Cleaning networkmanager versions, unmasked stable 0.9.6.4-r3

  • Loading branch information...
jeanfrancisroy committed Nov 13, 2012
1 parent 0b9f44b commit 0b18608f639692077197ab54a19c183642ab0391
@@ -1,238 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-GNOME_ORG_MODULE="NetworkManager"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools eutils gnome.org linux-info systemd user toolchain-funcs vala
-
-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 connection-sharing consolekit dhclient +dhcpcd doc gnutls +introspection kernel_linux +nss modemmanager policykit +ppp resolvconf systemd vala +wext wimax"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-REQUIRED_USE="
- modemmanager? ( ppp )
- ^^ ( nss gnutls )
- ^^ ( dhclient dhcpcd )
- consolekit? ( !systemd )
- systemd? ( !consolekit )"
-
-# 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?
-COMMON_DEPEND=">=sys-apps/dbus-1.2
- >=dev-libs/dbus-glib-0.94
- || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] )
- >=dev-libs/glib-2.26
- policykit? ( >=sys-auth/polkit-0.97 )
- >=net-libs/libsoup-2.26:2.4
- >=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[client] )
- dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
- introspection? ( >=dev-libs/gobject-introspection-0.10.3 )
- ppp? ( >=net-dialup/ppp-2.4.5 )
- resolvconf? ( net-dns/openresolv )
- connection-sharing? (
- net-dns/dnsmasq
- net-firewall/iptables )
- wimax? (
- dev-libs/libnl:1.1
- >=net-wireless/wimax-1.5.1 )
- !wimax? ( dev-libs/libnl:3 )"
-
-RDEPEND="${COMMON_DEPEND}
- modemmanager? ( >=net-misc/modemmanager-0.4 )
- systemd? ( >=sys-apps/systemd-31 )
- consolekit? ( sys-auth/consolekit )"
-
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- >=sys-kernel/linux-headers-2.6.29
- doc? ( >=dev-util/gtk-doc-1.8 )
- vala? ( $(vala_depend) )"
-
-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.4.0-force-libnl1.1-r1.patch"
- # Update init.d script to provide net and use inactive status if not connected
- epatch "${FILESDIR}/${PN}-0.9.2.0-init-provide-net-r1.patch"
- # Bug #402085, https://bugzilla.gnome.org/show_bug.cgi?id=387832
- epatch "${FILESDIR}/${PN}-0.9.2.0-pre-sleep.patch"
- # Bug #335147, https://bugzilla.gnome.org/show_bug.cgi?id=679428
- epatch "${FILESDIR}/${PN}-0.9.4.0-dhclient-ipv6.patch"
- # https://bugzilla.gnome.org/show_bug.cgi?id=683932
- epatch "${FILESDIR}/${PN}-0.9.6.0-daemon-signals.patch"
-
- epatch_user
-
- use vala && vala_src_prepare
- eautoreconf
- default
-}
-
-src_configure() {
- local udevdir=/lib/udev
- has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-
- ECONF="--disable-more-warnings
- --disable-static
- --localstatedir=/var
- --with-distro=gentoo
- --with-dbus-sys-dir=/etc/dbus-1/system.d
- --with-udev-dir=${udevdir}
- --with-iptables=/sbin/iptables
- --enable-concheck
- $(use_enable policykit polkit)
- $(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)
- $(use_enable vala)
- $(use_with wext)
- $(use_with wimax libnl-1)
- $(systemd_with_unitdir)"
-
- if use nss ; then
- ECONF="${ECONF} $(use_with nss crypto=nss)"
- else
- ECONF="${ECONF} $(use_with gnutls crypto=gnutls)"
- fi
-
- 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
-
- 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
-
- if use systemd; then
- # Our init.d script requires running a dispatcher script that annoys
- # systemd users; bug #434692
- rm -rv "${ED}/etc/init.d" || die "rm failed"
- else
- # Provide openrc net dependency only when nm is connected
- exeinto /etc/NetworkManager/dispatcher.d
- newexe "${FILESDIR}/10-openrc-status-r3" 10-openrc-status
- sed -e "s:@EPREFIX@:${EPREFIX}:g" \
- -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
- # Default conf.d file
- newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
- fi
-
- # 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" NetworkManager.conf
-
- if use policykit; then
- # 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"
- if has_version '<sys-auth/polkit-0.106'; then
- insinto /etc/polkit-1/localauthority/10-vendor.d
- doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.pkla"
- fi
- fi
-
- # 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."
-
- 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
-
- if use policykit; then
- # The polkit rules file moved to /usr/share
- old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
- if [[ -f "${old_rules}" ]]; then
- case "$(md5sum ${old_rules})" in
- 574d0cfa7e911b1f7792077003060240* )
- # Automatically delete the old rules.d file if the user did not change it
- elog
- elog "Removing old ${old_rules} ..."
- rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
- ;;
- * )
- elog "The ${old_rules}"
- elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
- elog "If you edited ${old_rules}"
- elog "without changing its behavior, you may want to remove it."
- ;;
- esac
- fi
- fi
-}
Oops, something went wrong.

0 comments on commit 0b18608

Please sign in to comment.