reinit the tree, so we can have metadata

6 files changed, 200 insertions, 0 deletions

diff --git a/net-irc/quassel-irssi/Manifest b/net-irc/quassel-irssi/Manifest
new file mode 100644
index 000000000000..8850e9cc98d2
--- /dev/null
+++ b/net-irc/quassel-irssi/Manifest
@@ -0,0 +1,8 @@
+AUX quassel-irssi-0_p20170107-fix_build_with_irssi_1.0.patch 1192 SHA256 8402bf43c3d624b3fa1ba7ad07fb930ea34e08997700f63eae9b9bac83db888e SHA512 71ff7b0dd2dd14556be5dfd6b92f2ca13af51fb876e731980a979ac27d0e195170e92a915f48bdeaa3556eff7666ee9f563fd5cf89a565d9b6da93dadea5e40a WHIRLPOOL d6700424c3540d2f818a089c6c5f08ad6f6e1401d810cdbc648a0a11f709a417cd647612fd36e8ee3393b91d39b558e04d1b2af7af70f17dd2f0e95b92ab6e72
+AUX quassel-irssi-0_p20170107-tls-ssl-rename.patch 1017 SHA256 6279ae5575a3bc3ac45790478f60d57f4d9582077d5a356077f548eee25f97fc SHA512 33d4e78d9872a24819a8b653d2d635992377ab3b6b1b990af5b14381be109a11c8a139e3fc578090dbf2bee6f1b3b5d26847f2dc1fbfcb5c4c42f52192f08d93 WHIRLPOOL e49620fed909e333a229c37a5dc5797a5ce98eaa0917936bb46213e3c61c00a53340983f15174b4c5e7c477ebe27fd27b85819a59c100d487e26248db966324b
+DIST quassel-irssi-0_p20170107-r1.zip 42745 SHA256 d159b7db11dbd741fbbc1569f3583301fc36697d5efb770696bb7f8813ce2e67 SHA512 1d7e4e15af2d73fd7e581c517384604a41b68e3a5152dcaf2776a20bc15b459e4a5a7caf39a9c06a11e65ad5d9fea0aa81fa001caa9060f55b821e12b4fed814 WHIRLPOOL a74b6452fe0cece5b63e326dc10522a45d6bbb7a80554027af52f8a8dd9a690d862ab75201f98260eed841b473cfc10bbe21ee78ec878f808c19e69156944c5e
+DIST quassel-irssi-0_p20170107.zip 42745 SHA256 d159b7db11dbd741fbbc1569f3583301fc36697d5efb770696bb7f8813ce2e67 SHA512 1d7e4e15af2d73fd7e581c517384604a41b68e3a5152dcaf2776a20bc15b459e4a5a7caf39a9c06a11e65ad5d9fea0aa81fa001caa9060f55b821e12b4fed814 WHIRLPOOL a74b6452fe0cece5b63e326dc10522a45d6bbb7a80554027af52f8a8dd9a690d862ab75201f98260eed841b473cfc10bbe21ee78ec878f808c19e69156944c5e
+EBUILD quassel-irssi-0_p20170107-r1.ebuild 1762 SHA256 f45c6ee8c991a3e7e93cdaf15a9832b217a53fc6d9b25c1e2156b7c43e99c35a SHA512 b4aaacfb00912017081c755bff069dfd34944062220ac6953589c754a3e2e669630947b3e630954cc46aad7c0a06d25c6b3c46aec642f0f7ada6de871f919796 WHIRLPOOL 745681f06b2047b9d821dcafe985d795c8ea9345111171b83b3a02780d28623a95b56f4021c6adbd1386f0a39db4288cf64a190111952025971d4e2289f804d2
+EBUILD quassel-irssi-0_p20170107.ebuild 1383 SHA256 c0d69319e833b8e730bc2ec28750e259d9742fdd91dd53afe58a74ddd71c855c SHA512 bffed91730d9e2f882766036ce81fc93f57c7cf7848b68466a319eb8d77ba35c443a6fafe90a587bdd09a2c8eb781c319b9fce4918ad60442bf4c5653e32ddbb WHIRLPOOL bd6a96ae7c1cf54ab1f1aff22227d4fa3ac9ca79689183646dff9448ebb1565ab61e6eab78647f4da2751be798b4ce6dc63844aac5b4732e5166cae5d075493d
+MISC ChangeLog 454 SHA256 b43e7aa1677bfe5cf479d016ca3ed1505c014691e3ce30467cea189e4a28c741 SHA512 cbc09fc8529c78cb935f27ba98a788de916b686acd8b8017e230fc2fd12d5a8139cb5c911be8563fed5d57c49dccbc870a592772aa1630f1e0e88f8caed2d899 WHIRLPOOL f4c6a266158ee873a73f2b5516b65d7e927d0614b896a8a2f6d91817bd284c498f9208db98e7ffc71944b941a0d54560dd8112d826e52ed1a2d85828e486b565
+MISC metadata.xml 557 SHA256 5613b558b7a5d8a5e77786da97ec90da47889937eddc5edf111aa47259b75b2a SHA512 4e9f077d0c9b6945e0fc66312ec7a264e5a7ba59039add39c2283debaf97ff71c921d016090ecbc27cdbba222672db8fc209fad11ededafe0354bbceaf068d78 WHIRLPOOL 0517ec1a7010dcd4421fcae8daae5935327f3998fc5da64d5f70aea53abc64ed0792b2c5c6d60281c60976c645e8e161764c395a1e7b642e33cd906ed369339e
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
new file mode 100644
index 000000000000..ddd96ff33316
--- /dev/null
+++ b/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-fix_build_with_irssi_1.0.patch
@@ -0,0 +1,38 @@
+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
new file mode 100644
index 000000000000..b38154ea0551
--- /dev/null
+++ b/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-tls-ssl-rename.patch
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 000000000000..508c6b3e1163
--- /dev/null
+++ b/net-irc/quassel-irssi/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>wraeth@gentoo.org</email>
+		<name>Sam Jorna</name>
+	</maintainer>
+	<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
new file mode 100644
index 000000000000..97d9cc73ba21
--- /dev/null
+++ b/net-irc/quassel-irssi/quassel-irssi-0_p20170107-r1.ebuild
@@ -0,0 +1,63 @@
+# 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/net-irc/quassel-irssi/quassel-irssi-0_p20170107.ebuild b/net-irc/quassel-irssi/quassel-irssi-0_p20170107.ebuild
new file mode 100644
index 000000000000..6a49ea9bf6f1
--- /dev/null
+++ b/net-irc/quassel-irssi/quassel-irssi-0_p20170107.ebuild
@@ -0,0 +1,55 @@
+# 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-0.8.21"
+DEPEND="${RDEPEND}
+	net-libs/quasselc"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+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."
+}