gentoo resync : 24.02.2018

3 files changed, 10 insertions, 9 deletions

diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index 85a462d3b7bb..cd2257cf7061 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -14,9 +14,9 @@ AUX systemd/ripd.service 347 BLAKE2B eaca725f889ad7689ba246ecbc20aa78314cc60a5a7
 AUX systemd/ripngd.service 364 BLAKE2B e79e086c0bbe3ceb12fadc711a1c88a34034780807d6abc63cad390854140835ab477b7203b8c492baae297f7fbe3085791944d1b2db2a737930c1bf36a81465 SHA512 ccfd048152896ee7ebdc434554a080b8ba36444d4de1cd11b5d2408cddfeb2ea1312962460b9a761d1a2db31dd5e72cadddf1807f9783ac1c2a51fd52c85ad54
 AUX systemd/zebra.service 354 BLAKE2B e22f8e321c5116179937e9c681482e779436092a10548ea4e564a0005f102a8d6dbba17fe5ef2a3952752f1ca6b1539841ccfee25b4a7b03b9e9faca1618004b SHA512 d02a801a421c143cefb63abc3448b162505fb9063130523f939f1e6ad33c4b39f113d00e6d0c4ea7f53616fffa1aa2333bf33660b5ccb4d7fd9d4f048c5a979a
 DIST ht-20040304-classless-bgp.patch 1581 BLAKE2B 64df9a86c235c4f6d35be0f19fe1b056958ae2fa28bd2e9e8d9902e569a8f9a2925ba45396bb92e345bfcaf8ca1ef9136a433c615a5bd12a279e7c062939549a SHA512 3df102d8ab88aaee1f109a2310602d6f734f2268252e5e42df752df7db7abeac526e969289481c4abfe905dcd41c35dee65196c48ac320fe9d083305451476e8
-DIST quagga-1.2.1.tar.gz 2922514 BLAKE2B ab0a59c1162bb4ac8ba3a75c015a433e2022bc35cd2a4678dbc7c80510f8c687d944b5e2bac03e9d3362bdb20badb2c17228dfd4172eebc6c87b24b2be2276e4 SHA512 ab7693ccb0cfa0f9ed90cc2b626dcd27aa6cc52e626646a2a37914a01f4b38dd80bf8d0e35d8a6a113718e82024203dbc3704c017f7c5c07bcdc2fe0109e89eb
 DIST quagga-1.2.2.tar.gz 2986142 BLAKE2B 2c2326e015ed4ce7364a960b56108bbd04c184b7cd78dca0cac528cd2869e65e6efbd40c303ce2b6eb29eed809e8b384baa36329b365ae6799a5b25fa21daa4c SHA512 861f6524bcdc01d1a895762bf1904744c12ae4dfc7c3583ecb7e55b3978c98187bde76df0ff85093c744139be9d5cf324fec75b5ba86cf1fdbce70d923710d14
-EBUILD quagga-1.2.1.ebuild 3679 BLAKE2B c71ad696b777ddec0bdfcee4fbb142fc7c55aa7b3d676d1caf56515915aa0fef6d8c825da864c23a685d02f977b0cb9b6eec5335c2a952facaad136ec7efef2e SHA512 c17c0b0d74088b0dd05ca2c3a7fddc471ff5b1fcbb888b94c0117d73f4e74842e21e832923a050cef3fb3666fbba4d20d1a13b0a75836a902fc4b1a1da60d516
+DIST quagga-1.2.4.tar.gz 2925847 BLAKE2B e0e8d8b8e2243bc5cecc2e66d26040780f839414a16fb8a719d25a6fe1c29dc8545a92700a3758100715e1efb3d874584903885af51ef9f5d88c4a02d02dbc74 SHA512 3e72440bcccfd3c1a449a62b7ff8623441256399a2bee0a39fa0a19694a5a78ac909c5c2128a24735bc034ea8b0811827293b480a2584a3a4c8ae36be9cf1fcd
 EBUILD quagga-1.2.2-r1.ebuild 3753 BLAKE2B 460befe5cbd2ad7cda462bfcf47ce10064d4b930c458b0076e00ad7b2ca2f03dcd8c9245ba65b4d75437498d841c1ccd3987cf61db61205fcfa2f20aab21a50b SHA512 2b64bc0363275d7ab6da6dd1e9fdddc819a2fe6bce5a2878157ef82a38c78ff388e11cf6c683de336dc121ee04ed5ffbc81c59f251c8ac78faca3fbe5de3b75c
