gentoo resync : 02.09.2020

4 files changed, 9 insertions, 102 deletions

diff --git a/net-irc/irssi-xmpp/Manifest b/net-irc/irssi-xmpp/Manifest
index 98b7c87b9c16..f9aae4c47153 100644
--- a/net-irc/irssi-xmpp/Manifest
+++ b/net-irc/irssi-xmpp/Manifest
@@ -1,6 +1,4 @@
-AUX irssi-xmpp-0.53-irssi-1.0.patch 1877 BLAKE2B 80956453f37de65bc39ca1e1a2c5fdea704f8389ed4d7e13f03635d00f18608d1ce828dfbd06b3b0004fbe43578cd9a0da624c6085d2e27d1e7c8c85c5cf7be6 SHA512 8fabc71b9b45eace69041c4b446f8227e92ce426980bb03f3251d7fac1d0cf96ef00a3f5f0a21b07590dabc97db605ac39f5d78131d945b95e466c3fd6a2cac7
-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
-EBUILD irssi-xmpp-0.53.ebuild 794 BLAKE2B 2d34c668b665062f5007b7935b321d68dc86a6db523032226d69882e0ac19d96cee9320213da09418313dfcefc82e66c49dbfe326578d2c9a4baa89e9bc66547 SHA512 3236a53cdb10bebaf15f5644f20fec2a1a47f2423d7c0d03163978d9c41a1a86a66a5bf6d611cb259db9345d825b6409b1631abd33aac24d5229147eb7bcc83a
-EBUILD irssi-xmpp-0.54.ebuild 705 BLAKE2B 4a2bb9ab0f057e4790dd0ea525db35be821395d19bbf46db9410f327e0654163ee6a59c9e964898c967becbd7b1f2502f8c411fbde977c28c5e9b9a1427f4ae2 SHA512 f614e1ae5d0392d38fc114aad5800ec53d008fc90c60844ac7c66b0de64a9ce49cba05ab0053373d1fcb27ef5bb639a7f10835f0138b1a6e2b7f9efbb6ccf733
+EBUILD irssi-xmpp-0.54.ebuild 891 BLAKE2B b3d49990bce3c6f74547e25465faf5e962dca086b787fbc3909d2498794c1aca4e6434306290a98e3dfaac615718c390ee70616b55a8f6460931e44aaf389425 SHA512 250dfaacb0f0ca219d8b3862e7008acbde97732af27f536f22e00ef3e577e4c31a4a4369857cbd71a9d37eb4a8c362c1bb2ed110e8cb036d04e1dde8bd9136d5
 MISC metadata.xml 250 BLAKE2B c268b1356ec4037e979bc2cf251f27473ab234bc7f5925b1725445675e59ce59fbd8900ffe5c09acdba75194848c7f001c8b1e6187a11744601dee6e3bd3c273 SHA512 ef7d2ea71e78c9684960143c24b05c0be118fe34e7ff731d4aa37d15b7435d5483440d235a59c2e223674b74cf7a9103c9e70fa1513225cc71b31ec01ea057cb
diff --git a/net-irc/irssi-xmpp/files/irssi-xmpp-0.53-irssi-1.0.patch b/net-irc/irssi-xmpp/files/irssi-xmpp-0.53-irssi-1.0.patch
deleted file mode 100644
index a92d4db4739b..000000000000
--- a/net-irc/irssi-xmpp/files/irssi-xmpp-0.53-irssi-1.0.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 0d9e5f7f1a0edaea0de312828ce47d11f74ee3dc Mon Sep 17 00:00:00 2001
-From: benaryorg <binary@benary.org>
-Date: Fri, 20 Jan 2017 06:31:28 +0100
-Subject: [PATCH] fix build with irssi 1.0
-
-use_ssl field of SERVER_CONNECT_REC has been renamed to use_tls.
-
-Original patch from darix.
-
-Signed-off-by: benaryorg <binary@benary.org>
----
- src/core/xmpp-servers.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/src/core/xmpp-servers.c b/src/core/xmpp-servers.c
-index 405ecd9..8d0b62d 100644
---- a/src/core/xmpp-servers.c
-+++ b/src/core/xmpp-servers.c
-@@ -32,6 +32,11 @@
- #include "rosters-tools.h"
- #include "tools.h"
- 
-+/* IRSSI_ABI_VERSION was introduced in 0.8.18 */
-+#if !defined(IRSSI_ABI_VERSION) || IRSSI_ABI_VERSION < 6
-+#  define use_tls use_ssl
-+#endif
-+
- static void
- channels_join(SERVER_REC *server, const char *data, int automatic)
- {
-@@ -151,7 +156,7 @@ xmpp_server_init_connect(SERVER_CONNECT_REC *connrec)
- 	server->connect_pid = -1;
- 
- 	if (server->connrec->port <= 0)
--		server->connrec->port = (server->connrec->use_ssl) ?
-+		server->connrec->port = (server->connrec->use_tls) ?
- 		    LM_CONNECTION_DEFAULT_PORT_SSL : LM_CONNECTION_DEFAULT_PORT;
- 
- 	if (conn->real_jid == NULL)
-@@ -335,7 +340,7 @@ lm_open_cb(LmConnection *connection, gboolean success,
- 		g_free(host);
- 	} else
- 		signal_emit("server connecting", 1, server);
--	if (server->connrec->use_ssl)
-+	if (server->connrec->use_tls)
- 		signal_emit("xmpp server status", 2, server, 
- 		    "Using SSL encryption.");
- 	else if (lm_ssl_get_use_starttls(lm_connection_get_ssl(server->lmconn)))
-@@ -470,7 +475,7 @@ xmpp_server_connect(XMPP_SERVER_REC *server)
- 		return;
- 	error = NULL;
- 	err_msg = NULL;
--	if (server->connrec->use_ssl) {
-+	if (server->connrec->use_tls) {
- 		if (!set_ssl(server->lmconn, &error, server, FALSE)) {
- 			err_msg = "Cannot init ssl";
- 			goto err;
diff --git a/net-irc/irssi-xmpp/irssi-xmpp-0.53.ebuild b/net-irc/irssi-xmpp/irssi-xmpp-0.53.ebuild
deleted file mode 100644
index 897b1d37ddd4..000000000000
--- a/net-irc/irssi-xmpp/irssi-xmpp-0.53.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=net-irc/irssi-0.8.13
-	>=net-libs/loudmouth-1.4.0"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-irssi-1.0.patch" )
-
-src_prepare() {
-	default
-	sed -e "s/{MAKE} doc-install/{MAKE}/" \
-		-i Makefile || die #322355
-}
-
-src_compile() {
-	emake PREFIX=/usr CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr IRSSI_LIB=/usr/$(get_libdir)/irssi install
-	dodoc README NEWS TODO docs/*
-}
diff --git a/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild b/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild
index 78831f468181..fab3d7c47f16 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/*
 }