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

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

4 files changed, 16 insertions, 68 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/Manifest b/media-video/rtmpdump/Manifest
index c5ffa8b2b009..8a54d923b6ef 100644
--- a/media-video/rtmpdump/Manifest
+++ b/media-video/rtmpdump/Manifest
@@ -1,7 +1,6 @@
 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
 EBUILD rtmpdump-2.2d.ebuild 1569 RMD160 0a989cb5bc53185505d3984e3f041d96de9d641e SHA1 01f610da5b07908681e5f3eb44222c1619042a9e SHA256 9ea4eb0a03f9b8782054a5a9b51b496a46fc4a4f9ae655caa95da3885e7129bc
-EBUILD rtmpdump-2.2e-r1.ebuild 1662 RMD160 0822e60243395cc67bbe88eca5e0a46c69104fb9 SHA1 5ea989eda37bf650f044c8bbfcedc570d2bcdfc5 SHA256 779745932e835bde6610844cce4c54787f403db4d9582218c03722be8ccc6cb1
-EBUILD rtmpdump-2.2e-r2.ebuild 1665 RMD160 0c8f5a9aba68ec593c680123b3e3255223c5a6b1 SHA1 bbd477be132313fb8fb67ef680f640b211a0ca03 SHA256 58f22b7eabbadd432a6a80b0d987316812f4ccb720785b155dc76c09e56d95b0
-MISC ChangeLog 1258 RMD160 9baf3dea8424c1a2f231c4471305f12f87bcc4c5 SHA1 229e5bd0e3642e7453ed7e2a29bfed8f5a036678 SHA256 aabf6ef7f57160c8135d3f00418b07a33c70155d39e883b3dbcccf0eab5fac0d
+EBUILD rtmpdump-2.2e-r3.ebuild 1734 RMD160 9cf6f4438c89d79215625764d887b03091403810 SHA1 3e2edadf5df46a399f2fd0136ac12e324c7c7de5 SHA256 eeffbb85dbdf47fc6fe9b0408df6a68e1947ce259ea2f54b634256cb447697ae
+MISC ChangeLog 1577 RMD160 decf3a0ba787984af7c03ee0279ee941242ad01b SHA1 60ce9d48994bca5513314be2bbb4e814160f2090 SHA256 9bcf69b52f9ec9798ce596826ba6ce5570a2e88c6d0f1fa2447e8686ab634d43
 MISC metadata.xml 472 RMD160 4835468842fdab943f6be092477f49086c6a29b9 SHA1 956aa390149904e2c64696cf44e36d5cfea8ac0f SHA256 e8efe99d2c5cee392b1222aedf2703c49f8b1a452d125a371fd3c3b2bbbe2b03
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"
 }