gentoo resync : 22.10.2018

8 files changed, 117 insertions, 112 deletions

diff --git a/net-libs/libircclient/Manifest b/net-libs/libircclient/Manifest
index d8fa2c78b6ea..0e39af11e77a 100644
--- a/net-libs/libircclient/Manifest
+++ b/net-libs/libircclient/Manifest
@@ -1,13 +1,11 @@
-AUX libircclient-1.6-build.patch 376 BLAKE2B 2a55d532c9f738600b5b5686a9785409da7cd4fd53433aebc72d270f1c7d8e3b00f7d54b5b7c9a914b5e412a7067697eb95c74678667b5df18f55abfa7285740 SHA512 1dd6a8a7c71b331ab1fc6a5d5f0c204bcc0c09362271df1f3304f78291555f3cf7c4fba278123c4d12f59793e9cf8cc867aae365aef82a51bb2b019c804b558b
-AUX libircclient-1.6-include.patch 289 BLAKE2B 4ba6e8eecdaad20dacd96b8418150e371bdbc65d68b87fa45738b53499633d9fbf23f6745282af2287e0ddd3118b1cceabc0305d5d6c37ed5d04e7a88b1a4b6e SHA512 62e3c1cfe8843eb16efe9e803785ba759100e3cf4c82b7f9f2fe11bd92a5fe9ad85707ef21c6231e3ee23f6e283711f643db76e79699574b3fb01eb893977d02
-AUX libircclient-1.6-shared.patch 2286 BLAKE2B f3d7556050684e950d3c50c82b42e19024c5110fb4ba51844b70b66dddab004a8503a9ba3889d659bdd7ecb57533ecec44687c735d9729f819cb3ed753730b9a SHA512 aa0cb079d206748c68ac5fbd066f78271b15f76e06a443c38ea54d35e1e2ccffb500cddd4d6a361c094b199ded876d7b47a1d08ebadbc48ea57d2bbefabf3f30
-AUX libircclient-1.6-static.patch 213 BLAKE2B 3922125e04f4736baa9a80a81fee828e424ee74c8629cb4fbcaf9791f09c6939ebf0c15c79a00a971d11aff49166cca146e80abeebd128ec4e7b3ca862a0ab9f SHA512 b370de10c348928dc75c1844b2c9f02b832ef4f44a6c7ab887e1ede35e8dbcc7fcfd427e472e35ffebc33fa98556d1cbac25be233c4ed4d5d267912c12ee9397
+AUX libircclient-1.10-openssl.patch 1210 BLAKE2B 500273e2a0665fd1f6085651bf9292bea0fc33829f1bfa9a4f5eca585e969216738e029b5e54d88a581c88befa8841c740865d29d595b45f1c8c45fc527a07e2 SHA512 66381f37e660c2663a1a6d4e28f25129b4fa3dd418860360665d0a115964507916eb0fe55fc92ca23dbcbcbbbd9da4744fb00e938413e5657b1c9da815d25029
+AUX libircclient-1.10-shared.patch 2521 BLAKE2B 09a7af8fe521c57fc9da6f63ee6a5be69e6d8633e0ede3af0def8c4c036722125ab9ffd0e48d8b93fac63a92410cdbc3465a07003cfc5f062d66c8398b747830 SHA512 bc5fbe085139c1062f901a1fa2dc38dc91ffe8031df563144c53a3c0077f3d2997a7d769de601db900a504f4fcf892ef3c42464ef0ed56010a972c9a79693447
 AUX libircclient-1.8-build.patch 340 BLAKE2B aae0969fce33301022fa11f93a2eb1c81b2a9419aa5e1bd8e2116b21f16133d3a068751bfd23d723dafcd35d5ca09b9cedb1d8b8e5bf726e320718e5e1b6da2d SHA512 44ab22464672b1f5e5ff8266ce3b4ebd8356175da2803a6f8cfc2b1e581f03c5a96f2a12a4b0bcef7bce4aeb8b6c9e31a0f149ffb2ac1b200d040e734dbbb640
 AUX libircclient-1.8-include.patch 289 BLAKE2B 4ba6e8eecdaad20dacd96b8418150e371bdbc65d68b87fa45738b53499633d9fbf23f6745282af2287e0ddd3118b1cceabc0305d5d6c37ed5d04e7a88b1a4b6e SHA512 62e3c1cfe8843eb16efe9e803785ba759100e3cf4c82b7f9f2fe11bd92a5fe9ad85707ef21c6231e3ee23f6e283711f643db76e79699574b3fb01eb893977d02
 AUX libircclient-1.8-shared.patch 2348 BLAKE2B eea99254aed77d0f9f05968c7d08bd6d90d223d4865a0ed85ce919f1597834cb6430cb732b88e4f40a851f51b7ac1b506a64e1d3836ea0c357ab79786cfc857f SHA512 e61b6c2d56be6cefb4320a93dae96d2fb0dbaf9818246ba1b9be88ab21d3302108d4cfb650cf0db564c50b2913d67ac24183221f2f522eab21097cbbbb37b642
 AUX libircclient-1.8-static.patch 209 BLAKE2B cc25d264d6d1801584ee06ca51921f7ad1dee1499b1e604c8d732779b44f22aa93fc076c97fee45d131d10cb46cf611a4e03220e61462d2b0003653554667217 SHA512 b1161ce28e5a8d668c852ee0ac336c186426a9467156c66ebe4805a722297ec225cc6b859c13003741d05a15ced1ccfaca0a20d98bf0bf933fc84fc1a97d8827
