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
Package-Manager: portage-2.2_rc33/cvs/Linux i686

6 files changed, 124 insertions, 6 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/Manifest b/gnome-extra/nautilus-sendto/Manifest
index 048c4552b56d..f065de40cbbb 100644
--- a/gnome-extra/nautilus-sendto/Manifest
+++ b/gnome-extra/nautilus-sendto/Manifest
@@ -4,11 +4,14 @@ AUX nautilus-sendto-0.12-pidgin-plugin-versioning.patch 833 RMD160 0d4df889e48a0
 AUX nautilus-sendto-0.14-configure-options.patch 7201 RMD160 9f0f2957b9478525df7327b0eeae8ea17e685f9d SHA1 43eb6a818453bd0c8bb6a83e532c5c235322dc33 SHA256 5004e981d2916ed89698b8faec319b98b0b4292ef94f2e3a342fc7081bd1d192
 AUX nautilus-sendto-0.8-thunderbird-binaries.patch 850 RMD160 665c7cfa28828a923726ea403c39af908706e149 SHA1 9bcf70571c0f1a0957f8c0e5bf8eef691c2039fe SHA256 67afc9936ceec64f024ac3f735f089246c2905b0a77f17a2969c9645af7adb85
 AUX nautilus-sendto-1.1.2-pidgin-plugin-versioning.patch 1212 RMD160 66427b4299cdaa896c1ab43e63b2eb97f0637336 SHA1 8131415bfb9f6f17408dc57ce3e1cb895b3ba9c0 SHA256 1787cc2d2e82a22c23abea4c8202f78ca16c8b4e9c1421969f6e0e556751a064
+AUX nautilus-sendto-1.1.5-pidgin-plugin-versioning.patch 1147 RMD160 91326f8a21590f62d23d3f4561685e360ec4ccfc SHA1 33970503e31864a80b99da74694a2ef67db3e7fa SHA256 89016515e82a8b846333348c0fe0c7c8308ed5ab24e8a9eaa6e35de1f6a6ada4
 DIST nautilus-sendto-0.12.tar.bz2 336188 RMD160 d90730aa1af385240d62d38bbda78ffdb699fe76 SHA1 34b6241d6bcdc05507336f99d9c45d2f77f2d35b SHA256 e91af28d5473997836e85aa5eabb39e53f88fdc7cc535d2b0399afdaee1184ab
 DIST nautilus-sendto-0.14.0.tar.bz2 363916 RMD160 108a410da43e52e76a39f9c832dd3f4ddb047f2e SHA1 ab99beb1c56095b4c7f44d60ef215e2b3c0a1ee7 SHA256 ed29ecd1f3e4e61758fea85f66b4a28ba2a053c1862fb43c28ef48d58edbc55e
 DIST nautilus-sendto-1.1.2.tar.bz2 389217 RMD160 7367ef82af875eecd25e394963000c8337ce62d5 SHA1 155a382499ab9ce73352c100a32073646ea637e9 SHA256 769ddd204d48702080e69cb456972cca27c11a24fd0cf13c1e1afc0091910ce0
+DIST nautilus-sendto-1.1.5.tar.bz2 365803 RMD160 0ee1fb96e4a23e5c46ef42634ecb6197822787c8 SHA1 95ba98dde620c78458aa64abc9d294a7ac98a089 SHA256 0beae480795f46c3b42817b12018348cd6c93949dd5a103ddf9fc26153c3a597
 EBUILD nautilus-sendto-0.12-r1.ebuild 2297 RMD160 17a04355a145465cd91c996d3cc17b1711e49e1f SHA1 f224e3d520c3e3079b1c017d2681eb43cbad0b3f SHA256 ec866022adf254df419bba8bb67184d85cf3bf86716f42b5bf19b8cced1c055f
 EBUILD nautilus-sendto-0.14.0.ebuild 1889 RMD160 07523a8bffd61dbf6b2a899a8ed066f367b0f810 SHA1 592ee8dc55c9cf20651906a3166971c7e125f1a9 SHA256 f00f89ca1ec8bb40c75ca20af7209486fa6beb613a5263cd09fdeb1d023df88e
-EBUILD nautilus-sendto-1.1.2.ebuild 1961 RMD160 acfbad7e8c92b2acc9bf0698c5a688a7e01116c9 SHA1 050015e6e58b380887f3d3aabacebd12aae4a3d1 SHA256 1d6d0e67a2048307a12a7f7b3df3006e6437bcb55fd34edf91a2acd4c039f4ab
-MISC ChangeLog 4874 RMD160 95c9d36ab36ac7a2315c4e25936c17edc092bcc1 SHA1 41d1ad7627bae636c206435c9bb0b575cde01997 SHA256 480ee343a61013452bd9bb286f4959aa298337871fc99b5422650b6114dbf142
-MISC metadata.xml 890 RMD160 3d66ae293ff43c12002be335496d4eafc2fcc784 SHA1 0a22979f8e6fe88b33314cd44442bab5dd534bad SHA256 f61516b207d4b866d9b453dd210922435c5ee282859a6f54c40c2ebf0dbd3b2e
+EBUILD nautilus-sendto-1.1.2.ebuild 1958 RMD160 ef8669df8bb3bb97f749e3227d90aeb82437c7ae SHA1 f5a8af4c1a443710206eef43e043ab084aa07cdd SHA256 f64bdf7a575fa6f355fdefa7f1cb0440a24d40452008a556f3192c48b1de5485
+EBUILD nautilus-sendto-1.1.5.ebuild 2014 RMD160 19891d02bcd23c357d9c3e54d64f3e56d6844218 SHA1 79c7c8b792c1cfbc9bbb500143d41f4d41f6116e SHA256 83d950a82c8957f806b8ca1df0240d7af1cb3549abcf79a38e921ac8d7e3f76b
+MISC ChangeLog 5340 RMD160 fbaf415f8422df6756f4ee5d516dfae9c6705f8e SHA1 2764d2b26e978ccabefdca0a6cf1fda6c34e1102 SHA256 77fe4038cf0d9cb50d9d9a8770fa467b828e52ac795411dc25795691012621e2
+MISC metadata.xml 1074 RMD160 f697fc1fc51a36da5a5b6e82b18ed06645ab077e SHA1 2b754d7870d078fa1d300aaabcafb0eb85fcde8b SHA256 682969f6d9c8faa5ca1368f4b19a4c4f971e66692887a879d058d8657bd77dec
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
+}