dev-cpp/libvmime: Remove unused patch

svn path=/sunrise/; revision=5894

4 files changed, 10 insertions, 988 deletions

diff --git a/dev-cpp/libvmime/ChangeLog b/dev-cpp/libvmime/ChangeLog
index a6fb04e07..246fe3920 100644
--- a/dev-cpp/libvmime/ChangeLog
+++ b/dev-cpp/libvmime/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 Mar 2008; Markus Ullmann <jokey@gentoo.org>
+  -libvmime-0.8.1-gnutls_ssl-detection.patch, libvmime-0.8.1:
+  Remove unused patch
+
   18 Jan 2008; (Tommy[D]) tommy100@gmx.de libvmime-0.8.1.ebuild:
   Shorten DESCRIPTION
 
diff --git a/dev-cpp/libvmime/Manifest b/dev-cpp/libvmime/Manifest
index b7155cb19..d7c19b308 100644
--- a/dev-cpp/libvmime/Manifest
+++ b/dev-cpp/libvmime/Manifest
@@ -1,5 +1,4 @@
-AUX libvmime-0.8.1-gnutls_ssl-detection.patch 34353 RMD160 09eb6a3148a914c48cf420e995ec7f4831cb2ffb SHA1 4b53c024f3bee28c4c0111f6ce8445ea6bbd6e69 SHA256 07f0705f0849f358b422e98d9b7f51d0b4264e4d7ad44470a3c677bc3667838c
 DIST libvmime-0.8.1.tar.bz2 478197 RMD160 74cf922ec5b851b4253cb3e550a56795761d45f4 SHA1 e2a5a4b686759788d7f9ce2b6e36a4bc82bfd1fe SHA256 88422ddd52eed4cc043b9b5380bde0e75eac2ee286078420dd4b97c2088b23fc
