From 72e262ea799f7ed91d75d12007955750374a8230 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sun, 19 Sep 2021 01:56:47 +0100 Subject: www-servers/nginx-unit: revbump for libcrypt dependency See the tracker/wiki page. Fixes: 69589f3c571a1c6e934824403b281cc8c5d0d2ca Signed-off-by: Sam James --- www-servers/nginx-unit/nginx-unit-1.25.0-r1.ebuild | 91 ++++++++++++++++++++++ www-servers/nginx-unit/nginx-unit-1.25.0.ebuild | 91 ---------------------- 2 files changed, 91 insertions(+), 91 deletions(-) create mode 100644 www-servers/nginx-unit/nginx-unit-1.25.0-r1.ebuild delete mode 100644 www-servers/nginx-unit/nginx-unit-1.25.0.ebuild (limited to 'www-servers') diff --git a/www-servers/nginx-unit/nginx-unit-1.25.0-r1.ebuild b/www-servers/nginx-unit/nginx-unit-1.25.0-r1.ebuild new file mode 100644 index 000000000000..b4fa47193ab9 --- /dev/null +++ b/www-servers/nginx-unit/nginx-unit-1.25.0-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit flag-o-matic python-single-r1 systemd toolchain-funcs + +MY_P="unit-${PV}" +DESCRIPTION="Dynamic web and application server" +HOMEPAGE="https://unit.nginx.org" +SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +MY_USE="perl python ruby" +MY_USE_PHP="php7-3 php7-4" +IUSE="${MY_USE} ${MY_USE_PHP} ssl" +REQUIRED_USE="|| ( ${IUSE} ) + python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND="perl? ( dev-lang/perl:= ) + php7-3? ( dev-lang/php:7.3[embed] ) + php7-4? ( dev-lang/php:7.4[embed] ) + python? ( ${PYTHON_DEPS} ) + ruby? ( + dev-lang/ruby:* + dev-ruby/rubygems:* + ) + ssl? ( dev-libs/openssl:0= ) + virtual/libcrypt:0=" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-glibc-2.34.patch ) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + eapply_user + sed -i '/^CFLAGS/d' auto/make || die + default +} + +src_configure() { + local opt=( + --control=unix:/run/${PN}.sock + --log=/var/log/${PN} + --modules=$(get_libdir)/${PN} + --pid=/run/${PN}.pid + --prefix=/usr + --state=/var/lib/${PN} + ) + + use ssl && opt+=( --openssl ) + export AR="$(tc-getAR)" + export CC="$(tc-getCC)" + ./configure ${opt[@]} --ld-opt="${LDFLAGS}" || die "Core configuration failed" + + # Modules require position-independent code + append-cflags $(test-flags-CC -fPIC) + + for flag in ${MY_USE} ; do + if use ${flag} ; then + ./configure ${flag} || die "Module configuration failed: ${flag}" + fi + done + + for flag in ${MY_USE_PHP} ; do + if use ${flag} ; then + local php_slot="/usr/$(get_libdir)/${flag/-/.}" + ./configure php \ + --module=${flag} \ + --config=${php_slot}/bin/php-config \ + --lib-path=${php_slot}/$(get_libdir) || die "Module configuration failed: ${flag}" + fi + done +} + +src_install() { + default + + diropts -m 0770 + keepdir /var/lib/${PN} + newinitd "${FILESDIR}/${PN}.initd" ${PN} + systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service +} diff --git a/www-servers/nginx-unit/nginx-unit-1.25.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.25.0.ebuild deleted file mode 100644 index b4fa47193ab9..000000000000 --- a/www-servers/nginx-unit/nginx-unit-1.25.0.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit flag-o-matic python-single-r1 systemd toolchain-funcs - -MY_P="unit-${PV}" -DESCRIPTION="Dynamic web and application server" -HOMEPAGE="https://unit.nginx.org" -SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -MY_USE="perl python ruby" -MY_USE_PHP="php7-3 php7-4" -IUSE="${MY_USE} ${MY_USE_PHP} ssl" -REQUIRED_USE="|| ( ${IUSE} ) - python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND="perl? ( dev-lang/perl:= ) - php7-3? ( dev-lang/php:7.3[embed] ) - php7-4? ( dev-lang/php:7.4[embed] ) - python? ( ${PYTHON_DEPS} ) - ruby? ( - dev-lang/ruby:* - dev-ruby/rubygems:* - ) - ssl? ( dev-libs/openssl:0= ) - virtual/libcrypt:0=" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}"/${P}-glibc-2.34.patch ) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - eapply_user - sed -i '/^CFLAGS/d' auto/make || die - default -} - -src_configure() { - local opt=( - --control=unix:/run/${PN}.sock - --log=/var/log/${PN} - --modules=$(get_libdir)/${PN} - --pid=/run/${PN}.pid - --prefix=/usr - --state=/var/lib/${PN} - ) - - use ssl && opt+=( --openssl ) - export AR="$(tc-getAR)" - export CC="$(tc-getCC)" - ./configure ${opt[@]} --ld-opt="${LDFLAGS}" || die "Core configuration failed" - - # Modules require position-independent code - append-cflags $(test-flags-CC -fPIC) - - for flag in ${MY_USE} ; do - if use ${flag} ; then - ./configure ${flag} || die "Module configuration failed: ${flag}" - fi - done - - for flag in ${MY_USE_PHP} ; do - if use ${flag} ; then - local php_slot="/usr/$(get_libdir)/${flag/-/.}" - ./configure php \ - --module=${flag} \ - --config=${php_slot}/bin/php-config \ - --lib-path=${php_slot}/$(get_libdir) || die "Module configuration failed: ${flag}" - fi - done -} - -src_install() { - default - - diropts -m 0770 - keepdir /var/lib/${PN} - newinitd "${FILESDIR}/${PN}.initd" ${PN} - systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service -} -- cgit v1.2.3-65-gdbad