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

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 7 insertions, 124 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/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"