Install IPv6 daemon in sbin, not bin. Remove earlier 1.3.8 ebuilds in favour of the new approach introduced by Tomáš "scarabeus" Chvátal.

(Portage version: 2.1.11.10/cvs/Linux x86_64)

4 files changed, 10 insertions, 176 deletions

diff --git a/net-misc/bird/ChangeLog b/net-misc/bird/ChangeLog
index a2b37bea4119..71637013ca6c 100644
--- a/net-misc/bird/ChangeLog
+++ b/net-misc/bird/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/bird
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/ChangeLog,v 1.21 2012/08/14 20:08:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/ChangeLog,v 1.22 2012/08/15 10:15:19 chainsaw Exp $
+
+*bird-1.3.8-r2 (15 Aug 2012)
+
+  15 Aug 2012; Tony Vroon <chainsaw@gentoo.org> -files/1.3.8-v4-v6-build.patch,
+  -bird-1.3.8.ebuild, -bird-1.3.8-r1.ebuild, +bird-1.3.8-r2.ebuild:
+  Install IPv6 daemon in sbin, not bin. Remove earlier 1.3.8 ebuilds in favour
+  of the new approach introduced by Tomáš "scarabeus" Chvátal.
 
 *bird-1.3.8-r1 (14 Aug 2012)
 
diff --git a/net-misc/bird/bird-1.3.8-r1.ebuild b/net-misc/bird/bird-1.3.8-r2.ebuild
index 87f843abaf4c..d609cda045fb 100644
--- a/net-misc/bird/bird-1.3.8-r1.ebuild
+++ b/net-misc/bird/bird-1.3.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/bird-1.3.8-r1.ebuild,v 1.1 2012/08/14 20:08:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/bird-1.3.8-r2.ebuild,v 1.1 2012/08/15 10:15:19 chainsaw Exp $
 
 EAPI=4
 
@@ -52,7 +52,7 @@ src_compile() {
 src_install() {
 	if use ipv6; then
 		newbin ipv6/birdc birdc6
-		newbin ipv6/bird bird6
+		newsbin ipv6/bird bird6
 		newinitd "${FILESDIR}/initd-v6-${P}" bird6
 	fi
 	dobin birdc
diff --git a/net-misc/bird/bird-1.3.8.ebuild b/net-misc/bird/bird-1.3.8.ebuild
deleted file mode 100644
index 3a2d59197b8d..000000000000
--- a/net-misc/bird/bird-1.3.8.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/bird-1.3.8.ebuild,v 1.1 2012/08/13 10:54:49 chainsaw Exp $
-
-EAPI=1
-
-inherit base 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 ~x86"
-IUSE="debug ipv6"
-
-RDEPEND="sys-libs/ncurses
-	sys-libs/readline
-	${DEPEND}"
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	sys-devel/m4"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-v4-v6-build.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		--enable-client \
-		--disable-ipv6 \
-		--localstatedir=/var \
-		$(use_enable debug) \
-		|| die "V4 configuration stage failed"
-	emake || die "V4 compilation stage failed"
-	if use ipv6; then
-		emake almost-clean
-		econf \
-			--enable-client \
-			--enable-ipv6 \
-			--localstatedir=/var \
-			$(use_enable debug) \
-			|| die "V6 configuration stage failed"
-		emake || die "V6 compilation stage failed"
-	fi
-}
-
-src_install() {
-	if use ipv6; then
-		dobin birdc6
-		dosbin bird6
-		newinitd "${FILESDIR}/initd-v6-${P}" bird6 || die "V6 init script installation failed"
-	fi
-	dobin birdc
-	dosbin bird
-	newinitd "${FILESDIR}/initd-v4-${P}" bird || die "V4 init script installation failed"
-	dodoc doc/bird.conf.example || die "configuration example installation failed"
-}
diff --git a/net-misc/bird/files/1.3.8-v4-v6-build.patch b/net-misc/bird/files/1.3.8-v4-v6-build.patch
deleted file mode 100644
index e91748647ba2..000000000000
--- a/net-misc/bird/files/1.3.8-v4-v6-build.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -uNr bird-1.3.8.ORIG/tools/Makefile.in bird-1.3.8/tools/Makefile.in
---- bird-1.3.8.ORIG/tools/Makefile.in	2012-08-13 11:42:03.202049769 +0100
-+++ bird-1.3.8/tools/Makefile.in	2012-08-13 11:47:34.993126170 +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@SUFFIX@
- 
--client: $(exedir)/birdc
-+client: $(exedir)/birdc@SUFFIX@
- 
- 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@SUFFIX@: $(bird-dep)
- 	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
--$(exedir)/birdc: $(birdc-dep)
-+$(exedir)/birdc@SUFFIX@: $(birdc-dep)
- 	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(CLIENT_LIBS)
- 
- .dir-stamp: sysdep/paths.h
-@@ -55,25 +55,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)/@runtimedir@
--	$(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX@
-+
-+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@SUFFIX@ ;	\
-+		$(INSTALL_PROGRAM) $(exedir)/birdc6 $(DESTDIR)/$(sbindir)/birdc ;		\
- 	fi
--	if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then						\
--		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@ ;	\
-+	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@SUFFIX@
-+
- 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.3.8.ORIG/tools/Makefile-top.in bird-1.3.8/tools/Makefile-top.in
---- bird-1.3.8.ORIG/tools/Makefile-top.in	2012-08-13 11:42:03.201049754 +0100
-+++ bird-1.3.8/tools/Makefile-top.in	2012-08-13 11:42:44.654056436 +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