Add back buildobj dir fix, bug #536516

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4D088B4

3 files changed, 24 insertions, 20 deletions

diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog
index 438435e3f0d4..adab4a9bfd26 100644
--- a/www-client/firefox/ChangeLog
+++ b/www-client/firefox/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-client/firefox
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.377 2015/01/13 03:26:56 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.378 2015/01/15 01:55:10 anarchy Exp $
+
+  15 Jan 2015;  <anarchy@gentoo.org> firefox-35.0.ebuild:
+  Add back buildobj dir fix, bug #536516
 
 *firefox-35.0 (13 Jan 2015)
 *firefox-31.4.0 (13 Jan 2015)
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 5c7c00cea693..b61a1dd6bfd9 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -519,18 +519,18 @@ EBUILD firefox-24.3.0.ebuild 12059 SHA256 25fbf1a1db269332d3b9df1f47707a55081763
 EBUILD firefox-24.8.0.ebuild 12064 SHA256 cec8cf1ff29949cc9ae344ee6ade19c5f5d37a36f17857860a822a3130fe655b SHA512 a6677c826a1555b0f4d791706c797266d98d49bbabef2183f7c1eec6786d76bc25164130100a499b7635be5d1b058329f1e63362dd109824470ab9c131836103 WHIRLPOOL bc9c272dff2e36ca571de91a042794ac5f8836f87be6699cc91b5aaf5034593eda1c2791106f310911d083bc2580a1a1029dd34bb2a44080cac52f70ef5db3c4
 EBUILD firefox-31.3.0.ebuild 11613 SHA256 013c44547174044f6bda7b863d485a0bcff509ead369ed1251f9d8dfb39981c5 SHA512 7c7420d2e9e68a6ee6ac284cdb0ce3d9d6d895ab3fd8df48fb7b12d090704044e08dd64c8a6dfdcb4ad14fcd6e75bef488535660b8cf1ecde6527c9b21c59d1d WHIRLPOOL a273bbf37c23237408d2f90f34e032631ecc77ae1c38d53375f2f8ad28adcb087c0c37fc42d2fcb7b8f030d62af41e4bf8c97d1dbc16a522d3d8a6d9e17b7faa
 EBUILD firefox-31.4.0.ebuild 11597 SHA256 d9bdea15eac1612a3fe566ebb93da8c539bf536bbb3aae4585dd2d5788300e0c SHA512 55b4c5d0501dcc1de0c1c9422de9934bd91ef50d18819bc05b9e44a1a2c6bb08201772f23379db39bdcb6a3c2bdb8619750355510c13732ef82ba36ae6fd2959 WHIRLPOOL fc1ba2ef352d9f9cdc6158101bdefbeaa8b120775fa5eb29e1d8d1e0b635ef05c4dca761546ab5f8ec16c2403338c70eeacaa6a756920bed5780bcdbe34ee2a8
