Inherit some changes from systemd-love to make it more systemd friendly

Package-Manager: portage-2.1.12.13/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 281 insertions, 6 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index e9bf55296366..06fe0fc259a5 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.172 2013/06/16 11:43:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.173 2013/07/13 19:59:01 pacho Exp $
+
+*networkmanager-0.9.8.2-r1 (13 Jul 2013)
+
+  13 Jul 2013; Pacho Ramos <pacho@gentoo.org> +files/10-openrc-status-r4,
+  +networkmanager-0.9.8.2-r1.ebuild:
+  Inherit some changes from systemd-love to make it more systemd friendly
 
   16 Jun 2013; Pacho Ramos <pacho@gentoo.org> -networkmanager-0.9.8.0.ebuild,
   -networkmanager-9999.ebuild, metadata.xml:
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 1ae205a8ac53..b4dc1126d34b 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -5,6 +5,7 @@ AUX 01-org.freedesktop.NetworkManager.settings.modify.system.pkla 187 SHA256 909
 AUX 01-org.freedesktop.NetworkManager.settings.modify.system.rules 265 SHA256 702e1e702ec633608fd75dfd44f66437896421c9d2d7fe9966df8e4ef1d93a6c SHA512 22dfa5b071891ba16b9a8b90a1964d56e370cb640d78191934ae802e568f92c299b9d4d965f7081fb36a8c09378bfb0b33193b2332cbdc28c6799b152128c214 WHIRLPOOL b89a4069cc973cf55001a5f0028c75a90ce4ea070c4424b5a22f3e9b8e61ee34ff7b06891eb1c6f8fa24735b3e5d98e61f0bfefca7dd12eeb615b83e72225c8b
 AUX 10-openrc-status-r2 899 SHA256 4391d3c53f7904bfd287e767c791c5c1b605d5bff7f5aaa00b8d7655101f2732 SHA512 5b5f783d2c68da4f47db919aea60963986638c313645e8f0ba3c89b3b339257b28eaaf65571536254e266e1da510cde7a157a8fdba1feb0d79b4d0c8ee3c51af WHIRLPOOL b941201368ee8c419fbbd0b33752deb70d9b9e140c76d74f50836734d22eeae70790cc3c7ac3b07cd40f95c3635fd99db92e161a21d74af1889dc0c48bb049ac
 AUX 10-openrc-status-r3 1103 SHA256 3ee158de440df6e6a8ddcc7c0622cb94039cffe6b0cc0b88d35a53333d32f73d SHA512 b848327b0975a59420a4e7132c45a15267a7d98b0f430f52d95991e7946eca787faf5b9a5adb3f1b294f5cc761f14d693d9d4e604ff091160da9610b76cb72e8 WHIRLPOOL 7745a0469e1bec653736c14e4e6f5f9593ef9a752d4973ad538350a1f934bcdf1e2cd4c276ce3f57515e9d8c34168014e138ab9627e57cd3cef79b852ebacc40
+AUX 10-openrc-status-r4 1182 SHA256 f8ed424818b866a0bf882c569f4484e8b1485ce7ac8c472f060fd877f2dcfe65 SHA512 b1f0cd7eaeb13af9ab1ce192fd3f47e52d505c4ad5a0888af1ad2598701a034231c03f5346441f44443daca84f2089cb68e08c2876396be0e668c484c3d331ec WHIRLPOOL c71c923c293730894a660c8db3371fee2697666388f49947ecc2508b18a0a0d16a72643f34e8a1dadb559743ea1b56a34d3abfd95bced85dc0d753a33d661fb8
 AUX conf.d.NetworkManager 230 SHA256 4594573f01fe5e04b6dde4525796acf909158591bdcefd662ec23fe0d1c3e1bd SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a WHIRLPOOL 7dbb15bf184e918369187605af91816ed11c460147066ede11f200d73103bb6f7f63ccc7abe7996d485294f44282d6bbd9520cc9e50f04ce41262c9817f7b994
 AUX init.d.NetworkManager 1895 SHA256 5f368362ef5c6deed538f20dc582d6da3c86871bd42297fa78536c0312021843 SHA512 c9a874976fa422778cc37e522d08da953c738fa971e8ae58f76952db374ad4fb8a5c65d1d0ddd2f2ad9ceae05996c21d24c98df214ebf5b9d338257f95c9cd5c WHIRLPOOL 036ef59d76e5a7e28de30345774a7bc446c6acf0e9d2499127d7f395b40f28b2078d02e91c24f7b421f5c90f907c3e799a40efb724ad2d02c546bbac1a446b30
 AUX networkmanager-0.9.2.0-init-provide-net-r1.patch 2282 SHA256 fd46086be527bdd79978142eb8b46653ecc919f2dcab0a02dea2d0fd28232f92 SHA512 d639f1bc6442a92ad9d759d09abc963131ca13ddae13129c0ef21affb3888426a8301aad6fe4b71eddfca2a9f21213d515ba90662abff981701090581ed6bb9e WHIRLPOOL fee0fa3b2b148e210d9bb547a327d42866a70fb817b0a8e5375ece10c09bbe1a67b048ca25cadba0296eeb4e8359245369e9b0c213fd0343a6e75792755bc0d3
