Revert "evolution-data-server: Updated to 3.6.1"

This reverts commit 1c91f00d415c9eff742e8e558a655da2c8dbe52d.

tboatman is working on GNOME 3.6.
evolution-data-server 3.6.1 doesn't work with older libgweather.

10 files changed, 22 insertions, 20 deletions

diff --git a/gnome2-libs/evolution-data-server/BUILD b/gnome2-libs/evolution-data-server/BUILD
index 65fc31b7cb..9df494d7f0 100755
--- a/gnome2-libs/evolution-data-server/BUILD
+++ b/gnome2-libs/evolution-data-server/BUILD
@@ -10,7 +10,8 @@ else
    OPTS="$OPTS --enable-nntp=no"
 fi &&
 
-OPTS="$EDS_LARGE \
+OPTS="$CAL       \
+      $EDS_LARGE \
       $OPTS"     &&
 
 make_single    &&
diff --git a/gnome2-libs/evolution-data-server/CONFIGURE b/gnome2-libs/evolution-data-server/CONFIGURE
index a404d60796..a926551a8d 100755
--- a/gnome2-libs/evolution-data-server/CONFIGURE
+++ b/gnome2-libs/evolution-data-server/CONFIGURE
@@ -1,8 +1,8 @@
-# CAL removed in 3.6.1 update
-persistent_remove CAL &&
-
 config_query "IPV6" "Enable support for resolving IPv6 addresses?" n &&
 config_query "NNTP" "Build Usenet news (NNTP) backend" y             &&
 
 config_query_option "EDS_LARGE" "Enable large file support?" y       \
-                    "--enable-largefile" "--disable-largefile"
+                    "--enable-largefile" "--disable-largefile"       &&
+config_query_option "CAL"  "Enable the calendar components" y        \
+                    "--enable-calendar=yes" "--enable-calendar=no"
+
diff --git a/gnome2-libs/evolution-data-server/DEPENDS b/gnome2-libs/evolution-data-server/DEPENDS
index d3b32deaa1..6932a20b8a 100755
--- a/gnome2-libs/evolution-data-server/DEPENDS
+++ b/gnome2-libs/evolution-data-server/DEPENDS
@@ -9,11 +9,6 @@ depends intltool &&
 depends dbus-glib &&
 depends libgdata &&
 
-optional_depends "gettext"                                        \
-                 "--enable-nls"                                   \
-                 "--disable-nls"                                  \
-                 "for Native Language Support (recommended)"      &&
-
 optional_depends "gtk-doc"                                        \
                  "--enable-gtk-doc"                               \
                  "--disable-gtk-doc"                              \
@@ -25,12 +20,12 @@ optional_depends "openldap"                                       \
                  "Enable OpenLDAP support"                        &&
 
 optional_depends "nss"                                            \
-                 "--enable-smime                                  \
+                 "--enable-ssl --enable-smime                     \
                   --with-nspr-includes=/usr/include/nspr          \
                   --with-nss-includes=/usr/include/nss            \
                   --with-nspr-libs=/usr/lib                       \
                   --with-nss-libs=/usr/lib"                       \
-                 "--disable-smime"                                \
+                 "--disable-ssl --disable-smime"                  \
                  "to use Mozlla libnss for SSL and SMIME support" &&
 
 optional_depends "krb5"                                           \
@@ -38,6 +33,11 @@ optional_depends "krb5"                                           \
                  "--without-krb5"                                 \
                  "Enable kerberos 5 support?"                     &&
 
+optional_depends gnome-keyring                                    \
+                 "--enable-gnome-keyring=yes"                     \
+                 "--enable-gnome-keyring=no"                      \
+                 "to use Gnome Keyring for storing passwords"     &&
+
 optional_depends gnome-online-accounts                            \
                  "--enable-goa"                                   \
                  "--disable-goa"                                  \
diff --git a/gnome2-libs/evolution-data-server/DETAILS b/gnome2-libs/evolution-data-server/DETAILS
index 1c16302a34..f0e190a58a 100755
--- a/gnome2-libs/evolution-data-server/DETAILS
+++ b/gnome2-libs/evolution-data-server/DETAILS
@@ -1,5 +1,5 @@
            SPELL=evolution-data-server
