Restore to non-pic friendly versions, they should never have been changed

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 25 insertions, 31 deletions

diff --git a/app-benchmarks/ramspeed/ChangeLog b/app-benchmarks/ramspeed/ChangeLog
index 07f5809a8f6a..69b1687c6545 100644
--- a/app-benchmarks/ramspeed/ChangeLog
+++ b/app-benchmarks/ramspeed/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-benchmarks/ramspeed
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ramspeed/ChangeLog,v 1.7 2012/12/01 17:57:38 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ramspeed/ChangeLog,v 1.8 2012/12/01 18:02:23 blueness Exp $
+
+  01 Dec 2012; Anthony G. Basile <blueness@gentoo.org> ramspeed-2.6.0.ebuild,
+  ramspeed-3.5.0.ebuild:
+  Restore to non-pic friendly versions, they should never have been changed
 
   01 Dec 2012; Anthony G. Basile <blueness@gentoo.org> ramspeed-3.5.0-r1.ebuild:
   Fix issue with the working directory
diff --git a/app-benchmarks/ramspeed/Manifest b/app-benchmarks/ramspeed/Manifest
index bea266f99a6b..f116df250787 100644
--- a/app-benchmarks/ramspeed/Manifest
+++ b/app-benchmarks/ramspeed/Manifest
@@ -3,25 +3,25 @@ Hash: SHA256
 
 DIST ramsmp-3.5.0.tar.gz 79481 SHA256 39fb15493fb3c293575746d56f6ab9faaa1d876d8b1f0d8e5a4042d2ace95839 SHA512 175cd2e568e4efdb1225e3c5319950376c4834633dd618324cf4268c762213733ed67ea94b4e5835b0259483e88afd2e9d9a3fde63515b8b25e5ec0b51f16b0e WHIRLPOOL 2e35adb0aa58a2d5ec81d64ab50bcfc3a7c831798aa13c62d80d2bfb907dcb048087047fd68fe9e7ccbd838848235bca5ee44ba6b203ac07c9945a7ea88a7447
 DIST ramspeed-2.6.0.tar.gz 77531 SHA256 f84e2e42b2b6b221ef9b586f6ae63d863db4ff21858e0ce7c84622a7c9522950 SHA512 9866e5525e0a9df1ab6a0e92085addfed50a987fb335d9127835ca0fb890f7614ad51bec15b7148648bbce8b4709b4f45114a51585bf0e881be56402934abdc4 WHIRLPOOL 04ab501739fa1ff9efd9c8fd371ddad9d907b38eae1e14d0228f28e955ccbdb944545ec2805cc33a3b27bdbe87bafd661ebd4ccebdb1faddb225ba8920063c57
-EBUILD ramspeed-2.6.0.ebuild 1269 SHA256 6d8d09fd94e362712fbc85d38ee26723ea9b72b35f4e2a3c05a0059338ae8346 SHA512 e3c1acc272e88cb7e34dcead6ba386327f73b62eb3d275fc850111408c97b88407b053e4138cc996605e2c5e6f26146e334ee46068f132229129513f624c6935 WHIRLPOOL 2309dc493d86a567a057b9371f2a956e5913b5c487fb6a0c1039695ee0279540aaaadd499d76639e16a0b67db30b761e1190855a443dc2c3d43b044495d8d329
+EBUILD ramspeed-2.6.0.ebuild 1173 SHA256 98fa701c7c63ef5354bc1a829d7f3569d5c6778dc7bd9393c286db2ec929cb85 SHA512 2197eda573b43749e2d03aded553101e5fd6f1bafbcccb85eca5900b9151a38b4b76242fd6ba4ca49c16fc0e6f5eb442558d528c2e804ed1276b9c0fa089c41f WHIRLPOOL fc64d32e7f0bbac3ced8c7f3a6d95354ef5b3f11fa6b161a47449a3fbae7fd92d93d123441e9c364860fd6b924421a779bd582231e4d27cccd8828e024fb3493
 EBUILD ramspeed-3.5.0-r1.ebuild 1574 SHA256 909754bc864d4917181bef15cdcaae8bb96b648baf6629307e5d6b340f705caa SHA512 38e7109166c397509be4b3867e1973608b6868c68bee73721903298ea9940cf9117e45d45826505253a5888a3973ca2db4c579e59d25c454f0e6d6d11fa2a46f WHIRLPOOL 590ecf2b2a78e089451235191daac69da81e8dfee0e99d608afd9c415fe13731d086463d25ecda71770ae1dba861954da5c717b3f848a696204a0f10ce8ac7c9
