gentoo resync : 25.08.2020

4 files changed, 130 insertions, 28 deletions

diff --git a/media-video/rtmpdump/Manifest b/media-video/rtmpdump/Manifest
index d170d8ddcc0f..f0b2e8a7450e 100644
--- a/media-video/rtmpdump/Manifest
+++ b/media-video/rtmpdump/Manifest
@@ -2,6 +2,8 @@ AUX rtmpdump-openssl-1.1-v2.patch 8964 BLAKE2B 7ac621cafbbd159a9e143f0c0108c4b08
 AUX rtmpdump-swf_vertification_type_2.patch 545 BLAKE2B e6db03f060ead7122029f15c0cc259e04863c2d5d0d2509a21de69f7fc61c1d3fb0ac062759c52e22e60733acdfb495cb4e6892ba7acb8e1f36ce1fe42f3ccd9 SHA512 5b5b4582b488429f8192b1158903047986d8ebc117c2ed81f7ab18bf59bcf8b8f6bc9a38fae89aff04af2342ca1362288a39516660f2163b94781c838652ad06
 AUX rtmpdump-swf_vertification_type_2_part_2.patch 868 BLAKE2B a5014fdc8bcf2cecbe5120297d4563c7d396e54c34e5f6dddf420fcfdbea4797c865daa0750cb1fa65f7c959d36381ce257ec48b3f4f377ce9ead3b3fe4cf833 SHA512 a0c1c46561384961bbb45962d416664cbd7a4a8c2e16eda4370d9acf76be809541ade182e41320102f252ed4e69dd2d6a0de37ad4085b52a22dc6ff0135d8894
 DIST rtmpdump-2.4_p20161210.tar.gz 142837 BLAKE2B 412a7c3b21738db643042e51e03b11e115ae1d68214e644374e8c10f3b2ab3f659ce1af884135d0e89f2e0ba44ebdf41937bc0f02d875c463ca711d9ae95698c SHA512 76617f02c13d7e8e3a7cf2734c6174e56fb321a881c9e4869bf6393786b193e0c01a8c530ecbf0679cc888c523af5712f2dcb2031fbd09729b7ddeebc3a4b133
+DIST rtmpdump-2.4_p20190330.tar.gz 143037 BLAKE2B ab0edbca444fc71034a1c6386f304d8f49f92075f6d4ca87992a7b9c4b4058f84333011e86cf38470f7b1dbf5e69f27e8b1fe34267104191c447342a03c18e3c SHA512 5357d01b51d3ec8c3c584c4e5aa9720a4c04b86573bc6cb7d724d660937b04b6dd35338b17721d6521fde2627e83763ed3b7c010f959bd72573016f3c47480b0
 EBUILD rtmpdump-2.4_p20161210-r3.ebuild 2795 BLAKE2B 1719b876e6fa430158036323f3a29e5c47080df2e94876419d7c2bfd67b5a54e86938d0d4b8e3a77486a01de154beb9f759e9a9c402fa4d34234dbe6f1f24de5 SHA512 b3dc94d290e431d443d6ef7b20c149fcf20315dbded2dd2e93e997613a3181a5ce0e2a5bfeb4edfcfca544fbdeb05b18fd66c0acb3de1186715cf9a4e466a658
