public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/
Date: Tue, 14 Feb 2012 12:19:26 +0000 (UTC)	[thread overview]
Message-ID: <1329221941.3ceed41b63d4a3c64a22272c5a136a0a35134daf.polynomial-c@gentoo> (raw)

commit:     3ceed41b63d4a3c64a22272c5a136a0a35134daf
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 14 12:19:01 2012 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 12:19:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=3ceed41b

seamonkey: update to latest ebuild from tree.

---
 www-client/seamonkey/Manifest                      |   53 ++++++------
 ...seamonkey-2.7.ebuild => seamonkey-2.7.1.ebuild} |   86 ++++++++++----------
 2 files changed, 70 insertions(+), 69 deletions(-)

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 40d6de5..e3084bb 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -2,29 +2,30 @@ AUX all-gentoo-1.js 957 RMD160 0f8662577dfad72d786c196ab804f7cc9cd3f9f6 SHA1 22c
 AUX icon/seamonkey.desktop 288 RMD160 c9f56aed280a3ff68f0c40ae453fc24351daeea6 SHA1 87254c3cbfad672309e4b1fa408d08b74be31056 SHA256 524ae39ffc10b2a950aa344ae6c3f3d9b4a21009697edfd52ec47aa850d795d0
 AUX icon/seamonkey.png 4172 RMD160 d296c4d4e0920e4476f4c6c607946434202ad521 SHA1 f76213195e2dc002ff2e411ed0247d2624ce7b09 SHA256 7ffc1911a62b526702f3c991365dd8f18b6427c7e173456a101db4fb4c43ae59
 DIST enigmail-1.3.5.tar.gz 1348362 RMD160 9aa3cdd7b8f16f4cb15e3b6f63c5ac913ddaac3f SHA1 4cc928ce2fc328cf6aefbf0c7161484405dbbb5e SHA256 932a0206e9598eb10056f94622e9c0a64afc93542b43694568df810208a1e3b2
