gentoo resync : 24.07.2021

3 files changed, 23 insertions, 32 deletions

diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index 2df446aeef2b..4de4dfdae135 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -4,6 +4,6 @@ AUX monkeyd.confd 172 BLAKE2B 12259f30705d5f9e20971a4966056481636b5134951a850c1a
 AUX monkeyd.initd 601 BLAKE2B 178c97cb2d8281a971c43ec78d5904238b180ad43ea47a7aaf272010fcceb9942a3b6b2089ea7b8244d265a1f4d241fb82b483073f75204356fd775769992625 SHA512 e356742c537b5bbc8d9696e5fdad0c08d93ace5085f8939fa50d97498ebe0d85712af5da675e76c642296856768081ee14d6f0d3d73a17ce4642cf46e9056a79
 AUX monkeyd.initd-r1 608 BLAKE2B c6ce981294e6e852d346166ba71493470f8ac3604cf597a35a8d38a0ab1fe4c808de018a94149832d0f647257cff42c189dbfc6ef9876a06a338c4cfdeb1c3ba SHA512 d1a30f0033d9f2a0957028a6873b71903d8051340ac272ccbaf12daba9a89bf0c2e476b8aa22a0e60697ffd10ab5c1d6a4aa0ff7b204f8b4adc76ebe91b8abaa
 DIST monkey-1.6.9.tar.gz 1972040 BLAKE2B f1fe4791bfdba14905797e36563d76a7b551fb3f8bf4d387c598f6c19f58e7759044e4ad2664ac29a546ce76b210fa61285198c711751c7a47c124be507898a7 SHA512 3540a17fffe57a9d4b88b6243c634dcf6a27ed894ae2a0d5d42a4881221a9d59ae67d4c7fcf087535360d20ccdadab16947cf3a7dc6d4e864d487f598eb0ba62
-EBUILD monkeyd-1.6.9-r1.ebuild 4105 BLAKE2B 8f0bfd98497958e81bec0684bf3014e3fc12b9270ca0f848f2385bb36419ad5d85b6efa1bfce4bc6926d7e596286d1157f8c67624b9761078cd6709f7e1f6b39 SHA512 a4a12ffba7f6c679dd1fa9e0a1958dacd483ca6df250d42f71b257f092d9e4abb11a1f5e5e55378dcf30254befbddb2a67e0d8c2fd862bdfac68ca764310b293
-EBUILD monkeyd-9999.ebuild 4086 BLAKE2B 7b3af0c73a8f44197e127ecec16f5cb3448a13c0cad8780d9c313713e532306ca03a7d312f1775ee83099636dd828e80e7a79de1b4419d716cdaf6a588862ab7 SHA512 3bc63c7cfc8b1dc08b0785b4dfee69e1993c5d0e4f6cf67383c25d97b04c7ee79f7b3f329432622e2b96483275af9a4597e8159a7f04d0ada9176e64ef6e4df6
+EBUILD monkeyd-1.6.9-r2.ebuild 4017 BLAKE2B c4dfcf32e3bc7bc12a552e94a9e9586e80d41cb99e3b0d8a526bd19db02328178cd8cc2cb94230cecd7934c3530a80fe1d4039adcd949349866c87fe501d6c4f SHA512 dfa2e7765f2e9d9f486fee05c15244c456214ac80c1629b1462477aa54bfe80986e87d22b1b5767902bda39f93c042ce1bda8933c90bc1f5a7f73452b4160f2d
+EBUILD monkeyd-9999.ebuild 4022 BLAKE2B 26e3870863f59b607f2c597c99361e1e2112b732fc2206c4a73f6f0aef90679c15b8f908ad15e7f66482a37578518926c267b6b0f0500c8047c5fb21b97906cf SHA512 adcfea12de7ee6195b8ef2b0cc610ca38f9babf30d1d722a22c7930a5b2b7ecc6cadf4e1539460eea35604b7126655e61168fe967ed2e3071b0515b1b0468c87
 MISC metadata.xml 394 BLAKE2B f5849f3a0f249bfcfe85c51bda735406b5d10e97bba70c0427b57994dda956c5b402e98aee9bf9359e966a8d40f72b44d04622217020a5e26dac44497ca487d6 SHA512 9431b7f6722baa7c18ab2341a35aed3978f54e92c0b2a686bef0f7dc20934a14f93b6a1f1208b47b720f11e5f901e634c3b278eb540dfcc06c3a7c668fc0a209
diff --git a/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild b/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild
index 47ed44923c33..0be511e56215 100644
--- a/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit epatch flag-o-matic toolchain-funcs user multilib
+inherit flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="A small, fast, and scalable web server"
 HOMEPAGE="http://www.monkey-project.com/"
@@ -37,6 +37,8 @@ DEPEND="
 	dev-util/cmake
 	monkeyd_plugins_tls? ( net-libs/mbedtls:= )"
 RDEPEND="
+	acct-group/monkeyd
+	acct-user/monkeyd
 	php? ( dev-lang/php )
 	cgi? ( dev-lang/php[cgi] )"
 
@@ -44,11 +46,6 @@ S="${WORKDIR}/${MY_P}"
 
 WEBROOT="/var/www/localhost"
 
-pkg_preinst() {
-	enewgroup monkeyd
-	enewuser monkeyd -1 -1 /var/tmp/monkeyd monkeyd
-}
-
 pkg_setup() {
 	if use debug; then
 		ewarn
@@ -62,8 +59,9 @@ pkg_setup() {
 src_prepare() {
 	# Unconditionally get rid of the bundled jemalloc
 	rm -rf "${S}"/deps
-	epatch "${FILESDIR}"/${PN}-1.6.9-fix-pidfile.patch
-	epatch "${FILESDIR}"/${PN}-1.6.8-system-mbedtls.patch
+	eapply "${FILESDIR}"/${PN}-1.6.9-fix-pidfile.patch
+	eapply "${FILESDIR}"/${PN}-1.6.8-system-mbedtls.patch
+	eapply_user
 }
 
 src_configure() {
@@ -137,16 +135,13 @@ src_install() {
 	mv "${D}"${WEBROOT}/htdocs \
 		"${D}"/usr/share/doc/"${PF}"/htdocs.dist || die
 
-	keepdir \
-		/var/tmp/monkeyd \
-		/var/log/monkeyd \
-		${WEBROOT}/htdocs
+	keepdir /var/log/monkeyd ${WEBROOT}/htdocs
 
 	# This needs to be created at runtime
 	rm -rf "${D}"/run
 }
 
 pkg_postinst() {
-	chown monkeyd:monkeyd /var/{log,tmp}/monkeyd
-	chmod 770 /var/{log,tmp}/monkeyd
+	chown monkeyd:monkeyd /var/log/monkeyd
+	chmod 770 /var/log/monkeyd
 }
diff --git a/www-servers/monkeyd/monkeyd-9999.ebuild b/www-servers/monkeyd/monkeyd-9999.ebuild
index dc3dfa6306e1..3308111d6ea3 100644
--- a/www-servers/monkeyd/monkeyd-9999.ebuild
+++ b/www-servers/monkeyd/monkeyd-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit epatch flag-o-matic toolchain-funcs user multilib
+inherit flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="A small, fast, and scalable web server"
 HOMEPAGE="http://www.monkey-project.com/"
@@ -37,6 +37,8 @@ DEPEND="
 	dev-util/cmake
 	monkeyd_plugins_tls? ( net-libs/mbedtls:= )"
 RDEPEND="
+	acct-group/monkeyd
+	acct-user/monkeyd
 	php? ( dev-lang/php )
 	cgi? ( dev-lang/php[cgi] )"
 
@@ -44,11 +46,6 @@ S="${WORKDIR}/${MY_P}"
 
 WEBROOT="/var/www/localhost"
 
-pkg_preinst() {
-	enewgroup monkeyd
-	enewuser monkeyd -1 -1 /var/tmp/monkeyd monkeyd
-}
-
 pkg_setup() {
 	if use debug; then
 		ewarn
@@ -62,11 +59,13 @@ pkg_setup() {
 src_prepare() {
 	# Unconditionally get rid of the bundled jemalloc
 	rm -rf "${S}"/deps
-	epatch "${FILESDIR}"/${PN}-1.6.9-fix-pidfile.patch
-	epatch "${FILESDIR}"/${PN}-1.6.8-system-mbedtls.patch
+	eapply "${FILESDIR}"/${PN}-1.6.9-fix-pidfile.patch
+	eapply "${FILESDIR}"/${PN}-1.6.8-system-mbedtls.patch
+	eapply_user
 }
 
 src_configure() {
+	append-cflags -fcommon
 	local myconf=""
 
 	use elibc_uclibc && myconf+=" --uclib-mode"
@@ -136,16 +135,13 @@ src_install() {
 	mv "${D}"${WEBROOT}/htdocs \
 		"${D}"/usr/share/doc/"${PF}"/htdocs.dist || die
 
-	keepdir \
-		/var/tmp/monkeyd \
-		/var/log/monkeyd \
-		${WEBROOT}/htdocs
+	keepdir /var/log/monkeyd ${WEBROOT}/htdocs
 
 	# This needs to be created at runtime
 	rm -rf "${D}"/run
 }
 
 pkg_postinst() {
-	chown monkeyd:monkeyd /var/{log,tmp}/monkeyd
-	chmod 770 /var/{log,tmp}/monkeyd
+	chown monkeyd:monkeyd /var/log/monkeyd
+	chmod 770 /var/log/monkeyd
 }