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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AEC0E13835A for ; Sat, 3 Oct 2020 18:35:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1074CE081A; Sat, 3 Oct 2020 18:35:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EC698E081A for ; Sat, 3 Oct 2020 18:35:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E830E33BF05 for ; Sat, 3 Oct 2020 18:35:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9B693373 for ; Sat, 3 Oct 2020 18:35:13 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1601750092.b4ccfc45a8a2afe0ba1cb941091474724e16774b.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/prosody/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/prosody/prosody-0.11.7.ebuild X-VCS-Directories: net-im/prosody/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: b4ccfc45a8a2afe0ba1cb941091474724e16774b X-VCS-Branch: master Date: Sat, 3 Oct 2020 18:35:13 +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: d03e0b5a-fa2d-431b-bc03-d1c09b784195 X-Archives-Hash: c1853cb81310f2799ca9c877745739c7 commit: b4ccfc45a8a2afe0ba1cb941091474724e16774b Author: Conrad Kostecki gentoo org> AuthorDate: Sat Oct 3 18:26:15 2020 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sat Oct 3 18:34:52 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4ccfc45 net-im/prosody: add notice back Also remove duplicate initd install. Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Conrad Kostecki gentoo.org> net-im/prosody/prosody-0.11.7.ebuild | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net-im/prosody/prosody-0.11.7.ebuild b/net-im/prosody/prosody-0.11.7.ebuild index 82f95665764..041e5c27e52 100644 --- a/net-im/prosody/prosody-0.11.7.ebuild +++ b/net-im/prosody/prosody-0.11.7.ebuild @@ -46,7 +46,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}/${PN}-0.11.2-r1-gentoo.patch" ) src_configure() { - local myconfargs=( + local myeconfargs=( --c-compiler="$(tc-getCC)" --datadir="${EPREFIX}/var/spool/jabber" --libdir="${EPREFIX}/usr/$(get_libdir)" @@ -59,7 +59,9 @@ src_configure() { --with-lua-lib="${EPREFIX}/usr/$(get_libdir)/lua" ) - ./configure ${myconfargs[@]} --cflags="${CFLAGS} -Wall -fPIC" --ldflags="${LDFLAGS} -shared" || die + # Since the configure script is handcrafted, + # and yells at unknown options, do not use 'econf'. + ./configure ${myeconfargs[@]} --cflags="${CFLAGS} -Wall -fPIC" --ldflags="${LDFLAGS} -shared" || die rm makefile || die mv GNUmakefile Makefile || die @@ -74,6 +76,4 @@ src_install() { systemd_dounit "${FILESDIR}"/prosody.service systemd_newtmpfilesd "${FILESDIR}"/prosody.tmpfilesd prosody.conf - - newinitd "${FILESDIR}"/prosody.initd-r3 prosody }