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.

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

5 files changed, 15 insertions, 193 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/Manifest b/net-misc/bird/Manifest
index cc41e990fbbb..b0ab3c29b6b5 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -6,7 +6,6 @@ AUX 1.2.4-v4-v6-build.patch 4179 SHA256 1651431304a25774cc11699a8e6a08ea1eb65dd5
 AUX 1.3.0-v4-v6-build.patch 4179 SHA256 b1385e27f5940e3e55b3dc63c9f0b8510cbd57995655ffae2837a6d0634e45d8 SHA512 36349217b755d81667e2b84171dadd4e8973ff7557a1d1260c561c47a89be99ceab591f5765020f8dae3ab422eb355b08dce0d79d8e9bbfeaae8b23746939733 WHIRLPOOL d467d64a640d5c741d1364a0ac2c011353acd9b5c00596f17b85a47ff807be569e126430c0501a3ba6007c5d6bb86b0098aec7f0c08bf574d7ec5fed2398f38a
 AUX 1.3.1-v4-v6-build.patch 4179 SHA256 df8f59670616eba7f724406cb4ab1e331f0883d0eb399c23ded57a0adc4bb6a5 SHA512 e4c52e7825afb302c4b8da350c5cc94a14fa66840e99ccb2fa609e005af4c25d3e2ee71709327393e1266c8d988d8f99a4f93944ce56139aca201aa67b3d8856 WHIRLPOOL 7ea021e6ddcefaad79dfe33fbdef197deb77642fa83827b0513987624109b5da49b98d0c3e3389bcc0ce113169c2ce87f009fb946bd44f8116e4a253b8385256
 AUX 1.3.2-v4-v6-build.patch 4175 SHA256 eb167203fc832649c79d11d541ba6b382856eba3c68fb167e03d9cf37119250c SHA512 7c8c161a98c0f03a4fdf3f8bb7a29fb5c9f51d0ac4c458094cf64777b2c07906cd17212053ada3a1d73ac9c47402b6fb8c29646ecb81f9fbb84c13effa5e55de WHIRLPOOL 6f1b6005bf926c692a989a55e83e523b0790ceb6d6741515809498e968437428f209a31ced40657d21d9877d182bb2040448f2e708584d66c628c1cf10568095
-AUX 1.3.8-v4-v6-build.patch 4153 SHA256 ac61b9162d63c63d05516b4718018bf6217ac046007143f071e7b6ddd8ac2e36 SHA512 ce539ceb9344101bd895e9c104e3b29c74d68bec9f0648181b1b22cb9764373a53a0cad28b7e47bad4fa79309b685940180165cd8b6f3f06aef2daf9b5ec21af WHIRLPOOL 6b38460ca8543b5ac977bc2a28df56d039ea20fce66bd344cd88bb7efc30d1fa64846c85c4ac94902d6740fd5d18786961cc5c12b0870c42e778aae7c51368c6
 AUX initd-v4-bird-1.2.3 773 SHA256 53dc92e4323f80b623bd7984a6d64dc35f56a765d25fcb82de0e77ae83197439 SHA512 f86e4559adc32efa49660de69ac8012f13f5668287fadc3719085f29b4b06ff58c96c564056cea667307a48d6ab6c7484c4650284d0ad11e26e200ef7bcbf1f5 WHIRLPOOL 137a63f79cfc33300d3351583e874b4a01364511ea378aba891a7034445b0e44813cf6d5523419b7bcc5efca3d913ffbaa8955269a508f7f0e151d7c9b7d8739
 AUX initd-v4-bird-1.2.4 773 SHA256 c269007c4b3b93e9a77f490d3ff7b8140bb4cdb430d31ae76153ecd5e2c1b933 SHA512 5cd21ae86f55ad359dbbae656322d874a2f18e551f7756f39dd87974c4bf177d8ebea773c207bd748282a22b071bc673c08c8927232aabb3626d8846ea296ddc WHIRLPOOL c6268c4151b111d5ac2bdfbcd9ac5bbfd4963d2ad7613cd8b354d612fea555311d47399147b5d5310d3b147555d1ae33e52609a02ebcd59fe4e0e9ec9da9321a
 AUX initd-v4-bird-1.3.0 938 SHA256 1135efe8e4b9c0462903cc1711ea638a539d34b0a076d385138d8d4906fafa5d SHA512 1a4a340c01a7d0745b032ae36a516dc5ab3ce5bae6a768d956a6cc5eece8aa3aa728a9b7e7f142a1008633d0070d9b015ecc9677bf5069febc695c761f0fc22f WHIRLPOOL cdec2a07f11c80b9e70e94ae7994c33460844c15ccd176a7f5e837ab6e25c8e0aa8c6ba17f278afab8263cd8c7a435630e207324d73c8ceb539a766d509c749a