-DIST seamonkey-2.7-be.xpi 800745 RMD160 68a1b31fa7624b0decc967b7b362e6858cd49221 SHA1 2c8a5ed8aea053f050e3b96d3113cde703b505ec SHA256 02951e90e36f5f5e37bdaf663dea41b8d50534cc3060902b7479e73b32a05f9e
-DIST seamonkey-2.7-ca.xpi 818013 RMD160 8ac8e44f515454d28c26234b072a5de8bd4d3ed5 SHA1 2273f660a0e66456ec1cc1db6f67c3f52faeed59 SHA256 996a4e3a2c27479664e6b93d2629d6ff0a3db59e77d9e4bf68491b705bd96ade
-DIST seamonkey-2.7-cs.xpi 823251 RMD160 706ec874e59e76a14e6f82a126d730b2d42a9300 SHA1 af967c7ec03e6d0daa00932c71a4f1c0fe3ed55b SHA256 44eb89865c5c6ccbadecefb71656348dcf67714c476b5d766893ba0edfcf6edc
-DIST seamonkey-2.7-de.xpi 864251 RMD160 c3007b16c3d1260ef29d6e788fb568156887594d SHA1 ed56e09257b0eb7a5f589220c137ce02870d6bde SHA256 583e7f35ae091d150d962aa7b966e944e7d49922ce9cbcd6aa5c918930122908
-DIST seamonkey-2.7-en-GB.xpi 793485 RMD160 0928aba47c36f09f3f64e4aa170e8fe1fc8e801c SHA1 66335712c839404cc658d9f968f386249c1bd26b SHA256 2e741dc1d709df3e23bfac40bb8ece7ba19dbc9bb49f4afc12998f4bae455a4e
-DIST seamonkey-2.7-es-AR.xpi 864071 RMD160 2a5c1c05bff14efe513a7625ea9233f982ce364a SHA1 1a882fdae77c259390207e8f87cfc990a7902c7b SHA256 931428884e68fc5f1fb0d4a3b2060c2857e9c9bc16c581b64e05b33190df10ec
-DIST seamonkey-2.7-es-ES.xpi 793320 RMD160 1a25362f9671804be23c9be4b4d1da2efe503344 SHA1 f7c3840b251e1b733b17f7b019f31eb38859e63e SHA256 96a188bc2ef091e9f8acdfa2f2ebe7a6e4f863fbcc9a802fe54fd19ef78b280c
-DIST seamonkey-2.7-fi.xpi 813471 RMD160 8acf8aa57c7f9bfda29745845d60c5845add1f5e SHA1 9f70c89999907c80826c250fa5bc7ab92d1bf8a4 SHA256 90e089a458d5127037cc1a78e96a3fdf45153e4ef6011ac040c8760f44febf4e
-DIST seamonkey-2.7-fr.xpi 819341 RMD160 886fc9634db910e27b525a0c48a3c0761e258a0d SHA1 f9643f887d11c40a712d2a51bf7dc5ac09356719 SHA256 02965964bcc29bc054d0b8f334281e8ad14e701bc9347fdbde627221832ea6ac
-DIST seamonkey-2.7-gl.xpi 813287 RMD160 7482da9161806d40791451a109bcc075c46800df SHA1 f3751e263ae04ce663e9686465ccf291aa270745 SHA256 283df961efe05ca29c687468d98a01c0bdb21d59177cc19717d2d91ed6712d12
-DIST seamonkey-2.7-hu.xpi 837466 RMD160 50400f2913882f16c22244305fa0cf24f0ad7903 SHA1 2fbec4c7e6f8850fc7a74641590d4002e6f1c1f0 SHA256 a003fce813ed94f0c16767a0e9f259d25c77e741df23cef7c8199d8b7b2735d8
-DIST seamonkey-2.7-it.xpi 743648 RMD160 cb2fc834e5015ac943926c1c1cd9760c3724523c SHA1 3d1ad4f770bca837553fe792ba178d93d5fa1599 SHA256 c552fe50c328348d671d0994982ac4065bee447b901d107b77ec2ff54bb7104a
-DIST seamonkey-2.7-ja.xpi 868187 RMD160 7913984fd29dbf511e1393189e28f3589d8175aa SHA1 781d8343d49dd3e1a51d46b2c3d7147224b8e56d SHA256 717041a84bd54aedc3a7e9ef06d3ecbd196100468fdc9e7c17e7cd7682455481
-DIST seamonkey-2.7-lt.xpi 961272 RMD160 9773d9e8c1ff155dd5bda052fd363a1aa3fece59 SHA1 c3296aa87c3f7da308697e19d5943e83e6953f7b SHA256 66bd557ac7e55426f946d3ab28617acae3877d7274aed3f6f690413cfecc198d
-DIST seamonkey-2.7-nb-NO.xpi 811691 RMD160 72cf79b1d7a346b83410c702bc5888a6700c03d3 SHA1 7293d8d72513cb196f21ba5b7ff05aff8ae0a006 SHA256 0fdb4f45b3e46556e89c2a32545cee43b36560b4c40964d07b28a4272da010bf
-DIST seamonkey-2.7-nl.xpi 810216 RMD160 ae6c1287697d459c028f8d38fa1629c89bf0a36c SHA1 8e2516295c3aae8655f3268712e15c9abbce9a95 SHA256 69aa91de5c1d1c6c1c7e9f55833add25538b1df70dd99f0185c982285c528314
-DIST seamonkey-2.7-patches-02.tar.xz 14652 RMD160 960dd419e072912c6c7937ebe29066839b11939b SHA1 1db5994786346f0c6cdd6dcd6f11c0e4e44293c2 SHA256 bed1f10ea00be91650d687368e6b5282cdff2eaabe436463cad3aaf619b9d542
-DIST seamonkey-2.7-pl.xpi 832577 RMD160 3e838f2369e129af5822a24282420178ca50f9b5 SHA1 61499be54442a5ba88d8f9f52149022d270789ec SHA256 d8449c3d337f71a07fad7d1d0acc375a473f2ec25b2eb58240a3ee7cb0cc80bd
-DIST seamonkey-2.7-pt-PT.xpi 849093 RMD160 a4858eadf60a3d9f9cdd24534b43f150db443e25 SHA1 2962286bbcfb81d77c17cc7e9126d2dd4a9962ef SHA256 6ab8eca4e7d5dc27bb4702845bb7d7cd493795fec12fb19cfef0c39ad9928a74
-DIST seamonkey-2.7-ru.xpi 897928 RMD160 b8bde901c7858cc0ecb7de219dd3207761ec659d SHA1 f2bead7318712ea2652715bf27171e3a2ca2bf20 SHA256 3173124e390b4a6664dc8e609a31ffdfc6e3cb728bde7a27672a7fb9cb88f6b9
-DIST seamonkey-2.7-sk.xpi 846755 RMD160 d91790de5885cbe7f719e56911f7aa6dc58c99a4 SHA1 bc90cdd397f5b28039a2ecca3b38b3f21e846580 SHA256 809b823c65ac58b9520dd45a2e5be3ed23d7290d73740672e875cd69b695370c
-DIST seamonkey-2.7-sv-SE.xpi 875470 RMD160 6a4451fd6a815460e46f1096f747f630c2bd3088 SHA1 4bed0f5a6a0a82f5945ee6f24e1347ba3b4dd743 SHA256 a9a4a63aa6f34a5bb8a188816faad88af30bc159d8269b2485a595aa0ed373c2
-DIST seamonkey-2.7-tr.xpi 813356 RMD160 de9fb4fd401ba36dd3e09ba7c6e78e4778794d26 SHA1 0babba594aeaec2f01eeb9f9bdf92d1ff4b07b46 SHA256 07a67c6707f7a918d33e2ccebfe15aca6e4123046d4669eb76aedad6225a9780
-DIST seamonkey-2.7-zh-CN.xpi 842340 RMD160 bdadbb97da6536a7d8ff9dfb9363941f4499fba9 SHA1 0c26e89e297c4958900a498c4540a9a1d2a7063a SHA256 dd656ade4233c51cd75c51739a5b770f26d6fe6ee6f5151da5823dd529cac063
-DIST seamonkey-2.7.source.tar.bz2 98045633 RMD160 a7c731fd281d8924732d726cb6e4267384e11947 SHA1 72d3e8d928ba29b40b00f735083cbfc48589eb9b SHA256 695c3e4767262fac35bcf80f71dcbdfbc1172cdd323338ea530f6680283aea2f
-EBUILD seamonkey-2.7.ebuild 7832 RMD160 fcbcf45c842f3b89ed6fd8b592b790c71727b1d6 SHA1 ed5d7309564d5a4accc427ea943a97d662349460 SHA256 5ca79986f4144c75539fb8945c46c9ddd1571a9fc1140826b79f55c33dc8ddf3
+DIST firefox-10.0-patches-0.5.tar.xz 16708 RMD160 40ccd212e16d4e5dd389db95aa7be0fe68361073 SHA1 3ca7cb54cdc2b704fe468cc26e1818648635b514 SHA256 981f40b1f2f12439d1301a0f7f4171aee4b84b16fe6b926344b63750efb21158
+DIST seamonkey-2.7-patches-03.tar.xz 1080 RMD160 bab03aac9c6bd1d5aacfe87f7c3792a15fd0250b SHA1 6a80c1d6ee057e8f557af59d350543c6ba0cf57f SHA256 eede05439b5555871082652abe01c13b1f859640d8ac5df3001623c1084abec8
+DIST seamonkey-2.7.1-be.xpi 800746 RMD160 8bbeab4c358547c653fe6bfa0c56422c391d5e57 SHA1 9f197da5b1a521da1df02f4aba5dd6da37e8cf90 SHA256 b88db6d126d36b7770f66d5edce765ce46d55b4222730e9ab78f54e1a6359b4c
+DIST seamonkey-2.7.1-ca.xpi 818015 RMD160 b57c0a931c4465e0fc8a8f95d89f7fcbf3f529fd SHA1 315e38517a7818d6c4670b1aab4900c3a30d8400 SHA256 3a0ab33210ef2ae036347969e6e48e5bc37809d2f0b0a0d7332d51143c115093
+DIST seamonkey-2.7.1-cs.xpi 823253 RMD160 ef9be39ecadb81e4ff0edfad838e8284e2ab3b95 SHA1 39877b8a1b53458a986fe35d71cc4f092a9cf172 SHA256 fa45342b3754adf18dd463568bc0ab12a778e32ea8716c35e7681ece12496d7e
+DIST seamonkey-2.7.1-de.xpi 864253 RMD160 230d826f92cda95ab99c3b1c4180791328cc153c SHA1 b700a54e0e4fff47709df127ad8e94aa116c7b60 SHA256 04f6a3630669d09f4d439be276ee49275ddff1c2f5fdbe64160d1423dcae1479
+DIST seamonkey-2.7.1-en-GB.xpi 793486 RMD160 d96297d5578e865a578452a33d1829d309247587 SHA1 7daf793655a9aa525b1100b68fb148aebd3cdcc8 SHA256 d07564283dc0880ca914e068c0c38f16244c55978f31d0e2c371b0c34208b226
+DIST seamonkey-2.7.1-es-AR.xpi 864072 RMD160 e2c1996a101491c5195a3d4085670f3deae0dcc4 SHA1 95ce037e14c0203ca4efa4ddbc7acfa3181cbab0 SHA256 a2d016af3b18fb71f085d67c104012ff0270a0885d3d0bef8a7bc380575a4d5d
+DIST seamonkey-2.7.1-es-ES.xpi 793321 RMD160 5417e6edf4911ae3f564b6097952ff08c1187536 SHA1 56b387eb2c8f504392dd1bad29773f3241d1549a SHA256 aab526cb0cf7626123d0f7570098227814da3f0a0078a807b9b9904bba66897f
+DIST seamonkey-2.7.1-fi.xpi 813472 RMD160 89e2b1d7a0fc0ccaecb9cc21bbc6015021fc82ce SHA1 627c0a27269c6400866317276e88677936180052 SHA256 45608e6d726513b3863ea86b0527a8fd3184999fc48786f3f2e691d35e452f88
+DIST seamonkey-2.7.1-fr.xpi 819342 RMD160 7e48406d1b59eeefc93c6355e9d585058ccc5295 SHA1 53bbbb1cf6823193d46d3726273c9f58c66a2083 SHA256 4b2ba4de86971b1398734fb79136b8d9d451f74fbee081a9d8dd58003bc694f9
+DIST seamonkey-2.7.1-gl.xpi 813288 RMD160 f4603a22187e0cdbb72033ca49bd6c433601aa8e SHA1 d36cffa011afb74f9ba7b75513cc88dd0b4119ee SHA256 25113b00067a2cda790830bf8e5ab7d12e1c5589090d69403028a6f77b66497d
+DIST seamonkey-2.7.1-hu.xpi 837467 RMD160 ce76eae79c640673370b5182160517a33b370673 SHA1 ac673e30d90cc9731814689a828e421f3fbe68a4 SHA256 9fa9ca4f77effc9b3a08e811bad01c35d03a67c1ed5da11caf8caeb3af459b13
+DIST seamonkey-2.7.1-it.xpi 743649 RMD160 f0a0eb1382ed4f8e1a883d35e0e37a456fccdedf SHA1 94c8bd6249d3ae9ecdd094ae2a134490411536c2 SHA256 d95faf43b62b34ef4f07464fde8627c2ea7d21a621eb7ba040f0399a70835bec
+DIST seamonkey-2.7.1-ja.xpi 868190 RMD160 22ad227dd14cbb33eff202289f4a939b01bfcdc3 SHA1 e04c8df83bf09bfcfee11083f2fbd71518feaa51 SHA256 fd387a5942dedd8ca9e9c733271a42bd642ac8d69d85296b08d07838b6a13360
+DIST seamonkey-2.7.1-lt.xpi 961274 RMD160 065ba7851738508f96416f17f8c85bae6b4f2c66 SHA1 ed4b326501a58843bc62f7cd40fd307b84771b5a SHA256 407eba52f956405f9fabbeade07767333e0375f955cc482d65526aad4b813548
+DIST seamonkey-2.7.1-nb-NO.xpi 811692 RMD160 a73cc980049a7d5167889093c8f4273ce0930b75 SHA1 c73b3f8fcd0d169d679fd4023548dc4e15e7e9bb SHA256 ed6697a24d178155f699f936518bb70e70590416e9ef4f58f862d3a24d42f435
+DIST seamonkey-2.7.1-nl.xpi 810218 RMD160 32de075bc0a1c3a77e4428b0c22c4a8a87a78bfc SHA1 8621a4f629a11cf7fe1447e5f1902157f0a80367 SHA256 efb86c5a7eae1f2e5cabf088d1df8eaaefd8f1c7249bb7312a9d6e5bedb1718a
+DIST seamonkey-2.7.1-pl.xpi 832577 RMD160 329d4b5fc73d2404cbb1d673f14748dcc757233b SHA1 d243261213f65999d3fbf65374098beb04bc0f59 SHA256 4ba996077f3a0afbc3eb999e958415097ae235e5fe8863435442e1af572d0f61
+DIST seamonkey-2.7.1-pt-PT.xpi 849095 RMD160 cb26aeeb39288328228e294d93c553ca70679671 SHA1 df78f07fd8368c20cce3f448b01635af82a05bdb SHA256 38da6aa10ca05a91cdc705ba4c58ec8e8622f681d3c3ba4f7c4fd0459aae4a79
+DIST seamonkey-2.7.1-ru.xpi 897930 RMD160 4e566062c8ae15227385a9364ba3b06cf115dc57 SHA1 4de3faba010f7124c0ab13d40344c166702b23e2 SHA256 ef3b8b4836aca06a6c1a71f5f9225be8e2f65f0aab83537d2044b6dbd4240677
+DIST seamonkey-2.7.1-sk.xpi 846757 RMD160 aded53150423d6ab11fa029dbc0939fdca5f12ea SHA1 cee4c545d4d09a4d3b4e1da199af0494b3f61701 SHA256 20cfc4fc4e9340821123cf3e230071d847d7b9b554acfe56b284d58988ecaee5
+DIST seamonkey-2.7.1-sv-SE.xpi 875472 RMD160 f53fae5d2265d31a39adfce87e6325171f6ccc24 SHA1 1d1eb7ecb0a04f363b88a7950e3bb15d47c20a7c SHA256 116b94f9f65ddf5fc7a2553cec5ea0e961e5d50625555706b94b64d858a53ffe
+DIST seamonkey-2.7.1-tr.xpi 813356 RMD160 db44fd07fed7ad71e329d0e4a986e307450b6eac SHA1 9ceb0cd915c6ffb7c38a12567025e7159ab57f8a SHA256 cf1ee822f7ae74ef267c53562848033add5f006488aebadd2ebc47ed22b82ced
+DIST seamonkey-2.7.1-zh-CN.xpi 842343 RMD160 fe506ea7ab500c7fbb1949f5e2188d84dd769e52 SHA1 0fac22454bed4feafc71e00ac650abdbc658b418 SHA256 464a707bec0c91587c2131e15d1f40245f04e02a9bdf9bcc7936d8a4339435d1
+DIST seamonkey-2.7.1.source.tar.bz2 98493950 RMD160 a7be15836ce1cc2def1ae93b5dd9d85f34ae77f8 SHA1 ddd93f118d2b47e53bb55646e121f653e80f2e8b SHA256 3d75a1a321cf4c30037b6fc69d3b757060f6aa94b8b329de77db3fe95c31e34b
+EBUILD seamonkey-2.7.1.ebuild 8014 RMD160 cbd81d644f2b71e97c6257d5f4e99f129d435627 SHA1 bacb6d70802cba41bfbbebbe4fa5997719429ebe SHA256 e21ac77da2f97ccbb80a4af9435a0f37614d9f4ad71a843689e7ed08b14345da

