Revert "qt4: => 4.6.0-beta1"

This reverts commit aa053bfe2e947a188abc138192198f71e4b798b2.

qt4 4.6.x causes issues with KDE 4.3
e.g. http://bugs.sourcemage.org/show_bug.cgi?id=15031

Upstream recommends using qt 4.5 for KDE 4.3.

Conflicts:

	x11-toolkits/qt4/BUILD
	x11-toolkits/qt4/CONFIGURE
	x11-toolkits/qt4/HISTORY
	x11-toolkits/qt4/PRE_SUB_DEPENDS
	x11-toolkits/qt4/SUB_DEPENDS

6 files changed, 10 insertions, 33 deletions

diff --git a/x11-toolkits/qt4/BUILD b/x11-toolkits/qt4/BUILD
index eaefd4fa7b..3fdd41defa 100755
--- a/x11-toolkits/qt4/BUILD
+++ b/x11-toolkits/qt4/BUILD
@@ -13,8 +13,6 @@ OPTS="$QT_DEBUG               \
       $QT_TOOLS tools         \
       $QT_TRANS translations  \
       $QT_WEBKIT              \
-      $QT_MEDIA               \
-      $QT_GTK                 \
       $QT_ACCESS              \
       $OPTS"                  &&
 
diff --git a/x11-toolkits/qt4/CONFIGURE b/x11-toolkits/qt4/CONFIGURE
index bdaf1edc6d..ba6456bb8f 100755
--- a/x11-toolkits/qt4/CONFIGURE
+++ b/x11-toolkits/qt4/CONFIGURE
@@ -52,13 +52,12 @@ config_query_option  QT_WEBKIT  'Build the WebKit module?'  y  \
                                 '-webkit'                      \
                                 '-no-webkit' &&
 
-config_query_option  QT_MEDIA 'Build Multimedia support?' y \
-                                '-multimedia' \
-                                '-no-multimedia' &&
-config_query_option  QT_GTK   'Build the GTK theme integration?' y \
-                              '-gtkstyle' \
-                              '-no-gtkstyle'  &&
-
 config_query_option  QT_ACCESS 'Compile Accessibility support' n \
                                 '-accessibility'  \
                                 '-no-accessibility'
+
+# change the old options to the new, can be removed after a year --20080105
+QT_DEMO="${QT_DEMO//demos/}" &&
+QT_EXAMPLE="${QT_EXAMPLE//examples/}" &&
+QT_TOOLS="${QT_TOOLS//tools/}" &&
+QT_TRANS="${QT_TRANS//translations/}"
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index b897f6aeed..bed45d3cac 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -3,9 +3,10 @@ persistent_remove QT_VER
 if  [[ $QT_TMPFS == n ]];  then
            TMPFS=off
 fi
-         SPELLX=qt-everywhere-opensource-src
-         VERSION=4.6.0-beta1
-     SOURCE_HASH=sha512:6b54375ea8672056030447dec3b4fabcae507d401a61d75be1d2609c42e6e12d6637787e4cec3f55fb15255f903e1663a5e0e170f179a2918a311e8fc2615316
+         SPELLX=qt-x11-opensource-src
+         VERSION=4.5.3
+     SOURCE_HASH=sha512:aa1051f3a5cab0ffe225eb03cd50b8bf34bcc28f89dd4bda6b80c9769395dbaec31b8d3b365e1a8aa0407be5e4cdd51c788706daebdfab8420e8f2853d8226a2
+      PATCHLEVEL=1
           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 5992c15378..1c5b7e5c35 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -21,15 +21,6 @@
 	* PRE_BUILD: fix for not linking clucene correctly (4.6.0-beta1)
 	  needed in order to build TOOLS, which in turn is needed by kde4
 
-2009-10-14 Treeve Jelbert <treeve@sourcemage.org>
-	* DETAILS: version 4.6.0-beta1
-	* CONFLICTS: add it back again unfortunately. when going from 4.5 to 4.6
-	  tries to link old modules which don't have the new entrypoints
-	* BUILD HISTORY SUB_DEPENDS PRE_SUB_DEPENDS:
-	  add multimedia, Accessibility and gtk options
-	* CONFIGURE: delete obsolete stuff
-	* DEPENDS: remove obsolete sqlite2 support
-
 2009-10-10 Eric Sandall <sandalle@sourcemage.org>
 	* CONFLICTS: No longer seems to need a self-conflict during upgrades
 
diff --git a/x11-toolkits/qt4/PRE_SUB_DEPENDS b/x11-toolkits/qt4/PRE_SUB_DEPENDS
index 47abc861f3..b7eac174d9 100755
--- a/x11-toolkits/qt4/PRE_SUB_DEPENDS
+++ b/x11-toolkits/qt4/PRE_SUB_DEPENDS
@@ -11,8 +11,6 @@ case $THIS_SUB_DEPENDS in
   STL)   [[ $QT_STL == "-stl" ]] && return 0;;
   QT3)   [[ $QT_QT3 == "-qt3support" ]] && return 0;;
   WEBKIT) [[ $QT_WEBKIT == "-webkit" ]] && return 0;;
-  MEDIA) [[ $QT_MEDIA == "-multimedia" ]] && return 0;;
-  GTK  ) [[ $QT_GTK == "-gtkstyle" ]] && return 0;;
   *) echo "Eek, unknown subdependency requested!"; return 1;;
 esac
 return 1
diff --git a/x11-toolkits/qt4/SUB_DEPENDS b/x11-toolkits/qt4/SUB_DEPENDS
index c6b963c799..fb162d95a8 100755
--- a/x11-toolkits/qt4/SUB_DEPENDS
+++ b/x11-toolkits/qt4/SUB_DEPENDS
@@ -48,16 +48,6 @@ MYSQL) echo "MySQL support requested, forcing mysql dependency." &&
        depends mysql "-plugin-sql-mysql  -I$INSTALL_ROOT/usr/include/mysql  \
                    -L$INSTALL_ROOT/usr/lib  -lmysqlclient"
        ;;
-MEDIA) if [[  $QT_MEDIA == "-no-multimedia" ]]; then
-          echo "Multimedia module requested, forcing build."  &&
-          QT_MEDIA="-multimedia"
-        fi
-        ;;
-GTK) if [[  $QT_GTK == "-no-gtkstyle" ]]; then
-          echo "GTK theme integration requested, forcing build."  &&
-          QT_GTK="-gtkstyle"
-        fi
-        ;;
 ACCESS) if [[  $QT_ACCESS == "-no-accessibility" ]]; then
           echo "Accessiblity support requested, forcing build."  &&
           QT_ACCESS="-accessibility"