@@ -30,24 +29,13 @@ EBUILD bird-1.3.0.ebuild 1522 SHA256 171d62be346bd87c254474986e8c4b71166ed943a34
 EBUILD bird-1.3.1.ebuild 1522 SHA256 f916168130b2d7b089c66b262599e59dfe91e2ac545e8bd8e476594b7da7d983 SHA512 6181d03a0bddd29192481c9e427a80acd6788b92f330801375a0fe6f3d9b837b3c88fc71c4b2f63b27b66e941a73ff296c65e734a392d747e8f14672a4f6de15 WHIRLPOOL 04121d62ab57138173ef96cbc9fb9f529eb6fc2a5cb8f102df1bf603b5c99817d2f854ab7c17b385087e880a13085ac6f29f08069a784477ef7c99dd7334b84c
 EBUILD bird-1.3.2.ebuild 1522 SHA256 fd7897827dd853d252fa9d8cac6b779cc7f2c67fad56ccfae8aec02d18a491db SHA512 be26a763765ce8ab00a191cd9f34fbafda09ae0447a8481cbf37d197aff488c603610ec9a881a9b799879a1fd60cf4087286d960e9b1f564555b82f216d07297 WHIRLPOOL db13f12d72ff0b10fcf0bbf6da4de28f92bcda173453f0c35f84d019acfb805662f5a4eb4f184522908343f0e58d77f1ed9a58923e2d56964860e408368947d9
 EBUILD bird-1.3.6.ebuild 1496 SHA256 26ee5eb18e98133cbe2f6bb1ca932dc0bde059a87cfbcf7a0a27e7edcb56e9ea SHA512 4e41458e4ef9c08bacf716d92d04dbcab9fc1e20b36ba6129a92d93ab0dd91942eda1a11273427ea9acb883b26ff17fe7798c56c8183b62b2189fc7dbee195ae WHIRLPOOL cec87dd87f6f1fa5fa8f0db3b1556e9bf4f84844dd2b0c3d67ccfb4f126ded7fdbb276f36c7999462860f20d1fe1d9320b0a63cd8b656e45c2cf0a644fc83709
