gentoo resync : 09.06.2018

3 files changed, 56 insertions, 11 deletions

diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index 916bc5c128cd..eaa754792784 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -1,6 +1,9 @@
 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.6.3.tar.gz 1337198 BLAKE2B e1a4a5ec4f46980f77f7c69860343da50eadea54129f20b52302aca5cdf63b19370f8cc2642b480af621772ed7b49ed7ed61a38c486f22c055abbe6be210aab9 SHA512 d0f044cbbb3e5fe0624ad8ae58f5fa352ff41a9cd73f37d803431d9d148927bce52d8f2b82e31dd65c753c55b1034aaf8e15739a511e42cd2dd122b5cd1e15df
+DIST bird-1.6.4.tar.gz 1018874 BLAKE2B f6ef0b952f6b00008fadcaa1c1a32ac31b42a9804e221edb75073e23ff942276bf1beee6d3f4c9d89f90339e99bb82a5953c17ff6963e5ff60d29a50f45e06d4 SHA512 5034d6bdca40ecddaed57bd4ab6e700828b89221bd3ce6d347aa9caa4dca65880c080ee3f276a8c31adde2de16402c8b7e7fd32dc4463d29d63b3f16b833b2eb
+DIST bird-2.0.2.tar.gz 1015224 BLAKE2B 3931c0431dc6511596e7214f6e2099548aafa69c951a44cd628443701eac061e8d95c387d74d81ad889988750c5bdb32a69ed77bfe655b161932017f1a1266a1 SHA512 aef96f246484a52269b44963df033ccc584e62d50d1ae31a97a97b9c7375e576d70d00f61a0f6da336e60cefc4c921945df0cc821d5fd1c737b19f508e65d30b
 EBUILD bird-1.6.3-r1.ebuild 1285 BLAKE2B 6d118b27f8bdf9ecf5ea2b5a4302c7c1c1bdb46ae3e266da97eb369532f9d815b718fd9cc211515a37b7027a1cb6f1571258c593641a0299bc7a5a90a3d21da7 SHA512 65dcb46fad1912e8d7f26d9597e7dcdc5f78e10d82fcc3cc4a211c03f2d395614d363b98c00283ca09704e0fe52a245f67e0ec41680eaeacbac931cd52d00bc9
-EBUILD bird-1.6.3.ebuild 1128 BLAKE2B c79e46d46ab73fb116b93810e2025a84a7460642d750707848dae6aa3750ec4aacd931e06833e49e10da6a0e9de5ec046d47f33cd450259a4c2120dee69eda54 SHA512 ff07b85bd0bcf0b9483099eccaaf2f1ccee42918d99416235330a5c43d6be7798a8981599020767569bf26c3ef52b82034ea5f0a2043c00d2c81b2849539babf
+EBUILD bird-1.6.4.ebuild 1285 BLAKE2B e728912943f43f666b0a96430cb48f9d4028627492ce03c87557af59cc78e5af6ac5f152fe63f7a1ef989b4028ec918fccda2f21b27c57f1e8530c2e3ec3ba56 SHA512 f94a5f28cc72dd35a853c5763fd28842cfd34ab0a8063db01e756e021c80191ac4cc40cc83f5fc980d93a5d00e2b777a9e902052db8fa9c50db5905d4a4bbf0b
+EBUILD bird-2.0.2.ebuild 774 BLAKE2B cdb92e8ef96464851c1b4d37b916ea705fb5b880cb89df18a093c411052e8363f15321da2bc400fd99cb8d33af5f6ab33668939a759e27028bca043961dc46bf SHA512 a14f8b83bf5d68a1c89c1ac8ab64f6f597893ea9ff004c904c7a3d009bb5ba4007a9607a30f987f423cf95aa7b8dda5040b94929d7a8e9f63f14e7775fb3f53e
 MISC metadata.xml 334 BLAKE2B c53abae724868a2a1e8ac40f84d7c35371a26c74d790975c0a73bb1df914e9d8bd9f6c541657b065f863e8837fae9168144a0d552d30debe9f7e63fcdf703078 SHA512 8bcd99ebbcb563836b5c63f61079594bb27dfb1ed0e35955e4a0a6faba02b82751ba6e58b1324b56bd8fd30799c8c75ba5f442c1e602efa905835ec2d8569330
diff --git a/net-misc/bird/bird-1.6.3.ebuild b/net-misc/bird/bird-1.6.4.ebuild
index 580dd5694106..ebdf7de5c1f3 100644
--- a/net-misc/bird/bird-1.6.3.ebuild
+++ b/net-misc/bird/bird-1.6.4.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
@@ -9,34 +9,34 @@ SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug ipv6"
+KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+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"
 
 src_prepare() {
+	eapply_user
 	mkdir ipv6
 	tar c --exclude ipv6 . | tar x -C ipv6
-	eapply_user
 }
 
 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/bird-2.0.2.ebuild b/net-misc/bird/bird-2.0.2.ebuild
new file mode 100644
index 000000000000..b5bd01fc5519
--- /dev/null
+++ b/net-misc/bird/bird-2.0.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 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 & IPv6"
+HOMEPAGE="http://bird.network.cz"
+SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+IUSE="+client debug"
+
+RDEPEND="client? ( sys-libs/ncurses )
+	client? ( sys-libs/readline )"
+DEPEND="sys-devel/flex
+	sys-devel/bison
+	sys-devel/m4"
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable client) \
+		$(use_enable debug)
+}
+
+src_install() {
+	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
+}