[gentoo-commits] repo/gentoo:master commit in: media-video/rtmpdump/

[Craig Andrews]

commit:     ab606cec475a4b1fea8a9793ef6ed81b83b919f5
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 27 02:42:07 2018 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Sat Oct 27 02:42:24 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab606cec

media-video/rtmpdump: Don't apply openssl 1.1 patch with USE=libressl

That patch causes compilation errors when used with libressl

Closes: https://bugs.gentoo.org/669708
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild | 2 +-
 media-video/rtmpdump/rtmpdump-9999.ebuild             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild 
b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild
index 8bfb1dd533d..8a45c29d0d0 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild
@@ -24,7 +24,6 @@ DEPEND="ssl? (
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-       "${FILESDIR}/${PN}-openssl-1.1.patch"
        "${FILESDIR}/${PN}-swf_vertification_type_2.patch"
        "${FILESDIR}/${PN}-swf_vertification_type_2_part_2.patch"
 )
@@ -66,6 +65,7 @@ src_prepare() {
                -e 's:OPT:OPTS:' \
                -e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
                || die "failed to fix Makefile"
+       use ssl && use !gnutls && use !libressl && eapply 
"${FILESDIR}/${PN}-openssl-1.1.patch"
        default
        multilib_copy_sources
 }

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild 
b/media-video/rtmpdump/rtmpdump-9999.ebuild
index 8bfb1dd533d..8a45c29d0d0 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -24,7 +24,6 @@ DEPEND="ssl? (
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-       "${FILESDIR}/${PN}-openssl-1.1.patch"
        "${FILESDIR}/${PN}-swf_vertification_type_2.patch"
        "${FILESDIR}/${PN}-swf_vertification_type_2_part_2.patch"
 )
@@ -66,6 +65,7 @@ src_prepare() {
                -e 's:OPT:OPTS:' \
                -e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
                || die "failed to fix Makefile"
+       use ssl && use !gnutls && use !libressl && eapply 
"${FILESDIR}/${PN}-openssl-1.1.patch"
        default
        multilib_copy_sources
 }