public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Jory Pratt" <anarchy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, www-client/firefox/, www-client/seamonkey/, eclass/
Date: Wed, 16 Jan 2013 20:40:51 +0000 (UTC)	[thread overview]
Message-ID: <1358368827.c543a91608f9be6572f3f5580cf7e4b6ed5c5d37.anarchy@gentoo> (raw)

commit:     c543a91608f9be6572f3f5580cf7e4b6ed5c5d37
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 16 20:40:27 2013 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Wed Jan 16 20:40:27 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=c543a916

sync python changes from cvs to overlay

---
 eclass/mozcoreconf-2.eclass                        |   15 +++++++++------
 mail-client/thunderbird/Manifest                   |    2 +-
 .../thunderbird/thunderbird-18.0_beta1-r2.ebuild   |    2 +-
 www-client/firefox/Manifest                        |    2 +-
 www-client/firefox/firefox-18.0-r1.ebuild          |    4 ++--
 www-client/seamonkey/Manifest                      |    2 +-
 www-client/seamonkey/seamonkey-2.15-r1.ebuild      |    2 +-
 7 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/eclass/mozcoreconf-2.eclass b/eclass/mozcoreconf-2.eclass
index 2aeb725..30e79de 100644
--- a/eclass/mozcoreconf-2.eclass
+++ b/eclass/mozcoreconf-2.eclass
@@ -1,11 +1,14 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozcoreconf-2.eclass,v 1.22 2011/08/29 01:28:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozcoreconf-2.eclass,v 1.27 2013/01/16 19:02:10 mgorny Exp $
 #
 # mozcoreconf.eclass : core options for mozilla
 # inherit mozconfig-2 if you need USE flags
 
-inherit multilib flag-o-matic python versionator
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads,sqlite'
+
+inherit multilib flag-o-matic python-any-r1 versionator
 
 IUSE="${IUSE} custom-cflags custom-optimization"
 
@@ -16,7 +19,7 @@ RDEPEND="x11-libs/libXrender
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	=dev-lang/python-2.7*[threads,sqlite]"
+	${PYTHON_DEPS}"
 
 # mozconfig_annotate: add an annotated line to .mozconfig
 #
