Remove old hack for $LDFLAGS passing (fixed upstream), remove the append-flags (fixed upstream).

Package-Manager: portage-2.1_rc3-r2

3 files changed, 25 insertions, 17 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index eb328e3c49af..674550a4f543 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.142 2006/05/31 10:04:05 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.143 2006/05/31 11:37:31 flameeyes Exp $
+
+  31 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  ffmpeg-0.4.9_p20060530.ebuild:
+  Remove old hack for $LDFLAGS passing (fixed upstream), remove the
+  append-flags (fixed upstream).
 
   31 May 2006; Luca Barbato <lu_zero@gentoo.org>
   ffmpeg-0.4.9_p20060530.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 011e565be996..610fdf489b42 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.4.8-gcc3.4-magicF2W.patch 994 RMD160 4192e2537d220d4b63c55bdea36ac7f5532d8a6a SHA1 07c79c6680ebe0b1a695394ba4d24abb503c4b46 SHA256 3d359f8483903dcc876be0ee4ff511d63a8cf57fade26d58f72e4a3ec0694226
 MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
 RMD160 4192e2537d220d4b63c55bdea36ac7f5532d8a6a files/0.4.8-gcc3.4-magicF2W.patch 994
@@ -61,14 +64,14 @@ EBUILD ffmpeg-0.4.9_p20060517.ebuild 7718 RMD160 94f1ed3aaa88d7595b36c1265862bb5
 MD5 587e561ad1ae6e62cc1453690819d25c ffmpeg-0.4.9_p20060517.ebuild 7718
 RMD160 94f1ed3aaa88d7595b36c1265862bb5cb469f166 ffmpeg-0.4.9_p20060517.ebuild 7718
 SHA256 c6b9c00d45c4c630e7ad9c9f909ca29afe2065b382b43a5c580111d24fa97dab ffmpeg-0.4.9_p20060517.ebuild 7718
-EBUILD ffmpeg-0.4.9_p20060530.ebuild 7743 RMD160 af3662f851c00c13d5da284272485b55f6114c2a SHA1 25de652c9801ba5851342529bbae7c2718ebdbab SHA256 7e22f262d34ad9cdda125141578bcd30626dcd8ce024fef2570ea075481ced03
-MD5 6eb682e888d6b190d0eed9f8da0e02e8 ffmpeg-0.4.9_p20060530.ebuild 7743
-RMD160 af3662f851c00c13d5da284272485b55f6114c2a ffmpeg-0.4.9_p20060530.ebuild 7743
-SHA256 7e22f262d34ad9cdda125141578bcd30626dcd8ce024fef2570ea075481ced03 ffmpeg-0.4.9_p20060530.ebuild 7743
-MISC ChangeLog 21702 RMD160 bc54d075850f16155c58919717f9ee8f6225e39c SHA1 2ff2c3359133c082338a43de747f9c179d99affc SHA256 c67693d5cfc51f23a704f3a71a34f55e20ddbbac581b4608d5213d1dc306566f
-MD5 8e5311065c8b06746286b139a2077f89 ChangeLog 21702
-RMD160 bc54d075850f16155c58919717f9ee8f6225e39c ChangeLog 21702
-SHA256 c67693d5cfc51f23a704f3a71a34f55e20ddbbac581b4608d5213d1dc306566f ChangeLog 21702
+EBUILD ffmpeg-0.4.9_p20060530.ebuild 7421 RMD160 976a4aa53e5f672d739cad5e726499c51ea2fb58 SHA1 3c37be08c5512ea440dd38e726ba115d9c2bec88 SHA256 1cf457d384221d075536e477b7e164c0d28d89ba881b0136c80f8909f53b0a31
+MD5 6bc99cc86ff2fa3f299acc2f83f32500 ffmpeg-0.4.9_p20060530.ebuild 7421
+RMD160 976a4aa53e5f672d739cad5e726499c51ea2fb58 ffmpeg-0.4.9_p20060530.ebuild 7421
+SHA256 1cf457d384221d075536e477b7e164c0d28d89ba881b0136c80f8909f53b0a31 ffmpeg-0.4.9_p20060530.ebuild 7421
+MISC ChangeLog 21892 RMD160 0893ba968e848547b99b755017818f5c8b5ed936 SHA1 cef276bd2b8538f93421aa480d63408b83caf190 SHA256 fd974e19c7bf2205909a6ce6a3d1d6e855ebc9708ae24f8f0486469ec16653d5
+MD5 e73193838c38efb1a3b947f4fb9511b6 ChangeLog 21892
+RMD160 0893ba968e848547b99b755017818f5c8b5ed936 ChangeLog 21892
+SHA256 fd974e19c7bf2205909a6ce6a3d1d6e855ebc9708ae24f8f0486469ec16653d5 ChangeLog 21892
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
@@ -88,3 +91,10 @@ SHA256 40809495f2dc849a8a2073aee157d06403a7327a51096ca78d5d8143fef813e4 files/di
 MD5 0fe6aaa1d4065bad4b6acec555ac656d files/digest-ffmpeg-0.4.9_p20060530 714
 RMD160 0f84e13ed0803a7d5e4a4ff12812b0aa3ba8cb4e files/digest-ffmpeg-0.4.9_p20060530 714
 SHA256 d12a59bb4e7e8e541a7937bc8e1539aab908413d08cbec1e512409a8a5a8b2ba files/digest-ffmpeg-0.4.9_p20060530 714
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEfYADAiZjviIA2XgRAtV1AJ4uUgHAj8OsK9NMO9Rgv1S0DII7BACggYPG
+y5OGW08DRlDNRnEY7R4tRF8=
+=0AR5
+-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20060530.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20060530.ebuild
index 8fc008410304..6ff97241a4a9 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20060530.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20060530.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20060530.ebuild,v 1.2 2006/05/31 10:04:05 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20060530.ebuild,v 1.3 2006/05/31 11:37:31 flameeyes Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -155,7 +155,6 @@ src_compile() {
 		--mandir=/usr/share/man \
 		--enable-static --disable-shared \
 		"--cc=$(tc-getCC)" \
-		"--extra-ldflags=${LDFLAGS}" \
 		${myconf} || die "static failed"
 
 
@@ -176,11 +175,6 @@ src_compile() {
 		fi
 	fi
 
-	# This is needed to make sure that when linking with --as-needed all the
-	# libraries are found in the right places, not suitable for upstream yet as
-	# it's GNU-ld only (most likely).
-	append-ldflags "-Wl,-rpath-link,${S_SHARED}/libav"{codec,format,util}
-
 	cd ${S_SHARED}
 	#econf generates configure options unknown to ffmpeg's configure, so configure manually
 	./configure \
@@ -188,7 +182,6 @@ src_compile() {
 		--mandir=/usr/share/man \
 		--disable-static --enable-shared \
 		"--cc=$(tc-getCC)" \
-		"--extra-ldflags=${LDFLAGS}" \
 		${myconf} || die "shared failed"
 
 	emake || die "shared failed"