Version bump for Gnome 3.6. Clean up old revision.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

3 files changed, 29 insertions, 31 deletions

diff --git a/gnome-extra/nautilus-sendto/ChangeLog b/gnome-extra/nautilus-sendto/ChangeLog
index f251bc2a71f8..f673a4e57ad8 100644
--- a/gnome-extra/nautilus-sendto/ChangeLog
+++ b/gnome-extra/nautilus-sendto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/nautilus-sendto
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/ChangeLog,v 1.62 2012/12/15 18:52:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/ChangeLog,v 1.63 2012/12/24 15:59:35 eva Exp $
+
+*nautilus-sendto-3.6.0 (24 Dec 2012)
+
+  24 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  -nautilus-sendto-3.0.2.ebuild, +nautilus-sendto-3.6.0.ebuild:
+  Version bump for Gnome 3.6. Clean up old revision.
 
   15 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   nautilus-sendto-2.32.0.ebuild, nautilus-sendto-3.0.2.ebuild,
diff --git a/gnome-extra/nautilus-sendto/Manifest b/gnome-extra/nautilus-sendto/Manifest
index 37b1f22e28a3..bfadca0e0103 100644
--- a/gnome-extra/nautilus-sendto/Manifest
+++ b/gnome-extra/nautilus-sendto/Manifest
@@ -13,21 +13,17 @@ AUX nautilus-sendto-2.28.4-unload.patch 4212 SHA256 630944971f0f2fb3680eb3e336b1
 AUX nautilus-sendto-2.28.5-commandline-help.patch 1123 SHA256 f5a928cf771d55f5514b73ff5aa509df73ed1dae4d14b418ddebb256c4940e8d SHA512 6555f45709fe4a832c3d8c7df8bf54dcf82f356e31c950621190116413957ebe449debd3e235f0754356441c6028a827d4f57c743f7451b04a8493b2e2e5a84d WHIRLPOOL 5431cf33fdca7b1b6ba6aade5ea4594adcd7ce2236bd477180e5ae0ae94c12f033da1db71041fcebfbbd6eb71d45da34b9889db05435ff6baadf5643172e291e
 AUX nautilus-sendto-2.28.5-fix-memleaks.patch 1596 SHA256 dd78e9382bd5e55f262c8609a50b9daf5bfb4c45c8d9d27e732ca74b8a338388 SHA512 5ffd9e41449f934977904cf1403012d1db1faa567a97eb16290b595c09ddb57d171eb5ab4b96b19ce6844fa9ebe9c8a728557c970a68ca2ca181cf88ff809dad WHIRLPOOL 8817fbb809c9e25c5df16258a8ef2aec014687afe89ebe1e2dc49bf76e0218874342acaeede13d435aad255ad8861fa10fd870f26a66cffe78f9b5cfdc4b40ed
 DIST nautilus-sendto-2.32.0.tar.bz2 446731 SHA256 890090b24381d91f079610d5454cb786a3ecefc91fa06649b2222be9bb02269a SHA512 4846155d9adf7c8e298b80a5487a7df0ff1e430c82c96b565413f63c015b84629d21a8b104d84ee8355f975044219c521a728d4a6d28862bafb0e871d86277d8 WHIRLPOOL 4a38f5d4533488751e758a82e6a11c496993f2f5c687f55af8638a86b661849f8aae0ac3baf14e7a07b3cb6f04d4fe852f710f5643be9ac271d1bf3952be2ad9
-DIST nautilus-sendto-3.0.2.tar.xz 377344 SHA256 03265d7063212717773bd6a1f85c25ec24066ca8424b658c5fa30ec0fb074b44 SHA512 b3b4c490b86996d8d2ee85c6b59a7d3fe98542ccd51c5371402ed4cc99a77e8b89cab947c559f2866be59fe6b57406bdf0440fe37218ccbcef4317dca33fa868 WHIRLPOOL 3630bd3668249d0384073f3990a4dfe6e3a1c56d6fef025c0657948120a46d5216435e7ed9f305bd3604bae44e176423228314341cd6b933bb4e95037a5d4bf2
 DIST nautilus-sendto-3.0.3.tar.xz 380940 SHA256 bafbfbfe66c9817b099c8b57f41341e0be4e94ae846a9a1ae84d7bcbc339c2cf SHA512 23bf4ab2becc0cf1f1178653424aad68fe53437aaa64f0bd0a6ca00425f44be9311e4c07369219242e94ef6b44ccb0d336ea70d6b7271cb440704848ca30fad1 WHIRLPOOL ddc6e1fa85fc0f4d281f9181466e1215f83f0dab58c4af2a2f807b3fdf711c355269c10ac05326553298661f881343a6089401f20b8efb65370e17b8d5af0fef
