commit: 324493b2eb7a8bbb1dba38b08617441432e1ab5a Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Sun Jul 18 19:54:41 2021 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Tue Jul 20 19:03:07 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=324493b2
www-servers/monkeyd: migrate to GLEP 81 Bug: https://bugs.gentoo.org/781542 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> acct-user/monkeyd/monkeyd-0.ebuild | 1 + ...monkeyd-9999.ebuild => monkeyd-1.6.9-r2.ebuild} | 28 ++++++++++------------ www-servers/monkeyd/monkeyd-9999.ebuild | 26 +++++++++----------- 3 files changed, 24 insertions(+), 31 deletions(-) diff --git a/acct-user/monkeyd/monkeyd-0.ebuild b/acct-user/monkeyd/monkeyd-0.ebuild index 22efad406d0..55cb3b5ff5d 100644 --- a/acct-user/monkeyd/monkeyd-0.ebuild +++ b/acct-user/monkeyd/monkeyd-0.ebuild @@ -9,6 +9,7 @@ DESCRIPTION="A user for www-servers/monkeyd" ACCT_USER_GROUPS=( "monkeyd" ) ACCT_USER_HOME="/var/tmp/monkeyd" +ACCT_USER_HOME_PERMS="0770" ACCT_USER_ID="149" acct-user_add_deps diff --git a/www-servers/monkeyd/monkeyd-9999.ebuild b/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild similarity index 88% copy from www-servers/monkeyd/monkeyd-9999.ebuild copy to www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild index dc3dfa6306e..0be511e5621 100644 --- a/www-servers/monkeyd/monkeyd-9999.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/"; @@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then inherit git-r3 else SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"; - KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 arm ~mips ppc ppc64 x86" fi LICENSE="GPL-2" @@ -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 } diff --git a/www-servers/monkeyd/monkeyd-9999.ebuild b/www-servers/monkeyd/monkeyd-9999.ebuild index dc3dfa6306e..3308111d6ea 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 }
