Version bump, implements RFC 5004 (prefer older external routes) as well as several other minor features. Some minor bugfixes as well. Removed older ebuilds.

(Portage version: 2.1.7.6/cvs/Linux x86_64)

17 files changed, 24 insertions, 463 deletions

diff --git a/net-misc/bird/ChangeLog b/net-misc/bird/ChangeLog
index 827311698bca..0415b1affa5f 100644
--- a/net-misc/bird/ChangeLog
+++ b/net-misc/bird/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for net-misc/bird
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/ChangeLog,v 1.8 2009/11/02 15:58:45 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/ChangeLog,v 1.9 2009/11/23 14:35:04 chainsaw Exp $
+
+*bird-1.1.6 (23 Nov 2009)
+
+  23 Nov 2009; <chainsaw@gentoo.org> -files/1.1.1-nostrip.patch,
+  -files/initd-v6-bird-1.1.1, -bird-1.1.1.ebuild,
+  -files/initd-v4-bird-1.1.2, -files/1.1.2-nostrip.patch,
+  -files/initd-v6-bird-1.1.2, -bird-1.1.2.ebuild,
+  -files/initd-v4-bird-1.1.3, -files/1.1.3-nostrip.patch,
+  -files/initd-v6-bird-1.1.3, -bird-1.1.3.ebuild,
+  -files/initd-v4-bird-1.1.4, -files/1.1.4-nostrip.patch,
+  -files/initd-v6-bird-1.1.4, -bird-1.1.4.ebuild,
+  +files/initd-v4-bird-1.1.6, +files/1.1.6-nostrip.patch,
+  -files/initd-v4-bird-1.1.1, +files/initd-v6-bird-1.1.6,
+  +bird-1.1.6.ebuild:
+  Version bump, implements RFC 5004 (prefer older external routes) as well
+  as several other minor features. Some minor bugfixes as well. Removed
+  older ebuilds.
 
 *bird-1.1.5 (02 Nov 2009)
 
