Update -fPIC filtering magic for post hardened-gcc.

3 files changed, 28 insertions, 26 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index f1a041a85eb9..017882c1c213 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.118 2004/04/03 23:48:29 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.119 2004/04/06 04:48:27 tseng Exp $
+
+  06 Apr 2004; Brandon Hale <tseng@gentoo.org> mplayer-1.0_pre3-r5.ebuild:
+  Update -fPIC filtering magic for post hardened-gcc.
 
   04 Apr 2004; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre3-r5.ebuild,
   files/ppc750FX-fix.patch:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 51a895005750..7788a0809666 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,25 +1,25 @@
-MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
-MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
-MD5 8b8084aa31b466c55d15bd06bb77086d files/mplayer-1.0_pre3-xmms.patch 411
-MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r3 358
-MD5 e2fc2cbbc8ebf183dcb599b66c999331 files/ppc750FX-fix.patch 515
-MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520
-MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
+MD5 d010ba52440cd4ca8967b5bfd5607d53 ChangeLog 20635
+MD5 f51499e146e6839aa021246a65038f99 mplayer-1.0_pre3-r4.ebuild 12131
+MD5 84f10e8dcf950baba007a5353ce6d0be mplayer-1.0_pre3-r5.ebuild 11388
+MD5 a9da267b040ddeaf03e4c6a5e646dd32 mplayer-1.0_pre3-r3.ebuild 11829
+MD5 b9caadadbde39fda82535e76a6fcbf04 mplayer-0.92-r1.ebuild 11850
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 19e1d19e15bddeab1b6f5494f77a5eca mplayer-1.0_pre2-r1.ebuild 11720
 MD5 8f18911adcd661e70ad0cd84a94d49ac files/mplayer-0.90-divx.patch 25064
-MD5 26a52f084f4d177580ed9ea0187f54e7 files/mplayer-0.90-ppc-benh-2.patch 2049
-MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r4 358
-MD5 059e03d1d2c965b04a5e53ed850de64a files/mplayer-0.90_rc4-gtk2.patch 6183
+MD5 fa86dd9d6980ff064efcc9d9f919905e files/mplayer-1.0_pre3-libmatroska063.diff 810
+MD5 deb1dbbf5879ed31e1b83fb7def5b600 files/digest-mplayer-0.92-r1 355
 MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903
+MD5 8b8084aa31b466c55d15bd06bb77086d files/mplayer-1.0_pre3-xmms.patch 411
+MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
+MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
+MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520
 MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
+MD5 059e03d1d2c965b04a5e53ed850de64a files/mplayer-0.90_rc4-gtk2.patch 6183
+MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
 MD5 fef9f0571da54ae3df2e804100bd2632 files/vuln01-fix.diff 1231
+MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r3 358
 MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r5 358
-MD5 fa86dd9d6980ff064efcc9d9f919905e files/mplayer-1.0_pre3-libmatroska063.diff 810
-MD5 deb1dbbf5879ed31e1b83fb7def5b600 files/digest-mplayer-0.92-r1 355
+MD5 e2fc2cbbc8ebf183dcb599b66c999331 files/ppc750FX-fix.patch 515
+MD5 26a52f084f4d177580ed9ea0187f54e7 files/mplayer-0.90-ppc-benh-2.patch 2049
+MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r4 358
 MD5 b0205104d1242fcccdb5dfd2188f5ab2 files/digest-mplayer-1.0_pre2-r1 358
-MD5 1ab468617a0f8e6902d1581acc78fef6 ChangeLog 20507
-MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-MD5 19e1d19e15bddeab1b6f5494f77a5eca mplayer-1.0_pre2-r1.ebuild 11720
-MD5 a9da267b040ddeaf03e4c6a5e646dd32 mplayer-1.0_pre3-r3.ebuild 11829
-MD5 f51499e146e6839aa021246a65038f99 mplayer-1.0_pre3-r4.ebuild 12131
-MD5 73bcf86ae253db16141f7622a32bad95 mplayer-1.0_pre3-r5.ebuild 11420
-MD5 b9caadadbde39fda82535e76a6fcbf04 mplayer-0.92-r1.ebuild 11850
diff --git a/media-video/mplayer/mplayer-1.0_pre3-r5.ebuild b/media-video/mplayer/mplayer-1.0_pre3-r5.ebuild
index 896d5d53547c..03c589cc0682 100644
--- a/media-video/mplayer/mplayer-1.0_pre3-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre3-r5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre3-r5.ebuild,v 1.3 2004/04/03 23:48:29 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre3-r5.ebuild,v 1.4 2004/04/06 04:48:27 tseng Exp $
 
 IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb gtk2 samba lirc matroska debug joystick theora ipv6"
 
-inherit eutils
+inherit eutils flag-o-matic
 
 # NOTE to myself:  Test this thing with and without dvd/gtk+ support,
 #                  as it seems the mplayer guys dont really care to
@@ -139,6 +139,8 @@ src_unpack() {
 
 src_compile() {
 
+	filter-flags -fPIC
+
 	use matrox && check_KV
 
 	local myconf=
@@ -218,10 +220,7 @@ src_compile() {
 		myconf="${myconf} --enable-linux-devfs"
 	fi
 
-	if has_version 'sys-devel/hardened-gcc' && [ "${CC}" = "gcc" ]
-	then
-		CC="${CC} -yet_exec"
-	fi
+	has_pic && CC="${CC} -yet_exec"
 
 	# Crashes on start when compiled with most optimizations.
 	# The code have CPU detection code now, with CPU specific