gentoo resync : 23.03.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-03-23 04:19:44 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-03-23 04:19:44 +0000
commit: c5283d322accc6097afec74eab24550829788bab (patch)
tree: b99ce668128d82a026eaa31461643f9173f9b77b /net-irc
parent: 5510d9d7d1c93c2ea71a2bd6f0666168808d5dd6 (diff)
23 files changed, 453 insertions, 222 deletions
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 01aaa190209c..a13f7d22abc2 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/emech/Manifest b/net-irc/emech/Manifest
index 52b078614ffd..59c3352b86f7 100644
--- a/net-irc/emech/Manifest
+++ b/net-irc/emech/Manifest
@@ -1,3 +1,6 @@
+AUX emech-3.0.99_p3-buildfix.patch 2732 BLAKE2B b5af908f431049c8e3f5d631477a62769ef578ec1b610182a71fdf0811d0da37b77601c4d2de78d4f78de6a7330488a5878b7c11612c85263fef1573a807a0c4 SHA512 40119107c596f29838474fd3828c08736abdbf0fdf069556da6842393e64a3514d2fbb31dbe8c267649e12bf9ec678295b07c725f11161da852dc285ef3c6151
 DIST emech-3.0.3.tar.gz 228709 BLAKE2B 596c2d757438e1ed08ecb96927258cbd1afcc6105831c336b5df4b22716fdeb2a3215678589c6d9898ad39979d6039cccb12f0af88183ac5fa1c9c1ce86c5102 SHA512 ffe478c0c1800c8afb7afca62dbe08fce6af25a5878ca5fb44bb1271a302d11b96263c51a3848996db8f33f1cdab60d86c26d571d6342fe1505d4dcff83803a3