-DIST libircclient-1.6.tar.gz 392788 BLAKE2B 143b080389442b4106715c4437e319a08ebfdf55cb8d2d510d4e10a68157f791d9ab01379c89facbcddc1e690cea39c8649cec65367d436ab57381633a1b9565 SHA512 94a68f27fcb12c918fa347d4ee44747e08e016245048c81f179b9a45081bd336c329e7185a3bc46deb28c9c77e1eff5dc53de7e723b1ed5ee2c1d3cc57ce0548
+DIST libircclient-1.10.tar.gz 288863 BLAKE2B 28bcfb36553c04be28ef4ffc0cf5fe3af8538704997f628f311719d245a0629ff49bee2c512d29e4d43a24a2803cbafc99512ebda7d5c991d9ecb2f1786a9d24 SHA512 d677ceae0bfabc112671b351fb94d048399a7ad025ff33a2ff1ae6313382fcc78b64d499f2c882eb8b894abdde949562395819e4059fd14640dfae6757b0c259
 DIST libircclient-1.8.tar.gz 291803 BLAKE2B 7fcbf8e8466ac95ca5a27475551af45f828b29385b28071d02271deae03d6bbd3589e86efe56b1fe5020be7894e699534ef1e3a2f2fedca1909e4d8e0c04d067 SHA512 f19e4b55cf49091ab2c83ff3d5cace2252daad6bf23cb61b7677b9c6055fe8a8a7d891f6e1e5962481c836f47b7dcd35ef563c8807737ac81e3c4cee253cfc4a
-EBUILD libircclient-1.6-r2.ebuild 1097 BLAKE2B 75dd684c0918d713e5fe96e5dcc9488ca92a448203b87f1ca09e445452d3421a287c90db0a716383e3c49c0f2aa8b0981c558cdb6c68ee580b4b182361ff0f8e SHA512 afa58d5fc2e91249fb9f97e3b366be1729714c0af38fcc93482cf8d2c7d23def5f47a387ec90596475174a7282e6c3540d7d8a5b3dd1c649ec84289f290b2919
+EBUILD libircclient-1.10.ebuild 1298 BLAKE2B 8014b74bf17844f0f658d0e6aecade76235e7e2aec1d010c0146ba8664aa676533cde6a5a09ab88b88e7be1f412baa60df6208f88b059acb5793b35849ec1349 SHA512 0df4434ad26da9256aec34d5a6e82ac8eb4e7f83e9e6760611e8406f8abc0989e791eb530f49c0689eab46382fdd9c39a39465ce86cefc40910bcc16de158468
 EBUILD libircclient-1.8.ebuild 1135 BLAKE2B f28f32d1a8a08987f214ca78c4c53a7108644495a9136b2145c36396a1bfcebf8e205cc69381b261183006ed1beec1f89c39ecb23e5e5d99d22f5f5c209bcf29 SHA512 c638d79b35913a4c095ce6a8b2b7122bed056fa0dd01242837067fe1273181d898970961647afeed42311a9cccfb1c6cdf00f0af4f33b6bdcbe899fa76517d03
 MISC metadata.xml 335 BLAKE2B 9616df0f3f19ee3ece536dfb658a60a9ffb53bed2562086cc5d0f15f27116a86d3ace0c0a796c476045a74d49e803008d9c345ad027f8bdfbb5923e008445268 SHA512 af62ea7ba30a57f3271bded0d53a9122693e992d1050667701ba54bb33d6851b6ddabecf5f54bbdf8aebb212bd3e6a5999a8e8c1b2bbdd6666243ccb24a6182b