@@ -92,13 +95,13 @@ moz_pkgsetup() {
 	export USE_PTHREADS=1
 	export ALDFLAGS=${LDFLAGS}
 
-	python_set_active_version 2
-
 	if [[ $(gcc-major-version) -eq 3 ]]; then
 		ewarn "Unsupported compiler detected, DO NOT file bugs for"
 		ewarn "outdated compilers. Bugs opened with gcc-3 will be closed"
 		ewarn "invalid."
 	fi
+
+	python-any-r1_pkg_setup
 }
 
 mozconfig_init() {

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 6775949..4e139e9 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -5,4 +5,4 @@ DIST enigmail-1.5.0.tar.gz 1216071 SHA256 51f55573448586718c8d7e664329d519b02c4b
 DIST firefox-18.0-patches-0.7.tar.xz 56092 SHA256 a1ad340ce4901b392bbe64adabddcc3524e8da6008e0223f2e75ce834d22534d SHA512 e2f90089b1e1534a993041776606c60be696cf9388990a0f86cda803978352199449156a5f51934dab3be809e0159472b2eabd9f39ae9b72d3b7e66feff2b63f WHIRLPOOL a89a49e86df4a58ebba2d8734c378315c2212f283ac1ba4cded99540cd837f6b6c1115674035b253878b622cfd94d0fb24eb08ece367cd02af47fa9116d2f302
 DIST thunderbird-17.0-patches-01.tar.xz 820 SHA256 79bf322258e0efc7682ce71ea84398e4dbec55b912acb264e16ddae72917bd8e SHA512 94ad743f86d95cb437bbe3be52beb8ab7c97acd9f703841f9445f94672d764cf6b9a3dfc065a6c54f24eeb16113a62708290512a3f54389c538a52fa93be7e06 WHIRLPOOL eb234826caf0f648d3ea8043b49fc2650f3a011eb28db661122e50abab0a6098b467e580d3c120b97a29919934c072e931f956bfa6676a2759cf46a2db88f282
 DIST thunderbird-18.0b1.source.tar.bz2 119356332 SHA256 60a31745fc0ee4fc5597de6663a757f55c0bd61494f67607e3b914c73e236c72 SHA512 a5cfd4049b88db6cfa30e3bb8f53637db0992c6ed8f5030958ed268ce93913e8936ca5e7b91f1ebf3c760c72b3ae5156fd72140dac6c5bc21a93ec20d3399c6b WHIRLPOOL 2836c94478bc364a7deb4e341b984c6dc987dc969dcc8b3c1b2e1bb85237e2109ccfb647de05860ac5afaa0076e60b278fe47299ad628d3c97c2f3e15f7cf0e2
-EBUILD thunderbird-18.0_beta1-r2.ebuild 10538 SHA256 f336c7d75ca199629c9b2c0156ad776cf34bc1f724b2f4d4ec7d79cd7192422f SHA512 b7a56501d025beaef56fd0638bce0f901082893a243c71c87fa2b5b2c7cacebb8847707313f00e9c56ad3137298e52049ccb50a936bec43fa256291db75a54f6 WHIRLPOOL 82fcb940b19063e53ac9584ea227ea2b2d89f8a5d1c100dc2e395e80dceb8650876f7f41ffbc63defbe6ada7c8636e742548f50a9ecc75feaa8e29d008733eec
+EBUILD thunderbird-18.0_beta1-r2.ebuild 10531 SHA256 1e8ae9102f8dc9133da50dd136a9c98b138da712bfecbc67a9d2be65a3d8c82b SHA512 835a20fdb1cb3086d8bb2b103d5e21df7fc099420b76ff54875067e26e04696bb05a53cd700efe5e643dbff02202e6cdd1795ecbdcbf39af37a2a1ad30280db9 WHIRLPOOL 9faea7be273b0762eba09f56e4b43cdf741f2b94d8d126782ea65f96475e0c1d4a319f7509d11c5aa0069d26221ad287673fcb88984d3c49dd9a1866fc1bc707

diff --git a/mail-client/thunderbird/thunderbird-18.0_beta1-r2.ebuild b/mail-client/thunderbird/thunderbird-18.0_beta1-r2.ebuild
index 721a170..4117fdd 100644
--- a/mail-client/thunderbird/thunderbird-18.0_beta1-r2.ebuild
+++ b/mail-client/thunderbird/thunderbird-18.0_beta1-r2.ebuild
@@ -26,7 +26,7 @@ EMVER="1.5.0"
 # We don't use the http mirror because it deletes old tarballs.
 MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
 
-inherit flag-o-matic toolchain-funcs mozconfig-3 makeedit multilib autotools pax-utils python check-reqs nsplugins mozlinguas
+inherit flag-o-matic toolchain-funcs mozconfig-3 makeedit multilib autotools pax-utils check-reqs nsplugins mozlinguas
 
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 956179b..313f19c 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -90,4 +90,4 @@ DIST firefox-18.0-zh-CN.xpi 313764 SHA256 fa5816d39c1752d987c3772414526ced9e92f6
 DIST firefox-18.0-zh-TW.xpi 315081 SHA256 9fe7a039ddaf7c0666c3e25cc87c6a342a5ac09b0316c60f7723c927167c2095 SHA512 04b5394ba81ff582c3aa7e33a75b0be483ae99a1c3effc1c57ea9a8d7d489c274b76eaec20432ac75e091472f280afcecbb7e36f7a9f51347705b66a8643731f WHIRLPOOL 3f56fdfe77f48ef8252d3f794626b7c361af78c1a64bc3f4a15ac8bc73451bf8da804d8847ee9cb10c2acec61776863f0954bf9921682968cb42acec3b882100
 DIST firefox-18.0-zu.xpi 305238 SHA256 442ea76cdfc9f94eb66c4479b9647466d1f06d5c2bad993dee45542937bdfbcd SHA512 5a059ca208b09891450f21a3ef3c49b364958658e016abd73497477b856a9126e9cd6832777c19b08a5f5f281b8d6da0e14534c1402d762b22b0e954bcae7657 WHIRLPOOL ed6415a2f397c50660e5638fc3cd1626ee08534bab06fee293a495da924de963de0bf99c9611bd9781d7abb3b0f036f690c8032f93dabe61303c6b24eeea750c
 DIST firefox-18.0.source.tar.bz2 96948716 SHA256 53f06ff49882060e811b06ceb5d59e5a8851bda23e4cc82426010de967565014 SHA512 dc2e8ccd7a12c44097762c297a7091abdcfd9830ab27ae2ea062984564c68aa47c7b61c2dfe08ad406b29072fcecc0dc9111852cdc9bede71b4f8b8bda8c8bad WHIRLPOOL 1ae098d33871fcad9215284ae3670c1978a5068b30521433f887f0ace8cdb7e5afec23f340f0489f764ff86d4c87ce1966a367a378369ea3532e0c85929b3af5
-EBUILD firefox-18.0-r1.ebuild 11489 SHA256 d050226a3d16f7f81dca300c6c3c86374d6d7bd81516ce6271cf1c69798e0326 SHA512 ce03da745a12f7ec9503925d1b98d16dc668d4b5bce77e182e61f7ba131664ecd694bc35f10111c53eac58f93ccec41de70ef794c11615679217b16db870f7bc WHIRLPOOL 3dfc35825c05ceb6a362b4102fae7ad698a45b7e36b7203bf5afed5a1f034af21a7aff6a59226cc0b60089bc2d55a17a33e70ff537e9936c78175c92579ed099
+EBUILD firefox-18.0-r1.ebuild 11416 SHA256 bdad26649e56980af032248abd5f051c43cf9cd9be94ce1f95c642d5da18c22d SHA512 58663daedfd5d2ead1c5c0252e4af022b068688007062b5e75ddb90665a973619d2ea03a0f824d4bb7499cb1947d3beda3ab167cbdbade0d2b3aabde3b0bc9f3 WHIRLPOOL bb25e90aa299dd0f8abc744289557edc7483975e6c77a93b4169d970dd8484d637bd0752d400afefa48197e397c019b210fbee657cb7daa5177cff00c075a675

diff --git a/www-client/firefox/firefox-18.0-r1.ebuild b/www-client/firefox/firefox-18.0-r1.ebuild
index d949a33..7880513 100644
--- a/www-client/firefox/firefox-18.0-r1.ebuild
+++ b/www-client/firefox/firefox-18.0-r1.ebuild
@@ -30,7 +30,7 @@ PATCH="${PN}-18.0-patches-0.7"
 # We don't use the http mirror because it deletes old tarballs.
 MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
 
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 multilib pax-utils fdo-mime autotools python virtualx nsplugins mozlinguas
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 multilib pax-utils fdo-mime autotools virtualx nsplugins mozlinguas
 
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="http://www.mozilla.com/firefox"
@@ -62,7 +62,7 @@ RDEPEND="
 	>=media-libs/libvpx-1.0.0
 	kernel_linux? ( media-libs/alsa-lib )
 	selinux? ( sec-policy/selinux-mozilla )"
-# We don't use PYTHON_DEPEND/PYTHON_USE_WITH for some silly reason
+
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	pgo? (

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index d5c9f4d..4ea0ae5 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -30,4 +30,4 @@ DIST seamonkey-2.15-uk.xpi 831595 SHA256 a047bed31c246951a43edf4889dc69c882612bf
 DIST seamonkey-2.15-zh-CN.xpi 801315 SHA256 c3faa1fb5d92df78bc7d376594a466daa1610f6513f4682afef129df564f335e SHA512 8c0d768c9c460057783845faccbef43d3a06969faf387752bfce71430af00d6694fc912264d5b6ba3a0a15317d9472678f4cec7f7bb8e0191bb4e34dae6612fd WHIRLPOOL bd3fcfe62aa14b38ad49c878389b7184ab058cc377ecf6a8f30a51b5915bea2da985773b59c4c0bb629a4b33c885075fd1983725e21e1b1890df37b6e5225c8b
 DIST seamonkey-2.15-zh-TW.xpi 804006 SHA256 3a1cb7817f1db7beb2c6e624f1e0022b963455a78b0fb1345aced8e0ffcb66c7 SHA512 887785a2b716115daf98d38abcf67b884a0f4ab054df2582348d1cf929f57063a9f55e3d629c54488ad15915d9012ac7cb76d44945817a47c2c67480fc321b9f WHIRLPOOL 9d3291e1d961087087e08f7de80b590b460486244f95c4d8aa99bf1baa9540e8ab006204931e78b96fdceeb406d129f491516dddaa54607eb39050433b893e80
 DIST seamonkey-2.15.source.tar.bz2 120128259 SHA256 29ef839f30bb5998cc60adfe16b2e5e64abc14e48cbf10dff98b5b3a5260f5c7 SHA512 98085c2fc0b8122de82e7cc08e72d5c598bd2fab606ef1db24ced105ba3f8f66be7199a5f6bc913c4f2ea22f298332688ea651ffc28d2b35ec11368520cfc58e WHIRLPOOL c631dfc1e01f3b1a7f1df13a8f179d3822a271236b79a4cd13e3cca436ff5205859fa752f7ce7ba469aaf5df033d81cc9ef8946a0e9270e6c34b8b141b5a7522
-EBUILD seamonkey-2.15-r1.ebuild 10345 SHA256 85e5b471edcea780c5f8c6953a65bf82f4b7821cc1e337f0cd0f3819d40dac73 SHA512 d6d719a6c5f615e54fe720c10b8616ad1ec74139588f7edc1a44badfaf182c6bfa297dc9dec459002f8aa391c97c35b680127b50c519320325c6a668a8c6e08a WHIRLPOOL a66df93a21497c89bc76f5f14de9505083edd3848ee78a2a15deff0f47e7d9a03c3114a3b4aa91f423178a20013c1cff5664d4dc2759d25f4207a711e803eed7
+EBUILD seamonkey-2.15-r1.ebuild 10338 SHA256 bdf8319ec0330db0d3c729c58e29a0db9a56568da74d65d389eba023ceda34fc SHA512 1f51a214003e1860cd44e2bc460c32196212e3f465ccc1276d3dd89727d035e47f606f4fd92b82b55c616ce0f9fd19d4a592c8b95e45671ad7deb1d3981b5d51 WHIRLPOOL 008903a9ca464ad77ef58c89ae25264b6da36b2bc543a4ed2b4389e78ba5b7402683b9885ee85fbb30aec8f6c3ecd55ff0db77c2e53dc3654dfca17f12452f1a

diff --git a/www-client/seamonkey/seamonkey-2.15-r1.ebuild b/www-client/seamonkey/seamonkey-2.15-r1.ebuild
index 3b55f10..4101f0d 100644
--- a/www-client/seamonkey/seamonkey-2.15-r1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.15-r1.ebuild
@@ -26,7 +26,7 @@ else
 	MOZ_LANGPACK_SUFFIX=".langpack.xpi"
 fi
 
-inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension python nsplugins mozlinguas
+inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension nsplugins mozlinguas
 
 PATCHFF="firefox-18.0-patches-0.7"
 PATCH="${PN}-2.14-patches-01"


             reply	other threads:[~2013-01-16 20:40 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-16 20:40 Jory Pratt [this message]
  -- strict thread matches above, loose matches on Subject: below --
2014-09-05 20:13 [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, www-client/firefox/, www-client/seamonkey/, eclass/ Ian Stakenvicius
2013-09-28 13:03 Jory Pratt
2013-09-27 17:59 Ian Stakenvicius
2013-01-16  4:39 Jory Pratt
2011-11-21 16:14 Jory Pratt

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=1358368827.c543a91608f9be6572f3f5580cf7e4b6ed5c5d37.anarchy@gentoo \
    --to=anarchy@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