Fixed bison problem #45121. Added hppa to KEYWORDS.

5 files changed, 27 insertions, 9 deletions

diff --git a/net-misc/dhcpv6/ChangeLog b/net-misc/dhcpv6/ChangeLog
index 301ec8413b81..8292acdbe39f 100644
--- a/net-misc/dhcpv6/ChangeLog
+++ b/net-misc/dhcpv6/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/dhcpv6
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/ChangeLog,v 1.11 2004/04/27 21:31:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/ChangeLog,v 1.12 2004/06/12 00:46:53 gmsoft Exp $
+
+  12 Jun 2004; Guy Martin <gmsoft@gentoo.org> dhcpv6-0.8.ebuild,
+  dhcpv6-0.85-r1.ebuild, files/dhcpv6-bison-fix.patch:
+  Fixed bison problem #45121. Added hppa to KEYWORDS.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> dhcpv6-0.8.ebuild,
   dhcpv6-0.85-r1.ebuild:
diff --git a/net-misc/dhcpv6/Manifest b/net-misc/dhcpv6/Manifest
index b59a9246766b..2ff875594d08 100644
--- a/net-misc/dhcpv6/Manifest
+++ b/net-misc/dhcpv6/Manifest
@@ -1,8 +1,9 @@
-MD5 bf33c71b412af2cf7a86f6c92358cb1b dhcpv6-0.8.ebuild 1051
-MD5 289ea3d39f281d36db8c2d572ff48584 dhcpv6-0.85-r1.ebuild 1161
-MD5 71d704d76647c2244e3bd3b29c38a5cc ChangeLog 1918
+MD5 ed29e630a45b531cd32b77fd7ebd33e4 dhcpv6-0.8.ebuild 1090
+MD5 7344f42303b1119ef9194c9a779a4a72 dhcpv6-0.85-r1.ebuild 1205
+MD5 cc13e234cb40c764ccc4c33fac856971 ChangeLog 2090
+MD5 15aaa387af559c468e7c5d3e9466e479 files/dhcp6s.rc 742
 MD5 6801b43613971e5a4afed325ed34368e files/digest-dhcpv6-0.8 58
-MD5 27accab0c7790138a2ace2568dfd8c0e files/dhcp6s.rc 743
-MD5 3ccbf593dfca962e8b6490e2f792b429 files/negative-iaid-patch-0.8 17822
 MD5 b18f95260c8f0563f943cffd467a5686 files/digest-dhcpv6-0.85-r1 59
+MD5 3ccbf593dfca962e8b6490e2f792b429 files/negative-iaid-patch-0.8 17822
 MD5 60d0451a46700b83ae1e76eb82ff82c3 files/patch-iaid-dhcp6-0.85 2181
+MD5 8c4fd5a338b44af32ac08a804c6ae1d3 files/dhcpv6-bison-fix.patch 358
diff --git a/net-misc/dhcpv6/dhcpv6-0.8.ebuild b/net-misc/dhcpv6/dhcpv6-0.8.ebuild
index fd5d1d2f0c8c..cb7ea06886e2 100644
--- a/net-misc/dhcpv6/dhcpv6-0.8.ebuild
+++ b/net-misc/dhcpv6/dhcpv6-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/dhcpv6-0.8.ebuild,v 1.8 2004/04/27 21:31:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/dhcpv6-0.8.ebuild,v 1.9 2004/06/12 00:46:53 gmsoft Exp $
 
 inherit eutils
 
@@ -21,6 +21,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/negative-iaid-patch-0.8
+	epatch ${FILESDIR}/${PN}-bison-fix.patch
 }
 
 src_install() {
diff --git a/net-misc/dhcpv6/dhcpv6-0.85-r1.ebuild b/net-misc/dhcpv6/dhcpv6-0.85-r1.ebuild
index 458f7bbf4527..6f07f50ba6b7 100644
--- a/net-misc/dhcpv6/dhcpv6-0.85-r1.ebuild
+++ b/net-misc/dhcpv6/dhcpv6-0.85-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/dhcpv6-0.85-r1.ebuild,v 1.5 2004/04/27 21:31:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/dhcpv6-0.85-r1.ebuild,v 1.6 2004/06/12 00:46:53 gmsoft Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dhcpv6/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 hppa"
 IUSE="static"
 
 DEPEND=""
@@ -22,6 +22,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/patch-iaid-dhcp6-${PV}
+	epatch ${FILESDIR}/${PN}-bison-fix.patch
 }
 
 src_compile() {
diff --git a/net-misc/dhcpv6/files/dhcpv6-bison-fix.patch b/net-misc/dhcpv6/files/dhcpv6-bison-fix.patch
new file mode 100644
index 000000000000..77b157606bcf
--- /dev/null
+++ b/net-misc/dhcpv6/files/dhcpv6-bison-fix.patch
@@ -0,0 +1,11 @@
+diff -uNr dhcp6-0.85.orig/server6_parse.y dhcp6-0.85/server6_parse.y
+--- dhcp6-0.85.orig/server6_parse.y	2004-06-12 00:29:01.384999104 +0000
++++ dhcp6-0.85/server6_parse.y	2004-06-12 00:29:47.882930344 +0000
+@@ -83,7 +83,6 @@
+ %token	<bool>	BOOLEAN
+ %token	<addr>	IPV6ADDR
+ %token 	<str>	INFINITY
+-%token	<str>	OPTION
+ 
+ %token	<str>	HOST
+ %token	<str>	POOL