diff --git a/net-misc/bird/bird-1.1.1.ebuild b/net-misc/bird/bird-1.1.1.ebuild
deleted file mode 100644
index f52d3786b70b..000000000000
--- a/net-misc/bird/bird-1.1.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/bird-1.1.1.ebuild,v 1.2 2009/08/21 05:39:29 mr_bones_ Exp $
-
-inherit eutils
-
-DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6"
-HOMEPAGE="http://bird.network.cz"
-SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug ipv6"
-
-RDEPEND="sys-libs/ncurses
-	sys-libs/readline
-	${DEPEND}"
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	sys-devel/m4"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PV}-nostrip.patch"
-}
-
-src_compile() {
-	econf \
-		--enable-client \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		|| die "Configuration stage failed"
-	emake || die "Compilation stage failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	if use ipv6; then
-		# The only thing worse then not supplying
-		# a sample configuration file to a user is
-		# wasting his/her time with a totally
-		# broken one.
-		rm "${D}/etc/bird6.conf"
-		newinitd "${FILESDIR}/initd-v6-${P}" bird6
-	else
-		newinitd "${FILESDIR}/initd-v4-${P}" bird
-	fi
-}
-
-pkg_postinst() {
-	if use ipv6; then
-		elog "Please note that only the IPv6 versions of the BIRD client & daemon have been installed."
-	else
-		elog "Please note that only the IPv4 versions of the BIRD client & daemon have been installed."
-	fi
-	elog "BIRDs build system is not currently suited to providing both."
-}
diff --git a/net-misc/bird/bird-1.1.3.ebuild b/net-misc/bird/bird-1.1.3.ebuild
deleted file mode 100644
index c9a8c869f6b9..000000000000
--- a/net-misc/bird/bird-1.1.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/bird-1.1.3.ebuild,v 1.1 2009/09/11 14:01:52 chainsaw Exp $
-
-inherit eutils
-
-DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6"
-HOMEPAGE="http://bird.network.cz"
-SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug ipv6"
-
-RDEPEND="sys-libs/ncurses
-	sys-libs/readline
-	${DEPEND}"
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	sys-devel/m4"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PV}-nostrip.patch"
-}
-
-src_compile() {
-	econf \
-		--enable-client \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		|| die "Configuration stage failed"
-	emake || die "Compilation stage failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	if use ipv6; then
-		# The only thing worse then not supplying
-		# a sample configuration file to a user is
-		# wasting his/her time with a totally
-		# broken one.
-		rm "${D}/etc/bird6.conf"
-		newinitd "${FILESDIR}/initd-v6-${P}" bird6
-	else
-		newinitd "${FILESDIR}/initd-v4-${P}" bird
-	fi
-}
-
-pkg_postinst() {
-	if use ipv6; then
-		elog "Please note that only the IPv6 versions of the BIRD client & daemon have been installed."
-	else
-		elog "Please note that only the IPv4 versions of the BIRD client & daemon have been installed."
-	fi
-	elog "BIRDs build system is not currently suited to providing both."
-}
diff --git a/net-misc/bird/bird-1.1.4.ebuild b/net-misc/bird/bird-1.1.4.ebuild
deleted file mode 100644
index f74ad4597685..000000000000
--- a/net-misc/bird/bird-1.1.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/bird-1.1.4.ebuild,v 1.1 2009/10/02 11:52:08 chainsaw Exp $
-
-inherit eutils
-
-DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6"
-HOMEPAGE="http://bird.network.cz"
-SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug ipv6"
-
-RDEPEND="sys-libs/ncurses
-	sys-libs/readline
-	${DEPEND}"
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	sys-devel/m4"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PV}-nostrip.patch"
-}
-
-src_compile() {
-	econf \
-		--enable-client \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		|| die "Configuration stage failed"
-	emake || die "Compilation stage failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	if use ipv6; then
-		# The only thing worse then not supplying
-		# a sample configuration file to a user is
-		# wasting his/her time with a totally
-		# broken one.
-		rm "${D}/etc/bird6.conf"
-		newinitd "${FILESDIR}/initd-v6-${P}" bird6
-	else
-		newinitd "${FILESDIR}/initd-v4-${P}" bird
-	fi
-}
-
-pkg_postinst() {
-	if use ipv6; then
-		elog "Please note that only the IPv6 versions of the BIRD client & daemon have been installed."
-	else
-		elog "Please note that only the IPv4 versions of the BIRD client & daemon have been installed."
-	fi
-	elog "BIRDs build system is not currently suited to providing both."
-}
diff --git a/net-misc/bird/bird-1.1.2.ebuild b/net-misc/bird/bird-1.1.6.ebuild
index 2cb5900ed2f6..76c36562cdce 100644
--- a/net-misc/bird/bird-1.1.2.ebuild
+++ b/net-misc/bird/bird-1.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/bird-1.1.2.ebuild,v 1.1 2009/08/24 12:22:41 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/bird-1.1.6.ebuild,v 1.1 2009/11/23 14:35:04 chainsaw Exp $
 
 inherit eutils
 