+DIST emech-3.0.99p3.tar.gz 249209 BLAKE2B 8ff0806275f7b1c9e49bb2eeda2afa0ac94b894426a2f56508492f970070e4141f14f88ffb3c1c46855817c405d29454cf85ebba53c85b4038d7d9d079f4dff6 SHA512 8ce6f8889e060791ab3af6fa63623469a457c436b4e23c51dcd1833fd09e7692270a324ad1d15beb4ad390e9d481267a8ea60eb17c9fd3195b5ad0daf7341165
 EBUILD emech-3.0.3-r1.ebuild 1744 BLAKE2B bd0fb4258a8715b1e34a0f9c556fbdedf93693982cebcd298a7b599d0bf727ba3a756b7276e2b0af1f8258fcdd576cd355c34a17580107eb05e96490c0f04a08 SHA512 539b9210d9a03e16c3350d706fa6042fd3d16de8b57397b1c28ce39ef88f7d526d2c89da51ddb41085c915fc6a378a3bc7e705417aca88e177112563b6cd09a2
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD emech-3.0.99_p3.ebuild 1812 BLAKE2B 5f039acb2b736b7127b241bf56076dad6f9da55a1fea1726c7ae4630acab3ce79db938b20676c4430652b6cc61f26bc33396cd2e24b0adfba4cf32eed1407435 SHA512 ad3644c25d6c63b43a98e716044c59430e0c8bcb8db5307d14d0a3d03b81ed2386762628857cfdb12792fb73d4299c465c857fc74fc167817dbf48dfd6550632
+MISC metadata.xml 375 BLAKE2B 62804e73401c54751bf6394037337c2c93f95caedc8ada8ce64ff872e6c59622fb64ceabdd47df9f636de180c6bc08a75804be3a90791b6b646120470096a52a SHA512 19c676648690f2f4eac811f15d774ec9a85b9e1ce475944fd2d4dd9cca253bc10efd74f6988479f3d95828e56b790b1759002db272e8918768fba7b70f9f48a5
diff --git a/net-irc/emech/emech-3.0.99_p3.ebuild b/net-irc/emech/emech-3.0.99_p3.ebuild
new file mode 100644
index 000000000000..f083ab026f89
--- /dev/null
+++ b/net-irc/emech/emech-3.0.99_p3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="UNIX compatible IRC bot programmed in the C language"
+HOMEPAGE="http://www.energymech.net/"
+SRC_URI="http://www.energymech.net/files/${P/_/}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="debug session tcl"
+S="${WORKDIR}/${P/_/}"
+
+DOC_CONTENTS="You can find a compressed sample config file at /usr/share/doc/${PF}"
+
+src_prepare() {
+	eapply "${FILESDIR}/${P}-buildfix.patch"
+
+	sed -i \
+		-e 's: "help/":"/usr/share/energymech/help/":' \
+		-e 's: "messages/":"/usr/share/energymech/messages/":' \
+		src/config.h.in || die
+	# Respect CFLAGS and LDFLAGS
+	sed -i \
+		-e '/^LFLAGS/s/\$(PIPEFLAG)/\0 \$(OPTIMIZE) \$(LDFLAGS)/' \
+		-e '/^GDBFLAG/d' \
+		-e '/^PIPEFLAG/d' \
+		src/Makefile.in || die
+
+	eapply_user
+}
+
+myconf() {
+	echo ./configure $*
+	./configure $* || die "./configure failed"
+}
+
+src_configure() {
+	myconf \
+		--with-alias \
+		--with-botnet \
+		--with-bounce \
+		--with-ctcp \
+		--with-dccfile \
+		--with-dynamode \
+		--with-dyncmd \
+		--with-greet \
+		--with-ircd_ext \
+		--with-md5 \
+		--with-newbie \
+		--with-note \
+		--with-notify \
+		--with-rawdns \
+		--with-redirect \
+		--with-seen \
+		--with-stats \
+		--with-telnet \
+		--with-toybox \
+		--with-trivia \
+		--without-uptime \
+		--with-web \
+		--with-wingate \
+		--without-profiling \
+		$(use_with tcl) \
+		$(use_with session) \
+		$(use_with debug)
+}
+
+src_compile() {
+	emake -C src CC="$(tc-getCC)" OPTIMIZE="${CFLAGS}"
+}
+
+src_install() {
+	dobin src/energymech
+
+	insinto /usr/share/energymech
+	doins -r help
+
+	insinto /usr/share/energymech/messages
+	doins messages/*.txt
+
+	dodoc sample.* README* TODO VERSIONS CREDITS checkmech
+	readme.gentoo_create_doc
+}
diff --git a/net-irc/emech/files/emech-3.0.99_p3-buildfix.patch b/net-irc/emech/files/emech-3.0.99_p3-buildfix.patch
new file mode 100644
index 000000000000..de1dee6ed673
--- /dev/null
+++ b/net-irc/emech/files/emech-3.0.99_p3-buildfix.patch
@@ -0,0 +1,70 @@
+diff -Naur emech-3.0.99p3.org/src/gencmd.c emech-3.0.99p3/src/gencmd.c
+--- emech-3.0.99p3.org/src/gencmd.c	2009-05-13 08:51:09.000000000 -0000
++++ emech-3.0.99p3/src/gencmd.c	2018-03-16 22:52:42.591033854 -0000
+@@ -316,7 +316,7 @@
+ 			}
+ 			if (pass == __struct_acces)
+ 			{
+-				printf("\t%i,\t/""* %s *""/\n",
++				printf("\t%li,\t/""* %s *""/\n",
+ 					pre_mcmd[wh].flags & CLEVEL,
+ 					pt);
+ 			}
+@@ -390,7 +390,7 @@
+ 		}
+ 		pass--;
+ 	}
+-	printf("#define LOCALHOST_ULONG %lu\n",inet_addr("127.1"));
++	printf("#define LOCALHOST_ULONG %u\n",inet_addr("127.1"));
+ 	printf("#else /""* MAIN_C *""/\n\n");
+ 	printf("extern OnMsg mcmd[];\n");
+ 	printf("extern OnMsg_access acmd[];\n\n");
+@@ -404,29 +404,29 @@
+ 
+ #ifdef BOTNET
+ 	combo.comboflags = 0; combo.x.noshare = 1;
+-	fprintf(of,"#define COMBO_NOSHARE\t0x%x\n",combo.comboflags);
++	fprintf(of,"#define COMBO_NOSHARE\t0x%lx\n",combo.comboflags);
+ 	combo.comboflags = 0; combo.x.readonly = 1;
+-	fprintf(of,"#define COMBO_READONLY\t0x%x\n",combo.comboflags);
++	fprintf(of,"#define COMBO_READONLY\t0x%lx\n",combo.comboflags);
+ #endif /* BOTNET */
+ 
+ #ifdef GREET
+ 	combo.comboflags = 0; combo.x.greetfile = 1;
+-	fprintf(of,"#define COMBO_GREETFILE\t0x%x\n",combo.comboflags);
++	fprintf(of,"#define COMBO_GREETFILE\t0x%lx\n",combo.comboflags);
+ 	combo.comboflags = 0; combo.x.randline = 1;
+-	fprintf(of,"#define COMBO_RANDLINE\t0x%x\n",combo.comboflags);
++	fprintf(of,"#define COMBO_RANDLINE\t0x%lx\n",combo.comboflags);
+ #endif /* GREET */
+ 
+ #ifdef BOUNCE
+ 	combo.comboflags = 0; combo.x.bounce = 1;
+-	fprintf(of,"#define COMBO_BOUNCE\t0x%x\n",combo.comboflags);
++	fprintf(of,"#define COMBO_BOUNCE\t0x%lx\n",combo.comboflags);
+ #endif /* BOUNCE */
+ 
+ 	combo.comboflags = 0; combo.x.echo = 1;
+-	fprintf(of,"#define COMBO_ECHO\t0x%x\n",combo.comboflags);
++	fprintf(of,"#define COMBO_ECHO\t0x%lx\n",combo.comboflags);
+ 	combo.comboflags = 0; combo.x.aop = 1;
+-	fprintf(of,"#define COMBO_AOP\t0x%x\n",combo.comboflags);
++	fprintf(of,"#define COMBO_AOP\t0x%lx\n",combo.comboflags);
+ 	combo.comboflags = 0; combo.x.avoice = 1;
+-	fprintf(of,"#define COMBO_AVOICE\t0x%x\n",combo.comboflags);
++	fprintf(of,"#define COMBO_AVOICE\t0x%lx\n",combo.comboflags);
+ 
+ 	fclose(of);
+ 	return(0);
+diff -Naur emech-3.0.99p3.org/src/function.c emech-3.0.99p3/src/function.c
+--- emech-3.0.99p3.org/src/function.c	2009-05-17 20:25:29.000000000 -0000
++++ emech-3.0.99p3/src/function.c	2018-03-17 11:41:15.224075216 -0000
+@@ -26,6 +26,7 @@
+ #include "global.h"
+ #include "h.h"
+ #include "text.h"
++#include "linux/limits.h"
+ 
+ LS char timebuf[24];		/* max format lentgh == 20+1, round up to nearest longword -> 24 */
+ LS char idlestr[36];		/* max format lentgh == 24+1, round up to nearest longword -> 28 */
diff --git a/net-irc/emech/metadata.xml b/net-irc/emech/metadata.xml
index 6f49eba8f496..d376f2bcd4b1 100644
--- a/net-irc/emech/metadata.xml
+++ b/net-irc/emech/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>dawid.weglinski@gmail.com</email>
+		<name>Dawid Węgliński</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index a5bdd6c42493..ca6ff7da43fc 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -5,6 +5,6 @@ DIST hexchat-2.12.4.tar.xz 1451468 BLAKE2B 91db1486b421f9707f9dddfe8aba812aa283d
 DIST hexchat-2.14.1.tar.xz 1281872 BLAKE2B e450fe7391b8b51a7aebeaeacdb5f1fb6c00184f668813920d98ed6a00dd4c0308863657467b7608987feb0739ac85256d93ca9ef8a220e6c7a5545d8386f25d SHA512 2728d6f084530c1a65ddb7960db6574fef2bca77e726a2155c8b5724256f37b47421e990b1bf7c9fad7987027b2f6de4534a8df28a98cb3d28da726e16ac32dd
 EBUILD hexchat-2.12.4-r1.ebuild 3609 BLAKE2B f1d3828bb8e4a9c1315fe2ad0e4abd2e3da682ee95882ccbfb5bbe546df994208750a8d628b55198d281678a61da583a938423561145a10a1cf08d622877befb SHA512 84c8fb88e9cfe25ac42f255c5fd1dd73d096ebb6e1f50ccd0bcff394b5c3f90791cf2d8841ae1ae2192422f0658d0825c01cee8a83a8583c590ddafaa6365c87
 EBUILD hexchat-2.12.4-r2.ebuild 3408 BLAKE2B ecaf76967360e6720de5018b2a8b8d354db06ead38bda2559871a87e15d2afa945580c226fafd32cc39c8ec3743d2eae972dbdecb7e5ea98e5a9a7f1de51e61b SHA512 9c93c3e0d39d911af72af03d9156b1f13dec40e22881ed8913db3b276ed3888472cfca59c0ec51ba779b58fecb49bf7c84f3e936a8dd1cc3e31257aa5ef9281e
-EBUILD hexchat-2.14.1.ebuild 3443 BLAKE2B fcf72f8550c673216c1b4944bfcfa457f67cbe5e15f62ca6aa0bb91668f760dd3f9229080c2ab6a3adb3eb11877163d4f11fd851f24b564feab45968f9852e8c SHA512 444e169ef4b544e5e7cc3d4fa1b6d59cfe686d1ad46f81aed3704de9695bb8db285bc787c8a45261b723853c952a61f736eb5a453a5e744a69f54f88fcb152fc
-EBUILD hexchat-9999.ebuild 3443 BLAKE2B fcf72f8550c673216c1b4944bfcfa457f67cbe5e15f62ca6aa0bb91668f760dd3f9229080c2ab6a3adb3eb11877163d4f11fd851f24b564feab45968f9852e8c SHA512 444e169ef4b544e5e7cc3d4fa1b6d59cfe686d1ad46f81aed3704de9695bb8db285bc787c8a45261b723853c952a61f736eb5a453a5e744a69f54f88fcb152fc
+EBUILD hexchat-2.14.1.ebuild 3435 BLAKE2B f052fd4f3669d2b6c338d1beba29d1fcfa9c2fbdd6ebf132e7f9b0c671aa7c196d1165647d20ee1ae40dc1c80d9ad73001afff22ad0f572c120d75e7287ae0ce SHA512 e4a263fedce93d34f9bfee8e270c8dca04108ea08272628462124a7e13feb54e038747522cc70b322976da0e599aa79de90478602f4081b7713c0d3ca770b8bb
+EBUILD hexchat-9999.ebuild 3435 BLAKE2B f052fd4f3669d2b6c338d1beba29d1fcfa9c2fbdd6ebf132e7f9b0c671aa7c196d1165647d20ee1ae40dc1c80d9ad73001afff22ad0f572c120d75e7287ae0ce SHA512 e4a263fedce93d34f9bfee8e270c8dca04108ea08272628462124a7e13feb54e038747522cc70b322976da0e599aa79de90478602f4081b7713c0d3ca770b8bb
 MISC metadata.xml 1270 BLAKE2B e7fa8f9ec799b0448b1b1746dc8e076050cc057a04234dc1aa45e77632d0e466443a3bfe0cc2f537fc1bbba91cbb11117377778336e520255120fed3498cdabe SHA512 bf21e165f0b91ee73edf979e59149723d62e7032a8087ec3ea164c1075bf7d7ebc658d15d44e05f682bef26b85ca24b27143446c9e8cf40dc97a6b29ef3932ea
diff --git a/net-irc/hexchat/hexchat-2.14.1.ebuild b/net-irc/hexchat/hexchat-2.14.1.ebuild
index 13d777d04033..b35c166c0a0d 100644
--- a/net-irc/hexchat/hexchat-2.14.1.ebuild
+++ b/net-irc/hexchat/hexchat-2.14.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit gnome2-utils meson mono-env python-single-r1 xdg-utils
 
diff --git a/net-irc/hexchat/hexchat-9999.ebuild b/net-irc/hexchat/hexchat-9999.ebuild
index 13d777d04033..b35c166c0a0d 100644
--- a/net-irc/hexchat/hexchat-9999.ebuild
+++ b/net-irc/hexchat/hexchat-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit gnome2-utils meson mono-env python-single-r1 xdg-utils
 
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index bbc4b9c0d29e..845fbab33b3b 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,4 +1,5 @@
+AUX konversation-1.7.4-qt-5.11.patch 766 BLAKE2B 1293fcd2bc9e7936ce7d181ae4282a4a475a7203dc2114000f76286d17c0c087d3d05582298b9104550ce42639e3f19a836e01ef49111cdd99e467f0519548ca SHA512 aac2d523c42a2578ddb202e34592bbb8371eebf603a60902ba4a8dd3f4973eba41ee89ca8a85996231a94a7b5a1eaaac2f44d2bd03c38a872addcdef0161afcb
 AUX konversationrc 350 BLAKE2B 7670666f4d36cc9b0ba303890dd1f1d3b5f331070f3982e73b2ff82aae17257f9d1aaf584ac2cfb751c4457eeee09f14c73740aa700371f06a40e045c4c47398 SHA512 29e77d6e00953ca1a11ebd21defed8b2fd49762208ca757477f4409f611815049d54a16e82c545cdd46fee0e2d88dbdbd3a4fd61fa421eff3482737009ad5731
 DIST konversation-1.7.4.tar.xz 3737732 BLAKE2B 585ce998bba94fe928c40c41e360d2dbdf5b5f2be586f8dcbf543c4e4c9a6ff8df428c325d638e21c0b54ae2d82875d2cc53e38f8abb01827428652b138ff600 SHA512 8d30fc0c0e533f1fa3268f8360eb5b9321b505fca3103ce189f707247345b2b2c409f590ce45d6fb129a76fc642a4e9f6a802c244a0a3e56aded422ddf4ed19a
-EBUILD konversation-1.7.4.ebuild 1757 BLAKE2B 7c8d856817af536036d5b20905a3d400766177f9d3433e5385e045d957e063d197d54f3924e3019e5f37a4d6256e99f913b4a72accb0db163a0c793985a8a52c SHA512 6108c9c797e413c44bca4a3a570c820fa0184c6d7ade4c0f79671cb58ba164fd84e32a3e65ed98d8259c79827c3e5a71f25c2a50ce1dc7b68cbb6be408447d69
+EBUILD konversation-1.7.4-r1.ebuild 1806 BLAKE2B 633fbbf53552962518ba9200a7b42f9c9aac1ee82efc7578b31b5fa0b9fce17c15239e2c02606b91a2a8b6824c81341b7c275ed244bed130c0c8e7fc7aca4b8f SHA512 bd938ea0ca5df8c615319b5e3ba0b36ffb2e0283ccac6b1a2fbc6198d307350b5592d98c93418840e96f32b9e220621d5ec285750dc8459ba6cf32a8c8890b40
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-irc/konversation/files/konversation-1.7.4-qt-5.11.patch b/net-irc/konversation/files/konversation-1.7.4-qt-5.11.patch
new file mode 100644
index 000000000000..46508bf20a23
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.4-qt-5.11.patch
@@ -0,0 +1,27 @@
+From 5740a0fdb6805c2e26dce20555a946da8485fe50 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Mon, 19 Mar 2018 17:13:30 +0100
+Subject: [PATCH] Fix build with Qt 5.11 (missing QTabWidget)
+
+Reviewers: #konversation
+
+Differential Revision: https://phabricator.kde.org/D11490
+---
+ src/dcc/transferdetailedinfopanel.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/dcc/transferdetailedinfopanel.h b/src/dcc/transferdetailedinfopanel.h
+index e8debbc0..0e7391de 100644
+--- a/src/dcc/transferdetailedinfopanel.h
++++ b/src/dcc/transferdetailedinfopanel.h
+@@ -16,6 +16,7 @@
+ #include "ui_transferdetailedinfopanelui.h"
+ #include "ui_transferdetailedtimeinfopanelui.h"
+ 
++#include <QTabWidget>
+ 
+ class QTimer;
+ 
+-- 
+2.16.2
+
diff --git a/net-irc/konversation/konversation-1.7.4.ebuild b/net-irc/konversation/konversation-1.7.4-r1.ebuild
index bedb2f5c384a..d16bd9092d16 100644
--- a/net-irc/konversation/konversation-1.7.4.ebuild
+++ b/net-irc/konversation/konversation-1.7.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -47,13 +47,15 @@ DEPEND="
 	$(add_qt_dep qtxml)
 	media-libs/phonon[qt5(+)]
 	sys-devel/gettext
-	crypt? ( app-crypt/qca:2[qt5] )
+	crypt? ( app-crypt/qca:2[qt5(+)] )
 "
 RDEPEND="${DEPEND}
 	!net-irc/konversation:4
 	crypt? ( app-crypt/qca:2[ssl] )
 "
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package crypt Qca-qt5)
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 11ae89262ff8..805e19de8ee1 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -5,6 +5,7 @@ AUX quasselcore.init 1744 BLAKE2B 6d79a5889f11bfb870192078675938c259d8face81c9dd
 AUX quasselcore.init-r1 492 BLAKE2B 568e41c649875fc9e334b54f341dc9f95295e37d1c350ac3356b1e92859786a242da52103acb4692bd32d647983d2b5a758b847db66041791dac5bf531cf448a SHA512 6b050c6bafa2c49ab92f8e7c77be3c6868b58040b4df8b2cc3bbc217c4bf9d69fa63a7efe9e1c9e3b055de170d79af6470fa58828c5291e0b3d6b6eb7044aff3
 AUX quasselcore.service 189 BLAKE2B a115a98b17f4e59f2bbae584ac998cb16729977b617feb7b76696fcb682c1bc2d88cc40847ed1b20dce04dd8702b86a406ce0117304501c203453d1d30667e47 SHA512 3f0e15582dca70ca11beddb50aa6c6d993d4283ff89dc83a84b1acf2c0d2edba306fdab30eb05937f363cf507e34b7f884e0852d88be68748b68ac7b4013b776
 DIST quassel-0.12.4.tar.bz2 3742639 BLAKE2B 855caaf3eb5373008dc3c6f673b68aa1bbb601541ba5eb6c9402f421ec6b1dc933c58785181ca8b3f2fd899ba91a873458ede06f0fda2a3e970980f395742be2 SHA512 66bc12a9634534e6492787172a199c774ef1642d1ddb268c24ed96608698628bca7b278021a006a4db76783b19b1e1dead9d019bb8a6cbe1e12b8857792e7b92
