net-misc/bird: Build both CLIs, ncurses/readline version optional. Remove old.

Package-Manager: Portage-2.3.13, Repoman-2.3.3

diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index 70620907f30d91e5a1615dac60cb1fc350d5ae7a..21097c326b9ac4c1a9f957b2cbb6db7fd8a3db2d 100644 (file)
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -1,6 +1 @@
-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

diff --git a/net-misc/bird/bird-1.4.5.ebuild b/net-misc/bird/bird-1.4.5.ebuild
deleted file mode 100644 (file)
index 4804c17..0000000
--- 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 (file)
index 2cad4e3..0000000
--- 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 (file)
index 580dd56..0000000
--- 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 (file)
index 580dd56..0000000
--- 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
similarity index 74%
rename from net-misc/bird/bird-1.6.2.ebuild
rename to net-misc/bird/bird-1.6.3-r1.ebuild
index 580dd5694106dec7394b28e9d583196b63ea21b1..07a2f35e30707eea5ee5313e8efbaf4f3918eff0 100644 (file)
--- 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 1a06e96ebdc7530ab0d716fe439df6af7f725cf5..3be54ec47f3c3997b8c9ab6d723ec56a96543617 100644 (file)
--- 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>