Wed Mar 6 00:03:52 PST 2013

3 files changed, 61 insertions, 124 deletions

diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD
index 262ba43ef..025956b03 100644
--- a/extra/kdesdk/PKGBUILD
+++ b/extra/kdesdk/PKGBUILD
@@ -1,27 +1,23 @@
-# $Id: PKGBUILD 178963 2013-03-01 10:21:15Z andrea $
+# $Id: PKGBUILD 179478 2013-03-05 16:12:26Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=kdesdk
 pkgname=('kdesdk-cervisia'
          'kdesdk-dolphin-plugins'
+         'kdesdk-dev-utils'
+         'kdesdk-dev-scripts'
          'kdesdk-kapptemplate'
          'kdesdk-kcachegrind'
-         'kdesdk-kioslave'
-         'kdesdk-kmtrace'
+         'kdesdk-kioslaves'
          'kdesdk-kompare'
-         'kdesdk-kpartloader'
-         'kdesdk-kprofilemethod'
-         'kdesdk-kstartperf'
-         'kdesdk-kuiviewer'
          'kdesdk-lokalize'
          'kdesdk-okteta'
          'kdesdk-poxml'
-         'kdesdk-scripts'
-         'kdesdk-strigi-analyzer'
+         'kdesdk-strigi-analyzers'
          'kdesdk-umbrello')
-pkgver=4.10.0
-pkgrel=2
+pkgver=4.10.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -30,8 +26,8 @@ makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs'
              'kdebase-lib')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
         'fix-python2-path.patch')
