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 1PwJ5p-0000Em-DD for garchives@archives.gentoo.org; Sun, 06 Mar 2011 18:54:14 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5CCF1C05F; Sun, 6 Mar 2011 18:54:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7E6EE1C05F for ; Sun, 6 Mar 2011 18:54:06 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D95321B409B for ; Sun, 6 Mar 2011 18:54:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 4A7108006A for ; Sun, 6 Mar 2011 18:54:05 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <38ecfcab09cda8f3c0d9ae759ebf9aada2b1dcaa.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, www-client/firefox/, eclass/, net-libs/xulrunner/ X-VCS-Repository: proj/mozilla X-VCS-Files: eclass/mozconfig-3.eclass eclass/mozcoreconf-2.eclass mail-client/thunderbird/Manifest mail-client/thunderbird/thunderbird-3.1.9.ebuild mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild net-libs/xulrunner/Manifest net-libs/xulrunner/xulrunner-2.0_beta13_pre.ebuild www-client/firefox/Manifest www-client/firefox/firefox-4.0_beta13_pre.ebuild X-VCS-Directories: mail-client/thunderbird/ www-client/firefox/ eclass/ net-libs/xulrunner/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 38ecfcab09cda8f3c0d9ae759ebf9aada2b1dcaa Date: Sun, 6 Mar 2011 18:54:05 +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: X-Archives-Hash: a648190062899122b79047e96fee4f47 commit: 38ecfcab09cda8f3c0d9ae759ebf9aada2b1dcaa Author: Jory A. Pratt gentoo org> AuthorDate: Sun Mar 6 18:52:14 2011 +0000 Commit: Jory Pratt gentoo org> CommitDate: Sun Mar 6 18:52:14 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mozilla.git;a= =3Dcommit;h=3D38ecfcab major modifications to eclasses, we now support gio over gnome-vfs --- eclass/mozconfig-3.eclass | 95 +++++++ eclass/mozcoreconf-2.eclass | 271 ++++++++++++++= ++++++ mail-client/thunderbird/Manifest | 4 +- mail-client/thunderbird/thunderbird-3.1.9.ebuild | 31 +-- .../thunderbird/thunderbird-3.3_alpha2.ebuild | 32 +-- net-libs/xulrunner/Manifest | 2 +- net-libs/xulrunner/xulrunner-2.0_beta13_pre.ebuild | 79 +------ www-client/firefox/Manifest | 2 +- www-client/firefox/firefox-4.0_beta13_pre.ebuild | 67 +----- 9 files changed, 389 insertions(+), 194 deletions(-) diff --git a/eclass/mozconfig-3.eclass b/eclass/mozconfig-3.eclass new file mode 100644 index 0000000..5705b0a --- /dev/null +++ b/eclass/mozconfig-3.eclass @@ -0,0 +1,95 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ +# +# mozconfig.eclass: the new mozilla.eclass + +inherit multilib flag-o-matic mozcoreconf-2 + +IUSE=3D"+alsa bindist gnome +dbus debug +ipc libnotify startup-notificat= ion system-sqlite +webm wifi" + +RDEPEND=3D"app-arch/zip + app-arch/unzip + >=3Dapp-text/hunspell-1.2 + dev-libs/expat + >=3Ddev-libs/glib-2.26 + >=3Ddev-libs/libIDL-0.8.0 + >=3Ddev-libs/libevent-1.4.7 + !=3Dx11-libs/cairo-1.10.2[X] + >=3Dx11-libs/gtk+-2.8.6 + >=3Dx11-libs/pango-1.10.1 + virtual/jpeg + alsa? ( media-libs/alsa-lib ) + dbus? ( >=3Ddev-libs/dbus-glib-0.72 ) + gnome? ( libnotify? ( >=3Dx11-libs/libnotify-0.4 ) ) + startup-notification? ( >=3Dx11-libs/startup-notification-0.8 ) + system-sqlite? ( >=3Ddev-db/sqlite-3.7.4[fts3,secure-delete,unlock-noti= fy,debug=3D] ) + webm? ( media-libs/libvpx=20 + media-libs/alsa-lib ) + wifi? ( net-wireless/wireless-tools )" + +DEPEND=3D"${RDEPEND}" + +mozconfig_config() { + if ${SM} || ${XUL} || ${TB} || ${FF} || ${IC}; then + mozconfig_annotate thebes --enable-default-toolkit=3Dcairo-gtk2 + else + mozconfig_annotate -thebes --enable-default-toolkit=3Dgtk2 + fi + + if [[ ${PN} =3D firefox || ${PN} =3D thunderbird ]]; then + mozconfig_use_enable !bindist official-branding + fi + + mozconfig_use_enable alsa ogg + mozconfig_use_enable alsa wave + mozconfig_use_enable dbus + mozconfig_use_enable debug + mozconfig_use_enable debug tests + mozconfig_use_enable debug debugger-info-modeules + mozconfig_use_enable ipc + mozconfig_use_enable libnotify + mozconfig_use_enable startup-notification + mozconfig_use_enable system-sqlite + if use system-sqlite; then + mozconfig_annotate '' --with-sqlite-prefix=3D"${EPREFIX}"/usr + fi + mozconfig_use_enable wifi necko-wifi + + if ${SM} || ${XUL} || ${FF} || ${IC}; then + if use webm && ! use alsa; then + echo "Enabling alsa support due to webm request" + mozconfig_annotate '+webm -alsa' --enable-ogg + mozconfig_annotate '+webm -alsa' --enable-wave + mozconfig_annotate '+webm' --enable-webm + else + mozconfig_use_enable webm + mozconfig_use_with webm system-libvpx + fi + fi + + if ${SM} || ${XUL} || ${FF} || ${IC}; then + if use amd64 || use x86 || use arm || use sparc; then + mozconfig_annotate '' --enable-tracejit + fi + fi + + if ${SM} || ${TB} || ${XUL}; then + MEXTENSIONS=3D"default" + mozconfig_annotate '' --enable-extensions=3D"${MEXTENSIONS}" + fi + + # These are enabled by default in all mozilla applications + mozconfig_annotate '' --with-system-nspr --with-nspr-prefix=3D"${EPREFI= X}"/usr + mozconfig_annotate '' --with-system-nss --with-nss-prefix=3D"${EPREFIX}= "/usr + mozconfig_annotate '' --x-includes=3D"${EPREFIX}"/usr/include --x-libra= ries=3D"${EPREFIX}"/usr/$(get_libdir) + mozconfig_annotate 'broken' --disable-crashreporter + mozconfig_annotate '' --enable-system-hunspell + mozconfig_annotate '' --disable-gnomevfs + mozconfig_annotate '' --enable-gio + mozconfig_annotate '' --with-system-libevent=3D"${EPREFIX}"/usr + mozconfig_annotate 'places' --enable-storage --enable-places --enable-p= laces_bookmarks + mozconfig_annotate '' --enable-oji --enable-mathml + mozconfig_annotate 'broken' --disable-mochitest +} diff --git a/eclass/mozcoreconf-2.eclass b/eclass/mozcoreconf-2.eclass new file mode 100644 index 0000000..634b7d0 --- /dev/null +++ b/eclass/mozcoreconf-2.eclass @@ -0,0 +1,271 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ +# +# mozcoreconf.eclass : core options for mozilla +# inherit mozconfig-2 if you need USE flags + +inherit multilib flag-o-matic python + +IUSE=3D"${IUSE} custom-optimization" + +RDEPEND=3D"x11-libs/libXrender + x11-libs/libXt + x11-libs/libXmu + >=3Dsys-libs/zlib-1.1.4" + +DEPEND=3D"${RDEPEND} + dev-util/pkgconfig + =3Ddev-lang/python-2*[threads]" + +# mozconfig_annotate: add an annotated line to .mozconfig +# +# Example: +# mozconfig_annotate "building on ultrasparc" --enable-js-ultrasparc +# =3D> ac_add_options --enable-js-ultrasparc # building on ultrasparc +mozconfig_annotate() { + declare reason=3D$1 x ; shift + [[ $# -gt 0 ]] || die "mozconfig_annotate missing flags for ${reason}\!= " + for x in ${*}; do + echo "ac_add_options ${x} # ${reason}" >>.mozconfig + done +} + +# mozconfig_use_enable: add a line to .mozconfig based on a USE-flag +# +# Example: +# mozconfig_use_enable truetype freetype2 +# =3D> ac_add_options --enable-freetype2 # +truetype +mozconfig_use_enable() { + declare flag=3D$(use_enable "$@") + mozconfig_annotate "$(useq $1 && echo +$1 || echo -$1)" "${flag}" +} + +# mozconfig_use_with: add a line to .mozconfig based on a USE-flag +# +# Example: +# mozconfig_use_with kerberos gss-api /usr/$(get_libdir) +# =3D> ac_add_options --with-gss-api=3D/usr/lib # +kerberos +mozconfig_use_with() { + declare flag=3D$(use_with "$@") + mozconfig_annotate "$(useq $1 && echo +$1 || echo -$1)" "${flag}" +} + +# mozconfig_use_extension: enable or disable an extension based on a USE= -flag +# +# Example: +# mozconfig_use_extension gnome gnomevfs +# =3D> ac_add_options --enable-extensions=3Dgnomevfs +mozconfig_use_extension() { + declare minus=3D$(useq $1 || echo -) + mozconfig_annotate "${minus:-+}$1" --enable-extensions=3D${minus}${2} +} + +moz_pkgsetup() { + # Ensure we use C locale when building + export LANG=3D"C" + export LC_ALL=3D"C" + export LC_MESSAGES=3D"C" + export LC_CTYPE=3D"C" + + # Ensure that we have a sane build enviroment + export MOZILLA_CLIENT=3D1 + export BUILD_OPT=3D1 + export NO_STATIC_LIB=3D1 + export USE_PTHREADS=3D1 + export ALDFLAGS=3D${LDFLAGS} + + python_set_active_version 2 +} + +mozconfig_init() { + declare enable_optimize pango_version myext x + declare XUL=3D$([[ ${PN} =3D=3D *xulrunner ]] && echo true || echo fals= e) + declare FF=3D$([[ ${PN} =3D=3D *firefox ]] && echo true || echo false) + declare IC=3D$([[ ${PN} =3D=3D *icecat ]] && echo true || echo false) + declare SM=3D$([[ ${PN} =3D=3D seamonkey ]] && echo true || echo false) + declare TB=3D$([[ ${PN} =3D=3D *thunderbird ]] && echo true || echo fal= se) + declare EM=3D$([[ ${PN} =3D=3D enigmail ]] && echo true || echo false) + + + #################################### + # + # Setup the initial .mozconfig + # See http://www.mozilla.org/build/configure-build.html + # + #################################### + + case ${PN} in + *xulrunner) + cp xulrunner/config/mozconfig .mozconfig \ + || die "cp xulrunner/config/mozconfig failed" ;; + *firefox) + cp browser/config/mozconfig .mozconfig \ + || die "cp browser/config/mozconfig failed" ;; + *icecat) + cp browser/config/mozconfig .mozconfig \ + || die "cp browser/config/mozconfig failed" ;; + seamonkey) + # Must create the initial mozconfig to enable application + : >.mozconfig || die "initial mozconfig creation failed" + mozconfig_annotate "" --enable-application=3Dsuite ;; + *thunderbird) + # Must create the initial mozconfig to enable application + : >.mozconfig || die "initial mozconfig creation failed" + mozconfig_annotate "" --enable-application=3Dmail ;; + enigmail) + cp mail/config/mozconfig .mozconfig \ + || die "cp mail/config/mozconfig failed" ;; + esac + + #################################### + # + # CFLAGS setup and ARCH support + # + #################################### + + # Set optimization level + if [[ ${ARCH} =3D=3D x86 ]]; then + mozconfig_annotate "less then -O2 causes a segfault on x86" --enable-o= ptimize=3D-O2 + elif use custom-optimization || [[ ${ARCH} =3D~ (alpha|ia64) ]]; then + # Set optimization level based on CFLAGS + if is-flag -O0; then + mozconfig_annotate "from CFLAGS" --enable-optimize=3D-O0 + elif [[ ${ARCH} =3D=3D ppc ]] && has_version '>=3Dsys-libs/glibc-2.8';= then + mozconfig_annotate "more than -O1 segfaults on ppc with glibc-2.8" --= enable-optimize=3D-O1 + elif is-flag -O1; then + mozconfig_annotate "from CFLAGS" --enable-optimize=3D-O1 + elif is-flag -Os; then + mozconfig_annotate "from CFLAGS" --enable-optimize=3D-Os + else + mozconfig_annotate "Gentoo's default optimization" --enable-optimize=3D= -O2 + fi + else + # Enable Mozilla's default + mozconfig_annotate "mozilla default" --enable-optimize + fi + + # Strip optimization so it does not end up in compile string + filter-flags '-O*' + + # Strip over-aggressive CFLAGS=20 + strip-flags + + # Additional ARCH support + case "${ARCH}" in + alpha) + # Historically we have needed to add -fPIC manually for 64-bit. + # Additionally, alpha should *always* build with -mieee for correct ma= th + # operation + append-flags -fPIC -mieee + ;; + + ia64) + # Historically we have needed to add this manually for 64-bit + append-flags -fPIC + ;; + + ppc64) + append-flags -fPIC -mminimal-toc + ;; + + ppc) + # Fix to avoid gcc-3.3.x micompilation issues. + if [[ $(gcc-major-version).$(gcc-minor-version) =3D=3D 3.3 ]]; then + append-flags -fno-strict-aliasing + fi + ;; + + x86) + if [[ $(gcc-major-version) -eq 3 ]]; then + # gcc-3 prior to 3.2.3 doesn't work well for pentium4 + # see bug 25332 + if [[ $(gcc-minor-version) -lt 2 || + ( $(gcc-minor-version) -eq 2 && $(gcc-micro-version) -lt 3 ) ]] + then + replace-flags -march=3Dpentium4 -march=3Dpentium3 + filter-flags -msse2 + fi + fi + ;; + esac + + if [[ $(gcc-major-version) -eq 3 ]]; then + # Enable us to use flash, etc plugins compiled with gcc-2.95.3 + mozconfig_annotate "building with >=3Dgcc-3" --enable-old-abi-compat-w= rappers + + # Needed to build without warnings on gcc-3 + CXXFLAGS=3D"${CXXFLAGS} -Wno-deprecated" + fi + + # Go a little faster; use less RAM + append-flags "$MAKEEDIT_FLAGS" + + #################################### + # + # mozconfig setup + # + #################################### + + mozconfig_annotate system_libs \ + --with-system-jpeg \ + --with-system-zlib \ + --enable-pango \ + --enable-svg \ + --enable-system-cairo + # Requires libpng with apng support + #--with-system-png \ + + mozconfig_annotate disable_update_strip \ + --disable-installer \ + --disable-pedantic \ + --disable-updater \ + --disable-strip \ + --disable-strip-libs \ + --disable-install-strip + + + + if [[ ${PN} !=3D seamonkey ]]; then + mozconfig_annotate basic_profile \ + --enable-single-profile \ + --disable-profilesharing \ + --disable-profilelocking + fi + + # Here is a strange one... + if is-flag '-mcpu=3Dultrasparc*' || is-flag '-mtune=3Dultrasparc*'; the= n + mozconfig_annotate "building on ultrasparc" --enable-js-ultrasparc + fi + + # Currently --enable-elf-dynstr-gc only works for x86, + # thanks to Jason Wever for the fix. + if use x86 && [[ ${enable_optimize} !=3D -O0 ]]; then + mozconfig_annotate "${ARCH} optimized build" --enable-elf-dynstr-gc + fi + + # jemalloc won't build with older glibc + ! has_version ">=3Dsys-libs/glibc-2.4" && mozconfig_annotate "we have o= ld glibc" --disable-jemalloc +} + +# mozconfig_final: display a table describing all configuration options = paired +# with reasons, then clean up extensions list +mozconfig_final() { + declare ac opt hash reason + echo + echo "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D" + echo "Building ${PF} with the following configuration" + grep ^ac_add_options .mozconfig | while read ac opt hash reason; do + [[ -z ${hash} || ${hash} =3D=3D \# ]] \ + || die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}" + printf " %-30s %s\n" "${opt}" "${reason:-mozilla.org default}" + done + echo "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D" + echo + + # Resolve multiple --enable-extensions down to one + declare exts=3D$(sed -n 's/^ac_add_options --enable-extensions=3D\([^ ]= *\).*/\1/p' \ + .mozconfig | xargs) + sed -i '/^ac_add_options --enable-extensions/d' .mozconfig + echo "ac_add_options --enable-extensions=3D${exts// /,}" >> .mozconfig +} diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/M= anifest index 1a177b7..09df85d 100644 --- a/mail-client/thunderbird/Manifest +++ b/mail-client/thunderbird/Manifest @@ -57,5 +57,5 @@ DIST thunderbird-3.1.9-zh-CN.xpi 219646 RMD160 a4869416= 8186adec3841840390bbffd77 DIST thunderbird-3.1.9-zh-TW.xpi 220577 RMD160 d13efbae626df159e32e17b40= 134f082451d013d SHA1 41f064ed29960c57f4e0d2c9676d3e8557f43a2b SHA256 029e= 44c508e71056c9e6ce9045cc935cba40c714840755dff99bc9efc131a70a DIST thunderbird-3.1.9.source.tar.bz2 68760361 RMD160 9c85e4b76929792a7c= 2c8cbc0435c86cb9961a4d SHA1 22b153102939430180ae1873ce15ef52286ff08d SHA2= 56 8b499ec3d81d3242b0cc2de27effb1891a07259adf7e5e4c06150f8c9f5254c2 DIST thunderbird-3.3a2.source.tar.bz2 81657866 RMD160 c3378e9b97992665e3= f2a152c058fb2fa1a2fb6f SHA1 e9fb755875b49b0fb42554065840c59ddf6389be SHA2= 56 226f3406e934f82085897671d042b7c0b2b07bfe697f49086f71d8a13e646b12 -EBUILD thunderbird-3.1.9.ebuild 7958 RMD160 5f232ad9c77030a5dff3c3a6e964= 86cbfa484bd2 SHA1 1104d693f074aa195b93d178cb26fd4e9a50e2b3 SHA256 4200f0a= 8ba78a249929633ac62088bca31f5d61383c6391d9d7cf4da375463ef -EBUILD thunderbird-3.3_alpha2.ebuild 9012 RMD160 cde9f6ee68cb9131a4a283b= d4a812c7a669aefbc SHA1 60e856047581cbfe114bedfc89a1746541dbeac1 SHA256 6c= 63434315103e587dc87d11eb3d8691eb9c45a750c40b295baefb6cf72074e7 +EBUILD thunderbird-3.1.9.ebuild 6843 RMD160 3cc4f7fcf528f1abd648f470039b= e917380af07e SHA1 be50da72ee4fae3e8684bedfee171368fc5ad6cf SHA256 a8f7ada= ef9d42b024c3eb31d08c3f0ae9e4ac4cc8d157253f86f7a3c6ff96a74 +EBUILD thunderbird-3.3_alpha2.ebuild 7866 RMD160 107cde4ce5d701ea1730876= fafcd2ee37612ae14 SHA1 e2b51c8ba265085dbd34a44ff8c773f333e064d5 SHA256 98= a0ca9cc2292a9d20637c9473ae4b2cefce17b378b63fff6fcf0357d0ece4a7 diff --git a/mail-client/thunderbird/thunderbird-3.1.9.ebuild b/mail-clie= nt/thunderbird/thunderbird-3.1.9.ebuild index 6720195..a202dac 100644 --- a/mail-client/thunderbird/thunderbird-3.1.9.ebuild +++ b/mail-client/thunderbird/thunderbird-3.1.9.ebuild @@ -22,7 +22,7 @@ HOMEPAGE=3D"http://www.mozilla.com/en-US/thunderbird/" KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~= amd64-linux ~x86-linux" SLOT=3D"0" LICENSE=3D"|| ( MPL-1.1 GPL-2 LGPL-2.1 )" -IUSE=3D"+alsa ldap +crypt bindist libnotify +lightning mozdom system-sql= ite wifi" +IUSE=3D"ldap +crypt +lightning mozdom" PATCH=3D"${PN}-3.1-patches-1.2" =20 REL_URI=3D"http://releases.mozilla.org/pub/mozilla.org/${PN}/releases" @@ -48,18 +48,11 @@ done RDEPEND=3D">=3Dsys-devel/binutils-2.16.1 >=3Ddev-libs/nss-3.12.8 >=3Ddev-libs/nspr-4.8.6 - >=3Dapp-text/hunspell-1.2 - x11-libs/cairo[X] x11-libs/pango[X] media-libs/libpng[apng] - alsa? ( media-libs/alsa-lib ) - libnotify? ( >=3Dx11-libs/libnotify-0.4 ) - system-sqlite? ( >=3Ddev-db/sqlite-3.7.1[fts3,secure-delete,threadsafe]= ) - wifi? ( net-wireless/wireless-tools ) !x11-plugins/lightning" =20 -DEPEND=3D"${RDEPEND} - =3Ddev-lang/python-2*[threads]" +DEPEND=3D"${RDEPEND}" =20 PDEPEND=3D"crypt? ( >=3Dx11-plugins/enigmail-1.1 )" =20 @@ -88,9 +81,7 @@ linguas() { } =20 pkg_setup() { - export BUILD_OFFICIAL=3D1 - export MOZILLA_OFFICIAL=3D1 - export ALDFLAGS=3D${LDFLAGS} + moz_pkgsetup =20 if ! use bindist; then elog "You are enabling official branding. You may not redistribute thi= s build" @@ -98,8 +89,6 @@ pkg_setup() { elog "a legal problem with Mozilla Foundation" elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag= " fi - - python_set_active_version 2 } =20 src_unpack() { @@ -147,7 +136,6 @@ src_configure() { # #################################### =20 - touch mail/config/mozconfig mozconfig_init mozconfig_config =20 @@ -155,27 +143,14 @@ src_configure() { use alpha && append-ldflags "-Wl,--no-relax" =20 mozconfig_annotate '' --enable-extensions=3D"${MEXTENSIONS}" - mozconfig_annotate '' --enable-application=3Dmail mozconfig_annotate '' --with-default-mozilla-five-home=3D"${EPREFIX}${M= OZILLA_FIVE_HOME}" mozconfig_annotate '' --with-user-appdir=3D.thunderbird mozconfig_annotate '' --with-system-png - mozconfig_annotate '' --with-system-nspr --with-nspr-prefix=3D"${EPREFI= X}"/usr - mozconfig_annotate '' --with-system-nss --with-nss-prefix=3D"${EPREFIX}= "/usr - mozconfig_annotate '' --with-sqlite-prefix=3D"${EPREFIX}"/usr - mozconfig_annotate '' --x-includes=3D"${EPREFIX}"/usr/include --x-libra= ries=3D"${EPREFIX}"/usr/$(get_libdir) - mozconfig_annotate 'broken' --disable-crashreporter - mozconfig_annotate '' --enable-system-hunspell =20 # Use enable features mozconfig_use_enable ldap mozconfig_use_enable ldap ldap-experimental - mozconfig_use_enable libnotify mozconfig_use_enable lightning calendar - mozconfig_use_enable wifi necko-wifi - mozconfig_use_enable system-sqlite - mozconfig_use_enable !bindist official-branding - mozconfig_use_enable alsa ogg - mozconfig_use_enable alsa wave =20 # Bug #72667 if use mozdom; then diff --git a/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild b/mail= -client/thunderbird/thunderbird-3.3_alpha2.ebuild index 4f75023..3e0ff66 100644 --- a/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild +++ b/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild @@ -23,7 +23,7 @@ HOMEPAGE=3D"http://www.mozilla.com/en-US/thunderbird/" KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~= amd64-linux ~x86-linux" SLOT=3D"0" LICENSE=3D"|| ( MPL-1.1 GPL-2 LGPL-2.1 )" -IUSE=3D"+alsa +crypt bindist libnotify +lightning mozdom system-sqlite w= ifi" +IUSE=3D"+crypt +lightning mozdom" #PATCH=3D"${PN}-3.1-patches-1.2" =20 REL_URI=3D"http://releases.mozilla.org/pub/mozilla.org/${PN}/releases" @@ -50,14 +50,7 @@ SRC_URI=3D"${REL_URI}/${MY_PV}/source/${MY_P}.source.t= ar.bz2 RDEPEND=3D">=3Dsys-devel/binutils-2.16.1 >=3Ddev-libs/nss-3.12.9 >=3Ddev-libs/nspr-4.8.7 - >=3Dapp-text/hunspell-1.2 - >=3Dx11-libs/cairo-1.10.2[X] - x11-libs/pango[X] media-libs/libpng[apng] - alsa? ( media-libs/alsa-lib ) - libnotify? ( >=3Dx11-libs/libnotify-0.4 ) - system-sqlite? ( >=3Ddev-db/sqlite-3.7.4[fts3,secure-delete,unlock-noti= fy] ) - wifi? ( net-wireless/wireless-tools ) !x11-plugins/lightning !x11-plugins/enigmail crypt? ( || ( @@ -70,8 +63,7 @@ RDEPEND=3D">=3Dsys-devel/binutils-2.16.1 =3Dapp-crypt/gnupg-1.4* ) )" =20 -DEPEND=3D"${RDEPEND} - =3Ddev-lang/python-2*[threads]" +DEPEND=3D"${RDEPEND}" =20 S=3D"${WORKDIR}"/comm-central =20 @@ -98,9 +90,7 @@ S=3D"${WORKDIR}"/comm-central #} =20 pkg_setup() { - export BUILD_OFFICIAL=3D1 - export MOZILLA_OFFICIAL=3D1 - export ALDFLAGS=3D${LDFLAGS} + moz_pkgsetup =20 if ! use bindist; then elog "You are enabling official branding. You may not redistribute thi= s build" @@ -108,8 +98,6 @@ pkg_setup() { elog "a legal problem with Mozilla Foundation" elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag= " fi - - python_set_active_version 2 } =20 src_unpack() { @@ -161,7 +149,6 @@ src_configure() { # #################################### =20 - touch mail/config/mozconfig mozconfig_init mozconfig_config =20 @@ -173,25 +160,12 @@ src_configure() { mozconfig_annotate '' --enable-chrome-format=3Djar fi mozconfig_annotate '' --enable-extensions=3D"${MEXTENSIONS}" - mozconfig_annotate '' --enable-application=3Dmail mozconfig_annotate '' --with-default-mozilla-five-home=3D"${EPREFIX}${M= OZILLA_FIVE_HOME}" mozconfig_annotate '' --with-user-appdir=3D.thunderbird mozconfig_annotate '' --with-system-png - mozconfig_annotate '' --with-system-nspr --with-nspr-prefix=3D"${EPREFI= X}"/usr - mozconfig_annotate '' --with-system-nss --with-nss-prefix=3D"${EPREFIX}= "/usr - mozconfig_annotate '' --with-sqlite-prefix=3D"${EPREFIX}"/usr - mozconfig_annotate '' --x-includes=3D"${EPREFIX}"/usr/include --x-libra= ries=3D"${EPREFIX}"/usr/$(get_libdir) - mozconfig_annotate 'broken' --disable-crashreporter - mozconfig_annotate '' --enable-system-hunspell =20 # Use enable features - mozconfig_use_enable libnotify mozconfig_use_enable lightning calendar - mozconfig_use_enable wifi necko-wifi - mozconfig_use_enable system-sqlite - mozconfig_use_enable !bindist official-branding - mozconfig_use_enable alsa ogg - mozconfig_use_enable alsa wave =20 # Bug #72667 if use mozdom; then diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest index 3844424..22e7171 100644 --- a/net-libs/xulrunner/Manifest +++ b/net-libs/xulrunner/Manifest @@ -1,4 +1,4 @@ AUX xulrunner-default-prefs.js 709 RMD160 a4d062f75c17552545267ec3fe2f6b= 54073dafbd SHA1 580128e9edf8021fdbbca2c91abf63cb83bab2c7 SHA256 e6850b0a2= 2f7d3889b49ec4a79a3c4d3d077edd98c8f0ffdc26e30bc70bb4b09 DIST firefox-4.0b13_pre_e56ecd8b3a68.source.tar.bz2 64806723 RMD160 e6f4= 690bf63f648a7260ab1dcf648a43be93490f SHA1 814314c2e425049a0646b4d77e5ef8f= 4e7738303 SHA256 f817fb4eede8216259ac1a23b92a05bb3088e4d2b6d00b8b5a930388= 4a69568c DIST xulrunner-2.0-patches-1.2.tar.bz2 50296 RMD160 55efe05cd37f3a49d4e6= bc25ea0e0e2a50eab02a SHA1 1a56906b94f30e33885b568041d1bdd53ad2b5b6 SHA256= e6b63b4c94f4a44c35aab34e6d15998c5a812eedcc4856a662f5c8eb35a4e6d9 -EBUILD xulrunner-2.0_beta13_pre.ebuild 7851 RMD160 4f334b61a0f6855cfd8a4= 3210ff75400bd2ee1bd SHA1 c0ca182981c991596bd983bea0e80c47b77b3b90 SHA256 = aee2deda38cf1f2ae02910cc742e0cb8f9388e34f2e42f6b5951e48e1e1b1008 +EBUILD xulrunner-2.0_beta13_pre.ebuild 5387 RMD160 f23018d13f275b9722dce= be436c77d2d7521a61b SHA1 d2b300454388c1d2c3a16442b36de50fa1f2d1c2 SHA256 = ddac6f714b23ee07c0293d7046492ced3bac0f3989a6209ece7c3f2a68d244da diff --git a/net-libs/xulrunner/xulrunner-2.0_beta13_pre.ebuild b/net-lib= s/xulrunner/xulrunner-2.0_beta13_pre.ebuild index 172ec4b..431aea1 100644 --- a/net-libs/xulrunner/xulrunner-2.0_beta13_pre.ebuild +++ b/net-libs/xulrunner/xulrunner-2.0_beta13_pre.ebuild @@ -21,7 +21,7 @@ HOMEPAGE=3D"http://developer.mozilla.org/en/docs/XULRun= ner" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd6= 4-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" SLOT=3D"1.9" LICENSE=3D"|| ( MPL-1.1 GPL-2 LGPL-2.1 )" -IUSE=3D"+alsa debug +ipc libnotify system-sqlite +webm wifi" +IUSE=3D"" =20 # More URIs appended below... SRC_URI=3D"http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar= .bz2" @@ -30,22 +30,11 @@ RDEPEND=3D" >=3Dsys-devel/binutils-2.16.1 >=3Ddev-libs/nss-3.12.9 >=3Ddev-libs/nspr-4.8.7 - >=3Dapp-text/hunspell-1.2 - >=3Dx11-libs/cairo-1.10.2[X] - >=3Ddev-libs/libevent-1.4.7 x11-libs/pango[X] media-libs/libpng[apng] - x11-libs/libXt - x11-libs/pixman - webm? ( media-libs/libvpx ) - alsa? ( media-libs/alsa-lib ) - libnotify? ( >=3Dx11-libs/libnotify-0.4 ) - system-sqlite? ( >=3Ddev-db/sqlite-3.7.4[fts3,secure-delete,unlock-noti= fy,debug=3D] ) - wifi? ( net-wireless/wireless-tools ) !www-plugins/weave" =20 DEPEND=3D"${RDEPEND} - =3Ddev-lang/python-2*[threads] dev-util/pkgconfig dev-lang/yasm" =20 @@ -62,13 +51,7 @@ else fi =20 pkg_setup() { - # Ensure we always build with C locale. - export LANG=3D"C" - export LC_ALL=3D"C" - export LC_MESSAGES=3D"C" - export LC_CTYPE=3D"C" - - python_set_active_version 2 + moz_pkgsetup } =20 src_prepare() { @@ -104,6 +87,10 @@ src_prepare() { "${S}"/build/unix/run-mozilla.sh || die "sed failed!" fi =20 + # Disable gnomevfs extension + sed -i -e "s:gnomevfs::" "${S}/"xulrunner/confvars.sh \ + || die "Failed to remove gnomevfs extension" + eautoreconf =20 cd js/src @@ -129,64 +116,10 @@ src_configure() { =20 mozconfig_annotate '' --with-default-mozilla-five-home=3D"${MOZLIBDIR}" mozconfig_annotate '' --enable-extensions=3D"${MEXTENSIONS}" - mozconfig_annotate '' --enable-application=3Dxulrunner mozconfig_annotate '' --disable-mailnews - mozconfig_annotate 'broken' --disable-crashreporter mozconfig_annotate '' --enable-canvas - mozconfig_annotate 'gtk' --enable-default-toolkit=3Dcairo-gtk2 - - # Bug 60668: Galeon doesn't build without oji enabled, so enable it - # regardless of java setting. - mozconfig_annotate '' --enable-oji --enable-mathml - mozconfig_annotate 'places' --enable-storage --enable-places mozconfig_annotate '' --enable-safe-browsing - # This will be removed when packages moving to webkit complete their mo= ve - mozconfig_annotate '' --enable-shared-js - - # System-wide install specs - mozconfig_annotate '' --disable-installer - mozconfig_annotate '' --disable-updater - mozconfig_annotate '' --disable-strip - mozconfig_annotate '' --disable-install-strip - - # Use system libraries - mozconfig_annotate '' --enable-system-cairo - mozconfig_annotate '' --enable-system-hunspell - mozconfig_annotate '' --with-system-nspr --with-nspr-prefix=3D"${EPREFI= X}"/usr - mozconfig_annotate '' --with-system-nss --with-nss-prefix=3D"${EPREFIX}= "/usr - mozconfig_annotate '' --x-includes=3D"${EPREFIX}"/usr/include --x-libra= ries=3D"${EPREFIX}"/usr/$(get_libdir) - mozconfig_annotate '' --with-system-bz2 - mozconfig_annotate '' --with-system-libevent=3D"${EPREFIX}"/usr mozconfig_annotate '' --with-system-png - if use webm ; then - mozconfig_annotate '' --with-system-libvpx - fi - - mozconfig_use_enable ipc # +ipc, upstream default - mozconfig_use_enable libnotify - mozconfig_use_enable wifi necko-wifi - mozconfig_use_enable alsa ogg - mozconfig_use_enable alsa wave - mozconfig_use_enable system-sqlite - mozconfig_use_enable webm - - # NOTE: Uses internal copy of libvpx - if use webm && ! use alsa; then - ewarn "USE=3Dwebm needs USE=3Dalsa, disabling WebM support." - mozconfig_annotate '+webm -alsa' --disable-webm - fi - - if use amd64 || use x86 || use arm || use sparc; then - mozconfig_annotate 'tracejit' --enable-tracejit - fi - - # Debug - if use debug ; then - mozconfig_annotate 'debug' --disable-optimize - mozconfig_annotate 'debug' --enable-debug=3D-ggdb - mozconfig_annotate 'debug' --enable-debug-modules=3Dall - mozconfig_annotate 'debug' --enable-debugger-info-modules - fi =20 # Finalize and report settings mozconfig_final diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest index 4a333bd..b835eb9 100644 --- a/www-client/firefox/Manifest +++ b/www-client/firefox/Manifest @@ -3,4 +3,4 @@ AUX icon/firefox-1.5-unbranded.desktop 303 RMD160 e9cb808= 302b7fbd7d4eb84aeb0a438 AUX icon/firefox-1.5.desktop 300 RMD160 df437e79147897b0ec52b44edc42ad4e= f270eda5 SHA1 b60d51629ba58992f6d9ae9ad8c29ffc6630de4d SHA256 bc6f8400403= 2afab5c078d8dc7c4ffe36abc45738c119fad3fcfa5de89dd5dae DIST firefox-4.0-patches-0.7.tar.bz2 4101 RMD160 6e006b1a047c1b750b7deb7= 449651b4bc30173e0 SHA1 9e47ce491edb9d12d9384949a73ea92377601542 SHA256 9f= a9d0b407a084d7f0f9887d054263404626eda46dc560ccd5ffd5d8c91fa707 DIST firefox-4.0b13_pre_e56ecd8b3a68.source.tar.bz2 64806723 RMD160 e6f4= 690bf63f648a7260ab1dcf648a43be93490f SHA1 814314c2e425049a0646b4d77e5ef8f= 4e7738303 SHA256 f817fb4eede8216259ac1a23b92a05bb3088e4d2b6d00b8b5a930388= 4a69568c -EBUILD firefox-4.0_beta13_pre.ebuild 9455 RMD160 f6e1c735bb83b77ac5fe883= 4c428ff215fe41473 SHA1 15815aa4df05374fc21b1a44beaf8b5b7949c013 SHA256 ec= 5d7c031e729c41850f391d31089d24bdaf3c3439734d42db9fafbc40d56a7b +EBUILD firefox-4.0_beta13_pre.ebuild 7432 RMD160 5cdfcfa204472b2f7b3bb91= 296ef4bb673a3bef2 SHA1 285564c4b2f1bbe77f0da874a57b4f02185fce7d SHA256 5f= ef389418cf8f01292bd5a8751c040ec0820d19c265e041754f5419aec16736 diff --git a/www-client/firefox/firefox-4.0_beta13_pre.ebuild b/www-clien= t/firefox/firefox-4.0_beta13_pre.ebuild index 3d4484f..805f9d4 100644 --- a/www-client/firefox/firefox-4.0_beta13_pre.ebuild +++ b/www-client/firefox/firefox-4.0_beta13_pre.ebuild @@ -21,7 +21,7 @@ HOMEPAGE=3D"http://www.mozilla.com/firefox" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd6= 4-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" SLOT=3D"0" LICENSE=3D"|| ( MPL-1.1 GPL-2 LGPL-2.1 )" -IUSE=3D"+alsa bindist +ipc libnotify system-sqlite +webm wifi" +IUSE=3D"" =20 REL_URI=3D"http://releases.mozilla.org/pub/mozilla.org/firefox/releases" # More URIs appended below... @@ -31,15 +31,8 @@ RDEPEND=3D" >=3Dsys-devel/binutils-2.16.1 >=3Ddev-libs/nss-3.12.9 >=3Ddev-libs/nspr-4.8.7 - >=3Dapp-text/hunspell-1.2 - >=3Dx11-libs/cairo-1.8.8[X] x11-libs/pango[X] media-libs/libpng[apng] - webm? ( media-libs/libvpx ) - alsa? ( media-libs/alsa-lib ) - libnotify? ( >=3Dx11-libs/libnotify-0.4 ) - system-sqlite? ( >=3Ddev-db/sqlite-3.7.4[fts3,secure-delete,unlock-noti= fy] ) - wifi? ( net-wireless/wireless-tools ) ~net-libs/xulrunner-${XUL_PV}[wifi=3D,libnotify=3D,system-sqlite=3D,web= m=3D]" =20 DEPEND=3D"${RDEPEND} @@ -108,11 +101,7 @@ linguas() { } =20 pkg_setup() { - # Ensure we always build with C locale. - export LANG=3D"C" - export LC_ALL=3D"C" - export LC_MESSAGES=3D"C" - export LC_CTYPE=3D"C" + moz_pkgsetup =20 if ! use bindist ; then einfo @@ -121,8 +110,6 @@ pkg_setup() { elog "a legal problem with Mozilla Foundation" elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag= " fi - - python_set_active_version 2 } =20 src_unpack() { @@ -144,6 +131,10 @@ src_prepare() { # Allow user to apply any additional patches without modifing ebuild epatch_user =20 + # Disable gnomevfs extension + sed -i -e "s:gnomevfs::" "${S}/"browser/confvars.sh \ + || die "Failed to remove gnomevfs extension" + eautoreconf =20 cd js/src @@ -167,58 +158,14 @@ src_configure() { use alpha && append-ldflags "-Wl,--no-relax" =20 mozconfig_annotate '' --enable-extensions=3D"${MEXTENSIONS}" - mozconfig_annotate '' --enable-application=3Dbrowser mozconfig_annotate '' --disable-mailnews - mozconfig_annotate '' --disable-crashreporter - mozconfig_annotate '' --enable-image-encoder=3Dall mozconfig_annotate '' --enable-canvas - mozconfig_annotate 'gtk' --enable-default-toolkit=3Dcairo-gtk2 - - # Bug 60668: Galeon doesn't build without oji enabled, so enable it - # regardless of java setting. - mozconfig_annotate '' --enable-oji --enable-mathml - mozconfig_annotate 'places' --enable-storage --enable-places mozconfig_annotate '' --enable-safe-browsing - - # System-wide install specs - mozconfig_annotate '' --disable-installer - mozconfig_annotate '' --disable-updater - mozconfig_annotate '' --disable-strip - mozconfig_annotate '' --disable-install-strip - - # Use system libraries - mozconfig_annotate '' --enable-system-cairo - mozconfig_annotate '' --enable-system-hunspell - mozconfig_annotate '' --with-system-nspr --with-nspr-prefix=3D"${EPREFI= X}"/usr - mozconfig_annotate '' --with-system-nss --with-nss-prefix=3D"${EPREFIX}= "/usr - mozconfig_annotate '' --x-includes=3D"${EPREFIX}"/usr/include --x-libra= ries=3D"${EPREFIX}"/usr/$(get_libdir) - mozconfig_annotate '' --with-system-bz2 mozconfig_annotate '' --with-system-png - if use webm ; then - mozconfig_annotate '' --with-system-libvpx - fi + mozconfig_annotate '' --with-system-libxul mozconfig_annotate '' --with-libxul-sdk=3D"${EPREFIX}"/usr/$(get_libdir= )/xulrunner-devel-${MAJ_XUL_PV} =20 - mozconfig_use_enable ipc # +ipc, upstream default - mozconfig_use_enable libnotify - mozconfig_use_enable wifi necko-wifi - mozconfig_use_enable alsa ogg - mozconfig_use_enable alsa wave - mozconfig_use_enable system-sqlite - mozconfig_use_enable webm - mozconfig_use_enable !bindist official-branding - - # NOTE: Uses internal copy of libvpx - if use webm && ! use alsa; then - ewarn "USE=3Dwebm needs USE=3Dalsa, disabling WebM support." - mozconfig_annotate '+webm -alsa' --disable-webm - fi - - if use amd64 || use x86 || use arm || use sparc; then - mozconfig_annotate '' --enable-tracejit - fi - # Other ff-specific settings mozconfig_annotate '' --with-default-mozilla-five-home=3D${MOZILLA_FIVE= _HOME} =20