From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 175EF158086 for ; Sat, 1 Jan 2022 20:08:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 03C012BC076; Sat, 1 Jan 2022 20:08:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DB84A2BC076 for ; Sat, 1 Jan 2022 20:08:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 05FCC342F1A for ; Sat, 1 Jan 2022 20:08:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8EA4C2A0 for ; Sat, 1 Jan 2022 20:08:01 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1641067662.e2c402d072037075abed4a76de937b305d2dfc73.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild www-servers/monkeyd/monkeyd-9999.ebuild X-VCS-Directories: www-servers/monkeyd/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: e2c402d072037075abed4a76de937b305d2dfc73 X-VCS-Branch: master Date: Sat, 1 Jan 2022 20:08:01 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bd42ae8f-ba24-472b-b3c7-064db8b2b390 X-Archives-Hash: 4d7f221e04cd71e428dde15fe3333e3f commit: e2c402d072037075abed4a76de937b305d2dfc73 Author: David Seifert gentoo org> AuthorDate: Sat Jan 1 20:07:42 2022 +0000 Commit: David Seifert gentoo 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 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 \