* [gentoo-commits] gentoo-x86 commit in net-misc/networkmanager: networkmanager-0.9.4.0-r7.ebuild ChangeLog networkmanager-0.9.4.0-r6.ebuild networkmanager-0.9.4.0-r2.ebuild networkmanager-0.9.2.0-r3.ebuild networkmanager-0.9.4.0-r4.ebuild
@ 2012-08-14 4:47 Alexandre Rostovtsev (tetromino)
0 siblings, 0 replies; only message in thread
From: Alexandre Rostovtsev (tetromino) @ 2012-08-14 4:47 UTC (permalink / raw
To: gentoo-commits
tetromino 12/08/14 04:47:00
Modified: ChangeLog networkmanager-0.9.4.0-r6.ebuild
Added: networkmanager-0.9.4.0-r7.ebuild
Removed: networkmanager-0.9.4.0-r2.ebuild
networkmanager-0.9.2.0-r3.ebuild
networkmanager-0.9.4.0-r4.ebuild
Log:
Add 0.9.4.0-r7 with systemd USE flag; systemd USE flag will be disabled in 0.9.4.0-r6 to allow stabilization. Drop some old ebuilds.
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Revision Changes Path
1.141 net-misc/networkmanager/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/ChangeLog?rev=1.141&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/ChangeLog?rev=1.141&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/ChangeLog?r1=1.140&r2=1.141
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- ChangeLog 10 Aug 2012 17:34:28 -0000 1.140
+++ ChangeLog 14 Aug 2012 04:47:00 -0000 1.141
@@ -1,6 +1,15 @@
# ChangeLog for net-misc/networkmanager
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.140 2012/08/10 17:34:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.141 2012/08/14 04:47:00 tetromino Exp $
+
+*networkmanager-0.9.4.0-r7 (14 Aug 2012)
+
+ 14 Aug 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+ -files/10-openrc-status, -networkmanager-0.9.2.0-r3.ebuild,
+ -networkmanager-0.9.4.0-r2.ebuild, -networkmanager-0.9.4.0-r4.ebuild,
+ +networkmanager-0.9.4.0-r7.ebuild:
+ Add 0.9.4.0-r7 with systemd USE flag; systemd USE flag will be disabled in
+ 0.9.4.0-r6 to allow stabilization. Drop some old ebuilds.
*networkmanager-0.9.4.0-r6 (10 Aug 2012)
1.2 net-misc/networkmanager/networkmanager-0.9.4.0-r6.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.4.0-r6.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.4.0-r6.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.4.0-r6.ebuild?r1=1.1&r2=1.2
Index: networkmanager-0.9.4.0-r6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.4.0-r6.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- networkmanager-0.9.4.0-r6.ebuild 10 Aug 2012 17:34:29 -0000 1.1
+++ networkmanager-0.9.4.0-r6.ebuild 14 Aug 2012 04:47:00 -0000 1.2
@@ -1,6 +1,6 @@
# 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.4.0-r6.ebuild,v 1.1 2012/08/10 17:34:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.4.0-r6.ebuild,v 1.2 2012/08/14 04:47:00 tetromino Exp $
EAPI="4"
GNOME_ORG_MODULE="NetworkManager"
@@ -12,7 +12,7 @@
LICENSE="GPL-2"
SLOT="0"
-IUSE="avahi bluetooth connection-sharing dhclient +dhcpcd doc gnutls +introspection kernel_linux +nss modemmanager +ppp resolvconf systemd +wext wimax"
+IUSE="avahi bluetooth connection-sharing dhclient +dhcpcd doc gnutls +introspection kernel_linux +nss modemmanager +ppp resolvconf +wext wimax" # systemd
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
REQUIRED_USE="
@@ -53,8 +53,9 @@
RDEPEND="${COMMON_DEPEND}
modemmanager? ( >=net-misc/modemmanager-0.4 )
- systemd? ( >=sys-apps/systemd-31 )
- !systemd? ( sys-auth/consolekit )"
+ sys-auth/consolekit"
+# systemd? ( >=sys-apps/systemd-31 )
+# !systemd? ( sys-auth/consolekit )
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
@@ -153,11 +154,11 @@
ECONF="${ECONF} $(use_with gnutls crypto=gnutls)"
fi
- if use systemd; then
- ECONF="${ECONF} --with-session-tracking=systemd"
- else
+# if use systemd; then
+# ECONF="${ECONF} --with-session-tracking=systemd"
+# else
ECONF="${ECONF} --with-session-tracking=ck"
- fi
+# fi
econf ${ECONF}
}
1.1 net-misc/networkmanager/networkmanager-0.9.4.0-r7.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.4.0-r7.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.4.0-r7.ebuild?rev=1.1&content-type=text/plain
Index: networkmanager-0.9.4.0-r7.ebuild
===================================================================
# 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.4.0-r7.ebuild,v 1.1 2012/08/14 04:47:00 tetromino Exp $
EAPI="4"
GNOME_ORG_MODULE="NetworkManager"
inherit autotools eutils gnome.org linux-info systemd user toolchain-funcs
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 dhclient +dhcpcd doc gnutls +introspection kernel_linux +nss modemmanager +ppp resolvconf systemd +wext wimax"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~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
# 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.75
|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] )
>=dev-libs/glib-2.26
>=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 )
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 )
!systemd? ( 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 )"
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"
# Fix quote handling for global data (Bug #410821)
epatch "${FILESDIR}/${PN}-0.9.4.0-fix-quote-handling.patch"
# Fix uninitialized variables in libnm-glib
epatch "${FILESDIR}/${P}-libnm-glib-ensure_inited.patch"
epatch "${FILESDIR}/${P}-libnm-glib-init-gerror.patch"
# Fix building against linux-headers-3.4, #417055
epatch "${FILESDIR}/${P}-ip_ppp.h.patch"
# Fix ipv6 default route bug, #417529
epatch "${FILESDIR}/${P}-ipv6-route.patch"
# Bug #335147, https://bugzilla.gnome.org/show_bug.cgi?id=679428
epatch "${FILESDIR}/${P}-dhclient-ipv6.patch"
# Bug #426844, wext vs. nl80211 API issues
epatch "${FILESDIR}/${P}-nl80211-encryption-caps.patch"
epatch "${FILESDIR}/${P}-wifi-kernel-api.patch"
epatch_user
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 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_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"
else
ECONF="${ECONF} --with-session-tracking=ck"
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
newexe "${FILESDIR}/10-openrc-status-r2" 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" 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"
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
# Default conf.d file
newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
# 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
# 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
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-08-14 4:47 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-14 4:47 [gentoo-commits] gentoo-x86 commit in net-misc/networkmanager: networkmanager-0.9.4.0-r7.ebuild ChangeLog networkmanager-0.9.4.0-r6.ebuild networkmanager-0.9.4.0-r2.ebuild networkmanager-0.9.2.0-r3.ebuild networkmanager-0.9.4.0-r4.ebuild Alexandre Rostovtsev (tetromino)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox