kdelibs: further cleanup preparing for kde4 switch

kde/kdelibs/config.in

@@ -18,10 +18,6 @@ if pkgcheck kdelibs X ; then
  	menu_begin MENU_PKG_KDE 'KDE Package Options'
 		text 'Install prefix for KDE Packages' \
 			SDECFG_PKG_KDE_CORE_PREFIX "opt/kde"
-		bool 'Increase optimization possibilities (--enable-final)' \
-			SDECFG_PKG_KDE_ENABLE_FINAL 0
-		bool 'Generate KDE Library Documentation' \
-			SDECFG_PKG_KDE_APIDOX 0
 	menu_end
 fi
 

kde/kdelibs/kdelibs.cache

@@ -1,77 +1,73 @@
 
-[TIMESTAMP] 1133990501 Wed Dec  7 22:21:41 2005
-[BUILDTIME] 255 (9) ERROR
-[SIZE] 365.24 MB, 16113 files
+[TIMESTAMP] 1239828186 Wed Apr 15 23:43:06 2009
+[BUILDTIME] 1180 (5)
+[SIZE] 307.77 MB, 4218 files
 
-[DEP] acl
-[DEP] alsa-lib
-[DEP] arts
 [DEP] aspell
 [DEP] attr
-[DEP] autoconf
+[DEP] automoc4
 [DEP] bash
 [DEP] binutils
 [DEP] bzip2
-[DEP] xorg-cf-files
+[DEP] cmake
 [DEP] coreutils
-[DEP] cups
 [DEP] diffutils
+[DEP] e2fsprogs
 [DEP] expat
-[DEP] gamin
+[DEP] fhs
 [DEP] findutils
+[DEP] fixesproto
+[DEP] flex
 [DEP] fontconfig
 [DEP] freetype
+[DEP] gamin
 [DEP] gawk
 [DEP] gcc
-[DEP] gettext
+[DEP] glib
 [DEP] glibc
 [DEP] grep
-[DEP] imake
+[DEP] ilmbase
+[DEP] inputproto
 [DEP] jasper
-[DEP] libart_lgpl23
-[DEP] libdnet
-[DEP] libdrm
 [DEP] libice
-[DEP] libidn
 [DEP] libjpeg
 [DEP] libpng
 [DEP] libsm
-[DEP] libtiff
+[DEP] libungif
 [DEP] libx11
 [DEP] libxau
+[DEP] libxcb
 [DEP] libxcursor
 [DEP] libxdmcp
 [DEP] libxext
 [DEP] libxfixes
 [DEP] libxft
-[DEP] libxinerama
 [DEP] libxml
-[DEP] libxmu
-[DEP] libxrandr
+[DEP] libxpm
 [DEP] libxrender
 [DEP] libxslt
 [DEP] libxt
-[DEP] libxxf86vm
+[DEP] libxtst
 [DEP] linux-header
-[DEP] lua
-[DEP] m4
 [DEP] make
-[DEP] mdnsresponder
 [DEP] mesa
-[DEP] mktemp
-[DEP] net-tools
+[DEP] nas
 [DEP] openexr
 [DEP] openssl
-[DEP] patch
 [DEP] pcre
 [DEP] perl
+[DEP] phonon
 [DEP] pkgconfig
-[DEP] qt3
+[DEP] qt4
 [DEP] renderproto
 [DEP] sed
+[DEP] shared-mime-info
+[DEP] soprano
+[DEP] strigi
 [DEP] sysfiles
 [DEP] tar
 [DEP] util-linux
+[DEP] valgrind
 [DEP] xextproto
 [DEP] xproto
 [DEP] zlib

kde/kdelibs/kdelibs.conf

@@ -14,16 +14,6 @@
 # GNU General Public License can be found in the file COPYING.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
-if [ "$SDECFG_PKG_KDE_APIDOX" ] ; then
-	echo_status "KDE library documentation will be generated."
-	var_insert makeinstopt " " "apidox"
-fi
-
-# If kerberos config is available use it.
-if [ -n "$KRB5_CONFIG" ] ; then
-	var_append extraconfopt " " "--with-gssapi=yes"
-fi
-
 kde_pm() {
 
 	cat > $root/etc/profile.d/kde <<-EOP

kde/kdelibs/kdelibs.desc

@@ -30,7 +30,7 @@
 [M] Nagy Karoly Gabriel <nagy.karoly@opensde.org>
 
 [C] extra/development extra/desktop/kde
-[F] FPIC-QUIRK KDE
+[F] KDE
 
 [L] GPL
 [S] Stable

kde/kdelibs/parse-config

@@ -15,11 +15,11 @@
 
 if hasflag KDE; then
 	if [ "$prefix_auto" = 1 ] ; then
-		if [ "$pkg" == "kdelibs" ]; then
+		if [ "$pkg" == "automoc4" ]; then
 			prefix="${SDECFG_PKG_KDE_CORE_PREFIX:-opt/kde}"
 		else
-			pkgprefix -t kdelibs
-			prefix=`pkgprefix kdelibs`
+			pkgprefix -t automoc4
+			prefix=`pkgprefix automoc4`
 		fi
 		set_confopt
 	fi
@@ -29,26 +29,15 @@ if hasflag KDE; then
 	export PATH="$(pkgprefix bindir qt4):$PATH"
 	export LD_LIBRARY_PATH="$QTDIR/${libdir##*/}:/$prefix/${libdir##*/}:$LD_LIBRARY_PATH"
 
-	# some feature and optimization settings ...
-	if pkginstalled openldap; then
-		pkgprefix -t openldap
-		var_append confopt " " "--with-ldap=$root/$( pkgprefix openldap )"
-	fi
-
-	# FIXME: no conditionals?
-	var_append confopt " " "--with-xinerama --enable-dnotify"
-
-	[ "$SDECFG_PKG_KDE_ENABLE_FINAL" != "1" ] ||
-		var_append confopt " " "--enable-final"
-
-	if [ $arch = x86 ]; then
-		var_append confopt " " "--enable-fast-malloc=full"
-	fi
-
-	if [[ $libdir != *lib ]]; then
-		var_append confopt " " "--enable-libsuffix=${libdir##*/lib}"
-	fi
+	kde_cmake()
+	{
+                mkdir build; cd build
+                var_remove_regex confopt ' ' '--.*'
+                var_remove_regex extraconfopt ' ' '--.*'
+                var_append extraconfopt " " "-DCMAKE_INSTALL_PREFIX=/$prefix -DCMAKE_LIBRARY_PATH=$libdir"
+                eval cmake $confopt $extraconfopt ..
+	}
 
-	# HACK around test for kdelibs
-	hook_add preconf 5 "mkdir build; cd build; .. $confopt $extraconfopt"
+	hook_add preconf 3 "kde_cmake"
 fi
+