diff --git a/net-libs/libircclient/files/libircclient-1.10-openssl.patch b/net-libs/libircclient/files/libircclient-1.10-openssl.patch
new file mode 100644
index 000000000000..b488f7f626c7
--- /dev/null
+++ b/net-libs/libircclient/files/libircclient-1.10-openssl.patch
@@ -0,0 +1,38 @@
+https://sourceforge.net/p/libircclient/code/141/
+https://sourceforge.net/p/libircclient/code/142/
+
+--- libircclient-1.10/src/ssl.c
++++ libircclient-1.10/src/ssl.c
+@@ -114,26 +114,23 @@
+ #if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_library_init();
+ #else
+-	OPENSSL_init_ssl(0, NULL);
++	if ( OPENSSL_init_ssl(0, NULL) == 0 )
++	 return LIBIRC_ERR_SSL_INIT_FAILED;
+ #endif 
+ 
+ 	if ( RAND_status() == 0 )
+ 		return LIBIRC_ERR_SSL_INIT_FAILED;
+ 
+ 	// Create an SSL context; currently a single context is used for all connections
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ssl_context = SSL_CTX_new( SSLv23_method() );
++#else
++	ssl_context = SSL_CTX_new( TLS_client_method() );
++#endif
+ 
+ 	if ( !ssl_context )
+ 		return LIBIRC_ERR_SSL_INIT_FAILED;
+ 
+-	// Disable SSLv2 as it is unsecure
+-	if ( (SSL_CTX_set_options( ssl_context, SSL_OP_NO_SSLv2) & SSL_OP_NO_SSLv2) == 0 )
+-		return LIBIRC_ERR_SSL_INIT_FAILED;
+-
+-	// Enable only strong ciphers
+-	if ( SSL_CTX_set_cipher_list( ssl_context, "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH" ) != 1 )
+-		return LIBIRC_ERR_SSL_INIT_FAILED;
+-
+ 	// Set the verification
+ 	if ( session->options & LIBIRC_OPTION_SSL_NO_VERIFY )
+ 		SSL_CTX_set_verify( ssl_context, SSL_VERIFY_NONE, 0 );
diff --git a/net-libs/libircclient/files/libircclient-1.6-shared.patch b/net-libs/libircclient/files/libircclient-1.10-shared.patch
index 44fe9ded64b6..33a1cc1d54e0 100644
--- a/net-libs/libircclient/files/libircclient-1.6-shared.patch
+++ b/net-libs/libircclient/files/libircclient-1.10-shared.patch
@@ -1,42 +1,39 @@
---- libircclient-1.6/src/Makefile.in
-+++ libircclient-1.6/src/Makefile.in
-@@ -1,10 +1,13 @@
- # $Id$
+--- libircclient-1.10/src/Makefile.in
++++ libircclient-1.10/src/Makefile.in
+@@ -1,8 +1,10 @@
+ # $Id: Makefile.in 137 2018-08-27 01:11:08Z gyunaev $
  CC = @CC@
--CFLAGS = -Wall -DIN_BUILDING_LIBIRC @CFLAGS@
-+CFLAGS = -fPIC -Wall -DIN_BUILDING_LIBIRC @CFLAGS@
+-CFLAGS = -Wall -Wno-misleading-indentation -Wno-unused-function -Wno-nonnull -DIN_BUILDING_LIBIRC @CFLAGS@
++CFLAGS = -fPIC -Wall -Wno-misleading-indentation -Wno-unused-function -Wno-nonnull -DIN_BUILDING_LIBIRC @CFLAGS@
  AR=@AR@ cr
  RANLIB=@RANLIB@
-+INSTALL = install
-+LN = ln -sf
++INSTALL=install
++LN=ln -sf
  INCLUDES=-I../include
  DESTDIR=
-+APIVERSION = 1
- 
- OBJS = libircclient.o
- 
-@@ -14,19 +17,24 @@
+ APIVERSION = 1
+@@ -15,19 +17,24 @@
  shared: libircclient.so
  shared_mingw: libircclient.dll
  
