gentoo resync : 07.05.2019

3 files changed, 80 insertions, 14 deletions

diff --git a/media-libs/libshout/Manifest b/media-libs/libshout/Manifest
index d48651e5f92d..59bcac085ac2 100644
--- a/media-libs/libshout/Manifest
+++ b/media-libs/libshout/Manifest
@@ -1,6 +1,8 @@
 AUX libshout-2.4.1-tls-compile-with-OpenSSL-1.1.0.patch 1727 BLAKE2B d270ff05d538748939103f4fea0f77154483e31cda7166da4a1af5305c2722faffccc5a0f98f44c83f82104ed94f7d15ad75ec8bd06807159aff4df7a0425e2f SHA512 af27d562fbf4f7be08317a97d69ae27d57618f4e6a5bc0131ce633b46a1a8f3cc24aa21ee12e427994d319e455afd8dbc3d061a6df6814958b9b787cfcb19ed8
 AUX libshout-2.4.1-underlinking.patch 529 BLAKE2B 993ab69f011caa49b96f28ede17bbe3fe68b304521a1d7185e865f4ac254d2bd313686e0d6a59e5aa50a0fe41a0e0214980aefe1fe3dcb8a45d827d4962fb153 SHA512 4717ee913ff50e276cca9983543a046271c34385bca2525bc64f6de90a25c7becc7e780807ff2534147dc17b1f57b57e23746948ea78288addfbeca7c495f78e
+AUX libshout-2.4.2-tls-compile-with-OpenSSL-1.1.0.patch 1862 BLAKE2B d478fa25f0771d64e644fe9884202d63bf198a0c3627e4dc5912258c45c9b5fc0143c9fe956ba0adc47dbc20744417d031175a3bbe6430f0fbea967f4fc0b1a4 SHA512 973a96892244934143f901d4469036ffe5fef46ea4e44d1c321d9ab888cb7865d59546aa6211b3268672355491d6876faebe57bb8cb1c0915cc692e66958cf0b
 DIST libshout-2.4.1.tar.gz 516161 BLAKE2B bedea3c043018eff4675fdb8b95e0bb8ff02a98994a4afcc76537124ebf7357f012f2e9445ebd207b576fc4166fb761d65066fe166fc8b611b96f5c5482a0e92 SHA512 4d4b958947e020de3330d49d39d59220fc89315f25f653a7456b9aa24ca9566fca30bb3d65e6348e79958656096b6b864ea8885157d24e55c8d84d6604670219
-EBUILD libshout-2.4.1-r1.ebuild 1317 BLAKE2B 34e99363db05398190a065358d1fde860372deb4750c5d22d8f128d1fe5d257881faba01e42f3b3bbc1f4094e7ec7a6576776a63712d44987e1732eb3efc4618 SHA512 d3e14eaf24dc7bc450274cb106ba2c2720318d295db20f3a9305849e53f72cd9d4d371ae64a18bd74ec90c4b854ce1c6c831e147b5c086acb62e619fff04619a
+DIST libshout-2.4.2.tar.gz 519249 BLAKE2B 15bd6a552eeb39654a07f5a43f670e53b37c0b239424d2530f09f156e1404da8133e557d614aa7c89aa36e3cec093fecd25aa05d855f283d4af51e1b543eb631 SHA512 ae4b042009887de22d105eb8238f4362f6ff51bd645fd51b5a87c4b5e3f5fdc99e9f99f85c24ae2e9d23eab92b854a7e733bf9f8cc61a8362ce984f02a014e93
 EBUILD libshout-2.4.1-r2.ebuild 1422 BLAKE2B 2c9b7ecce83ae62e785938cb85ad900b1d520bb6db20ebd6c92f4d140c8cea405a3bd78d1630b040c1117eed42f9b14ef6bf80c9319a132a0eabc82e0bda486a SHA512 042e66ae246f32c88c40ff6e5768ad9f1cd03473a286d0ec254a94f26c838766550d1dba9d5053f4e92cce09d06410d970bb0fec3f7ec29fa0cf068281b6c67c