+DIST nautilus-sendto-3.6.0.tar.xz 384260 SHA256 5f90a1a7b054257545dc72fa3a63de8f5564815576f90a21c320ebb177b9268e SHA512 71c9d59201f324b70752ca070f0938dfc203ff4d4bf0439d857924d27ed2df4c833fae1df4a8a6abd826902c405b1d1b9360dc156e3ed23e64c341887000ee04 WHIRLPOOL bb34983448e1f85efeb68b31de1e44384d9f5dddf44386804337688eb6f1c5517424be64728102aa1521011cf11a27feaadd8921a0adc5c9100aadb6ddd2c4f8
 EBUILD nautilus-sendto-2.32.0.ebuild 1474 SHA256 28ac0cca4d7655ca5cf5dcd3bc6bb27ce5858312c5a4b559ae97a58374c61ef9 SHA512 7109918e2301721cdd946cfdc922b0987c5d031bd3d27a8365ff73e4ccb89c4f70f9c3e89df1c8258c2440ea647f63872aba092c76c06de7ed5892745cd99440 WHIRLPOOL 6179011e3547b985baf7d4a5fcf46617eebb8fdb9c335cea028fd968b6db6924a9dc98aebf432f4b3d5be992db5bf266642d7e5b9f8aadabb77994622bfa93cc
-EBUILD nautilus-sendto-3.0.2.ebuild 1803 SHA256 629b3fea58aaf62d52642c14ba99f74f8eb1d63256908baaec7f47895f62d78a SHA512 3fefb4d8a7c8952473357da63acf44e7a0440da9884eae39866632dd838395947814238d5b54d2371b03dc68edf5cbaecd1e05bc6e83732fca72742b4cede673 WHIRLPOOL 7e29f59d0c287f104963fae3f103cacd84f70be99e44009968a81446ecd2b77d4f709fcfe0c33c01d9b9bde88246b6bb2f8064e9df6a83009dcab077d60a3f0b
 EBUILD nautilus-sendto-3.0.3.ebuild 1815 SHA256 50c0030a14affa27910a7d3a9c9712e98fb09fc9aee1cf05937dc3afce9cf7b3 SHA512 e9b5666047e2c6ac02db6edb37ff6e2786f00f95a2263efcde0fcc580fcffd6a650ee0929156854dc2da8246f024d064e801ee6084d38fe548c2ac7fd3501540 WHIRLPOOL 9469ff4f7d4576944b098b5419b4e45993606a478870224488fd477728afdf5f961c00fd2c2258eb823cd11933f55d50231f030677ce79710d0b73eda41ac00e
-MISC ChangeLog 13009 SHA256 48381b5247b9de25de5401a0ba1f2054d9c956ccf7c66cd89e405db32c39b8b3 SHA512 e86f7bcd194966b63ee34294e1643cf3ab3586d473717193eaadd7d8f74f7e27251afb7566bb0040d50d4987caea27644f559d6893bd1f3667fcbe070e457720 WHIRLPOOL 3b5c9c3d2658b26db0b3b33a32884a630599cc71522f7006dfe82a3b5d0d30cef768b0a75a81e6ae241283d01c11fa2cdab6289ff0a3f2b0fbc286ce7d783df5
+EBUILD nautilus-sendto-3.6.0.ebuild 1650 SHA256 02a91b0b5654e889dcf8e2f986b2b9d198971655f9906e774993812e1cddda58 SHA512 87258bec8803e5ba4376f1b9c69ee0b27a120c4d3e0454d886c135b1708d3f2e5274cdd711285abca48fe04051b7f958ccd01ffea3bb03ff13efd25343fd3158 WHIRLPOOL 3bdb7c49d56fa14a034f7ea197d4a172b1d40f4342aa54d8d8346ca445943d604d6cfa22fc9c72050048aebc36424071f0ef4e2e656fa79a544f7fe76b9ed9cf
+MISC ChangeLog 13213 SHA256 e8adbbd4b3ca7e8cc818961121bf7fc07c2d63425fc5459a67a77aa5292a9e42 SHA512 d3a921a912563786ae57ab787e262f6e7701265783b30fd089bc1a4982531d5ce3c18253e3305e0dfb19269230c9fe4c151d5efde4576868ab21ac2a4afc4e83 WHIRLPOOL 4529ab685767825fe4febf572e3b8caa9bf9782ec3626d1169cd9834cff790fdc020f0a4f59de442eae868f7fb9e54a425e824a6126e023ee26cac6874809406
 MISC metadata.xml 429 SHA256 d6ca2ca2610c15e8bcbd18c720ae8ecc99d5fa3408c9490f0cd78ae7edcfdc50 SHA512 9ebf3bb8297509dd76eb7665a8b7b77cc6d2a76ec1c0bf19606b03385527b4f6674a84b95e0633ae193ed5aa404e435468bced75a9e1dea51caed8ac7a29bdcf WHIRLPOOL d4fc1556fa18af058d9fa6759f5529e466922958818cf3759375823b384462ac6bd7facc34aec62e2ff797db63fb4bea0f491483d3e9149923093c75cd6ccac3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQzMcLAAoJEJ0WA1zPCt1hxIAH/1XzIDDsh43LhFkQPhHaEFry
