Revbump which fixes static archive build with -fPIC. Fixes bug #324513.

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

3 files changed, 14 insertions, 65 deletions

diff --git a/media-video/rtmpdump/ChangeLog b/media-video/rtmpdump/ChangeLog
index dcd362bd7138..a33212ef4ae1 100644
--- a/media-video/rtmpdump/ChangeLog
+++ b/media-video/rtmpdump/ChangeLog
@@ -1,6 +1,14 @@
 # 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.5 2010/06/17 16:05:48 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/ChangeLog,v 1.6 2010/06/17 21:56:25 hwoarang Exp $
+
+*rtmpdump-2.2e-r3 (17 Jun 2010)
+
+  17 Jun 2010; Markos Chandras <hwoarang@gentoo.org>
+  -rtmpdump-2.2e-r1.ebuild, -rtmpdump-2.2e-r2.ebuild,
+  +rtmpdump-2.2e-r3.ebuild:
+  Revbump which fixes static archive build with -fPIC. Fixes bug #324513. Thanks to Marc-Antoine
+  Perennou <Marc-Antoine@Perennou.com> for the patch
 
 *rtmpdump-2.2e-r2 (17 Jun 2010)
 
diff --git a/media-video/rtmpdump/rtmpdump-2.2e-r1.ebuild b/media-video/rtmpdump/rtmpdump-2.2e-r1.ebuild
deleted file mode 100644
index a2b7542823f7..000000000000
--- a/media-video/rtmpdump/rtmpdump-2.2e-r1.ebuild
+++ /dev/null
@@ -1,61 +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-r1.ebuild,v 1.2 2010/06/06 23:09:20 lu_zero 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 and bug #318353 )
-	sed -i 's/\$(MAKEFLAGS)//g' Makefile \
-		|| die "failed to fix Makefile"
-	sed -i 's:OPT=:&-fPIC :' librtmp/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}" SYS=posix || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${DESTTREE}" mandir="${DESTTREE}/share/man" 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.2e-r2.ebuild b/media-video/rtmpdump/rtmpdump-2.2e-r3.ebuild
index 106bbaf4f038..a39fe0ac69eb 100644
--- a/media-video/rtmpdump/rtmpdump-2.2e-r2.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.2e-r3.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.2e-r2.ebuild,v 1.1 2010/06/17 16:05:48 hwoarang Exp $
+# $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"
 
@@ -31,10 +31,12 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# fix Makefile ( bug #298535 and bug #318353 )
+	# fix Makefile ( bug #298535 , bug #318353 and bug #324513 )
 	sed -i 's/\$(MAKEFLAGS)//g' Makefile \
 		|| die "failed to fix Makefile"
-	sed -i 's:OPT=:&-fPIC :' librtmp/Makefile \
+	sed -i -e 's:OPT=:&-fPIC :' \
+		-e 's:OPT:OPTS:' \
+		-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
 		|| die "failed to fix Makefile"
 }