gentoo resync : 01.12.2017

3 files changed, 11 insertions, 148 deletions

diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index 9bf3fe1355ff..be148adadb9e 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -11,11 +11,9 @@ AUX systemd/quagga.conf 33 BLAKE2B 58926119e2e5fe2050c33e598c9a6ef30f792d2c31b98
 AUX systemd/ripd.service 347 BLAKE2B eaca725f889ad7689ba246ecbc20aa78314cc60a5a7d648ed3196afc2272fa0b968b0de088b7e34087d08d25ea053c0756e9cf9d35b358818c8639a4e0ec5d44 SHA512 4251609529c0fe7b8cee1191eae3d13ae1813d5d9544d2844df7e135f341f84cfd2192e6331bb2642da3637f7dd2ec29ffa93df918ecc1e071cfb45802ceabee
 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 SHA256 39993890f9e31d662ed0564c732fb22392a901beb45b64261ffeadd9edf27887 SHA512 3df102d8ab88aaee1f109a2310602d6f734f2268252e5e42df752df7db7abeac526e969289481c4abfe905dcd41c35dee65196c48ac320fe9d083305451476e8 WHIRLPOOL cef99d64d52ab8c28bd672fb93dfbd8d716a31c76a5403496a6d104a5ff39531d6085134124d41fe4ff7adf895fa001cbe77b6e42846d849d6c108c81583d04e
-DIST quagga-1.1.1.tar.gz 2871705 SHA256 b5a94e5bdad3062e04595a5692b8cc435f0a85102f75dfdca0a06d093b4ef63f SHA512 51eb64ada07b42c663705cedf56be5b8b54143a5543b472e3dc7c703a4ab0542f39cfbeed64d1c33ceee6a15ea8d25ef84616fa40b6bf9cc32023f7241c18c58 WHIRLPOOL 795aa54b7930c441cbbc40a67db75865ccecada523164c906dd4a1b385b51820bff061ca58265fc67d1a814c8162d8b6e6758a4aab47ba54dab58cf846cb28be
-DIST quagga-1.2.0.tar.gz 2948778 SHA256 1043644d37975d9f920b76c593368cbe36ca43e27eb57cff316ee80ccb31dce3 SHA512 0ad28b828c2e52ad486189bd68e21041fe7c4affada7e3f12ba83a95f3532e0b012ba6b4271f9d0de63d4f5b15e80c706977b3afa54b57a3a5ec02400227d5ae WHIRLPOOL b4c73c4f7c99c971d762fbde79d5c6776b11b36d8a9b58e9c7cb5d322818ef8b6d90ca5c3f4c55f9b3353ae65042a99b41d39049b0a2f254bbd8904e5136ecce
-DIST quagga-1.2.1.tar.gz 2922514 SHA256 aaddba5d4f41ed8e4c2f155f4584c993465d122c9096b5b52ada3fc75266fbcd SHA512 ab7693ccb0cfa0f9ed90cc2b626dcd27aa6cc52e626646a2a37914a01f4b38dd80bf8d0e35d8a6a113718e82024203dbc3704c017f7c5c07bcdc2fe0109e89eb WHIRLPOOL aeaa20e007a77a8bda469c847ae4de904c8987973e6ad4e358b59c5847226060417efdec8952aa79f8698b76f10da0c257034873365402215d05205e4a1fa866
-EBUILD quagga-1.1.1.ebuild 3614 BLAKE2B 820408c4c5259a4f2e74296b7bdb8211d0aeef089b4843d7e30e68cbf8ea094466fec738a0a436a58a92d197f2d6dee3047a7e210a6e077e19dcf4f77e49fc68 SHA512 93b78444d67d4206ec008566a3953c7c4c05ab325f79b3c9d29029ec9ded97283c48e376dfc273496598e7e8a7c665f74e08970ad9ee78bcdf39b4e19f1f698a
-EBUILD quagga-1.2.0-r2.ebuild 3734 BLAKE2B c9ff70d32976d36afe4548824e574e567375717bcb321cbc69a2b160020c4ab27b7cfa40828366f4c97ecafe0271c0b607ad67a732e1fe66b8a3b79da94429e1 SHA512 c6317db3cc11f0d6f941a0665c52fc1b1af7648dea08a5d44a0cad1f218c2b14d4ae19d8b7d8f71a8776a2ef1a0975f9335a32fd5197bff19aecb5312a12d60f
+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
+EBUILD quagga-1.2.2.ebuild 3647 BLAKE2B a8efa0d6375ab32edae0b0ed76e265ac9cb3242c6728dff37bc5ed9c8419b74af72c5cf0a7a66433bd01c5b182b6b22e0c1167fa1dedfaf5e5fb145cd8569d24 SHA512 2c4fdfff487cf0ba7d31994b2908cd02d6e84f2c386f6b5464569b9cd3be2daedfd70c28c72c28e4b923c3c0abf9072c6aa6617359d7ad43945d15d13347635b
 MISC metadata.xml 2375 BLAKE2B c3bb85308f39337c4bfe74dc7f373dbf3999fa38ee800d63b543f00771d580f52db69005227f778105209b703e1fa7e1ce88e4a6549f5fc673e8defcce4cd97b SHA512 77ae3e9edac846d80a8b9bf2cc6c7582bffbf9b43cffc0649dfdd1f3dcf528ebf0c99ebd70c4fe27c524f98ba453798de7f320d50f7b76287623b8ac8265a6db