-sha1sums=('e4aaaf5357ecb3dfc87014abb01af807731557df'
-          '923cabd7a877cf9a68efeb24fbf3d5827e1d949e')
+sha1sums=('14a4ceb5ce4690230f365fc01159f4f46c73da9a'
+          '07db42bbcae402c292eebf002e549b04162621c5')
 
 build() {
 	cd ${srcdir}/${pkgbase}-${pkgver}
@@ -56,22 +52,32 @@ package_kdesdk-cervisia() {
 	install='kdesdk-cervisia.install'
 	cd $srcdir/build/cervisia
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/cervisia
-	make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-dev-utils() {
+    pkgdesc='Small utilities for developers using KDE/Qt libs/frameworks'
+    url="https://projects.kde.org/projects/kde/kdesdk/kde-dev-utils"
+    depends=('kdebase-runtime')
+    conflicts=('kdesdk-kmtrace' 'kdesdk-kpartloader' 'kdesdk-kprofilemethod'
+              'kdesdk-kstartperf' 'kdesdk-kuiviewer')
+    replaces=('kdesdk-kmtrace' 'kdesdk-kpartloader' 'kdesdk-kprofilemethod'
+              'kdesdk-kstartperf' 'kdesdk-kuiviewer')
+    install='kdesdk-dev-utils.install'
+    cd $srcdir/build/kde-dev-utils
+    make DESTDIR=$pkgdir install
 }
 
 package_kdesdk-dolphin-plugins() {
 	pkgdesc='Extra Dolphin plugins'
+    url="https://projects.kde.org/projects/kde/kdesdk/dolphin-plugins"
 	depends=('kdebase-dolphin')
     optdepends=('bzr: bazaar support'
                 'git: git support'
                 'mercurial: hg support'
                 'subversion: svn support')
 	install='kdesdk.install'
-    for i in bazaar git hg svn; do
-        cd $srcdir/build/dolphin-plugins/$i
-    	make DESTDIR=$pkgdir install
-    done
+    cd $srcdir/build/dolphin-plugins
+  	make DESTDIR=$pkgdir install
 }
 
 package_kdesdk-kapptemplate() {
@@ -81,8 +87,6 @@ package_kdesdk-kapptemplate() {
 	install='kdesdk.install'
 	cd $srcdir/build/kapptemplate
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kapptemplate
-	make DESTDIR=$pkgdir install
 }
 
 package_kdesdk-kcachegrind() {
@@ -93,28 +97,20 @@ package_kdesdk-kcachegrind() {
 	install='kdesdk-kcachegrind.install'
 	cd $srcdir/build/kcachegrind
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kcachegrind
-	make DESTDIR=$pkgdir install
 
-        # Fix python 2 path
-        sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-                "${pkgdir}"/usr/bin/hotshot2calltree
+    # Fix python 2 path
+    sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+      "${pkgdir}"/usr/bin/hotshot2calltree
 }
 
-package_kdesdk-kioslave() {
-	pkgdesc='KDED Subversion Module'
+package_kdesdk-kioslaves() {
+	pkgdesc='KIO-Slaves'
+    url="https://projects.kde.org/projects/kde/kdesdk/kdesdk-kioslaves"
 	depends=('kdebase-runtime' 'subversion')
-        install='kdesdk.install'
-	cd $srcdir/build/kioslave
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kmtrace() {
-	pkgdesc='A KDE tool to assist with malloc debugging using glibc´s "mtrace" functionality'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/kmtrace
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmtrace
+    install='kdesdk.install'
+    replaces=('kdesdk-kioslave')
+    conflicts=('kdesdk-kioslave')
+	cd $srcdir/build/kdesdk-kioslaves
 	make DESTDIR=$pkgdir install
 }
 
@@ -125,61 +121,20 @@ package_kdesdk-kompare() {
 	install='kdesdk-kompare.install'
 	cd $srcdir/build/kompare
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kompare
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kpartloader() {
-	pkgdesc='A test application for KParts'
-	depends=('kdebase-runtime')
-	install='kdesdk.install'
-	cd $srcdir/build/kpartloader
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kprofilemethod() {
-	pkgdesc='Macros helping to profile'
-	cd $srcdir/build/kprofilemethod
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kspy() {
-	pkgdesc='An Object Inspector for Qt/KDE applications'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/kspy
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kstartperf() {
-	pkgdesc='Startup time measurement tool for KDE applications'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/kstartperf
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kuiviewer() {
-	pkgdesc='Qt Designer UI File Viewer'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/development/kuiviewer/"
-	install='kdesdk-kuiviewer.install'
-	cd $srcdir/build/kuiviewer
-	make DESTDIR=$pkgdir install
 }
 
 package_kdesdk-lokalize() {
 	pkgdesc='Computer-Aided Translation System'
-	depends=('kdebase-runtime' 'kdebindings-python2' 'kdesdk-strigi-analyzer')
+	depends=('kdebase-runtime' 'kdebindings-python2' 'kdesdk-strigi-analyzers')
 	url="http://kde.org/applications/development/lokalize/"
 	optdepends=('translate-toolkit: enable extra python script')
 	install='kdesdk-lokalize.install'
 	cd $srcdir/build/lokalize
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/lokalize
-	make DESTDIR=$pkgdir install
 
-  # Fix python 2 path
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/share/apps/lokalize/scripts/odf/xliffmerge.py
+    # Fix python 2 path
+    sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+      "${pkgdir}"/usr/share/apps/lokalize/scripts/odf/xliffmerge.py
 }
 
 package_kdesdk-okteta() {
@@ -191,45 +146,39 @@ package_kdesdk-okteta() {
 	install='kdesdk-okteta.install'
 	cd $srcdir/build/okteta
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/okteta
-	make DESTDIR=$pkgdir install
 }
 
 package_kdesdk-poxml() {
 	pkgdesc='Translates DocBook XML files using gettext po files'
+    url="https://projects.kde.org/projects/kde/kdesdk/poxml"
 	depends=('qt4' 'antlr2')
 	cd $srcdir/build/poxml
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/poxml
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-scheck() {
-	pkgdesc='An interface style to highlight accel and style guide conflicts'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/scheck
-	make DESTDIR=$pkgdir install
 }
 
-package_kdesdk-scripts() {
-	pkgdesc='KDE SDK scripts'
+package_kdesdk-dev-scripts() {
+	pkgdesc='Scripts and setting files useful during development of KDE software'
+    url="https://projects.kde.org/projects/kde/kdesdk/kde-dev-scripts"
 	depends=('python2')
-	cd $srcdir/build/scripts
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/scripts
+    replaces=('kdesdk-scripts')
+    conflicts=('kdesdk-scripts')
+	cd $srcdir/build/kde-dev-scripts
 	make DESTDIR=$pkgdir install
 
-  # Fix python 2 path
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/bin/{zonetab2pot,kde-systemsettings-tree}.py
-  sed -i 's|#! /usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/bin/{kdelnk2desktop.py,kde_generate_export_header}
+    # Fix python 2 path
+    sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+      "${pkgdir}"/usr/bin/{zonetab2pot,kde-systemsettings-tree}.py
+    sed -i 's|#! /usr/bin/env python|#!/usr/bin/env python2|' \
+      "${pkgdir}"/usr/bin/{kdelnk2desktop.py,kde_generate_export_header}
 }
 
-package_kdesdk-strigi-analyzer() {
-	pkgdesc='Strigi-Analyzer for KDE SDK'
+package_kdesdk-strigi-analyzers() {
+	pkgdesc='Analyzer plugins for strigi'
+    url="https://projects.kde.org/projects/kde/kdesdk/kdesdk-strigi-analyzers"
 	depends=('kdelibs')
-	cd $srcdir/build/strigi-analyzer
+    conflicts=('kdesdk-strigi-analyzer')
+    replaces=('kdesdk-strigi-analyzer')
+	cd $srcdir/build/kdesdk-strigi-analyzers
 	make DESTDIR=$pkgdir install
 }
 
@@ -241,10 +190,8 @@ package_kdesdk-umbrello() {
 	install='kdesdk-umbrello.install'
 	cd $srcdir/build/umbrello
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/umbrello
-	make DESTDIR=$pkgdir install
-
-  # Fix python 2 path
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/share/apps/umbrello/headings/heading.py
+    
+    # Fix python 2 path
+    sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+      "${pkgdir}"/usr/share/apps/umbrello/headings/heading.py
 }
diff --git a/extra/kdesdk/fix-python2-path.patch b/extra/kdesdk/fix-python2-path.patch
index 720487031..9e9a442c0 100644
--- a/extra/kdesdk/fix-python2-path.patch
+++ b/extra/kdesdk/fix-python2-path.patch
@@ -20,13 +20,3 @@
  
  try: convert()
  except: print 'error occured'
---- kdesdk-4.5.80/scripts/svn2log.sh~	2010-11-24 11:46:24.863333337 +0100
-+++ kdesdk-4.5.80/scripts/svn2log.sh	2010-11-24 11:46:24.896666669 +0100
-@@ -17,6 +17,6 @@
- svn cat svn://anonsvn.kde.org/home/kde/trunk/kde-common/accounts > /tmp/accounts.$PPID
- 
- echo "Creating changelog...";
--svn log -v --xml $1 | python $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8
-+svn log -v --xml $1 | python2 $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8
- 
- rm /tmp/accounts.$PPID
\ No newline at end of file
diff --git a/extra/kdesdk/kdesdk-kuiviewer.install b/extra/kdesdk/kdesdk-dev-utils.install
index 5495fb1b5..5495fb1b5 100644
--- a/extra/kdesdk/kdesdk-kuiviewer.install
+++ b/extra/kdesdk/kdesdk-dev-utils.install