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@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild
index 8bfb1dd533deed2765a6b4b575a465d37cf5bce3..8a45c29d0d07cdbadd6631cc47ae8f3936d35852 100644 (file)
--- 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 8bfb1dd533deed2765a6b4b575a465d37cf5bce3..8a45c29d0d07cdbadd6631cc47ae8f3936d35852 100644 (file)
--- 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
 }