gentoo resync : 16.01.2018

7 files changed, 19 insertions, 265 deletions

diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index 5eb9fb8a565a..6e465615c6d8 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -1,15 +1,6 @@
 AUX initd-v4-bird-1.3.8 801 BLAKE2B 09d9045299972580280fbb6d8745378a75b3a9e647b965d9033e6493df67ea268afba8ab95c46208894f330ff3607d90502653072eb73c130d1841cab9e604c2 SHA512 e878792e589317b743c53fa9fd1f5a4e04c6c97a64946a3e47a910c35d32ad265dcd860935e91950cddb97e1f6ab43c02157a5349e4bd4529cdd1539ca7cf879
 AUX initd-v6-bird-1.3.8 802 BLAKE2B a9dc698f9dfde93314fe1b0f4c8005d9b5f14e4133ebad124f4283a50d990c946bda88b1d55227ed6bf9f33caf0d716b0a8540adf592fbf156297c20ab8a3b1c SHA512 6adb2b7c22696e53644bb5331bcb1b6e84026e41086f6f538c40073a7daa3b0ce3a14e041c2615a72cbe151d6fa8f81b543f85d421f019440ef5b6fd0a556ad9
-DIST bird-1.4.5.tar.gz 1284666 BLAKE2B 46e233f41170cd888f0f1bee50e30d5d99b767a3a6cd9681c4d0091b325513efa7cc329be6549ec7d5c707cd97c90065d80a85212747cd0e34b908905d8b7c89 SHA512 fba60e7daacfdf86e3fa9cb4dc627d33928b4b84dca98d3bfbd378265e422b7ecfe10c2d17369d295afe8a5f1f2e771209bbd54710485a19d64e6551f16d6b94
-DIST bird-1.5.0.tar.gz 1300141 BLAKE2B fcce23b580552fead97ff0eb577cd1980a84381ba52138808e22f1fda9b0318c3e260e5ce996b52384ab090e25d67cbbcfdd12e1581ade035af187b4fc18ba26 SHA512 6814a1393d192083bc9807fd9c56e4bfe169aa34b70811f10da61c79d2fd4b18827bd4f3ea70d9ceba32125e54afb3f8df388416bff619c6f7e838a171f70ae8
-DIST bird-1.6.0.tar.gz 1273899 BLAKE2B 25c8c89f0609392fc47d8ef943f193b575f0fcf5209c6211ae34188ffb4381e830e00b582261e3970061d9f73866a309bc007e34fa1190f15f7a50f6c208d6fa SHA512 3b73c5aa26ac725547d8ff67c35008b6793ef4dc9f22940bacc3871f60abb77e41d93bef0e493d5808eea455e17a04bbba837f16665d726a0a80e73270fed67a
-DIST bird-1.6.1.tar.gz 1286450 BLAKE2B cad7febc28adaf0ea6fafca571611e38193904445bd0b9c2915073a7b2ac249ad5dd2c152a4ea5c95f0493cd95450fe350e34123730c76f6c1dd4aa8d60fbd8a SHA512 ac95aafdc0c94af32a9a78c7d9746bc085d6c4ba74e1acbf5ddf9c1f80a035ce6ece2adf66b1de54c9405e0887c79c6bbde3657c6c7cb727869b661fb7105196
-DIST bird-1.6.2.tar.gz 1300037 BLAKE2B 0a9949ed60dc40825c0fcc2045bee2f3b80617d80aed101aa7edd37cfca3ef398e1940d7c455330733a62c1feb0ca2f077b21cfd991b9e52d7ac797c514b0cbb SHA512 a45ef7fba6caec3ae3908a4cad83d5b5d75533f625bd9fd75d4c42aa1642e76ffd01b2d4f2fbaeffc298b525f426c726432a092d15c9d23e7ccf9ddfa6beeaa1
 DIST bird-1.6.3.tar.gz 1337198 BLAKE2B e1a4a5ec4f46980f77f7c69860343da50eadea54129f20b52302aca5cdf63b19370f8cc2642b480af621772ed7b49ed7ed61a38c486f22c055abbe6be210aab9 SHA512 d0f044cbbb3e5fe0624ad8ae58f5fa352ff41a9cd73f37d803431d9d148927bce52d8f2b82e31dd65c753c55b1034aaf8e15739a511e42cd2dd122b5cd1e15df