--install: lib
+-install:
 -	-mkdir -p $(DESTDIR)@prefix@/include
--	-mkdir -p $(DESTDIR)@prefix@/lib
+-	-mkdir -p $(DESTDIR)@libdir@
 -	cp ../include/libircclient.h $(DESTDIR)@prefix@/include/libircclient.h
 -	cp ../include/libirc_errors.h $(DESTDIR)@prefix@/include/libirc_errors.h
 -	cp ../include/libirc_events.h  $(DESTDIR)@prefix@/include/libirc_events.h 
 -	cp ../include/libirc_options.h  $(DESTDIR)@prefix@/include/libirc_options.h 
 -	cp ../include/libirc_rfcnumeric.h  $(DESTDIR)@prefix@/include/libirc_rfcnumeric.h 
--	cp libircclient.so $(DESTDIR)@prefix@/lib/
--	cp libircclient.a $(DESTDIR)@prefix@/lib/
+-	cp libircclient.so $(DESTDIR)@libdir@/libircclient.so.$(APIVERSION)
+-	ln -fs libircclient.so.$(APIVERSION) $(DESTDIR)@libdir@/libircclient.so
 +install: install-headers install-static install-shared
 +install-headers:
 +	$(INSTALL) -d $(DESTDIR)@prefix@/include
 +	$(INSTALL) -m0644 ../include/libircclient.h $(DESTDIR)@prefix@/include/libircclient.h
 +	$(INSTALL) -m0644 ../include/libirc_errors.h $(DESTDIR)@prefix@/include/libirc_errors.h
-+	$(INSTALL) -m0644 ../include/libirc_events.h  $(DESTDIR)@prefix@/include/libirc_events.h 
-+	$(INSTALL) -m0644 ../include/libirc_options.h  $(DESTDIR)@prefix@/include/libirc_options.h 
-+	$(INSTALL) -m0644 ../include/libirc_rfcnumeric.h  $(DESTDIR)@prefix@/include/libirc_rfcnumeric.h 
++	$(INSTALL) -m0644 ../include/libirc_events.h  $(DESTDIR)@prefix@/include/libirc_events.h
++	$(INSTALL) -m0644 ../include/libirc_options.h  $(DESTDIR)@prefix@/include/libirc_options.h
++	$(INSTALL) -m0644 ../include/libirc_rfcnumeric.h  $(DESTDIR)@prefix@/include/libirc_rfcnumeric.h
 +install-shared:
 +	$(INSTALL) -d $(DESTDIR)@libdir@
 +	$(INSTALL) -m0755 libircclient.so $(DESTDIR)@libdir@/libircclient.so.$(APIVERSION)
@@ -46,8 +43,8 @@
 +	$(INSTALL) -m0644 libircclient.a $(DESTDIR)@libdir@/libircclient.a
  
  libircclient.so: libircclient.o
--	$(CC) -shared -s -o libircclient.so libircclient.o @LIBS@
-+	$(CC) $(CFLAGS) -shared -Wl,-soname,libircclient.so.$(APIVERSION) -o libircclient.so libircclient.o $(LDFLAGS) @LIBS@
+-	$(CC) -shared -s -Wl,-soname,libircclient.so.$(APIVERSION) -o libircclient.so libircclient.o @LDFLAGS@ @LIBS@
++	$(CC) @CFLAGS@ -shared -Wl,-soname,libircclient.so.$(APIVERSION) -o libircclient.so libircclient.o @LDFLAGS@ @LIBS@
  
  libircclient.dll: libircclient.o
  	$(CC) -shared -s -o libircclient.dll -Wl,-out-implib,libircclient.lib libircclient.o libircclient.def -lkernel32 -lwsock32 @LIBS@
