Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to devel-kde44 grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 kde4/kdenetwork4/DEPENDS   |    2 +-
 kde4/kdenetwork4/HISTORY   |    3 +++
 x11-toolkits/qt4/CONFLICTS |    9 ++++++++-
 x11-toolkits/qt4/DETAILS   |    4 ++--
 x11-toolkits/qt4/HISTORY   |    4 ++++
 5 files changed, 18 insertions(+), 4 deletions(-)

New commits:
commit e9a53589af4514979b366195eab15ca9da77ad35
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    qt4: => 4.6.0

commit 89a362af9bfcd1ce2194164475faa5cfb5cbedcf
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdenetwork4 - no special case for torrent
    (cherry picked from commit 620adc96273c8df9511e2795b7966612a86dfdf1)

diff --git a/kde4/kdenetwork4/DEPENDS b/kde4/kdenetwork4/DEPENDS
index 085315f..d244334 100755
--- a/kde4/kdenetwork4/DEPENDS
+++ b/kde4/kdenetwork4/DEPENDS
@@ -8,7 +8,7 @@ optional_depends  wireless_tools '' '' 'Wireless support'     
          &&
 optional_depends  libidn     '' '' 'International Domain Name Support'  &&
 #optional_depends  decibel    '' '' 'Decibel support'                    &&
 optional_depends  qca2       '' '' 'needed to build kopete'             &&
-optional_depends  ktorrent4  '-DENABLE_EMBEDDED_TORRENT_SUPPORT=false' '' 
'use system torrent library'         &&
+optional_depends  ktorrent4  '' '' 'use system torrent library'         &&
 optional_depends  libv4l        '' '' 'better webcam suppor'            &&
 optional_depends  alsa-lib      '' '' 'sound support'                   &&  
 optional_depends  xmms       '' '' 'nowlistening plugin'                &&
diff --git a/kde4/kdenetwork4/HISTORY b/kde4/kdenetwork4/HISTORY
index c720a9f..43b9808 100644
--- a/kde4/kdenetwork4/HISTORY
+++ b/kde4/kdenetwork4/HISTORY
@@ -1,3 +1,6 @@
+2009-12-01 Treeve Jelbert <treeve AT sourcemage.org> 
+       * DEPENDS: no longer special case for torrent
+
 2009-11-29 Treeve Jelbert <treeve AT sourcemage.org> 
        * DEPENDS: explicitly disbale internal torrent support
          add alsa-lib, libv4l
diff --git a/x11-toolkits/qt4/CONFLICTS b/x11-toolkits/qt4/CONFLICTS
index be85071..60697dd 100755
--- a/x11-toolkits/qt4/CONFLICTS
+++ b/x11-toolkits/qt4/CONFLICTS
@@ -1 +1,8 @@
-conflicts qt4 y
+if spell_ok $SELF;then
+  OLDQT=`installed_version $SELF| cut -c-3` &&
+  NEWQT=`echo $VERSION | cut -c-3`
+message "old=$OLDQT, new=$NEWQT" &&
+  if [[ $OLDQT != $NEWQT ]];then
+    conflicts qt4 y
+  fi
+fi
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index 2c770a2..09a1fb7 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -4,8 +4,8 @@ if  [[ $QT_TMPFS == n ]];  then
            TMPFS=off
 fi
          SPELLX=qt-everywhere-opensource-src
-         VERSION=4.6.0-rc1
-     
SOURCE_HASH=sha512:69d41b8ae38a281f7a9c755e9aa0a30b75dab513332dbddb2a2a55bcd10abd2ec4373fcb6824e29f58b6c6296cfe0bcd6e2bf1a6970b0ce0bc20c882f69f4cbf
+         VERSION=4.6.0
+     
SOURCE_HASH=sha512:fb67e20426565723757cd12fbe130352fb04817b508bf35df79ba5545d3b7bfd7af4016206d8070ce4a85209849886968db2519621f3b96e2f5c6a28934b2386
           SOURCE=$SPELLX-$VERSION.tar.gz
              URI=qt/source/$SOURCE
   SECURITY_PATCH=3
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index ca1504e..263a4a0 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,7 @@
+2009-12-01 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.6.0
+       * CONFLICTS: check old version before forcing conflict
+
 2009-11-25 Treeve Jelbert <treeve AT sourcemage.org>
        * DEPENDS: zlib is always required now