www-nginx/nginx-vod-module: nginx version bump

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Jonas Licht <jonas.licht@fem.tu-ilmenau.de>

eclass/nginx-module.eclass

-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: nginx-module.eclass
@@ -22,23 +22,24 @@ case ${EAPI:-0} in
 	*) die "This eclass only supports EAPI 7" ;;
 esac
 
-# @ECLASS-VARIABLE:	NGX_PV
+inherit toolchain-funcs
+
+# @ECLASS-VARIABLE: NGINX_PV
 # @DESCRIPTION:
-# Uses version cut of the first three parts of the version to determine the proposed nginx version.
+# Uses version cut of the first three parts of the version to determine the nginx version providing the module.
 # This version is used for SRC_URI, BDPEND and compiling process.
-NGX_PV=$(ver_cut 1-3)
+NGINX_PV=$(ver_cut 1-3)
 
 # @ECLASS-VARIABLE: MODULE_PV
 # @DESCRIPTION:
 # Uses version cut to get the version of the module.
-# Variable can uses for SRC_URI.
+# Variable can be used for SRC_URI of the nginx module.
 MODULE_PV=$(ver_cut 4-)
 
-BDPEND="=www-servers/nginx-${NGX_PV}:="
-SRC_URI="https://nginx.org/download/nginx-${NGX_PV}.tar.gz
-	"
+BDEPEND="~www-servers/nginx-${NGINX_PV}:="
+SRC_URI="https://nginx.org/download/nginx-${NGINX_PV}.tar.gz"
 
-S="${WORKDIR}/nginx-${NGX_PV}"
+S="${WORKDIR}/nginx-${NGINX_PV}"
 
 EXPORT_FUNCTIONS src_configure src_compile src_install
 
@@ -47,13 +48,12 @@ EXPORT_FUNCTIONS src_configure src_compile src_install
 # @DESCRIPTION:
 # Parses the configure from the original nginx binary by exicution 'nginx -V' and adds the package as dynamic module.
 nginx-module_src_configure() {
-	if [ `grep -c "\.[[:space:]]auto/module" ${WORKDIR}/${PN}-${MODULE_PV}/config` -eq 0 ]; then
+	if [ $(grep -c "\.[[:space:]]auto/module" "${WORKDIR}/${PN}-${MODULE_PV}/config") -eq 0 ]; then
 		die "module uses old unsupported static config file syntax: https://www.nginx.com/resources/wiki/extending/converting/"
 	fi
-
 	#grep nginx configure from nginx -V add drop all other external modules
-	NGX_ORIGIN_CONFIGURE=`nginx -V 2>&1 | grep "configure arguments:" | cut -d: -f2 | sed "s/--add-module=\([^\s]\)*\s/ /"`
-	./configure ${NGX_ORIGIN_CONFIGURE} --add-dynamic-module="../${PN}-${MODULE_PV}" "$@" || die "configure failed"
+	NGINX_ORIGIN_CONFIGURE=$(nginx -V 2>&1 | grep "configure arguments:" | cut -d: -f2 | sed "s/--add-module=\([^\s]\)*\s/ /")
+	./configure ${NGINX_ORIGIN_CONFIGURE} --add-dynamic-module="../${PN}-${MODULE_PV}" "$@" || die "configure failed"
 }
 
 # @FUNCTION: nginx-module_src_compile
