summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gryniewicz <dang@gentoo.org>2005-12-01 17:51:05 +0000
committerDaniel Gryniewicz <dang@gentoo.org>2005-12-01 17:51:05 +0000
commit17c77f62ed8be8d675ac98c8d8fecde88c32a940 (patch)
treeb5cb844a254b3cb61babf402a31626d96cb1bee4 /gnome-base/nautilus
parentBump to 0.3.5. (diff)
downloadgentoo-2-17c77f62ed8be8d675ac98c8d8fecde88c32a940.tar.gz
gentoo-2-17c77f62ed8be8d675ac98c8d8fecde88c32a940.tar.bz2
gentoo-2-17c77f62ed8be8d675ac98c8d8fecde88c32a940.zip
Remove oggvorbis flag per bug#94254
(Portage version: 2.0.53_rc7)
Diffstat (limited to 'gnome-base/nautilus')
-rw-r--r--gnome-base/nautilus/ChangeLog6
-rw-r--r--gnome-base/nautilus/Manifest14
-rw-r--r--gnome-base/nautilus/files/digest-nautilus-2.10.01
-rw-r--r--gnome-base/nautilus/nautilus-2.10.0.ebuild96
-rw-r--r--gnome-base/nautilus/nautilus-2.10.1-r1.ebuild12
5 files changed, 11 insertions, 118 deletions
diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 90cbce5e47bf..ce5a7e8d7b80 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnome-base/nautilus
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.160 2005/11/06 21:11:58 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.161 2005/12/01 17:51:05 dang Exp $
+
+ 01 Dec 2005; <dang@gentoo.org> -nautilus-2.10.0.ebuild,
+ nautilus-2.10.1-r1.ebuild:
+ Remove oggvorbis flag per bug#94254
06 Nov 2005; <dang@gentoo.org> nautilus-2.12.1-r1.ebuild:
Modular X deps
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index f9e24ceadf52..52fc34cceb66 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,9 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 42335ac3b64a6a76d90521af0acbf256 ChangeLog 21396
MD5 3db7f854e279f4032b8d1e86d64157aa files/digest-nautilus-1.0.6-r9 68
-MD5 d3f1a79cced5768f96e22c17df92261b files/digest-nautilus-2.10.0 69
MD5 567191aa3b9ef17acb8e3b0ba006afdf files/digest-nautilus-2.10.1-r1 69
MD5 62b04598faf13b6c5ca417651b88d000 files/digest-nautilus-2.12.1 69
MD5 62b04598faf13b6c5ca417651b88d000 files/digest-nautilus-2.12.1-r1 69
@@ -20,14 +16,6 @@ MD5 6656801883a1b7be0c2f4f5b660c84c3 files/nautilus-2.12.1-symlink-del.patch 190
MD5 76cc1af40c4dc75ce99179ae9b25a2cd files/nautilus-2.9.90-icon_view_gst.patch 8136
MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
MD5 00c95b6b319c4650c8e666dbe2354c7a nautilus-1.0.6-r9.ebuild 3398
-MD5 c0ed9135a2a082d9b804280bbbf62c57 nautilus-2.10.0.ebuild 2587
-MD5 30e03d96ad901727aced906beb36baf6 nautilus-2.10.1-r1.ebuild 2557
+MD5 bacf61bb90a0b69b1233d3afc350f9b0 nautilus-2.10.1-r1.ebuild 2555
MD5 e32b9dca56cdd213e985fca3066ded30 nautilus-2.12.1-r1.ebuild 1891
MD5 a9bdda3fc643e7b3bb31396f58678770 nautilus-2.12.1.ebuild 2202
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDbnGsomPajV0RnrERApXhAJ4l30l2fOIG5hnITMRBp/AD/DDTlgCghNYB
-a0QmXfWdYuA1C1heDBOULtM=
-=FaB7
------END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/files/digest-nautilus-2.10.0 b/gnome-base/nautilus/files/digest-nautilus-2.10.0
deleted file mode 100644
index d425fe86c341..000000000000
--- a/gnome-base/nautilus/files/digest-nautilus-2.10.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b29a02be8733a82e002179e2e0f3fe83 nautilus-2.10.0.tar.bz2 5899170
diff --git a/gnome-base/nautilus/nautilus-2.10.0.ebuild b/gnome-base/nautilus/nautilus-2.10.0.ebuild
deleted file mode 100644
index 9d85d790c7a3..000000000000
--- a/gnome-base/nautilus/nautilus-2.10.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.10.0.ebuild,v 1.21 2005/07/12 12:39:57 leonardop Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="A filemanager for the Gnome2 desktop"
-HOMEPAGE="http://www.gnome.org/projects/nautilus/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="oggvorbis gstreamer mad flac"
-#IUSE="oggvorbis gstreamer cups mad flac"
-RESTRICT=test
-
-RDEPEND=">=dev-libs/glib-2.6
- >=x11-libs/pango-1.2
- >=x11-libs/gtk+-2.3
- >=dev-libs/libxml2-2.4.7
- =gnome-base/eel-${PV}*
- >=gnome-base/gnome-vfs-2.9.1
- >=media-sound/esound-0.2.27
- >=gnome-base/gconf-2
- >=gnome-base/libgnome-2.6
- >=gnome-base/libgnomeui-2.6
- >=gnome-base/gnome-desktop-2.9.91
- >=media-libs/libart_lgpl-2.3.10
- >=gnome-base/libbonobo-2.2
- >=gnome-base/librsvg-2.0.1
- >=gnome-base/orbit-2.4
- >=x11-libs/startup-notification-0.8
- >=media-libs/libexif-0.5.12
- dev-libs/popt
- virtual/fam
- virtual/eject
- !gstreamer? ( oggvorbis? ( media-sound/vorbis-tools ) )
- gstreamer? (
- >=media-libs/gstreamer-0.8
- >=media-libs/gst-plugins-0.8
- >=media-plugins/gst-plugins-gnomevfs-0.8
- mad? ( >=media-plugins/gst-plugins-mad-0.8 )
- oggvorbis? (
- >=media-plugins/gst-plugins-ogg-0.8
- >=media-plugins/gst-plugins-vorbis-0.8
- )
- flac? ( >=media-plugins/gst-plugins-flac-0.8 )
- )"
-
-# FIXME : what to do with exif/jpeg config stuff ?
-
-DEPEND="${RDEPEND}
- sys-devel/gettext
- >=dev-util/intltool-0.29
- >=app-text/scrollkeeper-0.3.11
- >=dev-util/pkgconfig-0.12.0"
-
-PDEPEND=">=x11-themes/gnome-icon-theme-1.1.91
- x11-themes/gnome-themes"
-
-DOCS="AUTHORS ChangeLo* HACKING MAINTAINERS NEWS README THANKS TODO"
-
-G2CONF="${G2CONF} $(use_enable gstreamer)"
-
-src_unpack() {
-
- unpack ${A}
- cd ${S}
-
- # use gstreamer for audio preview (patch by <foser@gentoo.org>)
- use gstreamer && epatch ${FILESDIR}/${PN}-2.9.90-icon_view_gst.patch
-
- # -- Component architecture has changed in 2.9 -- this
-# -- patch no longer applies.
-
- # add libgnomeprint support
- # With extra 2.8 fun - fixes #65604
-# if use cups; then
-# if has_version ">=net-print/gnome-cups-manager-0.28"; then
-# epatch ${FILESDIR}/${PN}-2.8-x-printers.patch
-# else
-# epatch ${FILESDIR}/${PN}-2-x-printers.patch
-# fi
-# fi
-
- # stop nautilus linking to cdda/paranoia
- sed -i -e "/^CORE_LIBS/s/\$CDDA_LIBS//" configure.in
-
- if use gstreamer; then
- WANT_AUTOCONF=2.5 autoheader || die
- WANT_AUTOCONF=2.5 autoconf || die
- WANT_AUTOMAKE=1.7 automake || die
- fi
-}
-
-USE_DESTDIR="1"
diff --git a/gnome-base/nautilus/nautilus-2.10.1-r1.ebuild b/gnome-base/nautilus/nautilus-2.10.1-r1.ebuild
index dae4d661bc58..39bc476b81b3 100644
--- a/gnome-base/nautilus/nautilus-2.10.1-r1.ebuild
+++ b/gnome-base/nautilus/nautilus-2.10.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.10.1-r1.ebuild,v 1.12 2005/10/17 13:11:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.10.1-r1.ebuild,v 1.13 2005/12/01 17:51:05 dang Exp $
inherit gnome2 eutils
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnome.org/projects/nautilus/"
LICENSE="GPL-2 LGPL-2 FDL-1.1"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="oggvorbis gstreamer mad flac"
+IUSE="ogg vorbis gstreamer mad flac"
# cups
RDEPEND=">=dev-libs/glib-2.6
@@ -33,16 +33,14 @@ RDEPEND=">=dev-libs/glib-2.6
dev-libs/popt
virtual/fam
virtual/eject
- !gstreamer? ( oggvorbis? ( media-sound/vorbis-tools ) )
+ !gstreamer? ( vorbis? ( media-sound/vorbis-tools ) )
gstreamer? (
>=media-libs/gstreamer-0.8
>=media-libs/gst-plugins-0.8
>=media-plugins/gst-plugins-gnomevfs-0.8
mad? ( >=media-plugins/gst-plugins-mad-0.8 )
- oggvorbis? (
- >=media-plugins/gst-plugins-ogg-0.8
- >=media-plugins/gst-plugins-vorbis-0.8
- )
+ ogg? ( >=media-plugins/gst-plugins-ogg-0.8 )
+ vorbis? ( >=media-plugins/gst-plugins-vorbis-0.8 )
flac? ( >=media-plugins/gst-plugins-flac-0.8 )
)"