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

["Benda XU" <heroxbd@gentoo.org>]

commit:     072832ee7e42b6939b2374827b4b22679e8fe0e3
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 24 07:11:23 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Aug 24 07:11:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=072832ee

media-video/rtmpdump: fix librtmp pkg-config paths for Prefix.

  Bump -9999 to EAPI 6 and git-r3 as a side effect.

Bug: 616202

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 ...9999.ebuild => rtmpdump-2.4_p20161210-r1.ebuild} | 21 ++++++++++++++-------
 media-video/rtmpdump/rtmpdump-9999.ebuild           |  9 +++++----
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild
similarity index 79%
copy from media-video/rtmpdump/rtmpdump-9999.ebuild
copy to media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild
index b4c247a6697..13ae3a45a58 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI="6"
 
-inherit git-2 multilib toolchain-funcs multilib-minimal flag-o-matic
+inherit multilib toolchain-funcs multilib-minimal flag-o-matic
 
 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 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="gnutls polarssl ssl libressl"
 
 DEPEND="ssl? (
@@ -30,6 +30,12 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	mkdir -p "${S}" || die "Can't create source directory"
+	cd "${S}" || die
+	unpack ${A}
+}
+
 src_prepare() {
 	# fix #571106 by restoring pre-GCC5 inline semantics
 	append-cflags -std=gnu89
@@ -40,12 +46,13 @@ src_prepare() {
 		-e 's:OPT:OPTS:' \
 		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
 		|| die "failed to fix Makefile"
+	eapply_user
 	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"
@@ -69,6 +76,6 @@ multilib_src_install() {
 	else
 		cd librtmp || die
 	fi
-	emake DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man" \
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir='$(prefix)/share/man' \
 		CRYPTO="${crypto}" install
 }

diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index b4c247a6697..80f3d75437d 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI="6"
 
-inherit git-2 multilib toolchain-funcs multilib-minimal flag-o-matic
+inherit git-r3 multilib toolchain-funcs multilib-minimal flag-o-matic
 
 DESCRIPTION="RTMP client intended to stream audio or video flash content"
 HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
@@ -40,6 +40,7 @@ src_prepare() {
 		-e 's:OPT:OPTS:' \
 		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
 		|| die "failed to fix Makefile"
+	eapply_user
 	multilib_copy_sources
 }
 
@@ -69,6 +70,6 @@ multilib_src_install() {
 	else
 		cd librtmp || die
 	fi
-	emake DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man" \
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir='$(prefix)/share/man' \
 		CRYPTO="${crypto}" install
 }