-         VERSION=3.6.1
+         VERSION=3.4.1
           BRANCH=`echo $VERSION | cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.xz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/evolution-data-server/HISTORY b/gnome2-libs/evolution-data-server/HISTORY
index 6e1744f669..fe6b91afdb 100644
--- a/gnome2-libs/evolution-data-server/HISTORY
+++ b/gnome2-libs/evolution-data-server/HISTORY
@@ -1,10 +1,3 @@
-2012-10-16 Eric Sandall <sandalle@sourcemage.org>
-	* DETAILS: Updated to 3.6.1
-	* CONFIGURE: No more calendar, just weather calendar
-	* DEPENDS: No more '--*-ssl' option for nss
-	  No more gnome-keyring support
-	  Optionally depends on gettext
-
 2012-04-16 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 3.4.1
 
diff --git a/gnome2-libs/evolution-data-server/PRE_SUB_DEPENDS b/gnome2-libs/evolution-data-server/PRE_SUB_DEPENDS
index 70cb7983ac..3164e3ec1b 100755
--- a/gnome2-libs/evolution-data-server/PRE_SUB_DEPENDS
+++ b/gnome2-libs/evolution-data-server/PRE_SUB_DEPENDS
@@ -2,5 +2,7 @@ case $THIS_SUB_DEPENDS in
   LDAP) persistent_read openldap OPENLDAP_NTLM OPENLDAP_NTLM &&
         is_depends_enabled $SPELL openldap &&
         [[ OPENLDAP_NTLM == "y" ]] &&return 0;;
+    CC) persistent_read evolution-data-server CAL CAL &&
+        if [[ $CAL == "--enable-calendar=yes" ]]; then return 0; fi ;;
 esac
 return 1
diff --git a/gnome2-libs/evolution-data-server/REPAIR^all^PRE_SUB_DEPENDS b/gnome2-libs/evolution-data-server/REPAIR^all^PRE_SUB_DEPENDS
index 70cb7983ac..3164e3ec1b 100755
--- a/gnome2-libs/evolution-data-server/REPAIR^all^PRE_SUB_DEPENDS
+++ b/gnome2-libs/evolution-data-server/REPAIR^all^PRE_SUB_DEPENDS
@@ -2,5 +2,7 @@ case $THIS_SUB_DEPENDS in
   LDAP) persistent_read openldap OPENLDAP_NTLM OPENLDAP_NTLM &&
         is_depends_enabled $SPELL openldap &&
         [[ OPENLDAP_NTLM == "y" ]] &&return 0;;
+    CC) persistent_read evolution-data-server CAL CAL &&
+        if [[ $CAL == "--enable-calendar=yes" ]]; then return 0; fi ;;
 esac
 return 1
diff --git a/gnome2-libs/evolution-data-server/SUB_DEPENDS b/gnome2-libs/evolution-data-server/SUB_DEPENDS
index 0c5c32e1af..53f4a49ba1 100755
--- a/gnome2-libs/evolution-data-server/SUB_DEPENDS
+++ b/gnome2-libs/evolution-data-server/SUB_DEPENDS
@@ -2,4 +2,8 @@ case $THIS_SUB_DEPENDS in
   LDAP)
     depends -sub NTLM openldap --with-openldap=yes "(because sub depends forced it)"
   ;;
+    CC) persistent_add CAL &&
+        message "Calendar components requested, forcing build" &&
+        CAL="--enable-calendar=yes"
+  ;;
 esac
diff --git a/gnome2-libs/evolution-data-server/evolution-data-server-3.4.1.tar.xz.sig b/gnome2-libs/evolution-data-server/evolution-data-server-3.4.1.tar.xz.sig
new file mode 100644
index 0000000000..41d0f1f596
--- /dev/null
+++ b/gnome2-libs/evolution-data-server/evolution-data-server-3.4.1.tar.xz.sig
diff --git a/gnome2-libs/evolution-data-server/evolution-data-server-3.6.1.tar.xz.sig b/gnome2-libs/evolution-data-server/evolution-data-server-3.6.1.tar.xz.sig
deleted file mode 100644
index 0982782c3a..0000000000
--- a/gnome2-libs/evolution-data-server/evolution-data-server-3.6.1.tar.xz.sig
+++ /dev/null