gentoo resync : 18.05.2019

15 files changed, 6 insertions, 619 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index a8bb33bdf433..badfda56a1ba 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/epic5/Manifest b/net-irc/epic5/Manifest
index 22bff18fcacc..627239613849 100644
--- a/net-irc/epic5/Manifest
+++ b/net-irc/epic5/Manifest
@@ -1,13 +1,4 @@
-AUX epic5-1.1.10-ruby-automagic-as-needed.patch 4139 BLAKE2B 4b94005dec241bc7be23f4d844c4c33087929d5bb765a70a8cd421e028faa74502b7c6f4a4c822030e22e841b60e7fde9e4bd60f93aa5d6107c4103e5aecf3d1 SHA512 2aa7122a4192849eb3c99c567cc0ad3fb914c4ef17555aecdffeee2b3792f511c3cd43ba069163889705e7a64d04e0636aa0b77934f9605eacfa1ed8d53afa9d
-AUX epic5-1.1.10-socks5-libsocks.patch 933 BLAKE2B ab7b6f7d76f947c41caec9352d43020527e309b3dea3cda4625205c2deaa0e0d864d6919e3c5194fb31643759e5f3c3e8c7efc805627f9dfa4d815df88e5619d SHA512 2357fb29b9be7fb16be606da05b75475fcc092dd0dd54b4a7defe6f4d6847a4aa15db7aec2a3e5ca0f0fe2d0d16104eee78c92ee6ee5ddcf571f2a7ef239bbb0
-AUX epic5-1.1.10-tcl-automagic-as-needed.patch 3453 BLAKE2B efd48926297535ae927f470f17f104a4ffe8f6719acc2040dc49f1fb7a453c9a9a85f87ef64e77ee215abc7fa4b3c669c04c1ec5fd154575f1d4228f4082594f SHA512 845e2e2ff40ab0c5351bc995457060b19781b07285e7115013cf5dea7ba333f28b9c248dd66369fda8a6038ad4de4fb71fb1d77c5b51568667a491efaebd72df
-AUX epic5-1.1.10-without-localdir.patch 1780 BLAKE2B 97b29e5c3efd4f9048db52f501acfdb848eff53a987e9fa4bf573dfccace8965adcb98109a2fcfe401ac6e86cf319a3f9dc8873df123bd4acf9d529b4d1b76f5 SHA512 788683fe1448793a2d8a5e50dda3dfb0aef86c44cbec11ed0a92444967a1775050bdd3ac40c44989b6fce16a6e7db154aa26d4f4c6692538eca2e661d32af7a6
-AUX epic5-1.1.10-xlocale.patch 350 BLAKE2B 4c2fe87d2bd42bee7cea05ab3426403836bb43a8136ee49f62ffdce3efc40690300a024b46f502a820cc1945577641afe25fab154f2c5393556caedaad360a04 SHA512 bb04eb98d4ce1c4f1b02d7572ad6722e6ad90ab68b4d22319a2285888c039cbc51e837193f78a93fb59c2c2caceb8fcb11d1e6125a4bc4432eddc98ee9c3ba55
-AUX epic5-1.1.2-libarchive-automagic.patch 1707 BLAKE2B 94eb0be15058b7ce86fe6500337477729ab2b4ab792d8c100c941c1fd9ff8ff96982616c539ae41bda111b08c1792478e4f47e2ec44e6e84d800e5b5d3ee7fd9 SHA512 6f438cc70982538e09d9a0eef7e2c42c331aa73c279157d4bd44b48c6aea26b08b9433927a51fef025acf22bfeec330c4c99946538eae5dca50360963e5f828c
-AUX epic5-1.1.2-perl-automagic-as-needed.patch 3123 BLAKE2B b104b7ab792010e0113e8f4ef378a53dac2f64182e7045866e3d57176427a735ded0b3a3b7975fab892dfa77692589e7324c927206dfb7a636d7f9ad69950f90 SHA512 bd58fa5b49b0b9c900612d1183d696e6683113420f79702df0706a3bd3885bc6215a178a11ca9dff8c9337314cf72488b85217d731b162dea95f4c8e22d50a6c
 AUX epic5-2.0.1-openssl-1.1.patch 2817 BLAKE2B f3ed4fa602b174f41700fdf5fcddb8a20626637fb5e416b82fd1e1216a846987a3afcf3fffd73317a6e2090e49b0fe3b1777ee4e870f597ca981be078c4e3c0e SHA512 af1f822f1660bc7528beef26b991a69896d0e94005aacd412256a5f8789024bfba6eec169d2115c626a70c0e89cc6625999c7b939390742aef932f1020e4fdad
-DIST epic5-1.1.10.tar.bz2 851439 BLAKE2B 13cf0f78ed2009595479fac8173b2936cf74382ec22964e00de2d84fd89c6cee661e4ea9e3d8ba44ec715ac7e861f4639b3459d3ac2d67c74cc49ad4aeebf127 SHA512 d0215570962253a0d5c60dacec86db1094575b0765db039247cf16b5957ba721576618ff73588610ba528782f4460fd4bbe5a1869e60e2c10d832d41ea3c6048
 DIST epic5-2.0.1.tar.xz 808612 BLAKE2B 48bc1305f955f524e26b5a2122f061b0251b874ad102e3a95c65b15646f7d5c95f661bdbac3e6ea118ce5d5b5e3ca58a94cfce288ee32c7483ea6dc1b6d24950 SHA512 29721cb097946fae3d64f71be4047f8348f7821ccdea870b4c756098f07adee90f03decb2f37fc5fa5c7c9d1aac5a16f4944adc9c9bc66097ceb609c69da2e25
-EBUILD epic5-1.1.10-r2.ebuild 1849 BLAKE2B e8567259e61a5e33fb1930296900cad6ac23c82f1b099fec405cd5b3295ad72663547da7553ecad9996a1846ccb337c41068d3b609fa324fbf6a8f138531a751 SHA512 86703fe7e6f5eada432846b7cacde9a300a5f7ca008a2708e0a531e6797ac1a330987bd0484e133e0608858f97776f983c1b2a7e7a646f0c203e207186d51cae
-EBUILD epic5-2.0.1.ebuild 1564 BLAKE2B 0b0306d8f7f9276367844d986cedf578b25c882d606de7b697c90e19ac83d233bfe9aafafb9eded723a08a0e96d95296c77d51a1414aab1c45a04fea1dbf0f7b SHA512 e9809cd9a8a189b3166beca5511c3acfdd2e59ee1fdefbb50973120a62f714682e71a13be45bbfe1b92e1d57ed83a8b53e6efafa85939ccbdcc57741a2b4dbab
+EBUILD epic5-2.0.1.ebuild 1562 BLAKE2B 8d7526dece005ef05ffa782398aa6f051219d718c814073ffdf6febe1f1b554d39ad4dddd8dd7f98fd13fe55645eacae3036bcc18ab25454ed3deef3081749df SHA512 197b594c2c2d32906bedfdd18f4e3d98b8eef5c0a5aefc2197c4f63a27038b84e4e15258c99dc37dffbba221a4f9bcc9e28e4d566aea7418c20f1e890674483c
 MISC metadata.xml 447 BLAKE2B f5ff4e910d6fd13784c843496888c28eac53df6973350b2839f581f07740f4a8cf03ea71d53e5ed11d5531d6512abb9a4727843094870c7ce5fae5dd90ccf38f SHA512 a3f99db42705f69febe961e85d76a3c4686918e253fc1c979941daa135ae65d920ad5127a4ea6ad9a8628df405ef937731168eb47b7a69fb92131d4ce703947a
diff --git a/net-irc/epic5/epic5-1.1.10-r2.ebuild b/net-irc/epic5/epic5-1.1.10-r2.ebuild
deleted file mode 100644
index 85532830333b..000000000000
--- a/net-irc/epic5/epic5-1.1.10-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24"
-
-inherit autotools ruby-single toolchain-funcs
-
-DESCRIPTION="Epic5 IRC Client"
-SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${P}.tar.bz2"
-HOMEPAGE="http://epicsol.org/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="archive ipv6 perl tcl ruby socks5 valgrind"
-
-RDEPEND="
-	>=dev-libs/openssl-0.9.8e-r3:0
-	>=sys-libs/ncurses-5.6-r2:0
-	virtual/libiconv
-	archive? ( app-arch/libarchive )
-	perl? ( >=dev-lang/perl-5.8.8-r2 )
-	tcl? ( dev-lang/tcl:0 )
-	socks5? ( net-proxy/dante )
-	ruby? ( ${RUBY_DEPS} )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-
-S=${WORKDIR}/${P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.2-libarchive-automagic.patch
-	"${FILESDIR}"/${P}-ruby-automagic-as-needed.patch
-	"${FILESDIR}"/${P}-tcl-automagic-as-needed.patch
-	"${FILESDIR}"/${PN}-1.1.2-perl-automagic-as-needed.patch
-	"${FILESDIR}"/${P}-without-localdir.patch
-	"${FILESDIR}"/${P}-socks5-libsocks.patch
-	"${FILESDIR}"/${P}-xlocale.patch
-)
-
-src_prepare() {
-	default
-	eautoconf
-}
-
-src_configure() {
-	# Because of our REQUIRED_USE constraints above, we know that
-	# ruby_get_use_implementations will only ever return one ruby
-	# implementation.
-	econf \
-		--libexecdir="${EPREFIX}"/usr/lib/misc \
-		$(use_with archive libarchive) \
-		$(use_with ipv6) \
-		$(use_with perl) \
-		$(use_with ruby) \
-		$(use_with socks5) \
-		$(use_with tcl tcl "${EPREFIX}"/usr/$(get_libdir)/tclConfig.sh) \
-		$(use_with valgrind valgrind)
-}
-
-src_compile() {
-	# parallel build failure
-	emake -j1
-}
-
-src_install () {
-	default
-
-	dodoc BUG_FORM COPYRIGHT EPIC4-USERS-README README KNOWNBUGS VOTES
-
-	cd "${S}"/doc || die
-	docinto doc
-	dodoc \
-		*.txt colors EPIC* IRCII_VERSIONS missing \
-		nicknames outputhelp README.SSL SILLINESS TS4
-}
diff --git a/net-irc/epic5/epic5-2.0.1.ebuild b/net-irc/epic5/epic5-2.0.1.ebuild
index e5ebd880946e..62ee7a864b6c 100644
--- a/net-irc/epic5/epic5-2.0.1.ebuild
+++ b/net-irc/epic5/epic5-2.0.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://epicsol.org/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 # Fails to build without ipv6
 IUSE="archive perl tcl ruby socks5 valgrind" #ipv6
