gentoo resync : 28.04.2021

4 files changed, 156 insertions, 8 deletions

diff --git a/www-servers/mongrel2/Manifest b/www-servers/mongrel2/Manifest
index 131a7a1f3cf8..084a7937c400 100644
--- a/www-servers/mongrel2/Manifest
+++ b/www-servers/mongrel2/Manifest
@@ -1,6 +1,7 @@
 AUX mongrel2-1.11.0-fno-common.patch 585 BLAKE2B de37abde0ab62ee986008a7f8d8f50ca32572f73ee589b9d45437ff6d4746cb15abc4726641eac75b688bc8814b7f99d2be206861e8d9e220fbc144af0926674 SHA512 99812f7c1c996a1497f5b58c50181d988755c36d0be7e1b6eac31d34fb0189a1910d0da61ed62105772abda097c581f457012716963c673f79803d3eeed655b3
 AUX mongrel2-1.11.0-polarssl-platform-590512.patch 459 BLAKE2B 63917c58c7c29639d321c5f346273f09289f0a1359d82a238ece01506b85ba242396e2786bef2e8af7ee1c52bf40edd5a6456dcebcb5d9e4f144422c8700135d SHA512 7e7c609d4c2b2820ef1097b96da56c4e250df685af90af19f0a3c863f0b55b7b0f8834199f1d6e94bd04d970189807202429ae5e20f63f86b84419d0e3d7edab
-AUX systemtls.mak 4506 BLAKE2B 60a448a3f1ed77646003cacb8d5adcf34899532c00fd461a67337f2ded6cc7a6204f72a1b25b3787f692487e502eb313ee0bc7dafb04c902c81d82edfc8fe96b SHA512 9b1fc5bf23d60267d64c08e0f0956deee0c421b03556138f994822abdcb324702bde744559e6629488cb05669b3228078180cb4f30af8fa09c10bc110ce7e3e1
+AUX mongrel2-1.11.0-respect-FLAGS.patch 5246 BLAKE2B 7bafb8f27bf51a6151a70c709a4d1f3da6c725634f23ac461f95110f566e9e57dd351be08b44da40491ff5c61ecb40d87daeeba59bc9887604460d63701f60a3 SHA512 45fe23e4066eb78374cd4a162c473318e8c75a4e4d8b5bce508541577d7d30539bb58e8f858157fb58467ba9a833e3bda68c5ebc3cf3ed7f459ca51bf1ded31b
+AUX systemtls.mak 4570 BLAKE2B 74718f85f540074a125ff9bf994a535ac33b530c880ddca8f8b6746b8e27d8e2ccffbb9611d2ac178107070114e8f78f6be9a11cb8572a6af80c2335b8259c76 SHA512 eee6e802729540eef32bf24dc3eface59508b3d73fc28ced075856fd572ba412474ceedf98a54be070de85221658ca960724814e777c0aedd0abe5edefe833cc
 DIST mongrel2-1.11.0.tar.gz 1060770 BLAKE2B cbf27e148385e0f659015bf0fae3e027996ba2a4b3189658503faf7b3083c9356ea61cd7bb0d5516fecedd30f1cde8fc3ed74f5f1221a50442df1e209770b87c SHA512 60ee5036c2ac826a08bb1300969f5ad7ec2bc67c7f47635a3b458a0bad6d7e2fa37183c2708d512632c86101f537a4eb64eeef0775137705898480da70d61e90