-EBUILD bird-1.4.5.ebuild 1115 BLAKE2B 95c0839af0f6d33913a5defe9751b652b182af474b2442d7878300cb8178a3147e9af4fe51fa70cf7eceed2a3d964a074eada3f57589b4592b54abb3a7dd6639 SHA512 8cadb81688945095b460e473dec075b6727752320e312603e9540c7d12f845c1ca5fb7c396050aa88de21b487190d0d72b1175722f06e00409d33844eff4f210
-EBUILD bird-1.5.0.ebuild 1115 BLAKE2B bede0314d13b3d37505d3a7549172904f3c839eb12caf41d7aed52e1371e595d3448ddbf612c0da0d8a6ce446653d4bfa70a4fd1580271c5b62afca1ae1fc1c9 SHA512 aa25e90d6aaa996b98767170412fe10d10ac9f75723651eb19a97db1d746cc634e061b193e8499bb0ac6adea9fbf261c9ee4098126b8ae1283e6c33d8ebbf8a1
-EBUILD bird-1.6.0.ebuild 1128 BLAKE2B c79e46d46ab73fb116b93810e2025a84a7460642d750707848dae6aa3750ec4aacd931e06833e49e10da6a0e9de5ec046d47f33cd450259a4c2120dee69eda54 SHA512 ff07b85bd0bcf0b9483099eccaaf2f1ccee42918d99416235330a5c43d6be7798a8981599020767569bf26c3ef52b82034ea5f0a2043c00d2c81b2849539babf
-EBUILD bird-1.6.1.ebuild 1128 BLAKE2B c79e46d46ab73fb116b93810e2025a84a7460642d750707848dae6aa3750ec4aacd931e06833e49e10da6a0e9de5ec046d47f33cd450259a4c2120dee69eda54 SHA512 ff07b85bd0bcf0b9483099eccaaf2f1ccee42918d99416235330a5c43d6be7798a8981599020767569bf26c3ef52b82034ea5f0a2043c00d2c81b2849539babf
-EBUILD bird-1.6.2.ebuild 1128 BLAKE2B c79e46d46ab73fb116b93810e2025a84a7460642d750707848dae6aa3750ec4aacd931e06833e49e10da6a0e9de5ec046d47f33cd450259a4c2120dee69eda54 SHA512 ff07b85bd0bcf0b9483099eccaaf2f1ccee42918d99416235330a5c43d6be7798a8981599020767569bf26c3ef52b82034ea5f0a2043c00d2c81b2849539babf
+EBUILD bird-1.6.3-r1.ebuild 1267 BLAKE2B 5ccf27da7c9039b6596eb0404e798ad5593c5844f690df66300721a136b9c9c4813804ef0d7f90dc2d027ca21e0926c35f899e7b5be512442a5fd0ed09513336 SHA512 e2c23c2431aa391dddb17d3ff52500bb2503d378fd522cfd3053165b15439ba27a09974c3d3055ed043a98aa807576c7a02472c2d6a86ee86cf8bc82cc9fa120
 EBUILD bird-1.6.3.ebuild 1128 BLAKE2B c79e46d46ab73fb116b93810e2025a84a7460642d750707848dae6aa3750ec4aacd931e06833e49e10da6a0e9de5ec046d47f33cd450259a4c2120dee69eda54 SHA512 ff07b85bd0bcf0b9483099eccaaf2f1ccee42918d99416235330a5c43d6be7798a8981599020767569bf26c3ef52b82034ea5f0a2043c00d2c81b2849539babf
