Version bump with several bugfixes.

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

3 files changed, 124 insertions, 9 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index b6b4f6790139..b1bb2338bd8c 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.396 2012/05/07 08:05:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.397 2012/05/20 10:57:43 tetromino Exp $
+
+*nautilus-3.4.2 (20 May 2012)
+
+  20 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +nautilus-3.4.2.ebuild:
+  Version bump with several bugfixes.
 
 *nautilus-3.4.1 (07 May 2012)
 
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 814c69c5432e..96fa3cad8a58 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -10,22 +10,24 @@ DIST nautilus-2.32.2.1-patches.tar.bz2 6984 RMD160 44f6fd3f76dd96f265a9e47220930
 DIST nautilus-2.32.2.1.tar.bz2 6350203 RMD160 4498fc3c5dd2a4f13935b0366c175ad1b87bac1e SHA1 7b0a89cd965f4ca1531115d353b208bb2ba9db33 SHA256 802dacc98c697afea2e6201dab1c8c800809f235fff39857983efb4340ecc303
 DIST nautilus-3.2.1.tar.xz 4703588 RMD160 d3f2db2747cc69a06494a4d50f6ee67b8dedbff7 SHA1 246c6ae0539dc111d755727ad4cb12d8df7bd322 SHA256 c482d6e7babcc238304cf55586cdf7e2b2806025214a143ed355f0d89b33b154
 DIST nautilus-3.4.1.tar.xz 4583100 RMD160 11183f1e9ac5d0abd1f458841361558afd668255 SHA1 852ab243d5506cc2762f495d743d83be86c1d19c SHA256 02581c9475e9c4250960555b248378a6a1c63a5c029728ec48347c78ca77392d
+DIST nautilus-3.4.2.tar.xz 4583996 RMD160 d73f9d9ac3e488e18b3647112c8c444627bce199 SHA1 72e2fee2f9caad339f98e9bff5fbdea2b14607a5 SHA256 752afa41189b0b6c73dc3769cd885e184c29d6d394345ec05cd48b0004e0f452
 EBUILD nautilus-2.32.2.1-r1.ebuild 2252 RMD160 13cff67f713771fea1b231207c3c4d81d3fc82a4 SHA1 f9d6146ba95f3a6d21742117af03629377737769 SHA256 a80c76e5f2e4b5abbed382d4a5a2ef958a643e0e12d65b1375f63f14fb1ba273
 EBUILD nautilus-2.32.2.1-r2.ebuild 2256 RMD160 420e3f60b0cf5eacd0b724502b4efb0ca800d11e SHA1 323916ce0e8fcaf0de7d79deb2bf9ed000b47a9b SHA256 9ced2a39bda655138ec89a2da8fda765b25449b9a5affe27eb1be3d4a55e685c
 EBUILD nautilus-2.32.2.1.ebuild 2070 RMD160 9c974b1b37fc48d74c25a6dc9b6d8246fc5231d6 SHA1 f0e12a0a5312ed2d1661e2b45b27a86ae5a2b47b SHA256 1a960587495c351347bb1e3f5bf374ae6852e32e9f136511c58b92bbd8c712de
 EBUILD nautilus-3.2.1-r1.ebuild 3375 RMD160 c9e9a5b6f970a450f42787fbc3d02087d2f16eee SHA1 d4c8ad28dd624dd18398dea6640211e736d803b5 SHA256 933272553e3b52d40e34b75347daf6e7dc51bbb1e88b5ab44c4488d2d152217b
 EBUILD nautilus-3.2.1.ebuild 2826 RMD160 0522ec9ec05dc23df9525dccc5474bc4a5a9dbbc SHA1 09f7ebf860dae009f83cc08f5f96ed367abaa8b9 SHA256 1a6493b610145696bb28a8c72103cc5ad61aa226dd0b704eb343b709487ccb8a
 EBUILD nautilus-3.4.1.ebuild 3168 RMD160 fc01963db02c9e7084b6a5df074bd28a9bb3311e SHA1 d8ea360f6ece7aa692cabb1f54298124b5417b0a SHA256 7add334b81835c0969499da9ae149546768ed947c5649bd10390671a5e3e1862
-MISC ChangeLog 59759 RMD160 2200e01f8ef0c8db485c43301064ae28885e0668 SHA1 9b681e3e861d3b6a361060dc879d33fc6a1ded2d SHA256 67b9c8b08da82a1dab88e51314d48acc7e451731281af5bffb9f5cffe8b4f693
+EBUILD nautilus-3.4.2.ebuild 3095 RMD160 d07b131b5a4dbbeca85d32ac1e38777ce38c66ef SHA1 68bd9f513296e40757957ebc386fc32fdd48b341 SHA256 b9b47dca84f279f1ead6a5b9c6b750fc67f112eb92e939e7a325c678509bbc46
+MISC ChangeLog 59914 RMD160 59465ae9b2bdfb1af0ef8fd27c9ef1d330f79906 SHA1 de640214b234d465da9c71663dd67333808f66fd SHA256 75a5a242187b7201f3dbc77401b788be539b0dc041b9b79d88914e55fe0a2713
 MISC metadata.xml 667 RMD160 4905458681c088bef4b030ee1a963a71b9cb53bd SHA1 fa3a39a43c3e54058f3996d30fa93cd8d03897aa SHA256 b2769f7911c156b0692b95f3511adb651cee0486c6d8eb37b7d0a95786aad4c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPp4I9AAoJEJ0WA1zPCt1hbScH/0rPE+X0ec/BUaiTGSKDSdz6
