Version bump. Pidgin plugin now uses dbus interface. Bug fixes. Clean up old revisions.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

5 files changed, 43 insertions, 186 deletions

diff --git a/gnome-extra/nautilus-sendto/ChangeLog b/gnome-extra/nautilus-sendto/ChangeLog
index a4458f4b1700..2c238d426984 100644
--- a/gnome-extra/nautilus-sendto/ChangeLog
+++ b/gnome-extra/nautilus-sendto/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/nautilus-sendto
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/ChangeLog,v 1.31 2010/01/05 04:43:52 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/ChangeLog,v 1.32 2010/01/11 22:35:31 eva Exp $
+
+*nautilus-sendto-2.28.2 (11 Jan 2010)
+
+  11 Jan 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -nautilus-sendto-0.14.0.ebuild, -nautilus-sendto-1.1.5.ebuild,
+  -nautilus-sendto-1.1.5-r1.ebuild, +nautilus-sendto-2.28.2.ebuild:
+  Version bump. Pidgin plugin now uses dbus interface. Bug fixes. Clean up
+  old revisions.
 
   05 Jan 2010; Joseph Jezak <josejx@gentoo.org>
   nautilus-sendto-1.1.5-r1.ebuild, nautilus-sendto-2.28.0.ebuild:
diff --git a/gnome-extra/nautilus-sendto/Manifest b/gnome-extra/nautilus-sendto/Manifest
index 426f5b442fff..933bb23e9537 100644
--- a/gnome-extra/nautilus-sendto/Manifest
+++ b/gnome-extra/nautilus-sendto/Manifest
@@ -5,19 +5,16 @@ 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-1.1.5-long-description.patch 3834 RMD160 0ea619b7907fc808a291cd1e6662ba14fb3d42e3 SHA1 e82cb4ded69edf7aaa1434d95519e5ea383ae3fd SHA256 f2f0f2757de3d9565cb9de55f580b0e45e3c0c2f2d1e44633f289de0c4c80a07
 AUX nautilus-sendto-1.1.5-pidgin-plugin-versioning.patch 1147 RMD160 91326f8a21590f62d23d3f4561685e360ec4ccfc SHA1 33970503e31864a80b99da74694a2ef67db3e7fa SHA256 89016515e82a8b846333348c0fe0c7c8308ed5ab24e8a9eaa6e35de1f6a6ada4
-DIST nautilus-sendto-0.14.0.tar.bz2 363916 RMD160 108a410da43e52e76a39f9c832dd3f4ddb047f2e SHA1 ab99beb1c56095b4c7f44d60ef215e2b3c0a1ee7 SHA256 ed29ecd1f3e4e61758fea85f66b4a28ba2a053c1862fb43c28ef48d58edbc55e
-DIST nautilus-sendto-1.1.5.tar.bz2 365803 RMD160 0ee1fb96e4a23e5c46ef42634ecb6197822787c8 SHA1 95ba98dde620c78458aa64abc9d294a7ac98a089 SHA256 0beae480795f46c3b42817b12018348cd6c93949dd5a103ddf9fc26153c3a597
 DIST nautilus-sendto-2.28.0.tar.bz2 401389 RMD160 f26925454bf53f5638395f8db6568c6ec6b90ac9 SHA1 9c102c3d8d9b6f9ee76cebf49d479937e6efbc78 SHA256 3f15fbe5c1cfc5bcadc39d47048ddae0dd0581a7494f365c5e531a2f3e77193c
