Bump to 1.1.5 new features and bugfixes:

new plugins: removable-drives,
nautilus-burn bugfixes: Mail plugin is now truly mail plugin.
Drop ~ppc (1.1.2 + 1.1.5) -- deptree broken due to gupnp-av.
Add new IUSE to metadata.xml
(Portage version: 2.2_rc33/cvs/Linux i686)

5 files changed, 118 insertions, 3 deletions

diff --git a/gnome-extra/nautilus-sendto/ChangeLog b/gnome-extra/nautilus-sendto/ChangeLog
index 2569b8e5d385..ccb16ccd99ea 100644
--- a/gnome-extra/nautilus-sendto/ChangeLog
+++ b/gnome-extra/nautilus-sendto/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-extra/nautilus-sendto
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/ChangeLog,v 1.26 2009/04/27 00:46:59 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/ChangeLog,v 1.27 2009/05/11 11:12:48 nirbheek Exp $
+
+*nautilus-sendto-1.1.5 (11 May 2009)
+
+  11 May 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  nautilus-sendto-1.1.2.ebuild, +nautilus-sendto-1.1.5.ebuild,
+  +files/nautilus-sendto-1.1.5-pidgin-plugin-versioning.patch, metadata.xml:
+  Bump to 1.1.5 new features and bugfixes: new plugins: removable-drives,
+  nautilus-burn bugfixes: Mail plugin is now truly mail plugin Drop ~ppc
+  (1.1.2 + 1.1.5) -- deptree broken due to gupnp-av. Add new IUSE to
+  metadata.xml
 
   27 Apr 2009; Brent Baude <ranger@gentoo.org> nautilus-sendto-1.1.2.ebuild:
   Marking nautilus-sendto-1.1.2 ~ppc for bug 262123
diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-1.1.5-pidgin-plugin-versioning.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-1.1.5-pidgin-plugin-versioning.patch
new file mode 100644
index 000000000000..0b35e1aa0431
--- /dev/null
+++ b/gnome-extra/nautilus-sendto/files/nautilus-sendto-1.1.5-pidgin-plugin-versioning.patch
@@ -0,0 +1,23 @@
+diff -Naur nautilus-sendto-1.1.4/pidgin_plugin/Makefile.am nautilus-sendto-1.1.4.new/pidgin_plugin/Makefile.am
+--- nautilus-sendto-1.1.4/pidgin_plugin/Makefile.am	2009-04-17 19:42:47.000000000 +0530
++++ nautilus-sendto-1.1.4.new/pidgin_plugin/Makefile.am	2009-04-18 20:08:18.504012965 +0530
+@@ -6,6 +6,7 @@
+ nautilus_la_LDFLAGS = -module -avoid-version -no-undefined
+ 
+ AM_CPPFLAGS = 					\
++	-DVERSION=\"$(VERSION)\"		\
+ 	-DLIBDIR=\"$(PIDGIN_LIBDIR)/pidgin/\" 	\
+ 	-DDATADIR=\"$(PIDGIN_DATADIR)\" 	\
+ 	$(NAUTILUS_SENDTO_CFLAGS)		\
+diff -Naur nautilus-sendto-1.1.4/pidgin_plugin/nautilus-sendto-plugin.c nautilus-sendto-1.1.4.new/pidgin_plugin/nautilus-sendto-plugin.c
+--- nautilus-sendto-1.1.4/pidgin_plugin/nautilus-sendto-plugin.c	2009-04-17 19:42:47.000000000 +0530
++++ nautilus-sendto-1.1.4.new/pidgin_plugin/nautilus-sendto-plugin.c	2009-04-18 20:08:33.827013571 +0530
+@@ -338,7 +338,7 @@
+ 
+ 	"gtk-nautilus",			/* id */
+ 	N_("Nautilus Integration"),		/* name */
+-	"0.8",				/* version */
++	VERSION,				/* version */
+ 	N_("Provides integration with Nautilus"),		/* summary */ 
+ 	N_("Provides integration with Nautilus"),		/* description */
+ 
diff --git a/gnome-extra/nautilus-sendto/metadata.xml b/gnome-extra/nautilus-sendto/metadata.xml
index afa95d72b414..9b8b1717a591 100644
--- a/gnome-extra/nautilus-sendto/metadata.xml
+++ b/gnome-extra/nautilus-sendto/metadata.xml
@@ -8,7 +8,10 @@
 		<flag name='claws'>Enables support for <pkg>mail-client/claws</pkg></flag>
 		<flag name='eds'>Enables support for evolution-sendto using
 			<pkg>gnome-extra/evolution-data-server</pkg></flag>