diff --git a/net-misc/bird/files/1.1.2-nostrip.patch b/net-misc/bird/files/1.1.2-nostrip.patch
deleted file mode 100644
index e37a84d78868..000000000000
--- a/net-misc/bird/files/1.1.2-nostrip.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -uNr bird-1.1.2.ORIG/tools/Makefile.in bird-1.1.2/tools/Makefile.in
---- bird-1.1.2.ORIG/tools/Makefile.in	2009-08-24 13:13:24.000000000 +0100
-+++ bird-1.1.2/tools/Makefile.in	2009-08-24 13:13:39.000000000 +0100
-@@ -56,9 +56,9 @@
- 
- install: all
- 	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(localstatedir)
--	$(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX6@
-+	$(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX6@
- 	if test -n "@CLIENT@" ; then								\
--		$(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX6@ ;				\
-+		$(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX6@ ;				\
- 	fi
- 	if ! test -f $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; then						\
- 		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ;	\
diff --git a/net-misc/bird/files/1.1.3-nostrip.patch b/net-misc/bird/files/1.1.3-nostrip.patch
deleted file mode 100644
index 36d1ef3b195d..000000000000
--- a/net-misc/bird/files/1.1.3-nostrip.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -uNr bird-1.1.3.ORIG/tools/Makefile.in bird-1.1.3/tools/Makefile.in
---- bird-1.1.3.ORIG/tools/Makefile.in	2009-09-11 14:56:23.000000000 +0100
-+++ bird-1.1.3/tools/Makefile.in	2009-09-11 14:56:38.000000000 +0100
-@@ -56,9 +56,9 @@
- 
- install: all
- 	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(localstatedir)
--	$(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX6@
-+	$(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX6@
- 	if test -n "@CLIENT@" ; then								\
--		$(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX6@ ;				\
-+		$(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX6@ ;				\
- 	fi
- 	if ! test -f $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; then						\
- 		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ;	\
diff --git a/net-misc/bird/files/1.1.4-nostrip.patch b/net-misc/bird/files/1.1.4-nostrip.patch
deleted file mode 100644
index 15ca414e63d2..000000000000
--- a/net-misc/bird/files/1.1.4-nostrip.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -uNr bird-1.1.4.ORIG/tools/Makefile.in bird-1.1.4/tools/Makefile.in
---- bird-1.1.4.ORIG/tools/Makefile.in	2009-10-02 12:45:06.000000000 +0100
-+++ bird-1.1.4/tools/Makefile.in	2009-10-02 12:45:31.000000000 +0100
-@@ -56,9 +56,9 @@
- 
- install: all
- 	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(localstatedir)
--	$(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX6@
-+	$(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX6@
- 	if test -n "@CLIENT@" ; then								\
--		$(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX6@ ;				\
-+		$(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX6@ ;				\
- 	fi
- 	if ! test -f $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; then						\
- 		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ;	\
diff --git a/net-misc/bird/files/1.1.1-nostrip.patch b/net-misc/bird/files/1.1.6-nostrip.patch
index d3513ce90237..282bfc2e8c36 100644
--- a/net-misc/bird/files/1.1.1-nostrip.patch
+++ b/net-misc/bird/files/1.1.6-nostrip.patch
@@ -1,6 +1,6 @@
-diff -uNr bird-1.1.1.ORIG/tools/Makefile.in bird-1.1.1/tools/Makefile.in
---- bird-1.1.1.ORIG/tools/Makefile.in	2009-08-20 15:47:18.000000000 +0100
-+++ bird-1.1.1/tools/Makefile.in	2009-08-20 15:47:40.000000000 +0100
+diff -uNr bird-1.1.6.ORIG/tools/Makefile.in bird-1.1.6/tools/Makefile.in
+--- bird-1.1.6.ORIG/tools/Makefile.in	2009-11-23 14:18:19.000000000 +0000
++++ bird-1.1.6/tools/Makefile.in	2009-11-23 14:18:36.000000000 +0000
 @@ -56,9 +56,9 @@
  
  install: all
diff --git a/net-misc/bird/files/initd-v4-bird-1.1.1 b/net-misc/bird/files/initd-v4-bird-1.1.1
deleted file mode 100644
index bb0f08f405b0..000000000000
--- a/net-misc/bird/files/initd-v4-bird-1.1.1
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/files/initd-v4-bird-1.1.1,v 1.1 2009/08/20 16:12:18 chainsaw Exp $
-
-EXE=bird
-CLI=birdc
-SOCK="/var/lib/run/${EXE}.ctl"
-
-depend() {
-	need net
-	use logger
-}
-
-checkconfig() {
-	if [ ! -f "/etc/${EXE}.conf" ]; then
-		eerror "Please create /etc/${EXE}.conf"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return $?
-
-	ebegin "Starting BIRD"
-	"/usr/sbin/${EXE}" -c "/etc/${EXE}.conf" -s "${SOCK}"
-	eend $? "Failed to start BIRD"
-}
-
-stop() {
-	ebegin "Stopping BIRD"
-	if [ -f "${SOCK}" ]; then
-		echo "down" | "/usr/sbin/${CLI}" -s "${SOCK}" &>/dev/null
-		eend $? "Failed to stop BIRD"
-	else
-		eend 0
-	fi
-}
diff --git a/net-misc/bird/files/initd-v4-bird-1.1.2 b/net-misc/bird/files/initd-v4-bird-1.1.2
deleted file mode 100644
index f2c566d0b512..000000000000
--- a/net-misc/bird/files/initd-v4-bird-1.1.2
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/files/initd-v4-bird-1.1.2,v 1.1 2009/08/24 12:22:41 chainsaw Exp $
-
-EXE=bird
-CLI=birdc
-SOCK="/var/lib/run/${EXE}.ctl"
-
-depend() {
-	need net
-	use logger
-}
-
-checkconfig() {
-	if [ ! -f "/etc/${EXE}.conf" ]; then
-		eerror "Please create /etc/${EXE}.conf"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return $?
-
-	ebegin "Starting BIRD"
-	"/usr/sbin/${EXE}" -c "/etc/${EXE}.conf" -s "${SOCK}"
-	eend $? "Failed to start BIRD"
-}
-
-stop() {
-	ebegin "Stopping BIRD"
-	if [ -f "${SOCK}" ]; then
-		echo "down" | "/usr/sbin/${CLI}" -s "${SOCK}" &>/dev/null
-		eend $? "Failed to stop BIRD"
-	else
-		eend 0
-	fi
-}
diff --git a/net-misc/bird/files/initd-v4-bird-1.1.4 b/net-misc/bird/files/initd-v4-bird-1.1.4
deleted file mode 100644
index 6e9b2d00a802..000000000000
--- a/net-misc/bird/files/initd-v4-bird-1.1.4
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/files/initd-v4-bird-1.1.4,v 1.1 2009/10/02 11:52:07 chainsaw Exp $
-
-EXE=bird
-CLI=birdc
-SOCK="/var/run/${EXE}.ctl"
-
-depend() {
-	need net
-	use logger
-}
-
-checkconfig() {
-	if [ ! -f "/etc/${EXE}.conf" ]; then
-		eerror "Please create /etc/${EXE}.conf"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return $?
-
-	ebegin "Starting BIRD"
-	"/usr/sbin/${EXE}" -c "/etc/${EXE}.conf" -s "${SOCK}"
-	eend $? "Failed to start BIRD"
-}
-
-stop() {
-	ebegin "Stopping BIRD"
-	if [ -f "${SOCK}" ]; then
-		echo "down" | "/usr/sbin/${CLI}" -s "${SOCK}" &>/dev/null
-		eend $? "Failed to stop BIRD"
-	else
-		eend 0
-	fi
-}
diff --git a/net-misc/bird/files/initd-v4-bird-1.1.3 b/net-misc/bird/files/initd-v4-bird-1.1.6
index 4009648b72d6..257af405daa1 100644
--- a/net-misc/bird/files/initd-v4-bird-1.1.3
+++ b/net-misc/bird/files/initd-v4-bird-1.1.6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/files/initd-v4-bird-1.1.3,v 1.1 2009/09/11 14:01:51 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/files/initd-v4-bird-1.1.6,v 1.1 2009/11/23 14:35:03 chainsaw Exp $
 
 EXE=bird
 CLI=birdc
diff --git a/net-misc/bird/files/initd-v6-bird-1.1.1 b/net-misc/bird/files/initd-v6-bird-1.1.1
deleted file mode 100644
index a74513b856f3..000000000000
--- a/net-misc/bird/files/initd-v6-bird-1.1.1
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/files/initd-v6-bird-1.1.1,v 1.1 2009/08/20 16:12:18 chainsaw Exp $
-
-EXE=bird6
-CLI=birdc6
-SOCK="/var/lib/run/${EXE}.ctl"
-
-depend() {
-	need net
-	use logger
-}
-
-checkconfig() {
-	if [ ! -f "/etc/${EXE}.conf" ]; then
-		eerror "Please create /etc/${EXE}.conf"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return $?
-
-	ebegin "Starting BIRD"
-	"/usr/sbin/${EXE}" -c "/etc/${EXE}.conf" -s "${SOCK}"
-	eend $? "Failed to start BIRD"
-}
-
-stop() {
-	ebegin "Stopping BIRD"
-	if [ -f "${SOCK}" ]; then
-		echo "down" | "/usr/sbin/${CLI}" -s "${SOCK}" &>/dev/null
-		eend $? "Failed to stop BIRD"
-	else
-		eend 0
-	fi
-}
diff --git a/net-misc/bird/files/initd-v6-bird-1.1.2 b/net-misc/bird/files/initd-v6-bird-1.1.2
deleted file mode 100644
index 1500aee9c37d..000000000000
--- a/net-misc/bird/files/initd-v6-bird-1.1.2
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/files/initd-v6-bird-1.1.2,v 1.1 2009/08/24 12:22:41 chainsaw Exp $
-
-EXE=bird6
-CLI=birdc6
-SOCK="/var/lib/run/${EXE}.ctl"
-
-depend() {
-	need net
-	use logger
-}
-
-checkconfig() {
-	if [ ! -f "/etc/${EXE}.conf" ]; then
-		eerror "Please create /etc/${EXE}.conf"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return $?
-
-	ebegin "Starting BIRD"
-	"/usr/sbin/${EXE}" -c "/etc/${EXE}.conf" -s "${SOCK}"
-	eend $? "Failed to start BIRD"
-}
-
-stop() {
-	ebegin "Stopping BIRD"
-	if [ -f "${SOCK}" ]; then
-		echo "down" | "/usr/sbin/${CLI}" -s "${SOCK}" &>/dev/null
-		eend $? "Failed to stop BIRD"
-	else
-		eend 0
-	fi
-}
diff --git a/net-misc/bird/files/initd-v6-bird-1.1.4 b/net-misc/bird/files/initd-v6-bird-1.1.4
deleted file mode 100644
index f00589f20bfa..000000000000
--- a/net-misc/bird/files/initd-v6-bird-1.1.4
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/files/initd-v6-bird-1.1.4,v 1.1 2009/10/02 11:52:07 chainsaw Exp $
-
-EXE=bird
-CLI=birdc
-SOCK="/var/run/${EXE}.ctl"
-
-depend() {
-	need net
-	use logger
-}
-
-checkconfig() {
-	if [ ! -f "/etc/${EXE}.conf" ]; then
-		eerror "Please create /etc/${EXE}.conf"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return $?
-
-	ebegin "Starting BIRD"
-	"/usr/sbin/${EXE}" -c "/etc/${EXE}.conf" -s "${SOCK}"
-	eend $? "Failed to start BIRD"
-}
-
-stop() {
-	ebegin "Stopping BIRD"
-	if [ -f "${SOCK}" ]; then
-		echo "down" | "/usr/sbin/${CLI}" -s "${SOCK}" &>/dev/null
-		eend $? "Failed to stop BIRD"
-	else
-		eend 0
-	fi
-}
diff --git a/net-misc/bird/files/initd-v6-bird-1.1.3 b/net-misc/bird/files/initd-v6-bird-1.1.6
index 1a3d3645c292..c7d2b34d82d9 100644
--- a/net-misc/bird/files/initd-v6-bird-1.1.3
+++ b/net-misc/bird/files/initd-v6-bird-1.1.6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/files/initd-v6-bird-1.1.3,v 1.2 2009/10/02 11:52:07 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/files/initd-v6-bird-1.1.6,v 1.1 2009/11/23 14:35:03 chainsaw Exp $
 
 EXE=bird
 CLI=birdc