From abd9acf70f995568c38becb595a716a2107bcfed Mon Sep 17 00:00:00 2001 From: Sergey Popov Date: Thu, 22 Dec 2016 11:09:44 +0300 Subject: net-misc/quagga: revision bump Fix dependency for USE="protobuf", drop old revisions. Revision needs to be bumped, because new dep has subslot operator. Package-Manager: portage-2.3.2 --- net-misc/quagga/quagga-1.1.0-r1.ebuild | 135 --------------------------------- net-misc/quagga/quagga-1.1.0-r2.ebuild | 135 +++++++++++++++++++++++++++++++++ net-misc/quagga/quagga-1.1.0.ebuild | 134 -------------------------------- 3 files changed, 135 insertions(+), 269 deletions(-) delete mode 100644 net-misc/quagga/quagga-1.1.0-r1.ebuild create mode 100644 net-misc/quagga/quagga-1.1.0-r2.ebuild delete mode 100644 net-misc/quagga/quagga-1.1.0.ebuild (limited to 'net-misc/quagga') diff --git a/net-misc/quagga/quagga-1.1.0-r1.ebuild b/net-misc/quagga/quagga-1.1.0-r1.ebuild deleted file mode 100644 index d227b3af621b..000000000000 --- a/net-misc/quagga/quagga-1.1.0-r1.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.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: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" - "${FILESDIR}/${P}-supress-dev-build-logs.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.1.0-r2.ebuild b/net-misc/quagga/quagga-1.1.0-r2.ebuild new file mode 100644 index 000000000000..1cdfa85aaadb --- /dev/null +++ b/net-misc/quagga/quagga-1.1.0-r2.ebuild @@ -0,0 +1,135 @@ +# 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.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" + "${FILESDIR}/${P}-supress-dev-build-logs.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.1.0.ebuild b/net-misc/quagga/quagga-1.1.0.ebuild deleted file mode 100644 index e85000b6d80a..000000000000 --- a/net-misc/quagga/quagga-1.1.0.ebuild +++ /dev/null @@ -1,134 +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.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: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}" - - 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 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 -} -- cgit v1.2.3-65-gdbad