From 9a4e2015fd417171ea0b87f6281c4e33543a0983 Mon Sep 17 00:00:00 2001 From: Mitch Harder Date: Mon, 23 May 2011 15:52:38 -0500 Subject: [PATCH] [www-client/firefox] Update firefox 4.0.1 ebuild to r1. Update the www-client/firefox-4.0.1 ebuild to track the r1 version on the Gentoo main tree. Minor updates include use system libffi. Also, the branding disclaimer was adapted to match Sabayon's practice. --- www-client/firefox/Manifest | 4 ++-- ...x-4.0.1.ebuild => firefox-4.0.1-r1.ebuild} | 21 ++++++++++++------- 2 files changed, 15 insertions(+), 10 deletions(-) rename www-client/firefox/{firefox-4.0.1.ebuild => firefox-4.0.1-r1.ebuild} (93%) diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest index d0426edbb..f06842aff 100644 --- a/www-client/firefox/Manifest +++ b/www-client/firefox/Manifest @@ -10,7 +10,7 @@ AUX icon/iceweasel.desktop 251 RMD160 56a1e32c06c3bd460d15f5fc56d23293cffd62bd S AUX using_extend_pad.patch 518 RMD160 111f0168d3936ccd39d4196434e799a8bba7c1d0 SHA1 e807afa1bb79771b4faff19ef4bbb238b92b8158 SHA256 059c79558934146d49f396c14b8fb054633caa4eb715babbdb300ae4669a204a AUX xulrunner-1.9.2-arm-fixes.patch 587 RMD160 495e8037785a1867fad0c088a4c834df6f02291c SHA1 5f08ef1f65771c2891a067c7baac8a4ef8466deb SHA256 a1b0aef546deecafe64c9ce70b08e7252a3eaf8d84a381a62b5edfaf1f735817 AUX xulrunner-1.9.2-gtk+-2.21.patch 663 RMD160 20e2465da0e6c884527fd7cfebd3bdb2f8f015a9 SHA1 f2b9c26ed255bde672ccc8cb7ae4ae014f52d6f5 SHA256 79c11dc4304d748f3c2d6e451aa6d44dd1bb450d1db671e7fa4a83420c6f2c05 -DIST firefox-4.0-patches-0.9.tar.bz2 15523 RMD160 b77ed73411f609197cc2bcd05076e6e4b08dafd9 SHA1 c0292e825a718f1f094b9d66d0055f9d9aed81a0 SHA256 43c36a28ceae88343bca694f7f52a9852f7ada82b56adc030dd4c7d9dd247441 +DIST firefox-4.0-patches-1.0.tar.bz2 16462 RMD160 46755eac7eb04eb19f79c93af3fd2016289a62a4 SHA1 270afe97a49bc507bc0d1d3159ec23e69e9ec40f SHA256 db5e993bf309c316ca370186c7866a7505cb37ecc729a3449bd0f6538aa2eda0 DIST firefox-4.0.1-af.xpi 220422 RMD160 ec60332dd0115ae4087778ae45999485dd5e79b0 SHA1 5668120b63f9cafc738b05f66b45e0c0f343a14c SHA256 6b3529b78e6643578d407d454a70bce423742206d13f69bdd97871da9c533688 DIST firefox-4.0.1-ak.xpi 222042 RMD160 c71d3c421e0297c599f5d6d8f135d12c2ae56b56 SHA1 5479593fc3c3c546f6289dc0634aa887dc30fc9d SHA256 a09ffd1618a1596cb8803a73bcbba74cfc79f8809168576b97fd023bf1c990c8 DIST firefox-4.0.1-ar.xpi 241601 RMD160 d875b31df6568e7a0903684b5c68952241ae3d7c SHA1 11ddcb8f9139dbcdf898e691a4cbdf1841563755 SHA256 f2d19b19c1d817d935bbe3df0531ae9ff95a801109c65e1230f4f3bae60a0662 @@ -87,6 +87,6 @@ DIST firefox-4.0.1-uk.xpi 260131 RMD160 7a4ea1bd3728037b6a72f2bffea2691433472429 DIST firefox-4.0.1-vi.xpi 239967 RMD160 15bcdf411cd432329d743c060c68d1cce16d7e56 SHA1 ff34a6697c4c02485d592da9849dbbcabdb87689 SHA256 78408acdada24372e27a2b0bc162d49b70accdcda506f56e6e700168c2434c2b DIST firefox-4.0.1-zu.xpi 227606 RMD160 4341384271eb8c3341f55512c301dcd9dc9fc542 SHA1 d171ff639bbcd5173e3dfd185fd7902da70815ad SHA256 6c8575e740f4058ee54be0f89a25994c25fca691499762b4036e190d03c24698 DIST firefox-4.0.1.source.tar.bz2 65980273 RMD160 63faaae78b56db407a34454986361212382c838e SHA1 c89bc5106266aa0097a7be15be84555bd2649f03 SHA256 cf3a39877facc229a67760915341fe95095cca647faab3a7adcb70046105199c -EBUILD firefox-4.0.1.ebuild 8090 RMD160 910185bd2a84d23c548672b28a0806ff1166c2f7 SHA1 2194b0741f9802252d101e2d88dd9301a944b20b SHA256 de07edb0f058eec8a6b57040bcdcbe78b22c577448d8f955a2f1edfcc5bfa299 +EBUILD firefox-4.0.1-r1.ebuild 8233 RMD160 9ed2853754d276e721bf2c4722db8442c3a83de7 SHA1 daaee8d3797bb7b25ff45114767e92d61b83015f SHA256 5f942b127c7a4a3f1d57c3fcf1616e56ccdf1eda4b7f15ee1edddc5e91193381 MISC Reasons 78 RMD160 7d64d7c887de08d4efae22403cf5477a2ff5aac2 SHA1 8af08b03118ba67b043188d8ab08e09e33b51b75 SHA256 572b8e14ccb6193465d6f33dac5ff2aa7e8e441a18f8d176f2c8f8ef5327b221 MISC metadata.xml 860 RMD160 9dc7089f75140dda59a5ee9eaff41c35febd25bc SHA1 df2fae94e9f4a9fba7399aea0bfe0a38a1d01e89 SHA256 783b95078850c3b150069dcdead96113fe1a44036e61cae9d035f15c3bd1660e diff --git a/www-client/firefox/firefox-4.0.1.ebuild b/www-client/firefox/firefox-4.0.1-r1.ebuild similarity index 93% rename from www-client/firefox/firefox-4.0.1.ebuild rename to www-client/firefox/firefox-4.0.1-r1.ebuild index c08fdd607..ff125791b 100644 --- a/www-client/firefox/firefox-4.0.1.ebuild +++ b/www-client/firefox/firefox-4.0.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-4.0.1.ebuild,v 1.1 2011/05/02 23:33:17 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-4.0.1-r1.ebuild,v 1.2 2011/05/16 18:00:19 xarthisius Exp $ EAPI="3" WANT_AUTOCONF="2.1" @@ -14,12 +14,12 @@ FF_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI FF_PV="${FF_PV/_beta/b}" # Handle beta for SRC_URI FF_PV="${FF_PV/_rc/rc}" # Handle rc for SRC_URI CHANGESET="e56ecd8b3a68" -PATCH="${PN}-4.0-patches-0.9" +PATCH="${PN}-4.0-patches-1.0" DESCRIPTION="Firefox Web Browser" HOMEPAGE="http://www.mozilla.com/firefox" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" SLOT="0" LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" IUSE="bindist +ipc system-sqlite +webm" @@ -28,13 +28,16 @@ REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases" # More URIs appended below... SRC_URI="http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2" +ASM_DEPEND=">=dev-lang/yasm-1.1" + RDEPEND=" >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.9 >=dev-libs/nspr-4.8.7 >=dev-libs/glib-2.26 - >=media-libs/libpng-1.4.7[apng] + media-libs/libpng[apng] x11-libs/pango[X] + dev-libs/libffi system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] ) ~net-libs/xulrunner-${XUL_PV}[wifi=,libnotify=,system-sqlite=,webm=] webm? ( media-libs/libvpx @@ -42,7 +45,8 @@ RDEPEND=" DEPEND="${RDEPEND} dev-util/pkgconfig - webm? ( dev-lang/yasm )" + webm? ( x86? ( ${ASM_DEPEND} ) + amd64? ( ${ASM_DEPEND} ) )" # No source releases for alpha|beta if [[ ${PV} =~ alpha|beta ]]; then @@ -111,9 +115,9 @@ pkg_setup() { if ! use bindist ; then einfo - elog "You are enabling official branding. You may not redistribute this build" - elog "to any users on your network or the internet. Doing so puts yourself into" - elog "a legal problem with Mozilla Foundation" + elog "You are enabling official branding. Manually check configuration" + elog "carefully to ensure compliance with licensing provisions" + elog "of the Mozilla Foundation if you are re-distributing this package." elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag" fi } @@ -168,6 +172,7 @@ src_configure() { mozconfig_annotate '' --enable-canvas mozconfig_annotate '' --enable-safe-browsing mozconfig_annotate '' --with-system-png + mozconfig_annotate '' --enable-system-ffi mozconfig_annotate '' --with-system-libxul mozconfig_annotate '' --with-libxul-sdk="${EPREFIX}"/usr/$(get_libdir)/xulrunner-devel-${MAJ_XUL_PV}