Version bump per bug #376551 and live ebuild inclusion

Package-Manager: portage-2.2.0_alpha46/cvs/Linux x86_64

4 files changed, 154 insertions, 6 deletions

diff --git a/media-video/rtmpdump/ChangeLog b/media-video/rtmpdump/ChangeLog
index 48d9ec1e1d04..3d37ee00ff7b 100644
--- a/media-video/rtmpdump/ChangeLog
+++ b/media-video/rtmpdump/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/rtmpdump
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/ChangeLog,v 1.18 2011/07/07 03:57:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/ChangeLog,v 1.19 2011/08/10 10:41:25 hwoarang Exp $
+
+*rtmpdump-9999 (10 Aug 2011)
+*rtmpdump-2.4 (10 Aug 2011)
+
+  10 Aug 2011; Markos Chandras <hwoarang@gentoo.org> +rtmpdump-2.4.ebuild,
+  +rtmpdump-9999.ebuild:
+  Version bump per bug #376551 and live ebuild inclusion
 
   07 Jul 2011; Alexis Ballier <aballier@gentoo.org> rtmpdump-2.3.ebuild:
   keyword ~x86-fbsd
diff --git a/media-video/rtmpdump/Manifest b/media-video/rtmpdump/Manifest
index e495dbb8138e..1f20286c232e 100644
--- a/media-video/rtmpdump/Manifest
+++ b/media-video/rtmpdump/Manifest
@@ -1,14 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 DIST rtmpdump-2.3.tgz 125103 RMD160 1d48925e6567783806fa68819d6a695cd06138bc SHA1 b65ce7708ae79adb51d1f43dd0b6d987076d7c42 SHA256 ef38b7a99d82ce6912063d21063aeaf28185341b3df486e24bffce5354224b2c
+DIST rtmpdump-2.4.tar.gz 134575 RMD160 12eb0ac4b2b68c004e75f80b9365a508b84b9787 SHA1 6a685b4f73eecb984403c36df593c412cd66febc SHA256 51f54d37907f19bfa00219d57ec6e12d09458bb31360e8cf004883df745f094c
 EBUILD rtmpdump-2.3.ebuild 1918 RMD160 d29b1877f763bc7d68056fc5c57ffb7b4d9f1961 SHA1 cd3e62992cc766611cdba5025abf005935ee0afd SHA256 b347efd0ff8a66c416dba41335529982347f2011c571a5cf843472103eab91cd
-MISC ChangeLog 3000 RMD160 77a509e0286b590e9822500cf8a89a7cc1109a04 SHA1 020affe8eb75ce17065bc6b956c0c329e47cf64b SHA256 be99d091c0ace2e3b3828687f00c566dd823d2c98042d1e5f82df75942356af1
+EBUILD rtmpdump-2.4.ebuild 1854 RMD160 e9bbd4db2aa47b23f2ee43f01f44783e560ca588 SHA1 d4bfdc5f4eb5f26cd5924a82583c811f7634381f SHA256 87fcaee97aeb8a144323064ae620b44607037b9c9c005a02c74324321408e13b
+EBUILD rtmpdump-9999.ebuild 1799 RMD160 07db9acc7e634dc1d220e31b55e363b85f97ff41 SHA1 4c51bf0723b4df0c18f2c0cacb296b630036ff06 SHA256 52e9f7035ecc70969ddcb20d1afc8d7803152618c1bfc2cdd2a94e2ec0843c64
+MISC ChangeLog 3216 RMD160 c7b64e0c544fec4cf854b261b2f243762ac37269 SHA1 67cc86a430dbf5eb4e34284b4c24a5a878c05fc6 SHA256 fc8ef206a110f71d20efbbdfe96d92cc1c5aec0d3f3322b6a556d54c2dc112cf
 MISC metadata.xml 472 RMD160 4835468842fdab943f6be092477f49086c6a29b9 SHA1 956aa390149904e2c64696cf44e36d5cfea8ac0f SHA256 e8efe99d2c5cee392b1222aedf2703c49f8b1a452d125a371fd3c3b2bbbe2b03
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4VLqgACgkQvFcC4BYPU0oj4ACeLFngm8h4/ZynDarXklGQ5+Wa
-1XwAni0kp/2riJBoyL6jbkAM5copA4M6
-=WJG+
+iQIcBAEBCgAGBQJOQmAwAAoJEPqDWhW0r/LCA94P+gOiaaGRYb/gcmH+UrkQu4ic
+Jo7uBfmGC3LxksevLzzJ3b14NgwJNzb5YoC3Ynwl3mTk0JX5vX1+TcOky4lIfFep
+WQbPEv9wgCN9emvJm2xtEJHhxgWcfbDXW9wpYbWH9bHWg8OtS+2/ZrA1TrOhukht
+CDt872osqXWBgI0ibZ5FA4D97JDm7pdk6+jqMjEVkWbMrARQQ/T1TWXIT93OMDjM
+70CCxls9i/oH/OirTDe3IpGZq+CipvsT1q1aTUrS7g7NziQmH6Rpu8HApN6pCSov
+fEbnNM8sMSs4oXD/fH9QxXMm4ZgKeOw0dGxrRWFLU4QKVg4rPn98JsXDP2BcpuEO
+4Bw7mYu9RI5f7vEAndGkWkKtd+u3TVwoH1B78Hd90Vay4YKppOC0+adLh4g5DpJz
+LpPLm46Aw31Hc35jHtS2YHw+QyJRJnzECpvkqnZeIJc+BVg6y+0W6Q+eDTTDNfIO
+lnym7M6h1r9t/gVH1gi68z5RbA7sSZSW0Osq1oEzEq0CP1SStc81qlKRUP8RmyHw
+iyV+M/6UwVNQK8M4lELYk5SDfFhjMTEbQUpsd13mT03nrq4R+ICv1REjPCDdonHH
+FDkuvFZATM2avuNuwyU2EiwNTlUEKgKPU4xHCij7Q+U0A7ryCog8O6oivxihJSSt
+BEhXUBEYk6x3OhRZ8uOm
+=tSrl
 -----END PGP SIGNATURE-----
