summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-11-11 20:42:24 +0000
committerMike Frysinger <vapier@gentoo.org>2012-11-11 20:42:24 +0000
commitc3de57bc33475fb6680f89eef6a759a6136c5b28 (patch)
treeb9feb5aacba186d99d29a3bcf8db17d98c33921f /net-misc
parentDepend on dev-python/pyopenssl. Bug #442546 (diff)
downloadgentoo-2-c3de57bc33475fb6680f89eef6a759a6136c5b28.tar.gz
gentoo-2-c3de57bc33475fb6680f89eef6a759a6136c5b28.tar.bz2
gentoo-2-c3de57bc33475fb6680f89eef6a759a6136c5b28.zip
Drop NetworkManager dbus patch as NM handles this itself now #441968 by Pavel Šimerda.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/dhcp/ChangeLog6
-rw-r--r--net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild7
2 files changed, 6 insertions, 7 deletions
diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index ee7035fbc27d..a53a4104e3a0 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/dhcp
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.226 2012/10/13 17:00:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.227 2012/11/11 20:42:24 vapier Exp $
+
+ 11 Nov 2012; Mike Frysinger <vapier@gentoo.org> dhcp-4.2.4_p2-r1.ebuild:
+ Drop NetworkManager dbus patch as NM handles this itself now #441968 by Pavel
+ Šimerda.
13 Oct 2012; Raúl Porcel <armin76@gentoo.org> dhcp-4.2.4_p2.ebuild:
alpha/s390/sh/sparc stable wrt #434880
diff --git a/net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild b/net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild
index a72042747e08..8c861f8a052b 100644
--- a/net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild
@@ -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/dhcp/dhcp-4.2.4_p2-r1.ebuild,v 1.2 2012/10/12 19:13:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild,v 1.3 2012/11/11 20:42:24 vapier Exp $
EAPI="4"
@@ -58,11 +58,6 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-4.2.4-quieter-ping.patch #296921
epatch "${FILESDIR}"/${PN}-4.2.4-always-accept-4.patch #437108
- # NetworkManager support patches
- # If they fail to apply to future versions they will be dropped
- # Add dbus support to dhclient
- epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-dbus.patch
-
# Brand the version with Gentoo
sed -i \
-e "/VERSION=/s:'$: Gentoo-${PR}':" \