+EBUILD libshout-2.4.2.ebuild 1408 BLAKE2B d326f61d38ddd063bd728a735ee5a16b51d968ed847f51152c7c70beefa4539cdea2bd404ad2ec789f96e2819bada1ffb92d39fd8903a9476be830ed23c4b966 SHA512 f63419d790238f0e50ba5d9e0a1e92e0d2a377d0716b4be0f9eb05c2ced2b0ba295a6122f142c05e2faa47940b6b693da2777ca3da7af9de314e3c8ba1d1ce78
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libshout/files/libshout-2.4.2-tls-compile-with-OpenSSL-1.1.0.patch b/media-libs/libshout/files/libshout-2.4.2-tls-compile-with-OpenSSL-1.1.0.patch
new file mode 100644
index 000000000000..55f2189e15f4
--- /dev/null
+++ b/media-libs/libshout/files/libshout-2.4.2-tls-compile-with-OpenSSL-1.1.0.patch
@@ -0,0 +1,61 @@
+From 3f07c95482c15f151e10f06c89302d3700c6430f Mon Sep 17 00:00:00 2001
+From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
+Date: Mon, 6 May 2019 13:33:48 +0200
+Subject: [PATCH] tls: compile with OpenSSL 1.1.0
+
+The init functions are not longer required in OpenSSL 1.1 so I dropped
+them.
+
+TLSv1_client_method() should not be used because it enables only the
+TLSv1.0 protocol. Better is to use SSLv23_client_method() which enable
+all the protocols including TLSv1.2. With this functions SSLv2 and SSLv3
+is theoretically possible but as of today those protocols are usually
+build-time disabled.
+To avoid all this OpenSSL 1.1 provides TLS_client_method() which is aim
+to provide to highest TLS protocol version (same as
+SSLv23_client_method() but it is deprecated in 1.1).
+
+Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
+
+Forward-ported to libshout-2.4.2 by Lars Wendler <polynomial-c@gentoo.org>
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ src/tls.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/src/tls.c b/src/tls.c
+index aed5bfc..d60fb57 100644
+--- a/src/tls.c
++++ b/src/tls.c
+@@ -26,6 +26,7 @@
+ #include <string.h>
+ 
+ #include <shout/shout.h>
++#include <string.h>
+ #include "shout_private.h"
+ 
+ #ifndef XXX_HAVE_X509_check_host
+@@ -86,14 +87,17 @@ shout_tls_t *shout_tls_new(shout_t *self, sock_t socket)
+ 
+ static inline int tls_setup(shout_tls_t *tls)
+ {
+-    SSL_METHOD *meth;
+-
++    const SSL_METHOD *meth;
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+     SSL_library_init();
+     SSL_load_error_strings();
+     SSLeay_add_all_algorithms();
+     SSLeay_add_ssl_algorithms();
+ 
+-    meth = TLSv1_client_method();
++    meth = SSLv23_client_method();
++#else
++    meth = TLS_client_method();
++#endif
+     if (!meth)
+         goto error;
+ 
+-- 
+2.21.0
+
diff --git a/media-libs/libshout/libshout-2.4.1-r1.ebuild b/media-libs/libshout/libshout-2.4.2.ebuild
index fcfeae82d3a3..e478485c81ce 100644
--- a/media-libs/libshout/libshout-2.4.1-r1.ebuild
+++ b/media-libs/libshout/libshout-2.4.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools multilib-minimal
 
@@ -11,14 +11,14 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="libressl speex static-libs theora"
 
 RDEPEND="
 	>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
 	>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
 	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl )
+	libressl? ( dev-libs/libressl:0= )
 	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
 	theora? ( >=media-libs/libtheora-1.1.1[${MULTILIB_USEDEP}] )
 "
@@ -30,25 +30,28 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/shout/shout.h
 )
 
-DOCS=( README examples/example.c )
-
-PATCHES=( "${FILESDIR}"/${PN}-2.4.1-underlinking.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.1-underlinking.patch
+	"${FILESDIR}"/${PN}-2.4.2-tls-compile-with-OpenSSL-1.1.0.patch
+)
 
 src_prepare() {
 	default
+	# Fix docdir
+	sed '/^docdir/s@$(PACKAGE)@$(PF)@' -i Makefile.am || die
 	eautoreconf
 	multilib_copy_sources
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		$(use_enable theora) \
+	local myeconfargs=(
 		$(use_enable speex)
+		$(use_enable static-libs static)
+		$(use_enable theora)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install_all() {
-	einstalldocs
-	rm -rf "${ED}"/usr/share/doc/${PN} || die
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }