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 1PzEzr-00022J-Un for garchives@archives.gentoo.org; Mon, 14 Mar 2011 21:08:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9402E0486; Mon, 14 Mar 2011 21:08:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9E675E0486 for ; Mon, 14 Mar 2011 21:08:03 +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 1D4AD1B4125 for ; Mon, 14 Mar 2011 21:08:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 69DD88006A for ; Mon, 14 Mar 2011 21:08:02 +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: <8b2880d90b565da3b1b7c125be1cbd7f5ccbc9b6.polynomial-c@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/ X-VCS-Repository: proj/mozilla X-VCS-Files: www-client/seamonkey/Manifest www-client/seamonkey/seamonkey-2.1_beta2.ebuild X-VCS-Directories: www-client/seamonkey/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 8b2880d90b565da3b1b7c125be1cbd7f5ccbc9b6 Date: Mon, 14 Mar 2011 21:08:02 +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: 23836ee8f4f49d99835093a06f9e905e commit: 8b2880d90b565da3b1b7c125be1cbd7f5ccbc9b6 Author: Lars Wendler gentoo org> AuthorDate: Mon Mar 14 20:43:39 2011 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Mar 14 20:43:39 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mozilla.git;a= =3Dcommit;h=3D8b2880d9 Adjusted ebuild for new mozilla eclasses. --- www-client/seamonkey/Manifest | 2 +- www-client/seamonkey/seamonkey-2.1_beta2.ebuild | 67 +++--------------= ------ 2 files changed, 9 insertions(+), 60 deletions(-) diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifes= t index 9ee97b2..fbbef6b 100644 --- a/www-client/seamonkey/Manifest +++ b/www-client/seamonkey/Manifest @@ -24,4 +24,4 @@ DIST seamonkey-2.1b2-ru.xpi 885903 RMD160 7a2a6d6060952= 1013fe2380d5ab67f59490730 DIST seamonkey-2.1b2-sk.xpi 835935 RMD160 6ab9dcc723d2bb147a23d84532eaf1= 3ca94eea07 SHA1 b3ef9378fd13566bd3443f9e3507c7ba96a8391a SHA256 78a5a6555= 67e4fed278911b99443c23c671065a6a864aebfbb29fbafa4fae0f0 DIST seamonkey-2.1b2-sv-SE.xpi 867156 RMD160 6d3ca2aab099e6bc6c57c641b20= a1ab10751a31e SHA1 ec46f7c052ed388d3022ad7ffeb4c6a6c0e8b0aa SHA256 abb1bf= f1771543d6202fc520f66acec930be02dec1d2c75b329b96955ec6815c DIST seamonkey-2.1b2.source.tar.bz2 83425193 RMD160 d7a9a61fd470a58e19f4= e9b2d2c7a00eaf1362ac SHA1 c94fd66240fd9d77a73fdeec271131c23fd6cf98 SHA256= 9f9e59303b1d39dc97aa943f49018a572d41b5e566c66e176f1f012e2e9d898a -EBUILD seamonkey-2.1_beta2.ebuild 11509 RMD160 53059d098eba0d51303bcfd5e= afef109a6d9d017 SHA1 5c27af8e030445bef3ff83dcd549a080bcb38047 SHA256 1768= c2d87bdf28dd4f3ddf2b179eec9417130858fb0fa693ae096747e98867d4 +EBUILD seamonkey-2.1_beta2.ebuild 9778 RMD160 7c0a2d53b7516505d7e10e91b0= 9fd7cae5dcfca2 SHA1 cbf0d3bebcdf90fbbd9a8b23ed95ff9e8f218891 SHA256 faeef= c49162e2d9a9c5a0c9c1ec2ffee21e23d408dd7d9a3322d26966bb68ad3 diff --git a/www-client/seamonkey/seamonkey-2.1_beta2.ebuild b/www-client= /seamonkey/seamonkey-2.1_beta2.ebuild index 5b059d0..8e769b9 100644 --- a/www-client/seamonkey/seamonkey-2.1_beta2.ebuild +++ b/www-client/seamonkey/seamonkey-2.1_beta2.ebuild @@ -68,23 +68,13 @@ fi RDEPEND=3D">=3Dsys-devel/binutils-2.16.1 >=3Ddev-libs/nss-3.12.9 >=3Ddev-libs/nspr-4.8.7 - alsa? ( media-libs/alsa-lib ) - system-sqlite? ( >=3Ddev-db/sqlite-3.7.4[fts3,secure-delete,unlock-noti= fy] ) >=3Dmedia-libs/libpng-1.4.1[apng] - >=3Dapp-text/hunspell-1.2 - >=3Dx11-libs/gtk+-2.10.0 - >=3Dx11-libs/cairo-1.10.0[X] >=3Dx11-libs/pango-1.14.0[X] - libnotify? ( >=3Dx11-libs/libnotify-0.4 ) - crypt? ( mailclient? ( >=3Dapp-crypt/gnupg-1.4 ) ) - vpx? ( media-libs/libvpx ) - wifi? ( net-wireless/wireless-tools )" - #vpx? ( media-libs/libvpx ) + crypt? ( mailclient? ( >=3Dapp-crypt/gnupg-1.4 ) )" =20 DEPEND=3D"${RDEPEND} - =3Ddev-lang/python-2*[threads] dev-util/pkgconfig - vpx? ( dev-lang/yasm )" + dev-lang/yasm" =20 S=3D"${WORKDIR}/comm-central" =20 @@ -132,16 +122,7 @@ pkg_setup() { ewarn "Those belong to upstream: https://bugzilla.mozilla.org" fi =20 - # 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" - - export BUILD_OFFICIAL=3D1 - export MOZILLA_OFFICIAL=3D1 - - python_set_active_version 2 + moz_pkgsetup } =20 src_prepare() { @@ -185,6 +166,11 @@ src_prepare() { cd "${S}"/mozilla || die eautoreconf cd "${S}"/mozilla/js/src || die + + # Disable gnomevfs extension + sed -i -e "s:gnomevfs::" "${S}/"suite/confvars.sh \ + || die "Failed to remove gnomevfs extension" + eautoreconf } =20 @@ -211,10 +197,6 @@ src_configure() { MEXTENSIONS=3D"${MEXTENSIONS},-sroaming" fi =20 - if ! use gnome ; then - MEXTENSIONS=3D"${MEXTENSIONS},-gnomevfs" - fi - if ! use composer ; then if ! use chatzilla && ! use mailclient ; then mozconfig_annotate '-composer' --disable-composer @@ -222,46 +204,13 @@ src_configure() { fi =20 mozconfig_annotate '' --enable-extensions=3D"${MEXTENSIONS}" - mozconfig_annotate '' --enable-application=3Dsuite - mozconfig_annotate 'broken' --disable-mochitest - mozconfig_annotate 'broken' --disable-crashreporter - mozconfig_annotate '' --enable-system-hunspell mozconfig_annotate '' --enable-jsd - mozconfig_annotate '' --enable-image-encoder=3Dall mozconfig_annotate '' --enable-canvas - mozconfig_annotate '' --with-system-nspr - mozconfig_annotate '' --with-system-nss - mozconfig_annotate '' --with-system-bz2 - mozconfig_annotate '' --enable-oji --enable-mathml - mozconfig_annotate 'places' --enable-storage --enable-places --enable-p= laces_bookmarks - mozconfig_annotate '' --disable-installer mozconfig_annotate '' --with-default-mozilla-five-home=3D${MOZILLA_FIVE= _HOME} - mozconfig_annotate '' --enable-printing =20 - # Enable/Disable based on USE flags - mozconfig_use_enable alsa ogg - mozconfig_use_enable alsa wave - mozconfig_use_enable libnotify mozconfig_use_enable ldap mozconfig_use_enable ldap ldap-experimental - #if use ldap ; then - # mozconfig_annotate 'ldap' --enable-ldap - # mozconfig_annotate 'ldap' --enable-ldap-experimental - #fi mozconfig_use_enable mailclient mailnews - mozconfig_use_enable system-sqlite - mozconfig_use_enable vpx webm - #mozconfig_use_with vpx system-vpx - mozconfig_use_enable wifi necko-wifi - - if use vpx && ! use alsa; then - ewarn "USE=3Dvpx 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 =20 if use mailclient && use crypt ; then mozconfig_annotate "mail crypt" --enable-chrome-format=3Djar