commit: 3252a86b2afff788707c84c540504cca87ac8630 Author: Bertrand Jacquin <bertrand <AT> jacquin <DOT> bzh> AuthorDate: Sat Sep 3 22:18:53 2016 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Wed Sep 14 11:15:42 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3252a86b
media-video/rtmpdump: Move to EAPI6 and git-r3. Specify dev-libs/openssl and dev-libs/libressl SLOT. Package-Manager: portage-2.2.28 Closes: https://github.com/gentoo/gentoo/pull/2210 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> ...999.ebuild => rtmpdump-2.4_p20131018-r1.ebuild} | 28 ++++++++++++---------- media-video/rtmpdump/rtmpdump-9999.ebuild | 13 ++++++---- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20131018-r1.ebuild similarity index 80% copy from media-video/rtmpdump/rtmpdump-9999.ebuild copy to media-video/rtmpdump/rtmpdump-2.4_p20131018-r1.ebuild index c9348c0..5a9d6d3 100644 --- a/media-video/rtmpdump/rtmpdump-9999.ebuild +++ b/media-video/rtmpdump/rtmpdump-2.4_p20131018-r1.ebuild @@ -2,28 +2,31 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="4" +EAPI="6" -inherit git-2 multilib toolchain-funcs multilib-minimal +inherit multilib toolchain-funcs multilib-minimal DESCRIPTION="RTMP client intended to stream audio or video flash content" HOMEPAGE="http://rtmpdump.mplayerhq.hu/"; -EGIT_REPO_URI="git://git.ffmpeg.org/rtmpdump" +SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"; # the library is LGPL-2.1, the command is GPL-2 LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~amd64-fbsd ~amd64-linux ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-linux" IUSE="gnutls polarssl ssl libressl" DEPEND="ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] ) polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[${MULTILIB_USEDEP}] ) ) - !gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) ) ) + !gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl:0 ) ) ) >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" RDEPEND="${DEPEND}" +DOCS=( README ChangeLog ) +HTML_DOCS=( rtmpdump.1.html rtmpgw.8.html ) + pkg_setup() { if ! use ssl && { use gnutls || use polarssl; }; then ewarn "USE='gnutls polarssl' are ignored without USE='ssl'." @@ -32,6 +35,8 @@ pkg_setup() { } src_prepare() { + default + # fix #571106 by restoring pre-GCC5 inline semantics append-cflags -std=gnu89 # fix Makefile ( bug #298535 , bug #318353 and bug #324513 ) @@ -42,11 +47,9 @@ src_prepare() { -e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \ || die "failed to fix Makefile" multilib_copy_sources -} -multilib_src_compile() { if use ssl ; then - if use gnutls ; then + if use gnutls ; then crypto="GNUTLS" elif use polarssl ; then crypto="POLARSSL" @@ -54,6 +57,9 @@ multilib_src_compile() { crypto="OPENSSL" fi fi +} + +multilib_src_compile() { #fix multilib-script support. Bug #327449 sed -i "/^libdir/s:lib$:$(get_libdir):" librtmp/Makefile || die if ! multilib_is_native_abi; then @@ -65,11 +71,9 @@ multilib_src_compile() { multilib_src_install() { mkdir -p "${ED}"/usr/$(get_libdir) || die - if multilib_is_native_abi; then - dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html - else + if ! multilib_is_native_abi; then cd librtmp || die fi emake DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man" \ - CRYPTO="${crypto}" install + CRYPTO="${crypto}" install } diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild index c9348c0..4c568c3 100644 --- a/media-video/rtmpdump/rtmpdump-9999.ebuild +++ b/media-video/rtmpdump/rtmpdump-9999.ebuild @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="4" +EAPI="6" -inherit git-2 multilib toolchain-funcs multilib-minimal +inherit git-r3 multilib toolchain-funcs multilib-minimal DESCRIPTION="RTMP client intended to stream audio or video flash content" HOMEPAGE="http://rtmpdump.mplayerhq.hu/"; @@ -24,6 +24,9 @@ DEPEND="ssl? ( )" RDEPEND="${DEPEND}" +DOCS=( README ChangeLog ) +HTML_DOCS=( rtmpdump.1.html rtmpgw.8.html ) + pkg_setup() { if ! use ssl && { use gnutls || use polarssl; }; then ewarn "USE='gnutls polarssl' are ignored without USE='ssl'." @@ -32,6 +35,8 @@ pkg_setup() { } src_prepare() { + default + # fix #571106 by restoring pre-GCC5 inline semantics append-cflags -std=gnu89 # fix Makefile ( bug #298535 , bug #318353 and bug #324513 ) @@ -65,9 +70,7 @@ multilib_src_compile() { multilib_src_install() { mkdir -p "${ED}"/usr/$(get_libdir) || die - if multilib_is_native_abi; then - dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html - else + if ! multilib_is_native_abi; then cd librtmp || die fi emake DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man" \
