From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E9CC81399CE for ; Thu, 3 Sep 2015 07:09:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2A2B114245; Thu, 3 Sep 2015 07:09:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8792114245 for ; Thu, 3 Sep 2015 07:09:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 12DB03406A6 for ; Thu, 3 Sep 2015 07:09:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 28ED2180 for ; Thu, 3 Sep 2015 07:09:08 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1441264401.4a081c7208cc3cee88197e22690c550e80d0cc91.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/monkeyd/Manifest www-servers/monkeyd/monkeyd-1.5.3.ebuild www-servers/monkeyd/monkeyd-1.5.5.ebuild www-servers/monkeyd/monkeyd-1.6.1.ebuild X-VCS-Directories: www-servers/monkeyd/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 4a081c7208cc3cee88197e22690c550e80d0cc91 X-VCS-Branch: master Date: Thu, 3 Sep 2015 07:09:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7299853d-f8ed-4288-8200-e83ca63102c6 X-Archives-Hash: 4bc63e6175e9ac4aadb33c3d82339351 commit: 4a081c7208cc3cee88197e22690c550e80d0cc91 Author: Anthony G. Basile gentoo org> AuthorDate: Thu Sep 3 07:13:05 2015 +0000 Commit: Anthony G. Basile gentoo 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 -}