summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe McCann <joem@gentoo.org>2004-12-27 15:51:59 +0000
committerJoe McCann <joem@gentoo.org>2004-12-27 15:51:59 +0000
commit15aeb21a443d1035351411a06b623b5c11b275e7 (patch)
tree9c02f593b3b6c6561c9c465776e8edd8e8a1d8f7 /gnome-base
parentx86 stable (Manifest recommit) (diff)
downloadgentoo-2-15aeb21a443d1035351411a06b623b5c11b275e7.tar.gz
gentoo-2-15aeb21a443d1035351411a06b623b5c11b275e7.tar.bz2
gentoo-2-15aeb21a443d1035351411a06b623b5c11b275e7.zip
Remove deps on masked esound and add for epiphany. Fixes bug 75794
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/gnome/ChangeLog16
-rw-r--r--gnome-base/gnome/gnome-2.6.1_p1.ebuild4
-rw-r--r--gnome-base/gnome/gnome-2.6.3_pre0.ebuild4
3 files changed, 14 insertions, 10 deletions
diff --git a/gnome-base/gnome/ChangeLog b/gnome-base/gnome/ChangeLog
index e52dfdbb7990..779bd516d75b 100644
--- a/gnome-base/gnome/ChangeLog
+++ b/gnome-base/gnome/ChangeLog
@@ -1,8 +1,12 @@
# ChangeLog for gnome-base/gnome
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.139 2004/12/24 00:41:58 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.140 2004/12/27 15:51:59 joem Exp $
- 24 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> gnome-2.8.1-r1.ebuild:
+ 27 Dec 2004; Joe McCann <joem@gentoo.org> gnome-2.6.1_p1.ebuild,
+ gnome-2.6.3_pre0.ebuild:
+ Remove deps on masked esound and add !mips for epiphany. Fixes bug 75794
+
+ 24 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> gnome-2.8.1-r1.ebuild:
Stable on alpha.
22 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> gnome-2.8.1-r1.ebuild:
@@ -11,7 +15,7 @@
19 Dec 2004; Mike Gardiner <obz@gentoo.org> gnome-2.8.1-r1.ebuild:
Keyworded x86 and ppc - everyone say hello GNOME 2.8.1
- 11 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> gnome-2.8.0-r1.ebuild:
+ 11 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> gnome-2.8.0-r1.ebuild:
Stable on alpha.
11 Dec 2004; Mike Gardiner <obz@gentoo.org> gnome-2.8.1-r1.ebuild,
@@ -35,7 +39,7 @@
+gnome-2.8.1.ebuild:
Added in the meta-tracker for GNOME 2.8.1
- 16 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> gnome-2.8.0-r1.ebuild:
+ 16 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> gnome-2.8.0-r1.ebuild:
~alpha keyword.
12 Nov 2004; Mike Gardiner <obz@gentoo.org> gnome-2.8.0-r1.ebuild:
@@ -66,7 +70,7 @@
18 Sep 2004; foser <foser@gentoo.org> gnome-2.8.0_pre1.ebuild :
First gnome meta for gnome 2.8, still lacks some minor components & updates (#64135)
- 24 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> gnome-2.6.2-r1.ebuild:
+ 24 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> gnome-2.6.2-r1.ebuild:
Stable on alpha.
*gnome-2.6.3_pre0 (22 Aug 2004)
@@ -106,7 +110,7 @@
11 Jul 2004; <spider@gentoo.org> gnome-1.4-r3.ebuild:
added IUSE flag to shut repoman up
- 04 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> gnome-2.6.ebuild:
+ 04 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> gnome-2.6.ebuild:
Stable on alpha.
01 Jul 2004; Aron Griffis <agriffis@gentoo.org> gnome-2.6.1_p1.ebuild,
diff --git a/gnome-base/gnome/gnome-2.6.1_p1.ebuild b/gnome-base/gnome/gnome-2.6.1_p1.ebuild
index 1bcf6fae48fd..57f762a201c4 100644
--- a/gnome-base/gnome/gnome-2.6.1_p1.ebuild
+++ b/gnome-base/gnome/gnome-2.6.1_p1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.6.1_p1.ebuild,v 1.14 2004/08/21 15:25:13 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.6.1_p1.ebuild,v 1.15 2004/12/27 15:51:59 joem Exp $
# UPDATE TRACKER : GNOME TEAM ONLY
@@ -63,7 +63,7 @@ RDEPEND="!gnome-base/gnome-core
>=gnome-extra/gnome-media-2.6.1
>=media-gfx/eog-2.6.1
- !hppa? ( >=net-www/epiphany-1.2.5 )
+ !hppa? ( !mips? ( >=net-www/epiphany-1.2.5 ) )
>=app-arch/file-roller-2.6.1
>=gnome-extra/gcalctool-4.3.51
>=gnome-extra/gconf-editor-2.6.1
diff --git a/gnome-base/gnome/gnome-2.6.3_pre0.ebuild b/gnome-base/gnome/gnome-2.6.3_pre0.ebuild
index ff7c63e9a779..e9f18ad58cbe 100644
--- a/gnome-base/gnome/gnome-2.6.3_pre0.ebuild
+++ b/gnome-base/gnome/gnome-2.6.3_pre0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.6.3_pre0.ebuild,v 1.13 2004/09/13 16:55:50 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.6.3_pre0.ebuild,v 1.14 2004/12/27 15:51:59 joem Exp $
# UPDATE TRACKER : GNOME TEAM ONLY
@@ -38,7 +38,7 @@ RDEPEND="!gnome-base/gnome-core
>=x11-libs/libxklavier-1.02
>=media-libs/audiofile-0.2.6-r1
- >=media-sound/esound-0.2.35
+ >=media-sound/esound-0.2.34
>=gnome-base/gnome-mime-data-2.4.1
>=media-libs/libart_lgpl-2.3.16