From 7e2762f995a1cc1dc607932c0bc1a58d74daf5ab Mon Sep 17 00:00:00 2001 From: Daniel Gryniewicz Date: Thu, 1 Dec 2005 19:42:29 +0000 Subject: [PATCH] New upstream version Package-Manager: portage-2.0.53_rc7 --- gnome-base/nautilus/ChangeLog | 8 ++++- gnome-base/nautilus/Manifest | 12 +++---- .../nautilus/files/digest-nautilus-2.12.1 | 1 - .../nautilus/files/digest-nautilus-2.12.2 | 1 + ...s-2.12.1.ebuild => nautilus-2.12.2.ebuild} | 32 +++++++------------ 5 files changed, 26 insertions(+), 28 deletions(-) delete mode 100644 gnome-base/nautilus/files/digest-nautilus-2.12.1 create mode 100644 gnome-base/nautilus/files/digest-nautilus-2.12.2 rename gnome-base/nautilus/{nautilus-2.12.1.ebuild => nautilus-2.12.2.ebuild} (75%) diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog index ce5a7e8d7b80..9ca184b8de08 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.161 2005/12/01 17:51:05 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.162 2005/12/01 19:42:29 dang Exp $ + +*nautilus-2.12.2 (01 Dec 2005) + + 01 Dec 2005; -nautilus-2.12.1.ebuild, + +nautilus-2.12.2.ebuild: + New upstream version 01 Dec 2005; -nautilus-2.10.0.ebuild, nautilus-2.10.1-r1.ebuild: diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest index 9b54ffc47f3a..388e9bce2a24 100644 --- a/gnome-base/nautilus/Manifest +++ b/gnome-base/nautilus/Manifest @@ -1,11 +1,11 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 43f3f0a83ce399726b32b7ec40dd3ede ChangeLog 21522 +MD5 0f32988d586c2970431e9f29c617fb5a ChangeLog 21663 MD5 3db7f854e279f4032b8d1e86d64157aa files/digest-nautilus-1.0.6-r9 68 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 +MD5 ce0f366310eca426982a50e22fdb9dfc files/digest-nautilus-2.12.2 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 @@ -21,11 +21,11 @@ MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 MD5 00c95b6b319c4650c8e666dbe2354c7a nautilus-1.0.6-r9.ebuild 3398 MD5 7a8f087c59094aae5720cea457555be1 nautilus-2.10.1-r1.ebuild 2551 MD5 e32b9dca56cdd213e985fca3066ded30 nautilus-2.12.1-r1.ebuild 1891 -MD5 a9bdda3fc643e7b3bb31396f58678770 nautilus-2.12.1.ebuild 2202 +MD5 127ac067a28b51577a3aed265eeb4090 nautilus-2.12.2.ebuild 1896 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux) -iD4DBQFDjzf8omPajV0RnrERAp1MAJ9CE9cUahBCw9Ep1epwl/n8J1++NACY1o1x -l+7X2hx5H+KluDAfbkPJgQ== -=PzAz +iD8DBQFDj1IYomPajV0RnrERAoyrAJ4/riFnkxGcYZpTYysOnZ5ErUXzcACdEvot +VOjPlmBc2ErBxvyGDpe42Yw= +=QAxJ -----END PGP SIGNATURE----- diff --git a/gnome-base/nautilus/files/digest-nautilus-2.12.1 b/gnome-base/nautilus/files/digest-nautilus-2.12.1 deleted file mode 100644 index 2890f00a821a..000000000000 --- a/gnome-base/nautilus/files/digest-nautilus-2.12.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 61878b1c3f9bee37cd568e17b31d66b1 nautilus-2.12.1.tar.bz2 4056062 diff --git a/gnome-base/nautilus/files/digest-nautilus-2.12.2 b/gnome-base/nautilus/files/digest-nautilus-2.12.2 new file mode 100644 index 000000000000..245d571569d0 --- /dev/null +++ b/gnome-base/nautilus/files/digest-nautilus-2.12.2 @@ -0,0 +1 @@ +MD5 1c1304e458eda551da11ed8c52b1faa2 nautilus-2.12.2.tar.bz2 4057461 diff --git a/gnome-base/nautilus/nautilus-2.12.1.ebuild b/gnome-base/nautilus/nautilus-2.12.2.ebuild similarity index 75% rename from gnome-base/nautilus/nautilus-2.12.1.ebuild rename to gnome-base/nautilus/nautilus-2.12.2.ebuild index 587638b3c0b3..c4785208d4f2 100644 --- a/gnome-base/nautilus/nautilus-2.12.1.ebuild +++ b/gnome-base/nautilus/nautilus-2.12.2.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.1.ebuild,v 1.2 2005/10/11 13:30:44 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.12.2.ebuild,v 1.1 2005/12/01 19:42:29 dang Exp $ -inherit virtualx gnome2 +inherit virtualx gnome2 eutils DESCRIPTION="A file manager for the GNOME desktop" HOMEPAGE="http://www.gnome.org/projects/nautilus/" @@ -31,7 +31,10 @@ RDEPEND=">=media-libs/libart_lgpl-2.3.10 >=media-libs/libexif-0.5.12 >=gnome-base/gconf-2 dev-libs/popt - virtual/x11 + || ( ( + x11-libs/libICE + x11-libs/libSM ) + virtual/x11 ) virtual/eject" # !gstreamer? ( vorbis? ( media-sound/vorbis-tools ) ) # gstreamer? ( @@ -55,23 +58,12 @@ DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO" USE_DESTDIR="1" -#src_unpack() { -# unpack "${A}" -# cd "${S}" -# -# # FIXME:Port this for 2.12 final -# # use gstreamer for audio preview (patch by ) -# use gstreamer && epatch ${FILESDIR}/${P}-icon_view_gst.patch -# -# # -- Component architecture has changed in 2.9 -- libgnomeprint patches -# # no longer apply. -# -# if use gstreamer; then -# WANT_AUTOCONF=2.5 autoheader || die -# WANT_AUTOCONF=2.5 autoconf || die -# WANT_AUTOMAKE=1.7 automake || die -# fi -#} +src_unpack() { + unpack "${A}" + cd "${S}" + + epatch ${FILESDIR}/${PN}-2.12.1-symlink-del.patch +} src_test() { if hasq userpriv $FEATURES ; -- 2.26.2