+		<flag name='empathy'>Enables support for <pkg>net-im/empathy</pkg></flag>
 		<flag name='gajim'>Enables support for <pkg>net-im/gajim</pkg></flag>
+		<flag name='mail'>Enables support for mailto using
+			<pkg>gnome-extra/evolution-data-server</pkg></flag>
 		<flag name='pidgin'>Enables support for <pkg>net-im/pidgin</pkg></flag>
 		<flag name='sylpheed'>Enables support for
 			<pkg>mail-client/sylpheed</pkg></flag>
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-1.1.2.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-1.1.2.ebuild
index 1679985d3c89..70f42391e28b 100644
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-1.1.2.ebuild
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-1.1.2.ebuild,v 1.3 2009/04/27 00:46:59 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-1.1.2.ebuild,v 1.4 2009/05/11 11:12:48 nirbheek Exp $
 
 inherit gnome2 eutils autotools
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="balsa bluetooth claws eds gajim pidgin sylpheed thunderbird upnp"
 
 RDEPEND=">=x11-libs/gtk+-2.4
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-1.1.5.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-1.1.5.ebuild
new file mode 100644
index 000000000000..5489d6e9e03a
--- /dev/null
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-1.1.5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-1.1.5.ebuild,v 1.1 2009/05/11 11:12:48 nirbheek Exp $
+
+EAPI="2"
+
+inherit gnome2 eutils autotools
+
+DESCRIPTION="A nautilus extension for sending files to locations"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth +mail empathy gajim cdr pidgin upnp"
+
+RDEPEND=">=x11-libs/gtk+-2.12
+	>=dev-libs/glib-2.6
+	>=gnome-base/libglade-2.5.1
+	>=gnome-base/nautilus-2.14
+	>=gnome-base/gconf-2.13.0
+	bluetooth? (
+		|| ( >=net-wireless/gnome-bluetooth-2.27
+			 >=net-wireless/bluez-gnome-1.8 )
+		>=dev-libs/dbus-glib-0.60 )
+	cdr? (
+		|| ( >=app-cdr/brasero-2.26.0[nautilus]
+			 >=gnome-extra/nautilus-cd-burner-2.24.0 ) )
+	mail? ( >=gnome-extra/evolution-data-server-1.5.3 )
+	empathy? ( >=net-im/empathy-2.25.5 )
+	gajim? ( net-im/gajim
+			 >=dev-libs/dbus-glib-0.60 )
+	pidgin? ( >=net-im/pidgin-2.0.0 )
+	upnp? ( >=net-libs/gupnp-av-0.2.1 )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=gnome-base/gnome-common-0.12
+	>=dev-util/pkgconfig-0.19
+	>=dev-util/intltool-0.35"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+_use_plugin() {
+	if use ${1}; then
+		G2CONF="${G2CONF}${2:-"${1}"},"
+	fi
+}
+
+pkg_setup() {
+	G2CONF="${G2CONF} --with-plugins=removable-devices,"
+	_use_plugin bluetooth
+	_use_plugin cdr nautilus-burn
+	_use_plugin mail evolution
+	_use_plugin empathy
+	_use_plugin pidgin
+	_use_plugin gajim
+	_use_plugin upnp
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix plugin versioning for pidgin plugin
+	epatch "${FILESDIR}"/${P}-pidgin-plugin-versioning.patch
+	eautoreconf
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! use mail; then
+		ewarn "You have disabled mail support, this will remove support for all mail clients"
+	fi
+
+	if use pidgin; then
+		elog "To enable SendTo support in pidgin, you must enable the plugin in pidgin"
+		elog "Check Tools -> Preferences -> Plugins in the pidgin menu."
+	fi
+}