drop -Wl,--build-id from LDFLAGS, bug #465466

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

4 files changed, 48 insertions, 19 deletions

diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog
index 3ea46a1d06f6..76789c3476d6 100644
--- a/www-client/seamonkey/ChangeLog
+++ b/www-client/seamonkey/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/seamonkey
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.461 2013/09/25 14:15:10 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.462 2013/09/26 16:31:45 axs Exp $
+
+  26 Sep 2013; Ian Stakenvicius <axs@gentoo.org>
+  +files/moz24-drop-Wl-build-id.patch, seamonkey-2.21.ebuild:
+  drop -Wl,--build-id from LDFLAGS, bug #465466
 
   25 Sep 2013; Lars Wendler <polynomial-c@gentoo.org> -seamonkey-2.20.ebuild,
   seamonkey-2.21.ebuild:
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 3ab7d55c1b8d..169920b59787 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -5,6 +5,7 @@ AUX all-gentoo-1.js 957 SHA256 9a0a0f220719bfa7e03b9cb3a5ccdbc9c5d43f75b443eceed
 AUX all-gentoo.js 712 SHA256 dfe92f212383bb79b3e2aebb03763c1ad179b3cbc90b22eb4b6aeddba98d100b SHA512 f13c884cf1d949b1a9d6605fbc09f788596c4266c3d5c5d3ca04060dc61be0d69951ac4da48b4de034163604ae6fa626549ec32977c857b374291a79a1c63027 WHIRLPOOL e475140e43852cc07d44ade2f965281c852152ce9a3467ce84b26b9d64d687db38742be88ecdb402e2e3de2c63731d99d3e0a64325514c5c64f2a17464096d03
 AUX enigmail_mailnews_extensions_genxpi.patch 800 SHA256 8f624af88ee4c3c6c9022e560c2a0155dff6ac16d036dad2dd7d26adb9c63109 SHA512 4a488e732c1d49775475baedec45438c4ab9677b59556db23ff98ec42a424074bb4538ea3826879365d2a19c58ed877f56185a41c8a933ed79cf8cbe0cd158a9 WHIRLPOOL 02f785f6f10fb44ba578d55752b06cfbb4107f13727ddddfd55a92ebb690c58cf405d46fe4b4037da3c7b83db5157d11ac4112c7bdf9da6faf8a689c5824563a
 AUX icon/seamonkey.desktop 288 SHA256 524ae39ffc10b2a950aa344ae6c3f3d9b4a21009697edfd52ec47aa850d795d0 SHA512 de41924fefe72217c93e42cd907a285d6ce878b3713b2b7e63cb3658bb6a7d83b57753a2911824b139820b7a84d03d89f89d7f79f28d32a4148a4916e779c686 WHIRLPOOL 6aac82b2104c32d7ab8831d760f641badc8705a4711d71bccb25064391d1120217b212ea0009eb145948d61f341b94e57896d5c8c99a90a72312cbebff26f85f