@@ -25,13 +26,14 @@ DIST NetworkManager-0.9.6.4.tar.xz 1968564 SHA256 511b411e055d187bc8f26c519fdb3e
 DIST NetworkManager-0.9.8.2.tar.xz 1967452 SHA256 5c0b2f71b2f61e0dfbe95cebad83001758db252d5cdf5b6f7ceebac9c6bd7ead SHA512 a731b85d267bcbd837960b0b1bec2c8ec0458180a751bce353e763e9fca033dfc8101a1267101dadcc8984138a4b693a198a09c15acd7faab3930f98c8246775 WHIRLPOOL 788c3f07f66aca9099349a1a8325cf4ba5c23665d019c508baf4bf037f77316379a1c47c1eb67d4ab6ef845ff6a783e2453d6ff50cde6b830d36f2d5cd648e3c
 EBUILD networkmanager-0.9.6.4-r1.ebuild 7546 SHA256 a998f7bad28581572ed7375ecdc33615d71a4b70c153d32f3142feee745016e3 SHA512 26636400345268f7534aeee029b29af5c53cc68f2b9d721c62f9cf206a2b5396641ded815fca1d2c375fedecb16c07bdf81b33fdc03bc8a46f40c50c3a7dea0a WHIRLPOOL 8c1549c48141feadf1cf1f7950b177fda1e044f23708af6e35502746f86fc5e1e2e26295ea9da6fb2f572b5cd8e3af2e4b3dde5481070bb9243669de277538a7
 EBUILD networkmanager-0.9.6.4.ebuild 7518 SHA256 e1786b0b52196e98b6c7aff8dd641193f196ecf5ed8fbcf088ff4baa4ec9d56f SHA512 7b74e41be564767a591eadf50445b6a278cb9fe571f512a6075bc72268198b841ffb3e818276aaf3c738b2198b5ff9de037f6d60b7e32d6c91e380bd016386d5 WHIRLPOOL 2702292d1530bb4e7b6177cd3a54d7640842eac179f05e174fa8bbf590a81ac25af7ec769f7ddd5e71e0446df0c9c370deeb3d5edb2ac3cab8ddd98b5a6bde80
+EBUILD networkmanager-0.9.8.2-r1.ebuild 7477 SHA256 31ba9899ab5b8df4d7777c921410a14d8bbfbf8cde30756f9ec0d9e3f2705d78 SHA512 99276d9d62b900647afeb9c6a90a19f2d213f4bc9f6458287f1d6949521ba6cd0ed8a28fc211476dbf1404d266d9ad53c4558905520d9de9ed4456eb9a3f7308 WHIRLPOOL fda011fbf0c6666fee66754cdae87e632fb4b76b416ece5e5dd81528f98dd5bce06d4286cd27995c806bfbc26a176a67b41de39448c17f524798bfdb68fdcab2
 EBUILD networkmanager-0.9.8.2.ebuild 7503 SHA256 3338fe5460c0920f363483de0c5f89bc32420a270e4bc9e6a5fe393037a23c1b SHA512 50ef0324ac5f336b73ae1674a6441b2f470de8d4a4a6ea5e0bd8922f5d15605e888acaf615cb4ecefbeb1cb132c4cc6fea0b4c8a591eb642cbc4dc554531d9c5 WHIRLPOOL d0ca01bb3f815f5a8be00fb48f98c1377e1f6abf4fffbceb0f0e2a79647f06c13aef54e14418a6f567ddd569627b6e50e923ee7456989b4801190225cf2a8dba
