[gentoo-commits] repo/gentoo:master commit in: net-im/prosody/

[Conrad Kostecki]

commit:     b4ccfc45a8a2afe0ba1cb941091474724e16774b
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  3 18:26:15 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> 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 <conikost <AT> 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
 }