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 1Q4eZF-0006bI-QH for garchives@archives.gentoo.org; Tue, 29 Mar 2011 19:27:09 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B86221C037; Tue, 29 Mar 2011 19:26:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 72FCB1C037 for ; Tue, 29 Mar 2011 19:26:58 +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 ED7471B418A for ; Tue, 29 Mar 2011 19:26:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 5BA7C80065 for ; Tue, 29 Mar 2011 19:26:57 +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: <154b584915f1dda8b6dfb99fd774915bc512bc92.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: 154b584915f1dda8b6dfb99fd774915bc512bc92 Date: Tue, 29 Mar 2011 19:26:57 +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: ab58f36c0d8a3ce7c9aecf73ab254904 commit: 154b584915f1dda8b6dfb99fd774915bc512bc92 Author: Lars Wendler gentoo org> AuthorDate: Tue Mar 29 19:26:12 2011 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Mar 29 19:26:12 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mozilla.git;a= =3Dcommit;h=3D154b5849 seamonkey: Added patch to make gconf optional. --- www-client/seamonkey/Manifest | 3 ++- www-client/seamonkey/seamonkey-2.1_beta2.ebuild | 15 ++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifes= t index 8e50d77..debfaf5 100644 --- a/www-client/seamonkey/Manifest +++ b/www-client/seamonkey/Manifest @@ -1,4 +1,5 @@ AUX 2.1/seamonkey-2.1b1-configure-fix.patch 690 RMD160 854bf17b5b5b5806c= 4936f80fbbd971e822a88e0 SHA1 10c39ddf76e3638fced4e48bbc2443b4eb88078c SHA= 256 f4b4a786ff743e9618d663832fbe7f21b36b0f84e1bf04cd0dae106da18fd2f4 +AUX 2.1/seamonkey-2.1b2-gconf-config-update.patch 1569 RMD160 e237530c4d= 95de84aa295927fd1c703d8a54b9a9 SHA1 6f78524f88fd7b3f4fef4eec1666eabe96c89= 992 SHA256 9da47f2752f7bb353297b93be3aaecf2d6004af3c91717d22e35a347ee6cf2= a2 AUX 2.1/seamonkey-2.1b2-system-cairo-fixup.patch 3364 RMD160 e823edc67c7= d0984fed7645b09c417b93eb663ed SHA1 62b3f66be453a2fb13e2504858849aaef72bbb= 44 SHA256 fac11adcee4f506a005725a5741f55ba55810f7bcfc82fce5fba4317c84f4be= 5 AUX 2.1/seamonkey-libnotify07.patch 1117 RMD160 d9258ba252d3c94e8ac70642= 4e94f055b278b499 SHA1 22502e4414f125efbada4812116f1e189c749782 SHA256 05e= d978e07d1d74b38c53b205f98cc502dc6ce31cb04a21ad5f20a7a2fb5bdac AUX 2.1/xulrunner-libpng15.diff 446 RMD160 a6b43dde909929befa6b7ec38f0fb= 51d0ddf4ac5 SHA1 6e9dd65b774022111c6723bda5341acadef8b040 SHA256 ece56d83= be83178bc05bcd3b11251624371522d2db932974f4a6e72f49857e51 @@ -24,4 +25,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 9803 RMD160 e3ce63315f5593ac199542d8f3= ac0b6199be74c1 SHA1 c08369a38f332835aecf6f2f771322ab9bf1ed96 SHA256 26a55= 525b54cc839c2cc01fb762f35ba96f092535287eb0998fc3b06f7b8ccae +EBUILD seamonkey-2.1_beta2.ebuild 9938 RMD160 d25cfd907b05a60add6f2e5783= f6bdfa45b7dcf9 SHA1 8c9c3737078166fa0a5501b149ac72e7448fb99f SHA256 3f19c= 147f4528374ac731d3bdca8f3eb179b8a7135334d904b896313efa7e8b3 diff --git a/www-client/seamonkey/seamonkey-2.1_beta2.ebuild b/www-client= /seamonkey/seamonkey-2.1_beta2.ebuild index 5a7ddbb..879e6de 100644 --- a/www-client/seamonkey/seamonkey-2.1_beta2.ebuild +++ b/www-client/seamonkey/seamonkey-2.1_beta2.ebuild @@ -41,7 +41,7 @@ HOMEPAGE=3D"http://www.seamonkey-project.org" =20 SLOT=3D"0" LICENSE=3D"|| ( MPL-1.1 GPL-2 LGPL-2.1 )" -IUSE=3D"+alsa +chatzilla +composer +crypt ldap +mailclient +roaming +web= m" +IUSE=3D"+alsa +chatzilla +composer +crypt gconf ldap +mailclient +roamin= g +webm" =20 SRC_URI=3D"${REL_URI}/source/${MY_P}.source.tar.bz2 http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.bz2 @@ -70,7 +70,7 @@ RDEPEND=3D">=3Dsys-devel/binutils-2.16.1 >=3Ddev-libs/nspr-4.8.7 >=3Dmedia-libs/libpng-1.4.1[apng] >=3Dx11-libs/pango-1.14.0[X] - + gconf? ( >=3Dgnome-base/gconf-1.2.1:2 ) crypt? ( mailclient? ( >=3Dapp-crypt/gnupg-1.4 ) ) webm? ( media-libs/libvpx=20 media-libs/alsa-lib )" @@ -145,6 +145,7 @@ src_prepare() { if has_version \>=3Dmedia-libs/libpng-1.5.0 ; then epatch "${FILESDIR}"/2.1/xulrunner-libpng15.diff fi + epatch "${FILESDIR}"/2.1/${PN}-2.1b2-gconf-config-update.patch =20 if use crypt && use mailclient ; then mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail @@ -165,16 +166,15 @@ src_prepare() { sed -i -e s:MOZ_JAVAXPCOM\=3D1::g ${S}/mozilla/xulrunner/confvars.sh \ || die "sed javaxpcom" =20 - eautoreconf - 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" =20 eautoreconf + cd "${S}"/mozilla || die + eautoreconf + cd "${S}"/mozilla/js/src || die + eautoreconf } =20 src_configure() { @@ -211,6 +211,7 @@ src_configure() { mozconfig_annotate '' --enable-canvas mozconfig_annotate '' --with-default-mozilla-five-home=3D${MOZILLA_FIVE= _HOME} =20 + mozconfig_use_enable gconf mozconfig_use_enable ldap mozconfig_use_enable ldap ldap-experimental mozconfig_use_enable mailclient mailnews