From f13da668297d71587bab04d59b5b841f5473a02f Mon Sep 17 00:00:00 2001 From: Joe McCann Date: Mon, 27 Dec 2004 15:51:59 +0000 Subject: [PATCH] Remove deps on masked esound and add for epiphany. Fixes bug 75794 --- gnome-base/gnome/ChangeLog | 16 ++++++---- gnome-base/gnome/Manifest | 38 +++++++++--------------- gnome-base/gnome/gnome-2.6.1_p1.ebuild | 4 +-- gnome-base/gnome/gnome-2.6.3_pre0.ebuild | 4 +-- 4 files changed, 28 insertions(+), 34 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 gnome-2.8.1-r1.ebuild: + 27 Dec 2004; Joe McCann 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 gnome-2.8.1-r1.ebuild: Stable on alpha. 22 Dec 2004; Gustavo Zacarias gnome-2.8.1-r1.ebuild: @@ -11,7 +15,7 @@ 19 Dec 2004; Mike Gardiner gnome-2.8.1-r1.ebuild: Keyworded x86 and ppc - everyone say hello GNOME 2.8.1 - 11 Dec 2004; Bryan Østergaard gnome-2.8.0-r1.ebuild: + 11 Dec 2004; Bryan Østergaard gnome-2.8.0-r1.ebuild: Stable on alpha. 11 Dec 2004; Mike Gardiner 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 gnome-2.8.0-r1.ebuild: + 16 Nov 2004; Bryan Østergaard gnome-2.8.0-r1.ebuild: ~alpha keyword. 12 Nov 2004; Mike Gardiner gnome-2.8.0-r1.ebuild: @@ -66,7 +70,7 @@ 18 Sep 2004; foser 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 gnome-2.6.2-r1.ebuild: + 24 Aug 2004; Bryan Østergaard gnome-2.6.2-r1.ebuild: Stable on alpha. *gnome-2.6.3_pre0 (22 Aug 2004) @@ -106,7 +110,7 @@ 11 Jul 2004; gnome-1.4-r3.ebuild: added IUSE flag to shut repoman up - 04 Jul 2004; Bryan Østergaard gnome-2.6.ebuild: + 04 Jul 2004; Bryan Østergaard gnome-2.6.ebuild: Stable on alpha. 01 Jul 2004; Aron Griffis gnome-2.6.1_p1.ebuild, diff --git a/gnome-base/gnome/Manifest b/gnome-base/gnome/Manifest index 84be3e52d347..18e2d547abd4 100644 --- a/gnome-base/gnome/Manifest +++ b/gnome-base/gnome/Manifest @@ -1,32 +1,22 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 97a6cc1179e8b1a5f06f998ac8e25390 ChangeLog 20252 -MD5 7000a4bf33a3fa0383afd41c0e798104 gnome-2.8.1-r1.ebuild 3859 MD5 2fe803743f19c25a33184caaba050e9c gnome-1.4-r3.ebuild 545 +MD5 4495d2bff6b870f43e26ca07f4103a5b gnome-2.4.2.ebuild 3757 MD5 40ea32d04f2550a993e7d8815f719df5 gnome-2.6.2-r1.ebuild 4220 -MD5 30eedb645dd74bdc112aef88862d5c07 gnome-2.8.2_pre0.ebuild 3852 -MD5 c584545cb93f626a542bf5699be754a9 gnome-2.8.0-r1.ebuild 3641 +MD5 8a6b244abaa40ac400b8f3390a4920d0 gnome-2.6.ebuild 3762 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 -MD5 f638a960c11abe03544f275393cb9398 gnome-2.6.3_pre0.ebuild 4249 +MD5 c584545cb93f626a542bf5699be754a9 gnome-2.8.0-r1.ebuild 3641 +MD5 7000a4bf33a3fa0383afd41c0e798104 gnome-2.8.1-r1.ebuild 3859 +MD5 30eedb645dd74bdc112aef88862d5c07 gnome-2.8.2_pre0.ebuild 3852 +MD5 495913fff4cae5352120c92da2a78555 gnome-2.6.3_pre0.ebuild 4250 MD5 8e2735e5d17f484f64a993802bd1bbc4 gnome-2.6.1_rc1.ebuild 3887 -MD5 c837bf2a7248f18f79c58b6bcb8a4b9f gnome-2.6.1_p1.ebuild 3892 -MD5 4495d2bff6b870f43e26ca07f4103a5b gnome-2.4.2.ebuild 3757 -MD5 8a6b244abaa40ac400b8f3390a4920d0 gnome-2.6.ebuild 3762 +MD5 e85e4f6e1fc0812eae0dbd8c8e125421 gnome-2.6.1_p1.ebuild 3904 +MD5 5195efb874b4d9e7a68d2688a74febcb ChangeLog 20428 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-1.4-r3 0 -MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.6.2-r1 0 -MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.6.1_rc1 0 -MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.8.2_pre0 0 +MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.4.2 0 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.6 0 -MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.8.0-r1 0 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.6.1_p1 0 -MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.4.2 0 -MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.8.1-r1 0 +MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.6.1_rc1 0 +MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.6.2-r1 0 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.6.3_pre0 0 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFBy2XhugEuf3OQ0akRAqjHAJ4rwyCH1/FPqw5TBdyHOuzU0RuITgCgleDl -fz6tcE1z6zPhxh0UoW9kEOs= -=68gt ------END PGP SIGNATURE----- +MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.8.0-r1 0 +MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.8.1-r1 0 +MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.8.2_pre0 0 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 -- 2.26.2