Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/irssi-xmpp/
Date: Sun, 30 Aug 2020 01:05:15
Message-Id: 1598749499.a1e1594330a3722fe4baa304dbd5baeb5fc693b9.sam@gentoo
1 commit: a1e1594330a3722fe4baa304dbd5baeb5fc693b9
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 30 00:57:27 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 30 01:04:59 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1e15943
7
8 net-irc/irssi-xmpp: fix musl build, respect CC
9
10 Closes: https://bugs.gentoo.org/713638
11 Package-Manager: Portage-3.0.4, Repoman-3.0.1
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 net-irc/irssi-xmpp/Manifest | 1 +
15 net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild | 10 +++++++---
16 2 files changed, 8 insertions(+), 3 deletions(-)
17
18 diff --git a/net-irc/irssi-xmpp/Manifest b/net-irc/irssi-xmpp/Manifest
19 index 7fcd6b7a56c..8bdb1e6629e 100644
20 --- a/net-irc/irssi-xmpp/Manifest
21 +++ b/net-irc/irssi-xmpp/Manifest
22 @@ -1,2 +1,3 @@
23 DIST irssi-xmpp-0.53.tar.gz 65649 BLAKE2B 69621ae0fadb3b3c1015b5ffa1f4b9e81cc3b92270c07582f5a4cefe83f9ed4e1735527900c6989127c8d70616b316ea42653ee57aa5a8b0e6e5c641cf064346 SHA512 09969db01b77e95248a080599d480b8271dcbe6d42bc90e5e2bb304a2d1b9695b70090ef0a6b7342bf6e17326e0f7a50c11c85e02e6ed742ec55820ffad655be
24 +DIST irssi-xmpp-0.54-musl-build.patch 24443 BLAKE2B b0ed65a688d0db84f89bc65c429b4754cd4dcfb9de2c1cd5aa64f4e02badc82d26ab42b2a29a3658910dcdbf61b2d49eca4c1b4355b5566c5a3bd120e06340bb SHA512 1417c328867b59de41f71fa720cb00581352604acec9787db183820f1ffb77209623bc236aa5b6e4f661c3780ee5c3d407aecbc286176a4d850f6e40bebecd45
25 DIST irssi-xmpp-0.54.tar.gz 65618 BLAKE2B 5dd1f3a858cdb397351b93800fdd2050aa8e5764ac2e03008d629dee7d825b02bce4bfc627ab2d3249392efe43ceb1530a7ccefc3241c8ca101cc2963d28f872 SHA512 31ddd9e0147eec23d08b8bcbe242e831d612cb2d00f3b56776e9d0b87db9bd76d4bb147422cdf18c0567f0e0463ab828ab7a0ef80a2b35cfdc0a8be962b39f14
26
27 diff --git a/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild b/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild
28 index 78831f46818..fab3d7c47f1 100644
29 --- a/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild
30 +++ b/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild
31 @@ -8,29 +8,33 @@ inherit toolchain-funcs
32 DESCRIPTION="An irssi plugin providing Jabber/XMPP support"
33 HOMEPAGE="https://cybione.org/~irssi-xmpp/"
34 SRC_URI="https://github.com/cdidier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
35 +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-musl-build.patch"
36
37 LICENSE="GPL-2"
38 SLOT="0"
39 KEYWORDS="~amd64 ~x86"
40
41 +BDEPEND="virtual/pkgconfig"
42 DEPEND="
43 net-irc/irssi
44 net-libs/loudmouth
45 "
46 -
47 RDEPEND="${DEPEND}"
48
49 src_prepare() {
50 default
51 +
52 + eapply "${DISTDIR}/${PN}-0.54-musl-build.patch"
53 +
54 sed -e "s/{MAKE} doc-install/{MAKE}/" \
55 -i Makefile || die #322355
56 }
57
58 src_compile() {
59 - emake PREFIX=/usr
60 + emake PREFIX=/usr CC="$(tc-getCC)"
61 }
62
63 src_install() {
64 - emake DESTDIR="${D}" PREFIX=/usr IRSSI_LIB=/usr/$(get_libdir)/irssi install
65 + emake DESTDIR="${ED}" PREFIX=/usr IRSSI_LIB=/usr/$(get_libdir)/irssi install
66 dodoc README.md NEWS TODO docs/*
67 }