From fcd72ac38e189b23a6f5ce14e1586384a4ca122d Mon Sep 17 00:00:00 2001 From: Ian Stakenvicius Date: Fri, 5 Dec 2014 23:06:59 +0000 Subject: [PATCH] shorten objdir to support longer PORTAGE_TMPDIRs, bug 531696 Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64 Manifest-Sign-Key: 0x2B6559ED --- www-client/firefox/ChangeLog | 6 +++++- www-client/firefox/Manifest | 10 +++++----- www-client/firefox/firefox-34.0.5-r1.ebuild | 21 +++++++++++---------- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog index 001a846feb4e..f50df7a190d4 100644 --- a/www-client/firefox/ChangeLog +++ b/www-client/firefox/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/firefox # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.369 2014/12/04 08:53:07 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.370 2014/12/05 23:06:43 axs Exp $ + + 05 Dec 2014; Ian Stakenvicius (_AxS_) + firefox-34.0.5-r1.ebuild: + shorten objdir to support longer PORTAGE_TMPDIRs, bug 531696 *firefox-34.0.5-r1 (04 Dec 2014) diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest index 6440a2bf2379..29da883da2d0 100644 --- a/www-client/firefox/Manifest +++ b/www-client/firefox/Manifest @@ -435,14 +435,14 @@ EBUILD firefox-10.0.11.ebuild 10716 SHA256 615a282826523ddf9177762a36d591a005476 EBUILD firefox-24.3.0.ebuild 12059 SHA256 25fbf1a1db269332d3b9df1f47707a55081763367a72507f11da19ea9fa6a48b SHA512 e3e067b1472e657713813816a86a9e25244353592fd7415265bd7bfe454d9314b3ce462194ecf663dc4a556b9d48b32e2cde970de3faaf013fbf79f88d73d1fd WHIRLPOOL 2dc2c713b903b397d9194a8dcf0a4dbc06ffcc3d7d9064bed04bf6120b48a8c921dffacf4bc8e94e881c6560753fb8b82c7a00d913122055a323536cdd9a454b EBUILD firefox-24.8.0.ebuild 12064 SHA256 cec8cf1ff29949cc9ae344ee6ade19c5f5d37a36f17857860a822a3130fe655b SHA512 a6677c826a1555b0f4d791706c797266d98d49bbabef2183f7c1eec6786d76bc25164130100a499b7635be5d1b058329f1e63362dd109824470ab9c131836103 WHIRLPOOL bc9c272dff2e36ca571de91a042794ac5f8836f87be6699cc91b5aaf5034593eda1c2791106f310911d083bc2580a1a1029dd34bb2a44080cac52f70ef5db3c4 EBUILD firefox-31.3.0.ebuild 11614 SHA256 c50d81a8af7d098509e4dd660e23e513c470a02a9dd7bd64a86c549004aebe9d SHA512 235493bd446b9a7159628a098ad01a5e441282833c46c8a7fa01409082ca56bdaf5795ff33959c656467cc6965a5fb94b247a7801daaedee20ae5f31d18793c5 WHIRLPOOL dce8d60ec19df4abbe99d5b66b821d69e2195af747211c6d85de754571476a6958123a8f5fe4ee6bcd85e32ccf6f36a7f08a997bdbe7ade33f0e8acfaf2cbcad -EBUILD firefox-34.0.5-r1.ebuild 11761 SHA256 8a83700f79d16e21d3f09c6c088b0b09d7b73f07e0bd82cc48c4b994febfaa5d SHA512 e7d5ed0c58dae021beb40b78b86fba44ce6537d636e8545b2a3f6ff4711c624edd0d2916415638dfced57d9c6852312430d502612bfd88686c3922a9f39bd793 WHIRLPOOL a8278d1e3c375f764a1ed332a4d43678f0550c29f7db538933719712e4b8c1afbf7c9dda70571ef3c9b6f5a30be759f12dfbd1b8ab1a605f4caa30cb042c5df3 -MISC ChangeLog 61404 SHA256 cb645ee94bac495c5d94601e4bbb4bfa782560d05c4dc29bb16f680187ca011e SHA512 48f04b3c44955b584f72a6df399b077a4a2f013b2812a879edde184c7e7d848cfc292796eecdd291f6117497d0cc30578a44fb6f9174f615722168ebc4674bd6 WHIRLPOOL 42e56216b15ea43a0cf4aaf2720f8dbe3583cc73e28bdf1e14392bc31de264470a22476ab83781a334ebaf6576489c6ef77615c00d70f21e5678b0ef71906095 +EBUILD firefox-34.0.5-r1.ebuild 11719 SHA256 2f56306602e5cc85548b07948d5b43ff148c4fa038ac67b7e794775cb8c69150 SHA512 4247434de39de6f2da136342ef1bc179bbaa81cc95b1d17939ae14a87ee9c94dc8f81137fb272e3bae87df1252c78b80fa48441f7047fb3d27ea7ed3d63e429f WHIRLPOOL bcccc6df37126f35343a0663f4c0f3e8e16c338ab41f96ecdab7ea4260bea7c709e882e49d0e7789997ed28876e3f3ade19fce00a5e171535472c9a182ce2c9d +MISC ChangeLog 61553 SHA256 1f3b67a7daa0447a6d559ba7475ccc5d3110cd2a9f04c9493ebde2a44eddb7c8 SHA512 cefbfd3ee1be9af3397d260fff564601e5b82d99751f5b8654cce381f3fb2d49975bdd9726e81d19199316002b7bd06ff4abd0e2582f4f30588d371d1218e86d WHIRLPOOL 035890ff16b69b519e010d249c6353feda8c209234301d4d4b4d021f5ede5e74d87b72ef6d967815502b1c721a96600bc7b1743c058eea88a88c9eee9bf44bd2 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 -iF4EAREIAAYFAlSAIPcACgkQ2ugaI38ACPBYnwD9HxJD1+kWK5o2GIvn9vYMphTw -oFfvEcZF86o7Ef5z2QEBAJLqJym8AFOTwZW2lr3yCfNf3mTtIfj1EPmNEn9S1MDa -=4HA7 +iF4EAREIAAYFAlSCOosACgkQ2ugaI38ACPCqHgD/Uj+xdcFbLtHXlg7SbrxjSimp +w+Wxwk2lKIrxgO2+M60A/j8vya/sz87f79v0ItC+6SeS3lVB7VBIZpW0OQR9pRiV +=HXvo -----END PGP SIGNATURE----- diff --git a/www-client/firefox/firefox-34.0.5-r1.ebuild b/www-client/firefox/firefox-34.0.5-r1.ebuild index f8f9e2f5cd4a..4983dcc24658 100644 --- a/www-client/firefox/firefox-34.0.5-r1.ebuild +++ b/www-client/firefox/firefox-34.0.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-34.0.5-r1.ebuild,v 1.1 2014/12/04 08:53:07 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-34.0.5-r1.ebuild,v 1.2 2014/12/05 23:06:43 axs Exp $ EAPI="5" VIRTUALX_REQUIRED="pgo" @@ -89,6 +89,8 @@ fi QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox" +BUILD_OBJ_DIR="${S}/ff" + pkg_setup() { moz_pkgsetup @@ -225,6 +227,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 @@ -274,33 +278,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 -- 2.26.2