Fixes bug 233326. Fixes RDEPEND issue. Package taken over.

(Portage version: 2.2_rc28/cvs/Linux x86_64)

7 files changed, 159 insertions, 9 deletions

diff --git a/net-misc/dhcpv6/ChangeLog b/net-misc/dhcpv6/ChangeLog
index 7eb18f1f9938..141c798f8b36 100644
--- a/net-misc/dhcpv6/ChangeLog
+++ b/net-misc/dhcpv6/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/dhcpv6
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/ChangeLog,v 1.22 2008/12/02 00:48:12 jer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/ChangeLog,v 1.23 2009/04/04 19:19:15 deathwing00 Exp $
+
+*dhcpv6-1.0.22-r1 (04 Apr 2009)
+
+  04 Apr 2009; Ioannis Aslanidis <iaslanidis@gentoo.org>
+  +files/fix-gnusource-collisions.patch, metadata.xml, dhcpv6-1.0.14.ebuild,
+  dhcpv6-1.0.20.ebuild, dhcpv6-1.0.22.ebuild, +dhcpv6-1.0.22-r1.ebuild:
+  Fixed RDEPEND. Fixes bug #233326. Package taken over.
 
 *dhcpv6-1.0.22 (02 Dec 2008)
 
diff --git a/net-misc/dhcpv6/dhcpv6-1.0.14.ebuild b/net-misc/dhcpv6/dhcpv6-1.0.14.ebuild
index 336edc9f2602..528288aab041 100644
--- a/net-misc/dhcpv6/dhcpv6-1.0.14.ebuild
+++ b/net-misc/dhcpv6/dhcpv6-1.0.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/dhcpv6-1.0.14.ebuild,v 1.1 2008/03/29 19:43:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/dhcpv6-1.0.14.ebuild,v 1.2 2009/04/04 19:19:15 deathwing00 Exp $
 
 inherit flag-o-matic
 
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 IUSE="static"
 
 DEPEND=""
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	use static && append-ldflags -static
diff --git a/net-misc/dhcpv6/dhcpv6-1.0.20.ebuild b/net-misc/dhcpv6/dhcpv6-1.0.20.ebuild
index 89aaf00c73c5..cd13bd59d0a1 100644
--- a/net-misc/dhcpv6/dhcpv6-1.0.20.ebuild
+++ b/net-misc/dhcpv6/dhcpv6-1.0.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/dhcpv6-1.0.20.ebuild,v 1.1 2008/08/01 17:16:06 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/dhcpv6-1.0.20.ebuild,v 1.2 2009/04/04 19:19:15 deathwing00 Exp $
 
 inherit flag-o-matic
 
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 IUSE="static"
 
 DEPEND=">=dev-libs/libnl-1.1"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	use static && append-ldflags -static
diff --git a/net-misc/dhcpv6/dhcpv6-1.0.22-r1.ebuild b/net-misc/dhcpv6/dhcpv6-1.0.22-r1.ebuild
new file mode 100644
index 000000000000..e65593207aec
--- /dev/null
+++ b/net-misc/dhcpv6/dhcpv6-1.0.22-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/dhcpv6-1.0.22-r1.ebuild,v 1.1 2009/04/04 19:19:15 deathwing00 Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="Server and client for DHCPv6"
+HOMEPAGE="https://fedorahosted.org/dhcpv6/"
+SRC_URI="https://fedorahosted.org/releases/d/h/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="static"
+
+DEPEND=">=dev-libs/libnl-1.1"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	use static && append-ldflags -static
+	econf || die
+	epatch "${FILESDIR}/fix-gnusource-collisions.patch"
+	emake || die
+}
+
+mkd() {
+	local x=$1 X=$2 i=$3
+	sed \
+		-e "s:6x:6${x}:g" \
+		-e "s:6X:6${X}:g" \
+		"${FILESDIR}"/dhcp6x.${i}d.in > dhcp6${x}.${i}d
+	new${i}d dhcp6${x}.${i}d dhcp6${x}
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog README TODO RFC*
+	dodir /var/lib/dhcpv6
+
+	rm -rf "${D}"/etc/{rc.d,sysconfig}
+	mkd s S init
+	mkd s S conf
+	mkd r R init
+	mkd r R conf
+}
diff --git a/net-misc/dhcpv6/dhcpv6-1.0.22.ebuild b/net-misc/dhcpv6/dhcpv6-1.0.22.ebuild
index 76a378a07567..ee3b311fae59 100644
--- a/net-misc/dhcpv6/dhcpv6-1.0.22.ebuild
+++ b/net-misc/dhcpv6/dhcpv6-1.0.22.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/dhcpv6-1.0.22.ebuild,v 1.1 2008/12/02 00:48:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/dhcpv6-1.0.22.ebuild,v 1.2 2009/04/04 19:19:14 deathwing00 Exp $
 
 inherit flag-o-matic
 
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 IUSE="static"
 
 DEPEND=">=dev-libs/libnl-1.1"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	use static && append-ldflags -static