-EBUILD nautilus-sendto-0.14.0.ebuild 1889 RMD160 07523a8bffd61dbf6b2a899a8ed066f367b0f810 SHA1 592ee8dc55c9cf20651906a3166971c7e125f1a9 SHA256 f00f89ca1ec8bb40c75ca20af7209486fa6beb613a5263cd09fdeb1d023df88e
-EBUILD nautilus-sendto-1.1.5-r1.ebuild 2188 RMD160 ffb1f87bad53a9d11afb2605d9b18d7b527488cc SHA1 a1f8ccdf03070d0b1a00f77082e64dcc4ca80789 SHA256 4d8bfc79b760d71ee392dd93fef4e4a0ac2c230a74fb76860c0353a22aa82704
-EBUILD nautilus-sendto-1.1.5.ebuild 2014 RMD160 19891d02bcd23c357d9c3e54d64f3e56d6844218 SHA1 79c7c8b792c1cfbc9bbb500143d41f4d41f6116e SHA256 83d950a82c8957f806b8ca1df0240d7af1cb3549abcf79a38e921ac8d7e3f76b
+DIST nautilus-sendto-2.28.2.tar.bz2 423429 RMD160 1b78f89d85f30bc3542aa960abd732f57150c6c0 SHA1 9ca70f8e8bcfcff68e40fceae3e3a2c3aab71369 SHA256 0fa992b9a4489b712465e82eb182db3eaea9280397871f9d95849c25d1c33893
 EBUILD nautilus-sendto-2.28.0.ebuild 2222 RMD160 a597b4c90c131d648f88f17e70c9ebe077f96b81 SHA1 028087b522c0f4ea00b3ce4a7c20558e5d5a0125 SHA256 24950be2a7da149faa46cb8c331092d2dc109bed434d051341f7c9bc06cfec66
-MISC ChangeLog 6326 RMD160 0a41dc24bcbecbab61ba8e7afeb1983e2e576064 SHA1 2014bfdf24d9983787a1f747d788faf6d5eeb3bc SHA256 354e5cd5f8f36c4d30e0bdbb4455e6c42f151ea9ddfe8e003798863c3a36405e
+EBUILD nautilus-sendto-2.28.2.ebuild 2162 RMD160 16c7e1e09f97cf3eb3ab51873134974ff141503a SHA1 c405791e5f78ca3b3bfd88f0c749f0841e32f989 SHA256 6132de7105d85ea314d2bc1a7011ec2643f60239f7307d7553c3094902b7bea0
+MISC ChangeLog 6642 RMD160 ffeef22fafde648bcdfc05bc272fc607a2883101 SHA1 bc527b4b84e829ead90fcb77690194b4f0fd046e SHA256 05aebb9c005653f0e3d0277f34e5fbee40127c2bebb59c3daa1a6bfc9cc3826c
 MISC metadata.xml 917 RMD160 076f338e5d1e1764840d4f988d16a7f6e316b07b SHA1 487af15e4bed942f4016af97334a66d39696eee7 SHA256 39f6c165fc219182be266c74dbd86c29dea8c803bb3bd9534014067732c10425
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAktCwycACgkQcsIHjyDViGR4vgCg1g8B3mnliWD+tk+zsu2BRIkI
-VDMAoK2qJmjyqlx1nAQugWUqR8Y9IHQ3
-=9o4H
+iEYEARECAAYFAktLp7kACgkQ1fmVwcYIWAbXogCg3u2vA0JctqEc0wetwMjbkisV
+FH0AoKx5GGSMZkrYbPmD+yq+z1LhPtfI
+=bVDQ
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-0.14.0.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-0.14.0.ebuild
deleted file mode 100644
index 2e3d0bf88cf1..000000000000
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-0.14.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-0.14.0.ebuild,v 1.1 2008/03/29 20:46:08 compnerd Exp $
-
-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 ~ppc ~sparc ~x86"
-IUSE="bluetooth eds gajim pidgin sylpheed thunderbird"
-
-RDEPEND=">=x11-libs/gtk+-2.4
-		 >=dev-libs/glib-2.6
-		 >=gnome-base/libglade-2.5.1
-		 >=gnome-base/nautilus-2.14
-		 >=gnome-base/gconf-2.13.0
-		 >=dev-libs/dbus-glib-0.71
-		 bluetooth? ( >=net-wireless/gnome-bluetooth-0.6 )
-		 eds? ( >=gnome-extra/evolution-data-server-1.5.3 )
-		 gajim? ( net-im/gajim )
-		 pidgin? ( >=net-im/pidgin-2.0.0 )
-		 sylpheed?  (
-						|| (
-								mail-client/sylpheed
-								mail-client/claws-mail
-							)
-					)
-		 thunderbird? ( mail-client/mozilla-thunderbird )"
-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"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-gaim
-		$(use_enable bluetooth)
-		$(use_enable eds evolution)
-		$(use_enable pidgin)
-		$(use_enable gajim)
-		$(use_enable sylpheed)
-		$(use_enable thunderbird)"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Convert autodetection into hard options
-	epatch "${FILESDIR}"/${PN}-0.14-configure-options.patch
-
-	# Fix plugin versioning for pidgin plugin
-	epatch "${FILESDIR}"/${PN}-0.12-pidgin-plugin-versioning.patch
-
-	eautoreconf
-	intltoolize --force || die "intltoolize force"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	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
-}
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-1.1.5.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-1.1.5.ebuild
deleted file mode 100644
index 5489d6e9e03a..000000000000
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-1.1.5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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
-}
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-1.1.5-r1.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-2.28.2.ebuild
index 250fb4cac8e6..b51ef40eea62 100644
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-1.1.5-r1.ebuild
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-2.28.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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-r1.ebuild,v 1.2 2010/01/05 04:43:52 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-2.28.2.ebuild,v 1.1 2010/01/11 22:35:31 eva Exp $
 
 EAPI="2"
 