-EBUILD libvmime-0.8.1.ebuild 1395 RMD160 3ea04c6dfdc4b3d87f2ae1c812eca70dda1c1ae5 SHA1 7f71f689d1cdb07d680bed06252d0ea1f94e9230 SHA256 8e2a75b0d6f3406106e22249ce071833b130eec4d8090baef3b9ee96d6107c50
-MISC ChangeLog 850 RMD160 6ed169dd0030740b12ec7cff986754eea20367e3 SHA1 8d5fed5cae53c1fd521d4b9a2b99592e0cc8ff3c SHA256 47b6b79e99d733af3e8d68fea1f47b23819294275b684eb062f9eb1975fc6321
+EBUILD libvmime-0.8.1.ebuild 1374 RMD160 15394cc91045473e915ebe1320eb9f96db771d16 SHA1 f926cb3c68e9ec28bab5fd97283c781516f5f85a SHA256 62799306425c46a45146e9fecb1fd5af0a6f1a0a733292047d0f79a3a44a9e7d
+MISC ChangeLog 984 RMD160 7b920af557b8667e1c7182d7fa1e910225ad38af SHA1 091ae86f90b162b48efdd24157ab1b2818a54fb0 SHA256 4b05445a98d479c2bc243a88e121ec477c1e14c88b051144ea392dd816c9fd63
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/dev-cpp/libvmime/files/libvmime-0.8.1-gnutls_ssl-detection.patch b/dev-cpp/libvmime/files/libvmime-0.8.1-gnutls_ssl-detection.patch
deleted file mode 100644
index 04d1656af..000000000
--- a/dev-cpp/libvmime/files/libvmime-0.8.1-gnutls_ssl-detection.patch
+++ /dev/null
@@ -1,980 +0,0 @@
---- configure.orig	2006-09-23 09:48:28.000000000 +0200
-+++ configure	2006-09-23 09:50:31.000000000 +0200
-@@ -21617,484 +21617,6 @@
-    { (exit 1); exit 1; }; }
- fi
- 
--# -- GNU SASL Library (http://www.gnu.org/software/gsasl/)
--
--if test "${ac_cv_header_gsasl_h+set}" = set; then
--  echo "$as_me:$LINENO: checking for gsasl.h" >&5
--echo $ECHO_N "checking for gsasl.h... $ECHO_C" >&6
--if test "${ac_cv_header_gsasl_h+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--fi
--echo "$as_me:$LINENO: result: $ac_cv_header_gsasl_h" >&5
--echo "${ECHO_T}$ac_cv_header_gsasl_h" >&6
--else
--  # Is the header compilable?
--echo "$as_me:$LINENO: checking gsasl.h usability" >&5
--echo $ECHO_N "checking gsasl.h usability... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--#include <gsasl.h>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_header_compiler=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_header_compiler=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
--
--# Is the header present?
--echo "$as_me:$LINENO: checking gsasl.h presence" >&5
--echo $ECHO_N "checking gsasl.h presence... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <gsasl.h>
--_ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_cxx_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
--  ac_header_preproc=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--  ac_header_preproc=no
--fi
--rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
--
--# So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
--  yes:no: )
--    { echo "$as_me:$LINENO: WARNING: gsasl.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: gsasl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: gsasl.h: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: gsasl.h: proceeding with the compiler's result" >&2;}
--    ac_header_preproc=yes
--    ;;
--  no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: gsasl.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: gsasl.h: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: gsasl.h:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: gsasl.h:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: gsasl.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: gsasl.h: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: gsasl.h:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: gsasl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: gsasl.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: gsasl.h: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: gsasl.h: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: gsasl.h: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to vincent@vincent-richard.net ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
--    ;;
--esac
--echo "$as_me:$LINENO: checking for gsasl.h" >&5
--echo $ECHO_N "checking for gsasl.h... $ECHO_C" >&6
--if test "${ac_cv_header_gsasl_h+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_cv_header_gsasl_h=$ac_header_preproc
--fi
--echo "$as_me:$LINENO: result: $ac_cv_header_gsasl_h" >&5
--echo "${ECHO_T}$ac_cv_header_gsasl_h" >&6
--
--fi
--if test $ac_cv_header_gsasl_h = yes; then
--  echo "$as_me:$LINENO: checking for gsasl_check_version in -lgsasl" >&5
--echo $ECHO_N "checking for gsasl_check_version in -lgsasl... $ECHO_C" >&6
--if test "${ac_cv_lib_gsasl_gsasl_check_version+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgsasl  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char gsasl_check_version ();
--int
--main ()
--{
--gsasl_check_version ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_gsasl_gsasl_check_version=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_lib_gsasl_gsasl_check_version=no
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_gsasl_gsasl_check_version" >&5
--echo "${ECHO_T}$ac_cv_lib_gsasl_gsasl_check_version" >&6
--if test $ac_cv_lib_gsasl_gsasl_check_version = yes; then
--  have_gsasl=yes GSASL_AVAIL_LIBS=-lgsasl
-- GSASL_AVAIL_REQUIRED=libgsasl
--
--else
--  have_gsasl=no
--fi
--
--else
--  have_gsasl=no
--fi
--
--
--
--# -- GNU TLS Library (http://www.gnu.org/software/gnutls/)
--
--# Check whether --with-libgnutls-prefix or --without-libgnutls-prefix was given.
--if test "${with_libgnutls_prefix+set}" = set; then
--  withval="$with_libgnutls_prefix"
--  libgnutls_config_prefix="$withval"
--else
--  libgnutls_config_prefix=""
--fi;
--
--  if test x$libgnutls_config_prefix != x ; then
--     if test x${LIBGNUTLS_CONFIG+set} != xset ; then
--        LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
--     fi
--  fi
--
--  # Extract the first word of "libgnutls-config", so it can be a program name with args.
--set dummy libgnutls-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_path_LIBGNUTLS_CONFIG+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  case $LIBGNUTLS_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_LIBGNUTLS_CONFIG="$LIBGNUTLS_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_path_LIBGNUTLS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--
--  test -z "$ac_cv_path_LIBGNUTLS_CONFIG" && ac_cv_path_LIBGNUTLS_CONFIG="no"
--  ;;
--esac
--fi
--LIBGNUTLS_CONFIG=$ac_cv_path_LIBGNUTLS_CONFIG
--
--if test -n "$LIBGNUTLS_CONFIG"; then
--  echo "$as_me:$LINENO: result: $LIBGNUTLS_CONFIG" >&5
--echo "${ECHO_T}$LIBGNUTLS_CONFIG" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--  min_libgnutls_version=1.2.0
--  echo "$as_me:$LINENO: checking for libgnutls - version >= $min_libgnutls_version" >&5
--echo $ECHO_N "checking for libgnutls - version >= $min_libgnutls_version... $ECHO_C" >&6
--  no_libgnutls=""
--  if test "$LIBGNUTLS_CONFIG" = "no" ; then
--    no_libgnutls=yes
--  else
--    LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
--    LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
--    libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
--
--
--      ac_save_CFLAGS="$CFLAGS"
--      ac_save_LIBS="$LIBS"
--      CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
--      LIBS="$LIBS $LIBGNUTLS_LIBS"
--      rm -f conf.libgnutlstest
--      if test "$cross_compiling" = yes; then
--  echo $ac_n "cross compiling; assumed OK... $ac_c"
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--#include <stdio.h>
--#include <stdlib.h>
--#include <string.h>
--#include <gnutls/gnutls.h>
--
--int
--main ()
--{
--    system ("touch conf.libgnutlstest");
--
--    if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) )
--    {
--      printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n",
--             "$libgnutls_config_version", gnutls_check_version(NULL) );
--      printf("*** was found! If libgnutls-config was correct, then it is best\n");
--      printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n");
--      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
--      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
--      printf("*** required on your system.\n");
--      printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n");
--      printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n");
--      printf("*** before re-running configure\n");
--    }
--    else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) )
--    {
--      printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION);
--      printf("*** library (version %s)\n", gnutls_check_version(NULL) );
--    }
--    else
--    {
--      if ( gnutls_check_version( "$min_libgnutls_version" ) )
--      {
--        return 0;
--      }
--     else
--      {
--        printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n",
--                gnutls_check_version(NULL) );
--        printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n",
--               "$min_libgnutls_version" );
--        printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");
--        printf("*** \n");
--        printf("*** If you have already installed a sufficiently new version, this error\n");
--        printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n");
--        printf("*** being found. The easiest way to fix this is to remove the old version\n");
--        printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n");
--        printf("*** correct copy of libgnutls-config. (In this case, you will have to\n");
--        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
--        printf("*** so that the correct libraries are found at run-time))\n");
--      }
--    }
--  return 1;
--}
--
--_ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  :
--else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--no_libgnutls=yes
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--       CFLAGS="$ac_save_CFLAGS"
--       LIBS="$ac_save_LIBS"
--  fi
--
--  if test "x$no_libgnutls" = x ; then
--     echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--     have_gnutls=yes
--  else
--     if test -f conf.libgnutlstest ; then
--        :
--     else
--        echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--     fi
--     if test "$LIBGNUTLS_CONFIG" = "no" ; then
--       echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found"
--       echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in"
--       echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the"
--       echo "*** full path to libgnutls-config."
--     else
--       if test -f conf.libgnutlstest ; then
--        :
--       else
--          echo "*** Could not run libgnutls test program, checking why..."
--          CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
--          LIBS="$LIBS $LIBGNUTLS_LIBS"
--          cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--#include <stdio.h>
--#include <stdlib.h>
--#include <string.h>
--#include <gnutls/gnutls.h>
--
--int
--main ()
--{
-- return !!gnutls_check_version(NULL);
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--   echo "*** The test program compiled, but did not run. This usually means"
--          echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong"
--          echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your"
--          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
--          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
--          echo "*** is required on your system"
--          echo "***"
--          echo "*** If you have an old version installed, it is best to remove it, although"
--          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
--          echo "***"
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- echo "*** The test program failed to compile or link. See the file config.log for the"
--          echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed"
--          echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you"
--          echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG"
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--          CFLAGS="$ac_save_CFLAGS"
--          LIBS="$ac_save_LIBS"
--       fi
--     fi
--     LIBGNUTLS_CFLAGS=""
--     LIBGNUTLS_LIBS=""
--     have_gnutls=no
--  fi
--  rm -f conf.libgnutlstest
--
--
--
--
- # -- global constructors (stolen from 'configure.in' in libsigc++)
- echo "$as_me:$LINENO: checking if linker supports global constructors" >&5
- echo $ECHO_N "checking if linker supports global constructors... $ECHO_C" >&6
-@@ -24438,6 +23960,224 @@
- fi;
- 
- if test "x$conf_sasl" = "xyes"; then
-+
-+# -- GNU SASL Library (http://www.gnu.org/software/gsasl/)
-+
-+if test "${ac_cv_header_gsasl_h+set}" = set; then
-+  echo "$as_me:$LINENO: checking for gsasl.h" >&5
-+echo $ECHO_N "checking for gsasl.h... $ECHO_C" >&6
-+if test "${ac_cv_header_gsasl_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_gsasl_h" >&5
-+echo "${ECHO_T}$ac_cv_header_gsasl_h" >&6
-+else
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking gsasl.h usability" >&5
-+echo $ECHO_N "checking gsasl.h usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <gsasl.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking gsasl.h presence" >&5
-+echo $ECHO_N "checking gsasl.h presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <gsasl.h>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_cxx_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: gsasl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: gsasl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gsasl.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: gsasl.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: gsasl.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: gsasl.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gsasl.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: gsasl.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gsasl.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: gsasl.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gsasl.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: gsasl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gsasl.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: gsasl.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gsasl.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: gsasl.h: in the future, the compiler will take precedence" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to vincent@vincent-richard.net ##
-+## ------------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+esac
-+echo "$as_me:$LINENO: checking for gsasl.h" >&5
-+echo $ECHO_N "checking for gsasl.h... $ECHO_C" >&6
-+if test "${ac_cv_header_gsasl_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_gsasl_h=$ac_header_preproc
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_gsasl_h" >&5
-+echo "${ECHO_T}$ac_cv_header_gsasl_h" >&6
-+
-+fi
-+if test $ac_cv_header_gsasl_h = yes; then
-+  echo "$as_me:$LINENO: checking for gsasl_check_version in -lgsasl" >&5
-+echo $ECHO_N "checking for gsasl_check_version in -lgsasl... $ECHO_C" >&6
-+if test "${ac_cv_lib_gsasl_gsasl_check_version+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lgsasl  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char gsasl_check_version ();
-+int
-+main ()
-+{
-+gsasl_check_version ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_gsasl_gsasl_check_version=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_gsasl_gsasl_check_version=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_gsasl_gsasl_check_version" >&5
-+echo "${ECHO_T}$ac_cv_lib_gsasl_gsasl_check_version" >&6
-+if test $ac_cv_lib_gsasl_gsasl_check_version = yes; then
-+  have_gsasl=yes GSASL_AVAIL_LIBS=-lgsasl
-+ GSASL_AVAIL_REQUIRED=libgsasl
-+
-+else
-+  have_gsasl=no
-+fi
-+
-+else
-+  have_gsasl=no
-+fi
-+
-+
-+
-+
- 	if test "x$have_gsasl" = "xyes"; then
- 
- 
-@@ -24495,6 +24235,267 @@
- fi;
- 
- if test "x$conf_tls" = "xyes"; then
-+
-+
-+# -- GNU TLS Library (http://www.gnu.org/software/gnutls/)
-+
-+# Check whether --with-libgnutls-prefix or --without-libgnutls-prefix was given.
-+if test "${with_libgnutls_prefix+set}" = set; then
-+  withval="$with_libgnutls_prefix"
-+  libgnutls_config_prefix="$withval"
-+else
-+  libgnutls_config_prefix=""
-+fi;
-+
-+  if test x$libgnutls_config_prefix != x ; then
-+     if test x${LIBGNUTLS_CONFIG+set} != xset ; then
-+        LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
-+     fi
-+  fi
-+
-+  # Extract the first word of "libgnutls-config", so it can be a program name with args.
-+set dummy libgnutls-config; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_LIBGNUTLS_CONFIG+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $LIBGNUTLS_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_LIBGNUTLS_CONFIG="$LIBGNUTLS_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_path_LIBGNUTLS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+
-+  test -z "$ac_cv_path_LIBGNUTLS_CONFIG" && ac_cv_path_LIBGNUTLS_CONFIG="no"
-+  ;;
-+esac
-+fi
-+LIBGNUTLS_CONFIG=$ac_cv_path_LIBGNUTLS_CONFIG
-+
-+if test -n "$LIBGNUTLS_CONFIG"; then
-+  echo "$as_me:$LINENO: result: $LIBGNUTLS_CONFIG" >&5
-+echo "${ECHO_T}$LIBGNUTLS_CONFIG" >&6
-+else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+  min_libgnutls_version=1.2.0
-+  echo "$as_me:$LINENO: checking for libgnutls - version >= $min_libgnutls_version" >&5
-+echo $ECHO_N "checking for libgnutls - version >= $min_libgnutls_version... $ECHO_C" >&6
-+  no_libgnutls=""
-+  if test "$LIBGNUTLS_CONFIG" = "no" ; then
-+    no_libgnutls=yes
-+  else
-+    LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
-+    LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
-+    libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
-+
-+
-+      ac_save_CFLAGS="$CFLAGS"
-+      ac_save_LIBS="$LIBS"
-+      CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
-+      LIBS="$LIBS $LIBGNUTLS_LIBS"
-+      rm -f conf.libgnutlstest
-+      if test "$cross_compiling" = yes; then
-+  echo $ac_n "cross compiling; assumed OK... $ac_c"
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <gnutls/gnutls.h>
-+
-+int
-+main ()
-+{
-+    system ("touch conf.libgnutlstest");
-+
-+    if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) )
-+    {
-+      printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n",
-+             "$libgnutls_config_version", gnutls_check_version(NULL) );
-+      printf("*** was found! If libgnutls-config was correct, then it is best\n");
-+      printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n");
-+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-+      printf("*** required on your system.\n");
-+      printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n");
-+      printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n");
-+      printf("*** before re-running configure\n");
-+    }
-+    else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) )
-+    {
-+      printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION);
-+      printf("*** library (version %s)\n", gnutls_check_version(NULL) );
-+    }
-+    else
-+    {
-+      if ( gnutls_check_version( "$min_libgnutls_version" ) )
-+      {
-+        return 0;
-+      }
-+     else
-+      {
-+        printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n",
-+                gnutls_check_version(NULL) );
-+        printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n",
-+               "$min_libgnutls_version" );
-+        printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");
-+        printf("*** \n");
-+        printf("*** If you have already installed a sufficiently new version, this error\n");
-+        printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n");
-+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-+        printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n");
-+        printf("*** correct copy of libgnutls-config. (In this case, you will have to\n");
-+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-+        printf("*** so that the correct libraries are found at run-time))\n");
-+      }
-+    }
-+  return 1;
-+}
-+
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  :
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+no_libgnutls=yes
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+       CFLAGS="$ac_save_CFLAGS"
-+       LIBS="$ac_save_LIBS"
-+  fi
-+
-+  if test "x$no_libgnutls" = x ; then
-+     echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+     have_gnutls=yes
-+  else
-+     if test -f conf.libgnutlstest ; then
-+        :
-+     else
-+        echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+     fi
-+     if test "$LIBGNUTLS_CONFIG" = "no" ; then
-+       echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found"
-+       echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in"
-+       echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the"
-+       echo "*** full path to libgnutls-config."
-+     else
-+       if test -f conf.libgnutlstest ; then
-+        :
-+       else
-+          echo "*** Could not run libgnutls test program, checking why..."
-+          CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
-+          LIBS="$LIBS $LIBGNUTLS_LIBS"
-+          cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <gnutls/gnutls.h>
-+
-+int
-+main ()
-+{
-+ return !!gnutls_check_version(NULL);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+   echo "*** The test program compiled, but did not run. This usually means"
-+          echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong"
-+          echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your"
-+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-+          echo "*** is required on your system"
-+          echo "***"
-+          echo "*** If you have an old version installed, it is best to remove it, although"
-+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-+          echo "***"
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ echo "*** The test program failed to compile or link. See the file config.log for the"
-+          echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed"
-+          echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you"
-+          echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+          CFLAGS="$ac_save_CFLAGS"
-+          LIBS="$ac_save_LIBS"
-+       fi
-+     fi
-+     LIBGNUTLS_CFLAGS=""
-+     LIBGNUTLS_LIBS=""
-+     have_gnutls=no
-+  fi
-+  rm -f conf.libgnutlstest
-+
- 	if test "x$have_gnutls" = "xyes"; then
- 
- 
diff --git a/dev-cpp/libvmime/libvmime-0.8.1.ebuild b/dev-cpp/libvmime/libvmime-0.8.1.ebuild
index cfe457946..4371ed7f0 100644
--- a/dev-cpp/libvmime/libvmime-0.8.1.ebuild
+++ b/dev-cpp/libvmime/libvmime-0.8.1.ebuild
@@ -4,21 +4,20 @@
 
 inherit eutils
 
-KEYWORDS="~x86"
-
 DESCRIPTION="A powerful C++ class library for working with MIME messages and services like IMAP, POP or SMTP."
 HOMEPAGE="http://www.vmime.org/"
 SRC_URI="mirror://sourceforge/vmime/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~x86"
 IUSE="debug doc examples sasl ssl"
 
-CDEPEND="sasl? ( net-libs/libgsasl )
+RDEPEND="sasl? ( net-libs/libgsasl )
 		ssl? ( net-libs/gnutls )
 		virtual/libiconv"
-DEPEND="${CDEPEND}
+DEPEND="${RDEPEND}
 		doc? ( app-doc/doxygen )"
-RDEPEND="${CDEPEND}"
 
 src_unpack() {
 	unpack ${A}