diff --git a/net-misc/dhcpv6/files/fix-gnusource-collisions.patch b/net-misc/dhcpv6/files/fix-gnusource-collisions.patch
new file mode 100644
index 000000000000..92c2ec65c852
--- /dev/null
+++ b/net-misc/dhcpv6/files/fix-gnusource-collisions.patch
@@ -0,0 +1,94 @@
+--- dhcpv6-1.0.22.orig/src/dhcp6c.c	2008-12-02 08:40:48.148706045 +0100
++++ dhcpv6-1.0.22/src/dhcp6c.c	2008-12-02 08:43:49.708699325 +0100
+@@ -74,6 +74,10 @@
+ # include <netinet6/in6_var.h>
+ #endif
+ 
++#ifdef HAVE_LINUX_IPV6_H
++# include <linux/ipv6.h>
++#endif
++
+ #include <linux/netlink.h>
+ #include <netlink/socket.h>
+ #include <netlink/route/rtnl.h>
+--- dhcpv6-1.0.22.orig/src/dhcp6s.c	2008-12-02 08:40:48.158710880 +0100
++++ dhcpv6-1.0.22/src/dhcp6s.c	2008-12-02 08:45:42.458702955 +0100
+@@ -62,6 +62,10 @@
+ # include <linux/sockios.h>
+ #endif
+ 
++#ifdef HAVE_LINUX_IPV6_H
++# include <linux/ipv6.h>
++#endif
++
+ #include "dhcp6.h"
+ #include "cfg.h"
+ #include "common.h"
+--- dhcpv6-1.0.22.orig/src/Makefile.am	2008-12-02 08:40:48.158710880 +0100
++++ dhcpv6-1.0.22/src/Makefile.am	2008-12-02 08:48:15.518699531 +0100
+@@ -25,21 +25,21 @@
+ 
+ lib_LTLIBRARIES = libdhcp6client.la
+ 
+-dhcp6s_CFLAGS  = -fPIE -D_GNU_SOURCE
++dhcp6s_CFLAGS  = -fPIE 
+ dhcp6s_LDFLAGS = $(BINLDFLAGS)
+ dhcp6s_SOURCES = dhcp6s.c server6_conf.c server6_addr.c server6_parse.y \
+                  server6_token.l $(COMMONSRCS)
+ 
+-dhcp6r_CFLAGS  = -fPIE -D_GNU_SOURCE
++dhcp6r_CFLAGS  = -fPIE 
+ dhcp6r_LDFLAGS = $(BINLDFLAGS)
+ dhcp6r_SOURCES = dhcp6r.c relay6_database.c relay6_parser.c relay6_socket.c
+ 
+-dhcp6c_CFLAGS  = -fPIE -D_GNU_SOURCE $(LIBNL_CFLAGS)
++dhcp6c_CFLAGS  = -fPIE $(LIBNL_CFLAGS)
+ dhcp6c_LDFLAGS = $(BINLDFLAGS) $(LIBNL_LIBS)
+ dhcp6c_SOURCES = dhcp6c.c cfg.c client6_addr.c client6_parse.y \
+                  client6_token.l dad_parse.c resolv_token.l $(COMMONSRCS)
+ 
+-libdhcp6client_la_CFLAGS = -DLIBDHCP -D_GNU_SOURCE -fPIC $(LIBNL_CFLAGS)
++libdhcp6client_la_CFLAGS = -DLIBDHCP -fPIC $(LIBNL_CFLAGS)
+ libdhcp6client_la_LDFLAGS = -version-info \
+                                 $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+                             -release $(LT_RELEASE) \
+--- dhcpv6-1.0.22.orig/src/Makefile.in	2008-12-02 08:40:48.148706045 +0100
++++ dhcpv6-1.0.22/src/Makefile.in	2008-12-02 08:47:47.308698921 +0100
+@@ -278,20 +278,20 @@
+ 
+ dhcp6clientinclude_HEADERS = client6_parse.h
+ lib_LTLIBRARIES = libdhcp6client.la
+-dhcp6s_CFLAGS = -fPIE -D_GNU_SOURCE
++dhcp6s_CFLAGS = -fPIE 
+ dhcp6s_LDFLAGS = $(BINLDFLAGS)
+ dhcp6s_SOURCES = dhcp6s.c server6_conf.c server6_addr.c server6_parse.y \
+                  server6_token.l $(COMMONSRCS)
+ 
+-dhcp6r_CFLAGS = -fPIE -D_GNU_SOURCE
++dhcp6r_CFLAGS = -fPIE
+ dhcp6r_LDFLAGS = $(BINLDFLAGS)
+ dhcp6r_SOURCES = dhcp6r.c relay6_database.c relay6_parser.c relay6_socket.c
+-dhcp6c_CFLAGS = -fPIE -D_GNU_SOURCE $(LIBNL_CFLAGS)
++dhcp6c_CFLAGS = -fPIE $(LIBNL_CFLAGS)
+ dhcp6c_LDFLAGS = $(BINLDFLAGS) $(LIBNL_LIBS)
+ dhcp6c_SOURCES = dhcp6c.c cfg.c client6_addr.c client6_parse.y \
+                  client6_token.l dad_parse.c resolv_token.l $(COMMONSRCS)
+ 
+-libdhcp6client_la_CFLAGS = -DLIBDHCP -D_GNU_SOURCE -fPIC $(LIBNL_CFLAGS)
++libdhcp6client_la_CFLAGS = -DLIBDHCP -fPIC $(LIBNL_CFLAGS)
+ libdhcp6client_la_LDFLAGS = -version-info \
+                                 $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+                             -release $(LT_RELEASE) \
+--- dhcpv6-1.0.22.orig/src/relay6_socket.c	2008-12-02 08:40:48.158710880 +0100
++++ dhcpv6-1.0.22/src/relay6_socket.c	2008-12-02 08:47:00.648708216 +0100
+@@ -42,6 +42,10 @@
+ #include "relay6_parser.h"
+ #include "relay6_database.h"
+ 
++#ifdef HAVE_LINUX_IPV6_H
++# include <linux/ipv6.h>
++#endif
++
+ #ifndef IPV6_2292PKTINFO
+ #define IPV6_2292PKTINFO IPV6_PKTINFO
+ #endif
diff --git a/net-misc/dhcpv6/metadata.xml b/net-misc/dhcpv6/metadata.xml
index 9f3fdee2246b..2d28460ca7f3 100644
--- a/net-misc/dhcpv6/metadata.xml
+++ b/net-misc/dhcpv6/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>deathwing00@gentoo.org</email>
+	 	<name>Ioannis Aslanidis</name>
 	</maintainer>
 </pkgmetadata>