+AUX moz24-drop-Wl-build-id.patch 1243 SHA256 5930c1afd86689723768afa0eca529995addcb7abd3bd4eb9de2cc65fbc722d6 SHA512 8d3678d0b434b880e89cc7fdfccef1601a12f50bd491eb7c64c17e7189ab10b0939a4236cccde28129761d9b3417e0e6b9806cd4150ed93e790ff3c0c0337e13 WHIRLPOOL fd918031604782a12e2a8e194cdc67aa11cb0285500e6e8db67583d42f7693227d1f4b496aaa30ea605fd53b64aab5126c32a6e0a8b83e02bb4de1a55b662723
 DIST enigmail-1.5.2.tar.gz 1211395 SHA256 f20d6d1be1ab12dc2f1208d8f01227fd7e5c4dcf5d6f4bd0833a932b58973a26 SHA512 21df4726b203c5840134eb925df79c8bcb06b201217000fc636cf43b6d7d7fc8850c90de8998838f3d07b02e027f7cab09b719d600d034c4110cce6befd690c5 WHIRLPOOL 496320d20af8b8254d55976a269cececd27efc8d948cd85c016b4a34bab5f600a9698f423a6dae4f003fa2020ad6e7e475d2c1a1819f529b14e7bd13d26aaa51
 DIST firefox-24.0-patches-0.3.tar.xz 7352 SHA256 611ab45bf4a834066e16be53345a25bccbb19c8d3ac4a0d5877e1334764480fd SHA512 9e89a9137c9574168b3f70af4093f62558e5cf66a248be7a283cea878568381370ffd7bcb073c003994adbf9bd098ddacb46200c0f624c5cb5754fc38af6a1f7 WHIRLPOOL 3b4262a3ec587e9c795971302a4221aec5a83d80caca15779c67da7c3dac83add4f83df725592f3332cc5ead746e33a6e6191064567b8670469695c0120a62df
 DIST seamonkey-2.14-patches-01.tar.xz 844 SHA256 aff61bf3c145eb3db72191357f6adf1d516960b9a55330ad9dd3e63c27a8bcc7 SHA512 205c38c4c8ca550d28aac30d09155d85588e7bac284e075ad0251bb5c5b62e30b8d4438bd7e4e3343377a9303a88655ffe807320f14e19166696d2d6045ae901 WHIRLPOOL c34f94b8673161fdb7273fd5dd7741db3c2250f33f5f39f12ade309e2e7183513cbf51356e52da3b1222976b06c1a71bbda74965e6b108fd7054100fcf51feda
@@ -34,23 +35,13 @@ DIST seamonkey-2.21-uk.xpi 846252 SHA256 1a8f1b69119e2df9f6ceb2d486e6eb689984798
 DIST seamonkey-2.21-zh-CN.xpi 809240 SHA256 6e32b8598ac5515f628ee12e88c01133c9611e43ad763a6f43c4be9bdbbb1091 SHA512 02e558492599c8543e9ba00b01b86aa9f70343c87969e1791e6eb127ca4f1aee1b5525dc81fef70dcb0459d230896b7367f4243969287489dcd99fd81f46c917 WHIRLPOOL f68760c5e118069e80b6d29bbee2728a052b7c26c979fe859b895ff4b694dfd146d9cf040239d50bd3b66a0cbd8d4255c3a7e7a106758ea26816860d7a855d6b
 DIST seamonkey-2.21-zh-TW.xpi 831544 SHA256 aa4ced5cb4237ac4915360c080bc2f46f7fa78cd06535f1bc7f9bba628bef249 SHA512 6733cb98b9dcb99e967498118553f8e2fb251d8cc397555779c2c10046adb549bcde52dbe7ffbc3b013030b71792537d9c17c1ff742f390c760b485ce2d61b2c WHIRLPOOL ab33dcb73b877d935a681514a387e1f5267d2f720f290c09cfcf5b2dcdd4b8a2aa6377809bcfad05086b147afe1e54b656ecb8c2648132af78f09733df75529f
 DIST seamonkey-2.21.source.tar.bz2 140654724 SHA256 1b15b1e6bc19477ff7dfc805dd3629566b0b5e94eca9638fe2f4b47c3a8d5ae9 SHA512 1d141bb5507b2b2f4be3d0435342c54c04aa5a4942f801ab34e9af216e164153d4a34c47e68231ff3a958a64860be718452bb904c71e787067c93cdeae0c5643 WHIRLPOOL c7f6bf379eada208a87f4fbb0349a9145d46e83db5156a93170fa1dba843ff23a35e0b316001a18fb0dae265130a752967c683472007755122ca00280e8d7392
