version bump from upstream

(Portage version: 2.1.1_pre3-r1)

3 files changed, 239 insertions, 0 deletions

diff --git a/gnome-extra/nautilus-sendto/files/digest-nautilus-sendto-0.7 b/gnome-extra/nautilus-sendto/files/digest-nautilus-sendto-0.7
new file mode 100644
index 000000000000..ea14bbe34abb
--- /dev/null
+++ b/gnome-extra/nautilus-sendto/files/digest-nautilus-sendto-0.7
@@ -0,0 +1,3 @@
+MD5 c6988b7b10cf2350ed4db03c57136928 nautilus-sendto-0.7.tar.bz2 300584
+RMD160 5cc01b9ecb2d4ff38aee1fdeeb589695b1398128 nautilus-sendto-0.7.tar.bz2 300584
+SHA256 b182003855b2cf4e1f07b6291bfa1aec0639b3808dec32ae27a1301be0d80a1c nautilus-sendto-0.7.tar.bz2 300584
diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.7-configure-options.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.7-configure-options.patch
new file mode 100644
index 000000000000..405baaaf0e12
--- /dev/null
+++ b/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.7-configure-options.patch
@@ -0,0 +1,211 @@
+--- configure.in.orig	2006-07-04 14:08:48.000000000 -0500
++++ configure.in	2006-07-04 14:46:41.000000000 -0500
+@@ -6,7 +6,7 @@
+ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+ 
+ AM_MAINTAINER_MODE
+-                                                                                
++
+ AM_DISABLE_STATIC
+ AC_PROG_CC
+ AM_PROG_LIBTOOL
+@@ -54,120 +54,116 @@
+ AC_SUBST(NAUTILUS_SENDTO_CFLAGS)
+ AC_SUBST(NAUTILUS_SENDTO_LIBS)
+ 
+-dnl Libebook support
++dnl Evolution (libebook) support
+ dnl ---------------------------------
++AC_ARG_ENABLE([evolution],
++              AC_HELP_STRING([--enable-evolution], [enable support for evolution]),,
++              [enable_evolution=no])
++
++if test x$enable_evolution = xyes ; then
++   PKG_CHECK_MODULES(NST_EBOOK, [libebook-1.2 >= $EBOOK_REQUIRED])
+ 
+-PKG_CHECK_MODULES(NST_EBOOK, libebook-1.2 >= $EBOOK_REQUIRED,
+-	[
+-	AC_SUBST(NST_EBOOK_CFLAGS)
+-	AC_SUBST(NST_EBOOK_LIBS)
+-	echo "Using libebook-1.2 !"
+-	enable_evolution=yes
+-	],
+-	[
+-        echo "Building without evolution"
+-	enable_evolution=no
+-	]
+-)
++   AC_SUBST(NST_EBOOK_CFLAGS)
++   AC_SUBST(NST_EBOOK_LIBS)
++fi
+ 
+ AM_CONDITIONAL(HAVE_EVOLUTION, test "x$enable_evolution" = "xyes")
+ 
+-dnl Gaim support if it's installed
++dnl Gaim support
+ dnl ---------------------------------
+ 
++AC_ARG_ENABLE([gaim],
++              AC_HELP_STRING([--enable-gaim], [enable support for gaim]),,
++              [enable_gaim=no])
++
++if test x$enable_gaim = xyes ; then
++   PKG_CHECK_MODULES(GAIM, [gaim >= $GAIM_REQUIRED])
++
++   AC_SUBST(GAIM_CFLAGS)
++   AC_SUBST(GAIM_LIBS)
++
++   GAIM_LIBDIR=`pkg-config --variable=libdir gaim`
++   GAIM_DATADIR=`pkg-config --variable=datadir gaim`
+ 
+-PKG_CHECK_MODULES(GAIM, gaim >= $GAIM_REQUIRED,
+-	[
+-	AC_SUBST(GAIM_CFLAGS)
+-	AC_SUBST(GAIM_LIBS)
+-	GAIM_LIBDIR=`pkg-config --variable=libdir gaim`
+-	GAIM_DATADIR=`pkg-config --variable=datadir gaim`
+-	AC_SUBST(GAIM_LIBDIR)
+-	AC_SUBST(GAIM_DATADIR)
+-	enable_gaim=yes
+-	],
+-	[
+-	echo "Building without gaim"
+-	enable_gaim=no
+-	]
+-)
++   AC_SUBST(GAIM_LIBDIR)
++   AC_SUBST(GAIM_DATADIR)
++fi
+ 
+ AM_CONDITIONAL(HAVE_GAIM, test "x$enable_gaim" = "xyes")
+ 
+-dnl Bluetooth support if it's installed
++dnl Bluetooth support
+ dnl -----------------------------------
+ 
+-PKG_CHECK_MODULES(BLUETOOTH, gnome-bluetooth >= $BLUETOOTH_REQUIRED,
+-	[
+-	AC_SUBST(BLUETOOTH_CFLAGS)
+-	AC_SUBST(BLUETOOTH_LIBS)
+-	enable_bluetooth=yes
+-	],
+-	[
+-	echo "Building without Bluetooth"
+-	enable_bluetooth=no
+-	]
+-)
++AC_ARG_ENABLE([bluetooth],
++              AC_HELP_STRING([--enable-bluetooth],[enable support for bluetooth]),,
++              [enable_bluetooth=no])
+ 
+-AM_CONDITIONAL(HAVE_BLUETOOTH, test "x$enable_bluetooth" = "xyes")
++if test x$enable_bluetooth = xyes ; then
++   PKG_CHECK_MODULES(BLUETOOTH, [gnome-bluetooth >= $BLUETOOTH_REQUIRED])
+ 
+-dnl --------------------------------------------------
++   AC_SUBST(BLUETOOTH_CFLAGS)
++   AC_SUBST(BLUETOOTH_LIBS)
++fi
++
++AM_CONDITIONAL(HAVE_BLUETOOTH, test "x$enable_bluetooth" = "xyes")
+ 
+ dnl Balsa support
+ dnl -------------------------------------------------
+ 
+-enable_balsa=no
+-AM_CONDITIONAL(HAVE_BALSA, test "x$enable_balsa" = "xyes")
+-dnl -------------------------------------------------
++AC_ARG_ENABLE([balsa],
++              AC_HELP_STRING([--enable-balsa],[enable support for balsa]),,
++              [enable_balsa=no])
+ 
++AM_CONDITIONAL(HAVE_BALSA, test "x$enable_balsa" = "xyes")
+ 
+ dnl Sylpheed support
+ dnl -------------------------------------------------
+ 
+-enable_sylpheed=yes
+-AM_CONDITIONAL(HAVE_SYLPHEED, test "x$enable_sylpheed" = "xyes")
+-dnl -------------------------------------------------
++AC_ARG_ENABLE([sylpheed],
++              AC_HELP_STRING([--enable-sylpheed],[enable support for sylpheed]),,
++              [enable_sylpheed=no])
+ 
++AM_CONDITIONAL(HAVE_SYLPHEED, test "x$enable_sylpheed" = "xyes")
+ 
+ dnl Thunderbird support
+ dnl -------------------------------------------------
+ 
+-enable_thunderbird=no
++AC_ARG_ENABLE([thunderbird],
++              AC_HELP_STRING([--enable-thunderbird],[enable support for thunderbird]),,
++              [enable_thunderbird=no])
++
+ AM_CONDITIONAL(HAVE_THUNDERBIRD, test "x$enable_thunderbird" = "xyes")
+-dnl -------------------------------------------------
+ 
+ dnl Gajim support
+ dnl -------------------------------------------------
+ 
+-AC_ARG_WITH(gajim,
+-        [AS_HELP_STRING(--with-gajim,[Path to Gajim install prefix])],
+-        [GAJIM_PATH="$withval"],[GAJIM_PATH="$prefix"])
++AC_ARG_WITH([gajim],
++            AS_HELP_STRING(--with-gajim,[Path to Gajim install prefix]),
++            [GAJIM_PATH="$withval"],
++            [GAJIM_PATH="$prefix"])
+ 
+ GAJIM_SHARE_DIR="$GAJIM_PATH"/share/gajim
+ 
+-PKG_CHECK_MODULES(DBUS, dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED,
+-        [
+-        AC_SUBST(DBUS_CFLAGS)
+-        AC_SUBST(DBUS_LIBS)
+-	if test -f "$GAJIM_SHARE_DIR"/data/pixmaps/gajim.png ;
+-	then
+-		enable_gajim=yes
+-		AC_DEFINE_UNQUOTED(GAJIM_SHARE_DIR, "$GAJIM_SHARE_DIR", [path to gajim share dir])
+-	else
+-		echo "Building without Gajim support"
+-		enable_gajim=no
+-	fi
+-        ],
+-        [
+-        echo "Building without Gajim support"
+-        enable_gajim=no
+-        ]
+-)
++AC_ARG_ENABLE([gajim],
++              AC_HELP_STRING([--enable-gajim],[enable support for gajim]),,
++              [enable_gajim=no])
++
++if test x$enable_gajim = xyes ; then
++   if test -f "$GAJIM_SHARE_DIR"/data/pixmaps/gajim.png ; then
++      enable_gajim=yes
++      AC_DEFINE_UNQUOTED(GAJIM_SHARE_DIR, "$GAJIM_SHARE_DIR", [path to gajim share dir])
++
++      PKG_CHECK_MODULES(DBUS, [dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED])
++
++      AC_SUBST(DBUS_CFLAGS)
++      AC_SUBST(DBUS_LIBS)
++   else
++      enable_gajim=no
++   fi
++fi
+ 
+ AM_CONDITIONAL(HAVE_GAJIM, test "x$enable_gajim" = "xyes")
+ 
+-dnl -------------------------------------------------
+-
+ 
+ GNOME_COMPILE_WARNINGS
+ 
+@@ -178,7 +174,7 @@
+ GETTEXT_PACKAGE=nautilus-sendto
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [GetText Package])
+-                                                                               
++
+ AM_GLIB_GNU_GETTEXT
+ AC_PROG_INTLTOOL
+ 
diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.7-gaim-2.0-plugin.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.7-gaim-2.0-plugin.patch
new file mode 100644
index 000000000000..17a4efc41574
--- /dev/null
+++ b/gnome-extra/nautilus-sendto/files/nautilus-sendto-0.7-gaim-2.0-plugin.patch
@@ -0,0 +1,25 @@
+--- gaim_plugin/nautilus-sendto-plugin.c.orig	2006-07-04 14:37:15.000000000 -0500
++++ gaim_plugin/nautilus-sendto-plugin.c	2006-07-04 14:37:51.000000000 -0500
+@@ -37,7 +37,7 @@
+ #include <unistd.h>
+ #include <dirent.h>
+ 
+-#include "internal.h"
++#include "plugin.h"
+ #include "conversation.h"
+ #include "core.h"
+ #include "debug.h"
+@@ -300,10 +300,10 @@
+     GAIM_PRIORITY_DEFAULT,		/* priority */
+     
+     "gtk-nautilus",					/* id */
+-    N_("Nautilus Integration"),				/* name */
++    "Nautilus Integration",				/* name */
+     "0.2",						/* version */
+-    N_("Provides integration with Nautilus"),		/* summary */ 
+-    N_("Provides integration with Nautilus"),		/* description */
++    "Provides integration with Nautilus",		/* summary */ 
++    "Provides integration with Nautilus",		/* description */
+     
+     "Roberto Majadas <roberto@hispalinux.es>",	/* author */
+     "www.gnome.org",                    /* homepage */