-MISC metadata.xml 245 BLAKE2B 94154a8bdd62b19999d65d599876471c8e44c02209c12a20d75667a21eb873ad59b42d27536d54ff1274d57bad9d73d81eaacea36b8b02e01b40b9eb5e6c82d4 SHA512 c3c7907e50537dd94fdcec1da306eee2f050e5a456d369cd3df8c9bf36c810d811fe547418a8025e533916eb52a742d9feafae647b2957820d99ed962dad302e
+MISC metadata.xml 334 BLAKE2B c53abae724868a2a1e8ac40f84d7c35371a26c74d790975c0a73bb1df914e9d8bd9f6c541657b065f863e8837fae9168144a0d552d30debe9f7e63fcdf703078 SHA512 8bcd99ebbcb563836b5c63f61079594bb27dfb1ed0e35955e4a0a6faba02b82751ba6e58b1324b56bd8fd30799c8c75ba5f442c1e602efa905835ec2d8569330
diff --git a/net-misc/bird/bird-1.4.5.ebuild b/net-misc/bird/bird-1.4.5.ebuild
deleted file mode 100644
index 4804c17b02d8..000000000000
--- a/net-misc/bird/bird-1.4.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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="sys-devel/flex
-	sys-devel/bison
-	sys-devel/m4"
-
-src_prepare() {
-	mkdir ipv6
-	tar c --exclude ipv6 . | tar x -C ipv6
-}
-
-src_configure() {
-	econf \
-		--enable-client \
-		--disable-ipv6 \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable debug)
-
-	if use ipv6; then
-		cd ipv6
-		econf \
-			--enable-client \
-			--enable-ipv6 \
-			--localstatedir="${EPREFIX}/var" \
-			$(use_enable debug)
-	fi
-}
-
-src_compile() {
-	emake
-	if use ipv6; then
-		cd ipv6
-		emake
-	fi
-}
-
-src_install() {
-	if use ipv6; then
-		newbin ipv6/birdc birdc6
-		newsbin ipv6/bird bird6
-		newinitd "${FILESDIR}/initd-v6-${PN}-1.3.8" bird6
-	fi
-	dobin birdc
-	dosbin bird
-	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
-	dodoc doc/bird.conf.example
-}
diff --git a/net-misc/bird/bird-1.5.0.ebuild b/net-misc/bird/bird-1.5.0.ebuild
deleted file mode 100644
index 2cad4e37a202..000000000000
--- a/net-misc/bird/bird-1.5.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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="sys-devel/flex
-	sys-devel/bison
-	sys-devel/m4"
-
-src_prepare() {
-	mkdir ipv6
-	tar c --exclude ipv6 . | tar x -C ipv6
-}
-
-src_configure() {
-	econf \
-		--enable-client \
-		--disable-ipv6 \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable debug)
-
-	if use ipv6; then
-		cd ipv6
-		econf \
-			--enable-client \
-			--enable-ipv6 \
-			--localstatedir="${EPREFIX}/var" \
-			$(use_enable debug)
-	fi
-}
-
-src_compile() {
-	emake
-	if use ipv6; then
-		cd ipv6
-		emake
-	fi
-}
-
-src_install() {
-	if use ipv6; then
-		newbin ipv6/birdc birdc6
-		newsbin ipv6/bird bird6
-		newinitd "${FILESDIR}/initd-v6-${PN}-1.3.8" bird6
-	fi
-	dobin birdc
-	dosbin bird
-	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
-	dodoc doc/bird.conf.example
-}
diff --git a/net-misc/bird/bird-1.6.0.ebuild b/net-misc/bird/bird-1.6.0.ebuild
deleted file mode 100644
index 580dd5694106..000000000000
--- a/net-misc/bird/bird-1.6.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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="sys-devel/flex
-	sys-devel/bison
-	sys-devel/m4"
-
-src_prepare() {
-	mkdir ipv6
-	tar c --exclude ipv6 . | tar x -C ipv6
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--enable-client \
-		--disable-ipv6 \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable debug)
-
-	if use ipv6; then
-		cd ipv6
-		econf \
-			--enable-client \
-			--enable-ipv6 \
-			--localstatedir="${EPREFIX}/var" \
-			$(use_enable debug)
-	fi
-}
-
-src_compile() {
-	emake
-	if use ipv6; then
-		cd ipv6
-		emake
-	fi
-}
-
-src_install() {
-	if use ipv6; then
-		newbin ipv6/birdc birdc6
-		newsbin ipv6/bird bird6
-		newinitd "${FILESDIR}/initd-v6-${PN}-1.3.8" bird6
-	fi
-	dobin birdc
-	dosbin bird
-	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
-	dodoc doc/bird.conf.example
-}
diff --git a/net-misc/bird/bird-1.6.1.ebuild b/net-misc/bird/bird-1.6.1.ebuild
deleted file mode 100644
index 580dd5694106..000000000000
--- a/net-misc/bird/bird-1.6.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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="sys-devel/flex
-	sys-devel/bison
-	sys-devel/m4"
-
-src_prepare() {
-	mkdir ipv6
-	tar c --exclude ipv6 . | tar x -C ipv6
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--enable-client \
-		--disable-ipv6 \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable debug)
-
-	if use ipv6; then
-		cd ipv6
-		econf \
-			--enable-client \
-			--enable-ipv6 \
-			--localstatedir="${EPREFIX}/var" \
-			$(use_enable debug)
-	fi
-}
-
-src_compile() {
-	emake
-	if use ipv6; then
-		cd ipv6
-		emake
-	fi
-}
-
-src_install() {
-	if use ipv6; then
-		newbin ipv6/birdc birdc6
-		newsbin ipv6/bird bird6
-		newinitd "${FILESDIR}/initd-v6-${PN}-1.3.8" bird6
-	fi
-	dobin birdc
-	dosbin bird
-	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
-	dodoc doc/bird.conf.example
-}
diff --git a/net-misc/bird/bird-1.6.2.ebuild b/net-misc/bird/bird-1.6.3-r1.ebuild
index 580dd5694106..07a2f35e3070 100644
--- a/net-misc/bird/bird-1.6.2.ebuild
+++ b/net-misc/bird/bird-1.6.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,10 +10,10 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug ipv6"
+IUSE="+client debug ipv6"
 