-EBUILD mongrel2-1.11.0-r1.ebuild 803 BLAKE2B cd5144b8dccfb451fcb1d1778525055cea3a976bf39c9ed77a14d90117d2e9416d5d897e8b36fac07ae6dbcf4cfdc6c895e67bed0f29d54addc9a66183ba2e90 SHA512 59555351b9be616ca5ec4b3a469f3223df91392ec3f158e63b491ad25284e07e683f2e78aee180e106c7637c775380b21137afabb10dd306ba06c3e7a31cfe85
+EBUILD mongrel2-1.11.0-r1.ebuild 861 BLAKE2B 7eed460ae5b4d3ad74d70b15d17a18d9c6c580ea901812efc71ffaad7cbb11cb698d799844ba58e7f02f4e441b95e607eacd3f986a7144346f018b531ec30280 SHA512 6cff892c65d9e5cc59eb7a81fbb56832294d7ec7724157ae27297d0eeab1246fda3a89972a914cec740f0b1d441f39e6538069040495e624fd89600e12b93582
 MISC metadata.xml 256 BLAKE2B 46b1738febd71b398d37ff29c65a3852bb520b84bf6ece85b1ebba4549ab49e190e98fb2a52c99ab3816034077b545d09502339b9358c5963cdf0d7851d79ddd SHA512 6988e6bbe794ff5efe6cca6193f2aaf3cbb58699de631998432f07153fd53adf4254d2d94f4fef10bdf1851ff05fbdd7e2729555060ca9aced7dfc5490b8fd3b
