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

(Portage version: 2.2_rc61/cvs/Linux x86_64)

4 files changed, 36 insertions, 176 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/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
 }