-EBUILD rtmpdump-9999.ebuild 2802 BLAKE2B 1f5f3de61c20ae9e0431f4aac81185b395cc852ef62eb64993b8e2cd167b34d1990853b3c54047773bac5147adfc0b9ba7fd8f689a80cea63b426af0d23d0a27 SHA512 a4449a69bf67afcd7f03c087667e26c76fe6f17eece0f742e9942d761dee92a15d899781c2e05a10bdeac78c341c2a94a939c6a7baed5435cd8f00454d619b26
-MISC metadata.xml 444 BLAKE2B 97f64854abc028cf6eb902008992a94e434db6de7258b8065666b31af4b92118044e4c3427792782cf7ac7a2eb8bb0fbaee047027ca2f648178cc07f46c6ac88 SHA512 38b9987993f4a3ed479c50aeda81436a8cbec7ad48c1e509fc351a58557c3922fe0834a680cda9996a5c5ca1b0b48377772e3eef775281eb40962f95ac095e7c
+EBUILD rtmpdump-2.4_p20190330.ebuild 2911 BLAKE2B 73e925601fe45531fda2d566015ed856ba36f3e5e5cc6365ad5dc29ceff57a56fe369892b27126c18788395b36ea7a5a1a3fed4f2f5f266732bdee299199c6d9 SHA512 f96859bc18c82fc10f263b4cf6501716c2a6295be44125f93975f84496436677b4898030ed6896979f85224669117b01ea97e3e825271449eac007e001b72f29
+EBUILD rtmpdump-9999.ebuild 2911 BLAKE2B 73e925601fe45531fda2d566015ed856ba36f3e5e5cc6365ad5dc29ceff57a56fe369892b27126c18788395b36ea7a5a1a3fed4f2f5f266732bdee299199c6d9 SHA512 f96859bc18c82fc10f263b4cf6501716c2a6295be44125f93975f84496436677b4898030ed6896979f85224669117b01ea97e3e825271449eac007e001b72f29
+MISC metadata.xml 830 BLAKE2B c716bc86aa84124cb7729fd1ff19a4cec080124c9110773da8c27360a155fe10e03e6d7be6af812ab8eff3d460c4b9cdfe3713432329500dc85f8612f14ae2db SHA512 111e30937fc4cfedbd0f03fc41fa6096d9ffdc6dff414c57dd9af1cf632eaa3721d76f66b6937eba786dbbfc035398879f03448098c0a9ff581203bdfa272f4b
diff --git a/media-video/rtmpdump/metadata.xml b/media-video/rtmpdump/metadata.xml
index b36893c1b2a1..77d74434352c 100644
--- a/media-video/rtmpdump/metadata.xml
+++ b/media-video/rtmpdump/metadata.xml
@@ -9,5 +9,12 @@
     rtmpdump is a toolkit for RTMP streams.
     All forms of RTMP are supported, including
     rtmp://, rtmpt://, rtmpe://, rtmpte://, and rtmps://.
+    Includes librtmp library.
   </longdescription>
+    <use>
+       <flag name="ssl">Enable Cryptographic features</flag>
+       <flag name="gnutls">Use GnuTLS instead of OpenSSL for Cryptography</flag>
+       <flag name="libressl">Use LibreSSL instead of OpenSSL for Cryptography</flag>
+       <flag name="tools">Enable installation of various binary tools in addition to librtmp library</flag>
+    </use>
 </pkgmetadata>
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild
new file mode 100644
index 000000000000..c5698f9c7a33
--- /dev/null
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20190330.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib toolchain-funcs multilib-minimal flag-o-matic
+
+DESCRIPTION="RTMP client, librtmp library intended to stream audio or video flash content"
+HOMEPAGE="https://rtmpdump.mplayerhq.hu/"
+
+# the library is LGPL-2.1, the command is GPL-2
+LICENSE="LGPL-2.1 tools? ( GPL-2 )"
+SLOT="0"
+IUSE="gnutls ssl static-libs +tools libressl"
+
+REQUIRED_USE="?? ( gnutls libressl )"
+
+DEPEND="ssl? (
+		gnutls? (
+			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+		)
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+		!gnutls? ( !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) )
+		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	)"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-swf_vertification_type_2.patch"
+	"${FILESDIR}/${PN}-swf_vertification_type_2_part_2.patch"
+)
+
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="http://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/c5f04a58fc2aeea6296ca7c44ee4734c18401aa3.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-c5f04a5"
+fi
+
+pkg_setup() {
+	if ! use ssl; then
+		if use gnutls; then
+			ewarn "USE='gnutls' is ignored without USE='ssl'."
+			ewarn "Please review the local USE flags for this package."
+		fi
+		if use libressl; then
+			ewarn "USE='libressl' is ignored without USE='ssl'."
+			ewarn "Please review the local USE flags for this package."
+		fi
+	fi
+}
+
+src_prepare() {
+	# fix #571106 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+	# fix Makefile ( bug #298535 , bug #318353 and bug #324513 )
+	sed -i 's/\$(MAKEFLAGS)//g' Makefile \
+		|| die "failed to fix Makefile"
+	sed -i -e 's:OPT=:&-fPIC :' \
+		-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-v2.patch"
+	default
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	if use ssl ; then
+		if use gnutls ; then
+			crypto="GNUTLS"
+		else
+			crypto="OPENSSL"
+		fi
+	fi
+	if ! multilib_is_native_abi || ! use tools ; then
+		cd librtmp || die
+	fi
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix
+}
+
+multilib_src_install() {
+	mkdir -p "${ED}"/usr/$(get_libdir) || die
+	if multilib_is_native_abi && use tools ; then
+		dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
+	else
+		cd librtmp || die
+	fi
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir='$(prefix)/share/man' \
+		CRYPTO="${crypto}" libdir="${EPREFIX}/usr/$(get_libdir)" install
+	find "${D}" -name '*.la' -delete || die
+	use static-libs || find "${D}" -name '*.a' -delete || die
+}
diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index 4e6b50ef0fc2..c5698f9c7a33 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -5,23 +5,23 @@ EAPI="7"
 
 inherit multilib toolchain-funcs multilib-minimal flag-o-matic
 
