New upstream release. Note that the V6 version is not functional, I have contacted upstream and will provide an updated ebuild when possible.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

12 files changed, 177 insertions, 245 deletions

diff --git a/net-misc/bird/ChangeLog b/net-misc/bird/ChangeLog
index a52048910d52..d64bc8e077f2 100644
--- a/net-misc/bird/ChangeLog
+++ b/net-misc/bird/ChangeLog
@@ -1,6 +1,18 @@
 # 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.10 2009/12/20 15:49:33 chainsaw Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/ChangeLog,v 1.11 2010/04/12 11:58:59 chainsaw Exp $
+
+*bird-1.2.2 (12 Apr 2010)
+
+  12 Apr 2010; <chainsaw@gentoo.org> -files/1.1.5-nostrip.patch,
+  -files/initd-v6-bird-1.1.5, -bird-1.1.5.ebuild,
+  -files/initd-v4-bird-1.1.6, -files/1.1.6-nostrip.patch,
+  -files/initd-v6-bird-1.1.6, -bird-1.1.6.ebuild,
+  +files/initd-v4-bird-1.2.2, +files/1.2.2-v4-v6-build.patch,
+  -files/initd-v4-bird-1.1.5, +files/initd-v6-bird-1.2.2,
+  +bird-1.2.2.ebuild:
+  New upstream release. Note that the V6 version is not functional, I have
+  contacted upstream and will provide an updated ebuild when possible.
 
 *bird-1.1.7 (20 Dec 2009)
 
diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index 8a1201f13b0c..f23be7c337ba 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -1,27 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 1.1.5-nostrip.patch 872 RMD160 84ffb2e00b5f7282c6a441e89b4515e283018f0c SHA1 eb4f9ad2d9900c7388513dc32bbf26aecb2d17c8 SHA256 a23047f73c6210b8c1f1db4359ef5276dc34d4c6a91ccc2aa128a9a652e495a6
-AUX 1.1.6-nostrip.patch 872 RMD160 5ef9cd6e152a6ac320552413ac183caf3c9a4424 SHA1 bc858ea61c359ec8a14394abb6b3ee06219f1fda SHA256 a65bc13a149a163fedab2453031b29345e3147617400b4af8e2dd7dca9cde480
 AUX 1.1.7-nostrip.patch 872 RMD160 7e1bb711dcac4f6624317011d88af7f8a4e3cba7 SHA1 69d9e1fc0447e8123ebe0a96e617776f1ea0f22d SHA256 4169dd1e111973b39adb9de483bc3cd2494d514e604ffa40be90e00c230b89fb
-AUX initd-v4-bird-1.1.5 773 RMD160 e59484eff146589b5326ee4b87acbf68f973e5b8 SHA1 2cfc7a47a3e3976662edfc8baab7668ddf061f7f SHA256 a985b9c29503bc2da36b890fa806fae90988da3dbd1de47db530f591b85b5760
-AUX initd-v4-bird-1.1.6 773 RMD160 86fe81370e8423f0f9281f8851a340182c3f4508 SHA1 cc73fd4a0621a9c38d044d6056539f3f434b7f55 SHA256 d65d4abb2840fc15dab41f9eb5385ab06946bd3a9a28c7a5ce3dce3db049ac7e
+AUX 1.2.2-v4-v6-build.patch 4179 RMD160 80d356ac2ca74b8379130eaf06a8ccbc66807520 SHA1 5dbc574d01a311fb62f0e17880d2595ce6627b6e SHA256 cb7df44af52c9cb7379c391e575f44767ea322d67fffefb56c57e237da167ece
 AUX initd-v4-bird-1.1.7 773 RMD160 168e0b111400df14c6d3dcd0838e08958ad9031e SHA1 f63011a957ab7338c34076814afa4a9c86e76f62 SHA256 96fa8430209d3e412e5de7af849a7becabb939d1cbee14fdcf4b93d37619ccac
-AUX initd-v6-bird-1.1.5 773 RMD160 c26bbca5122d03b1aeabcda1257ad02c75465d2a SHA1 65b7d2f885df0cfda671f271b09b543438990266 SHA256 bf728023bbd90bd085121eccdd36433070cb4f81a15785222b1ac5e03448b9f8
-AUX initd-v6-bird-1.1.6 773 RMD160 5fd2249a45591f50915fe9a06edd8ceb68d44ede SHA1 46734188617a5432703893c4737f1276264d333b SHA256 f2bb18dd9c19d3b1278f3edde130593be51ce01192114c75837b7c0ac4a40fc2
+AUX initd-v4-bird-1.2.2 773 RMD160 4952f210bf8d7126d9939084706bac25d4e8c6a1 SHA1 36e1f28ff1885bae8b67d6d77c2a5a873a0ff8f3 SHA256 b18b5b91d50e47e30f5a5a59f5e25532d547581e7a107261f320cb19426c0a21
 AUX initd-v6-bird-1.1.7 773 RMD160 c0ac6f2e2e4a9faf9e6231404c1fac224b3e409c SHA1 cc75de552ae20ca8a7be4f296f85c9db2d02358e SHA256 9bb5ac9fd4e7e81d92dcba11fb83360e9492c3fa43afd029b41e1d6a33fd5ab2
-DIST bird-1.1.5.tar.gz 652512 RMD160 b07caadf7f56a4a81d00a6335aac0025841a0c41 SHA1 62a9e7c8f988573b03b9f718398263768a74966a SHA256 8f353d9e4f9feb966948172ee25e5bcf590b56d9d650ae1c63a5a3b3892a568e
-DIST bird-1.1.6.tar.gz 654553 RMD160 4ee51358d90eb5cc1bafd3a2b0b22aa688eb9697 SHA1 1f56a6d6926fbebefb90c781a88c9eb581c06ee6 SHA256 836d3e7504d55ddc4c400ae67a94455fec1bcd98ef3c10363b01de8c3c388c75
+AUX initd-v6-bird-1.2.2 773 RMD160 88083b2a203cec10de0cbfbb9e71d3ccad0c3440 SHA1 8d92fa0a2b66d064a05453cd25211a5c948ade8f SHA256 a53f63f10bf16a2528c54b09e8537b516eb5df2e7b975423a5b5f4dd0a67a4e1
 DIST bird-1.1.7.tar.gz 740466 RMD160 f14c25b645963f5bda5edafb34673199b1ac0689 SHA1 4846616caa4ccde5311b2344758c7491f7e59703 SHA256 be6596caf8e45619a7e345a5dd591fee1bf81fb8c0b476c2e331d218046abbfe
-EBUILD bird-1.1.5.ebuild 1493 RMD160 3146eb3bf2d37dfecc83140370dd47233a1d289e SHA1 39c520a0dd5b923bd4bd7e9a9af5bc0cc32a3efb SHA256 e6e0e0ea2ab4f9c4e04e0726fb35e9e5b867471a8d334f7689357da11808055e
-EBUILD bird-1.1.6.ebuild 1493 RMD160 7e070a6a0409a9e6ef436aee84279ccdd5bbdd88 SHA1 1a35a4ef120c4259aa90b0dc54277ce668034afe SHA256 17a004cfd17c60767b67f21ddc4784483b10c9dcbd4b74148a73716d2f697b52
+DIST bird-1.2.2.tar.gz 774484 RMD160 648904d0ab37018098a3d53e133fe633891a62c6 SHA1 7dcf48237e30aca06cb573c6065ed5a2a241a1f7 SHA256 912d0a3d8e775fdeb7fc373a0b25045b935789ea16c577771f00f6b3567e4324
 EBUILD bird-1.1.7.ebuild 1493 RMD160 54d6567ad13613032a6a23e716e8b650463d768c SHA1 70ba8b36b17978407a5765287563a5951ad35db7 SHA256 62359f168cdd4e900d1a16e6dc7198021bd86b21580a39811bebeb57030783f8
-MISC ChangeLog 3199 RMD160 49198e9abe071590b404987f40cb8ece57f6e87e SHA1 99cd8e5864aa905b305c444b597bde04bb37676f SHA256 fce16163eee80914705b17bda5495697bc0be639f81811caa74aee19fa337631
+EBUILD bird-1.2.2.ebuild 1034 RMD160 3a985dc8ef2fbd6d87d3bf6c6ae9c8fba82d89db SHA1 9d73c24e855e16ed872275d1d5930901cbfccf41 SHA256 1789ecb4bca7db7e4fb5f3c105287c7a4a345a64136564cdfc127c07d2571e08
+MISC ChangeLog 3738 RMD160 b2fafd062e0733ecd618d755bd4ca5a9dbbef0c1 SHA1 b85cb6bf3bad07f239c9594aba41b2a5d392d360 SHA256 1949c262ffe48e39af0a50eb2aa4f4b6e8030594c1c0b818d83f27c9e3723250
 MISC metadata.xml 252 RMD160 39688056775b93958486028092a635d7596f2295 SHA1 84206aff0a072a68600245da08a0d83233da8259 SHA256 794815266f2c79c7762e9f4eaf6fd122af3b2b5b2d9d07a4aef8787218133d59
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAksuR8EACgkQp5vW4rUFj5oefACfdWrTvzBWrnWQkToVfTz+x++A
-FH4AoL/fQynUf/uzs7F5ZR3tlGjAnqLG
-=n2el
+iEYEARECAAYFAkvDCwkACgkQp5vW4rUFj5pYEQCguZ+3mcCoCeaikMzIg6bd09x3
+1ocAoJOgrvCt5Yn5H8yubuJkVwRLaoVS
+=0u6H
 -----END PGP SIGNATURE-----
