From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 21F351381F3 for ; Sat, 20 Apr 2013 22:20:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87274E094A; Sat, 20 Apr 2013 22:20:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0EDD7E094A for ; Sat, 20 Apr 2013 22:20:00 +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 E0CC533DB86 for ; Sat, 20 Apr 2013 22:19:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 7C443E408C for ; Sat, 20 Apr 2013 22:19:58 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1366496362.f47b4b878d7bb0671b49caa7f7fd16967ac8291d.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/firefox/ X-VCS-Repository: proj/mozilla X-VCS-Files: www-client/firefox/Manifest www-client/firefox/firefox-20.0.1.ebuild X-VCS-Directories: www-client/firefox/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: f47b4b878d7bb0671b49caa7f7fd16967ac8291d X-VCS-Branch: master Date: Sat, 20 Apr 2013 22:19:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 762f35fc-4710-4bd0-a01b-4fa9744b85a4 X-Archives-Hash: c6d5966b234edef44d133bf5647e60ad commit: f47b4b878d7bb0671b49caa7f7fd16967ac8291d Author: Jory A. Pratt gentoo org> AuthorDate: Sat Apr 20 22:19:22 2013 +0000 Commit: Jory Pratt gentoo org> CommitDate: Sat Apr 20 22:19:22 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=f47b4b87 Add useflag for system-cairo disabled by default --- www-client/firefox/Manifest | 2 +- www-client/firefox/firefox-20.0.1.ebuild | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest index 3199158..04c6eb5 100644 --- a/www-client/firefox/Manifest +++ b/www-client/firefox/Manifest @@ -178,4 +178,4 @@ DIST firefox-20.0.1-zh-TW.xpi 324198 SHA256 c6d6da4e2d86252c099427a7a9ac8188fb19 DIST firefox-20.0.1-zu.xpi 315412 SHA256 67cf6d8ba1c3fef4a78f22380c7e7ce0f04822e707d2b3c1f57bb11c00e1f314 SHA512 37b5080322819d3a18fcdd6fff24ccb323a5f0fe5c6e0f67dd9ba8fa6cdde1c9f55e4a5ec97377cff357dda915e077bb0289e5625174b210b063243b5841b342 WHIRLPOOL 0077b9dafbd40455788bfb689eefea88528c96ebd9a326e770c0caeef258c44600fee1a4e278f1fb31d53b10a3218c765d3ade421050fee478b421f4baf61a43 DIST firefox-20.0.1.source.tar.bz2 100154949 SHA256 03fe28c82d6577e9af8659f2ee44d5f05950353732d47a0ade562855ba564cf4 SHA512 07b280de2f48ae994e74945011da45d4737a9e17b4d4377725f6968598d992e6dd6c6929690815bf4bb554499a3e4fe17bfef652c3d762caa2e8af100a5d0359 WHIRLPOOL c385c1da6b9252983fd9bf3d2cce505032d2cc2a343a0846a0807fe658d37874152a51903b23aa36a04a67ebf6e3a7fdfaccf934256bf478068a43a71f735bc4 EBUILD firefox-17.0.5.ebuild 11771 SHA256 55badf96f2e515e1c80544c40e61cfee3534cb0745bbe492633442ab5d3e8bb2 SHA512 e941e0379fec82d2358ba8d451f6332e3b6986394122f23a5b36ecfcdb361604fccdae278d36927f314a2d467010a050f3315e78a741f0c80ea9ebf81cbd7e17 WHIRLPOOL 940dbb62e589b40aff7a7d1e815e9720d029c6da53d09ca524deed2eac2d39ab7cb1c5368c4625d8dce2c5487771e83e299369a7248171c47b8b64ae5494e66b -EBUILD firefox-20.0.1.ebuild 11237 SHA256 1c519f4be4f3ee748b66b95bfd8ead3321b4a7a4fe5826f1d2359fe494fc0f20 SHA512 d66d8e181de99ebcfecd35a068c3b6ab2c5566d9ab52c22b5f76bf70c97e5037a428dab89ba37be9a3377b39039da19fe441e3dd803fa32d6d944322f832f640 WHIRLPOOL 609e5c188a061380c1ed93b1dcc0e8b1e29807b18619cd9cca990280b3fdcf5946b7d7283a7725d6ea1a8ee2ed9011baae5d25ebd6384e60689bbf7d86d96b8e +EBUILD firefox-20.0.1.ebuild 11483 SHA256 9d1cc62a7118d876ee3128faa5a9aab16253909a20f8687dc185497fe718581f SHA512 782789ca1eb582ec46de2b21a05c1431871885da1ad905d40e1388d429aefa71859ce68f047e347928117fd9f9f52dc0c2c1b0b8a84dc4daa4acfc7f6c0505da WHIRLPOOL 9c878d3d8577cf82a063ef793b7486646f802e08f5c14c5c0f744b4151a54cb2eff745bd630066eedb02de47c87e99f307c844a09ac766df7b18e518cd7fe94d diff --git a/www-client/firefox/firefox-20.0.1.ebuild b/www-client/firefox/firefox-20.0.1.ebuild index bbf50cd..10c1c12 100644 --- a/www-client/firefox/firefox-20.0.1.ebuild +++ b/www-client/firefox/firefox-20.0.1.ebuild @@ -38,7 +38,7 @@ HOMEPAGE="http://www.mozilla.com/firefox" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" SLOT="0" LICENSE="MPL-2.0 GPL-2 LGPL-2.1" -IUSE="bindist gstreamer +jit +minimal pgo selinux system-jpeg system-sqlite" +IUSE="bindist gstreamer +jit +minimal pgo selinux system-cairo system-jpeg system-sqlite" # More URIs appended below... SRC_URI="${SRC_URI} @@ -57,6 +57,7 @@ RDEPEND=" >=media-libs/libpng-1.5.13[apng] virtual/libffi gstreamer? ( media-plugins/gst-plugins-meta:0.10[ffmpeg] ) + system-cairo? ( >=x11-libs/cairo-1.8[X] ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-sqlite? ( || ( >=dev-db/sqlite-3.7.16:3[secure-delete,debug=] @@ -140,6 +141,10 @@ src_unpack() { } src_prepare() { + # Discard system cairo patch if support is not requested + if ! use system-cairo ; then + export EPATCH_EXCLUDE="6009_fix_system_cairo_support.patch" + fi # Apply our patches EPATCH_SUFFIX="patch" \ EPATCH_FORCE="yes" \ @@ -218,6 +223,7 @@ src_configure() { mozconfig_use_enable jit methodjit mozconfig_use_enable jit tracejit mozconfig_use_enable jit ion + mozconfig_use_enable system-cairo # Allow for a proper pgo build if use pgo; then