gentoo resync 31.01.2019

3 files changed, 151 insertions, 0 deletions

diff --git a/net-irc/epic5/Manifest b/net-irc/epic5/Manifest
index 131c2807fe6f..22bff18fcacc 100644
--- a/net-irc/epic5/Manifest
+++ b/net-irc/epic5/Manifest
@@ -5,6 +5,9 @@ AUX epic5-1.1.10-without-localdir.patch 1780 BLAKE2B 97b29e5c3efd4f9048db52f501a
 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
 MISC metadata.xml 447 BLAKE2B f5ff4e910d6fd13784c843496888c28eac53df6973350b2839f581f07740f4a8cf03ea71d53e5ed11d5531d6512abb9a4727843094870c7ce5fae5dd90ccf38f SHA512 a3f99db42705f69febe961e85d76a3c4686918e253fc1c979941daa135ae65d920ad5127a4ea6ad9a8628df405ef937731168eb47b7a69fb92131d4ce703947a
diff --git a/net-irc/epic5/epic5-2.0.1.ebuild b/net-irc/epic5/epic5-2.0.1.ebuild
new file mode 100644
index 000000000000..e5ebd880946e
--- /dev/null
+++ b/net-irc/epic5/epic5-2.0.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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.xz"
+HOMEPAGE="http://epicsol.org/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+# Fails to build without ipv6
+IUSE="archive perl tcl ruby socks5 valgrind" #ipv6
+
+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=(
+	# From Debian
+	"${FILESDIR}/${P}-openssl-1.1.patch"
+)
+
+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 \
+		--with-ipv6 \
+		$(use_with archive libarchive) \
+		$(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/files/epic5-2.0.1-openssl-1.1.patch b/net-irc/epic5/files/epic5-2.0.1-openssl-1.1.patch
new file mode 100644
index 000000000000..254035e6d385
--- /dev/null
+++ b/net-irc/epic5/files/epic5-2.0.1-openssl-1.1.patch
@@ -0,0 +1,77 @@
+Index: epic5-2.0/source/crypto.c
+===================================================================
+--- epic5-2.0.orig/source/crypto.c
++++ epic5-2.0/source/crypto.c
+@@ -282,9 +282,9 @@ static char *	decipher_evp (const unsign
+ 	unsigned char	*iv = NULL;
+ 	unsigned long errcode;
+ 	int	outlen2;
+-        EVP_CIPHER_CTX a;
+-        EVP_CIPHER_CTX_init(&a);
+-	EVP_CIPHER_CTX_set_padding(&a, 0);
++	EVP_CIPHER_CTX *a = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(a);
++	EVP_CIPHER_CTX_set_padding(a, 0);
+ 
+ 	if (ivsize > 0)
+ 		iv = new_malloc(ivsize);
+@@ -292,18 +292,19 @@ static char *	decipher_evp (const unsign
+ 	if (ivsize > 0)
+ 		memcpy(iv, ciphertext, ivsize);
+ 
+-        EVP_DecryptInit_ex(&a, type, NULL, NULL, iv);
+-	EVP_CIPHER_CTX_set_key_length(&a, passwdlen);
+-	EVP_CIPHER_CTX_set_padding(&a, 0);
+-        EVP_DecryptInit_ex(&a, NULL, NULL, passwd, NULL);
++	EVP_DecryptInit_ex(a, type, NULL, NULL, iv);
++	EVP_CIPHER_CTX_set_key_length(a, passwdlen);
++	EVP_CIPHER_CTX_set_padding(a, 0);
++	EVP_DecryptInit_ex(a, NULL, NULL, passwd, NULL);
+ 
+-        if (EVP_DecryptUpdate(&a, outbuf, outlen, ciphertext, cipherlen) != 1)
++	if (EVP_DecryptUpdate(a, outbuf, outlen, ciphertext, cipherlen) != 1)
+ 		yell("EVP_DecryptUpdate died.");
+-	if (EVP_DecryptFinal_ex(&a, outbuf + (*outlen), &outlen2) != 1)
++	if (EVP_DecryptFinal_ex(a, outbuf + (*outlen), &outlen2) != 1)
+ 		yell("EVP_DecryptFinal_Ex died.");
+ 	*outlen += outlen2;
+ 
+-        EVP_CIPHER_CTX_cleanup(&a);
++	EVP_CIPHER_CTX_cleanup(a);
++	EVP_CIPHER_CTX_free(a);
+ 
+ 	ERR_load_crypto_strings();
+ 	while ((errcode = ERR_get_error()))
+@@ -454,9 +455,9 @@ static char *	cipher_evp (const unsigned
+ 	unsigned long errcode;
+ 	u_32int_t	randomval;
+ 	int		iv_count;
+-        EVP_CIPHER_CTX a;
+-        EVP_CIPHER_CTX_init(&a);
+-	EVP_CIPHER_CTX_set_padding(&a, 0);
++	EVP_CIPHER_CTX *a = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(a);
++	EVP_CIPHER_CTX_set_padding(a, 0);
+ 
+ 	if (ivsize < 0)
+ 		ivsize = 0;		/* Shenanigans! */
+@@ -480,12 +481,13 @@ static char *	cipher_evp (const unsigned
+ 	if (iv)
+ 		memcpy(outbuf, iv, ivsize);
+ 
+-        EVP_EncryptInit_ex(&a, type, NULL, NULL, iv);
+-	EVP_CIPHER_CTX_set_key_length(&a, passwdlen);
+-        EVP_EncryptInit_ex(&a, NULL, NULL, passwd, NULL);
+-        EVP_EncryptUpdate(&a, outbuf + ivsize, &outlen, plaintext, plaintextlen);
+-	EVP_EncryptFinal_ex(&a, outbuf + ivsize + outlen, &extralen);
+-        EVP_CIPHER_CTX_cleanup(&a);
++	EVP_EncryptInit_ex(a, type, NULL, NULL, iv);
++	EVP_CIPHER_CTX_set_key_length(a, passwdlen);
++	EVP_EncryptInit_ex(a, NULL, NULL, passwd, NULL);
++	EVP_EncryptUpdate(a, outbuf + ivsize, &outlen, plaintext, plaintextlen);
++	EVP_EncryptFinal_ex(a, outbuf + ivsize + outlen, &extralen);
++	EVP_CIPHER_CTX_cleanup(a);
++	EVP_CIPHER_CTX_free(a);
+ 	outlen += extralen;
+ 
+ 	ERR_load_crypto_strings();