Simplify hardened support

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

3 files changed, 8 insertions, 33 deletions

diff --git a/app-emulation/qemu-softmmu/ChangeLog b/app-emulation/qemu-softmmu/ChangeLog
index 648eaccec6e3..2e3fc120b932 100644
--- a/app-emulation/qemu-softmmu/ChangeLog
+++ b/app-emulation/qemu-softmmu/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/qemu-softmmu
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/ChangeLog,v 1.58 2009/03/12 11:48:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/ChangeLog,v 1.59 2009/03/12 16:02:48 lu_zero Exp $
+
+  12 Mar 2009; Luca Barbato <lu_zero@gentoo.org> qemu-softmmu-0.10.0.ebuild:
+  Simplify hardened support
 
   12 Mar 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   qemu-softmmu-0.9.1.ebuild, qemu-softmmu-0.9.1-r1.ebuild,
diff --git a/app-emulation/qemu-softmmu/Manifest b/app-emulation/qemu-softmmu/Manifest
index 05ab2b94e103..40b7fe6e9bfc 100644
--- a/app-emulation/qemu-softmmu/Manifest
+++ b/app-emulation/qemu-softmmu/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX qemu-ifdown 478 RMD160 2187fbf352e6b84686f0cf0e9e9ebe5d26359858 SHA1 1daccb4785fe503687562798f90be1414267e27d SHA256 7d90c39184fd7531d9b8ae787122b68ac768b41afeb0ef2b3baa6461f77af03d
 AUX qemu-ifup 554 RMD160 9769d79ab6456bdd7e3e689005f629e2a67b858d SHA1 dde2b27acabe6fe23ca40f90ff6950bb12a4b506 SHA256 eae9b50680442acc29c65a245a2d26a63756ad4cb894e08cb5ea249686801f1d
 AUX qemu-softmmu-0.9.0-block-qcow2.patch 346 RMD160 d9c11c082fce158e5fbdaceb5e87a327877de58c SHA1 976bd2727f8bdbad999ea2c23112dcbe550bbf4c SHA256 bfea37a8fc718bcee6f31df02c3095094c58d3ace952a7e7789784d6b3471c5a
@@ -11,19 +8,12 @@ AUX qemu-softmmu-0.9.1-block-device-address-range.patch 7904 RMD160 5653db42b048
 DIST qemu-0.10.0.tar.gz 3657649 RMD160 d9175b98d161d2eca0fa61471506e98f3d8f26af SHA1 87b6aa3b201dcdfd91d83c27b2d3e4495770c351 SHA256 3c5ecf320996ad243b7adc4798ad5dbfd58a6d5562cc0317a4cde7c7fb3edbb2
 DIST qemu-0.9.0.tar.gz 1901741 RMD160 4296542b6da18a6ac93d20787330d3c1c2ac0a19 SHA1 1e57e48a06eb8729913d92601000466eecef06cb SHA256 491facf9335654967ee53d8fb3540a274bfcbdcc225506bd38c4ee8e9ab405c1
 DIST qemu-0.9.1.tar.gz 2804104 RMD160 ee7bdb55a4540df2082d4bde9ebfd2f4e6f201a5 SHA1 630ea20b5989f0df00128de7f7be661c573ed041 SHA256 4756d0b4a4dc7dd88354bc6b37d381e4462dd328d0feef94803e90c0455835a5
