Clean up old ebuilds. Actually install a V6 init script and use the correct name.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

11 files changed, 18 insertions, 388 deletions

diff --git a/net-misc/bird/ChangeLog b/net-misc/bird/ChangeLog
index e385e61085d2..b5674174e292 100644
--- a/net-misc/bird/ChangeLog
+++ b/net-misc/bird/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/bird
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/ChangeLog,v 1.12 2010/06/07 13:41:01 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/ChangeLog,v 1.13 2010/08/23 11:29:16 chainsaw Exp $
+
+*bird-1.2.3-r1 (23 Aug 2010)
+
+  23 Aug 2010; <chainsaw@gentoo.org> -files/1.1.7-nostrip.patch,
+  -files/initd-v4-bird-1.1.7, -files/initd-v6-bird-1.1.7,
+  -bird-1.1.7.ebuild, -files/1.2.2-v4-v6-build.patch,
+  -files/initd-v4-bird-1.2.2, -files/initd-v6-bird-1.2.2,
+  -bird-1.2.2.ebuild, files/initd-v6-bird-1.2.3, -bird-1.2.3.ebuild,
+  +bird-1.2.3-r1.ebuild:
+  Clean up old ebuilds. Actually install a V6 init script and use the
+  correct name.
 
 *bird-1.2.3 (07 Jun 2010)
 
diff --git a/net-misc/bird/bird-1.1.7.ebuild b/net-misc/bird/bird-1.1.7.ebuild
deleted file mode 100644
index 2671ab4738d4..000000000000
--- a/net-misc/bird/bird-1.1.7.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.7.ebuild,v 1.1 2009/12/20 15:49:33 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
deleted file mode 100644
index 1807e09f6032..000000000000
--- a/net-misc/bird/bird-1.2.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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/bird-1.2.3.ebuild b/net-misc/bird/bird-1.2.3-r1.ebuild
index 9e9168aa124a..3f4c74a54f8e 100644
--- a/net-misc/bird/bird-1.2.3.ebuild
+++ b/net-misc/bird/bird-1.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.1 2010/06/07 13:41:01 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/bird-1.2.3-r1.ebuild,v 1.1 2010/08/23 11:29:16 chainsaw Exp $
 
 EAPI=1
 
@@ -55,7 +55,7 @@ src_install() {
 	if use ipv6; then
 		dobin birdc6
 		dosbin bird6
-		newinitd "${FILESDIR}/initd-v6-${P}" bird || die "V6 init script installation failed"
+		newinitd "${FILESDIR}/initd-v6-${P}" bird6 || die "V6 init script installation failed"
 	fi
 	dobin birdc
 	dosbin bird
diff --git a/net-misc/bird/files/1.1.7-nostrip.patch b/net-misc/bird/files/1.1.7-nostrip.patch
deleted file mode 100644
index 18a54f375405..000000000000
--- a/net-misc/bird/files/1.1.7-nostrip.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -uNr bird-1.1.7.ORIG/tools/Makefile.in bird-1.1.7/tools/Makefile.in
---- bird-1.1.7.ORIG/tools/Makefile.in	2009-12-20 15:43:48.284000127 +0000
-+++ bird-1.1.7/tools/Makefile.in	2009-12-20 15:44:02.542000130 +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
deleted file mode 100644
index bf00f02382cf..000000000000
--- a/net-misc/bird/files/1.2.2-v4-v6-build.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-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.7 b/net-misc/bird/files/initd-v4-bird-1.1.7
deleted file mode 100644
index 858b9f2a4da6..000000000000
--- a/net-misc/bird/files/initd-v4-bird-1.1.7
+++ /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.7,v 1.1 2009/12/20 15:49:32 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.2.2 b/net-misc/bird/files/initd-v4-bird-1.2.2
deleted file mode 100644
index d7219e510c02..000000000000
--- a/net-misc/bird/files/initd-v4-bird-1.2.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.2.2,v 1.1 2010/04/12 11:58:59 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.7 b/net-misc/bird/files/initd-v6-bird-1.1.7
deleted file mode 100644
index 15faf7da85f7..000000000000
--- a/net-misc/bird/files/initd-v6-bird-1.1.7
+++ /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.7,v 1.1 2009/12/20 15:49:32 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.2.2 b/net-misc/bird/files/initd-v6-bird-1.2.2
deleted file mode 100644
index 6a0205daf3d2..000000000000
--- a/net-misc/bird/files/initd-v6-bird-1.2.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.2.2,v 1.1 2010/04/12 11:58:59 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.2.3 b/net-misc/bird/files/initd-v6-bird-1.2.3
index e8fc4b65e944..dc0107d4b240 100644
--- a/net-misc/bird/files/initd-v6-bird-1.2.3
+++ b/net-misc/bird/files/initd-v6-bird-1.2.3
@@ -1,10 +1,10 @@
 #!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.2.3,v 1.1 2010/06/07 13:41:01 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bird/files/initd-v6-bird-1.2.3,v 1.2 2010/08/23 11:29:16 chainsaw Exp $
 
-EXE=bird
-CLI=birdc
+EXE=bird6
+CLI=birdc6
 SOCK="/var/run/${EXE}.ctl"
 
 depend() {