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 3C4AE13835B for ; Sun, 30 Aug 2020 01:05:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B7F5E08F1; Sun, 30 Aug 2020 01:05:14 +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 23554E08F1 for ; Sun, 30 Aug 2020 01:05:14 +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 977CB340D5C for ; Sun, 30 Aug 2020 01:05:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 288AB336 for ; Sun, 30 Aug 2020 01:05:11 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1598749499.a1e1594330a3722fe4baa304dbd5baeb5fc693b9.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/irssi-xmpp/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-irc/irssi-xmpp/Manifest net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild X-VCS-Directories: net-irc/irssi-xmpp/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a1e1594330a3722fe4baa304dbd5baeb5fc693b9 X-VCS-Branch: master Date: Sun, 30 Aug 2020 01:05:11 +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: f62159cf-6a54-4d13-a816-6f9036cf2916 X-Archives-Hash: 824f277403be616eb9df3b766f395e53 commit: a1e1594330a3722fe4baa304dbd5baeb5fc693b9 Author: Sam James gentoo org> AuthorDate: Sun Aug 30 00:57:27 2020 +0000 Commit: Sam James gentoo org> CommitDate: Sun Aug 30 01:04:59 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1e15943 net-irc/irssi-xmpp: fix musl build, respect CC Closes: https://bugs.gentoo.org/713638 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Sam James gentoo.org> net-irc/irssi-xmpp/Manifest | 1 + net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/net-irc/irssi-xmpp/Manifest b/net-irc/irssi-xmpp/Manifest index 7fcd6b7a56c..8bdb1e6629e 100644 --- a/net-irc/irssi-xmpp/Manifest +++ b/net-irc/irssi-xmpp/Manifest @@ -1,2 +1,3 @@ DIST irssi-xmpp-0.53.tar.gz 65649 BLAKE2B 69621ae0fadb3b3c1015b5ffa1f4b9e81cc3b92270c07582f5a4cefe83f9ed4e1735527900c6989127c8d70616b316ea42653ee57aa5a8b0e6e5c641cf064346 SHA512 09969db01b77e95248a080599d480b8271dcbe6d42bc90e5e2bb304a2d1b9695b70090ef0a6b7342bf6e17326e0f7a50c11c85e02e6ed742ec55820ffad655be +DIST irssi-xmpp-0.54-musl-build.patch 24443 BLAKE2B b0ed65a688d0db84f89bc65c429b4754cd4dcfb9de2c1cd5aa64f4e02badc82d26ab42b2a29a3658910dcdbf61b2d49eca4c1b4355b5566c5a3bd120e06340bb SHA512 1417c328867b59de41f71fa720cb00581352604acec9787db183820f1ffb77209623bc236aa5b6e4f661c3780ee5c3d407aecbc286176a4d850f6e40bebecd45 DIST irssi-xmpp-0.54.tar.gz 65618 BLAKE2B 5dd1f3a858cdb397351b93800fdd2050aa8e5764ac2e03008d629dee7d825b02bce4bfc627ab2d3249392efe43ceb1530a7ccefc3241c8ca101cc2963d28f872 SHA512 31ddd9e0147eec23d08b8bcbe242e831d612cb2d00f3b56776e9d0b87db9bd76d4bb147422cdf18c0567f0e0463ab828ab7a0ef80a2b35cfdc0a8be962b39f14 diff --git a/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild b/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild index 78831f46818..fab3d7c47f1 100644 --- a/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild +++ b/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild @@ -8,29 +8,33 @@ inherit toolchain-funcs DESCRIPTION="An irssi plugin providing Jabber/XMPP support" HOMEPAGE="https://cybione.org/~irssi-xmpp/" SRC_URI="https://github.com/cdidier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-musl-build.patch" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" +BDEPEND="virtual/pkgconfig" DEPEND=" net-irc/irssi net-libs/loudmouth " - RDEPEND="${DEPEND}" src_prepare() { default + + eapply "${DISTDIR}/${PN}-0.54-musl-build.patch" + sed -e "s/{MAKE} doc-install/{MAKE}/" \ -i Makefile || die #322355 } src_compile() { - emake PREFIX=/usr + emake PREFIX=/usr CC="$(tc-getCC)" } src_install() { - emake DESTDIR="${D}" PREFIX=/usr IRSSI_LIB=/usr/$(get_libdir)/irssi install + emake DESTDIR="${ED}" PREFIX=/usr IRSSI_LIB=/usr/$(get_libdir)/irssi install dodoc README.md NEWS TODO docs/* }