diff --git a/media-video/rtmpdump/rtmpdump-2.4.ebuild b/media-video/rtmpdump/rtmpdump-2.4.ebuild
new file mode 100644
index 000000000000..e9895814370f
--- /dev/null
+++ b/media-video/rtmpdump/rtmpdump-2.4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-2.4.ebuild,v 1.1 2011/08/10 10:41:26 hwoarang Exp $
+
+EAPI="4"
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="Open source command-line RTMP client intended to stream audio or video flash content"
+HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
+SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="gnutls polarssl ssl"
+
+DEPEND="ssl? (
+		gnutls? ( net-libs/gnutls )
+		polarssl? ( !gnutls? ( >=net-libs/polarssl-0.14.0 ) )
+		!gnutls? ( !polarssl? ( dev-libs/openssl ) )
+	)
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if ! use ssl && ( use gnutls ||	use polarssl ) ; then
+		ewarn "USE='gnutls polarssl' are ignored without USE='ssl'."
+		ewarn "Please review the local USE flags for this package."
+	fi
+}
+
+src_prepare() {
+	# 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"
+}
+
+src_compile() {
+	if use ssl ; then
+		if use gnutls ;	then
+			crypto="GNUTLS"
+		elif use polarssl ; then
+			crypto="POLARSSL"
+		else
+			crypto="OPENSSL"
+		fi
+	fi
+	#fix multilib-script support. Bug #327449
+	sed -i "/^libdir/s:lib$:$(get_libdir)$:" librtmp/Makefile
+	emake CC=$(tc-getCC) LD=$(tc-getLD) \
+		OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix
+}
+
+src_install() {
+	mkdir -p "${D}"/${DESTTREE}/$(get_libdir)
+	emake DESTDIR="${D}" prefix="${DESTTREE}" mandir="${DESTTREE}/share/man" \
+	CRYPTO="${crypto}" install
+	dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
+}
diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
new file mode 100644
index 000000000000..b5fbfa90d8cf
--- /dev/null
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-9999.ebuild,v 1.1 2011/08/10 10:41:26 hwoarang Exp $
+
+EAPI="4"
+
+inherit git-2 multilib toolchain-funcs
+
+DESCRIPTION="Open source command-line RTMP client intended to stream audio or video flash content"
+HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
+EGIT_REPO_URI="git://git.ffmpeg.org/rtmpdump"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="gnutls polarssl ssl"
+
+DEPEND="ssl? (
+		gnutls? ( net-libs/gnutls )
+		polarssl? ( !gnutls? ( >=net-libs/polarssl-0.14.0 ) )
+		!gnutls? ( !polarssl? ( dev-libs/openssl ) )
+	)
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if ! use ssl && ( use gnutls ||	use polarssl ) ; then
+		ewarn "USE='gnutls polarssl' are ignored without USE='ssl'."
+		ewarn "Please review the local USE flags for this package."
+	fi
+}
+
+src_prepare() {
+	# 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"
+}
+
+src_compile() {
+	if use ssl ; then
+		if use gnutls ;	then
+			crypto="GNUTLS"
+		elif use polarssl ; then
+			crypto="POLARSSL"
+		else
+			crypto="OPENSSL"
+		fi
+	fi
+	#fix multilib-script support. Bug #327449
+	sed -i "/^libdir/s:lib$:$(get_libdir)$:" librtmp/Makefile
+	emake CC=$(tc-getCC) LD=$(tc-getLD) \
+		OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix
+}
+
+src_install() {
+	mkdir -p "${D}"/${DESTTREE}/$(get_libdir)
+	emake DESTDIR="${D}" prefix="${DESTTREE}" mandir="${DESTTREE}/share/man" \
+	CRYPTO="${crypto}" install
+	dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
+}