removed hardened-gcc logic, added filter-flags logic

5 files changed, 17 insertions, 16 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 8a8e44428348..ce3eb9a0b097 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.116 2004/05/10 01:15:58 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.117 2004/05/12 12:35:23 pappy Exp $
+
+  12 May 2004; Alexander Gabert <pappy@gentoo.org> xine-lib-0.9.13-r3.ebuild,
+  xine-lib-1_rc2.ebuild, xine-lib-1_rc3-r2.ebuild:
+  removed hardened-gcc logic, added filter-flags logic
 
   09 May 2004; Jason Wever <weeve@gentoo.org> xine-lib-1_rc4.ebuild:
   Stable on sparc wrt bug #49387.
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 810ae4596ff0..bff61981873c 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,15 +1,16 @@
-MD5 595a8ea0bbb68441a1669cbfe1cfd8ff ChangeLog 20430
+MD5 bc06b872446c6ddc9f9df1c42d418652 ChangeLog 20615
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 74eefa329c52e465c889ab8d509843bc xine-lib-0.9.13-r3.ebuild 3461
-MD5 2d8af992b607144689ef99e1482005cd xine-lib-1_rc2.ebuild 4038
+MD5 ad018b30cd3d9ae5d36e2fdbd5ec1c4c xine-lib-0.9.13-r3.ebuild 3409
+MD5 6bcffac0af3bd2283810ae70ba719f69 xine-lib-1_rc2.ebuild 3986
 MD5 0b7f856fae11d36f4bffbf8bfe005761 xine-lib-1_rc3-r1.ebuild 4070
-MD5 911e8ac9be7bb59a1d410a07758bf3fd xine-lib-1_rc3-r2.ebuild 3952
+MD5 d7ab1cdc2de7806fc3d45ec0926d101a xine-lib-1_rc3-r2.ebuild 3900
 MD5 b304642fe1b9924c69805348043989d2 xine-lib-1_rc3-r3.ebuild 4192
 MD5 9d80107e6eaae8750bbc0f86f0fae18e xine-lib-1_rc4.ebuild 4490
 MD5 f1570a69c99207f65b5cdf1d154bbcd4 files/digest-xine-lib-0.9.13-r3 68
 MD5 f90bfe4a0ee80eecb38fc34022ccab7e files/digest-xine-lib-1_rc2 67
 MD5 e9819170d90442f5072d18dda93a8f5c files/digest-xine-lib-1_rc3-r1 68
 MD5 3824a3bb0c207c34e9bec101cac52a91 files/digest-xine-lib-1_rc3-r2 68
+MD5 d24969404b35f029bf203da4b53a3c3d files/digest-xine-lib-1_rc3-r3 68
 MD5 5e99bec89f5cc4f0d00bcd61430d67cb files/protect-CFLAGS.patch-1_rc2 597
 MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc3 597
 MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746
@@ -19,10 +20,9 @@ MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
 MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342
 MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
 MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
-MD5 d24969404b35f029bf203da4b53a3c3d files/digest-xine-lib-1_rc3-r3 68
-MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423
 MD5 ae644beadf7c9218bdbd3ed27865918a files/digest-xine-lib-1_rc4 67
 MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc4 597
 MD5 5d3bbb085af2a8dcaa429c1376a52c50 files/xine-lib-1-rc4-sparc_missing_include.patch 464
 MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc4-configure-sparc.patch 587
 MD5 5ddf5d90566965b047828407dcc0f5d1 files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch 331
+MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423
diff --git a/media-libs/xine-lib/xine-lib-0.9.13-r3.ebuild b/media-libs/xine-lib/xine-lib-0.9.13-r3.ebuild
index 8f621ca8c909..a647e538cbc7 100644
--- a/media-libs/xine-lib/xine-lib-0.9.13-r3.ebuild
+++ b/media-libs/xine-lib/xine-lib-0.9.13-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-0.9.13-r3.ebuild,v 1.9 2004/02/16 15:32:29 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-0.9.13-r3.ebuild,v 1.10 2004/05/12 12:35:23 pappy Exp $
 
 
 inherit libtool flag-o-matic eutils gcc
@@ -49,8 +49,7 @@ src_unpack() {
 }
 
 src_compile() {
-	filter-flags -maltivec -mabi=altivec
-	has_version sys-devel/hardened-gcc && filter-flags -fPIC
+	filter-flags -maltivec -mabi=altivec -fPIC
 	if [ "`gcc-version`" == "3.2" ] ; then
 		replace-flags -march=k6-3 -march=i686
 		replace-flags -march=k6-2 -march=i686
diff --git a/media-libs/xine-lib/xine-lib-1_rc2.ebuild b/media-libs/xine-lib/xine-lib-1_rc2.ebuild
index e625d71c722b..db8301ca42dc 100644
--- a/media-libs/xine-lib/xine-lib-1_rc2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc2.ebuild,v 1.15 2004/02/19 08:51:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc2.ebuild,v 1.16 2004/05/12 12:35:23 pappy Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -52,8 +52,7 @@ src_unpack() {
 }
 
 src_compile() {
-	filter-flags -maltivec -mabi=altivec -fstack-protector
-	has_version sys-devel/hardened-gcc && filter-flags -fPIC
+	filter-flags -maltivec -mabi=altivec -fstack-protector -fPIC
 
 	# fix build errors with sse2
 	if [ "`gcc-version`" == "3.2" ]; then
diff --git a/media-libs/xine-lib/xine-lib-1_rc3-r2.ebuild b/media-libs/xine-lib/xine-lib-1_rc3-r2.ebuild
index 6e6c28a2fb29..3a8efa86b26e 100644
--- a/media-libs/xine-lib/xine-lib-1_rc3-r2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc3-r2.ebuild,v 1.8 2004/04/07 22:02:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc3-r2.ebuild,v 1.9 2004/05/12 12:35:23 pappy Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -67,8 +67,7 @@ src_unpack() {
 }
 
 src_compile() {
-	filter-flags -maltivec -mabi=altivec -fstack-protector
-	has_version sys-devel/hardened-gcc && filter-flags -fPIC
+	filter-flags -maltivec -mabi=altivec -fstack-protector -fPIC
 
 	# fix build errors with sse2
 	if [ "`gcc-version`" == "3.2" ]; then