@@ -61,14 +61,16 @@ nginx-module_src_configure() {
 # @DESCRIPTION:
 # Runs 'make modules' to only build our package module.
 nginx-module_src_compile() {
-	emake modules "$@"
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	emake modules "$@" CC="$(tc-getCC)" LINK="$(tc-getCC) ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
 }
 
 # @FUNCTION: nginx-module_src_install
 # @DESCRIPTION:
 # Parses the module config file to get the so file name and install the shared object file to '/usr/$(get_libdir)/nginx/modules'
 nginx-module_src_install() {
-	NGX_MODULE_NAME=`grep ${WORKDIR}/${PN}-${MODULE_PV}/config -e "ngx_addon_name" | cut -d= -f2`
+	NGINX_MODULE_NAME=$(grep ${WORKDIR}/${PN}-${MODULE_PV}/config -e "ngx_addon_name" | cut -d= -f2)
 	exeinto /usr/$(get_libdir)/nginx/modules
-	doexe ${S}/objs/${NGX_MODULE_NAME}.so
+	doexe ${S}/objs/${NGINX_MODULE_NAME}.so
 }

www-nginx/nginx-vod-module/Manifest

-DIST nginx-1.18.0.tar.gz 1039530 BLAKE2B a8962a6af96acb043ff0c3dc4ad5192083773c449950aff53b01f6f7c46a2a540eb061a43432acccd753fa71067b1451d75f440ba5526575b78608be9d40a50b SHA512 8c21eeb62ab6e32e436932500f700bd2fb99fd2d29e43c08a5bfed4714c189c29c7141db551fcd5d2437303b7439f71758f7407dfd3e801e704e45e7daa78ddb
+DIST nginx-1.20.1.tar.gz 1061461 BLAKE2B ed359db6486fd2152e0246663b8d8f4fc6980594945212545d301ce6ce16088c760d11b26fa1f6e9c392b9464103c570ddccc4343f5ab3f84ede011bb7a6458d SHA512 3d9fd4bf2740eaf20fcc3c77260a3556aaf9dff2879afc2dbb5fff364dea27313ffbc51d335e9fc9c0186a2a44dac055ef60fde0d411b8cf842fdf661478c961
 DIST nginx-vod-module-1.25.tar.gz 446830 BLAKE2B c1bf218c83ccee76fa4e6414b209585931a271577a8aa7b71ba9634ad82193ed9bbd06dd3cf780f085edde604f0e08e56d40b9e0658f5bd307735a1848b20d5a SHA512 11a97ffa28d6078aa57ad1821421928f6e2a05235a2f384cd2b498e7998f1025edc1ee163a900937ee251b49bd9381813e71248e67d537531b91a998b1610c56
 DIST nginx-vod-module-1.27.tar.gz 450777 BLAKE2B c09edc53d40b71e0520d1b52e731901afb316ab1f41c9dd52db910c0eeee7100118b9ea5989b2b5bcd424e943c5b49b547e18f896e35e8c308ef228e282eabc4 SHA512 705851f259cca704148e3ecab38df4b9b881217023ec0027af64588b307c9c4d274b1872a6a130c5621234d484f9dcecba731f1c03f52d3bf58f7de7bb3aa9fc
-EBUILD nginx-vod-module-1.18.0.1.25.ebuild 478 BLAKE2B e543cbdc3d14736b8ed6ce75fbc45c31faa7bd143f34fc4ad09287eb7dc5d7cd389d7558b43dadf4728b8696fed95e85f1df331942fad5ebfd5f55691660c484 SHA512 e00ae54ae0f19177a475738f7dd3d0c4bfe4ad890ffa063f01540cef4a7f4feabfe5db217cfc48d7c135e0e55ffef5e6ecd5bddfbd68f17b377f9d48229d36ca
-EBUILD nginx-vod-module-1.18.0.1.27.ebuild 478 BLAKE2B e543cbdc3d14736b8ed6ce75fbc45c31faa7bd143f34fc4ad09287eb7dc5d7cd389d7558b43dadf4728b8696fed95e85f1df331942fad5ebfd5f55691660c484 SHA512 e00ae54ae0f19177a475738f7dd3d0c4bfe4ad890ffa063f01540cef4a7f4feabfe5db217cfc48d7c135e0e55ffef5e6ecd5bddfbd68f17b377f9d48229d36ca
+EBUILD nginx-vod-module-1.20.1.1.25.ebuild 479 BLAKE2B 04976589f87b0fc70de3029b58e5df1f9bf613896d2049384ff0151eed10011236c822c0ff7a79f59b5b6c357b5174fe523ad037602e66e624a32126a809cbad SHA512 35431c45054558c142102355be4ed24c06f5325429c833df5a3b1c2351e1f2ce907bca39608c81c0d0001ba86bbbbc961b49efa7f38cbe7bf0aa2a64f1b544ae
+EBUILD nginx-vod-module-1.20.1.1.27.ebuild 479 BLAKE2B 04976589f87b0fc70de3029b58e5df1f9bf613896d2049384ff0151eed10011236c822c0ff7a79f59b5b6c357b5174fe523ad037602e66e624a32126a809cbad SHA512 35431c45054558c142102355be4ed24c06f5325429c833df5a3b1c2351e1f2ce907bca39608c81c0d0001ba86bbbbc961b49efa7f38cbe7bf0aa2a64f1b544ae
 MISC metadata.xml 273 BLAKE2B 2558f2534b96fe944f0b83585143ca3ea2b1940a59e5919299ae4fcde113832f2667b057a3414ffb60668f7d5761f6ee8c0f8e3b2002614dac09e70cb416b547 SHA512 7325f879e9aad79011f5c5ba1f332d1de3dd16bc41fbf84093df601465d6099ddc4b9dfa55aad324e46b3b9e19060952c223877272e9491a6d2822c0836593b5

www-nginx/nginx-vod-module/nginx-vod-module-1.18.0.1.25.ebuild → www-nginx/nginx-vod-module/nginx-vod-module-1.20.1.1.25.ebuild

@@ -7,7 +7,7 @@ inherit nginx-module
 
 DESCRIPTION="NGINX-based MP4 Repackager"
 HOMEPAGE="https://github.com/kaltura/nginx-vod-module"
-SRC_URI+="https://github.com/kaltura/nginx-vod-module/archive/${MODULE_PV}.tar.gz -> ${PN}-${MODULE_PV}.tar.gz"
+SRC_URI+=" https://github.com/kaltura/nginx-vod-module/archive/${MODULE_PV}.tar.gz -> ${PN}-${MODULE_PV}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"

www-nginx/nginx-vod-module/nginx-vod-module-1.18.0.1.27.ebuild → www-nginx/nginx-vod-module/nginx-vod-module-1.20.1.1.27.ebuild

@@ -7,7 +7,7 @@ inherit nginx-module
 
 DESCRIPTION="NGINX-based MP4 Repackager"
 HOMEPAGE="https://github.com/kaltura/nginx-vod-module"
-SRC_URI+="https://github.com/kaltura/nginx-vod-module/archive/${MODULE_PV}.tar.gz -> ${PN}-${MODULE_PV}.tar.gz"
+SRC_URI+=" https://github.com/kaltura/nginx-vod-module/archive/${MODULE_PV}.tar.gz -> ${PN}-${MODULE_PV}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"