1 |
commit: b4ccfc45a8a2afe0ba1cb941091474724e16774b |
2 |
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 3 18:26:15 2020 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 3 18:34:52 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4ccfc45 |
7 |
|
8 |
net-im/prosody: add notice back |
9 |
|
10 |
Also remove duplicate initd install. |
11 |
|
12 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
14 |
|
15 |
net-im/prosody/prosody-0.11.7.ebuild | 8 ++++---- |
16 |
1 file changed, 4 insertions(+), 4 deletions(-) |
17 |
|
18 |
diff --git a/net-im/prosody/prosody-0.11.7.ebuild b/net-im/prosody/prosody-0.11.7.ebuild |
19 |
index 82f95665764..041e5c27e52 100644 |
20 |
--- a/net-im/prosody/prosody-0.11.7.ebuild |
21 |
+++ b/net-im/prosody/prosody-0.11.7.ebuild |
22 |
@@ -46,7 +46,7 @@ RDEPEND=" |
23 |
PATCHES=( "${FILESDIR}/${PN}-0.11.2-r1-gentoo.patch" ) |
24 |
|
25 |
src_configure() { |
26 |
- local myconfargs=( |
27 |
+ local myeconfargs=( |
28 |
--c-compiler="$(tc-getCC)" |
29 |
--datadir="${EPREFIX}/var/spool/jabber" |
30 |
--libdir="${EPREFIX}/usr/$(get_libdir)" |
31 |
@@ -59,7 +59,9 @@ src_configure() { |
32 |
--with-lua-lib="${EPREFIX}/usr/$(get_libdir)/lua" |
33 |
) |
34 |
|
35 |
- ./configure ${myconfargs[@]} --cflags="${CFLAGS} -Wall -fPIC" --ldflags="${LDFLAGS} -shared" || die |
36 |
+ # Since the configure script is handcrafted, |
37 |
+ # and yells at unknown options, do not use 'econf'. |
38 |
+ ./configure ${myeconfargs[@]} --cflags="${CFLAGS} -Wall -fPIC" --ldflags="${LDFLAGS} -shared" || die |
39 |
|
40 |
rm makefile || die |
41 |
mv GNUmakefile Makefile || die |
42 |
@@ -74,6 +76,4 @@ src_install() { |
43 |
|
44 |
systemd_dounit "${FILESDIR}"/prosody.service |
45 |
systemd_newtmpfilesd "${FILESDIR}"/prosody.tmpfilesd prosody.conf |
46 |
- |
47 |
- newinitd "${FILESDIR}"/prosody.initd-r3 prosody |
48 |
} |