diff --git a/net-misc/bird/bird-1.1.5.ebuild b/net-misc/bird/bird-1.1.5.ebuild
deleted file mode 100644
index fcdc277d7d4f..000000000000
--- a/net-misc/bird/bird-1.1.5.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.5.ebuild,v 1.1 2009/11/02 15:58:45 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.6.ebuild b/net-misc/bird/bird-1.1.6.ebuild
deleted file mode 100644
index 76c36562cdce..000000000000
--- a/net-misc/bird/bird-1.1.6.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.6.ebuild,v 1.1 2009/11/23 14:35:04 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.2.2.ebuild b/net-misc/bird/bird-1.2.2.ebuild
new file mode 100644
index 000000000000..1807e09f6032
--- /dev/null
+++ b/net-misc/bird/bird-1.2.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/bird-1.2.2.ebuild,v 1.1 2010/04/12 11:58:59 chainsaw Exp $
+
+inherit eutils autotools
+
+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"
+
+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}-v4-v6-build.patch"
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		--enable-client \
+		--disable-ipv6 \
+		$(use_enable debug) \
+		|| die "V4 configuration stage failed"
+	emake || die "V4 compilation stage failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-bin || die "V4 installation stage failed"
+	newinitd "${FILESDIR}/initd-v4-${P}" bird || die "V4 init script installation failed"
+}
diff --git a/net-misc/bird/files/1.1.5-nostrip.patch b/net-misc/bird/files/1.1.5-nostrip.patch
deleted file mode 100644
index d7acd2304b44..000000000000
--- a/net-misc/bird/files/1.1.5-nostrip.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -uNr bird-1.1.5.ORIG/tools/Makefile.in bird-1.1.5/tools/Makefile.in
---- bird-1.1.5.ORIG/tools/Makefile.in	2009-11-02 15:22:13.000000000 +0000
-+++ bird-1.1.5/tools/Makefile.in	2009-11-02 15:22:31.000000000 +0000
-@@ -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.6-nostrip.patch b/net-misc/bird/files/1.1.6-nostrip.patch
deleted file mode 100644
index 282bfc2e8c36..000000000000
--- a/net-misc/bird/files/1.1.6-nostrip.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
- 	$(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.2.2-v4-v6-build.patch b/net-misc/bird/files/1.2.2-v4-v6-build.patch
new file mode 100644
index 000000000000..bf00f02382cf
--- /dev/null
+++ b/net-misc/bird/files/1.2.2-v4-v6-build.patch
@@ -0,0 +1,109 @@
+diff -uNr bird-1.2.2.ORIG//tools/Makefile.in bird-1.2.2/tools/Makefile.in
+--- bird-1.2.2.ORIG//tools/Makefile.in	2010-04-12 12:25:43.000000000 +0100
++++ bird-1.2.2/tools/Makefile.in	2010-04-12 12:26:11.000000000 +0100
+@@ -3,13 +3,13 @@
+ 
+ include Rules
+ 
+-.PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs
++.PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs almost-clean
+ 
+ all: sysdep/paths.h .dep-stamp subdir daemon @CLIENT@
+ 
+-daemon: $(exedir)/bird
++daemon: $(exedir)/bird@SUFFIX6@
+ 
+-client: $(exedir)/birdc
++client: $(exedir)/birdc@SUFFIX6@
+ 
+ bird-dep := $(addsuffix /all.o, $(static-dirs)) conf/all.o lib/birdlib.a
+ 
+@@ -27,10 +27,10 @@
+ 	set -e ; for a in $(dynamic-dirs) ; do $(MAKE) -C $$a $@ ; done
+ 	set -e ; for a in $(static-dirs) $(client-dirs) ; do $(MAKE) -C $$a -f $(srcdir_abs)/$$a/Makefile $@ ; done
+ 
+-$(exedir)/bird: $(bird-dep)
++$(exedir)/bird@SUFFIX6@: $(bird-dep)
+ 	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+-$(exedir)/birdc: $(birdc-dep)
++$(exedir)/birdc@SUFFIX6@: $(birdc-dep)
+ 	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(CLIENT_LIBS)
+ 
+ .dir-stamp: sysdep/paths.h
+@@ -54,25 +54,42 @@
+ tags:
+ 	cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]`
+ 
+-install: all
++install-gen:
+ 	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(localstatedir)/run
+-	$(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX6@
++
++install-bin: install-gen
++	$(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/
++	if test -n "@CLIENT@" ; then                                                            \
++		$(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/ ;                          \
++	fi
++	if ! test -f $(DESTDIR)/$(sysconfdir)/bird.conf ; then                                          \
++		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird.conf ;    \
++	else                                                                                    \
++		echo "Not overwriting old bird.conf" ;                                          \
++	fi
++
++install-bin6: install-gen
++	$(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/
+ 	if test -n "@CLIENT@" ; then								\
+-		$(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX6@ ;				\
++		$(INSTALL_PROGRAM) $(exedir)/birdc6 $(DESTDIR)/$(sbindir)/birdc ;				\
+ 	fi
+-	if ! test -f $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; then						\
+-		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ;	\
++	if ! test -f $(DESTDIR)/$(sysconfdir)/bird6.conf ; then						\
++		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird6.conf ;	\
+ 	else											\
+-		echo "Not overwriting old bird@SUFFIX@.conf" ;						\
++		echo "Not overwriting old bird6.conf" ;						\
+ 	fi
+ 
++install: all install-bin@SUFFIX6@
++
+ install-docs:
+ 	$(INSTALL) -d $(DESTDIR)/$(docdir)
+ 	$(INSTALL_DATA) $(srcdir)/doc/{bird,prog}{,-*}.html $(DESTDIR)/$(docdir)/
+ 
+-clean:
++almost-clean:
+ 	find . -name "*.[oa]" -o -name core -o -name depend -o -name "*.html" | xargs rm -f
+ 	rm -f conf/cf-lex.c conf/cf-parse.* conf/commands.h conf/keywords.h
++
++clean: almost-clean
+ 	rm -f $(exedir)/bird $(exedir)/birdc $(exedir)/bird.ctl $(exedir)/bird6.ctl .dep-stamp
+ 
+ distclean: clean
+diff -uNr bird-1.2.2.ORIG//tools/Makefile-top.in bird-1.2.2/tools/Makefile-top.in
+--- bird-1.2.2.ORIG//tools/Makefile-top.in	2010-04-12 12:25:43.000000000 +0100
++++ bird-1.2.2/tools/Makefile-top.in	2010-04-12 12:26:00.000000000 +0100
+@@ -3,16 +3,19 @@
+ 
+ objdir=@objdir@
+ 
+-all depend tags install install-docs:
++all depend tags install install-docs install-bin install-bin6:
+ 	$(MAKE) -C $(objdir) $@
+ 
+ docs userdocs progdocs:
+ 	$(MAKE) -C doc $@
+ 
+-clean:
+-	$(MAKE) -C $(objdir) clean
++almost-clean:
++	$(MAKE) -C $(objdir) almost-clean
+ 	find . -name "*~" -or -name "*.[oa]" -or -name "\#*\#" -or -name TAGS -or -name core -or -name depend -or -name ".#*" | xargs rm -f
+ 
++clean: almost-clean
++	$(MAKE) -C $(objdir) clean
++
+ distclean: clean
+ 	$(MAKE) -C doc distclean
+ 	rm -rf $(objdir) autom4te.cache
diff --git a/net-misc/bird/files/initd-v4-bird-1.1.6 b/net-misc/bird/files/initd-v4-bird-1.1.6
deleted file mode 100644
index 257af405daa1..000000000000
--- a/net-misc/bird/files/initd-v4-bird-1.1.6
+++ /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.6,v 1.1 2009/11/23 14:35:03 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.5 b/net-misc/bird/files/initd-v4-bird-1.2.2
index 94087ccc8489..d7219e510c02 100644
--- a/net-misc/bird/files/initd-v4-bird-1.1.5
+++ b/net-misc/bird/files/initd-v4-bird-1.2.2
@@ -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.5,v 1.1 2009/11/02 15:58:44 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/files/initd-v4-bird-1.2.2,v 1.1 2010/04/12 11:58:59 chainsaw Exp $
 
 EXE=bird
 CLI=birdc
diff --git a/net-misc/bird/files/initd-v6-bird-1.1.6 b/net-misc/bird/files/initd-v6-bird-1.1.6
deleted file mode 100644
index c7d2b34d82d9..000000000000
--- a/net-misc/bird/files/initd-v6-bird-1.1.6
+++ /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.6,v 1.1 2009/11/23 14:35:03 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.5 b/net-misc/bird/files/initd-v6-bird-1.2.2
index f135078a3f8a..6a0205daf3d2 100644
--- a/net-misc/bird/files/initd-v6-bird-1.1.5
+++ b/net-misc/bird/files/initd-v6-bird-1.2.2
@@ -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.5,v 1.1 2009/11/02 15:58:44 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/files/initd-v6-bird-1.2.2,v 1.1 2010/04/12 11:58:59 chainsaw Exp $
 
 EXE=bird
 CLI=birdc