-EBUILD quagga-1.2.2.ebuild 3676 BLAKE2B 83ff52a209cebd66cae813a6767d0cef97e39fe61bd58bb88ff26df8ba73740868b8f7f4ccc6f74351cf75d01ba231b65a2a90126d68d9264cfa9e614a143897 SHA512 973c4f5a06d2c26c613a5e9ac5ef07e003d182ba7835f9cce754304fc78cdecb47b5607ec2590d4f1caeb642aff0a1e60a558cf7a847fe558c8b5b885df3b4ba
+EBUILD quagga-1.2.2.ebuild 3675 BLAKE2B 29d8900e617dd1a682dc592aa167a6d917484b21a264cd2d5a1e463a4b67fbaf7d00b843602e851b02a471a395176819a9c98efd95fd6cbec80b62d305fe9982 SHA512 ad383a681c9e0f1e196d26d34c6d1825d264d7b80f901688c3b081f40b993eafbc618eb94a43f118bfecf8361dfab018136a831162d8aebe8350d397b24ab6d1
+EBUILD quagga-1.2.4.ebuild 3678 BLAKE2B f7d3984970976d1878d59def3fdf77b28ff3369730f10c44a13edf70a4aa0c81dca32e80ebeaadea7fab2e99b1bc1e041a097d7a479524eb80beae318c9ed438 SHA512 f316d74f62c6eb9b037a1fd19cb13e781f5b81726169ebb7c856a9a5af69b090e609e47c24603c86c0ef106c5060b8f3a8678cbb5de3f1e2bc83014479f19aa9
 MISC metadata.xml 2375 BLAKE2B c3bb85308f39337c4bfe74dc7f373dbf3999fa38ee800d63b543f00771d580f52db69005227f778105209b703e1fa7e1ce88e4a6549f5fc673e8defcce4cd97b SHA512 77ae3e9edac846d80a8b9bf2cc6c7582bffbf9b43cffc0649dfdd1f3dcf528ebf0c99ebd70c4fe27c524f98ba453798de7f320d50f7b76287623b8ac8265a6db
diff --git a/net-misc/quagga/quagga-1.2.2.ebuild b/net-misc/quagga/quagga-1.2.2.ebuild
index 441faaf584b5..f4e67c358434 100644
--- a/net-misc/quagga/quagga-1.2.2.ebuild
+++ b/net-misc/quagga/quagga-1.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ppc ~s390 ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ppc ~s390 ~sparc x86"
 
 IUSE="bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline snmp tcp-zebra test"
 
diff --git a/net-misc/quagga/quagga-1.2.1.ebuild b/net-misc/quagga/quagga-1.2.4.ebuild
index 95640cd03056..f3cf905e3fc3 100644
--- a/net-misc/quagga/quagga-1.2.1.ebuild
+++ b/net-misc/quagga/quagga-1.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,9 +14,9 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~s390 sparc x86"
 
-IUSE="bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline snmp tcp-zebra"
+IUSE="bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline snmp tcp-zebra test"
 
 COMMON_DEPEND="
 	caps? ( sys-libs/libcap )
@@ -30,7 +30,8 @@ COMMON_DEPEND="
 	!elibc_glibc? ( dev-libs/libpcre )"
 DEPEND="${COMMON_DEPEND}
 	sys-apps/gawk
-	sys-devel/libtool:2"
+	sys-devel/libtool:2
+	test? ( dev-util/dejagnu )"
 RDEPEND="${COMMON_DEPEND}
 	sys-apps/iproute2"
 
@@ -89,7 +90,7 @@ src_configure() {
 		$(use_enable tcp-zebra) \
 		$(use_enable doc) \
 		$(usex multipath $(use_enable multipath) '' '=0' '') \
-		$(usex ospfapi '--enable-opaque-lsa --enable-ospf-te --enable-ospfclient' '' '' '') \
+		$(usex ospfapi '--enable-ospfclient' '' '' '') \
 		$(use_enable readline vtysh) \
 		$(use_with pam libpam) \
 		$(use_enable nhrpd) \