commit: 9a45bfa717768ae1bc7f8c0093698888c928265b Author: Joonas Niilola <juippis <AT> gentoo <DOT> org> AuthorDate: Mon Nov 21 09:21:50 2022 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Mon Nov 21 09:21:50 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a45bfa7
www-apache/modsecurity-crs: switch to optfeature Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> www-apache/modsecurity-crs/metadata.xml | 3 --- www-apache/modsecurity-crs/modsecurity-crs-3.3.4.ebuild | 13 +++++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/www-apache/modsecurity-crs/metadata.xml b/www-apache/modsecurity-crs/metadata.xml index 5ddb96e8e1a1..a9f0c60e3080 100644 --- a/www-apache/modsecurity-crs/metadata.xml +++ b/www-apache/modsecurity-crs/metadata.xml @@ -2,9 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <!--maintainer-needed--> - <use> - <flag name="nginx">Adds support for nginx</flag> - </use> <upstream> <remote-id type="github">coreruleset/coreruleset</remote-id> </upstream> diff --git a/www-apache/modsecurity-crs/modsecurity-crs-3.3.4.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-3.3.4.ebuild index abbbd1ec3c43..9782d5529222 100644 --- a/www-apache/modsecurity-crs/modsecurity-crs-3.3.4.ebuild +++ b/www-apache/modsecurity-crs/modsecurity-crs-3.3.4.ebuild @@ -1,7 +1,9 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="8" +EAPI=8 + +inherit optfeature DESCRIPTION="OWASP ModSecurity Core Rule Set" HOMEPAGE="https://coreruleset.org/"; @@ -11,12 +13,9 @@ S="${WORKDIR}/coreruleset-${PV}" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="+apache2 nginx" +IUSE="+apache2" -RDEPEND=" - apache2? ( >=www-apache/mod_security-2.9.6 ) - nginx? ( >=dev-libs/modsecurity-3.0.8 ) -" +RDEPEND="apache2? ( >=www-apache/mod_security-2.9.6 )" DOCS=( CHANGES CONTRIBUTORS.md crs-setup.conf.example KNOWN_BUGS README.md ) @@ -39,4 +38,6 @@ pkg_postinst() { einfo "The CRS configuration file has been installed to:" einfo " ${ROOT}/etc/apache2/modules.d/80_mod_security-crs.conf" fi + + optfeature "apache-less installations, e.g. nginx" dev-libs/modsecurity }