-DESCRIPTION="RTMP client intended to stream audio or video flash content"
+DESCRIPTION="RTMP client, librtmp library intended to stream audio or video flash content"
 HOMEPAGE="https://rtmpdump.mplayerhq.hu/"
 
 # the library is LGPL-2.1, the command is GPL-2
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="LGPL-2.1 tools? ( GPL-2 )"
 SLOT="0"
-IUSE="gnutls ssl static-libs libressl"
+IUSE="gnutls ssl static-libs +tools libressl"
+
+REQUIRED_USE="?? ( gnutls libressl )"
 
 DEPEND="ssl? (
 		gnutls? (
 			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)]
 			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
 		)
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-		)
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+		!gnutls? ( !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) )
 		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	)"
 RDEPEND="${DEPEND}"
@@ -37,23 +37,20 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-	SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+	SRC_URI="http://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/c5f04a58fc2aeea6296ca7c44ee4734c18401aa3.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-c5f04a5"
 fi
 
 pkg_setup() {
-	if ! use ssl && use gnutls ; then
-		ewarn "USE='gnutls' is ignored without USE='ssl'."
-		ewarn "Please review the local USE flags for this package."
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]] ; then
-		git-r3_src_unpack
-	else
-		mkdir -p "${S}" || die "Can't create source directory"
-		cd "${S}" || die
-		unpack ${A}
+	if ! use ssl; then
+		if use gnutls; then
+			ewarn "USE='gnutls' is ignored without USE='ssl'."
+			ewarn "Please review the local USE flags for this package."
+		fi
+		if use libressl; then
+			ewarn "USE='libressl' is ignored without USE='ssl'."
+			ewarn "Please review the local USE flags for this package."
+		fi
 	fi
 }
 
@@ -80,9 +77,7 @@ multilib_src_compile() {
 			crypto="OPENSSL"
 		fi
 	fi
-	#fix multilib-script support. Bug #327449
-	sed -i "/^libdir/s:lib$:$(get_libdir):" librtmp/Makefile || die
-	if ! multilib_is_native_abi; then
+	if ! multilib_is_native_abi || ! use tools ; then
 		cd librtmp || die
 	fi
 	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
@@ -91,13 +86,13 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	mkdir -p "${ED}"/usr/$(get_libdir) || die
-	if multilib_is_native_abi; then
+	if multilib_is_native_abi && use tools ; then
 		dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
 	else
 		cd librtmp || die
 	fi
 	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir='$(prefix)/share/man' \
-		CRYPTO="${crypto}" install
+		CRYPTO="${crypto}" libdir="${EPREFIX}/usr/$(get_libdir)" install
 	find "${D}" -name '*.la' -delete || die
 	use static-libs || find "${D}" -name '*.a' -delete || die
 }