diff --git a/net-libs/libircclient/files/libircclient-1.6-build.patch b/net-libs/libircclient/files/libircclient-1.6-build.patch
deleted file mode 100644
index d3d6c0f3edf9..000000000000
--- a/net-libs/libircclient/files/libircclient-1.6-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libircclient-1.6/configure.in
-+++ libircclient-1.6.new/configure.in
-@@ -61,9 +61,7 @@ AC_CHECK_FUNCS([localtime_r socket])
- AC_CHECK_LIB(socket, socket, AC_DEFINE(HAVE_SOCKET) LIBS="$LIBS -lsocket")
- 
- if test "$use_debug" = "yes"; then
--	CFLAGS="${CFLAGS} -g -DENABLE_DEBUG"
--else
--	CFLAGS="${CFLAGS} -O3"
-+	CFLAGS="${CFLAGS} -DENABLE_DEBUG"
- fi
- 
- # Choosing the target
diff --git a/net-libs/libircclient/files/libircclient-1.6-include.patch b/net-libs/libircclient/files/libircclient-1.6-include.patch
deleted file mode 100644
index c5bce1dfd947..000000000000
--- a/net-libs/libircclient/files/libircclient-1.6-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libircclient-1.6.orig/include/libircclient.h
-+++ libircclient-1.6/include/libircclient.h
-@@ -130,6 +130,7 @@
- #define IN_INCLUDE_LIBIRC_H
- #include "libirc_errors.h"
- #include "libirc_events.h"
-+#include "libirc_rfcnumeric.h"
- #include "libirc_options.h"
- #undef IN_INCLUDE_LIBIRC_H
- 
diff --git a/net-libs/libircclient/files/libircclient-1.6-static.patch b/net-libs/libircclient/files/libircclient-1.6-static.patch
deleted file mode 100644
index 4ecbb3362223..000000000000
--- a/net-libs/libircclient/files/libircclient-1.6-static.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libircclient-1.6.orig/src/Makefile.in
-+++ libircclient-1.6/src/Makefile.in
-@@ -9,6 +9,9 @@
- DESTDIR=
- APIVERSION = 1
- 
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
- OBJS = libircclient.o
- 
- all:	@TARGET@
diff --git a/net-libs/libircclient/libircclient-1.10.ebuild b/net-libs/libircclient/libircclient-1.10.ebuild
new file mode 100644
index 000000000000..940b5f0a3967
--- /dev/null
+++ b/net-libs/libircclient/libircclient-1.10.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Small but powerful library implementing the client-server IRC protocol"
+HOMEPAGE="http://www.ulduzsoft.com/libircclient/"
+SRC_URI="mirror://sourceforge/libircclient/${P}.tar.gz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc ipv6 ssl static-libs threads"
+
+DEPEND="ssl? ( dev-libs/openssl:0 )"
+RDEPEND=${DEPEND}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8-build.patch
+	"${FILESDIR}"/${PN}-1.10-shared.patch
+	"${FILESDIR}"/${PN}-1.8-static.patch
+	"${FILESDIR}"/${PN}-1.8-include.patch
+
+	# upstream patches (can usually be removed with next version bump)
+	"${FILESDIR}"/${PN}-1.10-openssl.patch
+)
+
+src_prepare() {
+	default
+	mv configure.in configure.ac || die
+	eautoconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable threads)
+		$(use_enable ipv6)
+		$(use_enable ssl openssl)
+		$(use_enable ssl threads)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake -C src $(usex static-libs "shared static" "shared")
+}
+
+src_install() {
+	emake -C src DESTDIR="${D}" install-shared $(usex static-libs "install-static" "")
+	insinto /usr/include/libircclient
+	doins include/*.h
+
+	dodoc Changelog THANKS
+	doman man/libircclient.1
+}
diff --git a/net-libs/libircclient/libircclient-1.6-r2.ebuild b/net-libs/libircclient/libircclient-1.6-r2.ebuild
deleted file mode 100644
index 1f6a2f5bbe59..000000000000
--- a/net-libs/libircclient/libircclient-1.6-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Small but powerful library implementing the client-server IRC protocol"
-HOMEPAGE="http://www.ulduzsoft.com/libircclient/"
-SRC_URI="mirror://sourceforge/libircclient/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc ipv6 ssl static-libs threads"
-
-DEPEND="ssl? ( dev-libs/openssl )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-shared.patch \
-		"${FILESDIR}"/${P}-include.patch \
-		"${FILESDIR}"/${P}-static.patch
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable threads) \
-		$(use_enable ipv6) \
-		$(use_enable ssl openssl) \
-		$(use_enable ssl threads)
-}
-
-src_compile() {
-	emake -C src $(usex static-libs "shared static" "shared")
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" $(usex static-libs "install" "install-shared")
-	insinto /usr/include/libircclient
-	doins include/*.h
-
-	dodoc Changelog THANKS
-	if use doc ; then
-		doman doc/man/man3/*
-		dohtml doc/html/*
-	fi
-}