-MISC ChangeLog 42988 SHA256 90c57ddfa705413b6923f1d05abf87dccb6762fba4edc64d4c490c2423906095 SHA512 40c761490b159cb5ef0ef6f1d0aae64b877be7ebd30025d01065a2cd636bf85439161500594e01b35057ce813785f6f194324b90a51622bd51956f2f1fe5fe6a WHIRLPOOL 05dd629b8db3afbc4f841e41248e7deddbd6c73c03b60094d08c4b5bc2f296c6ad224b7a06d83074f35322966d12ca4db97c7b337a0bb929b7b32f3fe879e915
+MISC ChangeLog 43216 SHA256 93142b5c6b2d89798e5816c4c107d79224179ebb0da93d6affa57933e0873eb2 SHA512 12017dc99c8d60000abefa0d87742ad9351c7b9fef73d2836baf9fdb65f9177241782931be72cc1d99abab0725c9ea942c2334b6e36e6095c57b7cd378a6f2a1 WHIRLPOOL 5795b9b44681ad15feb7aa1166b1886f440caed74a290669d673cf4942aef70b58655d32f0c43c4703e4dd852231b7eac7382e93051e84da70cbdca9dffa8b43
 MISC metadata.xml 1310 SHA256 7bc71d09fd619c5f65f1e9b5618d49f9f8ee38fe5b437cab2a3a870b8272fdbd SHA512 5637c1aed72ac8bcecd6fa806f4f8c35aa8ed353b5a4ae649cc415a1bad31b62ed657ed0a8c43cfdcbeebdac827ede6fa86c88a7ed49fa38464f00bcb4e72574 WHIRLPOOL 13bc9e31905900f2c23399268e5f670b6b75cf21ad6c1a7ccde29668fc441362f9b8b03ff2eba2de320c395f79dbd5dffa03d0ebcf62bf95a4f1a525c446dc42
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlG9pNoACgkQCaWpQKGI+9Sh9QCeNKMY8duOjW4ikGiac+2MJ0Lp
-bkkAnjSGVCQk29OyyJV7L9bKhbKWSN5e
-=vQsb
+iEYEAREIAAYFAlHhsYYACgkQCaWpQKGI+9TPSACfbYwXL553BIFDvBh6wbs2qKZ9
+W0EAnRol36B6+TZxsrliGL9ntdgccw74
+=c/tZ
 -----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager/files/10-openrc-status-r4 b/net-misc/networkmanager/files/10-openrc-status-r4