-V+Cst94f4+tbQGG63G7f/d67V50CmOZG/X5sfw9EqRdisD1OoZytfOx1EgyeqNtP
-Njzr/W72JMRU3phHJkD170nbo12ity21iSCCu0yBPawABW8oWTjYpXwfPKsAovFf
-gLw3IIXg6QZfye1AVbcfDVUjv053tqOqyzajZdmstoDejzEa+vvjC4P74RQM+f6w
-yopg6BBWBqnWPtOIvZIvdHjHV+cK7A82DLteqty5xt3J00DUDvZryjw9ZXPV8DgI
-nJH1dPdat+AaPUi5t5hFHEeI7iP3WHmAQhMVQ4o36rLp2WlI7c8csAVFVwNhxnI=
-=XFjs
+iQEcBAEBAgAGBQJPuM4tAAoJEJ0WA1zPCt1ht0oIALRHcTzzsuW158Cd0AkRV3aK
+VJqnidUSQAudS/fEQgWYFFmwXV7d3uZ7Q5Nl9JAa1hCnR8w+UgEnZV5A9hgFd63B
+VPwvOGdJEtA25jm/zJrrefo937URrrlR2h86qb+7AIQBpKOj9huFg7RH60WFYr/M
+tcDJAHYpbKViD4xXwVxzpEpgQlQKCeRKKu9L9tXyIgrkpiLuph2gjztdzIptC18E
+SzmodvH5ZxbCNkN0ajZuhIuXEJppnP6BCLEDsv5yHGALzO5F3zy0ZnqAjsQdnT0Z
+uVDWQ5F1boiZEe7pfKRpsZAXmrd5bQYx0b7PLzSfyIZ1CLCtzmMS5gu3HALY4rY=
+=WlOW
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/nautilus-3.4.2.ebuild b/gnome-base/nautilus/nautilus-3.4.2.ebuild
new file mode 100644
index 000000000000..d01b6cf436c0
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-3.4.2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-3.4.2.ebuild,v 1.1 2012/05/20 10:57:43 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 virtualx
+
+DESCRIPTION="A file manager for the GNOME desktop"
+HOMEPAGE="http://live.gnome.org/Nautilus"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="doc exif gnome +introspection packagekit +previewer sendto tracker xmp"
+
+# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
+# and 2.30.0
+COMMON_DEPEND=">=dev-libs/glib-2.31.9:2
+	>=x11-libs/pango-1.28.3
+	>=x11-libs/gtk+-3.3.17:3[introspection?]
+	>=dev-libs/libxml2-2.7.8:2
+	>=gnome-base/gnome-desktop-3.0.0:3
+
+	gnome-base/dconf
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/libnotify-0.7
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+
+	exif? ( >=media-libs/libexif-0.6.20 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
+	tracker? ( >=app-misc/tracker-0.12 )
+	xmp? ( >=media-libs/exempi-2.1.0 )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5
+	>=dev-util/gdbus-codegen-2.31.0
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xproto
+	doc? ( >=dev-util/gtk-doc-1.4 )"
+RDEPEND="${COMMON_DEPEND}
+	packagekit? ( app-admin/packagekit-base )
+	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )"
+# For eautoreconf
+#	gnome-base/gnome-common
+#	dev-util/gtk-doc-am"
+PDEPEND="gnome? (
+		>=x11-themes/gnome-icon-theme-1.1.91
+		x11-themes/gnome-icon-theme-symbolic )
+	tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
+	previewer? ( >=gnome-extra/sushi-0.1.9 )
+	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
+	>=gnome-base/gvfs-0.1.2"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-update-mimedb
+		$(use_enable exif libexif)
+		$(use_enable introspection)
+		$(use_enable packagekit)
+		$(use_enable sendto nst-extension)
+		$(use_enable tracker)
+		$(use_enable xmp)"
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work);
+	# bug #393663
+	epatch "${FILESDIR}/${PN}-3.2.1-delete.patch"
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=664573
+	epatch "${FILESDIR}/${PN}-3.2.1-key-press-forwarding.patch"
+
+	# Remove crazy CFLAGS
+	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \
+		|| die "sed 1 failed"
+}
+
+src_test() {
+	addpredict "/root/.gnome2_private"
+	unset SESSION_MANAGER
+	unset ORBIT_SOCKETDIR
+	unset DBUS_SESSION_BUS_ADDRESS
+	export GSETTINGS_BACKEND="memory"
+	Xemake check
+	unset GSETTINGS_BACKEND
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if use previewer; then
+		elog "nautilus uses gnome-extra/sushi to preview media files."
+		elog "To activate the previewer, select a file and press space; to"
+		elog "close the previewer, press space again."
+	else
+		elog "To preview media files, emerge nautilus with USE=previewer"
+	fi
+}