-RDEPEND="sys-libs/ncurses
-	sys-libs/readline"
+RDEPEND="client? ( sys-libs/ncurses )
+	client? ( sys-libs/readline )"
 DEPEND="sys-devel/flex
 	sys-devel/bison
 	sys-devel/m4"
@@ -26,17 +26,17 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--enable-client \
 		--disable-ipv6 \
 		--localstatedir="${EPREFIX}/var" \
+		$(use_enable client) \
 		$(use_enable debug)
 
 	if use ipv6; then
 		cd ipv6
 		econf \
-			--enable-client \
 			--enable-ipv6 \
 			--localstatedir="${EPREFIX}/var" \
+			$(use_enable client) \
 			$(use_enable debug)
 	fi
 }
@@ -51,11 +51,17 @@ src_compile() {
 
 src_install() {
 	if use ipv6; then
-		newbin ipv6/birdc birdc6
+		if use client; then
+			newbin ipv6/birdc birdc6
+		fi
+		newbin ipv6/birdcl birdcl6
 		newsbin ipv6/bird bird6
 		newinitd "${FILESDIR}/initd-v6-${PN}-1.3.8" bird6
 	fi
-	dobin birdc
+	if use client; then
+		dobin birdc
+	fi
+	dobin birdcl
 	dosbin bird
 	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
 	dodoc doc/bird.conf.example
diff --git a/net-misc/bird/metadata.xml b/net-misc/bird/metadata.xml
index 1a06e96ebdc7..3be54ec47f3c 100644
--- a/net-misc/bird/metadata.xml
+++ b/net-misc/bird/metadata.xml
@@ -5,4 +5,7 @@
 		<email>chainsaw@gentoo.org</email>
 		<name>Tony Vroon</name>
 	</maintainer>
+	<use>
+		<flag name="client">Build the ncurses/readline full featured CLI</flag>
+	</use>
 </pkgmetadata>