+EBUILD quassel-0.12.4-r1.ebuild 4896 BLAKE2B c85bafef6e7893295d2338d9d9bc36d7e1bf52bb03d6ae9b6fff70ce6e43b7c1dd2053c87933056c3f49fc2b1cb9e3f9c328929017977f12db77c8b31cb2a411 SHA512 784654af53e00e7845d6213228a1f37c6ec9322decd1160f24d491ab2e54bae013e3274641cbe31eb4cf85b71939fd46e5b59d01677270a33ba967a01adf5acc
 EBUILD quassel-0.12.4.ebuild 4724 BLAKE2B 2b5be22d3e552e9a94925c4e67cf50be43003fb5bcccfa988e4b0ea5dafa3374d3702222ceb467dece1ae87599c7886c210556739be0067351e3acbcdafa69cc SHA512 1612344383ea25f8cdb45464d87cfb594f1685adcf26e48582772e1e2a8464ed0194ad37ff00368483df47d37377f4c01100c32533f8c6590e2f924452d00a96
-EBUILD quassel-9999.ebuild 4776 BLAKE2B d746973a5f52ef9a8575af1531c89a455ef9fa1453637f7ea13916369f6464422fdc9105ed32948ee362af8bc6d252f797189332afae3a7da70b2e08b6472a71 SHA512 cef831488a2332453455821593867efcfe341464a8a971408815c1af7c374f01bd31eb52a9e9baf6a3ce0215b51962f0e0ae4dcaa1a598ccaaeb73566ba8e773
+EBUILD quassel-9999.ebuild 4911 BLAKE2B b71e42a3edac3fdf46d5fdfe38e2253ba8bde4ab9b4b8ed7d8fb06b3451824ac9d9eb1f16520b2354d35ec0b4bf8012597338f89aad46ad8efd2577213f5375f SHA512 3dcc2a9c74b23c24e76de3ae9cd876f5b1591af8faac6bd1ec6b7707b1d106dfdbaeeefd03a0d6cc52ad213c7a766b82f599dc35be2c136b8874ee67e48f3768
 MISC metadata.xml 1942 BLAKE2B 1a23788288146f7149de03e99463403ae7d365df1fd421fc85af9c3bee4ebc5a2575c94958b570f32bb8fb056461a879cf4e80d65063ef0f2ba124d2305f4f10 SHA512 abf82cf9fe2bd552c1b26591e20da212cc3a118f6fb4ac92df8340d6ad5c7b6757e9290f8c6e8175dd95384b385dfd0399d6693d7fe6dc480b5a6d6f9b851d05