diff --git a/www-servers/mongrel2/files/mongrel2-1.11.0-respect-FLAGS.patch b/www-servers/mongrel2/files/mongrel2-1.11.0-respect-FLAGS.patch
new file mode 100644
index 000000000000..17b5da340067
--- /dev/null
+++ b/www-servers/mongrel2/files/mongrel2-1.11.0-respect-FLAGS.patch
@@ -0,0 +1,146 @@
+--- a/examples/kegogi/Makefile
++++ b/examples/kegogi/Makefile
+@@ -1,4 +1,4 @@
+-CFLAGS=-g -I../../src -Isrc -Wall -Wextra
++CFLAGS+=-I../../src -Isrc -Wall -Wextra
+ LIBS=-lzmq -lsqlite3
+ 
+ all: kegogi
+@@ -8,10 +8,10 @@ install: all
+ 
+ kegogi: src/kegogi.o src/fuzzrnd.o src/kegogi_parser.o src/httpclient.o src/param.o src/kegogi_lexer.o src/kegogi_tokens.o
+ 	mkdir -p build
+-	$(CC) ${CFLAGS} -o build/kegogi src/kegogi.o src/kegogi_parser.o src/kegogi_lexer.o src/fuzzrnd.o src/httpclient.o src/param.o src/kegogi_tokens.o ${LIBS} ../../build/libm2.a
++	$(CC) $(CPPFLAGS) ${CFLAGS} $(LDFLAGS) -o build/kegogi src/kegogi.o src/kegogi_parser.o src/kegogi_lexer.o src/fuzzrnd.o src/httpclient.o src/param.o src/kegogi_tokens.o ${LIBS} ../../build/libm2.a
+ 
+ src/kegogi_lexer.o: src/kegogi_lexer.c
+-	$(CC) $(CFLAGS) -c src/kegogi_lexer.c -o src/kegogi_lexer.o
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -c src/kegogi_lexer.c -o src/kegogi_lexer.o
+ 
+ src/kegogi_lexer.c: src/kegogi_lexer.rl src/kegogi_parser.h
+ 	ragel src/kegogi_lexer.rl -C -o src/kegogi_lexer.c
+--- a/tests/filters/Makefile
++++ b/tests/filters/Makefile
+@@ -1,12 +1,12 @@
+ PREFIX?=/usr/local
+-CFLAGS=-I../../src -I../../src/mbedtls/include $(OPTFLAGS) -fPIC -shared -nostartfiles -L../../build
+-LDFLAGS=$(OPTLIBS)
++CFLAGS+=-I../../src -I../../src/mbedtls/include -fPIC -shared -nostartfiles -L../../build
++LDFLAGS+=$(OPTLIBS)
+ 
+ all: test_filter.so test_filter_a.so test_filter_b.so test_filter_c.so
+ 
+ 
+ %.so : %.c ../../build/libm2.a
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< ../../build/libm2.a
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< ../../build/libm2.a
+ 
+ clean:
+ 	rm -f *.so
+--- a/tools/config_modules/Makefile
++++ b/tools/config_modules/Makefile
+@@ -1,6 +1,6 @@
+ PREFIX?=/usr/local
+-CFLAGS=-I../../src -I../../src/mbedtls/include $(OPTFLAGS) -fPIC -shared -nostartfiles -L../../build
+-LDFLAGS=$(OPTLIBS)
++CFLAGS+=-I../../src -I../../src/mbedtls/include -fPIC -shared -nostartfiles -L../../build
++LDFLAGS+=$(OPTLIBS)
+ 
+ MONGO_SRC = mongo-c-driver/src/bson.c \
+             mongo-c-driver/src/encoding.c \
+@@ -22,11 +22,11 @@ fetch_mongo_c_driver:
+ mongodb.so: CFLAGS += $(MONGO_CFLAGS)
+ mongodb.so: fetch_mongo_c_driver
+ mongodb.so: mongodb.c
+-	$(CC) $(CFLAGS) -c $(MONGO_SRC)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< bson.o encoding.o gridfs.o md5.o mongo.o env_posix.o numbers.o ../../build/libm2.a
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -c $(MONGO_SRC)
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< bson.o encoding.o gridfs.o md5.o mongo.o env_posix.o numbers.o ../../build/libm2.a
+ 
+ %.so : %.c
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< ../../build/libm2.a
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< ../../build/libm2.a
+ 
+ clean:
+ 	rm -f *.o *.so
+--- a/tools/filters/Makefile
++++ b/tools/filters/Makefile
+@@ -1,12 +1,12 @@
+ PREFIX?=/usr/local
+-CFLAGS=-I../../src -I../../src/mbedtls/include $(OPTFLAGS) -g -fPIC -shared -nostartfiles -L../../build
+-LDFLAGS=$(OPTLIBS)
++CFLAGS+=-I../../src -I../../src/mbedtls/include -fPIC -shared -nostartfiles -L../../build
++LDFLAGS+=$(OPTLIBS)
+ 
+ all: null.so rewrite.so sendfile.so
+ 
+ 
+ %.so : %.c
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< ../../build/libm2.a
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< ../../build/libm2.a
+ 
+ clean:
+ 	rm -f *.so
+--- a/tools/m2sh/Makefile
++++ b/tools/m2sh/Makefile
+@@ -1,4 +1,4 @@
+-CFLAGS=-DNDEBUG -DNO_LINENOS -pthread -g -I../../src -Isrc -Wall $(OPTFLAGS)
++CFLAGS+=-DNDEBUG -DNO_LINENOS -pthread -g -I../../src -Isrc -Wall
+ LIBS=-lzmq -lsqlite3 ../../build/libm2.a $(OPTLIBS)
+ 
+ PREFIX?=/usr/local
+@@ -11,7 +11,7 @@ LIB_OBJ=$(filter-out src/m2sh.o,${OBJECTS})
+ 
+ all: ../lemon/lemon tests build/m2sh
+ 
+-dev: CFLAGS=-g -Wall -Wextra -Isrc -I../../src $(OPTFLAGS)
++dev: CFLAGS+=-Wall -Wextra -Isrc -I../../src $(OPTFLAGS)
+ dev: all
+ 
+ install: build/m2sh
+@@ -19,15 +19,15 @@ install: build/m2sh
+ 
+ build/libm2sh.a: ${LIB_OBJ}
+ 	mkdir -p build
+-	ar rcs $@ ${LIB_OBJ}
+-	ranlib $@
++	$(AR) rcs $@ ${LIB_OBJ}
++	$(RANLIB) $@
+ 
+ build/m2sh: ../lemon/lemon ../../build/libm2.a ${OBJECTS}
+ 	mkdir -p build
+-	$(CC) $(CFLAGS) -o build/m2sh ${OBJECTS} ../../build/libm2.a $(LIBS)
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o build/m2sh ${OBJECTS} ../../build/libm2.a $(LIBS)
+ 
+ ../lemon/lemon: ../lemon/lemon.c
+-	$(CC) -O2 ../lemon/lemon.c -o ../lemon/lemon
++	$(CC) $(CPPFLAGS) $(LDFLAGS) ../lemon/lemon.c -o ../lemon/lemon
+ 
+ tests: build/libm2sh.a ${TESTS}
+ 	sh ./tests/runtests.sh
+@@ -39,7 +39,7 @@ tests: build/libm2sh.a ${TESTS}
+ 	ragel -G2 $<
+ 
+ $(TESTS): %: %.c build/libm2sh.a
+-	$(CC) $(CFLAGS) -o $@ $< build/libm2sh.a ../../build/libm2.a $(LIBS)
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< build/libm2sh.a ../../build/libm2.a $(LIBS)
+ 
+ ../../build/libm2.a:
+ 	cd ../.. && make clean all
+--- a/tools/procer/Makefile
++++ b/tools/procer/Makefile
+@@ -1,4 +1,4 @@
+-CFLAGS=-DNDEBUG -pthread -g -I../../src -Wall $(OPTFLAGS)
++CFLAGS+=-DNDEBUG -pthread -g -I../../src -Wall
+ PREFIX?=/usr/local
+ LIBS?=-lzmq 
+ SOURCES=$(wildcard *.c)
+@@ -8,7 +8,7 @@ all: procer
+ 
+ 
+ procer: ../../build/libm2.a ${OBJECTS}
+-	$(CC) $(OPTFLAGS) $(OPTLIBS) -o $@ ${OBJECTS} ../../build/libm2.a ${LIBS}
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ${OBJECTS} ../../build/libm2.a ${LIBS}
+ 
+ clean:
+ 	rm -f *.o procer
diff --git a/www-servers/mongrel2/files/systemtls.mak b/www-servers/mongrel2/files/systemtls.mak
index e449b762af3d..a536094b3f57 100644
--- a/www-servers/mongrel2/files/systemtls.mak
+++ b/www-servers/mongrel2/files/systemtls.mak
@@ -43,12 +43,12 @@ builddirs:
 	@mkdir -p bin
 
 bin/mongrel2: build/libm2.a src/mongrel2.o