-EBUILD ramspeed-3.5.0.ebuild 1421 SHA256 91156a3ffe9834642a34553cde6c449373b0aea752b3518ded9bdb1aafd601b2 SHA512 454758699f8e94b2c06efda5ccec2b29c4b49cb5a04f537be432822148ff8e6e39129713a04964bfabfa281dba436d6e3e88c86c8b07dae9e74507eac519243e WHIRLPOOL d74f2372d5b9b8f76b604c9c3e4ff9b7cac07c18b4c0c41c486dcc97016f9961e22351e01eca9825da9f487e386f39edec92c7d0392d9c3f6cedea2d31638752
-MISC ChangeLog 1308 SHA256 99d4fc861559706ddfbbadc3947866322874547a71e09a50f4e82c170c20ac7e SHA512 f9ee1eb2266d0bda87e4eb3f53d6eae326480a0252969256571b1ac903b04b7b0473ab4b38033f70206370fa3f26753e7c8cce786a48e3c8acf77c79f8d67eec WHIRLPOOL 16c9df4cca22e59fb5bdedf15a969371ee4e0426433dad7062a715be5487780e6e2b3b9d8f085c06b03a8ee67eb74a96fbcec3def423a25923ce7a5f4be711e0
+EBUILD ramspeed-3.5.0.ebuild 1325 SHA256 0e9003f6c30c42808baf2042e4be9704973fcc405126ba9470c3f59385e8120e SHA512 aef78b950a4fa84441c667291a1b882b3b543452f637d7194237425b9b571536a006d7c226a4822dc7267a53fcd468eca73a779718f632e19c162262751109b1 WHIRLPOOL 99ced0e092e232c92fb68d80eb82fba4e04de09481a291ae2a1bca5fdae7c9b9daf8420fd35c7cf5eea247f2d229b295443c13e8ce625bd576501ddacd35a953
+MISC ChangeLog 1488 SHA256 065eafbf41a4253550b13d2714a0f456903c18a0a352ba5eb4c55171c3a4d4c5 SHA512 6ccd8bb25484b72c0e8541a9c78db7a29d138108d812fd96d48d2a14b4db24f058e44ad875af966cde055a09c7c5d70d8735b404afa59c10dfe28291e8766222 WHIRLPOOL dd36d7aaa7a59c8f25bc843cc9293b295409e1ce15451a42957b1e9ddae6764b387732bf575f35eec4ca259ec03ee768494b3aa0faf79db85d148898035c144c
 MISC metadata.xml 379 SHA256 21f1a45ebe96551bea9d2eede6c48836de737346eb83501d97b585497a6d9b8f SHA512 d1b154937833110f848a50548a90983f6a7500124ab6fcb433d9238d4ebfc4b34af4407a42a9f2a8d3e1c64b110c5b923b98eb2d49ab3e10b11480d5bdecd625 WHIRLPOOL 9129953f4ea70fd5c24a626d805696ba933395bba728d88bda301f6caaa2c2ba797488001a4891879d62aabc2a7346ae0bd6043201993191f7e5560ad13ce43f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQukUEAAoJEJOE+m71LUu6ahsP/itIyeaiB4lZa53ufI93Lrrm
-zCtsQeLBR0hLLa/rWqRCkw1MyPK2J5IMK8h+kK5SUrDEg/CU6rzQdnFSv2f4phcu
-a6pV2LgAo1M3UQ3uLrzwk6pLCfQevb5u8lZNDyfPIiUftt+4u0O9cXtRAMfQXXr2
-YuyUrkYmz9iz4ImnExTPToYssIooZiW9hitvMpVNdOZgMIpvSN/YkiKx3/Y8YiX5
-G0jzMqvpAI7cO+v+cd6tySQr79PtPxKaR9JbFU/1MoCFyKDpTHUuE7pNl3Kx5hUm
-L4xlGBkr90KhTzb4Nw+9JuQNIvclyjJfImPLgKCg8+3cz5nmKvauNGo2O4SZANlh
-XRrVCM3dtudM4ZG8NM7CAEUNeeEm6Dp2UXK+YWpxTFGfZSZZy1IrkqdzGJsixJMV
-OF0NV/dBi04yCaVbyJ0Rne2VOcZ5BAH+TIMIoanCKBsofDFo0nQ5OoYnAB0L2ugq
-9tghNmrzQOzEIHMIkBy9Y2jbwGZkeCoYXAXSo3+HjuY6FNme9XeTQgzD97Wp0BY7
-bk4FdCqr1uBagB6M+krYvt6uOunySa6c/yYk3rkl6tu4ayTP77rOnmWsU68Z0ZLH
-gzTrCpKhEtloYWR7ouqabl5hlsMEIEwo9e0523nySkssqlswDBA4gqeINnK37Sza
-sn0Vwh+SFSgh8bAGBoyH
-=Ydvp
+iQIcBAEBCAAGBQJQukYiAAoJEJOE+m71LUu6CuQP/2t1DjxoYrbghQMxzpYPC2fx
+AKUnrFx1BmL8tcqSsf8nHatKWrd7NPPUHfN4/87AgMRvXAkT3CaWHNg3yfLs8QQc
+STRsvucEbII5fFsqbxcHDAIcM8g3E6KtxXciy1HEXMrD/hbzsEsN94QWnlQolKS6
+znXL1WaGStV6T6VYPqRbl99OfG6YXIhTlkx+Pb5UP7EYLA6GTaX1u5BpWHTfGLiE
+MdHj/Oyr4wggiMVR7RttkQjYd0Lo6wthsvaz2P0c5PsWKiTF5KZ2Z+tGkPI6u2yO
+M8EEu+iTI9GMIAYf67vKmPZSmT7gNbQp4fDSVDoJ2uLwn0AJjrdVT2o75XtrwRm3
+WPetOmq8L/mO6596EBmEsBKL0ZLb4HSBqoxdIwDLjP92LYTtAOxm3A380WtieMRQ
+hh01t1W7jSsh8r44tdM3ULBoWgE0i+2QfSu1nyArpsAxYtzGUvjWRLWtfl+euTbK
+B/SauXwqmUQMjGTmgvYUsUydRn2sEnIvVZNMmhbcpvxG0uYRAUxtxA09bMJj4VBd
+rlRjMx3YgC+2HhXSX+YaYeUBi+rSlBVVZZl9SNzpjT5vCbZ1yAuyrSK2aOogTAoU
+fRXI0YXvhiEMLW0Zq+E0Q4DP4Fxf74BuHQVb+3SjbruVR/dCnUYpVsp9Zy/WdqZ7
+r7uvLOefslSNXsS1NAhl
+=EAoz
 -----END PGP SIGNATURE-----
