Fix polarssl dependency to match >=0.14.0. Bug #331587

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 19 insertions, 130 deletions

diff --git a/media-video/rtmpdump/ChangeLog b/media-video/rtmpdump/ChangeLog
index 3f1c0d92411b..a3bbe7e2def7 100644
--- a/media-video/rtmpdump/ChangeLog
+++ b/media-video/rtmpdump/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/rtmpdump
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/ChangeLog,v 1.9 2010/07/11 15:14:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/ChangeLog,v 1.10 2010/08/27 17:24:06 hwoarang Exp $
+
+  27 Aug 2010; Markos Chandras <hwoarang@gentoo.org> -rtmpdump-2.2d.ebuild,
+  -rtmpdump-2.2e-r3.ebuild, rtmpdump-2.3.ebuild:
+  Fix polarssl dependency to match >=0.14.0. Bug #331587
 
   11 Jul 2010; Jeroen Roovers <jer@gentoo.org> rtmpdump-2.3.ebuild:
   Marked ~hppa (bug #324941).
diff --git a/media-video/rtmpdump/Manifest b/media-video/rtmpdump/Manifest
index 803c008787b2..9c47fe3b324f 100644
--- a/media-video/rtmpdump/Manifest
+++ b/media-video/rtmpdump/Manifest
@@ -1,8 +1,14 @@
-DIST rtmpdump-2.2d.tgz 118309 RMD160 33f211d8edcedb020789b34c736fd0feba4ba6c1 SHA1 1e4de42fdae647f4810dc9e22d9a76cce74c88cc SHA256 a5660fed0b66e36fb7727b9492d5fe210b87acb6f7b493eb52ac91fbeac84c70
-DIST rtmpdump-2.2e.tar.gz 123742 RMD160 ddb796dfa0287622c2e34ecf6add2d75259b6859 SHA1 369010b64d798f04559055fdbe2962944505decd SHA256 15f984a8a084137b46a19c48e90f62be088c383edfad9804690842e55ef5a6b5
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST rtmpdump-2.3.tgz 125103 RMD160 1d48925e6567783806fa68819d6a695cd06138bc SHA1 b65ce7708ae79adb51d1f43dd0b6d987076d7c42 SHA256 ef38b7a99d82ce6912063d21063aeaf28185341b3df486e24bffce5354224b2c
-EBUILD rtmpdump-2.2d.ebuild 1569 RMD160 0a989cb5bc53185505d3984e3f041d96de9d641e SHA1 01f610da5b07908681e5f3eb44222c1619042a9e SHA256 9ea4eb0a03f9b8782054a5a9b51b496a46fc4a4f9ae655caa95da3885e7129bc
-EBUILD rtmpdump-2.2e-r3.ebuild 1734 RMD160 9cf6f4438c89d79215625764d887b03091403810 SHA1 3e2edadf5df46a399f2fd0136ac12e324c7c7de5 SHA256 eeffbb85dbdf47fc6fe9b0408df6a68e1947ce259ea2f54b634256cb447697ae
-EBUILD rtmpdump-2.3.ebuild 1881 RMD160 c04974ba305de02f6f3535cb3a987ce9b651ff3c SHA1 55438d34907597e3f8a72a3016eb92482578c49d SHA256 b66921f2f5e9873963cff8e7d5a34e6a22c7575c824b31786f3080a90d9ddb61
-MISC ChangeLog 1985 RMD160 3f7c663d418c3e0f6e7d5c526fe4c56959598a6a SHA1 dd8eab236aa00d0f74d9b3a8f2c57f363ed12862 SHA256 8629a7b5cd355245cc5d7b97875c3f3f47b1b9f04690fff79c5001cf222e9005
+EBUILD rtmpdump-2.3.ebuild 1895 RMD160 7b2518056b598458c8dafd9410449d3e03f0d278 SHA1 3dd379d4a01c40d85809bd7a74ef91743e81724c SHA256 6075dc1f52038dc6c4bfe04d3beabc3f5f0e1b6d5622c383ae51620a723bd093
+MISC ChangeLog 2174 RMD160 93c706fedc594f98acd286e7918f8206f9c8af61 SHA1 5aaa3f720094e5a83b47a6a8107def34188166b1 SHA256 145b3ad2490349e230c7041cae70bda830bc0a615e56588429c0537381aa495f
 MISC metadata.xml 472 RMD160 4835468842fdab943f6be092477f49086c6a29b9 SHA1 956aa390149904e2c64696cf44e36d5cfea8ac0f SHA256 e8efe99d2c5cee392b1222aedf2703c49f8b1a452d125a371fd3c3b2bbbe2b03
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkx39McACgkQ9/cejkQaxBCmNwCffB67/QKql4HP4jAiT4uhKnp6
+le4An0Sq0gbWYt1Fb6Noq+ml0n+ayr7J
+=Zyty
+-----END PGP SIGNATURE-----
diff --git a/media-video/rtmpdump/rtmpdump-2.2d.ebuild b/media-video/rtmpdump/rtmpdump-2.2d.ebuild
deleted file mode 100644
index 4d2ca4b10f4a..000000000000
--- a/media-video/rtmpdump/rtmpdump-2.2d.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-2.2d.ebuild,v 1.1 2010/06/05 11:07:22 hwoarang Exp $
-
-EAPI="2"
-
-inherit 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://rtmpdump.mplayerhq.hu/download/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnutls polarssl ssl"
-
-DEPEND="ssl? (
-		gnutls? ( net-libs/gnutls )
-		polarssl? ( !gnutls? ( net-libs/polarssl ) )
-		!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 and bug #318353 )
-	sed -i 's/\$(MAKEFLAGS)//g' Makefile \
-		|| die "failed to fix Makefile"
-}
-
-src_compile() {
-	local crypto=""
-	if use ssl ; then
-		if use gnutls ;	then
-			crypto="GNUTLS"
-		elif use polarssl ; then
-			crypto="POLARSSL"
-		else
-			crypto="OPENSSL"
-		fi
-	fi
-
-	emake CC=$(tc-getCC) LD=$(tc-getLD) \
-		OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" posix || die "emake failed"
-}
-
-src_install() {
-	dobin rtmpdump rtmpsuck rtmpsrv rtmpgw || die "dobin failed"
-	dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html || die "dodoc failed"
-	doman rtmpdump.1 rtmpgw.8 || die "doman failed"
-}
diff --git a/media-video/rtmpdump/rtmpdump-2.2e-r3.ebuild b/media-video/rtmpdump/rtmpdump-2.2e-r3.ebuild
deleted file mode 100644
index a39fe0ac69eb..000000000000
--- a/media-video/rtmpdump/rtmpdump-2.2e-r3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-2.2e-r3.ebuild,v 1.1 2010/06/17 21:56:25 hwoarang Exp $
-
-EAPI="2"
-
-inherit 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://rtmpdump.mplayerhq.hu/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnutls polarssl ssl"
-
-DEPEND="ssl? (
-		gnutls? ( net-libs/gnutls )
-		polarssl? ( !gnutls? ( net-libs/polarssl ) )
-		!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
-
-	emake CC=$(tc-getCC) LD=$(tc-getLD) \
-		OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${DESTTREE}" mandir="${DESTTREE}/share/man" \
-	CRYPTO="${crypto}" install 	|| die "emake install failed"
-	dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html || die "dodoc failed"
-}
diff --git a/media-video/rtmpdump/rtmpdump-2.3.ebuild b/media-video/rtmpdump/rtmpdump-2.3.ebuild
index 5e365e231df6..b7ecdfa5e252 100644
--- a/media-video/rtmpdump/rtmpdump-2.3.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-2.3.ebuild,v 1.3 2010/07/11 15:14:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-2.3.ebuild,v 1.4 2010/08/27 17:24:06 hwoarang Exp $
 
 EAPI="2"
 
@@ -17,7 +17,7 @@ IUSE="gnutls polarssl ssl"
 
 DEPEND="ssl? (
 		gnutls? ( net-libs/gnutls )
-		polarssl? ( !gnutls? ( net-libs/polarssl ) )
+		polarssl? ( !gnutls? ( >=net-libs/polarssl-0.14.0 ) )
 		!gnutls? ( !polarssl? ( dev-libs/openssl ) )
 	)
 	sys-libs/zlib"