Revert LD_PRELOAD hack (bug #394963).

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 4d04bce34ec4b957939fd50e913f1a3790a2b7c0..09e744e732b7a719c5fe4be11eea0dda0a4e297d 100644 (file)
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-client/opera
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.678 2011/12/11 23:14:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.679 2011/12/17 13:52:31 jer Exp $
+
+  17 Dec 2011; Jeroen Roovers <jer@gentoo.org> opera-11.60.1185.ebuild:
+  Revert LD_PRELOAD hack (bug #394963).
 
   11 Dec 2011; Jeroen Roovers <jer@gentoo.org> -opera-11.52.1100.ebuild:
   Old.

diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index e8a47441db39b976d199d38dd5fef9882112ba22..f64cfcd3a0968f1c0e2a571c516833e51fd0731c 100644 (file)
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
 DIST opera-11.60-1185.i386.freebsd.tar.xz 11537236 RMD160 9b8dc467f698cf540c0f537a98677930a077a0c4 SHA1 befc0d908b76d930bf9a0ac753ccfc2b086189fb SHA256 eb38671f9b5e06ba7b905bd9ff22262e9ef335c37414bbb0ea4234aa2b2ba46d
 DIST opera-11.60-1185.i386.linux.tar.xz 11505432 RMD160 f645c292f34a08a2bc44107f3ca57f4f0a1a55bd SHA1 96e3366afff3b738db9fadbd1046623827afaf00 SHA256 a73584938a558d1b9c6f250d1bf127b02fc6ca5c0378c4ee3009c178fe1c8a74
 DIST opera-11.60-1185.x86_64.linux.tar.xz 12347432 RMD160 50de639af506a0493843763cadc2c8e74d201538 SHA1 dc6d2cf74ed98dfb3625529a03a6d9107a4d01cf SHA256 a3ede13b6abe92633e4728773b472c8e0571717161ced7935ac3bc7ff728c642
-EBUILD opera-11.60.1185.ebuild 5950 RMD160 a5d38bf28eb53998130226ad2661e7b902eae50c SHA1 652c8e4e4d898049f51443c0708fdc2ddad2b674 SHA256 9b57bf1042c457b820eed8499af4bdcbba302861051bc7630d079085b050a143
-MISC ChangeLog 129262 RMD160 3a8327819162d7dfffc63ffdb6924ae118812548 SHA1 aced5cc1fd3d965e0de1302eb042f86f59e1929d SHA256 88ed090a1b71b2a25a245cc775d23370a3ac5cbf133290ec1d83477567e84cbf
+EBUILD opera-11.60.1185.ebuild 5874 RMD160 7b3b4af0b9c79819e7497c2469c150e6a880672e SHA1 d4e4d0297b094cb1cc37b066b6b76f26470b8413 SHA256 e11305f5594a97bfeb1e7daecef9aa2c76c6ef90da1c41a5451f2172a1ee6aef
+MISC ChangeLog 129375 RMD160 9350b3b3bfe5a9142d3985140b3852315fc68b04 SHA1 d5aa27e669a58a15112b6c6a4b8a26851d009cd2 SHA256 3d4623542c7d1ad50bdb9dd588ab36b7a3f60732cc9d892af76cce3da6605cb9
 MISC metadata.xml 732 RMD160 28acd15c216329d807150c88fb0861eb1383c61c SHA1 9ff443c6f422e8b018d29d21948da71eda6a4295 SHA256 bd388fb8f6b0aa2cd98fcfc290b677df712be3ef14537102e02665ea2f0d871a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7lOUUACgkQVWmRsqeSphP8OACcC71qfi+1aBya2XUmMQ5DaL5k
-4AEAnjDsLGdy07K13Q8JNKyUssQiJ9Cz
-=vrbR
+iEYEARECAAYFAk7snqUACgkQVWmRsqeSphPfDgCdELveM6syxYUcaCxj9hKuhO3d
+5LEAn39HTeatMD9ej1UNmbWT/X3aT7cO
+=krL3
 -----END PGP SIGNATURE-----

diff --git a/www-client/opera/opera-11.60.1185.ebuild b/www-client/opera/opera-11.60.1185.ebuild
index 161a87abb2315019e902d2a47327e4c2072a6615..c66473bf053ac92116efdc055e76ff26519d71e2 100644 (file)
--- a/www-client/opera/opera-11.60.1185.ebuild
+++ b/www-client/opera/opera-11.60.1185.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-11.60.1185.ebuild,v 1.3 2011/12/11 17:24:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-11.60.1185.ebuild,v 1.4 2011/12/17 13:52:31 jer Exp $
 
 EAPI="4"
 
@@ -171,7 +171,6 @@ src_prepare() {
        echo 'export OPERA_DIR="/usr/share/'"${PN}"'"' >> ${PN}
        echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \
                >> ${PN}
-       echo 'export LD_PRELOAD="/usr/'$(get_libdir)'/libgtk-x11-2.0.so"' >> ${PN}
        echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN}
 
        # Change libz.so.3 to libz.so.1 for gentoo/freebsd