diff --git a/net-irc/quassel/quassel-0.12.4-r1.ebuild b/net-irc/quassel/quassel-0.12.4-r1.ebuild
new file mode 100644
index 000000000000..a2f11472cf41
--- /dev/null
+++ b/net-irc/quassel/quassel-0.12.4-r1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils pax-utils systemd user versionator
+
+EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" "git://git.${PN}-irc.org/${PN}" )
+[[ "${PV}" == "9999" ]] && inherit git-r3
+
+DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
+HOMEPAGE="http://quassel-irc.org/"
+[[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
+SLOT="0"
+IUSE="crypt dbus debug kde monolithic phonon postgres +server
+snorenotify +ssl syslog webkit X"
+
+SERVER_RDEPEND="
+	dev-qt/qtscript:5
+	crypt? ( app-crypt/qca:2[qt5(+),ssl] )
+	postgres? ( dev-qt/qtsql:5[postgres] )
+	!postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
+	syslog? ( virtual/logger )
+"
+
+GUI_RDEPEND="
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dbus? (
+		>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
+		dev-qt/qtdbus:5
+	)
+	kde? (
+		kde-frameworks/kconfigwidgets:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/knotifications:5
+		kde-frameworks/knotifyconfig:5
+		kde-frameworks/ktextwidgets:5
+		kde-frameworks/kwidgetsaddons:5
+		kde-frameworks/kxmlgui:5
+		kde-frameworks/sonnet:5
+	)
+	phonon? ( media-libs/phonon[qt5(+)] )
+	snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
+	webkit? ( dev-qt/qtwebkit:5 )
+"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5[ssl?]
+	sys-libs/zlib
+	monolithic? (
+		${SERVER_RDEPEND}
+		${GUI_RDEPEND}
+	)
+	!monolithic? (
+		server? ( ${SERVER_RDEPEND} )
+		X? ( ${GUI_RDEPEND} )
+	)
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	kde-frameworks/extra-cmake-modules
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+REQUIRED_USE="
+	|| ( X server monolithic )
+	crypt? ( || ( server monolithic ) )
+	dbus? ( || ( X monolithic ) )
+	kde? ( || ( X monolithic ) dbus phonon )
+	phonon? ( || ( X monolithic ) )
+	postgres? ( || ( server monolithic ) )
+	snorenotify? ( || ( X monolithic ) )
+	syslog? ( || ( server monolithic ) )
+	webkit? ( || ( X monolithic ) )
+"
+
+pkg_setup() {
+	if use server; then
+		QUASSEL_DIR=/var/lib/${PN}
+		QUASSEL_USER=${PN}
+		# create quassel:quassel user
+		enewgroup "${QUASSEL_USER}"
+		enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" "${QUASSEL_USER}"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_QT5=ON
+		-DEMBED_DATA=OFF
+		-DCMAKE_SKIP_RPATH=ON
+		$(cmake-utils_use_find_package crypt QCA2-QT5)
+		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
+		$(cmake-utils_use_find_package dbus Qt5DBus)
+		-DWITH_KDE=$(usex kde)
+		-DWITH_OXYGEN=$(usex !kde)
+		-DWANT_MONO=$(usex monolithic)
+		$(cmake-utils_use_find_package phonon Phonon4Qt5)
+		-DWANT_CORE=$(usex server)
+		$(cmake-utils_use_find_package snorenotify LibsnoreQt5)
+		-DWITH_WEBKIT=$(usex webkit)
+		-DWANT_QTCLIENT=$(usex X)
+	)
+
+	# Something broke upstream detection since Qt 5.5
+	if use ssl ; then
+		mycmakeargs+=( "-DHAVE_SSL=TRUE" )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use server ; then
+		# needs PAX marking wrt bug#346255
+		pax-mark m "${ED}/usr/bin/quasselcore"
+
+		# prepare folders in /var/
+		keepdir "${QUASSEL_DIR}"
+		fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
+
+		# init scripts & systemd unit
+		newinitd "${FILESDIR}"/quasselcore.init-r1 quasselcore
+		newconfd "${FILESDIR}"/quasselcore.conf-r1 quasselcore
+		systemd_dounit "${FILESDIR}"/quasselcore.service
+
+		# logrotate
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/quassel.logrotate" quassel
+	fi
+}
+
+pkg_postinst() {
+	if use monolithic && use ssl ; then
+		elog "Information on how to enable SSL support for client/core connections"
+		elog "is available at http://bugs.quassel-irc.org/projects/quassel-irc/wiki/Client-Core_SSL_support."
+	fi
+
+	if use server; then
+		einfo "If you want to generate SSL certificate remember to run:"
+		einfo "	emerge --config =${CATEGORY}/${PF}"
+	fi
+
+	if use server || use monolithic ; then
+		einfo "Quassel can use net-misc/oidentd package if installed on your system."
+		einfo "Consider installing it if you want to run quassel within identd daemon."
+	fi
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
+
+pkg_config() {
+	if use server && use ssl; then
+		# generate the pem file only when it does not already exist
+		if [ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]; then
+			einfo "Generating QUASSEL SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\""
+			openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
+				-keyout "${QUASSEL_DIR}/quasselCert.pem" \
+				-out "${QUASSEL_DIR}/quasselCert.pem"
+			# permissions for the key
+			chown ${QUASSEL_USER}:${QUASSEL_USER} "${QUASSEL_DIR}/quasselCert.pem"
+			chmod 400 "${QUASSEL_DIR}/quasselCert.pem"
+		else
+			einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists."
+			einfo "Remove it if you want to create new one."
+		fi
+	fi
+}
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index bf4fa999424a..1f9e3e14eea2 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils eutils pax-utils systemd user
+inherit cmake-utils gnome2-utils pax-utils systemd user
 
 EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" "git://git.${PN}-irc.org/${PN}" )
 [[ "${PV}" == "9999" ]] && inherit git-r3
@@ -13,9 +13,10 @@ HOMEPAGE="http://quassel-irc.org/"
 [[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2"
 
 LICENSE="GPL-3"
-SLOT="0"
 KEYWORDS=""
-IUSE="+breeze crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify +ssl syslog urlpreview X"
+SLOT="0"
+IUSE="+breeze crypt +dbus debug kde ldap monolithic oxygen postgres +server
+snorenotify +ssl syslog urlpreview X"
 
 SERVER_RDEPEND="
 	dev-qt/qtscript:5
@@ -73,7 +74,7 @@ DOCS=( AUTHORS ChangeLog README.md )
 REQUIRED_USE="
 	|| ( X server monolithic )
 	crypt? ( || ( server monolithic ) )
-	kde? ( || ( X monolithic ) )
+	kde? ( || ( X monolithic ) dbus )
 	ldap? ( || ( server monolithic ) )
 	monolithic? ( || ( breeze oxygen ) )
 	postgres? ( || ( server monolithic ) )
@@ -96,21 +97,22 @@ src_configure() {
 	local mycmakeargs=(
 		-DUSE_QT4=OFF
 		-DUSE_QT5=ON
-		-DWANT_CORE=$(usex server)
-		-DWANT_MONO=$(usex monolithic)
-		-DWANT_QTCLIENT=$(usex X)
-		-DWITH_KDE=$(usex kde)
-		-DWITH_LDAP=$(usex ldap)
-		-DWITH_WEBKIT=OFF
-		-DWITH_WEBENGINE=$(usex urlpreview)
 		-DWITH_BREEZE=OFF
+		-DWITH_WEBKIT=OFF
 		-DWITH_BREEZE_DARK=OFF
 		-DWITH_OXYGEN=OFF
 		-DEMBED_DATA=OFF
 		-DCMAKE_SKIP_RPATH=ON
 		$(cmake-utils_use_find_package crypt QCA2-QT5)
 		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
+		$(cmake-utils_use_find_package dbus Qt5DBus)
+		-DWITH_KDE=$(usex kde)
+		-DWITH_LDAP=$(usex ldap)
+		-DWANT_MONO=$(usex monolithic)
+		-DWANT_CORE=$(usex server)
 		$(cmake-utils_use_find_package snorenotify LibsnoreQt5)
+		-DWITH_WEBENGINE=$(usex urlpreview)
+		-DWANT_QTCLIENT=$(usex X)
 	)
 
 	cmake-utils_src_configure
@@ -128,8 +130,8 @@ src_install() {
 		fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
 
 		# init scripts & systemd unit
-		newinitd "${FILESDIR}"/quasselcore.init quasselcore
-		newconfd "${FILESDIR}"/quasselcore.conf quasselcore
+		newinitd "${FILESDIR}"/quasselcore.init-r1 quasselcore
+		newconfd "${FILESDIR}"/quasselcore.conf-r1 quasselcore
 		systemd_dounit "${FILESDIR}"/quasselcore.service
 
 		# logrotate
@@ -153,6 +155,12 @@ pkg_postinst() {
 		einfo "Quassel can use net-misc/oidentd package if installed on your system."
 		einfo "Consider installing it if you want to run quassel within identd daemon."
 	fi
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
 }
 
 pkg_config() {
diff --git a/net-irc/sic/Manifest b/net-irc/sic/Manifest
index 5b98d43d036a..5a8047c882e4 100644
--- a/net-irc/sic/Manifest
+++ b/net-irc/sic/Manifest
@@ -1,4 +1,3 @@
 DIST sic-1.2.tar.gz 4563 BLAKE2B 63c70aa6e6e9da4c7c0a282ca1a407b9b9c4d02e764490a8b7ff1967a848ffe78c52700e6e895252c0807212eb80e0baeca5b338ead8da4ea9a0946d81b8c5b8 SHA512 5659ed9d8a5986dda90dbe1155c27a5fd0ab4b1fcad2c1a20997c530bf03864e6c08bdeffc025c728629ab11872af6a1250761160b91f148dc37d77a49046dc9
-EBUILD sic-1.2-r1.ebuild 652 BLAKE2B de2d6f276302938f27f8d9ce47df788edd364c95adc1f61a16564641f31d25667293a914daa8b115762017f80ae6925f6443281907544c692f03e9a1105b1bd4 SHA512 38f27581bd4c2653197956c1489aeaa9d715bbaecf91bd37acf7b922de08ba763ca5fb075bc440e3c0acaa3d5224fb06d16f71aadc199c15b6c1a75426d5f76e
-EBUILD sic-1.2.ebuild 712 BLAKE2B 1841b11e55830e558d9b2d28dd3c08b002f84eef64b0e5a45fa7f5da82d6d2be155a7805c854a7b43a6077ef646145d8b7d3a62d2b26b1154f1f3ca3487475ba SHA512 98ee2e764e6e74a3d87306b29a2ec71e22bc7ed4d603072be4ff52ddf2448c0ac995c6b3d64dae944b138efa22b8a6d9c73288a8c2356887ea4a17b4bc91f225
+EBUILD sic-1.2-r1.ebuild 650 BLAKE2B 63536f28aee51558a80be521d215b9b4db7f70e2b2dbaee4bb04afc0f0f77180bc3608dc23de73f2768bf146c82a701d9756cb105be3419e76ec6455fa935a90 SHA512 2a64e1872772be8fd6a02664f95ffebfdfcfa1271fecfec8fa8953616fc599a073f9b6188d6598052b81ff08d7095a5be79ef7405ea74f685895e49a4ced798a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-irc/sic/sic-1.2-r1.ebuild b/net-irc/sic/sic-1.2-r1.ebuild
index 2056ef616516..89b916c4ce2b 100644
--- a/net-irc/sic/sic-1.2-r1.ebuild
+++ b/net-irc/sic/sic-1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 
 src_prepare() {
 	default
diff --git a/net-irc/sic/sic-1.2.ebuild b/net-irc/sic/sic-1.2.ebuild
deleted file mode 100644
index 67faf284d4f9..000000000000
--- a/net-irc/sic/sic-1.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit toolchain-funcs
-
-DESCRIPTION="An extremly simple IRC client"
-HOMEPAGE="https://tools.suckless.org/sic"
-SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
-
-src_prepare() {
-	sed -i \
-		-e "s/CFLAGS =/CFLAGS +=/g" \
-		-e "s/-Os//" \
-		-e "s/LDFLAGS = -s/LDFLAGS +=/" \
-		-e "/^LIBS =/d" \
-		-e "s/= cc/= $(tc-getCC)/g" \
-		config.mk || die "sed failed"
-
-	# enable verbose build
-	sed -i 's/@${CC}/${CC}/' Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-}
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 95798233beb8..708138909c0c 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,9 +1,8 @@
 AUX weechat-1.2-tinfo.patch 874 BLAKE2B 5b720aaf45d1ff7f7792ca21ff79919b258fe16cdb19c7c7892abd3d702c86911a2c46519b84d7d71db40d89158b3662c93327e382a342bd2146dab98f4cbaed SHA512 89b5689654a6bcb41c5ca9c0f579a1619ada2bf5a1f46ec7d9e8755786499fadff2ce30469d169a295692889c421aa365919a3a7b4c5092e0889def2564b1790
-DIST weechat-1.9.1.tar.xz 1877428 BLAKE2B e7595735547699cfb20f653bbe515555b5d7e772e1bc1aecb4e95f1f4fd402a315698790e961305daf7d0bd6c5f9f7889c00efdf115f7182287965428b79d469 SHA512 552e9248e86db7fe53cd6539084e6c5e8548b8858b27c02326d04925d81ef09e123225af5c1f5550b262be5a1249fd8750fdda8d9877c3df918cc30b5e0953fa
+AUX weechat-2.1-tinfo.patch 910 BLAKE2B 706949f07bac5e191e045bc6dfbb6e6b1dc4ec2e7347ff7c3f8b3f8af67e5d50b27a31368bf3d2a143eb7b0ec0dc0902fd787d803da8b604793d2b1b912e1dee SHA512 a1df83dc71c75047a8d898401551adc727df581b6e2a0fca366b67b380e688f95a375cdd9246cc4fff7a1cce22bf50e2bc3022a843e8994f8ee8660c7be77a15
 DIST weechat-2.0.1.tar.xz 1967336 BLAKE2B 256f4bab45834ed2798490234c9417b8b8e4d06d0ed09f5779ad9d32321ab9aec58c38f4b048de319e4f46809313186462208258ca2d78d1e0470fa2014e7472 SHA512 3947e79a0ac8dce7605905c39039bedf9ba2af4778ee6905f12ca75786b62f3081568ce9426be251e65bad2837ddcf0664cbb08059f898d4ac60171325a94e74
-DIST weechat-2.0.tar.xz 1967636 BLAKE2B b4ee37a7c8da4cd724ada44f454979326ec1186254d197c538de13c148b52988ddeff23d432240404516c8f81d8588347c6ea5313572b4815d716f80e82f85a4 SHA512 771618c09fb24182f86304af8c12e158e3d97afbc51219d1f4c5f9ec102aac15c4511a6301141d47f67e385f41bf0ba91e3df795ffdd78a19d1f6a5b1121e951
-EBUILD weechat-1.9.1.ebuild 3911 BLAKE2B cba02d1251dd464f059c096bba8aef464b6f767adea67b84bb364c5c95fc7947f601bfd7f048d232288db7930820079e739ba9943fe16a78f8c69a155eb43f6f SHA512 6683148f66aba87e8e662f607e76dacec46c28dbd76ce598a8c881fc9581bf8f92ae1e752656553479e96de5de870f4e9ebcd5b0059b06cf36ae41419f68d7f4
-EBUILD weechat-2.0.1.ebuild 4010 BLAKE2B 8e08f9a541cd0466342804f27bcd73fe3be1087dc2e2bbca7014ff55c16844ee1259df371598a6b96f2e77b13473c83f367e787101aa45fa8ac3e092f59f843c SHA512 4fff7e01f110cb1dfffa62365e877d62a8330b1d56a8f5bd23213d548d908f250b4db824305d85e0647f1659642d169f4e512a3abed5f412201ef9279f8dfadb
-EBUILD weechat-2.0.ebuild 4010 BLAKE2B 8e08f9a541cd0466342804f27bcd73fe3be1087dc2e2bbca7014ff55c16844ee1259df371598a6b96f2e77b13473c83f367e787101aa45fa8ac3e092f59f843c SHA512 4fff7e01f110cb1dfffa62365e877d62a8330b1d56a8f5bd23213d548d908f250b4db824305d85e0647f1659642d169f4e512a3abed5f412201ef9279f8dfadb
-EBUILD weechat-9999.ebuild 4010 BLAKE2B 8e08f9a541cd0466342804f27bcd73fe3be1087dc2e2bbca7014ff55c16844ee1259df371598a6b96f2e77b13473c83f367e787101aa45fa8ac3e092f59f843c SHA512 4fff7e01f110cb1dfffa62365e877d62a8330b1d56a8f5bd23213d548d908f250b4db824305d85e0647f1659642d169f4e512a3abed5f412201ef9279f8dfadb
+DIST weechat-2.1.tar.xz 1990748 BLAKE2B 5f417e282fe0bc10f1625e16fc173c09781284c27cf321e219c73fcfb3bac4118403598d6e5d06ed9852b1bdb1e645d7f43999a113101aebe6bd626e2278b661 SHA512 4bea8c0c4467b81e2241d68e5c6425274f0fe15d853ddac46ddf3cce481e03549660d6083277719d462ec5d0dea4b31d89f6b3f51f92f12908213232d2d807df
+EBUILD weechat-2.0.1.ebuild 4008 BLAKE2B beeaa3a84bb98dc38ab099ab913c2897d14084460236dabb11314dad58d5a067a3ae9bb89df6bc0aa8be5200c334da308f63b01d6abf5e0df1aa222f4286b111 SHA512 42a7e08348d804d9f46ffe3274335510cf2b4d56303e706e2f73eae26ffa97804f52af8d29737cf5ddb7a7f299665aa7c661f0299f64d0bc7e2bc01556048c94
+EBUILD weechat-2.1.ebuild 4028 BLAKE2B e7958320fdec8faf91bfab3f11f33a58d97bbe28b0efd3f31a9e1bbf357f0c34b4c689a1a8d0781c67365051c6c04e291261674d01744ecebe8e7aaa3b977c2e SHA512 d2394b65e7e6836f9c50f431fa1d827574f20dddd89c6f1cd454d5dc3bcf98fee319655d426f61d67717062845bd9e434e94df74f3e5e4e44c7252c422865b43
+EBUILD weechat-9999.ebuild 4028 BLAKE2B e7958320fdec8faf91bfab3f11f33a58d97bbe28b0efd3f31a9e1bbf357f0c34b4c689a1a8d0781c67365051c6c04e291261674d01744ecebe8e7aaa3b977c2e SHA512 d2394b65e7e6836f9c50f431fa1d827574f20dddd89c6f1cd454d5dc3bcf98fee319655d426f61d67717062845bd9e434e94df74f3e5e4e44c7252c422865b43
 MISC metadata.xml 903 BLAKE2B 74f1e6930fb209c9d74ca9ff7a8c0b82900c8aac369612ef4c16cc4393fabe24770bc1734d20b261dfcfc021259e1df9e555e1d53605296e0847939d3ce41c40 SHA512 26d85549cc0b0e61cb576a50740cd289432dca90ff92e0d0162a430ff89959233aa002dee0018780e51607cdae85a866ac6db77fe22d2c8631590a33a05ff5d5
diff --git a/net-irc/weechat/files/weechat-2.1-tinfo.patch b/net-irc/weechat/files/weechat-2.1-tinfo.patch
new file mode 100644
index 000000000000..e44e06e61f99
--- /dev/null
+++ b/net-irc/weechat/files/weechat-2.1-tinfo.patch
@@ -0,0 +1,28 @@
+Use pkgconfig to find ncurses libs in order to support separate libtinfo.
+
+--- weechat-2.1/src/gui/curses/normal/CMakeLists.txt
++++ weechat-2.1/src/gui/curses/normal/CMakeLists.txt
+@@ -29,7 +29,13 @@
+   ../gui-curses-window.c
+ )
+ 
+-find_package(Ncurses)
++find_package(PkgConfig)
++pkg_search_module(NCURSES ncursesw ncurses)
++
++if(NOT NCURSES_FOUND)
++  find_package(Ncurses)
++endif(NOT NCURSES_FOUND)
++
+ if(NCURSES_FOUND)
+   check_include_files(ncursesw/ncurses.h NCURSESW_HEADERS)
+   if(NCURSESW_HEADERS)
+@@ -54,7 +60,7 @@
+ 
+ add_dependencies(${EXECUTABLE} weechat_gui_curses_normal)
+ 
+-list(APPEND EXTRA_LIBS ${NCURSES_LIBRARY})
++list(APPEND EXTRA_LIBS ${NCURSES_LIBRARY} ${NCURSES_LIBRARIES})
+ 
+ # Due to circular references, we must link two times with libweechat_core.a and libweechat_gui_common.a
+ target_link_libraries(${EXECUTABLE} ${STATIC_LIBS} weechat_gui_curses_normal ${EXTRA_LIBS} ${STATIC_LIBS})
diff --git a/net-irc/weechat/weechat-1.9.1.ebuild b/net-irc/weechat/weechat-1.9.1.ebuild
deleted file mode 100644
index 39521532b3fc..000000000000
--- a/net-irc/weechat/weechat-1.9.1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit python-single-r1 cmake-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
-else
-	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
-	KEYWORDS="amd64 x86 ~x64-macos"
-fi
-
-DESCRIPTION="Portable and multi-interface IRC client"
-HOMEPAGE="https://weechat.org/"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-NETWORKS="+irc"
-PLUGINS="+alias +buflist +charset +exec +fifo +logger +relay +scripts +spell +trigger +xfer"
-# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
-SCRIPT_LANGS="guile lua +perl +python ruby tcl"
-LANGS=" cs de es fr hu it ja pl pt pt_BR ru tr"
-IUSE="doc nls +ssl test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/libgcrypt:0=
-	net-misc/curl[ssl]
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	charset? ( virtual/libiconv )
-	guile? ( >=dev-scheme/guile-2.0 )
-	lua? ( dev-lang/lua:0[deprecated] )
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
-	ssl? ( net-libs/gnutls )
-	spell? ( app-text/aspell )
-	tcl? ( >=dev-lang/tcl-8.4.15:0= )
-"
-DEPEND="${RDEPEND}
-	doc? (
-		>=dev-ruby/asciidoctor-1.5.4
-		dev-util/source-highlight
-	)
-	nls? ( >=sys-devel/gettext-0.15 )
-	test? ( dev-util/cpputest )
-"
-
-DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
-
-# tests need to be fixed to not use system plugins if weechat is already installed
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.2-tinfo.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# fix libdir placement
-	sed -i \
-		-e "s:lib/:$(get_libdir)/:g" \
-		-e "s:lib\":$(get_libdir)\":g" \
-		CMakeLists.txt || die "sed failed"
-
-	# install only required translations
-	local i
-	for i in ${LANGS} ; do
-		if ! has ${i} ${LINGUAS-${i}} ; then
-			sed -i \
-				-e "/${i}.po/d" \
-				po/CMakeLists.txt || die
-		fi
-	done
-
-	# install only required documentation ; en always
-	for i in $(grep add_subdirectory doc/CMakeLists.txt \
-			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
-		if ! has ${i} ${LINGUAS-${i}} ; then
-			sed -i \
-				-e '/add_subdirectory('${i}')/d' \
-				doc/CMakeLists.txt || die
-		fi
-	done
-
-	# install docs in correct directory
-	sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# fix linking error on Darwin
-		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
-			cmake/FindPython.cmake || die
-		# allow to find the plugins by default
-		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
-			src/core/wee-config.c || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_NCURSES=ON
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_LARGEFILE=ON
-		-DENABLE_ALIAS=$(usex alias)
-		-DENABLE_ASPELL=$(usex spell)
-		-DENABLE_BUFLIST=$(usex buflist)
-		-DENABLE_CHARSET=$(usex charset)
-		-DENABLE_EXEC=$(usex exec)
-		-DENABLE_FIFO=$(usex fifo)
-		-DENABLE_IRC=$(usex irc)
-		-DENABLE_LOGGER=$(usex logger)
-		-DENABLE_RELAY=$(usex relay)
-		-DENABLE_SCRIPT=$(usex scripts)
-		-DENABLE_SCRIPTS=$(usex scripts)
-		-DENABLE_PERL=$(usex perl)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_RUBY=$(usex ruby)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_TCL=$(usex tcl)
-		-DENABLE_GUILE=$(usex guile)
-		-DENABLE_JAVASCRIPT=OFF
-		-DENABLE_TRIGGER=$(usex trigger)
-		-DENABLE_XFER=$(usex xfer)
-		-DENABLE_DOC=$(usex doc)
-		-DENABLE_TESTS=$(usex test)
-	)
-
-	if use python; then
-		python_export PYTHON_LIBPATH
-		mycmakeargs+=(
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
-		)
-	fi
-
-	cmake-utils_src_configure
-}
diff --git a/net-irc/weechat/weechat-2.0.1.ebuild b/net-irc/weechat/weechat-2.0.1.ebuild
index dd1313a0c730..7aa8c2cf35ac 100644
--- a/net-irc/weechat/weechat-2.0.1.ebuild
+++ b/net-irc/weechat/weechat-2.0.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
 else
 	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86 ~x64-macos"
+	KEYWORDS="amd64 x86 ~x64-macos"
 fi
 
 DESCRIPTION="Portable and multi-interface IRC client"
diff --git a/net-irc/weechat/weechat-2.0.ebuild b/net-irc/weechat/weechat-2.1.ebuild
index dd1313a0c730..0c7c645e9a4c 100644
--- a/net-irc/weechat/weechat-2.0.ebuild
+++ b/net-irc/weechat/weechat-2.1.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 	perl? ( dev-lang/perl:= )
 	php? ( >=dev-lang/php-7.0:* )
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
+	ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
 	ssl? ( net-libs/gnutls )
 	spell? ( app-text/aspell )
 	tcl? ( >=dev-lang/tcl-8.4.15:0= )
@@ -59,7 +59,7 @@ DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.ado
 # tests need to be fixed to not use system plugins if weechat is already installed
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.2-tinfo.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.1-tinfo.patch )
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index dd1313a0c730..0c7c645e9a4c 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 	perl? ( dev-lang/perl:= )
 	php? ( >=dev-lang/php-7.0:* )
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
+	ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
 	ssl? ( net-libs/gnutls )
 	spell? ( app-text/aspell )
 	tcl? ( >=dev-lang/tcl-8.4.15:0= )
@@ -59,7 +59,7 @@ DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.ado
 # tests need to be fixed to not use system plugins if weechat is already installed
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.2-tinfo.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.1-tinfo.patch )
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
author	V3n3RiX <venerix@redcorelinux.org>	2018-03-23 04:19:44 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-03-23 04:19:44 +0000
commit	c5283d322accc6097afec74eab24550829788bab (patch)
tree	b99ce668128d82a026eaa31461643f9173f9b77b /net-irc
parent	5510d9d7d1c93c2ea71a2bd6f0666168808d5dd6 (diff)