new file mode 100644
index 000000000000..e195ccc19687
--- /dev/null
+++ b/net-misc/networkmanager/files/10-openrc-status-r4
@@ -0,0 +1,35 @@
+#!/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.
+
+if [ ! -e "/run/openrc/softlevel" ]; then
+	# OpenRC is not running
+	exit 0
+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) nm-online -t 0 -x &&
+		! rc-service NetworkManager status 2>&1 | grep -q started &&
+		exec rc-service NetworkManager start ;;
+	down) nm-online -t 0 -x ||
+		rc-service NetworkManager status 2>&1 | grep -q stopped ||
+		exec rc-service NetworkManager stop ;;
+	pre-sleep) rc-service NetworkManager status 2>&1 | grep -q stopped ||
+		exec rc-service NetworkManager stop ;;
+esac
+exit 0
+# vim: set ts=4:
diff --git a/net-misc/networkmanager/networkmanager-0.9.8.2-r1.ebuild b/net-misc/networkmanager/networkmanager-0.9.8.2-r1.ebuild
new file mode 100644
index 000000000000..f9542db04805
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-0.9.8.2-r1.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.8.2-r1.ebuild,v 1.1 2013/07/13 19:59:01 pacho Exp $
+
+EAPI="5"
+GNOME_ORG_MODULE="NetworkManager"
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome.org linux-info systemd user readme.gentoo toolchain-funcs vala virtualx udev
+
+DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
+HOMEPAGE="http://projects.gnome.org/NetworkManager/"
+
+LICENSE="GPL-2+"
+SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
+IUSE="avahi bluetooth connection-sharing consolekit dhclient +dhcpcd gnutls
++introspection kernel_linux +nss modemmanager +ppp resolvconf systemd test vala
++wext" # wimax
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+REQUIRED_USE="
+	modemmanager? ( ppp )
+	^^ ( 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
+# TODO: Qt support?
+COMMON_DEPEND="
+	>=sys-apps/dbus-1.2
+	>=dev-libs/dbus-glib-0.94
+	>=dev-libs/glib-2.30
+	>=dev-libs/libnl-3.2.7:3=
+	>=sys-auth/polkit-0.106
+	>=net-libs/libsoup-2.26:2.4=
+	>=net-wireless/wpa_supplicant-0.7.3-r3[dbus]
+	>=virtual/udev-165[gudev]
+	bluetooth? ( >=net-wireless/bluez-4.82 )
+	avahi? ( net-dns/avahi:=[autoipd] )
+	connection-sharing? (
+		net-dns/dnsmasq
+		net-firewall/iptables )
+	gnutls? (
+		dev-libs/libgcrypt:=
+		net-libs/gnutls:= )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991 )
+	nss? ( >=dev-libs/nss-3.11:= )
+	dhclient? ( =net-misc/dhcp-4*[client] )
+	dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3 )
+	ppp? ( >=net-dialup/ppp-2.4.5[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	systemd? ( >=sys-apps/systemd-183 )
+	|| ( sys-power/upower >=sys-apps/systemd-183 )
+"
+RDEPEND="${COMMON_DEPEND}
+	consolekit? ( sys-auth/consolekit )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	>=sys-kernel/linux-headers-2.6.29
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/dbus-python[python_targets_python2_7]
+		dev-python/pygobject:2[python_targets_python2_7] )
+"
+
+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() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	# Bug #402085, https://bugzilla.gnome.org/show_bug.cgi?id=387832
+	epatch "${FILESDIR}/${PN}-0.9.7.995-pre-sleep.patch"
+
+	# Runtime detect systemd || consolekit
+	# https://bugzilla.gnome.org/show_bug.cgi?id=686997
+	epatch "${FILESDIR}/0001-core-runtime-detect-logind-and-ConsoleKit-3.patch"
+
+	# Use python2.7 shebangs for test scripts
+	sed -e 's@\(^#!.*python\)@\12.7@' \
+		-i */tests/*.py || die
+
+	# Fix completiondir, avoid eautoreconf, bug #465100
+	sed -i 's|^completiondir =.*|completiondir = $(datadir)/bash-completion|' \
+		cli/completion/Makefile.in || die "sed completiondir failed"
+
+	epatch_user
+
+	use vala && vala_src_prepare
+
+	# Force use of /run, avoid eautoreconf
+	sed -e 's:$localstatedir/run/:/run/:' -i configure || die
+
+	default
+}
+
+src_configure() {
+	# TODO: enable wimax when we have a libnl:3 compatible revision of it
+	econf \
+		--disable-more-warnings \
+		--disable-static \
+		--localstatedir=/var \
+		--enable-ifnet \
+		--without-netconfig \
+		--with-dbus-sys-dir=/etc/dbus-1/system.d \
+		--with-udev-dir="$(udev_get_udevdir)" \
+		--with-iptables=/sbin/iptables \
+		--enable-concheck \
+		--with-crypto=$(usex nss nss gnutls) \
+		--with-session-tracking=$(usex systemd systemd $(usex consolekit consolekit no)) \
+		--with-suspend-resume=$(usex systemd systemd upower) \
+		$(use_enable introspection) \
+		$(use_enable ppp) \
+		--disable-wimax \
+		$(use_with dhclient) \
+		$(use_with dhcpcd) \
+		$(use_with modemmanager modem-manager-1) \
+		$(use_with resolvconf) \
+		$(use_enable test tests) \
+		$(use_enable vala) \
+		$(use_with wext) \
+		"$(systemd_with_unitdir)"
+}
+
+src_test() {
+	cp libnm-util/tests/certs/test_ca_cert.pem src/settings/plugins/ifnet/tests/ || die
+	Xemake check
+}
+
+src_install() {
+	default
+
+	readme.gentoo_create_doc
+
+	# Gentoo init script
+	newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
+
+	# /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
+	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
+
+	# Default conf.d file
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# 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
+
+	# 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"
+
+	# Remove useless .la files
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	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
+
+	# 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
+}