[gentoo-commits] repo/gentoo:master commit in: net-misc/quagga/

[Sergey Popov]

commit:     66139ead8c4ed55cdc06bf520b8710191e64200d
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  6 11:57:03 2016 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Thu Oct  6 11:57:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66139ead

net-misc/quagga: stabilize new revision

Transfer stable keywords from previous revision, drop old

Package-Manager: portage-2.2.28

 net-misc/quagga/quagga-1.0.20160315-r2.ebuild | 135 --------------------------
 net-misc/quagga/quagga-1.0.20160315-r3.ebuild |   2 +-
 2 files changed, 1 insertion(+), 136 deletions(-)

diff --git a/net-misc/quagga/quagga-1.0.20160315-r2.ebuild b/net-misc/quagga/quagga-1.0.20160315-r2.ebuild
deleted file mode 100644
index cdf60d6..00000000
--- a/net-misc/quagga/quagga-1.0.20160315-r2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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.xz
-	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 +readline snmp tcp-zebra"
-
-COMMON_DEPEND="
-	caps? ( sys-libs/libcap )
-	snmp? ( net-analyzer/net-snmp )
-	readline? (
-		sys-libs/readline:0
-		pam? ( sys-libs/pam )
-	)
-	!elibc_glibc? ( dev-libs/libpcre )"
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	sys-apps/gawk
-	sys-devel/libtool:2"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.99.22.4-ipctl-forwarding.patch"
-	"${FILESDIR}/${P}-ripd-null-pointer-fix.patch"
-	"${FILESDIR}/${P}-ospfd-dangling-pointer-fix.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}"
-
-	epatch ${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 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.0.20160315-r3.ebuild b/net-misc/quagga/quagga-1.0.20160315-r3.ebuild
index 5af09fe..c1d3e7c 100644
--- a/net-misc/quagga/quagga-1.0.20160315-r3.ebuild
+++ b/net-misc/quagga/quagga-1.0.20160315-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz
 
 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 doc elibc_glibc ipv6 multipath ospfapi pam +readline snmp tcp-zebra"