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

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

8 files changed, 166 insertions, 14 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/Manifest b/net-misc/dhcpv6/Manifest
index fcf84ac8c61f..a878520cec0d 100644
--- a/net-misc/dhcpv6/Manifest
+++ b/net-misc/dhcpv6/Manifest
@@ -1,12 +1,14 @@
 AUX dhcp6x.confd.in 65 RMD160 3e0f77673bc50f0c741589fae3c077201c8f418d SHA1 db5fbabfc03efe4855615a058c2c9c8ebca5fd65 SHA256 bbb595c7e917b080ab87883eea55da49dc66a58d62261a3ae3956dcdaca5acfc
 AUX dhcp6x.initd.in 491 RMD160 f49f496ca5dc79132667ee3e76a4faf414d49db3 SHA1 2285e7636415b12bba5a217f4d17d0f41bb74c3e SHA256 96bd3e6d6343d7c05edd9e4c720d267a49ddebf1dd622861ff46c3c8517fd7f5
+AUX fix-gnusource-collisions.patch 3454 RMD160 72ebe09765b26c2974f594457192614ae74ec652 SHA1 f98fc86f5e98b09d003bcb060707a6fdb7593058 SHA256 453763d246a928ae4133682c61894c499697bdbbbd1fa0da5f4c773b2b04b9b8
 DIST dhcpv6-1.0.14.tar.gz 701971 RMD160 cc25584b3d747f038275ab6133b50ad140ce1069 SHA1 6071be94ace3ef3662813fade6edf23cd5c42795 SHA256 37bad8c8a6febc29478b4fcbf514c37c69173b54a27b2afe1e07432acbca04fa
 DIST dhcpv6-1.0.19.tar.gz 689850 RMD160 d97ab16f7f481b6cbaebd8a69c364855252d0c44 SHA1 1f29f3610cb8a32a2d2cca884d2fde8354e25182 SHA256 2168ad535ba258c8535f667bfd9a4c5ddc69b9a4904f09f4042ba63eb55323fb
 DIST dhcpv6-1.0.20.tar.gz 683144 RMD160 8e31a2d7ad427ffa70848a253137c960cd6fe521 SHA1 786df492184a1055173034688543c92e87082443 SHA256 76ad6865f1ce3b1ed5d0989d2efc77a2dead3ba950e399c411d892ef1f3c210d
 DIST dhcpv6-1.0.22.tar.gz 701870 RMD160 b24283167ab6f9f8c922692a84970ca0c3f0ba1b SHA1 e324236a322c403ba2f55279c61da6947fa995f7 SHA256 6da4181c22628778d95f88cf1d1860c586f6fe4188c5506e8f4c93976e18e002
-EBUILD dhcpv6-1.0.14.ebuild 939 RMD160 24ff18495349889bd7ea202251243a46f72a2959 SHA1 4db939a441f00ac2cbe31a03c4cbf4402f646bd8 SHA256 30eefe7d70d6a9ee12cb0bbc0783acdf68e7527d04dd934d86e41a34c2f6f5eb
+EBUILD dhcpv6-1.0.14.ebuild 964 RMD160 90f626c2e407f8f237c773c28ef35ca5173300dc SHA1 1e6114353363d8449195a8a6f1bd8dcc807c0feb SHA256 128253cc8f15d7ac836b8d588b494383f2b41b4c2857818be8e5793d7b68417e
 EBUILD dhcpv6-1.0.19.ebuild 1027 RMD160 a4bce37fca19c2c0df197737723b1ac01220526a SHA1 b80a5c159732bea41508d4867fae1807a35c9261 SHA256 0a5185a8b4e6da0f17e4b00a5e536fce8886012ca7e58dbc81b830460e4de8ec
-EBUILD dhcpv6-1.0.20.ebuild 970 RMD160 8be3f04cb3f1a24250bddc232e44e794d3718853 SHA1 7cca6a603fff02bf71815f6eab4f5a685469504e SHA256 458353acb8c3008364360dfa28a74956c0e2f6fc85bbb5f97f05e631df9bf993
-EBUILD dhcpv6-1.0.22.ebuild 965 RMD160 15969cf3c5e42bb40c0ac75088253c1f8e76afb9 SHA1 64e11c8338e09b639a94791285a769216c826b56 SHA256 bbc19ef2062a8f1d034a52ba86e36b4cc24353bd77511b5d57ebfa7bd940c20e
-MISC ChangeLog 3542 RMD160 0aeb700cec04d727d47959d7b33c92609fb6b385 SHA1 67cad213c87d5c7181f28c45288fc98cb0070179 SHA256 1857a9716c6eb1ee6d0dcecc94f61b15956e09d5d08b408a329c4e49e6630faf
-MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
+EBUILD dhcpv6-1.0.20.ebuild 993 RMD160 457692d55b5e3cba5daaef5fcbf066715e7b6a1c SHA1 c1b784e577ae670e1249b66877830eb549bd8d49 SHA256 4dc920f579a9558e0f3f5d9fe0ec281db1e224f3ca90fceeb9c8ac23bf1f500f
+EBUILD dhcpv6-1.0.22-r1.ebuild 1049 RMD160 b23c0582cc9efc2ff509d3e616a411a3594f0727 SHA1 df54d4731cf645197313d820a8bb74b63456d8ba SHA256 dd08dc918cab9b8207777b5c8f2cf70ca0cf2d52f8705e57effd2d936b028858
+EBUILD dhcpv6-1.0.22.ebuild 993 RMD160 b85ac0d8581aa2ef219f18d05a4c83f7f0c0cdf7 SHA1 14a3eed0fd18dda25ce77177a2aa5be5a130c1b4 SHA256 84351051cd5c66832e82ff4298b98d9f866d4bc7bb1dc3fd00e87cc173bf350f
+MISC ChangeLog 3846 RMD160 deac5b788214819f8a6d998282555b1b5c34d8d4 SHA1 fb32e7d4b4ba7842894a1088c7f9a963dff5542c SHA256 15d92e3b2eda1f85b9af5e996f6bc8c983ebeefee52eee64c6aa905156475c03
+MISC metadata.xml 264 RMD160 b449792a23b6e0a12220f9a084800f051339f887 SHA1 592aee12f068a8c1e8803efc81266c22d68d078c SHA256 e01499505dbb3db0c20b812b118327df7e1d05c4544c6fd271d024d51a138fe9
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>