New release: 2.12.1

(Portage version: 2.0.53_rc3)

5 files changed, 29 insertions, 35 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 0a3927ae8f5d..28eee53bb7d0 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,12 @@
 # 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.154 2005/09/17 14:59:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.155 2005/10/06 07:21:07 leonardop Exp $
+
+*nautilus-2.12.1 (06 Oct 2005)
+
+  06 Oct 2005; Leonardo Boshell <leonardop@gentoo.org>
+  -nautilus-2.12.0.ebuild, +nautilus-2.12.1.ebuild:
+  New version.
 
   17 Sep 2005; Aron Griffis <agriffis@gentoo.org> nautilus-2.10.1-r1.ebuild,
   nautilus-2.12.0.ebuild:
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 4ee0e37bfb9a..4cd99758a9bc 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,30 +1,23 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 031415a72aeecf5baa91ce45ab7ad0bc nautilus-2.10.1-r1.ebuild 2559
+MD5 cecc9db71b7cbfaa26c775e38c7e400d .nautilus-2.12.1.ebuild.swp 12288
 MD5 b9d8c5181dc3e5138aa2c26e1a94fd3a ChangeLog 20511
-MD5 00c95b6b319c4650c8e666dbe2354c7a nautilus-1.0.6-r9.ebuild 3398
-MD5 c0ed9135a2a082d9b804280bbbf62c57 nautilus-2.10.0.ebuild 2587
-MD5 c51a04ad792c7d2ebf3bc03070349c1f nautilus-2.12.0.ebuild 2241
-MD5 889a29f6bea75973eafb3d64a1801a5f files/nautilus-2.10.1-deselect.patch 802
-MD5 10a8e2ff004b9570adede4036ccda3d5 files/digest-nautilus-2.12.0 69
-MD5 47ad4a802bbd17967708599cda1b7aaf files/nautilus-1.0.6-mozilla-1.0_rc1.diff 920
-MD5 d7ad0d83dbafefa25a34a50e2ee34806 files/nautilus-1.0.6-mozilla-1.0_rc3.diff 1709
-MD5 76cc1af40c4dc75ce99179ae9b25a2cd files/nautilus-2.9.90-icon_view_gst.patch 8136
+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 10a8e2ff004b9570adede4036ccda3d5 files/digest-nautilus-2.12.0 69
+MD5 62b04598faf13b6c5ca417651b88d000 files/digest-nautilus-2.12.1 69
+MD5 7cb2f285f24e86a90c6a65b0b9356d39 files/macros/gnome.m4 16426
+MD5 486b971d706aec59655a72282d3feb0b files/macros/nautilus-macros.m4 7993
 MD5 4c62404b0162ab39572cb522fed222c4 files/nautilus-1.0.6-hyperbola.diff 1632
-MD5 48ff9ab600b9230470a12bb5b60ff68f files/nautilus-2.11.91-icon_view_gst.patch 8321
+MD5 47ad4a802bbd17967708599cda1b7aaf files/nautilus-1.0.6-mozilla-1.0_rc1.diff 920
+MD5 d7ad0d83dbafefa25a34a50e2ee34806 files/nautilus-1.0.6-mozilla-1.0_rc3.diff 1709
 MD5 ddc1abbf275436c7fa5fd5c04a27cc94 files/nautilus-1.0.6-mozilla-embed-1.0_rc3.diff 526
+MD5 889a29f6bea75973eafb3d64a1801a5f files/nautilus-2.10.1-deselect.patch 802
 MD5 29bf62fc0e7eaa6cd6aa5cf4e2dd291d files/nautilus-2.10.1-font_sizes.patch 1532
-MD5 3db7f854e279f4032b8d1e86d64157aa files/digest-nautilus-1.0.6-r9 68
-MD5 7cb2f285f24e86a90c6a65b0b9356d39 files/macros/gnome.m4 16426
-MD5 486b971d706aec59655a72282d3feb0b files/macros/nautilus-macros.m4 7993
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDLC9qJrHF4yAQTrARAh/wAKCfw5awFFqOwW4xhvQkXPk/mFDpSQCgiXuD
-ryOoQ8TVnh9dZNKhEq/SxtY=
-=rAuI
------END PGP SIGNATURE-----
+MD5 48ff9ab600b9230470a12bb5b60ff68f files/nautilus-2.11.91-icon_view_gst.patch 8321
+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 031415a72aeecf5baa91ce45ab7ad0bc nautilus-2.10.1-r1.ebuild 2559
+MD5 c51a04ad792c7d2ebf3bc03070349c1f nautilus-2.12.0.ebuild 2241
+MD5 cff11f63f9883f26b505687409eb9b33 nautilus-2.12.1.ebuild 2207
diff --git a/gnome-base/nautilus/files/digest-nautilus-2.12.0 b/gnome-base/nautilus/files/digest-nautilus-2.12.0
deleted file mode 100644
index 12a04ac5e6f4..000000000000
--- a/gnome-base/nautilus/files/digest-nautilus-2.12.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f38ae8d066b822317d18efa1e2c543df nautilus-2.12.0.tar.bz2 4073980
diff --git a/gnome-base/nautilus/files/digest-nautilus-2.12.1 b/gnome-base/nautilus/files/digest-nautilus-2.12.1
new file mode 100644
index 000000000000..2890f00a821a
--- /dev/null
+++ b/gnome-base/nautilus/files/digest-nautilus-2.12.1
@@ -0,0 +1 @@
+MD5 61878b1c3f9bee37cd568e17b31d66b1 nautilus-2.12.1.tar.bz2 4056062
diff --git a/gnome-base/nautilus/nautilus-2.12.0.ebuild b/gnome-base/nautilus/nautilus-2.12.1.ebuild
index a10c9ddd416a..0c9b9dae6af3 100644
--- a/gnome-base/nautilus/nautilus-2.12.0.ebuild
+++ b/gnome-base/nautilus/nautilus-2.12.1.ebuild
@@ -1,8 +1,8 @@
 # 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.12.0.ebuild,v 1.2 2005/09/17 14:59:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.12.1.ebuild,v 1.1 2005/10/06 07:21:08 leonardop Exp $
 
-inherit gnome2 virtualx
+inherit virtualx gnome2
 
 DESCRIPTION="A file manager for the GNOME desktop"
 HOMEPAGE="http://www.gnome.org/projects/nautilus/"
@@ -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="static"
+IUSE=""
 # cups flac gstreamer mad ogg vorbis
 
 RDEPEND=">=media-libs/libart_lgpl-2.3.10
@@ -46,7 +46,6 @@ RDEPEND=">=media-libs/libart_lgpl-2.3.10
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/intltool-0.28
-	>=app-text/scrollkeeper-0.3.11
 	>=dev-util/pkgconfig-0.9"
 
 PDEPEND=">=x11-themes/gnome-icon-theme-1.1.91
@@ -56,10 +55,6 @@ DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
 USE_DESTDIR="1"
 
 
-pkg_setup() {
-	G2CONF="$(use_enable static)"
-}
-
 #src_unpack() {
 #	unpack "${A}"
 #	cd "${S}"
@@ -79,5 +74,5 @@ pkg_setup() {
 #}
 
 src_test() {
-	Xmake check || die
+	Xmake check || die "Test phase failed"
 }