diff --git a/app-benchmarks/ramspeed/ramspeed-2.6.0.ebuild b/app-benchmarks/ramspeed/ramspeed-2.6.0.ebuild
index 3e1f6bcec990..b729bd1f6689 100644
--- a/app-benchmarks/ramspeed/ramspeed-2.6.0.ebuild
+++ b/app-benchmarks/ramspeed/ramspeed-2.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ramspeed/ramspeed-2.6.0.ebuild,v 1.4 2012/12/01 17:51:26 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ramspeed/ramspeed-2.6.0.ebuild,v 1.5 2012/12/01 18:02:23 blueness Exp $
 
 EAPI=2
 inherit flag-o-matic toolchain-funcs
@@ -12,7 +12,7 @@ SRC_URI="http://www.alasir.com/software/${PN}/${P}.tar.gz"
 LICENSE="Alasir"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="sse pic"
+IUSE="sse"
 
 src_prepare(){
 	tc-export CC AS
@@ -29,11 +29,6 @@ src_configure(){
 	append-ldflags -Wl,-z,noexecstack
 	obj=( ramspeed.o ${arch_prefix}{fltmark,fltmem,intmark,intmem}.o )
 
-	#avoid pic unfriendly assembly, bug #442778
-	if use pic; then
-		append-ldflags -nopie
-	fi
-
 	if use x86; then
 		obj=( "${obj[@]}" ${arch_prefix}{cpuinfo/cpuinfo_main,cpuinfo/cpuinfo_ext}.o )
 	fi
diff --git a/app-benchmarks/ramspeed/ramspeed-3.5.0.ebuild b/app-benchmarks/ramspeed/ramspeed-3.5.0.ebuild
index 523c5e37d07a..209fe49b5d81 100644
--- a/app-benchmarks/ramspeed/ramspeed-3.5.0.ebuild
+++ b/app-benchmarks/ramspeed/ramspeed-3.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ramspeed/ramspeed-3.5.0.ebuild,v 1.2 2012/12/01 17:51:26 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ramspeed/ramspeed-3.5.0.ebuild,v 1.3 2012/12/01 18:02:23 blueness Exp $
 
 EAPI=2
 inherit flag-o-matic toolchain-funcs
@@ -15,7 +15,7 @@ SRC_URI="http://www.alasir.com/software/${PN}/${MY_P}.tar.gz"
 LICENSE="Alasir"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="sse pic"
+IUSE="sse"
 
 src_prepare(){
 	tc-export CC AS
@@ -35,11 +35,6 @@ src_configure(){
 	append-ldflags -Wl,-z,noexecstack
 	obj=( ramsmp.o ${arch_prefix}{fltmark,fltmem,intmark,intmem}.o )
 
-	#avoid pic unfriendly assembly, bug #442778
-	if use pic; then
-		append-ldflags -nopie
-	fi
-
 	if use x86; then
 		obj=( "${obj[@]}" ${arch_prefix}{cpuinfo/cpuinfo_main,cpuinfo/cpuinfo_ext}.o )
 	fi