Version bump. Drop old revision. Fix USE=doc issues, bug #356071.

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

4 files changed, 47 insertions, 34 deletions

diff --git a/gnome-extra/nautilus-sendto/ChangeLog b/gnome-extra/nautilus-sendto/ChangeLog
index ada44341fc17..20a6377e5998 100644
--- a/gnome-extra/nautilus-sendto/ChangeLog
+++ b/gnome-extra/nautilus-sendto/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/nautilus-sendto
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/ChangeLog,v 1.66 2013/01/06 09:40:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/ChangeLog,v 1.67 2013/01/13 15:53:49 eva Exp $
+
+*nautilus-sendto-3.6.1 (13 Jan 2013)
+
+  13 Jan 2013; Gilles Dartiguelongue <eva@gentoo.org>
+  nautilus-sendto-2.32.0.ebuild, -nautilus-sendto-3.0.3.ebuild,
+  +nautilus-sendto-3.6.1.ebuild:
+  Version bump. Drop old revision. Fix USE=doc issues, bug #356071.
 
   06 Jan 2013; Agostino Sarubbo <ago@gentoo.org> nautilus-sendto-3.6.0.ebuild:
   Add ~sparc, wrt bug #449220
diff --git a/gnome-extra/nautilus-sendto/Manifest b/gnome-extra/nautilus-sendto/Manifest
index 4ce58d73c18f..60d4cca8facb 100644
--- a/gnome-extra/nautilus-sendto/Manifest
+++ b/gnome-extra/nautilus-sendto/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX nautilus-sendto-2.28.4-gseal-enable.patch 1345 SHA256 2e42e5ecf35cfdf348dfa2d77b94400e92dc8c0eb8150788c657f1fc1dc68126 SHA512 662f8407882c83ed0c025b2c5b9b16f399e25409b2868e8af3c2904f03e34c254bc6c7f01250db1e601891e9216b7f8f930de5fefbfa7e317e70ff2a6e8a049f WHIRLPOOL 5e152650367da10159cdff16a60aa8a6ef411aa473b63edeeb9d7d11b56560950d62fde259b2916b9654160b8f2502e69dcc23d64f5c1f7156066b316d2e85c6
 AUX nautilus-sendto-2.28.4-item-focus.patch 1009 SHA256 e145e6a2992090ee1cbedd850121b7a921c8025eadca697a80db0504831adb18 SHA512 bc6621e2d8050faca8e6db061582f1ded3bef8436fb4f4b656cce81ff2d09a2b1d84029760ffc38e6857609f4244c36b75f67d107f183c94d5b662ce024b2d78 WHIRLPOOL 6701409520a5b4bcc1f6688304222a188725cb030f699413281975fbf3581531385133e2c9ca890414478a57587c361b32c595e8fabf26153a1553f6b456e7e8
 AUX nautilus-sendto-2.28.4-remove-empathy.patch 10102 SHA256 74b3680e93bea6a2f5bdd1acc3ee625f88b15efcd00b9c8f3464f005c90a999d SHA512 d241bc3a2e76d3f0cde973604a8677575961deab9524f79cc6a981a2f9e0c0140b90087f6b363dc9e49f8f25361c53ee3a523483c7a2fb4805fdc061835fdafe WHIRLPOOL 5598f2b0f81f755581c07032713ce3147dcc39d60ae71b7e8a4d10757ec491e17611b94bce05dd05343f21bf5e2295b9abe5fc1cd150dcc0376c63f2f373dd8e
@@ -10,10 +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.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.3.ebuild 1815 SHA256 50c0030a14affa27910a7d3a9c9712e98fb09fc9aee1cf05937dc3afce9cf7b3 SHA512 e9b5666047e2c6ac02db6edb37ff6e2786f00f95a2263efcde0fcc580fcffd6a650ee0929156854dc2da8246f024d064e801ee6084d38fe548c2ac7fd3501540 WHIRLPOOL 9469ff4f7d4576944b098b5419b4e45993606a478870224488fd477728afdf5f961c00fd2c2258eb823cd11933f55d50231f030677ce79710d0b73eda41ac00e
+DIST nautilus-sendto-3.6.1.tar.xz 384848 SHA256 7f48489759739ac187265034bbf046fcfa3e03b3527b168ebc8718232469abdb SHA512 8ee117a5ccc5bd07b48410a121ee00358cec587e1290b23a24dcf13f78e845d8ee97799a811c829d34aea99dcd5e0991f7aa20d12e421d0a8015b0ba92cb8609 WHIRLPOOL c2fea1c693aff878a8cde14d20c9ba99ede24bdf7d45025cfbec717e5662ea5b6d671b04f967a6ad4bab08feb073feef03e4904048580e3ce35e33ac19f916f6
+EBUILD nautilus-sendto-2.32.0.ebuild 1437 SHA256 b99c065a4c145503a8c2c3cc52b7a0f98692a78804fb3b53ec796d1b9cd49112 SHA512 7655a3767d4d8e88ec4eedb8d27b4f8fbd3bf3600d324e3f039cd35f5914aa399d8117a90148eca811063de51df278061abeb9c1269a20158beca7de2bb18352 WHIRLPOOL 4aa579dc11ae3b6aa3ba6984196e09830f794af8df02589f2c5d1df349b4a62fca5d919bfcf1ebc0b2503b9fbe2cda1e914d1651d1d9786d7d6cdaa657730ede
 EBUILD nautilus-sendto-3.6.0.ebuild 1670 SHA256 18c356744e7c97b7981dc0546baa09b8fd579da860ded8bf9e49c5add5cea36f SHA512 7af90d8958bbcbb3bca0e5652e11eb13a541641ae7f3e45dd25819b9610965224bd6afc5f359ac1f3fa3f48b3ddce7f7b700e178719e2619dcb5805ff8215e04 WHIRLPOOL 25f65adb3905d689bb4419b8d9b69fdf2c71ef3bdfeeb849cd6b57f71d0b4e663c9adbad1605ede2c02d327b9c41b9c076a578ef08c78f1e25e6d123a5dadaeb
