removed zebra ebuild folder. zebra gets replaced by quagga. move has already been added to profiles/updates/1Q-2005.

20 files changed, 0 insertions, 502 deletions

diff --git a/net-misc/zebra/files/conf.d/bgpd.confd b/net-misc/zebra/files/conf.d/bgpd.confd
deleted file mode 100644
index 42659c6789f7..000000000000
--- a/net-misc/zebra/files/conf.d/bgpd.confd
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zebra/files/conf.d/bgpd.confd,v 1.2 2004/07/15 00:16:56 agriffis Exp $
-
-
-#################################
-# Configuration options for bgpd
-#################################
-
-# Set configuration file name
-#BGPD_CONFIG_FILE="/etc/zebra/bgpd.conf"
-
-# Set bgp protocol's port number
-#BGPD_BGP_PORT=""
-
-# Set vty's bind address
-#BGPD_VTY_ADDR="0.0.0.0"
-
-# Set vty's port number
-#BGPD_VTY_PORT=""
-
-# When program terminates, retain added route by bgpd.
-#BGPD_RETAIN="yes"
-
-# Do not install route to kernel.
-#BGPD_NO_KERNEL="yes"
-
diff --git a/net-misc/zebra/files/conf.d/ospf6d.confd b/net-misc/zebra/files/conf.d/ospf6d.confd
deleted file mode 100644
index 4657587e04e9..000000000000
--- a/net-misc/zebra/files/conf.d/ospf6d.confd
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zebra/files/conf.d/ospf6d.confd,v 1.2 2004/07/15 00:16:56 agriffis Exp $
-
-
-#################################
-# Configuration options for ospf6d
-#################################
-
-# Set configuration file name
-#OSPF6D_CONFIG_FILE="/etc/zebra/ospf6d.conf"
-
-# Set vty's bind address
-#OSPF6D_VTY_ADDR="0.0.0.0"
-
-# Set vty's port number
-#OSPF6D_VTY_PORT=""
-
diff --git a/net-misc/zebra/files/conf.d/ospfd.confd b/net-misc/zebra/files/conf.d/ospfd.confd
deleted file mode 100644
index 7ad42d06e538..000000000000
--- a/net-misc/zebra/files/conf.d/ospfd.confd
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zebra/files/conf.d/ospfd.confd,v 1.2 2004/07/15 00:16:56 agriffis Exp $
-
-
-#################################
-# Configuration options for ospfd
-#################################
-
-# Set configuration file name
-#OSPFD_CONFIG_FILE="/etc/zebra/ospfd.conf"
-
-# Set vty's bind address
-#OSPFD_VTY_ADDR="0.0.0.0"
-
-# Set vty's port number
-#OSPFD_VTY_PORT=""
-
diff --git a/net-misc/zebra/files/conf.d/ripd.confd b/net-misc/zebra/files/conf.d/ripd.confd
deleted file mode 100644
index 6d8fc9634254..000000000000
--- a/net-misc/zebra/files/conf.d/ripd.confd
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zebra/files/conf.d/ripd.confd,v 1.2 2004/07/15 00:16:56 agriffis Exp $
-
-
-#################################
-# Configuration options for ripd
-#################################
-
-# Set configuration file name
-#RIPD_CONFIG_FILE="/etc/zebra/ripd.conf"
-
-# Set vty's bind address
-#RIPD_VTY_ADDR="0.0.0.0"
-
-# Set vty's port number
-#RIPD_VTY_PORT=""
-
-# When program terminates, retain added route by ripd.
-#RIPD_RETAIN="yes"
-
diff --git a/net-misc/zebra/files/conf.d/ripngd.confd b/net-misc/zebra/files/conf.d/ripngd.confd
deleted file mode 100644
index ccc9ad2e71e5..000000000000
--- a/net-misc/zebra/files/conf.d/ripngd.confd
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zebra/files/conf.d/ripngd.confd,v 1.2 2004/07/15 00:16:56 agriffis Exp $
-
-
-#################################
-# Configuration options for ripngd
-#################################
-
-# Set configuration file name
-#RIPNGD_CONFIG_FILE="/etc/zebra/ripngd.conf"
-
-# Set verbose log mode flag
-#RIPNGD_LOG_MODE="255"
-
-# Set vty's bind address
-#RIPNGD_VTY_ADDR="0.0.0.0"
-
-# Set vty's port number
-#RIPNGD_VTY_PORT=""
-
-# When program terminates, retain added route by ripngd.
-#RIPNGD_RETAIN="yes"
-
diff --git a/net-misc/zebra/files/conf.d/zebra.confd b/net-misc/zebra/files/conf.d/zebra.confd
deleted file mode 100644
index 641e54ce1fa9..000000000000
--- a/net-misc/zebra/files/conf.d/zebra.confd
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zebra/files/conf.d/zebra.confd,v 1.2 2004/07/15 00:16:56 agriffis Exp $
-
-
-#################################
-# Configuration options for zebra
-#################################
-
-# Set configuration file name
-#ZEBRA_CONFIG_FILE="/etc/zebra/zebra.conf"
-
-# Don't delete old routes which installed by zebra.
-#ZEBRA_KEEP_KERNEL="yes"
-
-# Set verbose log mode flag
-#ZEBRA_LOG_MODE="255"
-
-# Set vty's bind address
-#ZEBRA_VTY_ADDR="0.0.0.0"
-
-# Set vty's port number
-#ZEBRA_VTY_PORT=""
-
-# When program terminates, retain added route by zebra.
-#ZEBRA_RETAIN="yes"
-
diff --git a/net-misc/zebra/files/digest-zebra-0.93a b/net-misc/zebra/files/digest-zebra-0.93a
deleted file mode 100644
index e4f913100f35..000000000000
--- a/net-misc/zebra/files/digest-zebra-0.93a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a0c0d4f4702a724c3c95d1c61c115758 zebra-0.93a.tar.gz 1335141
diff --git a/net-misc/zebra/files/digest-zebra-0.93b b/net-misc/zebra/files/digest-zebra-0.93b
deleted file mode 100644
index e8004aae5a29..000000000000
--- a/net-misc/zebra/files/digest-zebra-0.93b
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9ca7dc5e0afb9b6470e4b1e21c271fe1 zebra-0.93b.tar.gz 1340359
diff --git a/net-misc/zebra/files/digest-zebra-0.93b-r1 b/net-misc/zebra/files/digest-zebra-0.93b-r1
deleted file mode 100644
index efb6e070d4b2..000000000000
--- a/net-misc/zebra/files/digest-zebra-0.93b-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 9ca7dc5e0afb9b6470e4b1e21c271fe1 zebra-0.93b.tar.gz 1340359
-MD5 f594257d34f92de76afb7cc5db12cd48 ospfapi-release_0_93b-2003-01-25.tar.gz 99139
diff --git a/net-misc/zebra/files/digest-zebra-0.93b-r2 b/net-misc/zebra/files/digest-zebra-0.93b-r2
deleted file mode 100644
index efb6e070d4b2..000000000000
--- a/net-misc/zebra/files/digest-zebra-0.93b-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 9ca7dc5e0afb9b6470e4b1e21c271fe1 zebra-0.93b.tar.gz 1340359
-MD5 f594257d34f92de76afb7cc5db12cd48 ospfapi-release_0_93b-2003-01-25.tar.gz 99139
diff --git a/net-misc/zebra/files/init.d/bgpd.initd b/net-misc/zebra/files/init.d/bgpd.initd
deleted file mode 100644
index bb5f6c340a98..000000000000
--- a/net-misc/zebra/files/init.d/bgpd.initd
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zebra/files/init.d/bgpd.initd,v 1.2 2004/07/15 00:16:56 agriffis Exp $
-
-
-opts="depend checkconfig stop start"
-
-depend() {
-	need net zebra
-}
-
-checkconfig() {
-	if [ ! -e /etc/zebra/zebra.conf ]; then
-		eerror "You need to create /etc/zebra/bgpd.conf first."
-		eerror "An example can be found in /etc/zebra/sample/bgpd.conf.sample"
-		return 1
-	fi
-}
-
-stop() {
-	ebegin "Stopping bgpd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/bgpd.pid
-	result=$?
-	eend $result
-}
-
-start() {
-	local myopts="--daemon"
-
-	[ -n "${BGPD_CONFIG_FILE}" ] && myopts="${myopts} --config_file ${BGPD_CONFIG_FILE}"
-	[ -n "${BGPD_BGP_PORT}" ] && [ "${BGPD_BGP_PORT}" -ge 0 ] && myopts="${myopts} --bgp_port ${BGPD_BGP_PORT}"
-	[ -n "${BGPD_VTY_ADDR}" ] && myopts="${myopts} --vty_addr ${BGPD_VTY_ADDR}"
-	[ -n "${BGPD_VTY_PORT}" ] && [ "${BGPD_VTY_PORT}" -ge 0 ] && myopts="${myopts} --vty_port ${BGPD_VTY_PORT}"
-	[ "x${BGPD_RETAIN}" == "xyes" ] && myopts="${myopts} --retain"
-	[ "x${BGPD_NO_KERNEL}" == "xyes" ] && myopts="${myopts} --keep_kernel"
-
-	ebegin "Starting bgpd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/bgpd -- ${myopts}
-	result=$?
-	eend $result
-}
diff --git a/net-misc/zebra/files/init.d/ospf6d.initd b/net-misc/zebra/files/init.d/ospf6d.initd
deleted file mode 100644
index 24b6c692982d..000000000000
--- a/net-misc/zebra/files/init.d/ospf6d.initd
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zebra/files/init.d/ospf6d.initd,v 1.2 2004/07/15 00:16:56 agriffis Exp $
-
-
-opts="depend checkconfig stop start"
-
-depend() {
-	need net zebra
-}
-
-checkconfig() {
-	if [ ! -e /etc/zebra/zebra.conf ]; then
-		eerror "You need to create /etc/zebra/ospf6d.conf first."
-		eerror "An example can be found in /etc/zebra/sample/ospf6d.conf.sample"
-		return 1
-	fi
-}
-
-stop() {
-	ebegin "Stopping ospf6d"
-	start-stop-daemon --stop --quiet --pidfile /var/run/ospf6d.pid
-	result=$?
-	eend $result
-}
-
-start() {
-	local myopts="--daemon"
-
-	[ -n "${OSPF6D_CONFIG_FILE}" ] && myopts="${myopts} --config_file ${OSPF6D_CONFIG_FILE}"
-	[ -n "${OSPF6D_VTY_ADDR}" ] && myopts="${myopts} --vty_addr ${OSPF6D_VTY_ADDR}"
-	[ -n "${OSPF6D_VTY_PORT}" ] && [ "${OSPF6D_VTY_PORT}" -ge 0 ] && myopts="${myopts} --vty_port ${OSPF6D_VTY_PORT}"
-
-	ebegin "Starting ospf6d"
-	start-stop-daemon --start --quiet --exec /usr/sbin/ospf6d -- ${myopts}
-	result=$?
-	eend $result
-}
diff --git a/net-misc/zebra/files/init.d/ospfd.initd b/net-misc/zebra/files/init.d/ospfd.initd
deleted file mode 100644
index 9e6f9798a0ed..000000000000
--- a/net-misc/zebra/files/init.d/ospfd.initd
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zebra/files/init.d/ospfd.initd,v 1.2 2004/07/15 00:16:56 agriffis Exp $
-
-
-opts="depend checkconfig stop start"
-
-depend() {
-	need net zebra
-}
-
-checkconfig() {
-	if [ ! -e /etc/zebra/zebra.conf ]; then
-		eerror "You need to create /etc/zebra/ospfd.conf first."
-		eerror "An example can be found in /etc/zebra/sample/ospfd.conf.sample"
-		return 1
-	fi
-}
-
-stop() {
-	ebegin "Stopping ospfd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/ospfd.pid
-	result=$?
-	eend $result
-}
-
-start() {
-	local myopts="--daemon"
-
-	[ -n "${OSPFD_CONFIG_FILE}" ] && myopts="${myopts} --config_file ${OSPFD_CONFIG_FILE}"
-	[ -n "${OSPFD_VTY_ADDR}" ] && myopts="${myopts} --vty_addr ${OSPFD_VTY_ADDR}"
-	[ -n "${OSPFD_VTY_PORT}" ] && [ "${OSPFD_VTY_PORT}" -ge 0 ] && myopts="${myopts} --vty_port ${OSPFD_VTY_PORT}"
-
-	ebegin "Starting ospfd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/ospfd -- ${myopts}
-	result=$?
-	eend $result
-}
diff --git a/net-misc/zebra/files/init.d/ripd.initd b/net-misc/zebra/files/init.d/ripd.initd
deleted file mode 100644
index d09d9b4029be..000000000000
--- a/net-misc/zebra/files/init.d/ripd.initd
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zebra/files/init.d/ripd.initd,v 1.2 2004/07/15 00:16:56 agriffis Exp $
-
-
-opts="depend checkconfig stop start"
-
-depend() {
-	need net zebra
-}
-
-checkconfig() {
-	if [ ! -e /etc/zebra/zebra.conf ]; then
-		eerror "You need to create /etc/zebra/ripd.conf first."
-		eerror "An example can be found in /etc/zebra/sample/ripd.conf.sample"
-		return 1
-	fi
-}
-
-stop() {
-	ebegin "Stopping ripd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/ripd.pid
-	result=$?
-	eend $result
-}
-
-start() {
-	local myopts="--daemon"
-
-	[ -n "${RIPD_CONFIG_FILE}" ] && myopts="${myopts} --config_file ${RIPD_CONFIG_FILE}"
-	[ -n "${RIPD_VTY_ADDR}" ] && myopts="${myopts} --vty_addr ${RIPD_VTY_ADDR}"
-	[ -n "${RIPD_VTY_PORT}" ] && [ "${RIPD_VTY_PORT}" -ge 0 ] && myopts="${myopts} --vty_port ${RIPD_VTY_PORT}"
-	[ "x${RIPD_RETAIN}" == "xyes" ] && myopts="${myopts} --retain"
-
-	ebegin "Starting ripd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/ripd -- ${myopts}
-	result=$?
-	eend $result
-}
diff --git a/net-misc/zebra/files/init.d/ripngd.initd b/net-misc/zebra/files/init.d/ripngd.initd
deleted file mode 100644
index b5303341127a..000000000000
--- a/net-misc/zebra/files/init.d/ripngd.initd
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zebra/files/init.d/ripngd.initd,v 1.2 2004/07/15 00:16:56 agriffis Exp $
-
-
-opts="depend checkconfig stop start"
-
-depend() {
-	need net zebra
-}
-
-checkconfig() {
-	if [ ! -e /etc/zebra/zebra.conf ]; then
-		eerror "You need to create /etc/zebra/ripngd.conf first."
-		eerror "An example can be found in /etc/zebra/sample/ripngd.conf.sample"
-		return 1
-	fi
-}
-
-stop() {
-	ebegin "Stopping ripngd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/ripngd.pid
-	result=$?
-	eend $result
-}
-
-start() {
-	local myopts="--daemon"
-
-	[ -n "${RIPNGD_CONFIG_FILE}" ] && myopts="${myopts} --config_file ${RIPNGD_CONFIG_FILE}"
-	[ -n "${RIPNGD_LOG_MODE}" ] && [ "${RIPNGD_LOG_MODE}" -ge 0 ] && myopts="${myopts} --log_mode ${RIPNGD_LOG_MODE}"
-	[ -n "${RIPNGD_VTY_ADDR}" ] && myopts="${myopts} --vty_addr ${RIPNGD_VTY_ADDR}"
-	[ -n "${RIPNGD_VTY_PORT}" ] && [ "${RIPNGD_VTY_PORT}" -ge 0 ] && myopts="${myopts} --vty_port ${RIPNGD_VTY_PORT}"
-	[ "x${RIPNGD_RETAIN}" == "xyes" ] && myopts="${myopts} --retain"
-
-	ebegin "Starting ripngd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/ripngd -- ${myopts}
-	result=$?
-	eend $result
-}
diff --git a/net-misc/zebra/files/init.d/zebra.initd b/net-misc/zebra/files/init.d/zebra.initd
deleted file mode 100644
index 770aa87e15b5..000000000000
--- a/net-misc/zebra/files/init.d/zebra.initd
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zebra/files/init.d/zebra.initd,v 1.2 2004/07/15 00:16:56 agriffis Exp $
-
-
-opts="depend checkconfig stop start"
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ ! -e /etc/zebra/zebra.conf ]; then
-		eerror "You need to create /etc/zebra/zebra.conf first."
-		eerror "An example can be found in /etc/zebra/sample/zebra.conf.sample"
-		return 1
-	fi
-}
-
-stop() {
-	ebegin "Stopping zebra"
-	start-stop-daemon --stop --quiet --pidfile /var/run/zebra.pid
-	result=$?
-	eend $result
-}
-
-start() {
-	local myopts="--daemon"
-
-	[ -n "${ZEBRA_CONFIG_FILE}" ] && myopts="${myopts} --config_file ${ZEBRA_CONFIG_FILE}"
-	[ "x${ZEBRA_KEEP_KERNEL}" == "xyes" ] && myopts="${myopts} --keep_kernel"
-	[ -n "${ZEBRA_LOG_MODE}" ] && [ "${ZEBRA_LOG_MODE}" -ge 0 ] && myopts="${myopts} --log_mode ${ZEBRA_LOG_MODE}"
-	[ -n "${ZEBRA_VTY_ADDR}" ] && myopts="${myopts} --vty_addr ${ZEBRA_VTY_ADDR}"
-	[ -n "${ZEBRA_VTY_PORT}" ] && [ "${ZEBRA_VTY_PORT}" -ge 0 ] && myopts="${myopts} --vty_port ${ZEBRA_VTY_PORT}"
-	[ "x${ZEBRA_RETAIN}" == "xyes" ] && myopts="${myopts} --retain"
-
-	ebegin "Starting zebra"
-	start-stop-daemon --start --quiet --exec /usr/sbin/zebra -- ${myopts}
-	result=$?
-	eend $result
-}
diff --git a/net-misc/zebra/files/zebra-0.93b/ospfd-assert-fix.patch b/net-misc/zebra/files/zebra-0.93b/ospfd-assert-fix.patch
deleted file mode 100644
index d8135062346a..000000000000
--- a/net-misc/zebra/files/zebra-0.93b/ospfd-assert-fix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- ospf_lsa.c.orig	Mon Sep 16 23:09:47 2002
-+++ ospf_lsa.c	Tue Sep 17 10:03:10 2002
-@@ -2535,6 +2535,7 @@
- 	if (IS_DEBUG_OSPF (lsa, LSA_FLOODING))
- 	  zlog_info("LSA[%s]: is MaxAge", dump_lsa_key (lsa));
- 
-+#ifdef BUGGY_OPAQUE_LSA_HANDLING
-         switch (lsa->data->type)
-           {
-           case OSPF_AS_EXTERNAL_LSA:
-@@ -2547,6 +2548,31 @@
- 	    ospf_spf_calculate_schedule ();
-             break;
-           }
-+#else /* BUGGY_OPAQUE_LSA_HANDLING */
-+        switch (lsa->data->type)
-+          {
-+#ifdef HAVE_OPAQUE_LSA
-+          case OSPF_OPAQUE_LINK_LSA:
-+          case OSPF_OPAQUE_AREA_LSA:
-+          case OSPF_OPAQUE_AS_LSA:
-+            /*
-+             * As a general rule, whenever network topology has changed
-+             * (due to an LSA removal in this case), routing recalculation
-+             * should be triggered. However, this is not true for opaque
-+             * LSAs. Even if an opaque LSA instance is going to be removed
-+             * from the routing domain, it does not mean a change in network
-+             * topology, and thus, routing recalculation is not needed here.
-+             */
-+            break;
-+#endif /* HAVE_OPAQUE_LSA */
-+          case OSPF_AS_EXTERNAL_LSA:
-+	    ospf_ase_incremental_update (lsa, ospf_top);
-+            break;
-+          default:
-+	    ospf_spf_calculate_schedule ();
-+            break;
-+          }
-+#endif /* BUGGY_OPAQUE_LSA_HANDLING */
- 
- 	ospf_lsa_maxage (lsa);
-       }
diff --git a/net-misc/zebra/files/zebra-0.93b/ospfd-nbr-fix.patch b/net-misc/zebra/files/zebra-0.93b/ospfd-nbr-fix.patch
deleted file mode 100644
index 374b6c9c4451..000000000000
--- a/net-misc/zebra/files/zebra-0.93b/ospfd-nbr-fix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- ospf_neighbor.c.orig	Thu Jul  4 07:06:41 2002
-+++ ospf_neighbor.c	Sun Sep 29 20:31:59 2002
-@@ -119,6 +119,9 @@
-   OSPF_NSM_TIMER_OFF (nbr->t_ls_req);
-   OSPF_NSM_TIMER_OFF (nbr->t_ls_upd);
- 
-+  /* Cancel all events. *//* Thread lookup cost would be negligible. */
-+  thread_cancel_event (master, nbr);
-+
-   XFREE (MTYPE_OSPF_NEIGHBOR, nbr);
- }
- 
---- ospf_nsm.c.orig	Thu Jul  4 07:06:41 2002
-+++ ospf_nsm.c	Mon Sep 30 09:32:40 2002
-@@ -770,9 +770,24 @@
-     nbr->crypt_seqnum = 0;
-   
-   /* Generete NeighborChange ISM event. */
-+#ifdef BUGGY_ISM_TRANSITION
-   if ((old_state < NSM_TwoWay && state >= NSM_TwoWay) ||
-       (old_state >= NSM_TwoWay && state < NSM_TwoWay))
-     OSPF_ISM_EVENT_EXECUTE (oi, ISM_NeighborChange);
-+#else /* BUGGY_ISM_TRANSITION */
-+  switch (oi->state) {
-+  case ISM_DROther:
-+  case ISM_Backup:
-+  case ISM_DR:
-+    if ((old_state < NSM_TwoWay && state >= NSM_TwoWay) ||
-+        (old_state >= NSM_TwoWay && state < NSM_TwoWay))
-+      OSPF_ISM_EVENT_EXECUTE (oi, ISM_NeighborChange);
-+    break;
-+  default:
-+    /* ISM_PointToPoint -> ISM_Down, ISM_Loopback -> ISM_Down, etc. */
-+    break;
-+  }
-+#endif /* BUGGY_ISM_TRANSITION */
- 
-   /* Performance hack. Send hello immideately when some neighbor enter
-      Init state.  This whay we decrease neighbor discovery time. Gleb.*/
diff --git a/net-misc/zebra/files/zebra.confd b/net-misc/zebra/files/zebra.confd
deleted file mode 100644
index e56dab801842..000000000000
--- a/net-misc/zebra/files/zebra.confd
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zebra/files/zebra.confd,v 1.3 2004/07/15 00:16:56 agriffis Exp $
-
-# Config file for /etc/init.d/zebra
-
-# -b, --batch        Runs in batch mode
-# -d, --daemon       Runs in daemon mode
-# -f, --config_file  Set configuration file name
-# -i, --pid_file     Set process identifier file name
-# -k, --keep_kernel  Don't delete old routes which installed by zebra.
-# -l, --log_mode     Set verbose log mode flag
-# -A, --vty_addr     Set vty's bind address
-# -P, --vty_port     Set vty's port number
-# -r, --retain       When program terminates, retain added route by zebra.
-
-OPTS="-d"
diff --git a/net-misc/zebra/files/zebra.initd b/net-misc/zebra/files/zebra.initd
deleted file mode 100644
index 809a01dd3373..000000000000
--- a/net-misc/zebra/files/zebra.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zebra/files/zebra.initd,v 1.3 2004/07/15 00:16:56 agriffis Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting zebra"
-	start-stop-daemon --start --quiet  --exec /usr/sbin/zebra -- ${OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping zebra"
-	start-stop-daemon --stop --quiet  --exec /usr/sbin/zebra
-	eend $?
-}