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 <gentoo-commits+bounces-330823-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1Q4Hxo-0006lS-QW
for garchives@archives.gentoo.org; Mon, 28 Mar 2011 19:18:57 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 900C81C110;
Mon, 28 Mar 2011 19:18:49 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 47DA61C110
for <gentoo-commits@lists.gentoo.org>; Mon, 28 Mar 2011 19:18:49 +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 A30671B40EC
for <gentoo-commits@lists.gentoo.org>; Mon, 28 Mar 2011 19:18:48 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 174898006A
for <gentoo-commits@lists.gentoo.org>; Mon, 28 Mar 2011 19:18:48 +0000 (UTC)
From: "Jory Pratt" <anarchy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" <anarchy@gentoo.org>
Message-ID: <428964f11b368f10290eadcb1cd364e22f977a83.anarchy@gentoo>
Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/firefox/, www-client/firefox/files/
X-VCS-Repository: proj/mozilla
X-VCS-Files: www-client/firefox/Manifest www-client/firefox/files/mozilla-2.0-gconf-config-update.patch www-client/firefox/firefox-4.0-r2.ebuild www-client/firefox/firefox-4.0-r3.ebuild
X-VCS-Directories: www-client/firefox/ www-client/firefox/files/
X-VCS-Committer: anarchy
X-VCS-Committer-Name: Jory Pratt
X-VCS-Revision: 428964f11b368f10290eadcb1cd364e22f977a83
Date: Mon, 28 Mar 2011 19:18:48 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: f48d00125aca59d37fef03c1d625734d
commit: 428964f11b368f10290eadcb1cd364e22f977a83
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 19:18:53 2011 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 19:18:53 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mozilla.git;a=
=3Dcommit;h=3D428964f1
revert changes for firefox as cairo is not a dep of it but xul
---
www-client/firefox/Manifest | 3 +-
.../files/mozilla-2.0-gconf-config-update.patch | 25 --------------=
------
...firefox-4.0-r3.ebuild =3D> firefox-4.0-r2.ebuild} | 6 +---
3 files changed, 3 insertions(+), 31 deletions(-)
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 5ca4caa..2281fa6 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -3,7 +3,6 @@ AUX fix-preferences-gentoo.patch 426 RMD160 83075ec3c2e4c=
39ba298096bd08447bb94ca
AUX icon/firefox-1.5-unbranded.desktop 258 RMD160 32ebb016d6a4d3d2728c03=
1f3b3762796e02f5d3 SHA1 69820d445d06b90d7ac35ffd39dad5926caa0862 SHA256 f=
2bf5c237a5c56b443c20fd16d3da429bf3b99e9fe27b661a1a462aa46ed25d3
AUX icon/firefox-1.5.desktop 255 RMD160 4ef1cf548f11057274620b82f0728958=
a3424bea SHA1 6a440f817072fb60516c1a1d999dffb6d3fa1583 SHA256 9bf6e1264d9=
86c68d64831d166ed6b506bff6df8b56d21bfc166aee09cbc753f
AUX icon/firefox.desktop 276 RMD160 92a5671cd09e399b3330c4be31b7ac758374=
7031 SHA1 b757763670a00982f3cb38b8d41d7faa6eee3818 SHA256 06565ade11b6e4b=
448cf10339696c43f31e73cb6824491094bb6e0ab902c7cf5
-AUX mozilla-2.0-gconf-config-update.patch 827 RMD160 9de17d272f6e5899f79=
d713b965537f66d17db79 SHA1 5f575306bec598b1ff31dccccf42fd87de25c36c SHA25=
6 d9c53a9a728cd4e350fb4a55ab6a0783b38e4c695946b63574e7179a84c346c8
DIST firefox-4.0-af.xpi 220420 RMD160 ee8e95bbaf9e548082aca0a8029edc4cc6=
557afd SHA1 3a2da0b247983cdcf20a14faa2e3c1b6e3906264 SHA256 d4062ced61ccb=
4f1c37ee6c8793675e1c5da4d2a5e91ddf4c2d9f36561353492
DIST firefox-4.0-ak.xpi 222040 RMD160 0ba8ab5ec79abafe126a8045844e4839a7=
72d1e8 SHA1 4979d5ecfdd90a723d95984f57b07ddc6ed2df57 SHA256 4a050f68c9f4c=
51f89bb946c2aec22b5e81ae6b8a1835f601fc747c692e4dc37
DIST firefox-4.0-ar.xpi 241600 RMD160 d22109a623f83319d64e16bba931bdecc7=
b71831 SHA1 d4bc970bcb8ccc6c0a5ff6cbcce157727261756e SHA256 be5d98d19c926=
861dd545bad492043983cd709f409cb88eb1931bd82ca816c79
@@ -81,4 +80,4 @@ DIST firefox-4.0-uk.xpi 260129 RMD160 4a7cda6a1ae6dd31d=
3b089b05e6bc4f85d0b0a3e S
DIST firefox-4.0-vi.xpi 239966 RMD160 94f90afd4a26b6f9b220a1f096f4259f1c=
4339ed SHA1 7b5602a5b9e0e67b31b27bc125eb3a62e0c71319 SHA256 9927c8bd3bbd7=
96805bd70eb5a4b37d113715333542b7a262623e0f09b8aa2a6
DIST firefox-4.0-zu.xpi 227605 RMD160 56d91ea40c9983dc28db96af51a18cdd0b=
22a50d SHA1 a73c237b85bbb17924a2a2fc8499db380caa0f03 SHA256 474dfa2edf6cd=
692dbc05c9569d263ea326b02d91feb335a1e2e360117f524ae
DIST firefox-4.0.source.tar.bz2 66024327 RMD160 2d1a3cf0f37ddbf4a5be9b83=
949f8f8236e2081d SHA1 403da9dd65662e5c4dd34299214e04cb6f80575e SHA256 78b=
1e0a66be3604af49b81193e557c27ffaee16b8c26fead052455dd42c9150f
-EBUILD firefox-4.0-r3.ebuild 8115 RMD160 574d7235da409914448e4cd00f01a7d=
ed5705f2e SHA1 e33c379aa651daccf61dfe1c9a7a5c8518088cd2 SHA256 639c33ee97=
d609e1673aa13f2a9fcf6d9e79a55bb2ec1034209ceab62e84dff2
+EBUILD firefox-4.0-r2.ebuild 8003 RMD160 e8f05a2ee352537d60781adcd12049c=
ef1f3d68e SHA1 f2ab4c81ed4dffdf098189b55d1a31b9b5b25480 SHA256 673e5fe37e=
e86198799789254ea80a9afd83d79cde7a42a8ac8f334315ba0e20
diff --git a/www-client/firefox/files/mozilla-2.0-gconf-config-update.pat=
ch b/www-client/firefox/files/mozilla-2.0-gconf-config-update.patch
deleted file mode 100644
index 464e1e1..0000000
--- a/www-client/firefox/files/mozilla-2.0-gconf-config-update.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/configure.in b/configure.in
---- a/configure.in
-+++ b/configure.in
-@@ -5701,16 +5701,21 @@ then
-=20
- AC_SUBST(MOZ_ENABLE_GIO)
- AC_SUBST(MOZ_GIO_CFLAGS)
- AC_SUBST(MOZ_GIO_LIBS)
- =20
- dnl =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
- dnl =3D GConf support module
- dnl =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
-+ MOZ_ARG_DISABLE_BOOL(gconf,
-+ [ --disable-gconf Disable Gconf support ],
-+ MOZ_ENABLE_GCONF=3D,
-+ MOZ_ENABLE_GCONF=3Dforce)
-+
- if test "$MOZ_ENABLE_GCONF"
- then
- PKG_CHECK_MODULES(MOZ_GCONF, gconf-2.0 >=3D $GCONF_VERSION gobj=
ect-2.0 ,[
- MOZ_GCONF_LIBS=3D`echo $MOZ_GCONF_LIBS | sed 's/-llinc\>//'=
`
- MOZ_ENABLE_GCONF=3D1
- ],[
- if test "$MOZ_ENABLE_GCONF" =3D "force"
- then
diff --git a/www-client/firefox/firefox-4.0-r3.ebuild b/www-client/firefo=
x/firefox-4.0-r2.ebuild
similarity index 98%
rename from www-client/firefox/firefox-4.0-r3.ebuild
rename to www-client/firefox/firefox-4.0-r2.ebuild
index da13998..ce9926c 100644
--- a/www-client/firefox/firefox-4.0-r3.ebuild
+++ b/www-client/firefox/firefox-4.0-r2.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE=3D"http://www.mozilla.com/firefox"
KEYWORDS=3D"~amd64 ~x86 ~amd64-linux ~x86-linux"
SLOT=3D"0"
LICENSE=3D"|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE=3D"bindist gconf +ipc system-sqlite +webm"
+IUSE=3D"bindist +ipc system-sqlite +webm"
=20
REL_URI=3D"http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
# More URIs appended below...
@@ -35,11 +35,10 @@ RDEPEND=3D"
>=3Ddev-libs/nss-3.12.9
>=3Ddev-libs/nspr-4.8.7
>=3Ddev-libs/glib-2.26
- gconf? ( >=3Dgnome-base/gconf-1.2.1:2 )
media-libs/libpng[apng]
x11-libs/pango[X]
system-sqlite? ( >=3Ddev-db/sqlite-3.7.4[fts3,secure-delete,unlock-noti=
fy,debug=3D] )
- ~net-libs/xulrunner-${XUL_PV}[wifi=3D,libnotify=3D,system-sqlite=3D,web=
m=3D,gconf=3D]
+ ~net-libs/xulrunner-${XUL_PV}[wifi=3D,libnotify=3D,system-sqlite=3D,web=
m=3D]
webm? ( media-libs/libvpx
media-libs/alsa-lib )"
=20
@@ -137,7 +136,6 @@ src_prepare() {
EPATCH_FORCE=3D"yes" \
epatch "${WORKDIR}"
=20
- epatch "${FILESDIR}"/mozilla-2.0-gconf-config-update.patch
epatch "${FILESDIR}"/fix-preferences-gentoo.patch
=20
# Allow user to apply any additional patches without modifing ebuild