diff --git a/www-client/seamonkey/seamonkey-2.7.ebuild b/www-client/seamonkey/seamonkey-2.7.1.ebuild
similarity index 78%
rename from www-client/seamonkey/seamonkey-2.7.ebuild
rename to www-client/seamonkey/seamonkey-2.7.1.ebuild
index 2c7c54b..7f5066b 100644
--- a/www-client/seamonkey/seamonkey-2.7.ebuild
+++ b/www-client/seamonkey/seamonkey-2.7.1.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.7.ebuild,v 1.2 2012/02/07 21:59:39 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.7.1.ebuild,v 1.1 2012/02/13 13:55:14 polynomial-c Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
 
 # This list can be updated with scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=(be ca cs de en en-GB en-US es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN)
+MOZ_LANGS=(be ca cs de en-GB en-US es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl
+	    pt-PT ru sk sv-SE tr zh-CN)
 
 MOZ_PV="${PV/_pre*}"
 MOZ_PV="${MOZ_PV/_alpha/a}"
@@ -15,7 +16,7 @@ MOZ_PV="${MOZ_PV/_rc/rc}"
 MOZ_P="${PN}-${MOZ_PV}"
 
 if [[ ${PV} == *_pre* ]] ; then
-	MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${PN}/nightly/${MOZ_PV}-candidates/build${PV##*_pre}"
+	MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/nightly/${MOZ_PV}-candidates/build${PV##*_pre}"
 	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
 	# And the langpack stuff stays at eclass defaults
 else
@@ -26,7 +27,8 @@ fi
 
 inherit flag-o-matic toolchain-funcs eutils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension python nsplugins mozlinguas
 
-PATCH="${PN}-2.7-patches-02"
+PATCHFF="firefox-10.0-patches-0.5"
+PATCH="${PN}-2.7-patches-03"
 EMVER="1.3.5"
 
 DESCRIPTION="Seamonkey Web Browser"
@@ -35,11 +37,11 @@ HOMEPAGE="http://www.seamonkey-project.org"
 if [[ ${PV} == *_pre* ]] ; then
 	# pre-releases. No need for arch teams to change KEYWORDS here.
 
-	KEYWORDS=""
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
 else
 	# This is where arch teams should change the KEYWORDS.
 
-	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
 fi
 
 SLOT="0"
@@ -48,7 +50,8 @@ IUSE="+alsa +chatzilla +crypt +ipc +roaming system-sqlite +webm"
 
 SRC_URI+="${SRC_URI}
 	${MOZ_FTP_URI}/source/${MOZ_P}.source.tar.bz2 -> ${P}.source.tar.bz2
-	http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
 	crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )"
 
 ASM_DEPEND=">=dev-lang/yasm-1.1"
@@ -101,20 +104,14 @@ src_prepare() {
 	# Apply our patches
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/_seamonkey"
+	epatch "${WORKDIR}/seamonkey"
 
 	# browser patches go here
 	pushd "${S}"/mozilla &>/dev/null || die
+	EPATCH_EXCLUDE="2000-firefox_gentoo_install_dirs.patch" \
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/_mozilla"
-	popd &>/dev/null || die
-
-	# mailnews patches go here
-	pushd "${S}"/mailnews &>/dev/null || die
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/_mailnews"
+	epatch "${WORKDIR}/firefox"
 	popd &>/dev/null || die
 
 	# Allow user to apply any additional patches without modifing ebuild
@@ -122,10 +119,6 @@ src_prepare() {
 
 	if use crypt ; then
 		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
-		cd "${S}"/mailnews/extensions/enigmail || die
-		./makemake -r 2&>/dev/null
-		sed -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' \
-			-i Makefile.in || die
 		cd "${S}"
 	fi
 
@@ -165,6 +158,8 @@ src_configure() {
 		MEXTENSIONS+=",-sroaming"
 	fi
 
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
 	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
 	mozconfig_annotate '' --disable-gconf
 	mozconfig_annotate '' --enable-jsd
@@ -177,9 +172,16 @@ src_configure() {
 	mozconfig_use_enable system-sqlite
 	mozconfig_use_enable methodjit
 
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/seamonk" \
+		>> "${S}"/.mozconfig
+
 	# Finalize and report settings
 	mozconfig_final
 
+	# Work around breakage in makeopts with --no-print-directory
+	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
+
 	if [[ $(gcc-major-version) -lt 4 ]] ; then
 		append-cxxflags -fno-stack-protector
 	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]] ; then
@@ -187,32 +189,33 @@ src_configure() {
 			append-flags -mno-avx
 		fi
 	fi
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	# Work around breakage in makeopts with --no-print-directory
-	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf
 }
 
 src_compile() {
-	emake || die
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake -f client.mk || die
 
 	# Only build enigmail extension if conditions are met.
 	if use crypt ; then
-		emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed"
-		emake -j1 -C "${S}"/mailnews/extensions/enigmail xpi || die "make enigmail xpi failed"
+		cd "${S}"/mailnews/extensions/enigmail || die
+		./makemake -r 2&> /dev/null
+		cd "${S}"/seamonk/mailnews/extensions/enigmail
+		emake || die "make enigmail failed"
+		emake xpi || die "make enigmail xpi failed"
 	fi
 }
 
 src_install() {
 	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
 	declare emid
+	local obj_dir="seamonk"
+	cd "${S}/${obj_dir}"
+
+	# Copy our preference before omnijar is created.
+	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \
+		"${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
 
 	pax-mark m "${S}"/dist/bin/xpcshell
 
@@ -221,12 +224,14 @@ src_install() {
 
 	if use crypt ; then
 		cd "${T}" || die
-		unzip "${S}"/mozilla/dist/bin/enigmail*.xpi install.rdf || die
+		unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi install.rdf || die
 		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
 
 		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
 		cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
-		unzip "${S}"/mozilla/dist/bin/enigmail*.xpi || die
+		unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi || die
+
+		cd "${S}" || die
 	fi
 
 	sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
@@ -247,18 +252,13 @@ src_install() {
 		|| die
 	domenu "${T}"/${PN}.desktop || die
 
-	# Add our default prefs
-	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js \
-		> "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js \
-			|| die
-
-	# Required in order to use plugins and even run firefox on hardened.
+	# Required in order to use plugins and even run seamonkey on hardened.
 	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
 
 	# Handle plugins dir through nsplugins.eclass
 	share_plugins_dir
 
-	doman "${S}"/suite/app/${PN}.1 || die
+	doman "${S}"/${obj_dir}/suite/app/${PN}.1 || die
 }
 
 pkg_preinst() {



             reply	other threads:[~2012-02-14 12:19 UTC|newest]

Thread overview: 141+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-14 12:19 Lars Wendler [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-05-23  8:35 [gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/ Lars Wendler
2018-05-22  8:31 Lars Wendler
2018-04-19  6:05 Lars Wendler
2018-04-19  6:05 Lars Wendler
2018-03-07 13:00 Lars Wendler
2017-11-25  8:46 Lars Wendler
2017-11-23 19:47 Ian Stakenvicius
2017-10-10  1:21 Ian Stakenvicius
2017-08-24 13:18 Lars Wendler
2017-08-16 20:36 Ian Stakenvicius
2017-07-28 14:26 Ian Stakenvicius
2017-07-25 19:38 Ian Stakenvicius
2017-07-25  1:58 Ian Stakenvicius
2017-07-21 13:23 Lars Wendler
2017-06-05 14:36 Jory Pratt
2017-03-29 13:38 Lars Wendler
2017-02-06  2:43 Lars Wendler
2016-10-11 14:13 Ian Stakenvicius
2016-10-01 14:48 Ian Stakenvicius
2016-09-01 20:38 Ian Stakenvicius
2016-08-04 20:47 Ian Stakenvicius
2016-07-19 18:49 Ian Stakenvicius
2016-07-19 18:49 Ian Stakenvicius
2016-07-12 20:41 Ian Stakenvicius
2016-07-09  0:57 Ian Stakenvicius
2016-05-07 20:38 Ian Stakenvicius
2016-03-04 22:38 Lars Wendler
2016-01-26  5:38 Lars Wendler
2015-11-27 19:25 Ian Stakenvicius
2015-11-10  8:33 Lars Wendler
2015-09-28  8:18 Lars Wendler
2015-09-03 10:03 Lars Wendler
2015-09-03  7:18 Lars Wendler
2015-09-03  6:26 Lars Wendler
2015-09-02 14:29 Lars Wendler
2015-03-24  7:54 Lars Wendler
2014-12-04 14:21 Lars Wendler
2014-11-06 14:33 Lars Wendler
2014-11-06  8:17 Lars Wendler
2014-10-31 19:13 Ian Stakenvicius
2014-04-29 12:47 Lars Wendler
2014-04-11  7:00 Lars Wendler
2014-04-02 18:26 Ian Stakenvicius
2014-03-20 15:19 Lars Wendler
2014-03-19 10:08 Lars Wendler
2014-02-20 18:36 Lars Wendler
2014-02-19  8:38 Lars Wendler
2014-02-06 13:01 Lars Wendler
2014-02-05  7:44 Lars Wendler
2014-02-04  9:55 Lars Wendler
2014-01-01 20:15 Lars Wendler
2014-01-01 20:14 Lars Wendler
2013-12-17 12:16 Lars Wendler
2013-12-12  7:14 Lars Wendler
2013-11-18 18:50 Lars Wendler
2013-11-02 15:22 Lars Wendler
2013-10-31 10:21 Lars Wendler
2013-10-30 12:01 Lars Wendler
2013-09-25 22:29 Lars Wendler
2013-09-25 14:17 Lars Wendler
2013-09-18  7:01 Lars Wendler
2013-08-07  7:48 Lars Wendler
2013-08-07  7:22 Lars Wendler
2013-07-31 13:38 Lars Wendler
2013-07-26 11:10 Lars Wendler
2013-07-17  9:24 Lars Wendler
2013-05-21  6:23 Lars Wendler
2013-05-02 11:12 Lars Wendler
2013-04-22 15:57 Lars Wendler
2013-04-22 15:53 Lars Wendler
2013-04-22 11:39 Lars Wendler
2013-04-17 10:09 Lars Wendler
2013-04-08  6:50 Lars Wendler
2013-04-03  7:00 Lars Wendler
2013-04-03  6:55 Lars Wendler
2013-03-29  0:39 Jory Pratt
2013-03-13 21:49 Lars Wendler
2013-03-01  7:46 Lars Wendler
2013-02-21 12:02 Lars Wendler
2013-02-18 16:21 Lars Wendler
2013-02-07  5:51 Lars Wendler
2013-01-16 23:02 Lars Wendler
2013-01-10  9:35 Lars Wendler
2013-01-09 15:37 Lars Wendler
2012-12-07  6:40 Lars Wendler
2012-12-05 22:52 Lars Wendler
2012-12-05 22:46 Lars Wendler
2012-09-09 16:26 Lars Wendler
2012-08-28  8:44 Lars Wendler
2012-08-21  7:38 Lars Wendler
2012-08-13 13:55 Lars Wendler
2012-07-30 12:27 Lars Wendler
2012-07-18 22:30 Jory Pratt
2012-07-17 11:57 Lars Wendler
2012-07-11  7:08 Lars Wendler
2012-07-11  7:06 Lars Wendler
2012-07-02 15:02 Lars Wendler
2012-07-01 12:13 Lars Wendler
2012-06-27 11:56 Lars Wendler
2012-06-16 21:07 Lars Wendler
2012-06-16 20:07 Lars Wendler
2012-06-15 13:14 Jory Pratt
2012-06-15  8:38 Lars Wendler
2012-06-15  7:51 Lars Wendler
2012-06-10  2:31 Lars Wendler
2012-06-08 10:36 Lars Wendler
2012-06-08 10:35 Lars Wendler
2012-06-06  7:43 Lars Wendler
2012-06-05  9:31 Lars Wendler
2012-06-05  6:49 Lars Wendler
2012-05-08 13:22 Lars Wendler
2012-01-28 21:48 Lars Wendler
2011-12-15  7:52 Lars Wendler
2011-12-14 18:19 Lars Wendler
2011-12-04  1:16 Lars Wendler
2011-11-21 15:54 Lars Wendler
2011-11-10 13:44 Lars Wendler
2011-11-07 14:22 Lars Wendler
2011-10-16 15:55 Lars Wendler
2011-10-08  6:29 Lars Wendler
2011-10-02 20:35 Lars Wendler
2011-10-02 19:09 Lars Wendler
2011-10-02 17:36 Lars Wendler
2011-07-05 16:55 Lars Wendler
2011-07-03 19:15 Lars Wendler
2011-06-29  6:36 Lars Wendler
2011-06-28 18:23 Lars Wendler
2011-06-23 10:15 Lars Wendler
2011-06-17 13:44 Lars Wendler
2011-06-16 22:17 Lars Wendler
2011-06-16 21:06 Lars Wendler
2011-05-13  9:44 Lars Wendler
2011-04-24  8:33 Lars Wendler
2011-04-15 16:41 Lars Wendler
2011-04-08  5:58 Lars Wendler
2011-03-29 19:26 Lars Wendler
2011-03-14 21:08 Lars Wendler
2011-03-14 21:08 Lars Wendler
2011-02-13 22:12 Lars Wendler
2011-02-13 11:52 Lars Wendler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1329221941.3ceed41b63d4a3c64a22272c5a136a0a35134daf.polynomial-c@gentoo \
    --to=polynomial-c@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox