gentoo resync : 21.07.2018

3 files changed, 2 insertions, 90 deletions

diff --git a/net-irc/epic5/Manifest b/net-irc/epic5/Manifest
index 5cc8e5daf9c0..131c2807fe6f 100644
--- a/net-irc/epic5/Manifest
+++ b/net-irc/epic5/Manifest
@@ -6,6 +6,5 @@ AUX epic5-1.1.10-xlocale.patch 350 BLAKE2B 4c2fe87d2bd42bee7cea05ab3426403836bb4
 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
 DIST epic5-1.1.10.tar.bz2 851439 BLAKE2B 13cf0f78ed2009595479fac8173b2936cf74382ec22964e00de2d84fd89c6cee661e4ea9e3d8ba44ec715ac7e861f4639b3459d3ac2d67c74cc49ad4aeebf127 SHA512 d0215570962253a0d5c60dacec86db1094575b0765db039247cf16b5957ba721576618ff73588610ba528782f4460fd4bbe5a1869e60e2c10d832d41ea3c6048
-EBUILD epic5-1.1.10-r1.ebuild 2248 BLAKE2B cdfbaad2493b5b4842d5c09a9f887241438fbde9002848166ac09a33795071f93b0e473560f1e67dcedcfe040ff5672eb4094fc03c4cb8fcf53e5fe78509d030 SHA512 4825e4e3b278cfb9c8954644c5a7c9fe20b1b6cc873d84687cf93fce92bd52c656f0cd0e712e9061aea21a52bbe677f4a54a16e5866d87448ac90a025caac6a8
-EBUILD epic5-1.1.10-r2.ebuild 1851 BLAKE2B 9578453296c0e92b3f9c9289a2c17f535ebaa1723f5bbb926e4df27efd381ba357b7fec52505f2eca6846e9276d4b3430ace008ed759c0ddbb020f9b937fb7a7 SHA512 901bcd66a0b1acb618ebcfe3e161155b323ef2bd34c6a541226aa66d668a3746cd91a69dda36f96d01da7339f727bac9ee4aea79afc413de2c76b31b597cbe42
+EBUILD epic5-1.1.10-r2.ebuild 1849 BLAKE2B e8567259e61a5e33fb1930296900cad6ac23c82f1b099fec405cd5b3295ad72663547da7553ecad9996a1846ccb337c41068d3b609fa324fbf6a8f138531a751 SHA512 86703fe7e6f5eada432846b7cacde9a300a5f7ca008a2708e0a531e6797ac1a330987bd0484e133e0608858f97776f983c1b2a7e7a646f0c203e207186d51cae
 MISC metadata.xml 447 BLAKE2B f5ff4e910d6fd13784c843496888c28eac53df6973350b2839f581f07740f4a8cf03ea71d53e5ed11d5531d6512abb9a4727843094870c7ce5fae5dd90ccf38f SHA512 a3f99db42705f69febe961e85d76a3c4686918e253fc1c979941daa135ae65d920ad5127a4ea6ad9a8628df405ef937731168eb47b7a69fb92131d4ce703947a
diff --git a/net-irc/epic5/epic5-1.1.10-r1.ebuild b/net-irc/epic5/epic5-1.1.10-r1.ebuild
deleted file mode 100644
index 32634a469338..000000000000
--- a/net-irc/epic5/epic5-1.1.10-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-USE_RUBY="ruby22 ruby23"
-RUBY_OPTIONAL=yes
-inherit autotools eutils multilib ruby-ng 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
-	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_implementations_depend) )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-REQUIRED_USE="ruby? ( ^^ ( $(ruby_get_use_targets) ) )
-	$(for t in $(ruby_get_use_targets); do echo "${t}? ( ruby )"; done)"
-
-S=${WORKDIR}/${P}
-
-pkg_setup() {
-	# bug #489608, bug #497080
-	use ruby && ruby-ng_pkg_setup
-}
-
-# Don't use ruby-ng's separated sources support:
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	epatch \
-		"${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
-	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 ruby "$(ruby_implementation_command $(ruby_get_use_implementations))") \
-		$(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-1.1.10-r2.ebuild b/net-irc/epic5/epic5-1.1.10-r2.ebuild
index 19db1f3b7bc4..85532830333b 100644
--- a/net-irc/epic5/epic5-1.1.10-r2.ebuild
+++ b/net-irc/epic5/epic5-1.1.10-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://epicsol.org/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="archive ipv6 perl tcl ruby socks5 valgrind"
 
 RDEPEND="