-EBUILD seamonkey-2.21.ebuild 10927 SHA256 87ca161d990d1a3a71a2d53195bd0327c97db49800cecf426305854ff604f2be SHA512 208a888fdc950d36b361bfbda593ff80f2563afa00f5782c3a71011a9db3bf24aec9a9353c52828b1923cbf473a1739b411773bb81eb7a78e3d7532f0dbcedee WHIRLPOOL 63c61124e5c4434789bcaba5174f746155e4abd3e5a87feacbe73e7c07f0c7ff982adef43b8db39af72e3a2b4c896cf035678ce9e22e8acdfdef8989cd2f2f55
-MISC ChangeLog 64397 SHA256 fb51dca8e0d252c430667f86d2b418b278f8edd6b7894e72d9d146c221b74e7e SHA512 1b280231ff3415a6dd65bff21ab58f43e14740938d93e3f8657495a30465bfd471df56e56c4da3768cd58b99684cc9b7be2cfa98d96170df12d82f279b991906 WHIRLPOOL abe611d5d26cfebf1027de530fd48f0acadcfd3a06cd43c2596fe7eb4213adf4c48bb1e818f5ef56ee50efb017d924982c75f73604152a8e709013e9bd153a48
+EBUILD seamonkey-2.21.ebuild 11038 SHA256 c81a77cacd698135a59ce4f5a6ab3cffae6bf933baaa0843f6ec3acea6114fac SHA512 772feb626d190a7653f45251d1989640f14c511ed2a738d0a285325d1bbb006ec260351df0e402b978a45773fd9a7b3d278fa14f63bc1a2280a51da4f1858975 WHIRLPOOL ef16de1bd15d548d60a0755267eeebec798ad2430ff518fad96db3b20d35ae5c25340dc80c5389a854c29a9d8f4b3287a81dd175fb03b996d41c66d1d99c298c
+MISC ChangeLog 64548 SHA256 07531519b050fc7c3d90e6f52f6d2042c8df4e013dd0b7351bbce4321e4a7e66 SHA512 86fff87842ad2a9200087a22e636761648d00ed51bf7ac835c5d1d0f2fb98a34aca8a7903d78b1375dca7671fabd7fd0fa6fdd0baa42157a76b6e8efada2db47 WHIRLPOOL d54037ef3372dc79178eefcfdf22ae2fee31668323c784e523a5b29159ca53cec1b4cbe6c1c689955632ee6801007e2f6eb9ef11601876ad43a75fbbb59704c9
 MISC metadata.xml 1124 SHA256 ed82f76250ccd3e702a5fa60272382dd0025a4aa1e7480e4691170c259910464 SHA512 e53e8cf1fc76bfefa4f669703d8b27f0befdfe90e8a098a14a069a02c6c9f8b14edb2af40df96a746b1679bc1523c74e625d15f67bb72c166f799b7d4780163c WHIRLPOOL e6ebb16110bceb8de7609fc02b1b9baf441da8bb8227c2f5f2ad88ab3d1d3dd50704bfa9a965444010ea30c809c6edd03b3624d0023d9b7b667185bda52ab392
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSQu/wAAoJEPiazRVxLXTFnrIP+gJv6/7cP0Y2clS9ndOPtIq9
-AhjcfGYueGtcbcBec5aaJ3lWJ1DkOd2mqLP+q/FHWXeYam8B9xnrj1ZNRfHdLgak
-00v/xy5jevd/bQau4yamfzowjfeiKr7DpxABhO00G7svkHdikFUE0wZn44Hf3au1
-fCW+kFvCXeYTmmVBWNx6BNfzc7XGpz/BKPjQ/VtO0313V4y39qa5XLmxFquqwEwi
-5hHGldkQrg+szocr8zdP0aTiqi9KSZKsVNElXj0tZgZ+tlOKeXk/h/c7jpcS200D
-MBBG2mLUVFL0tyJxf9J6cVDxL4sv2ti2MMJoG9CIw1d19Y0cTZxXE4ebwPZBY1Mo
-tfbUpOtrE8tZvTO2+jCa7WyPZRmP8aOBCxicdHGofW2pNED+uNtipUE9kgYha2MM
-dcUFQhSxYeV3OOBOiVFxf/Ge3zNMzHExrrgvLxU9nSmVWjV9w08YNnJNkEi8Meyu
-4Vl7L7qxrt2asWKm98krN84VOKaEmdai/gxaRaKijkvo5MrXtcwcDA26AU/LQehI
-IMdOrqraQC0GnN4wFrC78ZLzLyWKTR4v7vlfK2omG5Wm8Wo80MyV+fXMXtB6e36M
-2CDiu7hL9+p8bqy+GCfG4/0zqmsL8g+fjKJ/XqZYhVa/DIJfbi2yIrVgbBTiCS1n
-wMq1U9OrhNMNS7FfrN+q
-=eALG
+iF4EAREIAAYFAlJEYXgACgkQ2ugaI38ACPCRUAD/TBXHG2u9R+fvBWAVAzYZ72I/
+EzOphU/3c2ssXnOejlMA/AkzpiNR4yhL1F+Fvon6qh7ZYiynzYdOYD0fvqkF7wOz
+=Cpwc
 -----END PGP SIGNATURE-----
