summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2020-05-31 12:26:54 +0200
committerMichał Górny <mgorny@gentoo.org>2020-05-31 12:29:52 +0200
commit9c4251f66f747ef671f52eec8bf6463109f4bc46 (patch)
tree2977c2322874836fb876d193d05000042434f2c1
parentdev-python/asynctest: Remove last-rited pkg (diff)
downloadgentoo-9c4251f66f747ef671f52eec8bf6463109f4bc46.tar.gz
gentoo-9c4251f66f747ef671f52eec8bf6463109f4bc46.tar.bz2
gentoo-9c4251f66f747ef671f52eec8bf6463109f4bc46.zip
net-irc/quassel-irssi: Remove last-rited pkg
Closes: https://bugs.gentoo.org/719728 Signed-off-by: Michał Górny <mgorny@gentoo.org>
-rw-r--r--net-irc/quassel-irssi/Manifest1
-rw-r--r--net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-fix_build_with_irssi_1.0.patch38
-rw-r--r--net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-tls-ssl-rename.patch20
-rw-r--r--net-irc/quassel-irssi/metadata.xml13
-rw-r--r--net-irc/quassel-irssi/quassel-irssi-0_p20170107-r1.ebuild63
-rw-r--r--profiles/package.mask7
6 files changed, 0 insertions, 142 deletions
diff --git a/net-irc/quassel-irssi/Manifest b/net-irc/quassel-irssi/Manifest
deleted file mode 100644
index 9b28a3223c43..000000000000
--- a/net-irc/quassel-irssi/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST quassel-irssi-0_p20170107-r1.zip 42745 BLAKE2B 5f15930aa1c3c5f96cf3f36c519465c271c7e0a0884f4bd5b09cbcbb10fb862864b37893231d9c0f903c38fc018bda3530ddc420ec7f8f39228a5860939a1962 SHA512 1d7e4e15af2d73fd7e581c517384604a41b68e3a5152dcaf2776a20bc15b459e4a5a7caf39a9c06a11e65ad5d9fea0aa81fa001caa9060f55b821e12b4fed814
diff --git a/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-fix_build_with_irssi_1.0.patch b/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-fix_build_with_irssi_1.0.patch
deleted file mode 100644
index ddd96ff33316..000000000000
--- a/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-fix_build_with_irssi_1.0.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 35555999f810f49b49ca2a6ec13d4f5b03503007 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <husson@archos.com>
-Date: Wed, 11 Jan 2017 10:24:08 +0100
-Subject: [PATCH] Fix build for irssi 1.0.0
-
----
- core/quassel-net.c | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/core/quassel-net.c b/core/quassel-net.c
-index 8a6eb55..9ab4829 100644
---- a/core/quassel-net.c
-+++ b/core/quassel-net.c
-@@ -117,6 +117,10 @@ static const char *get_nick_flags(SERVER_REC *server) {
- return "";
- }
-
-+// 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 SERVER_REC* quassel_server_init_connect(SERVER_CONNECT_REC* conn) {
- Quassel_SERVER_CONNECT_REC *r = (Quassel_SERVER_CONNECT_REC*) conn;
-
-@@ -132,10 +136,10 @@ static SERVER_REC* quassel_server_init_connect(SERVER_CONNECT_REC* conn) {
- ret->got = 0;
- server_connect_ref(SERVER_CONNECT(conn));
-
-- if(conn->use_ssl) {
-+ if(conn->use_tls)
- ret->ssl = 1;
-- }
-- ret->connrec->use_ssl = 0;
-+
-+ ret->connrec->use_tls = 0;
-
- ret->channels_join = quassel_irssi_channels_join;
- ret->send_message = quassel_irssi_send_message;
diff --git a/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-tls-ssl-rename.patch b/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-tls-ssl-rename.patch
deleted file mode 100644
index b38154ea0551..000000000000
--- a/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-tls-ssl-rename.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -rupN quassel-irssi-7b034e3a8084d08e87869a96795ab59aa4901c74/core/irssi/network-openssl.c quassel-irssi-patched/core/irssi/network-openssl.c
---- quassel-irssi-7b034e3a8084d08e87869a96795ab59aa4901c74/core/irssi/network-openssl.c 2017-01-19 14:07:24.000000000 -0500
-+++ quassel-irssi-patched/core/irssi/network-openssl.c 2017-01-20 16:07:01.599114339 -0500
-@@ -437,11 +437,11 @@ GIOChannel *irssi_ssl_get_iochannel(GIOC
- SSL *ssl;
- SSL_CTX *ctx = NULL;
-
-- const char *mycert = server->connrec->ssl_cert;
-- const char *mypkey = server->connrec->ssl_pkey;
-- const char *cafile = server->connrec->ssl_cafile;
-- const char *capath = server->connrec->ssl_capath;
-- gboolean verify = server->connrec->ssl_verify;
-+ const char *mycert = server->connrec->tls_cert;
-+ const char *mypkey = server->connrec->tls_pkey;
-+ const char *cafile = server->connrec->tls_cafile;
-+ const char *capath = server->connrec->tls_capath;
-+ gboolean verify = server->connrec->tls_verify;
-
- g_return_val_if_fail(handle != NULL, NULL);
-
diff --git a/net-irc/quassel-irssi/metadata.xml b/net-irc/quassel-irssi/metadata.xml
deleted file mode 100644
index fe6b0fafc997..000000000000
--- a/net-irc/quassel-irssi/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="github">phhusson/quassel-irssi</remote-id>
- <bugs-to>https://github.com/phhusson/quassel-irssi/issues</bugs-to>
- </upstream>
- <longdescription lang="en">
- A plugin for the Irssi IRC client to allow connecting to a Quassel core
- hosted either locally or remotely.
- </longdescription>
-</pkgmetadata>
diff --git a/net-irc/quassel-irssi/quassel-irssi-0_p20170107-r1.ebuild b/net-irc/quassel-irssi/quassel-irssi-0_p20170107-r1.ebuild
deleted file mode 100644
index 97d9cc73ba21..000000000000
--- a/net-irc/quassel-irssi/quassel-irssi-0_p20170107-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-# https://github.com/phhusson/quassel-irssi/pull/10 if accepted will
-# allow QuasselC to be installed as a separate package.
-
-# Commit Date: Sat, 7 Jan 2017 14:50:15 +0000
-COMMIT="f23e97a6188129cfae4c52f7e1a75940185454f4"
-
-DESCRIPTION="Irssi module to connect to Quassel cores."
-HOMEPAGE="https://github.com/phhusson/quassel-irssi/"
-SRC_URI="https://github.com/phhusson/${PN}/archive/${COMMIT}.zip -> ${PF}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# fails to build with irssi-1.0
-RDEPEND=">=net-irc/irssi-1.0.0"
-DEPEND="${RDEPEND}
- net-libs/quasselc"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-# Patches for building against irssi-1.0, obtained from:
-# http://pkgs.fedoraproject.org/cgit/rpms/quassel-irssi.git/plain/35555999f810f49b49ca2a6ec13d4f5b03503007.patch
-# http://pkgs.fedoraproject.org/cgit/rpms/quassel-irssi.git/plain/quassel-irssi-tls-ssl-rename.patch
-PATCHES=(
- "${FILESDIR}/${P}-fix_build_with_irssi_1.0.patch"
- "${FILESDIR}/${P}-tls-ssl-rename.patch"
-)
-
-src_prepare() {
- default
-
- sed -e "s:pkg-config:$(tc-getPKG_CONFIG):" \
- -e 's:^CFLAGS=.*:CFLAGS+=$(IRSSI_CFLAGS) $(QUASSELC_FLAGS):' \
- -i "${S}/core/Makefile" || die
-
- sed -e 's:gcc -shared:$(CC) -shared:' -i "${S}/core/Makefile" || die
-
- tc-export CC
- export SYSTEM_QUASSELC=1
-}
-
-src_compile() {
- emake IRSSI_LIB="${ROOT}usr/$(get_libdir)/irssi" -C core
-}
-
-src_install() {
- emake DESTDIR="${D}" LIBDIR="${ROOT}usr/$(get_libdir)" -C core install
- default
-}
-
-pkg_postinst() {
- elog "Note that this requires additional configuration of your irssi client. See"
- elog " ${ROOT}usr/share/doc/${P}/README.md.bz2'"
- elog "for instructions."
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index f0c955a429a0..a2b5f46f5d30 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -232,13 +232,6 @@ sys-cluster/openais
# Remove after 2020-06-28
net-libs/quasselc
-# Jonas Stein <jstein@gentoo.org> (2020-04-28)
-# Upstream stopped development. Package should depend on
-# <net-irc/quassel-0.13 which is no longer in the tree.
-# Bug #719728
-# Remove after 2020-05-28
-net-irc/quassel-irssi
-
# Michał Górny <mgorny@gentoo.org> (2020-04-26)
# Unmaintained. Stuck on Python 3.6. No revdeps.
# Removal in 30 days. Bug #719604.