[gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2016-10-22 13:08 Anthony G. Basile
  0 siblings, 0 replies; 30+ messages in thread
From: Anthony G. Basile @ 2016-10-22 13:08 UTC (permalink / raw
  To: gentoo-commits

commit:     93a117d669b2ff86b10a700a25e7560de7047aa2
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 22 13:08:16 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Oct 22 13:08:16 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93a117d6

www-servers/monkeyd: remove older stable version

Package-Manager: portage-2.2.28

 www-servers/monkeyd/Manifest                |   1 -
 www-servers/monkeyd/metadata.xml            |   2 -
 www-servers/monkeyd/monkeyd-1.5.6-r1.ebuild | 147 ----------------------------
 3 files changed, 150 deletions(-)

diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index 701c58a..ace1304 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -1,2 +1 @@
-DIST monkey-1.5.6.tar.gz 902636 SHA256 7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22 SHA512 4c7c627cb047252252b22da5fba179a21fb5b8dc6280b96307af52757ad049d24b0daaaea51dca4f0429af5e6499c239f6b62a03654cc9e7ad98ae8f5149b64c WHIRLPOOL aba1a928023fc67224f254182eb9707c6594c7092d9ff98ecfa297c91d5c61f79235e7467192b5d46ac114ae67a3cee98e06704721348a40ee825755ab39d9a1
 DIST monkey-1.6.9.tar.gz 1972040 SHA256 f1122e89cda627123286542b0a18fcaa131cbe9d4f5dd897d9455157289148fb SHA512 3540a17fffe57a9d4b88b6243c634dcf6a27ed894ae2a0d5d42a4881221a9d59ae67d4c7fcf087535360d20ccdadab16947cf3a7dc6d4e864d487f598eb0ba62 WHIRLPOOL c0af688a0a9d8d82a6dc405a79640738ebd62fe1de8a0aad715c1356c73a499ff5854f2a16d69e9a1022bfd02ca04dc17163011a27e53b438ca0e32c9b824f2b

diff --git a/www-servers/monkeyd/metadata.xml b/www-servers/monkeyd/metadata.xml
index 29b14aa..1e7b130 100644
--- a/www-servers/monkeyd/metadata.xml
+++ b/www-servers/monkeyd/metadata.xml
@@ -7,8 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="debug">Enable lots of debugging info</flag>
-		<flag name="jemalloc">Use dev-libs/jemalloc for allocations</flag>
-		<flag name="minimal">Do not install shared lib and include files</flag>
 		<flag name="static-plugins">Build statically linked plugins</flag>
 	</use>
 </pkgmetadata>

diff --git a/www-servers/monkeyd/monkeyd-1.5.6-r1.ebuild b/www-servers/monkeyd/monkeyd-1.5.6-r1.ebuild
deleted file mode 100644
index a753859..00000000
--- a/www-servers/monkeyd/monkeyd-1.5.6-r1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils multilib toolchain-funcs
-
-MY_P="${PN/d}-${PV}"
-DESCRIPTION="A small, fast, and scalable web server"
-HOMEPAGE="http://www.monkey-project.com/"
-SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 x86"
-
-# ssl is broken, so we turn it off until fixed
-IUSE="-debug jemalloc php minimal elibc_musl elibc_uclibc monkeyd_plugins_auth monkeyd_plugins_cheetah cgi monkeyd_plugins_dirlisting fastcgi +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril"
-
-# uclibc is often compiled without backtrace info so we should
-# force this off.  If someone complains, consider relaxing it.
-# ssl is borken, so we remove "ssl? ( monkeyd_plugins_polarssl )"
-REQUIRED_USE="
-	elibc_uclibc? ( !debug )
-	cgi? ( php )"
-
-DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
-RDEPEND="
-	php? ( dev-lang/php )
-	cgi? ( dev-lang/php[cgi] )"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBROOT="/var/www/localhost"
-
-pkg_setup() {
-	if use debug; then
-		ewarn
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn "Do not use debug in production!"
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# Unconditionally get rid of the bundled jemalloc
-	rm -rf "${S}"/deps
-	epatch "${FILESDIR}"/${PN}-1.5.2-use-system-jemalloc.patch
-	epatch "${FILESDIR}"/${PN}-1.5.0-fix-CPPFLAGS.patch
-
-	# Don't install the banana script, we use ${FILESDIR}/monkeyd.initd instead
-	sed -i '/Creating bin\/banana/d' configure || die "No configure file"
-	sed -i '/create_banana_script bindir/d' configure || die "No configure file"
-
-	# Don't explicitly strip files
-	sed -i -e '/$STRIP /d' -e 's/install -s -m 644/install -m 755/' configure || die "No configure file"
-
-	# We don't need the includes, sym link to libmonkey.so, or monkey.cp when not installing the .so
-	use minimal && {
-		sed -i '/install -d \\$(INCDIR)/d' configure || die "No configure file"
-		sed -i '/install -m 644 src\/include\/\*.h \\$(INCDIR)/d' configure || die "No configure file"
-		sed -i '/ln -sf/d' configure || die "No configure file"
-		sed -i '/install -d \\$(LIBDIR)\/pkgconfig/d' configure || die "No configure file"
-		sed -i '/install -m 644 monkey.pc \\$(LIBDIR)\/pkgconfig/d' configure || die "No configure file"
-	}
-
-	# Unquiet build
-	sed -i '/^CC\s/d' configure || die "No configure file"
-	sed -i 's/^\(CC_QUIET=\).*/\1 \\\$(CC)/' configure || die "No configure file"
-	sed -i 's/^\(.*MAKE.*\)-s\(.*\)$/\1\2/' configure || die "No configure file"
-	makes=$(find . -iname Makefile.in)
-	for f in ${makes}; do
-		sed -i '/^CC\s/d' $f || die "No file "$f
-		sed -i 's/^\(CC_QUIET=\).*/\1 \$(CC)/' $f || die "No file "$f
-	done
-}
-
-src_configure() {
-	local myconf=""
-
-	use elibc_uclibc && myconf+=" --uclib-mode"
-	use elibc_musl && myconf+=" --musl-mode"
-
-	use minimal || myconf+=" --enable-shared"
-	use jemalloc || myconf+=" --malloc-libc"
-
-	if use debug; then
-		myconf+=" --debug --trace"
-	else
-		myconf+=" --no-backtrace"
-	fi
-
-	local enable_plugins=""
-	local disable_plugins=""
-	for p in ${PLUGINS}; do
-		cp=${p/monkeyd_plugins_/}
-		use $p && enable_plugins+="${cp}," || disable_plugins+="${cp},"
-	done
-	myconf+=" --enable-plugins=${enable_plugins%,} --disable-plugins=${disable_plugins%,}"
-
-	# Non-autotools configure
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--datadir=${WEBROOT}/htdocs \
-		--logdir=/var/log/${PN} \
-		--mandir=/usr/share/man \
-		--libdir=/usr/$(get_libdir) \
-		--pidfile=/run/monkey.pid \
-		--plugdir=/usr/$(get_libdir)/monkeyd/plugins \
-		--sysconfdir=/etc/${PN} \
-		--platform="generic" \
-		${myconf} \
-		|| die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-
-	# Don't install the banana script man page
-	rm "${S}"/man/banana.1
-}
-
-src_install() {
-	default
-
-	if use php ; then
-		sed -i -e '/^#AddScript application\/x-httpd-php/s:^#::' "${D}"/etc/monkeyd/monkey.conf || die
-		sed -i -e 's:/home/my_home/php/bin/php:/usr/bin/php-cgi:' "${D}"/etc/monkeyd/monkey.conf || die
-	fi
-
-	sed -i -e "s:/var/log/monkeyd/monkey.pid:/var/run/monkey.pid:" "${D}"/etc/monkeyd/monkey.conf || die
-	newinitd "${FILESDIR}"/monkeyd.initd monkeyd
-	newconfd "${FILESDIR}"/monkeyd.confd monkeyd
-
-	#move htdocs to docdir, bug #429632
-	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
-	mv "${D}"${WEBROOT}/htdocs \
-		"${D}"/usr/share/doc/"${PF}"/htdocs.dist
-	mkdir "${D}"${WEBROOT}/htdocs
-
-	keepdir \
-		/var/log/monkeyd \
-		${WEBROOT}/htdocs
-}


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2022-01-01 20:08 David Seifert
  0 siblings, 0 replies; 30+ messages in thread
From: David Seifert @ 2022-01-01 20:08 UTC (permalink / raw
  To: gentoo-commits

commit:     e2c402d072037075abed4a76de937b305d2dfc73
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  1 20:07:42 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jan  1 20:07:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2c402d0

www-servers/monkeyd: remove uclibc

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild | 13 +------------
 www-servers/monkeyd/monkeyd-9999.ebuild     | 13 +------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild b/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild
index 0be511e56215..574514f722de 100644
--- a/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,11 +25,8 @@ SLOT="0"
 PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls"
 IUSE="cgi debug fastcgi php static-plugins ${PLUGINS}"
 
-# uclibc is often compiled without backtrace info so we should
-# force this off.  If someone complains, consider relaxing it.
 REQUIRED_USE="
 	monkeyd_plugins_tls? ( !static-plugins )
-	elibc_uclibc? ( !debug )
 	cgi? ( php )"
 
 #DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
@@ -68,7 +65,6 @@ src_configure() {
 	append-cflags -fcommon
 	local myconf=""
 
-	use elibc_uclibc && myconf+=" --uclib-mode"
 	use elibc_musl && myconf+=" --musl-mode"
 
 	#use jemalloc || myconf+=" --malloc-libc"
@@ -98,13 +94,6 @@ src_configure() {
 		myconf+=" --static-plugins=${enable_plugins%,}"
 	fi
 
-	# For O_CLOEXEC which is guarded by _GNU_SOURCE in uClibc,
-	# but shouldn't because it is POSIX.  This needs to be fixed
-	# in uClibc.  Also, we really should us append-cppflags but
-	# monkey's build system doesn't respect CPPFLAGS.  This needs
-	# to be fixed in monkey.
-	use elibc_uclibc && append-cflags -D_GNU_SOURCE
-
 	# Non-autotools configure
 	./configure \
 		--pthread-tls \

diff --git a/www-servers/monkeyd/monkeyd-9999.ebuild b/www-servers/monkeyd/monkeyd-9999.ebuild
index 3308111d6ea3..a0b187211a62 100644
--- a/www-servers/monkeyd/monkeyd-9999.ebuild
+++ b/www-servers/monkeyd/monkeyd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,11 +25,8 @@ SLOT="0"
 PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls"
 IUSE="cgi debug fastcgi php static-plugins ${PLUGINS}"
 
-# uclibc is often compiled without backtrace info so we should
-# force this off.  If someone complains, consider relaxing it.
 REQUIRED_USE="
 	monkeyd_plugins_tls? ( !static-plugins )
-	elibc_uclibc? ( !debug )
 	cgi? ( php )"
 
 #DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
@@ -68,7 +65,6 @@ src_configure() {
 	append-cflags -fcommon
 	local myconf=""
 
-	use elibc_uclibc && myconf+=" --uclib-mode"
 	use elibc_musl && myconf+=" --musl-mode"
 
 	#use jemalloc || myconf+=" --malloc-libc"
@@ -98,13 +94,6 @@ src_configure() {
 		myconf+=" --static-plugins=${enable_plugins%,}"
 	fi
 
-	# For O_CLOEXEC which is guarded by _GNU_SOURCE in uClibc,
-	# but shouldn't because it is POSIX.  This needs to be fixed
-	# in uClibc.  Also, we really should us append-cppflags but
-	# monkey's build system doesn't respect CPPFLAGS.  This needs
-	# to be fixed in monkey.
-	use elibc_uclibc && append-cflags -D_GNU_SOURCE
-
 	# Non-autotools configure
 	./configure \
 		--pthread-tls \


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2021-07-20 19:03 Conrad Kostecki
  0 siblings, 0 replies; 30+ messages in thread
From: Conrad Kostecki @ 2021-07-20 19:03 UTC (permalink / raw
  To: gentoo-commits

commit:     0d1e374717dd026049baab74dfc190459ecd37a1
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 18 19:55:39 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Jul 20 19:03:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d1e3747

www-servers/monkeyd: drop old version

Closes: https://bugs.gentoo.org/781542
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild | 152 ----------------------------
 1 file changed, 152 deletions(-)

diff --git a/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild b/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
deleted file mode 100644
index 47ed44923c3..00000000000
--- a/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch flag-o-matic toolchain-funcs user multilib
-
-DESCRIPTION="A small, fast, and scalable web server"
-HOMEPAGE="http://www.monkey-project.com/"
-MY_P="${PN/d}-${PV}"
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/monkey/monkey.git"
-	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"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-# jemalloc is also off until we figure out how to work CMakeLists.txt magic.
-#IUSE="cgi debug fastcgi jemalloc php static-plugins ${PLUGINS}"
-
-PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls"
-IUSE="cgi debug fastcgi php static-plugins ${PLUGINS}"
-
-# uclibc is often compiled without backtrace info so we should
-# force this off.  If someone complains, consider relaxing it.
-REQUIRED_USE="
-	monkeyd_plugins_tls? ( !static-plugins )
-	elibc_uclibc? ( !debug )
-	cgi? ( php )"
-
-#DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
-DEPEND="
-	dev-util/cmake
-	monkeyd_plugins_tls? ( net-libs/mbedtls:= )"
-RDEPEND="
-	php? ( dev-lang/php )
-	cgi? ( dev-lang/php[cgi] )"
-
-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
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn "Do not use debug in production!"
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn
-	fi
-}
-
-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
-}
-
-src_configure() {
-	append-cflags -fcommon
-	local myconf=""
-
-	use elibc_uclibc && myconf+=" --uclib-mode"
-	use elibc_musl && myconf+=" --musl-mode"
-
-	#use jemalloc || myconf+=" --malloc-libc"
-	myconf+=" --malloc-libc"
-
-	if use debug; then
-		myconf+=" --debug --trace"
-	else
-		myconf+=" --no-backtrace"
-	fi
-
-	local enable_plugins=""
-	local disable_plugins=""
-	# We use 'cgi' and 'fastcgi' because they are global flags
-	# instead of the corresponding monkeyd_plugins_*
-	use cgi && enable_plugins+="cgi," || disable_plugins+="cgi,"
-	use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi,"
-	# For the rest, we scan the monkeyd_plugins_* and parse out the plugin name.
-	local p
-	for p in ${PLUGINS}; do
-		pp=${p/+/}
-		cp=${pp/monkeyd_plugins_/}
-		use $pp && enable_plugins+="${cp}," || disable_plugins+="${cp},"
-	done
-	myconf+=" --enable-plugins=${enable_plugins%,} --disable-plugins=${disable_plugins%,}"
-	if use static-plugins; then
-		myconf+=" --static-plugins=${enable_plugins%,}"
-	fi
-
-	# For O_CLOEXEC which is guarded by _GNU_SOURCE in uClibc,
-	# but shouldn't because it is POSIX.  This needs to be fixed
-	# in uClibc.  Also, we really should us append-cppflags but
-	# monkey's build system doesn't respect CPPFLAGS.  This needs
-	# to be fixed in monkey.
-	use elibc_uclibc && append-cflags -D_GNU_SOURCE
-
-	# Non-autotools configure
-	./configure \
-		--pthread-tls \
-		--prefix=/usr \
-		--default-user=monkeyd \
-		--sbindir=/usr/sbin \
-		--webroot=${WEBROOT}/htdocs \
-		--logdir=/var/log/monkeyd \
-		--mandir=/usr/share/man \
-		--libdir=/usr/$(get_libdir) \
-		--sysconfdir=/etc/monkeyd \
-		${myconf} \
-		|| die
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/monkeyd.initd-r1 monkeyd
-	newconfd "${FILESDIR}"/monkeyd.confd monkeyd
-
-	# Move htdocs to docdir, bug #429632
-	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
-	mv "${D}"${WEBROOT}/htdocs \
-		"${D}"/usr/share/doc/"${PF}"/htdocs.dist || die
-
-	keepdir \
-		/var/tmp/monkeyd \
-		/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
-}


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2021-02-15  9:03 Sam James
  0 siblings, 0 replies; 30+ messages in thread
From: Sam James @ 2021-02-15  9:03 UTC (permalink / raw
  To: gentoo-commits

commit:     fd67a63888ea9f79768ef16b1d8439092c9d2c09
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 15 08:56:12 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 09:03:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd67a638

www-servers/monkeyd: drop double KEYWORDS

Double KEYWORDS lines break tools like ekeyword and Nattka.
As per PMS, blank/empty KEYWORDS is implied by not defining
the variable.

See: https://projects.gentoo.org/qa/policy-guide/ebuild-format.html#pg0105
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 www-servers/monkeyd/monkeyd-9999.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/www-servers/monkeyd/monkeyd-9999.ebuild b/www-servers/monkeyd/monkeyd-9999.ebuild
index 86d571f4137..1ec59af14bc 100644
--- a/www-servers/monkeyd/monkeyd-9999.ebuild
+++ b/www-servers/monkeyd/monkeyd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,6 @@ MY_P="${PN/d}-${PV}"
 if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/monkey/monkey.git"
 	inherit git-r3
-	KEYWORDS=""
 else
 	SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2021-02-15  0:32 Sam James
  0 siblings, 0 replies; 30+ messages in thread
From: Sam James @ 2021-02-15  0:32 UTC (permalink / raw
  To: gentoo-commits

commit:     cf51e4c5d3b693e1e4210a81e7fa9399123c49ea
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 23:29:59 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 00:32:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf51e4c5

www-servers/monkeyd: fix double KEYWORDS

Double KEYWORDS lines break tools like ekeyword and Nattka.
As per PMS, blank/empty KEYWORDS is implied by not defining
the variable.

See: https://projects.gentoo.org/qa/policy-guide/ebuild-format.html#pg0105
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild b/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
index b01710bd8a8..515772116e8 100644
--- a/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,6 @@ MY_P="${PN/d}-${PV}"
 if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/monkey/monkey.git"
 	inherit git-r3
-	KEYWORDS=""
 else
 	SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
 	KEYWORDS="amd64 arm ~mips ppc ppc64 x86"


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2021-02-14 10:36 David Seifert
  0 siblings, 0 replies; 30+ messages in thread
From: David Seifert @ 2021-02-14 10:36 UTC (permalink / raw
  To: gentoo-commits

commit:     47add45312b44da974e2c5590872eca333963b7e
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sun Feb 14 10:33:09 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 10:33:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47add453

www-servers/monkeyd: Apply gcc-10 workaround

* Ebuild needs multiple improvements
* Upstream active, but last release in 2016

Closes: https://bugs.gentoo.org/707642
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild b/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
index d86b0157384..b01710bd8a8 100644
--- a/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
@@ -68,6 +68,7 @@ src_prepare() {
 }
 
 src_configure() {
+	append-cflags -fcommon
 	local myconf=""
 
 	use elibc_uclibc && myconf+=" --uclib-mode"


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2018-04-27 22:11 Anthony G. Basile
  0 siblings, 0 replies; 30+ messages in thread
From: Anthony G. Basile @ 2018-04-27 22:11 UTC (permalink / raw
  To: gentoo-commits

commit:     dacba8510405c732f4c93ab36d3db0d153c525fe
Author:     Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Fri Apr 27 17:42:36 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Apr 27 22:11:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dacba851

www-servers/monkeyd: git-2->git-r3

Package-Manager: Portage-2.3.31, Repoman-2.3.9
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild | 10 +++++-----
 www-servers/monkeyd/monkeyd-9999.ebuild     |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild b/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
index 67bcf735132..d86b0157384 100644
--- a/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=5
 
 inherit eutils flag-o-matic toolchain-funcs user multilib
 
 DESCRIPTION="A small, fast, and scalable web server"
 HOMEPAGE="http://www.monkey-project.com/"
 MY_P="${PN/d}-${PV}"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/monkey/monkey.git"
-	inherit git-2
-	KEYWORDS="amd64 arm ppc64"
+	inherit git-r3
+	KEYWORDS=""
 else
 	SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
 	KEYWORDS="amd64 arm ~mips ppc ppc64 x86"

diff --git a/www-servers/monkeyd/monkeyd-9999.ebuild b/www-servers/monkeyd/monkeyd-9999.ebuild
index fafdebcfb41..86d571f4137 100644
--- a/www-servers/monkeyd/monkeyd-9999.ebuild
+++ b/www-servers/monkeyd/monkeyd-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=5
 
 inherit eutils flag-o-matic toolchain-funcs user multilib
 
 DESCRIPTION="A small, fast, and scalable web server"
 HOMEPAGE="http://www.monkey-project.com/"
 MY_P="${PN/d}-${PV}"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/monkey/monkey.git"
-	inherit git-2
+	inherit git-r3
 	KEYWORDS=""
 else
 	SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2016-10-22 13:05 Anthony G. Basile
  0 siblings, 0 replies; 30+ messages in thread
From: Anthony G. Basile @ 2016-10-22 13:05 UTC (permalink / raw
  To: gentoo-commits

commit:     d6929ec2e656edb86ba0916bd5edd1c542879793
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 22 13:05:07 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Oct 22 13:05:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6929ec2

www-servers/monkeyd: stable on ppc and x86, bug #585064

Package-Manager: portage-2.2.28

 www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild b/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
index 982df5d..842df53 100644
--- a/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS="amd64 arm ppc64"
 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"


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2016-07-18 17:13 Markus Meier
  0 siblings, 0 replies; 30+ messages in thread
From: Markus Meier @ 2016-07-18 17:13 UTC (permalink / raw
  To: gentoo-commits

commit:     730771c56c7658c2f19cf3a5617e3c68ab1b3692
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 17:13:01 2016 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 17:13:01 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=730771c5

www-servers/monkeyd: arm stable, bug #585064

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="arm"

 www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild b/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
index 3a6ca5e..84e1446 100644
--- a/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
@@ -12,10 +12,10 @@ MY_P="${PN/d}-${PV}"
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/monkey/monkey.git"
 	inherit git-2
-	KEYWORDS="ppc64"
+	KEYWORDS="arm ppc64"
 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"


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2016-07-14  7:27 Jeroen Roovers
  0 siblings, 0 replies; 30+ messages in thread
From: Jeroen Roovers @ 2016-07-14  7:27 UTC (permalink / raw
  To: gentoo-commits

commit:     4e1fe764d3e49401394c6a128699fb8c28fb200e
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 07:27:00 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 07:27:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e1fe764

www-servers/monkeyd: Stable for PPC64 (bug #585064).

Package-Manager: portage-2.3.0
RepoMan-Options: --ignore-arches

 www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild b/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
index 86b01b6..3a6ca5e 100644
--- a/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
@@ -12,10 +12,10 @@ MY_P="${PN/d}-${PV}"
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/monkey/monkey.git"
 	inherit git-2
-	KEYWORDS=""
+	KEYWORDS="ppc64"
 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"


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2016-07-01 17:20 Anthony G. Basile
  0 siblings, 0 replies; 30+ messages in thread
From: Anthony G. Basile @ 2016-07-01 17:20 UTC (permalink / raw
  To: gentoo-commits

commit:     bf1f8daa30e04804218d6f188ded9482ae65debf
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  1 14:50:58 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jul  1 17:23:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf1f8daa

www-servers/monkeyd: remove older unstable version

Package-Manager: portage-2.2.28

 www-servers/monkeyd/Manifest             |   1 -
 www-servers/monkeyd/monkeyd-1.6.8.ebuild | 141 -------------------------------
 2 files changed, 142 deletions(-)

diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index 2a10383..701c58a 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -1,3 +1,2 @@
 DIST monkey-1.5.6.tar.gz 902636 SHA256 7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22 SHA512 4c7c627cb047252252b22da5fba179a21fb5b8dc6280b96307af52757ad049d24b0daaaea51dca4f0429af5e6499c239f6b62a03654cc9e7ad98ae8f5149b64c WHIRLPOOL aba1a928023fc67224f254182eb9707c6594c7092d9ff98ecfa297c91d5c61f79235e7467192b5d46ac114ae67a3cee98e06704721348a40ee825755ab39d9a1
-DIST monkey-1.6.8.tar.gz 1967478 SHA256 936aa276d11dea77cda2703eb5d1b89ede1cf8d44440e1ec029cafb10effb3cf SHA512 44d3c9785190849e50ffc28168a41939ddb9fa62e7c0ead26fa67ff78eae1b3855a9729b3de520b53d629607b456e9fa6fe31b7d0b0036c514c1d13296b7e8db WHIRLPOOL 227559f6e625ca78690072aff0eddfcbdad2aba11b395c2636b58ce3329b657324975631be0392e4e92004fb0233bda3384fb080b2381035bf7d743d198ef4bc
 DIST monkey-1.6.9.tar.gz 1972040 SHA256 f1122e89cda627123286542b0a18fcaa131cbe9d4f5dd897d9455157289148fb SHA512 3540a17fffe57a9d4b88b6243c634dcf6a27ed894ae2a0d5d42a4881221a9d59ae67d4c7fcf087535360d20ccdadab16947cf3a7dc6d4e864d487f598eb0ba62 WHIRLPOOL c0af688a0a9d8d82a6dc405a79640738ebd62fe1de8a0aad715c1356c73a499ff5854f2a16d69e9a1022bfd02ca04dc17163011a27e53b438ca0e32c9b824f2b

diff --git a/www-servers/monkeyd/monkeyd-1.6.8.ebuild b/www-servers/monkeyd/monkeyd-1.6.8.ebuild
deleted file mode 100644
index b97936f..0000000
--- a/www-servers/monkeyd/monkeyd-1.6.8.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-DESCRIPTION="A small, fast, and scalable web server"
-HOMEPAGE="http://www.monkey-project.com/"
-MY_P="${PN/d}-${PV}"
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/monkey/monkey.git"
-	inherit git-2
-	KEYWORDS="arm"
-else
-	SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 arm ~mips ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-# jemalloc is also off until we figure out how to work CMakeLists.txt magic.
-#IUSE="cgi -debug fastcgi jemalloc php static-plugins ${PLUGINS}"
-
-PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls"
-IUSE="cgi -debug fastcgi php static-plugins ${PLUGINS}"
-
-# uclibc is often compiled without backtrace info so we should
-# force this off.  If someone complains, consider relaxing it.
-REQUIRED_USE="
-	monkeyd_plugins_tls? ( !static-plugins )
-	elibc_uclibc? ( !debug )
-	cgi? ( php )"
-
-#DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
-DEPEND="
-	dev-util/cmake
-	monkeyd_plugins_tls? ( net-libs/mbedtls:= )"
-RDEPEND="
-	php? ( dev-lang/php )
-	cgi? ( dev-lang/php[cgi] )"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBROOT="/var/www/localhost"
-
-pkg_setup() {
-	if use debug; then
-		ewarn
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn "Do not use debug in production!"
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# Unconditionally get rid of the bundled jemalloc
-	rm -rf "${S}"/deps
-	epatch "${FILESDIR}"/${PN}-1.6.8-system-mbedtls.patch
-}
-
-src_configure() {
-	local myconf=""
-
-	use elibc_uclibc && myconf+=" --uclib-mode"
-	use elibc_musl && myconf+=" --musl-mode"
-
-	#use jemalloc || myconf+=" --malloc-libc"
-	myconf+=" --malloc-libc"
-
-	if use debug; then
-		myconf+=" --debug --trace"
-	else
-		myconf+=" --no-backtrace"
-	fi
-
-	local enable_plugins=""
-	local disable_plugins=""
-	# We use 'cgi' and 'fastcgi' because they are global flags
-	# instead of the corresponding monkeyd_plugins_*
-	use cgi && enable_plugins+="cgi," || disable_plugins+="cgi,"
-	use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi,"
-	# For the rest, we scan the monkeyd_plugins_* and parse out the plugin name.
-	local p
-	for p in ${PLUGINS}; do
-		pp=${p/+/}
-		cp=${pp/monkeyd_plugins_/}
-		use $pp && enable_plugins+="${cp}," || disable_plugins+="${cp},"
-	done
-	myconf+=" --enable-plugins=${enable_plugins%,} --disable-plugins=${disable_plugins%,}"
-	if use static-plugins; then
-		myconf+=" --static-plugins=${enable_plugins%,}"
-	fi
-
-	# For O_CLOEXEC which is guarded by _GNU_SOURCE in uClibc,
-	# but shouldn't because it is POSIX.  This needs to be fixed
-	# in uClibc.  Also, we really should us append-cppflags but
-	# monkey's build system doesn't respect CPPFLAGS.  This needs
-	# to be fixed in monkey.
-	use elibc_uclibc && append-cflags -D_GNU_SOURCE
-
-	# Non-autotools configure
-	./configure \
-		--pthread-tls \
-		--prefix=/usr \
-		--sbindir=/usr/sbin \
-		--webroot=${WEBROOT}/htdocs \
-		--logdir=/var/log/${PN} \
-		--mandir=/usr/share/man \
-		--libdir=/usr/$(get_libdir) \
-		--pidfile=/run/monkey.pid \
-		--sysconfdir=/etc/${PN} \
-		${myconf} \
-		|| die
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/monkeyd.initd-r1 monkeyd
-	newconfd "${FILESDIR}"/monkeyd.confd monkeyd
-
-	# Move htdocs to docdir, bug #429632
-	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
-	mv "${D}"${WEBROOT}/htdocs \
-		"${D}"/usr/share/doc/"${PF}"/htdocs.dist || die
-
-	keepdir \
-		/var/log/monkeyd \
-		${WEBROOT}/htdocs
-
-	# This needs to be created at runtime
-	rm -rf "${D}"/run
-}


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2016-06-12 19:53 Markus Meier
  0 siblings, 0 replies; 30+ messages in thread
From: Markus Meier @ 2016-06-12 19:53 UTC (permalink / raw
  To: gentoo-commits

commit:     1f669245a392c8008a09a0e6d1c7d9f7c02c0d97
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 12 19:53:08 2016 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sun Jun 12 19:53:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f669245

www-servers/monkeyd: arm stable, bug #585064

Package-Manager: portage-2.3.0_rc1
RepoMan-Options: --include-arches="arm"

 www-servers/monkeyd/monkeyd-1.6.8.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-servers/monkeyd/monkeyd-1.6.8.ebuild b/www-servers/monkeyd/monkeyd-1.6.8.ebuild
index 3221de5..b97936f 100644
--- a/www-servers/monkeyd/monkeyd-1.6.8.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.6.8.ebuild
@@ -12,10 +12,10 @@ MY_P="${PN/d}-${PV}"
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/monkey/monkey.git"
 	inherit git-2
-	KEYWORDS=""
+	KEYWORDS="arm"
 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"


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2016-06-05  8:34 Anthony G. Basile
  0 siblings, 0 replies; 30+ messages in thread
From: Anthony G. Basile @ 2016-06-05  8:34 UTC (permalink / raw
  To: gentoo-commits

commit:     2a3dcd011bf7fc6d5e3532d4ad76042a6fa36d91
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  5 08:35:30 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jun  5 08:36:01 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a3dcd01

www-servers/monkeyd: version bump to 1.6.9, remove older unstable

Package-Manager: portage-2.2.28

 www-servers/monkeyd/Manifest                                       | 2 +-
 www-servers/monkeyd/{monkeyd-1.6.7.ebuild => monkeyd-1.6.9.ebuild} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index a693d8d..2a10383 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -1,3 +1,3 @@
 DIST monkey-1.5.6.tar.gz 902636 SHA256 7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22 SHA512 4c7c627cb047252252b22da5fba179a21fb5b8dc6280b96307af52757ad049d24b0daaaea51dca4f0429af5e6499c239f6b62a03654cc9e7ad98ae8f5149b64c WHIRLPOOL aba1a928023fc67224f254182eb9707c6594c7092d9ff98ecfa297c91d5c61f79235e7467192b5d46ac114ae67a3cee98e06704721348a40ee825755ab39d9a1
-DIST monkey-1.6.7.tar.gz 2038458 SHA256 32bf4126d1947c426eb2aa269f4bfa08fe5e42b4966468f2fea8e9a3cdfc8ea1 SHA512 7da091f7252c7188e7a30c56c704984d3806b001bb74c15b6f742fc527304cb8821b6da5da2a7275f15f5cd29c3d412ad0534075867893b4aea7a6f8a309df90 WHIRLPOOL fdc451925b241f1ef3b8b4e6e6dd6c2869b3408d1ad41498107f12cd04e845a730501f5c8c070c30643ae9fa4384395034e7ccd2b3da30e61730def4e9a1b91a
 DIST monkey-1.6.8.tar.gz 1967478 SHA256 936aa276d11dea77cda2703eb5d1b89ede1cf8d44440e1ec029cafb10effb3cf SHA512 44d3c9785190849e50ffc28168a41939ddb9fa62e7c0ead26fa67ff78eae1b3855a9729b3de520b53d629607b456e9fa6fe31b7d0b0036c514c1d13296b7e8db WHIRLPOOL 227559f6e625ca78690072aff0eddfcbdad2aba11b395c2636b58ce3329b657324975631be0392e4e92004fb0233bda3384fb080b2381035bf7d743d198ef4bc
+DIST monkey-1.6.9.tar.gz 1972040 SHA256 f1122e89cda627123286542b0a18fcaa131cbe9d4f5dd897d9455157289148fb SHA512 3540a17fffe57a9d4b88b6243c634dcf6a27ed894ae2a0d5d42a4881221a9d59ae67d4c7fcf087535360d20ccdadab16947cf3a7dc6d4e864d487f598eb0ba62 WHIRLPOOL c0af688a0a9d8d82a6dc405a79640738ebd62fe1de8a0aad715c1356c73a499ff5854f2a16d69e9a1022bfd02ca04dc17163011a27e53b438ca0e32c9b824f2b

diff --git a/www-servers/monkeyd/monkeyd-1.6.7.ebuild b/www-servers/monkeyd/monkeyd-1.6.9.ebuild
similarity index 97%
rename from www-servers/monkeyd/monkeyd-1.6.7.ebuild
rename to www-servers/monkeyd/monkeyd-1.6.9.ebuild
index add07dc..3221de5 100644
--- a/www-servers/monkeyd/monkeyd-1.6.7.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.6.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -59,7 +59,7 @@ pkg_setup() {
 src_prepare() {
 	# Unconditionally get rid of the bundled jemalloc
 	rm -rf "${S}"/deps
-	epatch "${FILESDIR}"/${PN}-1.6.3-system-mbedtls.patch
+	epatch "${FILESDIR}"/${PN}-1.6.8-system-mbedtls.patch
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2016-01-19 21:17 Anthony G. Basile
  0 siblings, 0 replies; 30+ messages in thread
From: Anthony G. Basile @ 2016-01-19 21:17 UTC (permalink / raw
  To: gentoo-commits

commit:     5a36d7b69ccf00b4eb70aa756ab2dd6cec590ccb
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 21:19:13 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 21:26:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a36d7b6

www-servers/monkeyd: inherit eutils, fixes bug #572374

Package-Manager: portage-2.2.26

 www-servers/monkeyd/monkeyd-1.5.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/monkeyd/monkeyd-1.5.6-r1.ebuild b/www-servers/monkeyd/monkeyd-1.5.6-r1.ebuild
index 6226bf2..a753859 100644
--- a/www-servers/monkeyd/monkeyd-1.5.6-r1.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.5.6-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit toolchain-funcs multilib
+inherit eutils multilib toolchain-funcs
 
 MY_P="${PN/d}-${PV}"
 DESCRIPTION="A small, fast, and scalable web server"


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2016-01-11 15:21 Brian Evans
  0 siblings, 0 replies; 30+ messages in thread
From: Brian Evans @ 2016-01-11 15:21 UTC (permalink / raw
  To: gentoo-commits

commit:     dd3ff83b1baba2ebab4cbb01267a6239af90edff
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 11 15:09:02 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Jan 11 15:09:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd3ff83b

www-servers/monkeyd: Drop unused depend.php inherit

Non-maintainer commit.  Verified all functions in eclass were not used

Package-Manager: portage-2.2.26

 www-servers/monkeyd/monkeyd-1.5.6-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-servers/monkeyd/monkeyd-1.5.6-r1.ebuild b/www-servers/monkeyd/monkeyd-1.5.6-r1.ebuild
index 8bf5b83..6226bf2 100644
--- a/www-servers/monkeyd/monkeyd-1.5.6-r1.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.5.6-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
 
-inherit toolchain-funcs depend.php multilib
+inherit toolchain-funcs multilib
 
 MY_P="${PN/d}-${PV}"
 DESCRIPTION="A small, fast, and scalable web server"


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2016-01-01  8:05 Anthony G. Basile
  0 siblings, 0 replies; 30+ messages in thread
From: Anthony G. Basile @ 2016-01-01  8:05 UTC (permalink / raw
  To: gentoo-commits

commit:     3eb10323281a12ec15d5a0cafc791024c12be5c5
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  1 08:12:02 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jan  1 08:12:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eb10323

www-servers/monkeyd: version bump to 1.6.7

Package-Manager: portage-2.2.24

 www-servers/monkeyd/Manifest             |   1 +
 www-servers/monkeyd/monkeyd-1.6.7.ebuild | 141 +++++++++++++++++++++++++++++++
 2 files changed, 142 insertions(+)

diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index dd1c038..73804ec 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -1,2 +1,3 @@
 DIST monkey-1.5.6.tar.gz 902636 SHA256 7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22 SHA512 4c7c627cb047252252b22da5fba179a21fb5b8dc6280b96307af52757ad049d24b0daaaea51dca4f0429af5e6499c239f6b62a03654cc9e7ad98ae8f5149b64c WHIRLPOOL aba1a928023fc67224f254182eb9707c6594c7092d9ff98ecfa297c91d5c61f79235e7467192b5d46ac114ae67a3cee98e06704721348a40ee825755ab39d9a1
 DIST monkey-1.6.6.tar.gz 2035885 SHA256 4ad8258d6cb6fb8b9d98891a7c84a559ab7ab96f7dde0ecdfc23a1a8d594ce11 SHA512 c56edcd2bb18fbe4e4f364853e4796be1211cca7829899cde94500d514ded7ba8cca44c6e5f964b8864d0348caf1a570ac558c287f708c081a40aeecef8ee2cf WHIRLPOOL 60b95e0c81b9ce3faf2a87acf9496a8510d5d6d66501850c2d45cab39505b58f9f22ec9936002ff06cd4b13d6ac787b144409f64625fc56042fdfef4bfee79a4
+DIST monkey-1.6.7.tar.gz 2038458 SHA256 32bf4126d1947c426eb2aa269f4bfa08fe5e42b4966468f2fea8e9a3cdfc8ea1 SHA512 7da091f7252c7188e7a30c56c704984d3806b001bb74c15b6f742fc527304cb8821b6da5da2a7275f15f5cd29c3d412ad0534075867893b4aea7a6f8a309df90 WHIRLPOOL fdc451925b241f1ef3b8b4e6e6dd6c2869b3408d1ad41498107f12cd04e845a730501f5c8c070c30643ae9fa4384395034e7ccd2b3da30e61730def4e9a1b91a

diff --git a/www-servers/monkeyd/monkeyd-1.6.7.ebuild b/www-servers/monkeyd/monkeyd-1.6.7.ebuild
new file mode 100644
index 0000000..add07dc
--- /dev/null
+++ b/www-servers/monkeyd/monkeyd-1.6.7.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+DESCRIPTION="A small, fast, and scalable web server"
+HOMEPAGE="http://www.monkey-project.com/"
+MY_P="${PN/d}-${PV}"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/monkey/monkey.git"
+	inherit git-2
+	KEYWORDS=""
+else
+	SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# jemalloc is also off until we figure out how to work CMakeLists.txt magic.
+#IUSE="cgi -debug fastcgi jemalloc php static-plugins ${PLUGINS}"
+
+PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls"
+IUSE="cgi -debug fastcgi php static-plugins ${PLUGINS}"
+
+# uclibc is often compiled without backtrace info so we should
+# force this off.  If someone complains, consider relaxing it.
+REQUIRED_USE="
+	monkeyd_plugins_tls? ( !static-plugins )
+	elibc_uclibc? ( !debug )
+	cgi? ( php )"
+
+#DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
+DEPEND="
+	dev-util/cmake
+	monkeyd_plugins_tls? ( net-libs/mbedtls:= )"
+RDEPEND="
+	php? ( dev-lang/php )
+	cgi? ( dev-lang/php[cgi] )"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBROOT="/var/www/localhost"
+
+pkg_setup() {
+	if use debug; then
+		ewarn
+		ewarn "\033[1;33m**************************************************\033[00m"
+		ewarn "Do not use debug in production!"
+		ewarn "\033[1;33m**************************************************\033[00m"
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# Unconditionally get rid of the bundled jemalloc
+	rm -rf "${S}"/deps
+	epatch "${FILESDIR}"/${PN}-1.6.3-system-mbedtls.patch
+}
+
+src_configure() {
+	local myconf=""
+
+	use elibc_uclibc && myconf+=" --uclib-mode"
+	use elibc_musl && myconf+=" --musl-mode"
+
+	#use jemalloc || myconf+=" --malloc-libc"
+	myconf+=" --malloc-libc"
+
+	if use debug; then
+		myconf+=" --debug --trace"
+	else
+		myconf+=" --no-backtrace"
+	fi
+
+	local enable_plugins=""
+	local disable_plugins=""
+	# We use 'cgi' and 'fastcgi' because they are global flags
+	# instead of the corresponding monkeyd_plugins_*
+	use cgi && enable_plugins+="cgi," || disable_plugins+="cgi,"
+	use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi,"
+	# For the rest, we scan the monkeyd_plugins_* and parse out the plugin name.
+	local p
+	for p in ${PLUGINS}; do
+		pp=${p/+/}
+		cp=${pp/monkeyd_plugins_/}
+		use $pp && enable_plugins+="${cp}," || disable_plugins+="${cp},"
+	done
+	myconf+=" --enable-plugins=${enable_plugins%,} --disable-plugins=${disable_plugins%,}"
+	if use static-plugins; then
+		myconf+=" --static-plugins=${enable_plugins%,}"
+	fi
+
+	# For O_CLOEXEC which is guarded by _GNU_SOURCE in uClibc,
+	# but shouldn't because it is POSIX.  This needs to be fixed
+	# in uClibc.  Also, we really should us append-cppflags but
+	# monkey's build system doesn't respect CPPFLAGS.  This needs
+	# to be fixed in monkey.
+	use elibc_uclibc && append-cflags -D_GNU_SOURCE
+
+	# Non-autotools configure
+	./configure \
+		--pthread-tls \
+		--prefix=/usr \
+		--sbindir=/usr/sbin \
+		--webroot=${WEBROOT}/htdocs \
+		--logdir=/var/log/${PN} \
+		--mandir=/usr/share/man \
+		--libdir=/usr/$(get_libdir) \
+		--pidfile=/run/monkey.pid \
+		--sysconfdir=/etc/${PN} \
+		${myconf} \
+		|| die
+}
+
+src_compile() {
+	emake VERBOSE=1
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/monkeyd.initd-r1 monkeyd
+	newconfd "${FILESDIR}"/monkeyd.confd monkeyd
+
+	# Move htdocs to docdir, bug #429632
+	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
+	mv "${D}"${WEBROOT}/htdocs \
+		"${D}"/usr/share/doc/"${PF}"/htdocs.dist || die
+
+	keepdir \
+		/var/log/monkeyd \
+		${WEBROOT}/htdocs
+
+	# This needs to be created at runtime
+	rm -rf "${D}"/run
+}


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2015-11-24  8:27 Anthony G. Basile
  0 siblings, 0 replies; 30+ messages in thread
From: Anthony G. Basile @ 2015-11-24  8:27 UTC (permalink / raw
  To: gentoo-commits

commit:     ebd7f8507267db7625b9a0cb45d8daa3a7eba2df
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 08:34:30 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 08:34:30 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebd7f850

www-servers/monkeyd: remove older unstable version.

Package-Manager: portage-2.2.20.1

 www-servers/monkeyd/Manifest             |   1 -
 www-servers/monkeyd/monkeyd-1.6.5.ebuild | 141 -------------------------------
 2 files changed, 142 deletions(-)

diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index 7b31727..dd1c038 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -1,3 +1,2 @@
 DIST monkey-1.5.6.tar.gz 902636 SHA256 7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22 SHA512 4c7c627cb047252252b22da5fba179a21fb5b8dc6280b96307af52757ad049d24b0daaaea51dca4f0429af5e6499c239f6b62a03654cc9e7ad98ae8f5149b64c WHIRLPOOL aba1a928023fc67224f254182eb9707c6594c7092d9ff98ecfa297c91d5c61f79235e7467192b5d46ac114ae67a3cee98e06704721348a40ee825755ab39d9a1
-DIST monkey-1.6.5.tar.gz 2033866 SHA256 5e24a782fe3d97f4a4e78cac54646ca13d8646b8c790ea63924be77235453ea5 SHA512 64b5a30e8636e9aaaf3f8fb207201282980a29449476e8905218b5e36da78c9a1754a5706eafb40d46c72458a32346899a1bf859b29c213bf7cc5e66f5d834b3 WHIRLPOOL 1573fd42dc87da294f56dc3ddea8968d9cabd9421788beda074968343e52ea94f2ec321ed2a73c778787337e4f0c4eff89b43026f7e495976eb1d0cddd6b6c19
 DIST monkey-1.6.6.tar.gz 2035885 SHA256 4ad8258d6cb6fb8b9d98891a7c84a559ab7ab96f7dde0ecdfc23a1a8d594ce11 SHA512 c56edcd2bb18fbe4e4f364853e4796be1211cca7829899cde94500d514ded7ba8cca44c6e5f964b8864d0348caf1a570ac558c287f708c081a40aeecef8ee2cf WHIRLPOOL 60b95e0c81b9ce3faf2a87acf9496a8510d5d6d66501850c2d45cab39505b58f9f22ec9936002ff06cd4b13d6ac787b144409f64625fc56042fdfef4bfee79a4

diff --git a/www-servers/monkeyd/monkeyd-1.6.5.ebuild b/www-servers/monkeyd/monkeyd-1.6.5.ebuild
deleted file mode 100644
index add07dc..0000000
--- a/www-servers/monkeyd/monkeyd-1.6.5.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-DESCRIPTION="A small, fast, and scalable web server"
-HOMEPAGE="http://www.monkey-project.com/"
-MY_P="${PN/d}-${PV}"
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/monkey/monkey.git"
-	inherit git-2
-	KEYWORDS=""
-else
-	SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-# jemalloc is also off until we figure out how to work CMakeLists.txt magic.
-#IUSE="cgi -debug fastcgi jemalloc php static-plugins ${PLUGINS}"
-
-PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls"
-IUSE="cgi -debug fastcgi php static-plugins ${PLUGINS}"
-
-# uclibc is often compiled without backtrace info so we should
-# force this off.  If someone complains, consider relaxing it.
-REQUIRED_USE="
-	monkeyd_plugins_tls? ( !static-plugins )
-	elibc_uclibc? ( !debug )
-	cgi? ( php )"
-
-#DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
-DEPEND="
-	dev-util/cmake
-	monkeyd_plugins_tls? ( net-libs/mbedtls:= )"
-RDEPEND="
-	php? ( dev-lang/php )
-	cgi? ( dev-lang/php[cgi] )"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBROOT="/var/www/localhost"
-
-pkg_setup() {
-	if use debug; then
-		ewarn
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn "Do not use debug in production!"
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# Unconditionally get rid of the bundled jemalloc
-	rm -rf "${S}"/deps
-	epatch "${FILESDIR}"/${PN}-1.6.3-system-mbedtls.patch
-}
-
-src_configure() {
-	local myconf=""
-
-	use elibc_uclibc && myconf+=" --uclib-mode"
-	use elibc_musl && myconf+=" --musl-mode"
-
-	#use jemalloc || myconf+=" --malloc-libc"
-	myconf+=" --malloc-libc"
-
-	if use debug; then
-		myconf+=" --debug --trace"
-	else
-		myconf+=" --no-backtrace"
-	fi
-
-	local enable_plugins=""
-	local disable_plugins=""
-	# We use 'cgi' and 'fastcgi' because they are global flags
-	# instead of the corresponding monkeyd_plugins_*
-	use cgi && enable_plugins+="cgi," || disable_plugins+="cgi,"
-	use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi,"
-	# For the rest, we scan the monkeyd_plugins_* and parse out the plugin name.
-	local p
-	for p in ${PLUGINS}; do
-		pp=${p/+/}
-		cp=${pp/monkeyd_plugins_/}
-		use $pp && enable_plugins+="${cp}," || disable_plugins+="${cp},"
-	done
-	myconf+=" --enable-plugins=${enable_plugins%,} --disable-plugins=${disable_plugins%,}"
-	if use static-plugins; then
-		myconf+=" --static-plugins=${enable_plugins%,}"
-	fi
-
-	# For O_CLOEXEC which is guarded by _GNU_SOURCE in uClibc,
-	# but shouldn't because it is POSIX.  This needs to be fixed
-	# in uClibc.  Also, we really should us append-cppflags but
-	# monkey's build system doesn't respect CPPFLAGS.  This needs
-	# to be fixed in monkey.
-	use elibc_uclibc && append-cflags -D_GNU_SOURCE
-
-	# Non-autotools configure
-	./configure \
-		--pthread-tls \
-		--prefix=/usr \
-		--sbindir=/usr/sbin \
-		--webroot=${WEBROOT}/htdocs \
-		--logdir=/var/log/${PN} \
-		--mandir=/usr/share/man \
-		--libdir=/usr/$(get_libdir) \
-		--pidfile=/run/monkey.pid \
-		--sysconfdir=/etc/${PN} \
-		${myconf} \
-		|| die
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/monkeyd.initd-r1 monkeyd
-	newconfd "${FILESDIR}"/monkeyd.confd monkeyd
-
-	# Move htdocs to docdir, bug #429632
-	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
-	mv "${D}"${WEBROOT}/htdocs \
-		"${D}"/usr/share/doc/"${PF}"/htdocs.dist || die
-
-	keepdir \
-		/var/log/monkeyd \
-		${WEBROOT}/htdocs
-
-	# This needs to be created at runtime
-	rm -rf "${D}"/run
-}


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2015-11-24  8:24 Anthony G. Basile
  0 siblings, 0 replies; 30+ messages in thread
From: Anthony G. Basile @ 2015-11-24  8:24 UTC (permalink / raw
  To: gentoo-commits

commit:     8972a4c48d2b1be2b7c0ee5e288d7d85302cda5e
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 08:30:30 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 08:31:08 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8972a4c4

www-servers/monkeyd: version bump to 1.6.6.

Package-Manager: portage-2.2.20.1

 www-servers/monkeyd/Manifest             |   1 +
 www-servers/monkeyd/monkeyd-1.6.6.ebuild | 141 +++++++++++++++++++++++++++++++
 2 files changed, 142 insertions(+)

diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index a7d8224..7b31727 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -1,2 +1,3 @@
 DIST monkey-1.5.6.tar.gz 902636 SHA256 7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22 SHA512 4c7c627cb047252252b22da5fba179a21fb5b8dc6280b96307af52757ad049d24b0daaaea51dca4f0429af5e6499c239f6b62a03654cc9e7ad98ae8f5149b64c WHIRLPOOL aba1a928023fc67224f254182eb9707c6594c7092d9ff98ecfa297c91d5c61f79235e7467192b5d46ac114ae67a3cee98e06704721348a40ee825755ab39d9a1
 DIST monkey-1.6.5.tar.gz 2033866 SHA256 5e24a782fe3d97f4a4e78cac54646ca13d8646b8c790ea63924be77235453ea5 SHA512 64b5a30e8636e9aaaf3f8fb207201282980a29449476e8905218b5e36da78c9a1754a5706eafb40d46c72458a32346899a1bf859b29c213bf7cc5e66f5d834b3 WHIRLPOOL 1573fd42dc87da294f56dc3ddea8968d9cabd9421788beda074968343e52ea94f2ec321ed2a73c778787337e4f0c4eff89b43026f7e495976eb1d0cddd6b6c19
+DIST monkey-1.6.6.tar.gz 2035885 SHA256 4ad8258d6cb6fb8b9d98891a7c84a559ab7ab96f7dde0ecdfc23a1a8d594ce11 SHA512 c56edcd2bb18fbe4e4f364853e4796be1211cca7829899cde94500d514ded7ba8cca44c6e5f964b8864d0348caf1a570ac558c287f708c081a40aeecef8ee2cf WHIRLPOOL 60b95e0c81b9ce3faf2a87acf9496a8510d5d6d66501850c2d45cab39505b58f9f22ec9936002ff06cd4b13d6ac787b144409f64625fc56042fdfef4bfee79a4

diff --git a/www-servers/monkeyd/monkeyd-1.6.6.ebuild b/www-servers/monkeyd/monkeyd-1.6.6.ebuild
new file mode 100644
index 0000000..add07dc
--- /dev/null
+++ b/www-servers/monkeyd/monkeyd-1.6.6.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+DESCRIPTION="A small, fast, and scalable web server"
+HOMEPAGE="http://www.monkey-project.com/"
+MY_P="${PN/d}-${PV}"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/monkey/monkey.git"
+	inherit git-2
+	KEYWORDS=""
+else
+	SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# jemalloc is also off until we figure out how to work CMakeLists.txt magic.
+#IUSE="cgi -debug fastcgi jemalloc php static-plugins ${PLUGINS}"
+
+PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls"
+IUSE="cgi -debug fastcgi php static-plugins ${PLUGINS}"
+
+# uclibc is often compiled without backtrace info so we should
+# force this off.  If someone complains, consider relaxing it.
+REQUIRED_USE="
+	monkeyd_plugins_tls? ( !static-plugins )
+	elibc_uclibc? ( !debug )
+	cgi? ( php )"
+
+#DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
+DEPEND="
+	dev-util/cmake
+	monkeyd_plugins_tls? ( net-libs/mbedtls:= )"
+RDEPEND="
+	php? ( dev-lang/php )
+	cgi? ( dev-lang/php[cgi] )"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBROOT="/var/www/localhost"
+
+pkg_setup() {
+	if use debug; then
+		ewarn
+		ewarn "\033[1;33m**************************************************\033[00m"
+		ewarn "Do not use debug in production!"
+		ewarn "\033[1;33m**************************************************\033[00m"
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# Unconditionally get rid of the bundled jemalloc
+	rm -rf "${S}"/deps
+	epatch "${FILESDIR}"/${PN}-1.6.3-system-mbedtls.patch
+}
+
+src_configure() {
+	local myconf=""
+
+	use elibc_uclibc && myconf+=" --uclib-mode"
+	use elibc_musl && myconf+=" --musl-mode"
+
+	#use jemalloc || myconf+=" --malloc-libc"
+	myconf+=" --malloc-libc"
+
+	if use debug; then
+		myconf+=" --debug --trace"
+	else
+		myconf+=" --no-backtrace"
+	fi
+
+	local enable_plugins=""
+	local disable_plugins=""
+	# We use 'cgi' and 'fastcgi' because they are global flags
+	# instead of the corresponding monkeyd_plugins_*
+	use cgi && enable_plugins+="cgi," || disable_plugins+="cgi,"
+	use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi,"
+	# For the rest, we scan the monkeyd_plugins_* and parse out the plugin name.
+	local p
+	for p in ${PLUGINS}; do
+		pp=${p/+/}
+		cp=${pp/monkeyd_plugins_/}
+		use $pp && enable_plugins+="${cp}," || disable_plugins+="${cp},"
+	done
+	myconf+=" --enable-plugins=${enable_plugins%,} --disable-plugins=${disable_plugins%,}"
+	if use static-plugins; then
+		myconf+=" --static-plugins=${enable_plugins%,}"
+	fi
+
+	# For O_CLOEXEC which is guarded by _GNU_SOURCE in uClibc,
+	# but shouldn't because it is POSIX.  This needs to be fixed
+	# in uClibc.  Also, we really should us append-cppflags but
+	# monkey's build system doesn't respect CPPFLAGS.  This needs
+	# to be fixed in monkey.
+	use elibc_uclibc && append-cflags -D_GNU_SOURCE
+
+	# Non-autotools configure
+	./configure \
+		--pthread-tls \
+		--prefix=/usr \
+		--sbindir=/usr/sbin \
+		--webroot=${WEBROOT}/htdocs \
+		--logdir=/var/log/${PN} \
+		--mandir=/usr/share/man \
+		--libdir=/usr/$(get_libdir) \
+		--pidfile=/run/monkey.pid \
+		--sysconfdir=/etc/${PN} \
+		${myconf} \
+		|| die
+}
+
+src_compile() {
+	emake VERBOSE=1
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/monkeyd.initd-r1 monkeyd
+	newconfd "${FILESDIR}"/monkeyd.confd monkeyd
+
+	# Move htdocs to docdir, bug #429632
+	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
+	mv "${D}"${WEBROOT}/htdocs \
+		"${D}"/usr/share/doc/"${PF}"/htdocs.dist || die
+
+	keepdir \
+		/var/log/monkeyd \
+		${WEBROOT}/htdocs
+
+	# This needs to be created at runtime
+	rm -rf "${D}"/run
+}


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2015-10-31  7:10 Anthony G. Basile
  0 siblings, 0 replies; 30+ messages in thread
From: Anthony G. Basile @ 2015-10-31  7:10 UTC (permalink / raw
  To: gentoo-commits

commit:     8012014964ed51217c632d444b56d972796d4f7b
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 31 07:16:33 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 07:16:33 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80120149

www-servers/monkeyd: version bump 1.6.5, remove older unstable.

Package-Manager: portage-2.2.20.1

 www-servers/monkeyd/Manifest                                       | 2 +-
 www-servers/monkeyd/{monkeyd-1.6.4.ebuild => monkeyd-1.6.5.ebuild} | 0
 www-servers/monkeyd/monkeyd-9999.ebuild                            | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index ec9f86a..a7d8224 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -1,2 +1,2 @@
 DIST monkey-1.5.6.tar.gz 902636 SHA256 7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22 SHA512 4c7c627cb047252252b22da5fba179a21fb5b8dc6280b96307af52757ad049d24b0daaaea51dca4f0429af5e6499c239f6b62a03654cc9e7ad98ae8f5149b64c WHIRLPOOL aba1a928023fc67224f254182eb9707c6594c7092d9ff98ecfa297c91d5c61f79235e7467192b5d46ac114ae67a3cee98e06704721348a40ee825755ab39d9a1
-DIST monkey-1.6.4.tar.gz 2033295 SHA256 351a18a15f3ad8f64c75281105bb2f321da69d58a8034d23757b7ce29fdc9cb3 SHA512 0de83a47806529fa04d60bdf3f69c1f2e2e5980a03d82a8322bb146afff8db85f7f689add876f739133ed262951533382909cd1a3f0f51a8750dde4b15459d25 WHIRLPOOL 6498f74d122b46912065ea060a596d1badc0144069270ea4e949d6debad025ba309e66e1f4e28fb9c595d560c3a37e1a5f01e6ac5a00d31eb5909a31abe3c105
+DIST monkey-1.6.5.tar.gz 2033866 SHA256 5e24a782fe3d97f4a4e78cac54646ca13d8646b8c790ea63924be77235453ea5 SHA512 64b5a30e8636e9aaaf3f8fb207201282980a29449476e8905218b5e36da78c9a1754a5706eafb40d46c72458a32346899a1bf859b29c213bf7cc5e66f5d834b3 WHIRLPOOL 1573fd42dc87da294f56dc3ddea8968d9cabd9421788beda074968343e52ea94f2ec321ed2a73c778787337e4f0c4eff89b43026f7e495976eb1d0cddd6b6c19

diff --git a/www-servers/monkeyd/monkeyd-1.6.4.ebuild b/www-servers/monkeyd/monkeyd-1.6.5.ebuild
similarity index 100%
rename from www-servers/monkeyd/monkeyd-1.6.4.ebuild
rename to www-servers/monkeyd/monkeyd-1.6.5.ebuild

diff --git a/www-servers/monkeyd/monkeyd-9999.ebuild b/www-servers/monkeyd/monkeyd-9999.ebuild
index 2323b63..add07dc 100644
--- a/www-servers/monkeyd/monkeyd-9999.ebuild
+++ b/www-servers/monkeyd/monkeyd-9999.ebuild
@@ -59,7 +59,7 @@ pkg_setup() {
 src_prepare() {
 	# Unconditionally get rid of the bundled jemalloc
 	rm -rf "${S}"/deps
-	epatch "${FILESDIR}"/${P}-system-mbedtls.patch
+	epatch "${FILESDIR}"/${PN}-1.6.3-system-mbedtls.patch
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2015-10-28  8:05 Anthony G. Basile
  0 siblings, 0 replies; 30+ messages in thread
From: Anthony G. Basile @ 2015-10-28  8:05 UTC (permalink / raw
  To: gentoo-commits

commit:     5ea69423dcf4cbfe34cff712e3a54cbc8bcf49bf
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 28 08:08:17 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Oct 28 08:08:17 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ea69423

www-servers/monkeyd: remove older unstable version 1.6.3.

Package-Manager: portage-2.2.20.1

 www-servers/monkeyd/Manifest             |   1 -
 www-servers/monkeyd/monkeyd-1.6.3.ebuild | 141 -------------------------------
 2 files changed, 142 deletions(-)

diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index 60f417f..ec9f86a 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -1,3 +1,2 @@
 DIST monkey-1.5.6.tar.gz 902636 SHA256 7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22 SHA512 4c7c627cb047252252b22da5fba179a21fb5b8dc6280b96307af52757ad049d24b0daaaea51dca4f0429af5e6499c239f6b62a03654cc9e7ad98ae8f5149b64c WHIRLPOOL aba1a928023fc67224f254182eb9707c6594c7092d9ff98ecfa297c91d5c61f79235e7467192b5d46ac114ae67a3cee98e06704721348a40ee825755ab39d9a1
-DIST monkey-1.6.3.tar.gz 2032771 SHA256 47973b12cc45c185b054e251a6c3d8a36cae70301f614b4132bb1ef504f01cfa SHA512 21d317b55bc22e0ef34a2ff545103fbba3728a47e888db58506891e525e926397af81d0ad42ac134f67ab30548853ea4c98df264fab6238901dd05c5b0f55abe WHIRLPOOL acda82625c281f31212eb22d4cef0f64fa251fad25ba5e8aa9e2f4f2146d5bd626a6c66cdb2d17f6559cc858d09fd0afd2383bcdccbf225b8956e2f8b272726c
 DIST monkey-1.6.4.tar.gz 2033295 SHA256 351a18a15f3ad8f64c75281105bb2f321da69d58a8034d23757b7ce29fdc9cb3 SHA512 0de83a47806529fa04d60bdf3f69c1f2e2e5980a03d82a8322bb146afff8db85f7f689add876f739133ed262951533382909cd1a3f0f51a8750dde4b15459d25 WHIRLPOOL 6498f74d122b46912065ea060a596d1badc0144069270ea4e949d6debad025ba309e66e1f4e28fb9c595d560c3a37e1a5f01e6ac5a00d31eb5909a31abe3c105

diff --git a/www-servers/monkeyd/monkeyd-1.6.3.ebuild b/www-servers/monkeyd/monkeyd-1.6.3.ebuild
deleted file mode 100644
index fc9146e..0000000
--- a/www-servers/monkeyd/monkeyd-1.6.3.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-DESCRIPTION="A small, fast, and scalable web server"
-HOMEPAGE="http://www.monkey-project.com/"
-MY_P="${PN/d}-${PV}"
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/monkey/monkey.git"
-	inherit git-2
-	KEYWORDS=""
-else
-	SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-# jemalloc is also off until we figure out how to work CMakeLists.txt magic.
-#IUSE="cgi -debug fastcgi jemalloc php static-plugins ${PLUGINS}"
-
-PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls"
-IUSE="cgi -debug fastcgi php static-plugins ${PLUGINS}"
-
-# uclibc is often compiled without backtrace info so we should
-# force this off.  If someone complains, consider relaxing it.
-REQUIRED_USE="
-	monkeyd_plugins_tls? ( !static-plugins )
-	elibc_uclibc? ( !debug )
-	cgi? ( php )"
-
-#DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
-DEPEND="
-	dev-util/cmake
-	monkeyd_plugins_tls? ( net-libs/mbedtls:= )"
-RDEPEND="
-	php? ( dev-lang/php )
-	cgi? ( dev-lang/php[cgi] )"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBROOT="/var/www/localhost"
-
-pkg_setup() {
-	if use debug; then
-		ewarn
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn "Do not use debug in production!"
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# Unconditionally get rid of the bundled jemalloc
-	rm -rf "${S}"/deps
-	epatch "${FILESDIR}"/${P}-system-mbedtls.patch
-}
-
-src_configure() {
-	local myconf=""
-
-	use elibc_uclibc && myconf+=" --uclib-mode"
-	use elibc_musl && myconf+=" --musl-mode"
-
-	#use jemalloc || myconf+=" --malloc-libc"
-	myconf+=" --malloc-libc"
-
-	if use debug; then
-		myconf+=" --debug --trace"
-	else
-		myconf+=" --no-backtrace"
-	fi
-
-	local enable_plugins=""
-	local disable_plugins=""
-	# We use 'cgi' and 'fastcgi' because they are global flags
-	# instead of the corresponding monkeyd_plugins_*
-	use cgi && enable_plugins+="cgi," || disable_plugins+="cgi,"
-	use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi,"
-	# For the rest, we scan the monkeyd_plugins_* and parse out the plugin name.
-	for p in ${PLUGINS}; do
-		pp=${p/+/}
-		cp=${pp/monkeyd_plugins_/}
-		use $pp && enable_plugins+="${cp}," || disable_plugins+="${cp},"
-	done
-	myconf+=" --enable-plugins=${enable_plugins%,} --disable-plugins=${disable_plugins%,}"
-	if use static-plugins; then
-		myconf+=" --static-plugins=${enable_plugins%,}"
-	fi
-
-	# For O_CLOEXEC which is guarded by _GNU_SOURCE in uClibc,
-	# but shouldn't because it is POSIX.  This needs to be fixed
-	# in uClibc.  Also, we really should us append-cppflags but
-	# monkey's build system doesn't respect CPPFLAGS.  This needs
-	# to be fixed in monkey.
-	use elibc_uclibc && append-cflags -D_GNU_SOURCE
-
-	# Non-autotools configure
-	./configure \
-		--pthread-tls \
-		--prefix=/usr \
-		--sbindir=/usr/sbin \
-		--webroot=${WEBROOT}/htdocs \
-		--logdir=/var/log/${PN} \
-		--mandir=/usr/share/man \
-		--libdir=/usr/$(get_libdir) \
-		--pidfile=/run/monkey.pid \
-		--sysconfdir=/etc/${PN} \
-		${myconf} \
-		|| die
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/monkeyd.initd-r1 monkeyd
-	newconfd "${FILESDIR}"/monkeyd.confd monkeyd
-
-	# Move htdocs to docdir, bug #429632
-	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
-	mv "${D}"${WEBROOT}/htdocs \
-		"${D}"/usr/share/doc/"${PF}"/htdocs.dist
-	mkdir "${D}"${WEBROOT}/htdocs
-
-	keepdir \
-		/var/log/monkeyd \
-		${WEBROOT}/htdocs
-
-	# This needs to be created at runtime
-	rm -rf "${D}"/run
-}


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2015-10-28  8:05 Anthony G. Basile
  0 siblings, 0 replies; 30+ messages in thread
From: Anthony G. Basile @ 2015-10-28  8:05 UTC (permalink / raw
  To: gentoo-commits

commit:     315047e745e9210b9279845aaae12931e2cceebe
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 28 08:11:26 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Oct 28 08:11:26 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=315047e7

www-servers/monkeyd: minor cleanups to the ebuild.

Package-Manager: portage-2.2.20.1

 www-servers/monkeyd/monkeyd-1.6.4.ebuild | 4 ++--
 www-servers/monkeyd/monkeyd-9999.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/www-servers/monkeyd/monkeyd-1.6.4.ebuild b/www-servers/monkeyd/monkeyd-1.6.4.ebuild
index 33b478d..add07dc 100644
--- a/www-servers/monkeyd/monkeyd-1.6.4.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.6.4.ebuild
@@ -84,6 +84,7 @@ src_configure() {
 	use cgi && enable_plugins+="cgi," || disable_plugins+="cgi,"
 	use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi,"
 	# For the rest, we scan the monkeyd_plugins_* and parse out the plugin name.
+	local p
 	for p in ${PLUGINS}; do
 		pp=${p/+/}
 		cp=${pp/monkeyd_plugins_/}
@@ -129,8 +130,7 @@ src_install() {
 	# Move htdocs to docdir, bug #429632
 	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
 	mv "${D}"${WEBROOT}/htdocs \
-		"${D}"/usr/share/doc/"${PF}"/htdocs.dist
-	mkdir "${D}"${WEBROOT}/htdocs
+		"${D}"/usr/share/doc/"${PF}"/htdocs.dist || die
 
 	keepdir \
 		/var/log/monkeyd \

diff --git a/www-servers/monkeyd/monkeyd-9999.ebuild b/www-servers/monkeyd/monkeyd-9999.ebuild
index fc9146e..2323b63 100644
--- a/www-servers/monkeyd/monkeyd-9999.ebuild
+++ b/www-servers/monkeyd/monkeyd-9999.ebuild
@@ -84,6 +84,7 @@ src_configure() {
 	use cgi && enable_plugins+="cgi," || disable_plugins+="cgi,"
 	use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi,"
 	# For the rest, we scan the monkeyd_plugins_* and parse out the plugin name.
+	local p
 	for p in ${PLUGINS}; do
 		pp=${p/+/}
 		cp=${pp/monkeyd_plugins_/}
@@ -129,8 +130,7 @@ src_install() {
 	# Move htdocs to docdir, bug #429632
 	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
 	mv "${D}"${WEBROOT}/htdocs \
-		"${D}"/usr/share/doc/"${PF}"/htdocs.dist
-	mkdir "${D}"${WEBROOT}/htdocs
+		"${D}"/usr/share/doc/"${PF}"/htdocs.dist || die
 
 	keepdir \
 		/var/log/monkeyd \


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2015-10-27 11:33 Anthony G. Basile
  0 siblings, 0 replies; 30+ messages in thread
From: Anthony G. Basile @ 2015-10-27 11:33 UTC (permalink / raw
  To: gentoo-commits

commit:     5fd853071a74a0571d5f5196da3eb979bf041041
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 27 11:21:57 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Oct 27 11:39:47 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fd85307

www-servers/monkeyd: version bump to 1.6.4

Package-Manager: portage-2.2.20.1

 www-servers/monkeyd/Manifest             |   1 +
 www-servers/monkeyd/monkeyd-1.6.4.ebuild | 141 +++++++++++++++++++++++++++++++
 2 files changed, 142 insertions(+)

diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index 443362c..60f417f 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -1,2 +1,3 @@
 DIST monkey-1.5.6.tar.gz 902636 SHA256 7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22 SHA512 4c7c627cb047252252b22da5fba179a21fb5b8dc6280b96307af52757ad049d24b0daaaea51dca4f0429af5e6499c239f6b62a03654cc9e7ad98ae8f5149b64c WHIRLPOOL aba1a928023fc67224f254182eb9707c6594c7092d9ff98ecfa297c91d5c61f79235e7467192b5d46ac114ae67a3cee98e06704721348a40ee825755ab39d9a1
 DIST monkey-1.6.3.tar.gz 2032771 SHA256 47973b12cc45c185b054e251a6c3d8a36cae70301f614b4132bb1ef504f01cfa SHA512 21d317b55bc22e0ef34a2ff545103fbba3728a47e888db58506891e525e926397af81d0ad42ac134f67ab30548853ea4c98df264fab6238901dd05c5b0f55abe WHIRLPOOL acda82625c281f31212eb22d4cef0f64fa251fad25ba5e8aa9e2f4f2146d5bd626a6c66cdb2d17f6559cc858d09fd0afd2383bcdccbf225b8956e2f8b272726c
+DIST monkey-1.6.4.tar.gz 2033295 SHA256 351a18a15f3ad8f64c75281105bb2f321da69d58a8034d23757b7ce29fdc9cb3 SHA512 0de83a47806529fa04d60bdf3f69c1f2e2e5980a03d82a8322bb146afff8db85f7f689add876f739133ed262951533382909cd1a3f0f51a8750dde4b15459d25 WHIRLPOOL 6498f74d122b46912065ea060a596d1badc0144069270ea4e949d6debad025ba309e66e1f4e28fb9c595d560c3a37e1a5f01e6ac5a00d31eb5909a31abe3c105

diff --git a/www-servers/monkeyd/monkeyd-1.6.4.ebuild b/www-servers/monkeyd/monkeyd-1.6.4.ebuild
new file mode 100644
index 0000000..33b478d
--- /dev/null
+++ b/www-servers/monkeyd/monkeyd-1.6.4.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+DESCRIPTION="A small, fast, and scalable web server"
+HOMEPAGE="http://www.monkey-project.com/"
+MY_P="${PN/d}-${PV}"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/monkey/monkey.git"
+	inherit git-2
+	KEYWORDS=""
+else
+	SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# jemalloc is also off until we figure out how to work CMakeLists.txt magic.
+#IUSE="cgi -debug fastcgi jemalloc php static-plugins ${PLUGINS}"
+
+PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls"
+IUSE="cgi -debug fastcgi php static-plugins ${PLUGINS}"
+
+# uclibc is often compiled without backtrace info so we should
+# force this off.  If someone complains, consider relaxing it.
+REQUIRED_USE="
+	monkeyd_plugins_tls? ( !static-plugins )
+	elibc_uclibc? ( !debug )
+	cgi? ( php )"
+
+#DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
+DEPEND="
+	dev-util/cmake
+	monkeyd_plugins_tls? ( net-libs/mbedtls:= )"
+RDEPEND="
+	php? ( dev-lang/php )
+	cgi? ( dev-lang/php[cgi] )"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBROOT="/var/www/localhost"
+
+pkg_setup() {
+	if use debug; then
+		ewarn
+		ewarn "\033[1;33m**************************************************\033[00m"
+		ewarn "Do not use debug in production!"
+		ewarn "\033[1;33m**************************************************\033[00m"
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# Unconditionally get rid of the bundled jemalloc
+	rm -rf "${S}"/deps
+	epatch "${FILESDIR}"/${PN}-1.6.3-system-mbedtls.patch
+}
+
+src_configure() {
+	local myconf=""
+
+	use elibc_uclibc && myconf+=" --uclib-mode"
+	use elibc_musl && myconf+=" --musl-mode"
+
+	#use jemalloc || myconf+=" --malloc-libc"
+	myconf+=" --malloc-libc"
+
+	if use debug; then
+		myconf+=" --debug --trace"
+	else
+		myconf+=" --no-backtrace"
+	fi
+
+	local enable_plugins=""
+	local disable_plugins=""
+	# We use 'cgi' and 'fastcgi' because they are global flags
+	# instead of the corresponding monkeyd_plugins_*
+	use cgi && enable_plugins+="cgi," || disable_plugins+="cgi,"
+	use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi,"
+	# For the rest, we scan the monkeyd_plugins_* and parse out the plugin name.
+	for p in ${PLUGINS}; do
+		pp=${p/+/}
+		cp=${pp/monkeyd_plugins_/}
+		use $pp && enable_plugins+="${cp}," || disable_plugins+="${cp},"
+	done
+	myconf+=" --enable-plugins=${enable_plugins%,} --disable-plugins=${disable_plugins%,}"
+	if use static-plugins; then
+		myconf+=" --static-plugins=${enable_plugins%,}"
+	fi
+
+	# For O_CLOEXEC which is guarded by _GNU_SOURCE in uClibc,
+	# but shouldn't because it is POSIX.  This needs to be fixed
+	# in uClibc.  Also, we really should us append-cppflags but
+	# monkey's build system doesn't respect CPPFLAGS.  This needs
+	# to be fixed in monkey.
+	use elibc_uclibc && append-cflags -D_GNU_SOURCE
+
+	# Non-autotools configure
+	./configure \
+		--pthread-tls \
+		--prefix=/usr \
+		--sbindir=/usr/sbin \
+		--webroot=${WEBROOT}/htdocs \
+		--logdir=/var/log/${PN} \
+		--mandir=/usr/share/man \
+		--libdir=/usr/$(get_libdir) \
+		--pidfile=/run/monkey.pid \
+		--sysconfdir=/etc/${PN} \
+		${myconf} \
+		|| die
+}
+
+src_compile() {
+	emake VERBOSE=1
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/monkeyd.initd-r1 monkeyd
+	newconfd "${FILESDIR}"/monkeyd.confd monkeyd
+
+	# Move htdocs to docdir, bug #429632
+	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
+	mv "${D}"${WEBROOT}/htdocs \
+		"${D}"/usr/share/doc/"${PF}"/htdocs.dist
+	mkdir "${D}"${WEBROOT}/htdocs
+
+	keepdir \
+		/var/log/monkeyd \
+		${WEBROOT}/htdocs
+
+	# This needs to be created at runtime
+	rm -rf "${D}"/run
+}


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2015-09-03  7:09 Anthony G. Basile
  0 siblings, 0 replies; 30+ messages in thread
From: Anthony G. Basile @ 2015-09-03  7:09 UTC (permalink / raw
  To: gentoo-commits

commit:     30af9daa5f5febccafd7b767db2ebdc13dd226fc
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  3 07:09:36 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Sep  3 07:13:19 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30af9daa

www-servers/monkeyd: version bump to 1.6.2

Package-Manager: portage-2.2.20.1

 www-servers/monkeyd/Manifest             |   1 +
 www-servers/monkeyd/monkeyd-1.6.2.ebuild | 139 +++++++++++++++++++++++++++++++
 2 files changed, 140 insertions(+)

diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index ff2c241..abe7245 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -2,3 +2,4 @@ DIST monkey-1.5.3.tar.gz 892478 SHA256 0ac300e04f052818bc26b7da0183c3c5cd13be809
 DIST monkey-1.5.5.tar.gz 898602 SHA256 5a0554fdb4d8746f5eb665f305bd120c8f2bef3e7fea2a43be6b472461b45b05 SHA512 faf86a36a91c8b1e47f3a2ea7f19aee98eada6f3348ff64f160fc388c268a146d49ad9434043731cf928fca6708db40fa5e1daedc41d4b8cce671f98d590b920 WHIRLPOOL 26b44624f77b72bbd31da6be5855429199a0fc9ab163548f1d0f21a34b84a1f0325241ed7ad5ecbb28c9e9f899458b5d8c15f9f91e27b73a53023c2e3152947d
 DIST monkey-1.5.6.tar.gz 902636 SHA256 7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22 SHA512 4c7c627cb047252252b22da5fba179a21fb5b8dc6280b96307af52757ad049d24b0daaaea51dca4f0429af5e6499c239f6b62a03654cc9e7ad98ae8f5149b64c WHIRLPOOL aba1a928023fc67224f254182eb9707c6594c7092d9ff98ecfa297c91d5c61f79235e7467192b5d46ac114ae67a3cee98e06704721348a40ee825755ab39d9a1
 DIST monkey-1.6.1.tar.gz 1916812 SHA256 acf2ba04578c362b2b1c509ee4a998b6b2951e51b16bd339d300743de1752961 SHA512 c7c0f83bb74193bfd7008a0327012a45474b65befb47ac514d3a10095c41aeb2ec49067249377d18cc3a6ec77eb14c5ae25e36d2550e47971a43e156ef24d619 WHIRLPOOL 70545f343b6675d456b4ed426ad27435302c0e122f1b26640e3aa65343a5912af4c431d799f018fe19f3183c904a876fc157f5f0e257f6dcf9b76cf2422ed1f0
+DIST monkey-1.6.2.tar.gz 1913867 SHA256 d26ff514d64bb2de503a9a4d61fce20d89deff0f2f9f958977db4b98e44ece3e SHA512 2fe3b82386d580974509b03ea66caa05adec76178296d736d994ff7f4aedd52fcd298fad083050c59378b1a6cc37cbe8fd34c437a95830fd78304c710bb16b8b WHIRLPOOL 1b1bc34b0534130ce489040e2283d9b074c43ca58f9005832ceb92be92d38e70e482daf405022e1933a9300b782231747d91f937a5b2468a44f0eaa5a4fb984a

diff --git a/www-servers/monkeyd/monkeyd-1.6.2.ebuild b/www-servers/monkeyd/monkeyd-1.6.2.ebuild
new file mode 100644
index 0000000..e0f0159
--- /dev/null
+++ b/www-servers/monkeyd/monkeyd-1.6.2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit flag-o-matic toolchain-funcs multilib
+
+DESCRIPTION="A small, fast, and scalable web server"
+HOMEPAGE="http://www.monkey-project.com/"
+MY_P="${PN/d}-${PV}"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/monkey/monkey.git"
+	inherit git-2
+	KEYWORDS=""
+else
+	SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# Currently monkeyd_plugins_tls is off.  It provides mbed TLS (formerly PolarSSL).
+# jemalloc is also off until we figure out how to work CMakeLists.txt magic.
+#PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls"
+#IUSE="cgi -debug fastcgi jemalloc php static-plugins ${PLUGINS}"
+
+PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril"
+IUSE="cgi -debug fastcgi php static-plugins ${PLUGINS}"
+
+# uclibc is often compiled without backtrace info so we should
+# force this off.  If someone complains, consider relaxing it.
+REQUIRED_USE="
+	elibc_uclibc? ( !debug )
+	cgi? ( php )"
+
+#DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
+DEPEND="dev-util/cmake"
+RDEPEND="
+	php? ( dev-lang/php )
+	cgi? ( dev-lang/php[cgi] )"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBROOT="/var/www/localhost"
+
+pkg_setup() {
+	if use debug; then
+		ewarn
+		ewarn "\033[1;33m**************************************************\033[00m"
+		ewarn "Do not use debug in production!"
+		ewarn "\033[1;33m**************************************************\033[00m"
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# Unconditionally get rid of the bundled jemalloc and mbedTLS
+	rm -rf "${S}"/deps
+}
+
+src_configure() {
+	local myconf=""
+
+	use elibc_uclibc && myconf+=" --uclib-mode"
+	use elibc_musl && myconf+=" --musl-mode"
+
+	#use jemalloc || myconf+=" --malloc-libc"
+	myconf+=" --malloc-libc"
+
+	if use debug; then
+		myconf+=" --debug --trace"
+	else
+		myconf+=" --no-backtrace"
+	fi
+
+	local enable_plugins=""
+	local disable_plugins=""
+	# We use 'cgi' and 'fastcgi' because they are global flags
+	# instead of the corresponding monkeyd_plugins_*
+	use cgi && enable_plugins+="cgi," || disable_plugins+="cgi,"
+	use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi,"
+	# For the rest, we scan the monkeyd_plugins_* and parse out the plugin name.
+	for p in ${PLUGINS}; do
+		pp=${p/+/}
+		cp=${pp/monkeyd_plugins_/}
+		use $pp && enable_plugins+="${cp}," || disable_plugins+="${cp},"
+	done
+	myconf+=" --enable-plugins=${enable_plugins%,} --disable-plugins=${disable_plugins%,}"
+	if use static-plugins; then
+		myconf+=" --static-plugins=${enable_plugins%,}"
+	fi
+
+	# For O_CLOEXEC which is guarded by _GNU_SOURCE in uClibc,
+	# but shouldn't because it is POSIX.  This needs to be fixed
+	# in uClibc.  Also, we really should us append-cppflags but
+	# monkey's build system doesn't respect CPPFLAGS.  This needs
+	# to be fixed in monkey.
+	use elibc_uclibc && append-cflags -D_GNU_SOURCE
+
+	# Non-autotools configure
+	./configure \
+		--pthread-tls \
+		--prefix=/usr \
+		--sbindir=/usr/sbin \
+		--webroot=${WEBROOT}/htdocs \
+		--logdir=/var/log/${PN} \
+		--mandir=/usr/share/man \
+		--libdir=/usr/$(get_libdir) \
+		--pidfile=/run/monkey.pid \
+		--sysconfdir=/etc/${PN} \
+		${myconf} \
+		|| die
+}
+
+src_compile() {
+	emake VERBOSE=1
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/monkeyd.initd-r1 monkeyd
+	newconfd "${FILESDIR}"/monkeyd.confd monkeyd
+
+	# Move htdocs to docdir, bug #429632
+	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
+	mv "${D}"${WEBROOT}/htdocs \
+		"${D}"/usr/share/doc/"${PF}"/htdocs.dist
+	mkdir "${D}"${WEBROOT}/htdocs
+
+	keepdir \
+		/var/log/monkeyd \
+		${WEBROOT}/htdocs
+
+	# This needs to be created at runtime
+	rm -rf "${D}"/run
+}


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2015-09-03  7:09 Anthony G. Basile
  0 siblings, 0 replies; 30+ messages in thread
From: Anthony G. Basile @ 2015-09-03  7:09 UTC (permalink / raw
  To: gentoo-commits

commit:     4a081c7208cc3cee88197e22690c550e80d0cc91
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  3 07:13:05 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Sep  3 07:13:21 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a081c72

www-servers/monkeyd: remove older versions.

Package-Manager: portage-2.2.20.1

 www-servers/monkeyd/Manifest             |   3 -
 www-servers/monkeyd/monkeyd-1.5.3.ebuild | 144 -------------------------------
 www-servers/monkeyd/monkeyd-1.5.5.ebuild | 144 -------------------------------
 www-servers/monkeyd/monkeyd-1.6.1.ebuild | 139 -----------------------------
 4 files changed, 430 deletions(-)

diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index abe7245..29e9b39 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -1,5 +1,2 @@
-DIST monkey-1.5.3.tar.gz 892478 SHA256 0ac300e04f052818bc26b7da0183c3c5cd13be8090aaabd3505838587be8c0ec SHA512 6a55ba580bfde3c11329e94055d287e341990e4db4cb5ab12e40b8bab57b4b51fd57cd33fc5aa9d864127f235888f818593be26fe93daa34ca3c40fa8936465f WHIRLPOOL 4038bd2f0b39f6068ab69dc98dec4d5b29feca388c18361f57b653db86c38469d69072ae803ddd565e57350163247072334835216a13d014956a27b91c8a42b6
-DIST monkey-1.5.5.tar.gz 898602 SHA256 5a0554fdb4d8746f5eb665f305bd120c8f2bef3e7fea2a43be6b472461b45b05 SHA512 faf86a36a91c8b1e47f3a2ea7f19aee98eada6f3348ff64f160fc388c268a146d49ad9434043731cf928fca6708db40fa5e1daedc41d4b8cce671f98d590b920 WHIRLPOOL 26b44624f77b72bbd31da6be5855429199a0fc9ab163548f1d0f21a34b84a1f0325241ed7ad5ecbb28c9e9f899458b5d8c15f9f91e27b73a53023c2e3152947d
 DIST monkey-1.5.6.tar.gz 902636 SHA256 7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22 SHA512 4c7c627cb047252252b22da5fba179a21fb5b8dc6280b96307af52757ad049d24b0daaaea51dca4f0429af5e6499c239f6b62a03654cc9e7ad98ae8f5149b64c WHIRLPOOL aba1a928023fc67224f254182eb9707c6594c7092d9ff98ecfa297c91d5c61f79235e7467192b5d46ac114ae67a3cee98e06704721348a40ee825755ab39d9a1
-DIST monkey-1.6.1.tar.gz 1916812 SHA256 acf2ba04578c362b2b1c509ee4a998b6b2951e51b16bd339d300743de1752961 SHA512 c7c0f83bb74193bfd7008a0327012a45474b65befb47ac514d3a10095c41aeb2ec49067249377d18cc3a6ec77eb14c5ae25e36d2550e47971a43e156ef24d619 WHIRLPOOL 70545f343b6675d456b4ed426ad27435302c0e122f1b26640e3aa65343a5912af4c431d799f018fe19f3183c904a876fc157f5f0e257f6dcf9b76cf2422ed1f0
 DIST monkey-1.6.2.tar.gz 1913867 SHA256 d26ff514d64bb2de503a9a4d61fce20d89deff0f2f9f958977db4b98e44ece3e SHA512 2fe3b82386d580974509b03ea66caa05adec76178296d736d994ff7f4aedd52fcd298fad083050c59378b1a6cc37cbe8fd34c437a95830fd78304c710bb16b8b WHIRLPOOL 1b1bc34b0534130ce489040e2283d9b074c43ca58f9005832ceb92be92d38e70e482daf405022e1933a9300b782231747d91f937a5b2468a44f0eaa5a4fb984a

diff --git a/www-servers/monkeyd/monkeyd-1.5.3.ebuild b/www-servers/monkeyd/monkeyd-1.5.3.ebuild
deleted file mode 100644
index dc0aeca..0000000
--- a/www-servers/monkeyd/monkeyd-1.5.3.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit toolchain-funcs depend.php multilib
-
-MY_P="${PN/d}-${PV}"
-DESCRIPTION="A small, fast, and scalable web server"
-HOMEPAGE="http://www.monkey-project.com/"
-SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 x86"
-
-# ssl is broken, so we turn it off until fixed
-IUSE="-debug jemalloc php minimal elibc_musl elibc_uclibc monkeyd_plugins_auth monkeyd_plugins_cheetah cgi monkeyd_plugins_dirlisting fastcgi +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril"
-
-# uclibc is often compiled without backtrace info so we should
-# force this off.  If someone complains, consider relaxing it.
-# ssl is borken, so we remove "ssl? ( monkeyd_plugins_polarssl )"
-REQUIRED_USE="elibc_uclibc? ( !debug )"
-
-DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
-RDEPEND="php? ( dev-lang/php )"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBROOT="/var/www/localhost"
-
-pkg_setup() {
-	use php && require_php_cgi
-
-	if use debug; then
-		ewarn
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn "Do not use debug in production!"
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# Unconditionally get rid of the bundled jemalloc
-	rm -rf "${S}"/deps
-	epatch "${FILESDIR}"/${PN}-1.5.2-use-system-jemalloc.patch
-	epatch "${FILESDIR}"/${PN}-1.5.0-fix-CPPFLAGS.patch
-
-	# Don't install the banana script, we use ${FILESDIR}/monkeyd.initd instead
-	sed -i '/Creating bin\/banana/d' configure || die "No configure file"
-	sed -i '/create_banana_script bindir/d' configure || die "No configure file"
-
-	# Don't explicitly strip files
-	sed -i -e '/$STRIP /d' -e 's/install -s -m 644/install -m 755/' configure || die "No configure file"
-
-	# We don't need the includes, sym link to libmonkey.so, or monkey.cp when not installing the .so
-	use minimal && {
-		sed -i '/install -d \\$(INCDIR)/d' configure || die "No configure file"
-		sed -i '/install -m 644 src\/include\/\*.h \\$(INCDIR)/d' configure || die "No configure file"
-		sed -i '/ln -sf/d' configure || die "No configure file"
-		sed -i '/install -d \\$(LIBDIR)\/pkgconfig/d' configure || die "No configure file"
-		sed -i '/install -m 644 monkey.pc \\$(LIBDIR)\/pkgconfig/d' configure || die "No configure file"
-	}
-
-	# Unquiet build
-	sed -i '/^CC\s/d' configure || die "No configure file"
-	sed -i 's/^\(CC_QUIET=\).*/\1 \\\$(CC)/' configure || die "No configure file"
-	sed -i 's/^\(.*MAKE.*\)-s\(.*\)$/\1\2/' configure || die "No configure file"
-	makes=$(find . -iname Makefile.in)
-	for f in ${makes}; do
-		sed -i '/^CC\s/d' $f || die "No file "$f
-		sed -i 's/^\(CC_QUIET=\).*/\1 \$(CC)/' $f || die "No file "$f
-	done
-}
-
-src_configure() {
-	local myconf=""
-
-	use elibc_uclibc && myconf+=" --uclib-mode"
-	use elibc_musl && myconf+=" --musl-mode"
-
-	use minimal || myconf+=" --enable-shared"
-	use jemalloc || myconf+=" --malloc-libc"
-
-	if use debug; then
-		myconf+=" --debug --trace"
-	else
-		myconf+=" --no-backtrace"
-	fi
-
-	local enable_plugins=""
-	local disable_plugins=""
-	for p in ${PLUGINS}; do
-		cp=${p/monkeyd_plugins_/}
-		use $p && enable_plugins+="${cp}," || disable_plugins+="${cp},"
-	done
-	myconf+=" --enable-plugins=${enable_plugins%,} --disable-plugins=${disable_plugins%,}"
-
-	# Non-autotools configure
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--datadir=${WEBROOT}/htdocs \
-		--logdir=/var/log/${PN} \
-		--mandir=/usr/share/man \
-		--libdir=/usr/$(get_libdir) \
-		--plugdir=/usr/$(get_libdir)/monkeyd/plugins \
-		--sysconfdir=/etc/${PN} \
-		--platform="generic" \
-		${myconf} \
-		|| die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-
-	# Don't install the banana script man page
-	rm "${S}"/man/banana.1
-}
-
-src_install() {
-	default
-
-	if use php ; then
-		sed -i -e '/^#AddScript application\/x-httpd-php/s:^#::' "${D}"/etc/monkeyd/monkey.conf || die
-		sed -i -e 's:/home/my_home/php/bin/php:/usr/bin/php-cgi:' "${D}"/etc/monkeyd/monkey.conf || die
-	fi
-
-	sed -i -e "s:/var/log/monkeyd/monkey.pid:/var/run/monkey.pid:" "${D}"/etc/monkeyd/monkey.conf || die
-	newinitd "${FILESDIR}"/monkeyd.initd monkeyd
-	newconfd "${FILESDIR}"/monkeyd.confd monkeyd
-
-	#move htdocs to docdir, bug #429632
-	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
-	mv "${D}"${WEBROOT}/htdocs \
-		"${D}"/usr/share/doc/"${PF}"/htdocs.dist
-	mkdir "${D}"${WEBROOT}/htdocs
-
-	keepdir \
-		/var/log/monkeyd \
-		${WEBROOT}/htdocs
-}

diff --git a/www-servers/monkeyd/monkeyd-1.5.5.ebuild b/www-servers/monkeyd/monkeyd-1.5.5.ebuild
deleted file mode 100644
index 5c05f5f..0000000
--- a/www-servers/monkeyd/monkeyd-1.5.5.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit toolchain-funcs depend.php multilib
-
-MY_P="${PN/d}-${PV}"
-DESCRIPTION="A small, fast, and scalable web server"
-HOMEPAGE="http://www.monkey-project.com/"
-SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 x86"
-
-# ssl is broken, so we turn it off until fixed
-IUSE="-debug jemalloc php minimal elibc_musl elibc_uclibc monkeyd_plugins_auth monkeyd_plugins_cheetah cgi monkeyd_plugins_dirlisting fastcgi +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril"
-
-# uclibc is often compiled without backtrace info so we should
-# force this off.  If someone complains, consider relaxing it.
-# ssl is borken, so we remove "ssl? ( monkeyd_plugins_polarssl )"
-REQUIRED_USE="elibc_uclibc? ( !debug )"
-
-DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
-RDEPEND="php? ( dev-lang/php )"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBROOT="/var/www/localhost"
-
-pkg_setup() {
-	use php && require_php_cgi
-
-	if use debug; then
-		ewarn
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn "Do not use debug in production!"
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# Unconditionally get rid of the bundled jemalloc
-	rm -rf "${S}"/deps
-	epatch "${FILESDIR}"/${PN}-1.5.2-use-system-jemalloc.patch
-	epatch "${FILESDIR}"/${PN}-1.5.0-fix-CPPFLAGS.patch
-
-	# Don't install the banana script, we use ${FILESDIR}/monkeyd.initd instead
-	sed -i '/Creating bin\/banana/d' configure || die "No configure file"
-	sed -i '/create_banana_script bindir/d' configure || die "No configure file"
-
-	# Don't explicitly strip files
-	sed -i -e '/$STRIP /d' -e 's/install -s -m 644/install -m 755/' configure || die "No configure file"
-
-	# We don't need the includes, sym link to libmonkey.so, or monkey.cp when not installing the .so
-	use minimal && {
-		sed -i '/install -d \\$(INCDIR)/d' configure || die "No configure file"
-		sed -i '/install -m 644 src\/include\/\*.h \\$(INCDIR)/d' configure || die "No configure file"
-		sed -i '/ln -sf/d' configure || die "No configure file"
-		sed -i '/install -d \\$(LIBDIR)\/pkgconfig/d' configure || die "No configure file"
-		sed -i '/install -m 644 monkey.pc \\$(LIBDIR)\/pkgconfig/d' configure || die "No configure file"
-	}
-
-	# Unquiet build
-	sed -i '/^CC\s/d' configure || die "No configure file"
-	sed -i 's/^\(CC_QUIET=\).*/\1 \\\$(CC)/' configure || die "No configure file"
-	sed -i 's/^\(.*MAKE.*\)-s\(.*\)$/\1\2/' configure || die "No configure file"
-	makes=$(find . -iname Makefile.in)
-	for f in ${makes}; do
-		sed -i '/^CC\s/d' $f || die "No file "$f
-		sed -i 's/^\(CC_QUIET=\).*/\1 \$(CC)/' $f || die "No file "$f
-	done
-}
-
-src_configure() {
-	local myconf=""
-
-	use elibc_uclibc && myconf+=" --uclib-mode"
-	use elibc_musl && myconf+=" --musl-mode"
-
-	use minimal || myconf+=" --enable-shared"
-	use jemalloc || myconf+=" --malloc-libc"
-
-	if use debug; then
-		myconf+=" --debug --trace"
-	else
-		myconf+=" --no-backtrace"
-	fi
-
-	local enable_plugins=""
-	local disable_plugins=""
-	for p in ${PLUGINS}; do
-		cp=${p/monkeyd_plugins_/}
-		use $p && enable_plugins+="${cp}," || disable_plugins+="${cp},"
-	done
-	myconf+=" --enable-plugins=${enable_plugins%,} --disable-plugins=${disable_plugins%,}"
-
-	# Non-autotools configure
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--datadir=${WEBROOT}/htdocs \
-		--logdir=/var/log/${PN} \
-		--mandir=/usr/share/man \
-		--libdir=/usr/$(get_libdir) \
-		--plugdir=/usr/$(get_libdir)/monkeyd/plugins \
-		--sysconfdir=/etc/${PN} \
-		--platform="generic" \
-		${myconf} \
-		|| die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-
-	# Don't install the banana script man page
-	rm "${S}"/man/banana.1
-}
-
-src_install() {
-	default
-
-	if use php ; then
-		sed -i -e '/^#AddScript application\/x-httpd-php/s:^#::' "${D}"/etc/monkeyd/monkey.conf || die
-		sed -i -e 's:/home/my_home/php/bin/php:/usr/bin/php-cgi:' "${D}"/etc/monkeyd/monkey.conf || die
-	fi
-
-	sed -i -e "s:/var/log/monkeyd/monkey.pid:/var/run/monkey.pid:" "${D}"/etc/monkeyd/monkey.conf || die
-	newinitd "${FILESDIR}"/monkeyd.initd monkeyd
-	newconfd "${FILESDIR}"/monkeyd.confd monkeyd
-
-	#move htdocs to docdir, bug #429632
-	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
-	mv "${D}"${WEBROOT}/htdocs \
-		"${D}"/usr/share/doc/"${PF}"/htdocs.dist
-	mkdir "${D}"${WEBROOT}/htdocs
-
-	keepdir \
-		/var/log/monkeyd \
-		${WEBROOT}/htdocs
-}

diff --git a/www-servers/monkeyd/monkeyd-1.6.1.ebuild b/www-servers/monkeyd/monkeyd-1.6.1.ebuild
deleted file mode 100644
index e0f0159..0000000
--- a/www-servers/monkeyd/monkeyd-1.6.1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit flag-o-matic toolchain-funcs multilib
-
-DESCRIPTION="A small, fast, and scalable web server"
-HOMEPAGE="http://www.monkey-project.com/"
-MY_P="${PN/d}-${PV}"
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/monkey/monkey.git"
-	inherit git-2
-	KEYWORDS=""
-else
-	SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-# Currently monkeyd_plugins_tls is off.  It provides mbed TLS (formerly PolarSSL).
-# jemalloc is also off until we figure out how to work CMakeLists.txt magic.
-#PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls"
-#IUSE="cgi -debug fastcgi jemalloc php static-plugins ${PLUGINS}"
-
-PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril"
-IUSE="cgi -debug fastcgi php static-plugins ${PLUGINS}"
-
-# uclibc is often compiled without backtrace info so we should
-# force this off.  If someone complains, consider relaxing it.
-REQUIRED_USE="
-	elibc_uclibc? ( !debug )
-	cgi? ( php )"
-
-#DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
-DEPEND="dev-util/cmake"
-RDEPEND="
-	php? ( dev-lang/php )
-	cgi? ( dev-lang/php[cgi] )"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBROOT="/var/www/localhost"
-
-pkg_setup() {
-	if use debug; then
-		ewarn
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn "Do not use debug in production!"
-		ewarn "\033[1;33m**************************************************\033[00m"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# Unconditionally get rid of the bundled jemalloc and mbedTLS
-	rm -rf "${S}"/deps
-}
-
-src_configure() {
-	local myconf=""
-
-	use elibc_uclibc && myconf+=" --uclib-mode"
-	use elibc_musl && myconf+=" --musl-mode"
-
-	#use jemalloc || myconf+=" --malloc-libc"
-	myconf+=" --malloc-libc"
-
-	if use debug; then
-		myconf+=" --debug --trace"
-	else
-		myconf+=" --no-backtrace"
-	fi
-
-	local enable_plugins=""
-	local disable_plugins=""
-	# We use 'cgi' and 'fastcgi' because they are global flags
-	# instead of the corresponding monkeyd_plugins_*
-	use cgi && enable_plugins+="cgi," || disable_plugins+="cgi,"
-	use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi,"
-	# For the rest, we scan the monkeyd_plugins_* and parse out the plugin name.
-	for p in ${PLUGINS}; do
-		pp=${p/+/}
-		cp=${pp/monkeyd_plugins_/}
-		use $pp && enable_plugins+="${cp}," || disable_plugins+="${cp},"
-	done
-	myconf+=" --enable-plugins=${enable_plugins%,} --disable-plugins=${disable_plugins%,}"
-	if use static-plugins; then
-		myconf+=" --static-plugins=${enable_plugins%,}"
-	fi
-
-	# For O_CLOEXEC which is guarded by _GNU_SOURCE in uClibc,
-	# but shouldn't because it is POSIX.  This needs to be fixed
-	# in uClibc.  Also, we really should us append-cppflags but
-	# monkey's build system doesn't respect CPPFLAGS.  This needs
-	# to be fixed in monkey.
-	use elibc_uclibc && append-cflags -D_GNU_SOURCE
-
-	# Non-autotools configure
-	./configure \
-		--pthread-tls \
-		--prefix=/usr \
-		--sbindir=/usr/sbin \
-		--webroot=${WEBROOT}/htdocs \
-		--logdir=/var/log/${PN} \
-		--mandir=/usr/share/man \
-		--libdir=/usr/$(get_libdir) \
-		--pidfile=/run/monkey.pid \
-		--sysconfdir=/etc/${PN} \
-		${myconf} \
-		|| die
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/monkeyd.initd-r1 monkeyd
-	newconfd "${FILESDIR}"/monkeyd.confd monkeyd
-
-	# Move htdocs to docdir, bug #429632
-	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
-	mv "${D}"${WEBROOT}/htdocs \
-		"${D}"/usr/share/doc/"${PF}"/htdocs.dist
-	mkdir "${D}"${WEBROOT}/htdocs
-
-	keepdir \
-		/var/log/monkeyd \
-		${WEBROOT}/htdocs
-
-	# This needs to be created at runtime
-	rm -rf "${D}"/run
-}


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2015-08-22  1:33 Anthony G. Basile
  0 siblings, 0 replies; 30+ messages in thread
From: Anthony G. Basile @ 2015-08-22  1:33 UTC (permalink / raw
  To: gentoo-commits

commit:     80e68c9fb7cc6c85dfe49a645060724f66ddf46e
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 22 01:36:37 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 01:36:37 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80e68c9f

www-servers/monkeyd: bump to 1.6.1, drop 1.6.0-r1.

Package-Manager: portage-2.2.20.1

 www-servers/monkeyd/Manifest                                 |  2 +-
 .../{monkeyd-1.6.0-r1.ebuild => monkeyd-1.6.1.ebuild}        | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index 52f20be..ff2c241 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -1,4 +1,4 @@
 DIST monkey-1.5.3.tar.gz 892478 SHA256 0ac300e04f052818bc26b7da0183c3c5cd13be8090aaabd3505838587be8c0ec SHA512 6a55ba580bfde3c11329e94055d287e341990e4db4cb5ab12e40b8bab57b4b51fd57cd33fc5aa9d864127f235888f818593be26fe93daa34ca3c40fa8936465f WHIRLPOOL 4038bd2f0b39f6068ab69dc98dec4d5b29feca388c18361f57b653db86c38469d69072ae803ddd565e57350163247072334835216a13d014956a27b91c8a42b6
 DIST monkey-1.5.5.tar.gz 898602 SHA256 5a0554fdb4d8746f5eb665f305bd120c8f2bef3e7fea2a43be6b472461b45b05 SHA512 faf86a36a91c8b1e47f3a2ea7f19aee98eada6f3348ff64f160fc388c268a146d49ad9434043731cf928fca6708db40fa5e1daedc41d4b8cce671f98d590b920 WHIRLPOOL 26b44624f77b72bbd31da6be5855429199a0fc9ab163548f1d0f21a34b84a1f0325241ed7ad5ecbb28c9e9f899458b5d8c15f9f91e27b73a53023c2e3152947d
 DIST monkey-1.5.6.tar.gz 902636 SHA256 7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22 SHA512 4c7c627cb047252252b22da5fba179a21fb5b8dc6280b96307af52757ad049d24b0daaaea51dca4f0429af5e6499c239f6b62a03654cc9e7ad98ae8f5149b64c WHIRLPOOL aba1a928023fc67224f254182eb9707c6594c7092d9ff98ecfa297c91d5c61f79235e7467192b5d46ac114ae67a3cee98e06704721348a40ee825755ab39d9a1
-DIST monkey-1.6.0.tar.gz 1915116 SHA256 bd6d126aba461b16def25eb7d9226c1256063d6c82cd0a2a92f634e9b959fddd SHA512 4cb916d13619a78ad067f0ac47d82d88425dbe0458cba6c580694caf9455a2141c78980af7143f24f82eb41d1d5c842f4765117d9c7b4d657c728c38a1315627 WHIRLPOOL 0681aac08412e15a2279c2cde0446357c35450d4e2fc97b642ae3adbcfa020aafd8f410f7d48603d1004266f5c11ddc5587a186a4718fd9146deb8f7c4f70652
+DIST monkey-1.6.1.tar.gz 1916812 SHA256 acf2ba04578c362b2b1c509ee4a998b6b2951e51b16bd339d300743de1752961 SHA512 c7c0f83bb74193bfd7008a0327012a45474b65befb47ac514d3a10095c41aeb2ec49067249377d18cc3a6ec77eb14c5ae25e36d2550e47971a43e156ef24d619 WHIRLPOOL 70545f343b6675d456b4ed426ad27435302c0e122f1b26640e3aa65343a5912af4c431d799f018fe19f3183c904a876fc157f5f0e257f6dcf9b76cf2422ed1f0

diff --git a/www-servers/monkeyd/monkeyd-1.6.0-r1.ebuild b/www-servers/monkeyd/monkeyd-1.6.1.ebuild
similarity index 93%
rename from www-servers/monkeyd/monkeyd-1.6.0-r1.ebuild
rename to www-servers/monkeyd/monkeyd-1.6.1.ebuild
index 59f80a4..e0f0159 100644
--- a/www-servers/monkeyd/monkeyd-1.6.0-r1.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.6.1.ebuild
@@ -6,14 +6,20 @@ EAPI="5"
 
 inherit flag-o-matic toolchain-funcs multilib
 
-MY_P="${PN/d}-${PV}"
 DESCRIPTION="A small, fast, and scalable web server"
 HOMEPAGE="http://www.monkey-project.com/"
-SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
+MY_P="${PN/d}-${PV}"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/monkey/monkey.git"
+	inherit git-2
+	KEYWORDS=""
+else
+	SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 
 # Currently monkeyd_plugins_tls is off.  It provides mbed TLS (formerly PolarSSL).
 # jemalloc is also off until we figure out how to work CMakeLists.txt magic.


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2015-08-20 13:42 Anthony G. Basile
  0 siblings, 0 replies; 30+ messages in thread
From: Anthony G. Basile @ 2015-08-20 13:42 UTC (permalink / raw
  To: gentoo-commits

commit:     9d6c946de560ad0cb3408107ee9f13be97849249
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 13:46:06 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 13:46:06 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d6c946d

www-servers/monkeyd: add 9999 version for testing

Package-Manager: portage-2.2.20.1

 www-servers/monkeyd/monkeyd-9999.ebuild | 139 ++++++++++++++++++++++++++++++++
 1 file changed, 139 insertions(+)

diff --git a/www-servers/monkeyd/monkeyd-9999.ebuild b/www-servers/monkeyd/monkeyd-9999.ebuild
new file mode 100644
index 0000000..e0f0159
--- /dev/null
+++ b/www-servers/monkeyd/monkeyd-9999.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit flag-o-matic toolchain-funcs multilib
+
+DESCRIPTION="A small, fast, and scalable web server"
+HOMEPAGE="http://www.monkey-project.com/"
+MY_P="${PN/d}-${PV}"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/monkey/monkey.git"
+	inherit git-2
+	KEYWORDS=""
+else
+	SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# Currently monkeyd_plugins_tls is off.  It provides mbed TLS (formerly PolarSSL).
+# jemalloc is also off until we figure out how to work CMakeLists.txt magic.
+#PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls"
+#IUSE="cgi -debug fastcgi jemalloc php static-plugins ${PLUGINS}"
+
+PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril"
+IUSE="cgi -debug fastcgi php static-plugins ${PLUGINS}"
+
+# uclibc is often compiled without backtrace info so we should
+# force this off.  If someone complains, consider relaxing it.
+REQUIRED_USE="
+	elibc_uclibc? ( !debug )
+	cgi? ( php )"
+
+#DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
+DEPEND="dev-util/cmake"
+RDEPEND="
+	php? ( dev-lang/php )
+	cgi? ( dev-lang/php[cgi] )"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBROOT="/var/www/localhost"
+
+pkg_setup() {
+	if use debug; then
+		ewarn
+		ewarn "\033[1;33m**************************************************\033[00m"
+		ewarn "Do not use debug in production!"
+		ewarn "\033[1;33m**************************************************\033[00m"
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# Unconditionally get rid of the bundled jemalloc and mbedTLS
+	rm -rf "${S}"/deps
+}
+
+src_configure() {
+	local myconf=""
+
+	use elibc_uclibc && myconf+=" --uclib-mode"
+	use elibc_musl && myconf+=" --musl-mode"
+
+	#use jemalloc || myconf+=" --malloc-libc"
+	myconf+=" --malloc-libc"
+
+	if use debug; then
+		myconf+=" --debug --trace"
+	else
+		myconf+=" --no-backtrace"
+	fi
+
+	local enable_plugins=""
+	local disable_plugins=""
+	# We use 'cgi' and 'fastcgi' because they are global flags
+	# instead of the corresponding monkeyd_plugins_*
+	use cgi && enable_plugins+="cgi," || disable_plugins+="cgi,"
+	use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi,"
+	# For the rest, we scan the monkeyd_plugins_* and parse out the plugin name.
+	for p in ${PLUGINS}; do
+		pp=${p/+/}
+		cp=${pp/monkeyd_plugins_/}
+		use $pp && enable_plugins+="${cp}," || disable_plugins+="${cp},"
+	done
+	myconf+=" --enable-plugins=${enable_plugins%,} --disable-plugins=${disable_plugins%,}"
+	if use static-plugins; then
+		myconf+=" --static-plugins=${enable_plugins%,}"
+	fi
+
+	# For O_CLOEXEC which is guarded by _GNU_SOURCE in uClibc,
+	# but shouldn't because it is POSIX.  This needs to be fixed
+	# in uClibc.  Also, we really should us append-cppflags but
+	# monkey's build system doesn't respect CPPFLAGS.  This needs
+	# to be fixed in monkey.
+	use elibc_uclibc && append-cflags -D_GNU_SOURCE
+
+	# Non-autotools configure
+	./configure \
+		--pthread-tls \
+		--prefix=/usr \
+		--sbindir=/usr/sbin \
+		--webroot=${WEBROOT}/htdocs \
+		--logdir=/var/log/${PN} \
+		--mandir=/usr/share/man \
+		--libdir=/usr/$(get_libdir) \
+		--pidfile=/run/monkey.pid \
+		--sysconfdir=/etc/${PN} \
+		${myconf} \
+		|| die
+}
+
+src_compile() {
+	emake VERBOSE=1
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/monkeyd.initd-r1 monkeyd
+	newconfd "${FILESDIR}"/monkeyd.confd monkeyd
+
+	# Move htdocs to docdir, bug #429632
+	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
+	mv "${D}"${WEBROOT}/htdocs \
+		"${D}"/usr/share/doc/"${PF}"/htdocs.dist
+	mkdir "${D}"${WEBROOT}/htdocs
+
+	keepdir \
+		/var/log/monkeyd \
+		${WEBROOT}/htdocs
+
+	# This needs to be created at runtime
+	rm -rf "${D}"/run
+}


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2015-08-14  0:59 Anthony G. Basile
  0 siblings, 0 replies; 30+ messages in thread
From: Anthony G. Basile @ 2015-08-14  0:59 UTC (permalink / raw
  To: gentoo-commits

commit:     66e00955bd8dd37e04c5d1c6febb50fe84b2c7e8
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 14 00:45:05 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Aug 14 01:02:59 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66e00955

www-servers/monkeyd: fix build on uClibc

Package-Manager: portage-2.2.20.1

 www-servers/monkeyd/monkeyd-1.6.0-r1.ebuild | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/www-servers/monkeyd/monkeyd-1.6.0-r1.ebuild b/www-servers/monkeyd/monkeyd-1.6.0-r1.ebuild
index e265962..d07b3b8 100644
--- a/www-servers/monkeyd/monkeyd-1.6.0-r1.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.6.0-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit toolchain-funcs depend.php multilib
+inherit flag-o-matic toolchain-funcs multilib
 
 MY_P="${PN/d}-${PV}"
 DESCRIPTION="A small, fast, and scalable web server"
@@ -86,6 +86,13 @@ src_configure() {
 		myconf+=" --static-plugins=${enable_plugins%,}"
 	fi
 
+	# For O_CLOEXEC which is guarded by _GNU_SOURCE in uClibc,
+	# but shouldn't because it is POSIX.  This needs to be fixed
+	# in uClibc.  Also, we really should us append-cppflags but
+	# monkey's build system doesn't respect CPPFLAGS.  This needs
+	# to be fixed in monkey.
+	use elibc_uclibc && append-cflags -D_GNU_SOURCE
+
 	# Non-autotools configure
 	./configure \
 		--pthread-tls \


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2015-08-13 21:58 Anthony G. Basile
  0 siblings, 0 replies; 30+ messages in thread
From: Anthony G. Basile @ 2015-08-13 21:58 UTC (permalink / raw
  To: gentoo-commits

commit:     6dd2ea49a8ef1194f3b7152ba19284daef071afc
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 13 22:01:13 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Aug 13 22:01:53 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dd2ea49

www-servers/monkeyd: DEPEND on dev-util/cmake

Package-Manager: portage-2.2.20.1

 www-servers/monkeyd/monkeyd-1.6.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/monkeyd/monkeyd-1.6.0-r1.ebuild b/www-servers/monkeyd/monkeyd-1.6.0-r1.ebuild
index 4dc3377..e265962 100644
--- a/www-servers/monkeyd/monkeyd-1.6.0-r1.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.6.0-r1.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="
 	cgi? ( php )"
 
 #DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
-DEPEND=""
+DEPEND="dev-util/cmake"
 RDEPEND="
 	php? ( dev-lang/php )
 	cgi? ( dev-lang/php[cgi] )"


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2015-08-10 19:10 Anthony G. Basile
  0 siblings, 0 replies; 30+ messages in thread
From: Anthony G. Basile @ 2015-08-10 19:10 UTC (permalink / raw
  To: gentoo-commits

commit:     0598317c52f57ce4673d859e3291f8bd4ebe2d6f
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 10 19:12:40 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 19:12:40 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0598317c

www-servers/monkeyd: do verbose build for 1.6.0.

Package-Manager: portage-2.2.20

 www-servers/monkeyd/monkeyd-1.6.0.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/www-servers/monkeyd/monkeyd-1.6.0.ebuild b/www-servers/monkeyd/monkeyd-1.6.0.ebuild
index 3f55619..73972b8 100644
--- a/www-servers/monkeyd/monkeyd-1.6.0.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.6.0.ebuild
@@ -101,6 +101,10 @@ src_configure() {
 		|| die
 }
 
+src_compile() {
+	emake VERBOSE=1
+}
+
 src_install() {
 	default
 


^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
@ 2015-08-10 19:03 Anthony G. Basile
  0 siblings, 0 replies; 30+ messages in thread
From: Anthony G. Basile @ 2015-08-10 19:03 UTC (permalink / raw
  To: gentoo-commits

commit:     d8bc5dd197f8771c63f6534e7592e18ab5f3ffac
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 10 19:04:45 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 19:06:09 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8bc5dd1

www-servers/monkeyd: major bump to 1.6.0.

Package-Manager: portage-2.2.20

 www-servers/monkeyd/Manifest             |   1 +
 www-servers/monkeyd/metadata.xml         |   1 +
 www-servers/monkeyd/monkeyd-1.6.0.ebuild | 119 +++++++++++++++++++++++++++++++
 3 files changed, 121 insertions(+)

diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index acca2cb..52f20be 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -1,3 +1,4 @@
 DIST monkey-1.5.3.tar.gz 892478 SHA256 0ac300e04f052818bc26b7da0183c3c5cd13be8090aaabd3505838587be8c0ec SHA512 6a55ba580bfde3c11329e94055d287e341990e4db4cb5ab12e40b8bab57b4b51fd57cd33fc5aa9d864127f235888f818593be26fe93daa34ca3c40fa8936465f WHIRLPOOL 4038bd2f0b39f6068ab69dc98dec4d5b29feca388c18361f57b653db86c38469d69072ae803ddd565e57350163247072334835216a13d014956a27b91c8a42b6
 DIST monkey-1.5.5.tar.gz 898602 SHA256 5a0554fdb4d8746f5eb665f305bd120c8f2bef3e7fea2a43be6b472461b45b05 SHA512 faf86a36a91c8b1e47f3a2ea7f19aee98eada6f3348ff64f160fc388c268a146d49ad9434043731cf928fca6708db40fa5e1daedc41d4b8cce671f98d590b920 WHIRLPOOL 26b44624f77b72bbd31da6be5855429199a0fc9ab163548f1d0f21a34b84a1f0325241ed7ad5ecbb28c9e9f899458b5d8c15f9f91e27b73a53023c2e3152947d
 DIST monkey-1.5.6.tar.gz 902636 SHA256 7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22 SHA512 4c7c627cb047252252b22da5fba179a21fb5b8dc6280b96307af52757ad049d24b0daaaea51dca4f0429af5e6499c239f6b62a03654cc9e7ad98ae8f5149b64c WHIRLPOOL aba1a928023fc67224f254182eb9707c6594c7092d9ff98ecfa297c91d5c61f79235e7467192b5d46ac114ae67a3cee98e06704721348a40ee825755ab39d9a1
+DIST monkey-1.6.0.tar.gz 1915116 SHA256 bd6d126aba461b16def25eb7d9226c1256063d6c82cd0a2a92f634e9b959fddd SHA512 4cb916d13619a78ad067f0ac47d82d88425dbe0458cba6c580694caf9455a2141c78980af7143f24f82eb41d1d5c842f4765117d9c7b4d657c728c38a1315627 WHIRLPOOL 0681aac08412e15a2279c2cde0446357c35450d4e2fc97b642ae3adbcfa020aafd8f410f7d48603d1004266f5c11ddc5587a186a4718fd9146deb8f7c4f70652

diff --git a/www-servers/monkeyd/metadata.xml b/www-servers/monkeyd/metadata.xml
index f81ac37..05bf7e3 100644
--- a/www-servers/monkeyd/metadata.xml
+++ b/www-servers/monkeyd/metadata.xml
@@ -9,5 +9,6 @@
 		<flag name="debug">Enable lots of debugging info</flag>
 		<flag name="jemalloc">Use dev-libs/jemalloc for allocations</flag>
 		<flag name="minimal">Do not install shared lib and include files</flag>
+		<flag name="static-plugins">Build statically linked plugins</flag>
 	</use>
 </pkgmetadata>

diff --git a/www-servers/monkeyd/monkeyd-1.6.0.ebuild b/www-servers/monkeyd/monkeyd-1.6.0.ebuild
new file mode 100644
index 0000000..3f55619
--- /dev/null
+++ b/www-servers/monkeyd/monkeyd-1.6.0.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit toolchain-funcs depend.php multilib
+
+MY_P="${PN/d}-${PV}"
+DESCRIPTION="A small, fast, and scalable web server"
+HOMEPAGE="http://www.monkey-project.com/"
+SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+
+# Currently monkeyd_plugins_tls is off.  It provides mbed TLS (formerly PolarSSL).
+# jemalloc is also off until we figure out how to work CMakeLists.txt magic.
+#PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls"
+#IUSE="cgi -debug fastcgi jemalloc php static-plugins ${PLUGINS}"
+
+PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril"
+IUSE="cgi -debug fastcgi php static-plugins ${PLUGINS}"
+
+# uclibc is often compiled without backtrace info so we should
+# force this off.  If someone complains, consider relaxing it.
+REQUIRED_USE="
+	elibc_uclibc? ( !debug )
+	cgi? ( php )"
+
+#DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
+DEPEND=""
+RDEPEND="
+	php? ( dev-lang/php )
+	cgi? ( dev-lang/php[cgi] )"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBROOT="/var/www/localhost"
+
+pkg_setup() {
+	if use debug; then
+		ewarn
+		ewarn "\033[1;33m**************************************************\033[00m"
+		ewarn "Do not use debug in production!"
+		ewarn "\033[1;33m**************************************************\033[00m"
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# Unconditionally get rid of the bundled jemalloc and mbedTLS
+	rm -rf "${S}"/deps
+}
+
+src_configure() {
+	local myconf=""
+
+	use elibc_uclibc && myconf+=" --uclib-mode"
+	use elibc_musl && myconf+=" --musl-mode"
+
+	#use jemalloc || myconf+=" --malloc-libc"
+	myconf+=" --malloc-libc"
+
+	if use debug; then
+		myconf+=" --debug --trace"
+	else
+		myconf+=" --no-backtrace"
+	fi
+
+	local enable_plugins=""
+	local disable_plugins=""
+	# We use 'cgi' and 'fastcgi' because they are global flags
+	# instead of the corresponding monkeyd_plugins_*
+	use cgi && enable_plugins+="cgi," || disable_plugins+="cgi,"
+	use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi,"
+	# For the rest, we scan the monkeyd_plugins_* and parse out the plugin name.
+	for p in ${PLUGINS}; do
+		pp=${p/+/}
+		cp=${pp/monkeyd_plugins_/}
+		use $pp && enable_plugins+="${cp}," || disable_plugins+="${cp},"
+	done
+	myconf+=" --enable-plugins=${enable_plugins%,} --disable-plugins=${disable_plugins%,}"
+	if use static-plugins; then
+		myconf+=" --static-plugins=${enable_plugins%,}"
+	fi
+
+	# Non-autotools configure
+	./configure \
+		--pthread-tls \
+		--prefix=/usr \
+		--sbindir=/usr/sbin \
+		--webroot=${WEBROOT}/htdocs \
+		--logdir=/var/log/${PN} \
+		--mandir=/usr/share/man \
+		--libdir=/usr/$(get_libdir) \
+		--pidfile=/run/monkey.pid \
+		--sysconfdir=/etc/${PN} \
+		${myconf} \
+		|| die
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/monkeyd.initd monkeyd
+	newconfd "${FILESDIR}"/monkeyd.confd monkeyd
+
+	#move htdocs to docdir, bug #429632
+	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
+	mv "${D}"${WEBROOT}/htdocs \
+		"${D}"/usr/share/doc/"${PF}"/htdocs.dist
+	mkdir "${D}"${WEBROOT}/htdocs
+
+	keepdir \
+		/var/log/monkeyd \
+		${WEBROOT}/htdocs
+}


^ permalink raw reply related	[flat|nested] 30+ messages in thread

end of thread, other threads:[~2022-01-01 20:08 UTC | newest]

Thread overview: 30+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-22 13:08 [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/ Anthony G. Basile
  -- strict thread matches above, loose matches on Subject: below --
2022-01-01 20:08 David Seifert
2021-07-20 19:03 Conrad Kostecki
2021-02-15  9:03 Sam James
2021-02-15  0:32 Sam James
2021-02-14 10:36 David Seifert
2018-04-27 22:11 Anthony G. Basile
2016-10-22 13:05 Anthony G. Basile
2016-07-18 17:13 Markus Meier
2016-07-14  7:27 Jeroen Roovers
2016-07-01 17:20 Anthony G. Basile
2016-06-12 19:53 Markus Meier
2016-06-05  8:34 Anthony G. Basile
2016-01-19 21:17 Anthony G. Basile
2016-01-11 15:21 Brian Evans
2016-01-01  8:05 Anthony G. Basile
2015-11-24  8:27 Anthony G. Basile
2015-11-24  8:24 Anthony G. Basile
2015-10-31  7:10 Anthony G. Basile
2015-10-28  8:05 Anthony G. Basile
2015-10-28  8:05 Anthony G. Basile
2015-10-27 11:33 Anthony G. Basile
2015-09-03  7:09 Anthony G. Basile
2015-09-03  7:09 Anthony G. Basile
2015-08-22  1:33 Anthony G. Basile
2015-08-20 13:42 Anthony G. Basile
2015-08-14  0:59 Anthony G. Basile
2015-08-13 21:58 Anthony G. Basile
2015-08-10 19:10 Anthony G. Basile
2015-08-10 19:03 Anthony G. Basile

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox