Source Mage code commit list

[Matthew Clark <scm AT mail.sourcemage.org>]

GIT changes to master grimoire by Matthew Clark 
<matthewclark AT inlesserterms.net>:

 kde-apps/kopete/CONFLICTS     |    2 --
 kde-apps/kopete/HISTORY       |    3 +++
 kde-core/kdenetwork/CONFIGURE |   36 +-----------------------------------
 kde-core/kdenetwork/CONFLICTS |    2 --
 kde-core/kdenetwork/DEPENDS   |   11 -----------
 kde-core/kdenetwork/DETAILS   |    2 +-
 kde-core/kdenetwork/HISTORY   |    7 +++++++
 kde-core/kdenetwork/PRE_BUILD |    3 +++
 8 files changed, 15 insertions(+), 51 deletions(-)

New commits:
commit 7db1e56806c20ab76edc88867d6bb7b30aba00d1
Author: Matthew Clark <matthewclark AT inlesserterms.net>
Commit: Matthew Clark <matthewclark AT inlesserterms.net>

    Removed conflict for kdenetwork, since kdenetwork no longer
    builds kopete (bug 12932)

commit 7e6a49a0ccf2232276bd184b6c623bbf26c5cbb5
Author: Matthew Clark <matthewclark AT inlesserterms.net>
Commit: Matthew Clark <matthewclark AT inlesserterms.net>

    Since we have a kopete spell, then the kdenetwork spell will
    no longer build kopete.  Fixes bug 12932.

diff --git a/kde-apps/kopete/CONFLICTS b/kde-apps/kopete/CONFLICTS
deleted file mode 100755
index 1a757c8..0000000
--- a/kde-apps/kopete/CONFLICTS
+++ /dev/null
@@ -1,2 +0,0 @@
-conflicts kdenetwork
-
diff --git a/kde-apps/kopete/HISTORY b/kde-apps/kopete/HISTORY
index 3f36524..5ad167b 100644
--- a/kde-apps/kopete/HISTORY
+++ b/kde-apps/kopete/HISTORY
@@ -1,3 +1,6 @@
+2006-08-01 Matthew Clark <matthewclark AT inlesserterms.net>
+       * CONFLICTS: Removed, as kdenetwork no longer builds kopete
+
 2006-07-13 Treeve Jelbert <treeve01 AT pi.be>
        * DETAILS: version 0.12.1
 
diff --git a/kde-core/kdenetwork/CONFIGURE b/kde-core/kdenetwork/CONFIGURE
index 16176ca..c935aeb 100755
--- a/kde-core/kdenetwork/CONFIGURE
+++ b/kde-core/kdenetwork/CONFIGURE
@@ -1,36 +1,2 @@
-source  $SECTION_DIRECTORY/KDE_CONFIGURE  &&
+source  $SECTION_DIRECTORY/KDE_CONFIGURE 
 
-message  "${MESSAGE_COLOR}Will depend on 
${SPELL_COLOR}libxslt${DEFAULT_COLOR}"  &&
-
-if  spell_ok  libxslt;  then
-  config_query  KDENETWORK_KOPETE  "Build Kopete Instant Messenger?"  y
-else
-  config_query  KDENETWORK_KOPETE  "Build Kopete Instant Messenger?"  n
-fi  &&
-
-if  [  "$KDENETWORK_KOPETE"  ==  "y"  ];  then
-  message  "${MESSAGE_COLOR}Will depend on 
${SPELL_COLOR}libidn${DEFAULT_COLOR}"  &&
-
-  if  spell_ok  libidn;  then
-    config_query  KDENETWORK_LIBIDN  "Enable Jabber protocol support in 
Kopete?"  y
-  else
-    config_query  KDENETWORK_LIBIDN  "Enable Jabber protocol support in 
Kopete?"  n
-  fi  &&
-
-  if  [  "$KDENETWORK_LIBIDN"  ==  "y"  ];  then
-    message  "${MESSAGE_COLOR}Will depend on 
${SPELL_COLOR}qca-tls${DEFAULT_COLOR}"  &&
-
-    if  spell_ok  qca-tls;  then
-      config_query  KDENETWORK_QCATLS  "Enable SSL support in Kopete 
Jabber?"  y
-    else
-      config_query  KDENETWORK_QCATLS  "Enable SSL support in Kopete 
Jabber?"  n
-    fi
-  else
-    persistent_add  KDENETWORK_QCATLS  &&
-    KDENETWORK_QCATLS="n"
-  fi
-else
-  persistent_add  KDENETWORK_LIBIDN  KDENETWORK_QCATLS &&
-  KDENETWORK_LIBIDN="n"
-  KDENETWORK_QCATLS="n"
-fi
diff --git a/kde-core/kdenetwork/CONFLICTS b/kde-core/kdenetwork/CONFLICTS
deleted file mode 100755
index 13e92f4..0000000
--- a/kde-core/kdenetwork/CONFLICTS
+++ /dev/null
@@ -1,2 +0,0 @@
-conflicts kopete
-
diff --git a/kde-core/kdenetwork/DEPENDS b/kde-core/kdenetwork/DEPENDS
index 3a94a4c..f77d26d 100755
--- a/kde-core/kdenetwork/DEPENDS
+++ b/kde-core/kdenetwork/DEPENDS
@@ -2,17 +2,6 @@ depends  kdebase  &&
 
 source  $SECTION_DIRECTORY/KDE_DEPENDS  &&
 
-if  [  "$KDENETWORK_KOPETE"  ==  "y"  ];  then
-  depends  libxslt  &&
-
-  if  [  "$KDENETWORK_LIBIDN"  ==  "y"  ];  then
-    depends  libidn
-    if  [  "$KDENETWORK_QCATLS"  ==  "y"  ];  then
-      depends  qca-tls
-    fi
-  fi
-fi  &&
-
 optional_depends  openssl                         \
                   '--with-ssl'                    \
                   '--without-ssl'                 \
diff --git a/kde-core/kdenetwork/DETAILS b/kde-core/kdenetwork/DETAILS
index da59503..14b6483 100755
--- a/kde-core/kdenetwork/DETAILS
+++ b/kde-core/kdenetwork/DETAILS
@@ -14,5 +14,5 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
 cat << EOF
 Network applications. Currently contains the news
 reader, and several other network-related programs.
-NO LONGER CONTAINS KMAIL
+NO LONGER CONTAINS KMAIL OR KOPETE (Kopete is a separate spell)
 EOF
diff --git a/kde-core/kdenetwork/HISTORY b/kde-core/kdenetwork/HISTORY
index 022cbc5..304d04e 100644
--- a/kde-core/kdenetwork/HISTORY
+++ b/kde-core/kdenetwork/HISTORY
@@ -1,3 +1,10 @@
+2006-08-01 Matthew Clark <matthewclark AT inlesserterms.net>
+       * Fixed bug 12932
+       * CONFLICTS: Removed kopete conflict, file deleted
+       * DETAILS: Mentioned removal of kopete
+       * CONFIGURE: Removed kopete support
+       * PRE_BUILD: Created to prevent kopete from building
+
 2006-06-29 Eric Sandall <eric AT sandall.us>
        * DETAILS: Removed BUILD_API=2, set grimoire-wide
 
diff --git a/kde-core/kdenetwork/PRE_BUILD b/kde-core/kdenetwork/PRE_BUILD
new file mode 100755
index 0000000..8706bb0
--- /dev/null
+++ b/kde-core/kdenetwork/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build           &&
+cd  $SOURCE_DIRECTORY       &&
+sedit "/kopete/d" subdirs