From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DC1C9138306 for ; Wed, 13 Jul 2016 17:25:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 054FE21C228; Wed, 13 Jul 2016 17:25:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5ADFE21C228 for ; Wed, 13 Jul 2016 17:25:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DC481340BCD for ; Wed, 13 Jul 2016 17:25:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 932C7244E for ; Wed, 13 Jul 2016 17:25:44 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1468430954.951bbd7e60ff137134aec0026703b5ecf87c56f4.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/flow-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/flow-tools/flow-tools-0.68.5.1-r4.ebuild net-analyzer/flow-tools/flow-tools-0.68.5.1-r5.ebuild net-analyzer/flow-tools/flow-tools-0.68.5.1-r6.ebuild X-VCS-Directories: net-analyzer/flow-tools/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 951bbd7e60ff137134aec0026703b5ecf87c56f4 X-VCS-Branch: master Date: Wed, 13 Jul 2016 17:25:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 16f60bf9-7208-425b-8856-424799eb4c22 X-Archives-Hash: 76fd2bc4ced17e29ca3fc7ed654a5870 commit: 951bbd7e60ff137134aec0026703b5ecf87c56f4 Author: Anthony G. Basile gentoo org> AuthorDate: Wed Jul 13 17:25:00 2016 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Wed Jul 13 17:29:14 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=951bbd7e net-analyzer/flow-tools: add libressl support Package-Manager: portage-2.2.28 .../flow-tools/flow-tools-0.68.5.1-r4.ebuild | 72 ---------------------- .../flow-tools/flow-tools-0.68.5.1-r5.ebuild | 72 ---------------------- .../flow-tools/flow-tools-0.68.5.1-r6.ebuild | 13 ++-- 3 files changed, 8 insertions(+), 149 deletions(-) diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r4.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r4.ebuild deleted file mode 100644 index ea94ae5..0000000 --- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r4.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils user - -DESCRIPTION="library and programs to collect, send, process, and generate reports from NetFlow data" -HOMEPAGE="https://code.google.com/p/flow-tools/" -SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug mysql postgres ssl static-libs" - -RDEPEND="sys-apps/tcp-wrappers - sys-libs/zlib - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql ) - ssl? ( dev-libs/openssl )" - -DEPEND="${RDEPEND} - sys-devel/flex - sys-devel/bison" - -DOCS=( ChangeLog README SECURITY TODO ) - -pkg_setup() { - enewgroup flows - enewuser flows -1 -1 /var/lib/flows flows -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-run.patch - epatch "${FILESDIR}"/${P}-syslog.patch -} - -src_configure() { - econf \ - $(use_enable static-libs static) \ - $(usex mysql --with-mysql '') \ - $(usex postgres --with-postgresql=yes --with-postgresql=no) \ - $(usex ssl --with-openssl '') \ - --sysconfdir=/etc/flow-tools -} - -src_install() { - default - - prune_libtool_files - - exeinto /var/lib/flows/bin - doexe "${FILESDIR}"/linkme - - keepdir /var/lib/flows/ft - - newinitd "${FILESDIR}/flowcapture.initd" flowcapture - newconfd "${FILESDIR}/flowcapture.confd" flowcapture - - fowners flows:flows /var/lib/flows - fowners flows:flows /var/lib/flows/bin - fowners flows:flows /var/lib/flows/ft - - fperms 0755 /var/lib/flows - fperms 0755 /var/lib/flows/bin -} - -pkg_preinst() { - enewgroup flows - enewuser flows -1 -1 /var/lib/flows flows -} diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r5.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r5.ebuild deleted file mode 100644 index ea94ae5..0000000 --- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r5.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils user - -DESCRIPTION="library and programs to collect, send, process, and generate reports from NetFlow data" -HOMEPAGE="https://code.google.com/p/flow-tools/" -SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug mysql postgres ssl static-libs" - -RDEPEND="sys-apps/tcp-wrappers - sys-libs/zlib - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql ) - ssl? ( dev-libs/openssl )" - -DEPEND="${RDEPEND} - sys-devel/flex - sys-devel/bison" - -DOCS=( ChangeLog README SECURITY TODO ) - -pkg_setup() { - enewgroup flows - enewuser flows -1 -1 /var/lib/flows flows -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-run.patch - epatch "${FILESDIR}"/${P}-syslog.patch -} - -src_configure() { - econf \ - $(use_enable static-libs static) \ - $(usex mysql --with-mysql '') \ - $(usex postgres --with-postgresql=yes --with-postgresql=no) \ - $(usex ssl --with-openssl '') \ - --sysconfdir=/etc/flow-tools -} - -src_install() { - default - - prune_libtool_files - - exeinto /var/lib/flows/bin - doexe "${FILESDIR}"/linkme - - keepdir /var/lib/flows/ft - - newinitd "${FILESDIR}/flowcapture.initd" flowcapture - newconfd "${FILESDIR}/flowcapture.confd" flowcapture - - fowners flows:flows /var/lib/flows - fowners flows:flows /var/lib/flows/bin - fowners flows:flows /var/lib/flows/ft - - fperms 0755 /var/lib/flows - fperms 0755 /var/lib/flows/bin -} - -pkg_preinst() { - enewgroup flows - enewuser flows -1 -1 /var/lib/flows flows -} diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r6.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r6.ebuild index 501d9f9..087e3c9 100644 --- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r6.ebuild +++ b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r6.ebuild @@ -1,24 +1,27 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 inherit eutils user -DESCRIPTION="library and programs to collect, send, process, and generate reports from NetFlow data" +DESCRIPTION="library and programs to process reports from NetFlow data" HOMEPAGE="https://code.google.com/p/flow-tools/" SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2" LICENSE="BSD GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug mysql postgres ssl static-libs" +IUSE="debug libressl mysql postgres ssl static-libs" RDEPEND="sys-apps/tcp-wrappers sys-libs/zlib mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql ) - ssl? ( dev-libs/openssl )" + postgres? ( dev-db/postgresql:* ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + )" DEPEND="${RDEPEND} sys-devel/flex