-EqCHNFMJFRFFHlYKUunIS0s9h+LZm+5phrr2CgF9Ca9mYt2beBABClcbkC+xw/tm
-2os8jE8trPyuJEKK9g/xW+y2HzmvZgDe2yarb5VyqNzdStE2d6DVjrNWvU/+1So6
-hSR4uWXrIWuAdJbfvsOJQZYoj7M7/03gtJS1sLJpTC3GH9/zeUWpCohqbVDI7kbT
-RYajuRl7xUyZxL4ixC3JmpxJhgYPQewClho0iTvUobNTMOyc/sHwcWDpjllblVDP
-RqXKZ4B+mwz1EqQQuxgGUiTWdHlkg62gTEJ7vjsYLmV1kso54pp9j0KD7uHNaVE=
-=Wvlz
+iEYEAREIAAYFAlDYe+kACgkQ1fmVwcYIWAY3SwCg6jh5n6tMKZc62SWLlFsHT/3G
+ZBQAn1b3ErAnskW42xAH0qXKWMFVQ796
+=kkXZ
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-3.0.2.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-3.6.0.ebuild
index 41bc9c82434f..46e2d0cb2a55 100644
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-3.0.2.ebuild
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-3.6.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-3.0.2.ebuild,v 1.3 2012/12/15 18:52:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-3.6.0.ebuild,v 1.1 2012/12/24 15:59:35 eva Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
@@ -11,33 +11,34 @@ inherit eutils gnome2 multilib
 DESCRIPTION="A nautilus extension for sending files to locations"
 HOMEPAGE="http://www.gnome.org"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdr doc gajim +mail pidgin upnp-av"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="cdr gajim +mail pidgin upnp-av"
 
 COMMON_DEPEND=">=x11-libs/gtk+-2.90.3:3[X(+)]
 	>=dev-libs/glib-2.25.9:2
-	cdr? ( >=app-cdr/brasero-2.26.0[nautilus] )
+	cdr? ( >=app-cdr/brasero-2.26[nautilus] )
 	gajim? (
 		net-im/gajim
 		>=dev-libs/dbus-glib-0.60 )
-	mail? ( >=gnome-extra/evolution-data-server-3 )
+	mail? ( >=gnome-extra/evolution-data-server-3.5.3:= )
 	pidgin? (
-		>=net-im/pidgin-2.0.0
+		>=net-im/pidgin-2
 		>=dev-libs/dbus-glib-0.60 )
-	upnp-av? ( >=net-libs/gupnp-0.13.0 )"
+	upnp-av? ( >=net-libs/gupnp-0.13 )
+"
 RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/nautilus-2.91.1[sendto]"
 DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35
 	>=gnome-base/nautilus-2.91.1
 	sys-devel/gettext
 	virtual/pkgconfig
-	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1.9 )"
+"
 # Needed for eautoreconf
 #	>=gnome-base/gnome-common-0.12
-#	dev-util/gtk-doc-am
 
 _use_plugin() {
 	if use ${1}; then
@@ -45,7 +46,7 @@ _use_plugin() {
 	fi
 }
 
-pkg_setup() {
+src_configure() {
 	DOCS="AUTHORS ChangeLog NEWS README"
 	G2CONF="${G2CONF}
 		--with-plugins=removable-devices,"
@@ -54,12 +55,7 @@ pkg_setup() {
 	_use_plugin pidgin
 	_use_plugin gajim
 	_use_plugin upnp-av upnp
-}
-
-src_prepare() {
-	# Regenerate marshaler code for <glib-2.31 compatibility
-	rm -v src/plugins/evolution/econtactentry-marshal.{c,h} || die
-	gnome2_src_prepare
+	gnome2_src_configure
 }
 
 src_install() {
@@ -67,5 +63,5 @@ src_install() {
 
 	# Prevent file collision with nautilus-3 (which installs its own copy of
 	# libnautilus-sendto.so)
-	rm -r "${ED}/usr/$(get_libdir)/nautilus/extensions-"*
+	rm -r "${ED}/usr/$(get_libdir)/nautilus/extensions-"* || die
 }