removed hardened-gcc logic, added filter-flags fPIC logic

6 files changed, 32 insertions, 39 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 4f9ba173d6a3..b2944a207cec 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
 # 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.129 2004/05/02 17:43:50 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.130 2004/05/12 12:46:33 pappy Exp $
+
+  12 May 2004; Alexander Gabert <pappy@gentoo.org> mplayer-0.92-r1.ebuild,
+  mplayer-1.0_pre2-r1.ebuild, mplayer-1.0_pre3-r3.ebuild,
+  mplayer-1.0_pre3-r4.ebuild:
+  removed hardened-gcc logic, added filter-flags fPIC logic
 
   02 May 2004; Jason Wever <weeve@gentoo.org> mplayer-1.0_pre4-r1.ebuild:
   Changed -sparc keyword back to ~sparc.
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 5c6b422865df..8cab91bcb81a 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,13 +1,14 @@
-MD5 031f4096fa2adb1590916626accbd9d7 ChangeLog 22250
+MD5 b997221944da8e09c88102403aa62250 ChangeLog 22474
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-MD5 9c167eef5d63ea7678acdd6c6103e973 mplayer-1.0_pre3-r3.ebuild 11616
-MD5 b5879bc6ed587fe09e782b09e9e3f277 mplayer-1.0_pre3-r4.ebuild 11918
+MD5 06a993cb89fac55613aad364670c41fb mplayer-0.92-r1.ebuild 11570
+MD5 f98bc5b521254207cb231a9eb853f522 mplayer-1.0_pre2-r1.ebuild 11435
+MD5 95426d21a3f8920fc3b0d94ade8ad0bd mplayer-1.0_pre3-r3.ebuild 11549
+MD5 633cbda54fcb59b371bbfb86f475bd84 mplayer-1.0_pre3-r4.ebuild 11851
 MD5 dde44e13a63780a2a748d8f3b4af60ed mplayer-1.0_pre3-r5.ebuild 11526
-MD5 0b366846f51dbd2f0359d0a564bb3d2f mplayer-1.0_pre4.ebuild 11096
-MD5 dd623a5ef4090e678cee2a8dd3511c84 mplayer-0.92-r1.ebuild 11635
-MD5 9f75c8a10e051291440089e942831bfa mplayer-1.0_pre2-r1.ebuild 11502
 MD5 e7afbe7352e1a3b4f570a196cc710ce0 mplayer-1.0_pre4-r1.ebuild 11026
+MD5 0b366846f51dbd2f0359d0a564bb3d2f mplayer-1.0_pre4.ebuild 11096
 MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
+MD5 deb1dbbf5879ed31e1b83fb7def5b600 files/digest-mplayer-0.92-r1 355
 MD5 b0205104d1242fcccdb5dfd2188f5ab2 files/digest-mplayer-1.0_pre2-r1 358
 MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r3 358
 MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r4 358
@@ -21,12 +22,11 @@ MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903
 MD5 fa86dd9d6980ff064efcc9d9f919905e files/mplayer-1.0_pre3-libmatroska063.diff 810
 MD5 8b8084aa31b466c55d15bd06bb77086d files/mplayer-1.0_pre3-xmms.patch 411
 MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
+MD5 e2fc2cbbc8ebf183dcb599b66c999331 files/ppc750FX-fix.patch 515
 MD5 fef9f0571da54ae3df2e804100bd2632 files/vuln01-fix.diff 1231
-MD5 deb1dbbf5879ed31e1b83fb7def5b600 files/digest-mplayer-0.92-r1 355
 MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
-MD5 e2fc2cbbc8ebf183dcb599b66c999331 files/ppc750FX-fix.patch 515
+MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4 358
+MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r1 358
 MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre3-alsa-gcc34.patch 299
 MD5 f998f1cad3da27cac3aea1982dc5c747 files/mplayer-1.0_pre3-libavcodec-gcc34.patch 5010
-MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4 358
 MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre4-alsa-gcc34.patch 299
-MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r1 358
diff --git a/media-video/mplayer/mplayer-0.92-r1.ebuild b/media-video/mplayer/mplayer-0.92-r1.ebuild
index 7434b88d4890..f511693f8181 100644
--- a/media-video/mplayer/mplayer-0.92-r1.ebuild
+++ b/media-video/mplayer/mplayer-0.92-r1.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-0.92-r1.ebuild,v 1.2 2004/04/19 22:34:26 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.92-r1.ebuild,v 1.3 2004/05/12 12:46:33 pappy 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 samba lirc"
 