diff --git a/www-client/seamonkey/files/moz24-drop-Wl-build-id.patch b/www-client/seamonkey/files/moz24-drop-Wl-build-id.patch
new file mode 100644
index 000000000000..434dd238a961
--- /dev/null
+++ b/www-client/seamonkey/files/moz24-drop-Wl-build-id.patch
@@ -0,0 +1,32 @@
+--- a/comm-esr24/mozilla/configure.in	2013-09-26 09:41:27.220542321 -0400
++++ b/comm-esr24/mozilla/configure.in	2013-09-26 09:49:07.888550730 -0400
+@@ -1339,13 +1339,6 @@
+     AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
+                   AC_MSG_RESULT([no])
+                   LDFLAGS=$_SAVE_LDFLAGS)
+-    AC_MSG_CHECKING([for --build-id option to ld])
+-    _SAVE_LDFLAGS=$LDFLAGS
+-    LDFLAGS="$LDFLAGS -Wl,--build-id"
+-    AC_TRY_LINK(,,AC_MSG_RESULT([yes])
+-                  [NSPR_LDFLAGS="$NSPR_LDFLAGS -Wl,--build-id"],
+-                  AC_MSG_RESULT([no])
+-                  LDFLAGS=$_SAVE_LDFLAGS)
+ 
+ 
+     # Check for -mssse3 on $CC
+--- a/comm-esr24/mozilla/js/src/configure.in	2013-09-26 09:41:27.222542321 -0400
++++ b/comm-esr24/mozilla/js/src/configure.in	2013-09-26 09:49:19.121550935 -0400
+@@ -1154,13 +1154,6 @@
+     DSO_PIC_CFLAGS='-fPIC'
+     ASFLAGS="$ASFLAGS -fPIC"
+ 
+-    AC_MSG_CHECKING([for --build-id option to ld])
+-    _SAVE_LDFLAGS=$LDFLAGS
+-    LDFLAGS="$LDFLAGS -Wl,--build-id"
+-    AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
+-                  AC_MSG_RESULT([no])
+-                  LDFLAGS=$_SAVE_LDFLAGS)
+-
+     # Turn on GNU-specific warnings:
+     # -Wall - turn on a lot of warnings
+     # -Wpointer-arith - good to have
diff --git a/www-client/seamonkey/seamonkey-2.21.ebuild b/www-client/seamonkey/seamonkey-2.21.ebuild
index bd99c369180f..31eed8f0da3a 100644
--- a/www-client/seamonkey/seamonkey-2.21.ebuild
+++ b/www-client/seamonkey/seamonkey-2.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.21.ebuild,v 1.4 2013/09/25 14:15:10 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.21.ebuild,v 1.5 2013/09/26 16:31:45 axs Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -47,7 +47,7 @@ fi
 
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+chatzilla +crypt gstreamer +ipc +jit minimal pulseaudio +roaming system-cairo system-icu system-jpeg system-sqlite"
+IUSE="+chatzilla +crypt gstreamer +ipc +jit minimal pulseaudio +roaming selinux system-cairo system-icu system-jpeg system-sqlite"
 
 SRC_URI="${SRC_URI}
 	${MOZ_FTP_URI}/source/${MY_MOZ_P}.source.tar.bz2 -> ${P}.source.tar.bz2
@@ -130,6 +130,8 @@ src_prepare() {
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}/firefox"
 	popd &>/dev/null || die
+	# drop -Wl,--build-id from LDFLAGS, bug #465466
+	epatch "${FILESDIR}"/moz${PATCHFF:8:2}-drop-Wl-build-id.patch
 
 	# Shell scripts sometimes contain DOS line endings; bug 391889
 	grep -rlZ --include="*.sh" $'\r$' . |