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

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C6085806)

3 files changed, 33 insertions, 30 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/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
 }