summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Alexander <wired@gentoo.org>2010-09-02 16:28:40 +0000
committerAlex Alexander <wired@gentoo.org>2010-09-02 16:28:40 +0000
commit259867fa7bee4cc3b957778e56b4f6534d2cef4d (patch)
tree1f426c121f14f77f046ff91a59f77fc94959498c
parentInitial import to the main tree (diff)
downloadgentoo-2-259867fa7bee4cc3b957778e56b4f6534d2cef4d.tar.gz
gentoo-2-259867fa7bee4cc3b957778e56b4f6534d2cef4d.tar.bz2
gentoo-2-259867fa7bee4cc3b957778e56b4f6534d2cef4d.zip
fixed bug #303525 by applying collision patch when <=sys-kernel/linux-headers-2.6.34
(Portage version: 2.2_rc73/cvs/Linux x86_64)
-rw-r--r--net-misc/dhcpv6/ChangeLog6
-rw-r--r--net-misc/dhcpv6/dhcpv6-1.2.0-r1.ebuild7
2 files changed, 11 insertions, 2 deletions
diff --git a/net-misc/dhcpv6/ChangeLog b/net-misc/dhcpv6/ChangeLog
index b1c2c0b57f79..60e490e9ef55 100644
--- a/net-misc/dhcpv6/ChangeLog
+++ b/net-misc/dhcpv6/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/dhcpv6
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/ChangeLog,v 1.28 2010/08/29 10:12:42 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/ChangeLog,v 1.29 2010/09/02 16:28:40 wired Exp $
+
+ 02 Sep 2010; Alex Alexander <wired@gentoo.org> dhcpv6-1.2.0-r1.ebuild:
+ fixed bug #303525 by applying collision patch when
+ <=sys-kernel/linux-headers-2.6.34
29 Aug 2010; Alex Alexander <wired@gentoo.org> metadata.xml:
new maintainers: wired and hwoarang
diff --git a/net-misc/dhcpv6/dhcpv6-1.2.0-r1.ebuild b/net-misc/dhcpv6/dhcpv6-1.2.0-r1.ebuild
index e19d8b69bddf..8845f88597c5 100644
--- a/net-misc/dhcpv6/dhcpv6-1.2.0-r1.ebuild
+++ b/net-misc/dhcpv6/dhcpv6-1.2.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/dhcpv6-1.2.0-r1.ebuild,v 1.1 2010/08/29 10:06:42 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/dhcpv6-1.2.0-r1.ebuild,v 1.2 2010/09/02 16:28:40 wired Exp $
EAPI=3
@@ -18,6 +18,11 @@ IUSE="static"
DEPEND=">=dev-libs/libnl-1.1"
RDEPEND="${DEPEND}"
+src_prepare() {
+ has_version "<sys-kernel/linux-headers-2.6.35" &&
+ epatch "${FILESDIR}/fix-gnusource-collisions-${PV}.patch"
+}
+
src_configure() {
use static && append-ldflags -static
econf "--localstatedir=/var" || die