-EBUILD firefox-35.0.ebuild 11949 SHA256 7357fdd25dab5dbdcaf60e3b4f090f0c9b2f7566e11ce8629f4a285e1426e562 SHA512 623e9d04c90c6c15b4072d42b4e179b92a247d15f022c720f06d5ba2b67c3fcb8d97d739a893a82b6447d1d42887daf1ca16f5f7ea24e42370bb204ef5ae1849 WHIRLPOOL dec0cf2d03a64d4cffdf75cc17eec5e4977991ead554ec8bd2a95471e2568a60f0ed16273a861736e56253202172507be5676ae3fe66af737dbb0abeffcaa678
-MISC ChangeLog 62491 SHA256 374f441d4d9343a6e5c804d777a8000e3b807bb206763ca1479b9300eeb54257 SHA512 1d80a8144c419d39881c5db1adc59cbeedead46e5d607c9559b1779b52c05dabc54d9ecca7f12c6df1d7c1e6f2d4a21949e8e1419826b97c3bdca413c4b1f388 WHIRLPOOL 3b414f2452866cea646e54f15ed5501e5ddb54ca0c6b7ed59fdb8e8f1505741223551a7d425a85c26891c6685eaca5bf6dcb647e1a5b193600875330ec5eeb3c
+EBUILD firefox-35.0.ebuild 11907 SHA256 6e689ba66781ad425e92b5757d8763d4c3e4d1421646d4fc29190598731b74be SHA512 a404bc62478f40f8a02b329c2a431653d89e6dd6ad591622f9a9677ecccb64efa0bddafc873b05f03188908a05fd33ee81382bb2cd3e408ff84d4df22e1798a2 WHIRLPOOL 53e454a68117950803c9d7138e0f43457e9409eaa1192fca3d47b38f8e8d0ee41fa33a3c42c4d27fd70bf37941d4a7f00228c9e8a14ba0e5a66e4a3124e970a2
+MISC ChangeLog 62591 SHA256 38690c12d11452c9f68d868c753abebd8fd4636fa99d74a3c2d76a0d8747257b SHA512 c1bbc0700f254fb11246f42d079fefa7e1d6f7af762a62d5370169c168d65ba756bd011f8d3e1c148dff38d3347b8151417ea0ecc5fa6ac23b10c8e7368d654e WHIRLPOOL eec8c8500298220c1bd7788fa250a70244f69f017d8e07bca822ed4a9b7170c015c32ea7ac6aaba8b783660290e66c82c9f7d37b494c327fd4a1f31700b527a4
 MISC ChangeLog-2009 109736 SHA256 6a3f47a190cb2146174953971b193f7d75f408ea2cd1ad7d029fb848dd66f3c8 SHA512 db43c51ba072bd47d8bdf313481156b2e6238c9905147033dc7d7ce5a634ca01b7cfdd399c7b03a4f4af8c44eabf353c7b7e22642220975f1bd33d5a109cce10 WHIRLPOOL 7bdbc95d44e2a564cada83e831ee80b849d468138a6d5e75f23fd4e165408e07af4891bc6989af8e1f792f8d963613de20d013e5a610ee58855c0aad0de475fe
 MISC metadata.xml 1566 SHA256 b94c25cf2bf37a18dd59e6146891faf768f155facdd7f819cc22a5dda220dc1e SHA512 df78660e754571b567974cbf42b203dd269aa512ffeacee66a8eaea2a152a3400925d0b1164395c7e6d7daa1498cd02831874b817594b4eb6fec9aa21a6c0942 WHIRLPOOL fea97dc03a3b99ac3d347786bf2d4baeaeb62b1330d81e59f742ad0d70145ab43e27b67d70b4c13cb6a86da81d7163bef501bc2b8800c38fed2f4407d794f961
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUtJAvAAoJEKDMw7q00Ii0qngH/0JCc2aMlpoywPLkai21rEtx
-AHkai37ybjudV27OeFDEpzj2wJEqKRLKX6XEqyG/5x5FPrH3BUinnlC/lLXhD4q8
-nYOyU2XjUWOnju7wEgXN25Cu/RRO0ZK6icszjjXzRn/5F+Z4IPVUoNGEHiwNw2pQ
-13tXTiacQivrVmMD7ngjof5BQZdwrYbfgIS6IRQ6C/PcWxoTiC+5X3NW2KfVPlpb
-nu6h+dO0ZirQnF3Ko5CnEE9KdSw8Ij39t3d9FzflAeUlVb0pb9G1YiX00b5IC5IO
-pJGe5XV0MjMH8sFE1QzYW36M/Lpfnaz1r2VtpKgvQgnjVbvaSdKF0fzkdAZOY6Y=
-=Pcxx
+iQEcBAEBCAAGBQJUtx2tAAoJEKDMw7q00Ii0188IAI0g/K//I7HyQrFCc+f8PFCu
++YOUBv/d96kZOQmr6fH4bNVdHoVkr7yM78cc0LppmeI6U3iv8C0X0CMRd99awUy4
+itSxgTH4cWkmhMPZ6HSVDku1Ql5IfsKqx3R87s8W5MLiO66qmneOEIGtE1wanKAU
+zbhhRO2JRNqFwBIzSWWznqWv/AgYRn+YQ1I+h0BbetcutTreYTrAPx++crlyhlJn
+uidAHoxbr5dq0a5vVD6tTk5HqqBY/RaLgvPfz6DXh0B3o7wEaifHXA5+cSziFzJ3
+5TDxzSrAHLUZrluoQYCi9ErCRWgxj26uqkVYY8h4CpPt4kDxfpd4AHervN9PvmU=
+=axKb
 -----END PGP SIGNATURE-----
diff --git a/www-client/firefox/firefox-35.0.ebuild b/www-client/firefox/firefox-35.0.ebuild
index ea10a2c9e735..a902d66e80da 100644
--- a/www-client/firefox/firefox-35.0.ebuild
+++ b/www-client/firefox/firefox-35.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-35.0.ebuild,v 1.1 2015/01/13 03:26:56 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-35.0.ebuild,v 1.2 2015/01/15 01:55:10 anarchy Exp $
 
 EAPI="5"
 VIRTUALX_REQUIRED="pgo"
@@ -91,6 +91,8 @@ fi
 
 QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
 
+BUILD_OBJ_DIR="${S}/ff"
+
 pkg_setup() {
 	moz_pkgsetup
 
@@ -229,6 +231,8 @@ src_configure() {
 		echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
 	fi
 
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+
 	# Finalize and report settings
 	mozconfig_final
 
@@ -278,33 +282,30 @@ src_install() {
 	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
 	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
 
-	# MOZ_BUILD_ROOT, and hence OBJ_DIR change depending on arch, compiler, pgo, etc.
-	local obj_dir="$(echo */config.log)"
-	obj_dir="${obj_dir%/*}"
-	cd "${S}/${obj_dir}" || die
+	cd "${BUILD_OBJ_DIR}" || die
 
 	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${S}/${obj_dir}"/dist/bin/xpcshell
+	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
 
 	# Add our default prefs for firefox
 	cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
-		"${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
 		|| die
 
 	# Set default path to search for dictionaries.
 	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
-		>> "${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		>> "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
 		|| die
 
 	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
-		"${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
 		|| die
 
 	local plugin
 	use gmp-autoupdate || for plugin in \
 	gmp-gmpopenh264 ; do
 		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-			"${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
 			|| die
 	done