@@ -12,11 +12,12 @@ HOMEPAGE="http://www.gnome.org"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="bluetooth +mail empathy gajim cdr pidgin upnp"
+IUSE="bluetooth doc empathy gajim cdr pidgin upnp" # +mail
 
+# FIXME: mail plugin build is broken
+#	mail? ( >=gnome-extra/evolution-data-server-1.5.3 )
 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? (
@@ -26,17 +27,22 @@ RDEPEND=">=x11-libs/gtk+-2.12
 	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 )"
+	empathy? ( >=net-im/empathy-2.27.91 )
+	gajim? (
+		net-im/gajim
+		>=dev-libs/dbus-glib-0.60 )
+	pidgin? (
+		>=net-im/pidgin-2.0.0
+		>=dev-libs/dbus-glib-0.60 )
+	upnp? ( >=net-libs/gupnp-0.13.0 )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
-	>=gnome-base/gnome-common-0.12
 	>=dev-util/pkgconfig-0.19
-	>=dev-util/intltool-0.35"
+	>=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
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
@@ -47,10 +53,11 @@ _use_plugin() {
 }
 
 pkg_setup() {
-	G2CONF="${G2CONF} --with-plugins=removable-devices,"
+	G2CONF="${G2CONF}
+		--with-plugins=removable-devices,"
 	_use_plugin bluetooth
 	_use_plugin cdr nautilus-burn
-	_use_plugin mail evolution
+#	_use_plugin mail evolution
 	_use_plugin empathy
 	_use_plugin pidgin
 	_use_plugin gajim
@@ -60,11 +67,11 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
-	# Fix plugin versioning for pidgin plugin
-	epatch "${FILESDIR}"/${P}-pidgin-plugin-versioning.patch
+	# FIXME: skip evolution, it does not build properly
+	sed 's/evolution//g' -i Makefile.{am,in} || die "sed failed"
 
-	# Fix long description for plugins, bug #271100
-	epatch "${FILESDIR}/${P}-long-description.patch"
+	# Fix plugin versioning for pidgin plugin
+	epatch "${FILESDIR}/${PN}-1.1.5-pidgin-plugin-versioning.patch"
 
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
@@ -73,12 +80,7 @@ src_prepare() {
 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
+#	if ! use mail; then
+#		ewarn "You have disabled mail support, this will remove support for all mail clients"
+#	fi
 }