diff --git a/net-irc/epic5/files/epic5-1.1.10-ruby-automagic-as-needed.patch b/net-irc/epic5/files/epic5-1.1.10-ruby-automagic-as-needed.patch
deleted file mode 100644
index ba277ca8f60b..000000000000
--- a/net-irc/epic5/files/epic5-1.1.10-ruby-automagic-as-needed.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From: Nathan Phillip Brink <binki@gentoo.org>
-Subject: Fix up linking against libruby when using
-	LDFLAGS=-Wl,--as-needed. Also allow ruby to be a non-automagic
-	dependency.
-
---- a/configure.in	Tue Mar 25 07:39:34 2014 +0000
-+++ b/configure.in	Tue Mar 25 07:55:14 2014 +0000
-@@ -1168,34 +1168,28 @@
- dnl
- dnl Ruby support?
- dnl
--AC_ARG_WITH(ruby,
--[  --with-ruby[=PATH_TO_RUBY_EXE]       Compile with ruby support.],
--[ 
--	rubyexe=$withval
--],
--	rubyexe=yes
--)
--
--if test "x$rubyexe" = "xyes"; then
--	for i in ruby ruby20 ruby19 ruby18 ruby2.0 ruby1.9.1 ruby1.9 ruby1.8; do
--		$i -h 2>&1 >/dev/null && rubyexe=$i && break
--	done
--	if test "x$rubyexe" = "xyes"; then
--		rubyexe=no
--	fi
--fi
-+AC_ARG_WITH([ruby],
-+       [AS_HELP_STRING([--with-ruby[=PATH_TO_RUBY_EXE]], [Compile with ruby support.])],
-+       [], [with_ruby=maybe])
- 
--if test "x$rubyexe" = "xno"; then
-+with_ruby_errormsg="--with-ruby was specified but I could not locate ruby. Please try specifying --with-ruby=/path/to/ruby or --without-ruby."
-+AC_MSG_CHECKING([whether to support Ruby])
-+if test "x$with_ruby" = "xno" ; then
- 	AC_MSG_CHECKING(whether to support Ruby)
- 	AC_MSG_RESULT(no)
- else
--	AC_CHECK_PROG(RUBYPROG, $rubyexe, "yes", "no")
--	AC_MSG_CHECKING(whether to support Ruby)
--	if test $RUBYPROG != "yes" ; then 
--	    AC_MSG_RESULT(no)
-+	AC_MSG_RESULT(yes)
-+	AS_IF([test "x$with_ruby" = "xyes" -o "x$with_ruby" = "xmaybe"],
-+		[rubyexe=ruby],
-+		[rubyexe="$with_ruby"])
-+	dnl Support --with-ruby being passed a full path instead of just an executable name.
-+	AS_IF([test -x "$rubyexe"],
-+		[RUBYPROG=yes],
-+		[AC_CHECK_PROG([RUBYPROG], [$rubyexe], [yes], [no])])
-+	if test "x$RUBYPROG" = xno ; then
-+		AS_IF([test "x$with_ruby" != "xmaybe"],
-+			[AC_MSG_ERROR([$with_ruby_errormsg])])
- 	else
--	    AC_MSG_RESULT(yes)
--
- 	    dnl ---- 
- 	    dnl Look first for Ruby 1.9
- 	    incdir=`$rubyexe -rrbconfig -e 'puts RbConfig::CONFIG[["rubyhdrdir"]]'`
-@@ -1208,15 +1205,15 @@
- 
- 	    rubylibs=`$rubyexe -rrbconfig -e 'puts RbConfig::CONFIG[["LIBRUBYARG"]]'`
- 	    extralibs=`$rubyexe -rrbconfig -e 'puts RbConfig::CONFIG[["LIBS"]]'`
--	    RUBYLDFLAGS="$rubylibs $extralibs"
-+	    RUBYLIBS="$rubylibs $extralibs"
- 	    RUBYDOTOH="ruby.o"
- 
- 	    AC_MSG_CHECKING(whether embedded ruby works the way I expect)
- 	    have_embedded_ruby="no"
- 	    old_CFLAGS="$CFLAGS"
--	    old_LDFLAGS="$LDFLAGS"
-+	    old_LIBS="$LIBS"
- 	    CFLAGS="$CFLAGS $RUBYCFLAGS"
--	    LDFLAGS="$LDFLAGS $RUBYLDFLAGS"
-+	    LIBS="$LIBS $RUBYLIBS"
- 	    AC_TRY_LINK([
- #include <ruby.h>
-     VALUE epic_echo (VALUE module, VALUE string)
-@@ -1241,9 +1238,9 @@
- 		AC_MSG_RESULT(no)
- 		AC_MSG_CHECKING(whether ruby requires -pthread to link)
- 		RUBYCFLAGS="$RUBYCFLAGS -pthread"
--		RUBYLDFLAGS="$RUBYLDFLAGS -pthread"
--		CFLAGS="$CFLAGS $RUBYCFLAGS"
--		LDFLAGS="$LDFLAGS $RUBYLDFLAGS"
-+		RUBYLIBS="$RUBYLIBS -pthread"
-+		CFLAGS="$old_CFLAGS $RUBYCFLAGS"
-+		LIBS="$old_LIBS $RUBYLIBS"
- 
- 	        AC_TRY_LINK([
- #include <ruby.h>
-@@ -1268,17 +1265,19 @@
- 	    fi
- 
- 	    CFLAGS="$old_CFLAGS"
--	    LDFLAGS="$old_LDFLAGS"
-+	    LIBS="$old_LIBS"
- 	    if test $have_embedded_ruby = "yes" ; then
- 		AC_MSG_RESULT(yes)
- 		AC_DEFINE(HAVE_RUBY)
- 		AC_DEFINE(RUBYCFLAGS)
--		AC_DEFINE(RUBYLDFLAGS)
-+		AC_DEFINE(RUBYLIBS)
- 	    else
-+		AS_IF([test "x$with_ruby" != "xmaybe"],
-+			[AC_MSG_ERROR([$with_ruby_errormsg])])
- 	        RUBYDOTOH=""
- 		HAVE_RUBY=""
- 		RUBYCFLAGS=""
--		RUBYLDFLAGS=""
-+		RUBYLIBS=""
- 		AC_MSG_RESULT(no, sorry)
- 	    fi
- 	fi
-@@ -1376,7 +1375,7 @@
- AC_SUBST(LDFLAGS)
- AC_SUBST(RUBYDOTOH)
- AC_SUBST(RUBYCFLAGS)
--AC_SUBST(RUBYLDFLAGS)
-+AC_SUBST(RUBYLIBS)
- AC_SUBST(TCLDOTOH)
- AC_SUBST(TCLCFLAGS)
- AC_SUBST(TCLLDFLAGS)
---- a/source/Makefile.in	Tue Mar 25 07:39:34 2014 +0000
-+++ b/source/Makefile.in	Tue Mar 25 07:55:14 2014 +0000
-@@ -38,7 +38,7 @@
- epic5: $(OBJECTS)
- 	sh info.c.sh
- 	$(CC) $(CFLAGS) $(INCLUDES) -c info.c
--	$(CC) $(CFLAGS) $(LDFLAGS) -o epic5 $(OBJECTS) info.o @PERLLDFLAGS@ @TCLLDFLAGS@ @RUBYLDFLAGS@ $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o epic5 $(OBJECTS) info.o @PERLLDFLAGS@ @TCLLDFLAGS@ @RUBYLIBS@ $(LIBS)
- 	$(RM) info.c info.o
- clean::
- 	$(RM) epic5 $(OBJECTS)
diff --git a/net-irc/epic5/files/epic5-1.1.10-socks5-libsocks.patch b/net-irc/epic5/files/epic5-1.1.10-socks5-libsocks.patch
deleted file mode 100644
index 4aef0c7d6af3..000000000000
--- a/net-irc/epic5/files/epic5-1.1.10-socks5-libsocks.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Nathan Phillip Brink <binki@gentoo.org>
-Subject: Use -lsocks instead of -lsocks5 for `./configure --with-socks5`.
-
---- a/configure.in
-+++ b/configure.in
-@@ -861,7 +861,7 @@
- 
- AC_MSG_CHECKING(whether to support SOCKS)
- AC_ARG_WITH(socks,
--[  --with-socks[=PATH]     Compile with SOCKS firewall traversal support.],
-+[  --with-socks[=PATH]     Compile with SOCKS (libsocks without socks.h) firewall traversal support.],
- [ case "$withval" in
-   no)
- 	AC_MSG_RESULT(no)
-@@ -887,7 +887,7 @@
- 
- AC_MSG_CHECKING(whether to support SOCKS5)
- AC_ARG_WITH(socks5,
--[  --with-socks5[=PATH]    Compile with SOCKS5 firewall traversal support.],
-+[  --with-socks5[=PATH]    Compile with SOCKS5 (libsocks with socks.h) firewall traversal support.],
- [ case "$withval" in
-   no)
- 	AC_MSG_RESULT(no)
-@@ -899,7 +899,7 @@
- 	fi
- 
- 	AC_MSG_RESULT(yes)
--	LIBS="$LIBS -lsocks5"
-+	LIBS="$LIBS -lsocks"
- 	AC_DEFINE(SOCKS)
- 	AC_DEFINE(USE_SOCKS5)
- 	;;
diff --git a/net-irc/epic5/files/epic5-1.1.10-tcl-automagic-as-needed.patch b/net-irc/epic5/files/epic5-1.1.10-tcl-automagic-as-needed.patch
deleted file mode 100644
index 5b5b932b06bc..000000000000
--- a/net-irc/epic5/files/epic5-1.1.10-tcl-automagic-as-needed.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From: Nathan Phillip Brink <binki@gentoo.org>
-Subject: Make dependence on TCL not be automagic (so that --with-tcl
-	errors out if TCL can't be found and not specifying --with-tcl
-	does the normal automagic behavior).  Support
-	LDFLAGS=-Wl,--as-needed by using LIBS instead of LDFLAGS for
-	-ltcl as appropriate.
-
---- a/configure.in
-+++ b/configure.in
-@@ -1122,43 +1122,41 @@
- dnl
- dnl Tcl support?
- dnl
--AC_ARG_WITH(tcl,
--[  --with-tcl[=PATH_TO_tclConfig.sh]      Compile with tcl support.],
--[
--	tclconfig=$withval
--],
--	tclconfig="yes"
--)
--
--if test "x$tclconfig" = "xyes" ; then
--	for i in /usr/lib $localdir/lib $localdir/lib/tcl8.4 ; do
--		if test -r $i/tclConfig.sh ; then
--			tclconfig=$i/tclConfig.sh
--			break;
--		fi
--	done
--fi
-+AC_ARG_WITH([tcl], [AS_HELP_STRING([--with-tcl[=PATH_TO_tclConfig.sh]], [Compile with tcl support.])],
-+	[], [with_tcl=maybe])
- 
- AC_MSG_CHECKING(whether to support TCL)
--if test "x$tclconfig" = "xno"; then
-+if test "x$with_tcl" = "xno"; then
- 	AC_MSG_RESULT(no)
- else
--	if test ! -r $tclconfig ; then
-+	with_tcl_errormsg="You specified --with-tcl=$with_tcl but I could not find TCL. Please specify --with-tcl=/path/to/tclConfig.sh or remove --with-tcl from ./configure's commandline."
-+	if test "x$with_tcl" = "xmaybe" -o "x$with_tcl" = "xyes"; then
-+		for i in /usr/lib /usr/local/lib /usr/local/lib/tcl8.4 ; do
-+			if test -r "$i"/tclConfig.sh ; then
-+				tclconfig="$i"/tclConfig.sh
-+				break;
-+			fi
-+		done
-+	else
-+		tclconfig="$with_tcl"
-+	fi
-+	if test ! -r "$tclconfig" ; then
-+		dnl Avoid being automagic unless if the user wants us to be.
-+		AS_IF([test "x$with_tcl" != "xmaybe"],
-+			[AC_MSG_ERROR([$with_tcl_errormsg])])
- 		AC_MSG_RESULT(no)
- 	else
- 		AC_MSG_RESULT(yes)
--		TCLCFLAGS=`(. $tclconfig && echo $TCL_INCLUDE_SPEC)`
--		TCLLDFLAGS1=`(. $tclconfig && echo $TCL_LIB_SPEC)`
--		TCLLDFLAGS2=`(. $tclconfig && echo $TCL_LIBS)`
--		TCLLDFLAGS=$(eval echo "$TCLLDFLAGS1 $TCLLDFLAGS2")
-+		TCLCFLAGS=`(. "$tclconfig" && echo $TCL_INCLUDE_SPEC)`
-+		TCLLIBS=`(. "$tclconfig" && echo $TCL_LIB_SPEC $TCL_LIBS)`
- 		TCLDOTOH="tcl.o"
- 
- 		AC_MSG_CHECKING(whether embedded tcl works the way I expect)
- 		have_embedded_tcl="no"
- 		old_CFLAGS="$CFLAGS"
--		old_LDFLAGS="$LDFLAGS"
-+		old_LIBS="$LIBS"
- 		CFLAGS="$CFLAGS $TCLCFLAGS"
--		LDFLAGS="$LDFLAGS $TCLLDFLAGS"
-+		LIBS="$LIBS $TCLLIBS"
- 		AC_TRY_LINK([
- #include <tcl.h>
- 	   Tcl_Interp *my_tcl;
-@@ -1175,14 +1173,16 @@
- ], have_embedded_tcl="yes")
- 
- 		CFLAGS="$old_CFLAGS"
--		LDFLAGS="$old_LDFLAGS"
-+		LIBS="$old_LIBS"
- 		if test $have_embedded_tcl = "yes" ; then
- 		    AC_MSG_RESULT(yes)
- 		    AC_DEFINE(HAVE_TCL)
- 		    AC_DEFINE(TCLCFLAGS)
--		    AC_DEFINE(TCLLDFLAGS)
-+		    AC_DEFINE(TCLLIBS)
- 		else
--		    AC_MSG_RESULT(no, sorry)
-+			AS_IF([test "$with_tcl" != "xmaybe"],
-+				[AC_MSG_ERROR([$with_tcl_errormsg])])
-+			AC_MSG_RESULT(no, sorry)
- 		fi
- 	fi
- fi
-@@ -1383,7 +1383,7 @@
- AC_SUBST(RUBYLIBS)
- AC_SUBST(TCLDOTOH)
- AC_SUBST(TCLCFLAGS)
--AC_SUBST(TCLLDFLAGS)
-+AC_SUBST(TCLLIBS)
- AC_SUBST(PERLDOTOH)
- AC_SUBST(PERLCFLAGS)
- AC_SUBST(PERLLDFLAGS)
-
---- a/source/Makefile.in
-+++ b/source/Makefile.in
-@@ -38,7 +38,7 @@
- epic5: $(OBJECTS)
- 	sh info.c.sh
- 	$(CC) $(CFLAGS) $(INCLUDES) -c info.c
--	$(CC) $(CFLAGS) $(LDFLAGS) -o epic5 $(OBJECTS) info.o @PERLLDFLAGS@ @TCLLDFLAGS@ @RUBYLIBS@ $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o epic5 $(OBJECTS) info.o @PERLLDFLAGS@ @TCLLIBS@ @RUBYLIBS@ $(LIBS)
- 	$(RM) info.c info.o
- clean::
- 	$(RM) epic5 $(OBJECTS)
diff --git a/net-irc/epic5/files/epic5-1.1.10-without-localdir.patch b/net-irc/epic5/files/epic5-1.1.10-without-localdir.patch
deleted file mode 100644
index 4caccad764a8..000000000000
--- a/net-irc/epic5/files/epic5-1.1.10-without-localdir.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Nathan Phillip Brink <binki@gentoo.org>
-Subject: Drop some automatic probing of /usr/local and /opt and etc., Gentoo users know to use CPPFLAGS/CFLAGS/LDFLAGS.
-Date: 2014-08-30
-
---- a/configure.in
-+++ b/configure.in
-@@ -33,58 +33,6 @@
- AC_AIX
- 
- dnl ----------------------------------------------------------
--AC_MSG_CHECKING([for an extra library directory])
--AC_ARG_WITH([localdir],
--[  --with-localdir=/usr/local An extra directory to look for stuff.],[
--   if test "x$withval" = "x" ; then
--      if test -d /usr/local/lib ; then
--	withval="/usr/local"
--      elif test -d /usr/pkg/lib ; then
--	withval="/usr/pkg"
--      elif test -d /opt/lib ; then
--	withval="/opt"
--      else
--        with_extra_libdir="no"
--      fi
--   elif test -d "$withval" ; then
--      with_extra_libdir="yes"
--   else
--      with_extra_libdir="no"
--   fi
--
--   if test "x$withval" != "x" ; then
--      LIBS="-L$withval/lib $LIBS"
--      CFLAGS="-I$withval/include/ $CFLAGS"
--      localdir=$withdir
--      with_extra_libdir="yes"
--   else
--      with_extra_libdir="no"
--   fi
--],[
--   if test "x$withval" = "x" ; then
--      if test -d /usr/local/lib ; then
--	withval="/usr/local"
--      elif test -d /usr/pkg/lib ; then
--	withval="/usr/pkg"
--      elif test -d /opt/lib ; then
--	withval="/opt"
--      else
--        with_extra_libdir="no"
--      fi
--   fi
--
--   if test "x$withval" != "x" ; then
--      LIBS="-L$withval/lib $LIBS"
--      CFLAGS="-I$withval/include/ $CFLAGS"
--      localdir=$withdir
--      with_extra_libdir="yes"
--   else
--      with_extra_libdir="no"
--   fi
--])
--AC_MSG_RESULT([$with_extra_libdir, $withval])
--
--dnl ----------------------------------------------------------
- dnl ----------------------------------------------------------
- dnl
- dnl System specific checks
-
diff --git a/net-irc/epic5/files/epic5-1.1.10-xlocale.patch b/net-irc/epic5/files/epic5-1.1.10-xlocale.patch
deleted file mode 100644
index 8c5c7e44bfff..000000000000
--- a/net-irc/epic5/files/epic5-1.1.10-xlocale.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN epic5-1.1.10.orig/source/recode.c epic5-1.1.10/source/recode.c
---- epic5-1.1.10.orig/source/recode.c	2014-04-11 17:12:26.000000000 +0200
-+++ epic5-1.1.10/source/recode.c	2018-04-30 22:55:11.976293375 +0200
-@@ -41,7 +41,6 @@
- #include <langinfo.h>
- #include <locale.h>
- #include <wctype.h>
--#include <xlocale.h>
- 
- /*
-  * Here's the plan...
diff --git a/net-irc/epic5/files/epic5-1.1.2-libarchive-automagic.patch b/net-irc/epic5/files/epic5-1.1.2-libarchive-automagic.patch
deleted file mode 100644
index 522610f9fb57..000000000000
--- a/net-irc/epic5/files/epic5-1.1.2-libarchive-automagic.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: Nathan Phillip Brink <binki@gentoo.org>
-Subject: Prevent libarchive check from being automagic.
-
---- a/configure.in
-+++ b/configure.in
-@@ -231,22 +231,28 @@
- dnl XXX I don't understand why this is even necessary.
--have_libarchive=""
--orig_LIBS="$LIBS"
--AC_CHECK_LIB(archive, archive_read_new, [LIBS="$LIBS -larchive"])
--AC_MSG_CHECKING(whether libarchive works the way I expect)
--AC_TRY_LINK([#include <archive.h>], [
--	struct archive *x; 
--	const char *s = "bogus.zip";
--	x = archive_read_new();
--	archive_read_support_format_all(x);
--	archive_read_open_file(x, s, 10240);
--], have_libarchive="yes")
--if test "x$have_libarchive" = "x"; then
--	LIBS="$orig_LIBS"
--	AC_MSG_RESULT(no)
--else
--	AC_MSG_RESULT(yes)
--	AC_DEFINE(HAVE_LIBARCHIVE)
--fi
-+AC_ARG_WITH([libarchive], [AS_HELP_STRING([--without-libarchive], [Disable libarchive support.])],
-+	[], [with_libarchive=maybe])
-+AS_IF([test "x$with_libarchive" != "xno"],
-+	[
-+	have_libarchive=""
-+	orig_LIBS="$LIBS"
-+	AC_CHECK_LIB(archive, archive_read_new, [LIBS="$LIBS -larchive"])
-+	AC_MSG_CHECKING(whether libarchive works the way I expect)
-+	AC_TRY_LINK([#include <archive.h>], [
-+		struct archive *x; 
-+		const char *s = "bogus.zip";
-+		x = archive_read_new();
-+		archive_read_support_format_all(x);
-+		archive_read_open_file(x, s, 10240);
-+	], have_libarchive="yes")
-+	if test "x$have_libarchive" = "x"; then
-+		LIBS="$orig_LIBS"
-+		AC_MSG_RESULT(no)
-+		AS_IF([test "x$with_libarchive" = "xyes"],
-+			[AC_MSG_ERROR([--with-libarchive was specified but libarchive could not be found. Please do not specify --with-libarchive or install libarchive.])])
-+	else
-+		AC_MSG_RESULT(yes)
-+		AC_DEFINE(HAVE_LIBARCHIVE)
-+	fi])
- 
- dnl -----
- AC_ARG_WITH(ssl,
-
diff --git a/net-irc/epic5/files/epic5-1.1.2-perl-automagic-as-needed.patch b/net-irc/epic5/files/epic5-1.1.2-perl-automagic-as-needed.patch
deleted file mode 100644
index e211fa14b275..000000000000
--- a/net-irc/epic5/files/epic5-1.1.2-perl-automagic-as-needed.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From: Nathan Phillip Brink <binki@gentoo.org>
-Subject: Fix perl being automagic and to be safe with
-	LDFLAGS=-Wl,--as-needed.
-
---- a/configure.in
-+++ b/configure.in
-@@ -1033,37 +1033,38 @@
- dnl
- dnl Perl support?
- dnl
--AC_ARG_WITH(perl,
--[  --with-perl[=PATH_TO_PERL_EXE]       Compile with perl support.],
--[ 
--	perlexe=$withval
--],
--	perlexe=yes
--)
--
--if test "x$perlexe" = "xyes"; then
--	perlexe=perl
--fi
--
--if test "x$perlexe" = "xno"; then
-+AC_ARG_WITH([perl], [AS_HELP_STRING([--with-perl=[PATH_TO_PERL_EXE]], [Compile with perl support.])],
-+	[], [with_perl=maybe])
-+AS_IF([test "x$with_perl" = "xno"],
-+	[
- 	AC_MSG_CHECKING(whether to support Perl)
- 	AC_MSG_RESULT(no)
--else
--	AC_CHECK_PROG(PERLPROG, $perlexe, "yes", "no")
--	AC_MSG_CHECKING(whether to support Perl)
--	if test $PERLPROG != "yes" ; then 
-+	],
-+	[
-+	with_perl_errormsg="You specified --with-perl=$with_perl but I could not find a working perl. Please run ./configure with --without-perl or specify a path to a working perl executable."
-+	AS_IF([test "x$with_perl" = "xyes" -o "x$with_perl" = "xmaybe"],
-+		[perlexe=perl],
-+		[perlexe="$with_perl"])
-+	dnl Allow a full path to be specified in --with-perl
-+	AS_IF([test -x "$perlexe"],
-+		[PERLPROG=yes],
-+		[AC_CHECK_PROG(PERLPROG, $perlexe, "yes", "no")])
-+	AC_MSG_CHECKING([whether to support Perl])
-+	if test $PERLPROG != "yes" ; then
-+		AS_IF([test "x$with_perl" != "xmaybe"],
-+			[AC_MSG_ERROR([$with_perl_errormsg])])
- 		AC_MSG_RESULT(no)
- 	else
- 		AC_MSG_RESULT(yes)
- 		PERLCFLAGS=`$perlexe -MExtUtils::Embed -e ccopts`
--		PERLLDFLAGS=`$perlexe -MExtUtils::Embed -e ldopts`
-+		PERLLIBS=`$perlexe -MExtUtils::Embed -e ldopts`
- 
- 		AC_MSG_CHECKING(whether embedded perl works the way I expect)
- 		have_embedded_perl="no"
- 		old_CFLAGS="$CFLAGS"
--		old_LDFLAGS="$LDFLAGS"
-+		old_LIBS="$LIBS"
- 		CFLAGS="$CFLAGS $PERLCFLAGS"
--		LDFLAGS="$LDFLAGS $PERLLDFLAGS"
-+		LIBS="$LIBS $PERLLIBS"
- 		AC_TRY_RUN([
- #include <EXTERN.h>
- #include <perl.h>
-@@ -1101,20 +1102,22 @@
- have_embedded_perl="no",:)
- 
- 		CFLAGS="$old_CFLAGS"
--		LDFLAGS="$old_LDFLAGS"
-+		LIBS="$old_LIBS"
- 		if test $have_embedded_perl = "yes" ; then
- 			AC_MSG_RESULT(yes)
- 			AC_DEFINE(HAVE_PERL)
- 			AC_DEFINE(PERLCFLAGS)
--			AC_DEFINE(PERLLDFLAGS)
-+			AC_DEFINE(PERLLIBS)
- 			PERLDOTOH="perl.o"
- 		else
-+			AS_IF([test "x$with_perl" != "xmaybe"],
-+				[AC_MSG_ERROR([$with_perl_errormsg])])
- 			PERLCFLAGS=""
--			PERLLDFLAGS=""
-+			PERLLIBS=""
- 			AC_MSG_RESULT(no, sorry)
- 			PERLCFLAGS=""
--			PERLLDFLAGS=""
-+			PERLLIBS=""
- 		fi
- 	fi
--fi
-+	])
- 
-@@ -1392,7 +1395,7 @@
- AC_SUBST(TCLLIBS)
- AC_SUBST(PERLDOTOH)
- AC_SUBST(PERLCFLAGS)
--AC_SUBST(PERLLDFLAGS)
-+AC_SUBST(PERLLIBS)
- AC_SUBST(WSERV_BIN)
- AC_SUBST(WSERV_INSTALL)
- AC_SUBST(bindir)
-
---- a/source/Makefile.in
-+++ b/source/Makefile.in
-@@ -38,7 +38,7 @@
- epic5: $(OBJECTS)
- 	sh info.c.sh
- 	$(CC) $(CFLAGS) $(INCLUDES) -c info.c
--	$(CC) $(CFLAGS) $(LDFLAGS) -o epic5 $(OBJECTS) info.o @PERLLDFLAGS@ @TCLLIBS@ @RUBYLIBS@ $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o epic5 $(OBJECTS) info.o @PERLLIBS@ @TCLLIBS@ @RUBYLIBS@ $(LIBS)
- 	$(RM) info.c info.o
- clean::
- 	$(RM) epic5 $(OBJECTS)
diff --git a/net-irc/polari/Manifest b/net-irc/polari/Manifest
index 5e6593596275..fb44c3bd7c19 100644
--- a/net-irc/polari/Manifest
+++ b/net-irc/polari/Manifest
@@ -1,5 +1,5 @@
 DIST polari-3.24.2.tar.xz 804160 BLAKE2B c0e651d478cf814d1e055ef196ea725a17c50ee4836df7939b73dc59bbea0f74d8dbf6ceebd07b3748b6814fa52ae8a300515ac8f6952f59546e7c27ed35d6da SHA512 23a475d657556e7f4e93dde8e545bf7bede227635d540bd006b85b068923d87e713bd05f14d8ccde458bf6efd4920665bca02ea41c4de870680581ebfa595f0e
 DIST polari-3.30.2.tar.xz 1153792 BLAKE2B 992f39e989179617164fb9d955a5211aa466293882d773c5783792503741cf62ae7fa848697046f2888bdc04c083e0b3fef0be18055e2d2c2607cc029eb2c816 SHA512 4aae1bd70498ddbddab494c9484c039bc5fabc13860ddd6a2001858808baea004c9f463b37c9392eaac62cf951867ea6e24e77053976bd4524dd711ac52a5b4d
 EBUILD polari-3.24.2.ebuild 883 BLAKE2B 1828647d578f3cd96ed456f1b19e51df2208cb1a1dec59578f6360d822e0637982ffe665621399bae3ec7b0c89d604788f17283b39e3ac63dfc5aaed90aec80c SHA512 8a6817c62c0f89f97c347af5fba5d12b6c3d81774fc5a390117c9def93bbc40dbf7bde7693f983cc0e2b2ad26589b5cff06a04c49ab0b9d8c14694435735c8c4
-EBUILD polari-3.30.2.ebuild 1121 BLAKE2B fd6e76fad1a7dd7b13988c6056d8df4fc5324494e2416470850e41d84f96cd1106a89b6d086ddbf0bcd442b2f25dcb963ecc22e952824310ad2de039e33d2eef SHA512 6cdea277dee0e606cf77094d88e14abbc9389fbc324cb74d3f0414403be40888c0660a2423fb552dd679faa3054fe99b822d93f701c6f1ffbe999afb633038f3
+EBUILD polari-3.30.2.ebuild 1119 BLAKE2B 8c48f6479165e8159cf2089a5184426c282f6f988f449d00acf57b6800a7332360218306cb7d4d964f5be61078eddc31ecaa747b49081be00f30a5500dc0b1f0 SHA512 ede8349b7bcb9a8299823e791afe3c7940a6b5868c07be668262859e93e3f4e3e002edba3b912ee11bbb92b4781b6985022659563a3596b62a7367a092fa2331
 MISC metadata.xml 383 BLAKE2B fe4acd5e1d8f9336124e6a8588c3d25df25d7a60fac88b1eb637a1b169fd0805bc59030ec776257bfd664df72e6a3dfefcbde1d60bd08384281587ec062f2ad7 SHA512 98707a009259fafe782cd442524620d79465fadf8304becb5c4de4e15763245bd7c21fda7081749a7bfb551e1dd9d3168236862bb704bfb9091ca087ce348deb
diff --git a/net-irc/polari/polari-3.30.2.ebuild b/net-irc/polari/polari-3.30.2.ebuild
index 9af6db37fec0..d25b4a62e8b5 100644
--- a/net-irc/polari/polari-3.30.2.ebuild
+++ b/net-irc/polari/polari-3.30.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Polari"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 
 COMMON_DEPEND="
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 955a9ab9dfae..d0f45758cd82 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -6,6 +6,6 @@ AUX quasselcore.service 189 BLAKE2B a115a98b17f4e59f2bbae584ac998cb16729977b617f
 DIST quassel-0.12.5.tar.bz2 3747392 BLAKE2B 624cd18c2a5e1c480f701072bfeeeb18589cdbd2f2b7ab0d524f32e384ac4feb7328b23b60c3005340d53e4bf3a209f75a5d673a8d5d3f659825f0ef21bd3f9f SHA512 3a0263d7bec9ef4b0d8ef6ea53784f95e0efbadc0f03b49005908411b0b53543ebc66189fb4100c117d87264b648f2a1b01be48c371f926b9f326b1ffc870685
 DIST quassel-0.13.1.tar.bz2 4289663 BLAKE2B 1d5252efe3febd26e7d04f6533f551316d58b5e4a7c143cc81dd0cf6a3602e28a57de4c73c86fb668e43bf8d01049456d1f5cf37a73f683b9c8b6dd9d78ee4bd SHA512 4ed55e81b1638c8851ddae5d9c9d23a1c2cea92f307e19f426873c2600d8e183898d3ed7c290f2ea5d1b8c5e1be7f9ffcc3e8c3c0193d080fc879b10cc3a962c
 EBUILD quassel-0.12.5-r2.ebuild 4945 BLAKE2B 5a54a1aa6826752cf7d9af83ccd572eb5cd3252ed44a7ddeb3a30facdfba46282fe04a652ad20e38f91b251f1eafc2afcce05d8e56e28b7afa283ffe877cca05 SHA512 a49a8b12edc8cf8296189efc30278d59e1494a5097d1759854cc33a456e0158a17b3bb9d90860ac33818b2e2f2183c777f37a3b5768a4aea2bdbba0675a82390
-EBUILD quassel-0.13.1.ebuild 5039 BLAKE2B ef87d0973516d221ea4e5e37ffc9af247217ee835b6e2009c31912ceb862c18dd69e833bb08c04fe9596fdf7548f50815060cdf6a45e84c34feadb4377128b4a SHA512 d86140e4fe5ef1a432110fb829f271119a7abdc0a8eb5a5b2ae16d84edab5215b30f014d240be90daff7dfd8bbe9460c6eddffc4747f524102e16c4d042b20c7
+EBUILD quassel-0.13.1.ebuild 5038 BLAKE2B e6797f22b1df5e444502578cb391b0aa87885713544bfceed566a1ce81ce6a865e2e58bde479135ef2a01d6b1a614ada2fc615dff4f4d07edb43c0a2a523965d SHA512 01474d82c2327259ec6c731bb57878a55f835e7be204e73f6922e908224959be5943cb41f67c65cd80fd38bfcef464b81597c852b95a9b26a83cf5c183a6e9c0
 EBUILD quassel-9999.ebuild 5045 BLAKE2B 755dde3d5253499249e4e7e7ce2d40689247f9002b74a882ae247889934a48a47ed80173776efd7d7d61f5e048cba7ffef8c272ad6fb671afc720de3655bdb0a SHA512 2326f3a6bc0ca9de6b7eeaaf7150a69c7cbd842074d8fe0f43f7b4f9ab3213dba63657b85cf2d19565e15c16840d35cb4629e60250e227b01e5c927bcb3960ac
 MISC metadata.xml 1960 BLAKE2B a7e329fb44a58cf74d1964b426cc75b7697160478d62d2c4216d93defb62fd6d9e018ab29689b7a8652571db62a2a2a00f22dda6fb697feb9a381c37cc4a6ac6 SHA512 17931d04330ce51f30dd77579ebed36c04050d150db1faa793fd65307f3808ee2cdfb807a40e3881ebd879c75a583434367e46963a90c99c1a1724659946a8ca
diff --git a/net-irc/quassel/quassel-0.13.1.ebuild b/net-irc/quassel/quassel-0.13.1.ebuild
index 890c2b6a296e..732ad90f4aaa 100644
--- a/net-irc/quassel/quassel-0.13.1.ebuild
+++ b/net-irc/quassel/quassel-0.13.1.ebuild
@@ -8,7 +8,7 @@ inherit cmake-utils gnome2-utils pax-utils systemd user
 if [[ ${PV} != *9999* ]]; then
 	MY_P=${PN}-${PV/_/-}
 	SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
+	KEYWORDS="amd64 ~arm x86 ~amd64-linux ~sparc-solaris"
 	S="${WORKDIR}/${MY_P}"
 else
 	EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" "git://git.${PN}-irc.org/${PN}" )