summaryrefslogtreecommitdiff
path: root/www-servers/nginx-unit
diff options
context:
space:
mode:
Diffstat (limited to 'www-servers/nginx-unit')
-rw-r--r--www-servers/nginx-unit/Manifest6
-rw-r--r--www-servers/nginx-unit/files/auto-make.patch14
-rw-r--r--www-servers/nginx-unit/files/auto-os-conf.patch109
-rw-r--r--www-servers/nginx-unit/nginx-unit-1.17.0.ebuild2
-rw-r--r--www-servers/nginx-unit/nginx-unit-1.8.0.ebuild65
5 files changed, 2 insertions, 194 deletions
diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index 820b9ccf39a1..a2064903d19c 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -1,8 +1,4 @@
-AUX auto-make.patch 368 BLAKE2B ca9b0f4fe616edefb11806a6919835ad215e5b1bf4f0ca678737f1ecff787af11cc9ecd6624e6bc27548917545c72fb09df600900d7b5bbabdf766f653e17646 SHA512 507ed06a1e57d466e9e99a1bc56694211f21cb688f68450ec138b0983e0d5bf80ad426ff07e6865f66abf417200c177846211db95ea261054dbdb296deae1b95
-AUX auto-os-conf.patch 3777 BLAKE2B 759053595665eea70d7119a31e49d9dc234b7684078781eef234e6cb2a50a401729edc7380cd7ffd64826a900167badb5bf3922c6e395a999ede1e15d2e3a28f SHA512 5e156343aa65e4c08ca3b6f6721d8564dde9ed2903a03165d8c96036cdba6f0bcd813b45a394b8684f9e06281d5a28ea0d161611c470280e639158e63816f319
AUX nginx-unit.initd 288 BLAKE2B 94caaeee62d93cdb3b9240bc6563fabe9b273b2125f9ec0c1ae0a2b079bef89b94f7e3a748d649a0840595f46047cee7ea388bd9514d1da88bb4a041a4a2c8ef SHA512 52a788e21a9aaa90a470a7861cd9856e3c2d2c52e3b4a23276c8b43e2a22f6f5aaec78caaf5f449463f1b856e0ffd83515e583f0ced00eada2d0afc00949ca77
DIST nginx-unit-1.17.0.tar.gz 726928 BLAKE2B d171f2f818302cb0f491ccc3ca93596ee52817647cf1f2f176ebed075cb1dd5772f133d9e925075fe72d826a63b4c4debddace8784612196ebe6b6655d70571b SHA512 4175fc6dd84ad8a3bbdc117d3ce0c7a11c708a7a204ade0bb40f5606f6923e351bb1a8f1f8394c09cdf12fdc20bc927920412dc4b41d3141f76482db047c4bed
-DIST nginx-unit-1.8.0.tar.gz 511226 BLAKE2B e396b27954840a5f1ad3a4cd9501a5e5fe769a754c51043da784a2c4596e6acc33089f495bf412a0db086e5c715a51292c7dece004a6512564421a431b6c339e SHA512 1d0ad05343ff70aff4c6e221a36c20df95fa2e2262ae5c69963a9bcb9ef883151e8a2fa9fef29f43ac5489aa5cbb3e9dfd10cf5e7f6d7a98742b490ebf3a0413
-EBUILD nginx-unit-1.17.0.ebuild 1954 BLAKE2B a889f8b1f34ea66df35e682bf26f7e22462076efad22cc6f6cb41c182ee80bd4c7687c8742b5364ecfac3dd5a04d148fedbef3b6ad70ba123aa7697060603f87 SHA512 21ec634694b9761493395d4ca72193840e152e16888f777ca382e96a6e3743583a0368854081373b6730e0ceea212a6100ab7c5c8938285afc617a206788cd67
-EBUILD nginx-unit-1.8.0.ebuild 1602 BLAKE2B c35777bed33ab33da0458037c03702d91a6596d6b5b5a1a11197cb3961d53b523a5a8be7a8a4d52735fa66aabb430467913d0e9f122930e69b44302e764145c2 SHA512 3c500bf702ce9e09118d68339fff0eabd7cf01be05e25bd3179d21a32f13e39a7513f10480da3595d462392572f36a2a1ef4698a8b51a8adb1e44177b0f408fa
+EBUILD nginx-unit-1.17.0.ebuild 1953 BLAKE2B 8942de82799f70fae7997d63d34a9fe2f5ea056d288c3b07ca83e1dc36b68604959fd847bb291838a8bcffbd0bef0e084ec097c70e6c9368859437f79dcda3a7 SHA512 27ca570d72ebabaa53584dfcb66757692aa49b13133dde98a60dda1ec67b9cfb0d3ce78e3ea884e7355d3f55510179d5bb509d73ad793a03a6939aed4d14ffe4
MISC metadata.xml 949 BLAKE2B 47faacf65d957c617419ef5183d99b77421bd45dd4499263eda7097fecc73633a085c05833e5b375e70865c4b12e6e02e224fdded5fed0e9eee19d44eb525e26 SHA512 c8073b3eea6233733ac01329aab48e51dd43fc6deb9c8ca8b482dbcb3df781069d750d0002f203309cebf64890d517b1ed900a9cda62e4a028fd2fd721a7f5c7
diff --git a/www-servers/nginx-unit/files/auto-make.patch b/www-servers/nginx-unit/files/auto-make.patch
deleted file mode 100644
index 9a157ed6a86d..000000000000
--- a/www-servers/nginx-unit/files/auto-make.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/auto/make 2019-10-03 16:08:32.000000000 +0200
-+++ b/auto/make 2019-10-31 16:57:43.354566956 +0100
-@@ -13,10 +13,9 @@
-
- cat << END > $NXT_MAKEFILE
-
-+AR = $AR
- CC = $CC
-
--CFLAGS = $NXT_CFLAGS $NXT_CC_OPT $CFLAGS
--
- NXT_EXEC_LINK = $NXT_EXEC_LINK $NXT_LD_OPT
- NXT_SHARED_LOCAL_LINK = $NXT_SHARED_LOCAL_LINK $NXT_LD_OPT
- NXT_MODULE_LINK = $NXT_MODULE_LINK
diff --git a/www-servers/nginx-unit/files/auto-os-conf.patch b/www-servers/nginx-unit/files/auto-os-conf.patch
deleted file mode 100644
index e1d6775f9350..000000000000
--- a/www-servers/nginx-unit/files/auto-os-conf.patch
+++ /dev/null
@@ -1,109 +0,0 @@
---- a/auto/os/conf 2019-10-31 17:17:33.194445276 +0100
-+++ b/auto/os/conf 2019-10-31 17:19:51.780033224 +0100
-@@ -21,7 +21,7 @@
- Linux)
- nxt_have=NXT_LINUX . auto/have
-
-- NXT_STATIC_LINK="ar -r -c"
-+ NXT_STATIC_LINK="\$(AR) -r -c"
- NXT_SHARED_LINK="\$(CC) -shared -Wl,-soname,libnxt.so"
- NXT_SHARED_LOCAL_LINK="\$(CC) -shared \
- -Wl,-soname,\\\$\$ORIGIN/libnxt.so"
-@@ -44,7 +44,7 @@
- FreeBSD)
- nxt_have=NXT_FREEBSD . auto/have
-
-- NXT_STATIC_LINK="ar -r -c"
-+ NXT_STATIC_LINK="\$(AR) -r -c"
- NXT_SHARED_LINK="\$(CC) -shared -Wl,-soname,libnxt.so"
- NXT_SHARED_LOCAL_LINK="\$(CC) -shared \
- -Wl,-soname,\\\$\$ORIGIN/libnxt.so"
-@@ -71,14 +71,14 @@
- case "$NXT_CC_NAME" in
-
- SunC):
-- NXT_STATIC_LINK="ar -r -c"
-+ NXT_STATIC_LINK="\$(AR) -r -c"
- NXT_SHARED_LINK="\$(CC) -G -h libnxt.so"
- NXT_SHARED_LOCAL_LINK="\$(CC) -G -h \\\$\$ORIGIN/libnxt.so"
- NXT_MODULE_LINK="\$(CC) -G"
- ;;
-
- *)
-- NXT_STATIC_LINK="ar -r -c"
-+ NXT_STATIC_LINK="\$(AR) -r -c"
- NXT_SHARED_LINK="\$(CC) -shared -Wl,-soname,libnxt.so"
- NXT_SHARED_LOCAL_LINK="\$(CC) -shared \
- -Wl,-soname,\\\$\$ORIGIN/libnxt.so"
-@@ -106,7 +106,7 @@
- # HFS+ volumes are caseless by default.
- nxt_have=NXT_HAVE_CASELESS_FILESYSTEM . auto/have
-
-- NXT_STATIC_LINK="ar -r -c"
-+ NXT_STATIC_LINK="\$(AR) -r -c"
- NXT_SHARED_LINK="\$(CC) -dynamiclib"
- NXT_SHARED_LOCAL_LINK="\$(CC) -dynamiclib \
- -install_name @executable_path/libnxt.dylib"
-@@ -130,7 +130,7 @@
- NetBSD)
- nxt_have=NXT_NETBSD . auto/have
-
-- NXT_STATIC_LINK="ar -r -c"
-+ NXT_STATIC_LINK="\$(AR) -r -c"
- NXT_SHARED_LINK="\$(CC) -shared"
- NXT_SHARED_LOCAL_LINK="\$(CC) -shared"
- NXT_MODULE_LINK="\$(CC) -shared"
-@@ -152,7 +152,7 @@
- OpenBSD)
- nxt_have=NXT_OPENBSD . auto/have
-
-- NXT_STATIC_LINK="ar -r -c"
-+ NXT_STATIC_LINK="\$(AR) -r -c"
- NXT_SHARED_LINK="\$(CC) -shared"
- NXT_SHARED_LOCAL_LINK="\$(CC) -shared"
- NXT_MODULE_LINK="\$(CC) -shared"
-@@ -174,7 +174,7 @@
- DragonFly)
- nxt_have=NXT_DRAGONFLY . auto/have
-
-- NXT_STATIC_LINK="ar -r -c"
-+ NXT_STATIC_LINK="\$(AR) -r -c"
- NXT_SHARED_LINK="\$(CC) -shared"
- NXT_SHARED_LOCAL_LINK="\$(CC) -shared"
- NXT_MODULE_LINK="\$(CC) -shared"
-@@ -196,7 +196,7 @@
- AIX)
- nxt_have=NXT_AIX . auto/have
-
-- NXT_STATIC_LINK="ar -r -c"
-+ NXT_STATIC_LINK="\$(AR) -r -c"
- NXT_SHARED_LINK="\$(CC) -G"
- NXT_SHARED_LOCAL_LINK="\$(CC) -G"
- NXT_MODULE_LINK="\$(CC) -G"
-@@ -220,7 +220,7 @@
- NXT_EXEC_LINK="\$(CC)"
- NXT_SHARED_LOCAL_EXEC_LINK=
-
-- NXT_STATIC_LINK="ar -r -c"
-+ NXT_STATIC_LINK="\$(AR) -r -c"
- NXT_SHARED_LINK="\$(CC) -shared"
- NXT_SHARED_LOCAL_LINK="\$(CC) -shared"
- NXT_MODULE_LINK="\$(CC) -shared"
-@@ -238,7 +238,7 @@
- QNX)
- nxt_have=NXT_QNX . auto/have
-
-- NXT_STATIC_LINK="ar -r -c"
-+ NXT_STATIC_LINK="\$(AR) -r -c"
- NXT_SHARED_LINK="\$(CC) -shared"
- NXT_SHARED_LOCAL_LINK="\$(CC) -shared"
- NXT_MODULE_LINK="\$(CC) -shared"
-@@ -257,7 +257,7 @@
- ;;
-
- *)
-- NXT_STATIC_LINK="ar -r -c"
-+ NXT_STATIC_LINK="\$(AR) -r -c"
- NXT_SHARED_LINK="\$(CC) -shared"
- NXT_SHARED_LOCAL_LINK="\$(CC) -shared"
- NXT_MODULE_LINK="\$(CC) -shared"
diff --git a/www-servers/nginx-unit/nginx-unit-1.17.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.17.0.ebuild
index ac0c6c8fc956..49c2f106174a 100644
--- a/www-servers/nginx-unit/nginx-unit-1.17.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.17.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
MY_USE="perl python ruby"
MY_USE_PHP="php7-2 php7-3 php7-4"
IUSE="${MY_USE} ${MY_USE_PHP} ssl"
diff --git a/www-servers/nginx-unit/nginx-unit-1.8.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.8.0.ebuild
deleted file mode 100644
index ac86712d6623..000000000000
--- a/www-servers/nginx-unit/nginx-unit-1.8.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{6,7})
-
-inherit python-single-r1
-
-MY_P="unit-${PV}"
-DESCRIPTION="A dynamic web and application server"
-HOMEPAGE="https://unit.nginx.org"
-SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-MY_USE="perl python ruby"
-MY_USE_PHP="php7-2 php7-3"
-IUSE="${MY_USE} ${MY_USE_PHP}"
-REQUIRED_USE="|| ( ${IUSE} ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="perl? ( dev-lang/perl:= )
- php7-2? ( dev-lang/php:7.2[embed] )
- php7-3? ( dev-lang/php:7.3[embed] )
- python? ( ${PYTHON_DEPS} )
- ruby? ( dev-lang/ruby:= )"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- ./configure \
- --control=unix:/run/${PN}.sock \
- --ld-opt="${LDFLAGS}" \
- --log=/var/log/${PN} \
- --modules=$(get_libdir)/${PN} \
- --pid=/run/${PN}.pid \
- --prefix=/usr \
- --state=/var/lib/${PN} || die "Core configuration failed"
- 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}
-}