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

["Anthony G. Basile" <blueness@gentoo.org>]

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
-}