-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
@@ -131,6 +131,8 @@ src_unpack() {
 
 src_compile() {
 
+	filter-flags -fPIC
+
 	use matrox && check_KV
 
 	local myconf=
@@ -271,11 +273,6 @@ src_compile() {
 		myconf="${myconf} --enable-linux-devfs"
 	fi
 
-	if has_version 'sys-devel/hardened-gcc' && [ "${CC}"="gcc" ]
-	then
-		CC="${CC} -yet_exec"
-	fi
-
 	# Crashes on start when compiled with most optimizations.
 	# The code have CPU detection code now, with CPU specific
 	# optimizations, so extra should not be needed and is not
diff --git a/media-video/mplayer/mplayer-1.0_pre2-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre2-r1.ebuild
index 6bb4313b6244..55692125f463 100644
--- a/media-video/mplayer/mplayer-1.0_pre2-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre2-r1.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_pre2-r1.ebuild,v 1.2 2004/04/19 22:34:26 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre2-r1.ebuild,v 1.3 2004/05/12 12:46:33 pappy 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 samba lirc matroska debug joystick"
 
-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
@@ -118,6 +118,8 @@ src_unpack() {
 
 src_compile() {
 
+	filter-flags -fPIC
+
 	use matrox && check_KV
 
 	local myconf=
@@ -269,11 +271,6 @@ src_compile() {
 		myconf="${myconf} --enable-linux-devfs"
 	fi
 
-	if has_version 'sys-devel/hardened-gcc' && [ "${CC}" = "gcc" ]
-	then
-		CC="${CC} -yet_exec"
-	fi
-
 	# Crashes on start when compiled with most optimizations.
 	# The code have CPU detection code now, with CPU specific
 	# optimizations, so extra should not be needed and is not
diff --git a/media-video/mplayer/mplayer-1.0_pre3-r3.ebuild b/media-video/mplayer/mplayer-1.0_pre3-r3.ebuild
index 019b6252b5aa..8b3c8a5db009 100644
--- a/media-video/mplayer/mplayer-1.0_pre3-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre3-r3.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-r3.ebuild,v 1.2 2004/04/19 22:34:26 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre3-r3.ebuild,v 1.3 2004/05/12 12:46:33 pappy 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 samba lirc matroska debug joystick"
 
-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
@@ -120,6 +120,8 @@ src_unpack() {
 
 src_compile() {
 
+	filter-flags -fPIC
+
 	use matrox && check_KV
 
 	local myconf=
@@ -270,11 +272,6 @@ src_compile() {
 		myconf="${myconf} --enable-linux-devfs"
 	fi
 
-	if has_version 'sys-devel/hardened-gcc' && [ "${CC}" = "gcc" ]
-	then
-		CC="${CC} -yet_exec"
-	fi
-
 	# Crashes on start when compiled with most optimizations.
 	# The code have CPU detection code now, with CPU specific
 	# optimizations, so extra should not be needed and is not
diff --git a/media-video/mplayer/mplayer-1.0_pre3-r4.ebuild b/media-video/mplayer/mplayer-1.0_pre3-r4.ebuild
index 2e755e2f2bbf..36770c5576f8 100644
--- a/media-video/mplayer/mplayer-1.0_pre3-r4.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre3-r4.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-r4.ebuild,v 1.2 2004/04/19 22:34:26 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre3-r4.ebuild,v 1.3 2004/05/12 12:46:33 pappy 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 samba lirc matroska debug joystick"
 
-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
@@ -127,6 +127,8 @@ src_unpack() {
 
 src_compile() {
 
+	filter-flags -fPIC
+
 	use matrox && check_KV
 
 	local myconf=
@@ -277,11 +279,6 @@ src_compile() {
 		myconf="${myconf} --enable-linux-devfs"
 	fi
 
-	if has_version 'sys-devel/hardened-gcc' && [ "${CC}" = "gcc" ]
-	then
-		CC="${CC} -yet_exec"
-	fi
-
 	# Crashes on start when compiled with most optimizations.
 	# The code have CPU detection code now, with CPU specific
 	# optimizations, so extra should not be needed and is not