diff --git a/net-misc/quagga/quagga-1.1.1.ebuild b/net-misc/quagga/quagga-1.1.1.ebuild
deleted file mode 100644
index 0cf903443f32..000000000000
--- a/net-misc/quagga/quagga-1.1.1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CLASSLESS_BGP_PATCH=ht-20040304-classless-bgp.patch
-
-inherit autotools eutils flag-o-matic multilib pam readme.gentoo-r1 systemd user
-
-DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP"
-HOMEPAGE="http://quagga.net/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
-	bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/${CLASSLESS_BGP_PATCH} )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ~s390 sparc x86"
-
-IUSE="bgpclassless caps doc elibc_glibc ipv6 multipath ospfapi pam protobuf +readline snmp tcp-zebra"
-
-COMMON_DEPEND="
-	caps? ( sys-libs/libcap )
-	protobuf? ( dev-libs/protobuf-c:0= )
-	readline? (
-		sys-libs/readline:0=
-		pam? ( sys-libs/pam )
-	)
-	snmp? ( net-analyzer/net-snmp )
-	!elibc_glibc? ( dev-libs/libpcre )"
-DEPEND="${COMMON_DEPEND}
-	sys-apps/gawk
-	sys-devel/libtool:2"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.99.22.4-ipctl-forwarding.patch"
-)
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="Sample configuration files can be found in /usr/share/doc/${PF}/samples
-You have to create config files in /etc/quagga before
-starting one of the daemons.
-
-You can pass additional options to the daemon by setting the EXTRA_OPTS
-variable in their respective file in /etc/conf.d"
-
-pkg_setup() {
-	enewgroup quagga
-	enewuser quagga -1 -1 /var/empty quagga
-}
-
-src_prepare() {
-	# Classless prefixes for BGP
-	# http://hasso.linux.ee/doku.php/english:network:quagga
-	use bgpclassless && eapply -p0 "${DISTDIR}/${CLASSLESS_BGP_PATCH}"
-
-	eapply "${PATCHES[@]}"
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	# do not build PDF docs
-	export ac_cv_prog_PDFLATEX=no
-	export ac_cv_prog_LATEXMK=no
-
-	econf \
-		--enable-exampledir=/usr/share/doc/${PF}/samples \
-		--enable-irdp \
-		--enable-isisd \
-		--enable-isis-topology \
-		--enable-pimd \
-		--enable-user=quagga \
-		--enable-group=quagga \
-		--enable-vty-group=quagga \
-		--with-cflags="${CFLAGS}" \
-		--with-pkg-extra-version="-gentoo" \
-		--sysconfdir=/etc/quagga \
-		--localstatedir=/run/quagga \
-		--disable-static \
-		$(use_enable caps capabilities) \
-		$(usex snmp '--enable-snmp' '' '' '') \
-		$(use_enable !elibc_glibc pcreposix) \
-		$(use_enable tcp-zebra) \
-		$(use_enable doc) \
-		$(usex multipath $(use_enable multipath) '' '=0' '') \
-		$(usex ospfapi '--enable-opaque-lsa --enable-ospf-te --enable-ospfclient' '' '' '') \
-		$(use_enable readline vtysh) \
-		$(use_with pam libpam) \
-		$(use_enable protobuf) \
-		$(use_enable ipv6 ripngd) \
-		$(use_enable ipv6 ospf6d) \
-		$(use_enable ipv6 rtadv)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-	readme.gentoo_create_doc
-
-	keepdir /etc/quagga
-	fowners root:quagga /etc/quagga
-	fperms 0770 /etc/quagga
-
-	# Path for PIDs before first reboot should be created here, bug #558194
-	dodir /run/quagga
-	fowners quagga:quagga /run/quagga
-	fperms 0770 /run/quagga
-
-	# Install systemd-related stuff, bug #553136
-	systemd_dotmpfilesd "${FILESDIR}/systemd/quagga.conf"
-	systemd_dounit "${FILESDIR}/systemd/zebra.service"
-
-	# install zebra as a file, symlink the rest
-	newinitd "${FILESDIR}"/quagga-services.init.3 zebra
-
-	for service in bgpd isisd ospfd pimd ripd $(use ipv6 && echo ospf6d ripngd); do
-		dosym zebra /etc/init.d/${service}
-		systemd_dounit "${FILESDIR}/systemd/${service}.service"
-	done
-
-	use readline && use pam && newpamd "${FILESDIR}/quagga.pam" quagga
-
-	insinto /etc/logrotate.d
-	newins redhat/quagga.logrotate quagga
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-misc/quagga/quagga-1.2.0-r2.ebuild b/net-misc/quagga/quagga-1.2.2.ebuild
index 6897c5f9eac8..0b061a38a75e 100644
--- a/net-misc/quagga/quagga-1.2.0-r2.ebuild
+++ b/net-misc/quagga/quagga-1.2.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 CLASSLESS_BGP_PATCH=ht-20040304-classless-bgp.patch
 
-inherit autotools eutils flag-o-matic multilib pam readme.gentoo-r1 systemd user
+inherit autotools eutils flag-o-matic multilib pam readme.gentoo-r1 systemd tmpfiles user
 
 DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP"
 HOMEPAGE="http://quagga.net/"
@@ -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"
 
@@ -89,7 +89,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) \
@@ -108,13 +108,8 @@ src_install() {
 	fowners root:quagga /etc/quagga
 	fperms 0770 /etc/quagga
 
-	# Path for PIDs before first reboot should be created here, bug #558194
-	dodir /run/quagga
-	fowners quagga:quagga /run/quagga
-	fperms 0770 /run/quagga
-
 	# Install systemd-related stuff, bug #553136
-	systemd_dotmpfilesd "${FILESDIR}/systemd/quagga.conf"
+	dotmpfiles "${FILESDIR}/systemd/quagga.conf"
 	systemd_dounit "${FILESDIR}/systemd/zebra.service"
 
 	# install zebra as a file, symlink the rest
@@ -132,5 +127,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	# Path for PIDs before first reboot should be created here, bug #558194
+	tmpfiles_process quagga.conf
+
 	readme.gentoo_print_elog
 }