-EBUILD qemu-softmmu-0.10.0.ebuild 3478 RMD160 d9746ccb71e73f82e08578e120c4592aa73e29d8 SHA1 d0c54076f53a46c0a3f7f2dfead2aa84fd7afe9d SHA256 8631249f53c313f1e891f97e11383033104292e3bd96df9d3567ed6f4c7f2c05
+EBUILD qemu-softmmu-0.10.0.ebuild 2939 RMD160 7076381223b824cdd7a24f3cebbc127acbedd35e SHA1 f32cdc79896d754d65d61a4252d430805eb60679 SHA256 069cfe3e3cb6745b3807707a05bcd2aae051a3a713ab7eea7d82dfc591aaa2a1
 EBUILD qemu-softmmu-0.9.0-r1.ebuild 3175 RMD160 8a7d2bc7dd359671e5350537da075fc169168b60 SHA1 681d7c1f8ff28c30a4e9135e1e54d4075cd8fe7b SHA256 a381f8a2e983e6e6266657adab2cc59605bb3efc416dec4b7f901a51e0666412
 EBUILD qemu-softmmu-0.9.0.ebuild 3129 RMD160 dc0666aa7499db65af3f78d0d94a4253750927d5 SHA1 7493550b324f11ee72aa5ca994cdd207eb383c6f SHA256 ddd4eb920698c27d70a27d20eb1877b37a7824689340821f8cfe16698100942c
 EBUILD qemu-softmmu-0.9.1-r1.ebuild 2896 RMD160 4e5761b2f708d974b2026a006efb1cf9d23486da SHA1 426134eaa5e212c2e45ac36cbb87676a42371ae0 SHA256 261458bbcef7d5dc13dabad1cfddfd6656d8b57fd10e34011f88db6ed07ab502
 EBUILD qemu-softmmu-0.9.1-r2.ebuild 3445 RMD160 fff1fc780161c0b38bc4eb9dd12c05db5082ceb5 SHA1 263f864e0c73aecd80443009f9f8a82cc9c194a0 SHA256 b891d2a46654663015db4d9ad0bc0dfa7ff8c45d6a76e350004e036df9f020c0
 EBUILD qemu-softmmu-0.9.1-r3.ebuild 3497 RMD160 307e4ffb5529ef7fcae85143bc24b1215ef397ad SHA1 fed449d32e6d30cf4cca64a0dabc7f97ecc5f8ab SHA256 3dec7492e786102a0e766cde65fcb3f54c84e8bcdef03042fb82eca2ac0550e7
 EBUILD qemu-softmmu-0.9.1.ebuild 2824 RMD160 b264432c59a2c5a30c7ae4d5467574cbc9552b02 SHA1 48b5d381eea4ddfa2422ec5f5cd8487c3e9cdd97 SHA256 a390898d852e421e0921782da93974ba0d20a9f65879e875da0afda2ea7efb05
-MISC ChangeLog 10110 RMD160 7d72e4855d9217be1c6842b3c2a49ad7dea9ef57 SHA1 4f5fd06a834f53735f016a1d40786dc19127bedf SHA256 59e25087329eb7d5512a4d3e5c44f19201a602d80c1e9870e01da66f94cbc113
+MISC ChangeLog 10214 RMD160 bffef0dbec9adea2220943d38092607562638b0a SHA1 8177a11a57337b9cf9f4c27e5cbcc8d47feb3b12 SHA256 2a52d2b9b1597a272cac2557bbb8cbec01b220e16ff76d3678f5d18300a1d84a
 MISC metadata.xml 781 RMD160 74450132e66859323be46c121f5eecefb17bf582 SHA1 e1b83da2aeb047e497f2296c8a75d5ff29e3ee72 SHA256 09da74da4568ada6f342113ee454230473c8324cb74957028bf6f1d8864cac22
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkm49rwACgkQAiZjviIA2XhwSQCeJvCOy4wsqB3xWktXoih5weob
-t3oAoIBuVf84W/kMC55Ju7VlKH+uwb5K
-=EyIp
------END PGP SIGNATURE-----
diff --git a/app-emulation/qemu-softmmu/qemu-softmmu-0.10.0.ebuild b/app-emulation/qemu-softmmu/qemu-softmmu-0.10.0.ebuild
index 25b02ee709c1..3b891aec642d 100644
--- a/app-emulation/qemu-softmmu/qemu-softmmu-0.10.0.ebuild
+++ b/app-emulation/qemu-softmmu/qemu-softmmu-0.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/qemu-softmmu-0.10.0.ebuild,v 1.4 2009/03/12 11:48:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/qemu-softmmu-0.10.0.ebuild,v 1.5 2009/03/12 16:02:48 lu_zero Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -73,27 +73,9 @@ src_compile() {
 	use pulseaudio && audio_opts="pa $audio_opts"
 	use sdl && audio_opts="sdl $audio_opts"
 
-	./configure ${conf_opts} --audio-drv-list="$audio_opts" || die "econf failed"
-
-	mycc=$(cat config-host.mak | egrep "^CC=" | cut -d "=" -f 2)
-
 	filter-flags -fpie -fstack-protector
 
-	# If using gentoo's compiler set the SPEC to non-hardened
-	if [ ! -z ${GCC_SPECS} -a -f ${GCC_SPECS} ]; then
-		local myccver=$(${mycc} -dumpversion)
-		local gccver=$($(tc-getBUILD_CC) -dumpversion)
-
-		#Is this a SPEC for the right compiler version?
-		myspec="${GCC_SPECS/${gccver}/${myccver}}"
-		if [ "${myspec}" == "${GCC_SPECS}" ]; then
-			shopt -s extglob
-			GCC_SPECS="${GCC_SPECS/%hardened*specs/vanilla.specs}"
-			shopt -u extglob
-		else
-			unset GCC_SPECS
-		fi
-	fi
+	./configure ${conf_opts} --audio-drv-list="$audio_opts" || die "econf failed"
 
 	emake || die "emake qemu failed"