-EBUILD bird-1.3.8-r1.ebuild 1212 SHA256 aee97a09e8cab6b6da58cecff9087758b8a3fdf643fc980c8a3c6733ff1b3a26 SHA512 941a6842964195ae00f28ac9f24e539b1b4ed277620d557393ff0dacb59fd5696c752e10c0cd9029900e12c9bb4c59474a0c13d7b13b96a325858099da39c10f WHIRLPOOL b56b76acd1a4b913dc59af2b04f0c1051917e5a008a562d2947b30bcecd6ad48e57d9e7ad5550ff679aa45333304450827b713a16243ec030dd0f66bed16e632
-EBUILD bird-1.3.8.ebuild 1484 SHA256 eddad2bc9af0062e606c7f09033c08af76a5f12a079a790c625a7a6b591d1a24 SHA512 9fdbd1115cbaaa51e07b4def07d55f8a6e113d04fe1e87aad1d0900b58cd382b1dba5c4aa308253d2a41407099e09739d69514ee72b0e51c5730cc8c5f0470a9 WHIRLPOOL 9c10d5381ab1c122d166d315d5d1cd95de72a6646bc1cd6c5f7173a2eea8e773fc2b7913f05e03766f72e1875d56ea8ace18a1b6f1d642eebc664ae0edfd4d45
-MISC ChangeLog 6863 SHA256 9a5966a4468749eef827acc41bac24741ac50faab01ec881c3e9b5267e96e646 SHA512 79c5b33d46592cb03452d5d1abdabc2eb6806bcd40034146fa23c924eb767c9f9776a76180aa8c0abd5532ce08ff7c075ffd3ade4d53934400c8a9e5458c9db1 WHIRLPOOL a05a42dcbdfa1fb3209238d8a5b071af9116803eabd6274e080b35558b4a995cb3f8db46403e8427cf9fa5cda2fd04a9e92afdb611daff5be23696ed9cbe5a91
+EBUILD bird-1.3.8-r2.ebuild 1212 SHA256 f9f6fea250c7f18f4347502e0b6c9b32a5db355338bef42f097061b535db24a6 SHA512 21fae824590a766522cb02347812aa683aa0024c5f9573ebd15078bffc28712dc7ef948e4a6a9d59996837a934059714da59780ecbe82c6c295e0b940cacd9e7 WHIRLPOOL 5c85f07319aac27ff1ca4de5d3e748e5d1fcd7a95d00dc446229f5f449d0f8b9612edc9f11d27f9b062eae2d8d7a2737ab4fdce6488e0620fc06f058f893a85a
+MISC ChangeLog 7186 SHA256 52a994cc6a3891b35a5f5e2361c844c06502582785bb05c624a734f990391717 SHA512 ef075e42e6bf96bf56af67aedcd45e1168583aab3a2c99147e3c0ac5a60630b6c4d62167e68ee4f41d05c5831fffefbb4e82de781c94d1b343b07387dcd8f53b WHIRLPOOL 50cc8430e80f917d2777f72b53be54ddc2284929bfcaabe1a4e4d45c12a7d0121eb0dbb3fedb8f07eb4c06f6f52cc3d317b580c7ddc6d3908ba9de2311786da7
 MISC metadata.xml 230 SHA256 44667b3033aa4aa69744b8eb24206d2edfcc84e8e491c54d891ba252e6540c44 SHA512 3631b789bb412140294075f5bea1f22dd11d6099f6564c4af2d18675e743fee7eeac84dfa8345d5c94e1002d07c636ef9c0bf811d3a4efa161f909b81ec93dcd WHIRLPOOL a2975b1f344e08d9a4fbfc6d5800d2ec06fe2a85199944618dc8747f1c2e90be1323bafbd6d0dea6f1432589a6fd0cd2160962b25a80d38efb532e551e414e0d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQKrBGAAoJEOSiRoyO7jvohi0P/12rhpbGCc68V1FJvV9Yk5Av
-YY+/u+UFfgjE+ZI3W+uuX4KPrSQ/cLsV4cSON5dCOs0UT4B8CohhlgphNONF151y
-AtStLAU7Cj9rCzknbcNzdkA+5mQggGnoChaRvN2KJgAuE4GqEHX5gzy0n5zw0S0v
-SsISnd8tT5r7s4Is7Bz3A35uCfSOh0HlA101fIQZ21r5Th8oh/hKsCjCU9mKJhUR
-VsGhdcTFm4bMLSzE2KAznvvluI37YAyGyD2NWkbTWGqdMLWfrQJ4NUnLhTCNJXyk
-7sH4jRNPv8FaR+/Gbzhlw+Qt5/EeZ5LHayh+YYz2GNJasMI7mYY0mHD8g4Z1JcNC
-4+wBPizoh+6/N3/+kTpYhISk2camiBLDvoYsIKTYjoyaYOr1s82jYppwMdQysyhG
-VdW9BjjNDOIjN9rHzIZnI656uRw+D2ePWMr8crFVpJpWgCL4exW38VGSV7ZmdB20
-wCJumIXc8mgWRF9pRvoGYo3u6Cz/MxpVOm/wdLYEkuHeyAdPip5rFSS+QNro11tr
-KeNHRnBGwssORDuCEXduuj/cQA5PVe13p/LKVetQg4f+POkKQZRJYAcBi+zhLSMt
-1efALle0orh4tVCZgvS4WzeAy/pW9DHQ1OkVLm5491sF3AXUT0YerTDnI5rv/hsZ
-X1B67xniIDKOA4mNuGt6
-=a37X
+iEUEAREIAAYFAlArdtAACgkQp5vW4rUFj5oDRQCVGNsEdo93zIZygkkN1uEnLNlu
+SwCggVFdvXeDntS0tcf06D+9pn4RnEk=
+=clmT
 -----END PGP SIGNATURE-----
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