-MISC ChangeLog 13542 SHA256 48ca81f23467a8dd804521657bcbf2967da357875ba917edd6cdbfe88e7b1bd1 SHA512 14032a8e107bd0884d5f11d82609dfa32904fed42db1d7196f1e28a3e2f00b284e099e4e7ce004c805bf91e06429b460122ccf377bdb44d2897e01c592f5e9ed WHIRLPOOL b68bbd0c08b9f49df225edd79d848fdf07616cf5b68f91f48ba800ddc08fe259679f0594ba60ea488d1396fd8ff04fa6c23ab41da0f3b34ee8487813a0e34872
+EBUILD nautilus-sendto-3.6.1.ebuild 1636 SHA256 6e415cc18775ecd0b2540f76a17b3ff129bfd62a0c0abba9a697e534e905c983 SHA512 08dc6909dfc8411e5c9ebbab6342e4a3196630bae3aa3d317d50195bb98f9ef73c541be5ad7399a7dfb054de584b3b1f1fd1dca4a7344d45d26c4b3d376a3197 WHIRLPOOL 6f181dadb8c13b61d433e98234be567fe7727b6cb6d7c192ea2ef8001378fddf5572d30c2f02ed0e7d4e614152a98944802f1d3513a2fb03aec0bd3a5a4780c4
+MISC ChangeLog 13800 SHA256 64d83d445d7be04b8c6aef6aac31d50b69b9600de22a6ae41064805ea013fb31 SHA512 85fc166ea4f609e5cd97d58aad47e56e0597ddc9393d2f3c758b6de643bc4f902f0c625e81a4a85c621ef2cd153d5a73faaaba3f53e2db1ead5a039a55027fbe WHIRLPOOL 1d8bb9eb70cf8fd8a85bac1b285b47d0ac6388038603f3d8ebe00a35f361e6a50791cb4b4c116449219d6355787e2ada230cc0bd1884584f7a896f9fc3c36a9e
 MISC metadata.xml 429 SHA256 d6ca2ca2610c15e8bcbd18c720ae8ecc99d5fa3408c9490f0cd78ae7edcfdc50 SHA512 9ebf3bb8297509dd76eb7665a8b7b77cc6d2a76ec1c0bf19606b03385527b4f6674a84b95e0633ae193ed5aa404e435468bced75a9e1dea51caed8ac7a29bdcf WHIRLPOOL d4fc1556fa18af058d9fa6759f5529e466922958818cf3759375823b384462ac6bd7facc34aec62e2ff797db63fb4bea0f491483d3e9149923093c75cd6ccac3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlDy2I4ACgkQ1fmVwcYIWAamkwCfcUPQY5AEYdj+rDIqkUl+wnOa
+cb8AoLG/ueJ9dwH1QWtArGqhZcZZqw+L
+=Ha8k
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-2.32.0.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-2.32.0.ebuild
index 0999ce72a184..b05019753a7a 100644
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-2.32.0.ebuild
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-2.32.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-2.32.0.ebuild,v 1.7 2012/12/15 18:52:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-2.32.0.ebuild,v 1.8 2013/01/13 15:53:49 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnome.org"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE="cdr doc gajim +mail pidgin upnp-av"
+IUSE="cdr gajim +mail pidgin upnp-av"
 
 RDEPEND=">=x11-libs/gtk+-2.18:2
 	>=dev-libs/glib-2.25.9:2
@@ -28,13 +28,13 @@ RDEPEND=">=x11-libs/gtk+-2.18:2
 		>=dev-libs/dbus-glib-0.60 )
 	upnp-av? ( >=net-libs/gupnp-0.13.0 )"
 DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35
 	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
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-3.0.3.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-3.6.1.ebuild
index 3d429ee37ed7..c0d7ad9c5a7c 100644
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-3.0.3.ebuild
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-3.6.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.3.ebuild,v 1.4 2012/12/15 18:52:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-3.6.1.ebuild,v 1.1 2013/01/13 15:53:49 eva Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
@@ -11,33 +11,35 @@ 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 ~ppc ~ppc64 ~x86"
-IUSE="cdr doc gajim +mail pidgin upnp-av"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cdr gajim +mail pidgin upnp-av"
 
-COMMON_DEPEND=">=x11-libs/gtk+-2.90.3:3[X(+)]
+COMMON_DEPEND="
 	>=dev-libs/glib-2.25.9:2
-	cdr? ( >=app-cdr/brasero-2.26.0[nautilus] )
+	>=x11-libs/gtk+-2.90.3:3[X(+)]
+	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}
-	>=gnome-base/nautilus-2.91.1
+	>=dev-util/gtk-doc-am-1.9
 	>=dev-util/intltool-0.35
+	>=gnome-base/nautilus-2.91.1
 	sys-devel/gettext
 	virtual/pkgconfig
-	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,8 +47,7 @@ _use_plugin() {
 	fi
 }
 
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
+src_configure() {
 	G2CONF="${G2CONF}
 		--with-plugins=removable-devices,"
 	_use_plugin cdr nautilus-burn
@@ -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
 }