gentoo resync : 03.03.2021

4 files changed, 58 insertions, 15 deletions

diff --git a/www-servers/mongrel2/Manifest b/www-servers/mongrel2/Manifest
index 0a3587fd8b4d..ef0f020a1b6a 100644
--- a/www-servers/mongrel2/Manifest
+++ b/www-servers/mongrel2/Manifest
@@ -1,5 +1,6 @@
-AUX mongrel2-1.11.0-polarssl-platform-590512.patch 617 BLAKE2B 96493ff66f36c9b8036ef0a131a239a913b7f9fc96647d7b426377d88c6f51951b7fe4c1f0d7996e71f36c9462d61b2196f8fd6755c609be4ae00a1c45574d8c SHA512 176ffc3ebb360fb56ca3774cad71ad0e0fa7f519cb899f5aeed1d9f5beaaf6578f67713a206daebd3b9b56533628cf1620a66ebc607db35f40ba7ad8d11946f4
+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
 DIST mongrel2-1.11.0.tar.gz 1060770 BLAKE2B cbf27e148385e0f659015bf0fae3e027996ba2a4b3189658503faf7b3083c9356ea61cd7bb0d5516fecedd30f1cde8fc3ed74f5f1221a50442df1e209770b87c SHA512 60ee5036c2ac826a08bb1300969f5ad7ec2bc67c7f47635a3b458a0bad6d7e2fa37183c2708d512632c86101f537a4eb64eeef0775137705898480da70d61e90
-EBUILD mongrel2-1.11.0-r1.ebuild 692 BLAKE2B e1580b2a5cd45234beffa9ab341f6c6b3030fc671186437a952c583eb8924c515aca0f3fd148edcbfa7528021a04aef92bb3e042eb5901d4d82682be35253572 SHA512 421dd70d910b3bcd9a53ec0031a40a2d14c74e3064410d5255eebd556edc8cf6c3134246d4166b6f2a8bc308f2de17428b0738f5bb24245aea73bdb1afb105a4
+EBUILD mongrel2-1.11.0-r1.ebuild 803 BLAKE2B cd5144b8dccfb451fcb1d1778525055cea3a976bf39c9ed77a14d90117d2e9416d5d897e8b36fac07ae6dbcf4cfdc6c895e67bed0f29d54addc9a66183ba2e90 SHA512 59555351b9be616ca5ec4b3a469f3223df91392ec3f158e63b491ad25284e07e683f2e78aee180e106c7637c775380b21137afabb10dd306ba06c3e7a31cfe85
 MISC metadata.xml 257 BLAKE2B adec48923f12ab0f7e9fc4595c967d05bb7c5ea8c5540c43b14786be2d16be4beb8f456cf39be77a1bae0ec23e28a9d4243b755c313f4b7ebc5a8e3e0bf25b5b SHA512 a62ddbc194ab32158cdffeb2994a1f86c3e60f64efc1bf17eee73e2897e53d7faf2dfeed90a9a9b2d89208ccd4c9848fbfb3658582ca3ec30764555ba259c3b7
diff --git a/www-servers/mongrel2/files/mongrel2-1.11.0-fno-common.patch b/www-servers/mongrel2/files/mongrel2-1.11.0-fno-common.patch
new file mode 100644
index 000000000000..1c95f6b7c2d5
--- /dev/null
+++ b/www-servers/mongrel2/files/mongrel2-1.11.0-fno-common.patch
@@ -0,0 +1,31 @@
+--- a/src/mongrel2.c
++++ b/src/mongrel2.c
+@@ -55,6 +55,7 @@
+ #include "logrotate.h"
+ #include "register.h"
+ 
++extern char *m2program;
+ extern int RUNNING;
+ extern uint32_t THE_CURRENT_TIME_IS;
+ int RELOAD = 0;
+--- a/src/unixy.h
++++ b/src/unixy.h
+@@ -38,7 +38,7 @@
+ #include <bstring.h>
+ #include <unistd.h>
+ 
+-char *m2program;
++extern char *m2program;
+ 
+ int Unixy_chroot(bstring path);
+ 
+--- a/tools/procer/procer.c
++++ b/tools/procer/procer.c
+@@ -9,6 +9,7 @@
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+ 
++extern char *m2program;
+ extern char **environ;
+ 
+ static int RUNNING = 1;
diff --git a/www-servers/mongrel2/files/mongrel2-1.11.0-polarssl-platform-590512.patch b/www-servers/mongrel2/files/mongrel2-1.11.0-polarssl-platform-590512.patch
index 0e5957e551b8..c67dc060c8a4 100644
--- a/www-servers/mongrel2/files/mongrel2-1.11.0-polarssl-platform-590512.patch
+++ b/www-servers/mongrel2/files/mongrel2-1.11.0-polarssl-platform-590512.patch
@@ -1,6 +1,6 @@
 # Fix missing include for newer mbedtls
---- a/src/io.h       2016-08-04 15:55:53.124890328 -0700
-+++ b/src/io.h      2015-12-31 01:25:07.000000000 -0800
+--- a/src/io.h
++++ b/src/io.h
 @@ -6,6 +6,7 @@
  #endif
  
@@ -9,8 +9,8 @@
  #include <mbedtls/x509.h>
  #include <mbedtls/ssl.h>
  #include "server.h"
---- a/src/server.h   2016-08-04 15:54:49.539498093 -0700
-+++ b/src/server.h  2015-12-31 01:25:07.000000000 -0800
+--- a/src/server.h
++++ b/src/server.h
 @@ -39,6 +39,7 @@
  #include "adt/darray.h"
  #include "host.h"
diff --git a/www-servers/mongrel2/mongrel2-1.11.0-r1.ebuild b/www-servers/mongrel2/mongrel2-1.11.0-r1.ebuild
index f651aa267276..5ba0b5486632 100644
--- a/www-servers/mongrel2/mongrel2-1.11.0-r1.ebuild
+++ b/www-servers/mongrel2/mongrel2-1.11.0-r1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="A language agnostic web server focused on web applications"
 HOMEPAGE="http://mongrel2.org"
@@ -10,20 +12,29 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="net-libs/zeromq
+DEPEND="
+	dev-db/sqlite:3
 	>=net-libs/mbedtls-2.1[havege]
-	dev-db/sqlite:3"
+	net-libs/zeromq"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-polarssl-platform-590512.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
 src_prepare() {
-	cp "${FILESDIR}/systemtls.mak" Makefile || die
-	eapply "${FILESDIR}/${P}-polarssl-platform-590512.patch"
-	eapply_user
+	cp "${FILESDIR}"/systemtls.mak Makefile || die
+	default
+}
+
+src_configure() {
+	tc-export CC
+	default
 }
 
 src_install() {
-	emake install PREFIX=/usr DESTDIR="${D}"
+	emake PREFIX="${EPREFIX}"/usr DESTDIR="${D}" install
 	dodoc README examples/configs/mongrel2.conf
 }