From e9b069895ebc7bebaef1da05af2816de772388d1 Mon Sep 17 00:00:00 2001 From: Rene Ladan Date: Fri, 1 Jan 2021 16:36:05 +0000 Subject: net-mgmt/flowd: remove optional support for expired Python2.7 Also suggested by maintainer (bofh) PR: 249740 Submitted by: swills --- net-mgmt/flowd/Makefile | 12 +----------- net-mgmt/flowd/pkg-descr | 2 +- net-mgmt/flowd/pkg-plist | 2 -- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/net-mgmt/flowd/Makefile b/net-mgmt/flowd/Makefile index 72ec4c27d5bd..e74165793b41 100644 --- a/net-mgmt/flowd/Makefile +++ b/net-mgmt/flowd/Makefile @@ -26,15 +26,12 @@ FLOWD_USER= _flowd USERS= ${FLOWD_USER} GROUPS= ${FLOWD_USER} -OPTIONS_DEFINE= PERL PYTHON DOCS EXAMPLES +OPTIONS_DEFINE= PERL DOCS EXAMPLES OPTIONS_DEFAULT=PERL OPTIONS_SUB= yes PERL_DESC= Install flowd perl module PERL_USES= perl5 -PYTHON_DESC= Install flowd Python support -PYTHON_USES= python:2.7 -PYTHON_PLIST_SUB= PYTHON_VER=${PYTHON_VER} post-patch: @${REINPLACE_CMD} -e "s;%%FLOWD_USER%%;${FLOWD_USER};g" \ @@ -46,9 +43,6 @@ post-build-PERL-on: DESTDIR=${STAGEDIR} PREFIX=${PREFIX} && \ ${MAKE_CMD}) -post-build-PYTHON-on: - ( cd ${WRKSRC} && ${PYTHON_CMD} setup.py build ) - pre-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} @@ -61,8 +55,4 @@ pre-install-PERL-on: ( cd ${WRKSRC}/Flowd-perl && ${MAKE_CMD} install ) @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Flowd/Flowd.so -pre-install-PYTHON-on: - ( cd ${WRKSRC} && ${PYTHON_CMD} setup.py install --root "${STAGEDIR}" ) - @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/flowd.so - .include diff --git a/net-mgmt/flowd/pkg-descr b/net-mgmt/flowd/pkg-descr index 0d23fe901591..3c651d5c8aea 100644 --- a/net-mgmt/flowd/pkg-descr +++ b/net-mgmt/flowd/pkg-descr @@ -7,7 +7,7 @@ features: * Supports filtering and tagging of flows, using a packet filter-like syntax * Stores recorded flow data in a compact binary format which supports run-time choice over which flow fields are stored - * Ships with both Perl and Python interfaces for reading and parsing the + * Ships with Perl interface for reading and parsing the on-disk record format * Is licensed under a liberal BSD-like license diff --git a/net-mgmt/flowd/pkg-plist b/net-mgmt/flowd/pkg-plist index d1eccf10b45e..8a5765dede69 100644 --- a/net-mgmt/flowd/pkg-plist +++ b/net-mgmt/flowd/pkg-plist @@ -11,8 +11,6 @@ lib/libflowd.a %%PERL%%%%PERL5_MAN3%%/Flowd.3.gz %%PERL%%%%SITE_ARCH%%/Flowd.pm %%PERL%%%%SITE_ARCH%%/auto/Flowd/Flowd.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/flowd-0.9.1-py%%PYTHON_VER%%.egg-info -%%PYTHON%%%%PYTHON_SITELIBDIR%%/flowd.so man/man5/flowd.conf.5.gz man/man8/flowd-reader.8.gz man/man8/flowd.8.gz -- cgit v1.2.3