-	$(CC) $(CFLAGS) $(LDFLAGS) src/mongrel2.o -o $@ $< $(LIBS)
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) src/mongrel2.o -o $@ $< $(LIBS)
 
 build/libm2.a: CFLAGS += -fPIC
 build/libm2.a: ${LIB_OBJ}
-	ar rcs $@ ${LIB_OBJ}
-	ranlib $@
+	$(AR) rcs $@ ${LIB_OBJ}
+	$(RANLIB) $@
 
 clean:
 	rm -rf build bin lib ${OBJECTS} ${TESTS} tests/config.sqlite
@@ -88,7 +88,7 @@ tests/config.sqlite: src/config/config.sql src/config/example.sql src/config/mim
 	sqlite3 $@ < src/config/mimetypes.sql
 
 $(TESTS): %: %.c build/libm2.a
-	$(CC) $(CFLAGS) -o $@ $< build/libm2.a $(LIBS)
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< build/libm2.a $(LIBS)
 
 src/state.c: src/state.rl src/state_machine.rl
 src/http11/http11_parser.c: src/http11/http11_parser.rl
@@ -133,4 +133,4 @@ ragel:
 	ragel -G2 src/http11/httpclient_parser.rl
 
 %.o: %.S
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -c $< -o $@
diff --git a/www-servers/mongrel2/mongrel2-1.11.0-r1.ebuild b/www-servers/mongrel2/mongrel2-1.11.0-r1.ebuild
index 5ba0b5486632..0317876c263d 100644
--- a/www-servers/mongrel2/mongrel2-1.11.0-r1.ebuild
+++ b/www-servers/mongrel2/mongrel2-1.11.0-r1.ebuild
@@ -22,6 +22,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${P}-polarssl-platform-590512.patch
 	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${PN}-1.11.0-respect-FLAGS.patch
 )
 
 src_prepare() {
@@ -30,7 +31,7 @@ src_prepare() {
 }
 
 src_configure() {
-	tc-export CC
+	tc-export AR CC RANLIB
 	default
 }