From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SXB4q-0007TM-6X for garchives@archives.gentoo.org; Wed, 23 May 2012 12:54:08 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 46C5CE05B1; Wed, 23 May 2012 12:53:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0885EE05B1 for ; Wed, 23 May 2012 12:53:55 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 23B391B4028 for ; Wed, 23 May 2012 12:53:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DD531E542A for ; Wed, 23 May 2012 12:53:52 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1337777572.26f0c1594860202b43cc4bdf6cf35bb014c36cd4.polynomial-c@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/firefox/, www-client/seamonkey/ X-VCS-Repository: proj/mozilla X-VCS-Files: www-client/firefox/Manifest www-client/firefox/firefox-12.0.ebuild www-client/seamonkey/Manifest www-client/seamonkey/seamonkey-2.9.1.ebuild X-VCS-Directories: www-client/firefox/ www-client/seamonkey/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 26f0c1594860202b43cc4bdf6cf35bb014c36cd4 X-VCS-Branch: master Date: Wed, 23 May 2012 12:53:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 2711f93e-0eba-44bf-a633-98ed45369ca8 X-Archives-Hash: a8d32a438b186b82e61ab5a8d7cc3310 commit: 26f0c1594860202b43cc4bdf6cf35bb014c36cd4 Author: Lars Wendler gentoo org> AuthorDate: Wed May 23 12:52:52 2012 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed May 23 12:52:52 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mozilla.git;a= =3Dcommit;h=3D26f0c159 Fixed dependency on sqlite in firefox ebuild. Added jit USE flag to seamo= nkey ebuild. --- www-client/firefox/Manifest | 2 +- www-client/firefox/firefox-12.0.ebuild | 2 +- www-client/seamonkey/Manifest | 3 +- www-client/seamonkey/seamonkey-2.9.1.ebuild | 28 ++++++++++++++++++++-= ----- 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest index 636466a..33eeecc 100644 --- a/www-client/firefox/Manifest +++ b/www-client/firefox/Manifest @@ -86,4 +86,4 @@ DIST firefox-12.0-zh-CN.xpi 266860 RMD160 f376ac78c45b1= 306aa9a0a48af18033c294e04 DIST firefox-12.0-zh-TW.xpi 267735 RMD160 937efdf1bdefffcfb514247bd2779f= a66fb1a26a SHA1 f4142fa1a449d62402aacf3c49b01a17cd86f1de SHA256 b1fc8db55= 6c8f6724e0b1798edcfea03f5c140aaa89e2d5078fd9c05cfdcb27f DIST firefox-12.0-zu.xpi 255708 RMD160 42b5013ff842ed74bcb70bacf338b6239= 340a1c6 SHA1 4ac34cc274ad7a94904f05bb768d8b412bf72ce6 SHA256 8491b0e6c1f4= b5dff38f715d38c44ed267816bb053149193d958c43b6ca65bbb DIST firefox-12.0.source.tar.bz2 78956707 RMD160 d83eb97543fc09f84b30a46= ba8217c17f30bd572 SHA1 0177185e54b7d63dc36bd5bd5c80ba6afd52e199 SHA256 9a= 232a10e5803b0e4a85bd986e3e88b87ccde7bdc3363ea7022d5761944dbb1d -EBUILD firefox-12.0.ebuild 11125 RMD160 624b74361ec2077fa8ee5a3ef61e8797= 168705b8 SHA1 9f4e8088b480a70a0e014702b1ccb79639335d6b SHA256 89441e66e8a= 8746fbc8694f7a899b8b89c9a525ea60650e91ec9d6754728dd2b +EBUILD firefox-12.0.ebuild 11124 RMD160 44167c71dacbe9f195b6de7c0559e015= 3bdeef14 SHA1 7c986c69fcbdd8c4fa29baace2df04b6196b42dc SHA256 84dd56a32c4= 10e57990209b53faf39261b66e8411ee2bcfb3c977ce7cd51e49f diff --git a/www-client/firefox/firefox-12.0.ebuild b/www-client/firefox/= firefox-12.0.ebuild index 083ef3c..a0a68e5 100644 --- a/www-client/firefox/firefox-12.0.ebuild +++ b/www-client/firefox/firefox-12.0.ebuild @@ -57,7 +57,7 @@ RDEPEND=3D" >=3Dmedia-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi - system-sqlite? ( >=3Ddev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsaf= e,unlock-notify,debug=3D] ) + system-sqlite? ( >=3Ddev-db/sqlite-3.7.10[fts3,secure-delete,threadsafe= ,unlock-notify,debug=3D] ) webm? ( >=3Dmedia-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifes= t index 4e04c5c..09fbaca 100644 --- a/www-client/seamonkey/Manifest +++ b/www-client/seamonkey/Manifest @@ -5,6 +5,7 @@ AUX seamonkey-2.9-revert-system-cairo-breakage.patch.bz2 = 4056 RMD160 1ded73be2dd DIST enigmail-1.4.1.tar.gz 1344516 RMD160 f235e266acd390992f128a20f73288= c2ecc3c5a5 SHA1 5c629a5d06e23c5bebb86c840f44f04f0732dbda SHA256 100bc7f9a= c6bca03e4507df25c5b29d6a39d0904c46301cc7def3676779d720b DIST firefox-12.0-patches-0.2.tar.xz 11528 RMD160 7421b1c48f22bef9b5a37e= a084c5755672fdc96c SHA1 8117e20cb51cd7e2c39d8774515f583d1dded7b3 SHA256 7= b478bec5ae03a51d08de5c19e7d71c668c566a359f694ab47f8d02e7f52a03f DIST seamonkey-2.7-patches-03.tar.xz 1080 RMD160 bab03aac9c6bd1d5aacfe87= f7c3792a15fd0250b SHA1 6a80c1d6ee057e8f557af59d350543c6ba0cf57f SHA256 ee= de05439b5555871082652abe01c13b1f859640d8ac5df3001623c1084abec8 +DIST seamonkey-2.9-revert-system-cairo-breakage.patch.bz2 4056 RMD160 1d= ed73be2ddc2d592ce72047ae9d3305ba0655fd SHA1 30f64705951349f1eb4da129db9c3= fb3b671b113 SHA256 b44ae89fa9ca8e0ae9607bdf737489a204803660eb9c86d84c3c08= 1210f5dfb6 DIST seamonkey-2.9.1-be.xpi 798857 RMD160 fbaea7fab9014552552e831b077257= 6cb8e3b0c7 SHA1 14030f2331f5067a71fb2fd05689f5cca874e464 SHA256 2c1ac1a65= 7bd30b18610e157160ae5744230857f286edef3010dd4ee4e3e163f DIST seamonkey-2.9.1-ca.xpi 816788 RMD160 240fe42ed05da9ab1a3ad0c6a03e9f= 2d8e2a2d1e SHA1 3be62265e7912293690e01daaf7f7e6b92fad96a SHA256 b08f59c86= 6fcedad3f56907ba58403e8412056b2e86579bdc46eb13a89d64af5 DIST seamonkey-2.9.1-cs.xpi 821567 RMD160 9d00bec75951d196aebc445ffe9717= 403a67ad70 SHA1 a35107eec1819e9297b9716e21be4dbe5fbb6c2a SHA256 8d45826f8= 82d885030d3a0c6d42fdbdc055dcd056e1d19c545fdbbd72e3f805a @@ -29,4 +30,4 @@ DIST seamonkey-2.9.1-sv-SE.xpi 873454 RMD160 45701743bf= 22a7ecead137a2d16232e2e99 DIST seamonkey-2.9.1-tr.xpi 812532 RMD160 dc511c9e0a6e874c3a709de32e3884= 8cf2d5368a SHA1 44639eaf6a120694f7ae9e8e713d573b5f1fa2d7 SHA256 2bd704fe8= bd2760cb89f06fcceb377a76c53d0d1186af3fe83aba27c94d1e9ef DIST seamonkey-2.9.1-zh-CN.xpi 840507 RMD160 9a9dcdf6d919dd721357c22c088= efbd8bffca80f SHA1 299d9c8b5f278e3588d849da3bd79b33840dcb90 SHA256 a519cd= aca2ff62327e7bbce640f318df6550c4a01f2b443c5bed81e0d2b99e89 DIST seamonkey-2.9.1.source.tar.bz2 102164308 RMD160 9a024a908b61db24250= c93d12d499391d5b0bd2e SHA1 04b417222c345bd45732dacf07d3e33a3b0cd53d SHA25= 6 1d6e65569bb2d9643c746a1aff3b3515ff56565014e95316b19e0731df9c65ac -EBUILD seamonkey-2.9.1.ebuild 8141 RMD160 c4fa822105188b9a15df7ac10de59c= 57c632b56b SHA1 84a0827d5de414318486efbcbd9333c51a246db0 SHA256 8253dd7dd= 621a4fed5b884d78c00a5ffa07afcd7874bedf0c7741fa6b6120cfa +EBUILD seamonkey-2.9.1.ebuild 8745 RMD160 e0709e91d26d1b1d2ca9a196366ae2= 1dc03f2bc5 SHA1 d53e1dfead6d654a538dc6790377d3a68c4eef54 SHA256 b6832ddd4= 4e0ed0aaf98156ebdaca573f22e0c32e97711dd29996b5fcebbe69b diff --git a/www-client/seamonkey/seamonkey-2.9.1.ebuild b/www-client/sea= monkey/seamonkey-2.9.1.ebuild index 3b21738..b81929b 100644 --- a/www-client/seamonkey/seamonkey-2.9.1.ebuild +++ b/www-client/seamonkey/seamonkey-2.9.1.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/www-client/seamonkey/seamonkey-2.9.eb= uild,v 1.1 2012/04/24 23:24:38 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.9.1.= ebuild,v 1.5 2012/05/08 13:08:49 polynomial-c Exp $ =20 EAPI=3D"3" WANT_AUTOCONF=3D"2.1" @@ -46,12 +46,13 @@ fi =20 SLOT=3D"0" LICENSE=3D"|| ( MPL-1.1 GPL-2 LGPL-2.1 )" -IUSE=3D"+alsa +chatzilla +crypt +ipc +roaming system-sqlite +webm" +IUSE=3D"+alsa +chatzilla +crypt +ipc +jit +roaming system-sqlite +webm" =20 SRC_URI+=3D"${SRC_URI} ${MOZ_FTP_URI}/source/${MOZ_P}.source.tar.bz2 -> ${P}.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz + http://dev.gentoo.org/~polynomial-c/mozilla/${PN}-2.9-revert-system-cai= ro-breakage.patch.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMV= ER}.tar.gz )" =20 ASM_DEPEND=3D">=3Ddev-lang/yasm-1.1" @@ -114,7 +115,7 @@ src_prepare() { epatch "${WORKDIR}/firefox" popd &>/dev/null || die =20 - epatch "${FILESDIR}"/${PN}-2.9-revert-system-cairo-breakage.patch.bz2 + epatch "${DISTDIR}"/${PN}-2.9-revert-system-cairo-breakage.patch.bz2 =20 # Allow user to apply any additional patches without modifing ebuild epatch_user @@ -175,7 +176,9 @@ src_configure() { mozconfig_annotate '' --target=3D"${CTARGET:-${CHOST}}" =20 mozconfig_use_enable system-sqlite - mozconfig_use_enable methodjit + # Both methodjit and tracejit conflict with PaX + mozconfig_use_enable jit methodjit + mozconfig_use_enable jit tracejit =20 # Use an objdir to keep things organized. echo "mk_add_options MOZ_OBJDIR=3D@TOPSRCDIR@/seamonk" \ @@ -222,7 +225,11 @@ src_install() { "${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \ || die =20 - pax-mark m "${S}"/dist/bin/xpcshell + # Without methodjit and tracejit there's no conflict with PaX + if use jit ; then + # Pax mark xpcshell for hardened support, only used for startupcache c= reation. + pax-mark m "${S}"/dist/bin/xpcshell + fi =20 emake DESTDIR=3D"${D}" install || die "emake install failed" cp -f "${FILESDIR}"/icon/${PN}.desktop "${T}" || die @@ -257,8 +264,15 @@ src_install() { || die domenu "${T}"/${PN}.desktop || die =20 - # Required in order to use plugins and even run seamonkey on hardened. - pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-= container} + # Without methodjit and tracejit there's no conflict with PaX + if use jit ; then + # Required in order to use plugins and even run firefox on hardened. + pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin} + fi + + # Plugin-container needs to be pax-marked for hardened to ensure plugin= s such as flash + # continue to work as expected. + pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container =20 # Handle plugins dir through nsplugins.eclass share_plugins_dir