[arch-commits] Commit in kdepim/repos (extra-i686 extra-i686/PKGBUILD)

Pierre Schmitz pierre at archlinux.org
Tue Sep 1 15:11:37 UTC 2009


    Date: Tuesday, September 1, 2009 @ 11:11:37
  Author: pierre
Revision: 50796

Merged revisions 50556 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/kdepim/trunk

........
  r50556 | pierre | 2009-08-29 22:11:36 +0200 (Sa, 29 Aug 2009) | 1 line
  
  prepare KDE 4.3.1; package cleanup
........

Modified:
  kdepim/repos/extra-i686/	(properties)
  kdepim/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |  133 ++++++++++++-------------------------------------------------
 1 file changed, 28 insertions(+), 105 deletions(-)


Property changes on: kdepim/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /kdepim/trunk:1-48881
   + /kdepim/trunk:1-50795

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-09-01 15:11:00 UTC (rev 50795)
+++ extra-i686/PKGBUILD	2009-09-01 15:11:37 UTC (rev 50796)
@@ -4,39 +4,29 @@
 pkgbase=kdepim
 pkgname=('kdepim-akregator'
          'kdepim-console'
-         'kdepim-icons'
          'kdepim-kaddressbook'
          'kdepim-kalarm'
          'kdepim-kjots'
          'kdepim-kleopatra'
          'kdepim-kmail'
-         'kdepim-kmailcvt'
          'kdepim-knode'
          'kdepim-knotes'
          'kdepim-kontact'
-         'kdepim-kontactinterfaces'
          'kdepim-korganizer'
          'kdepim-kpilot'
          'kdepim-kresources'
-         'kdepim-ksendemail'
          'kdepim-ktimetracker'
          'kdepim-libkdepim'
-         'kdepim-libkleo'
-         'kdepim-libkpgp'
-         'kdepim-libksieve'
-         'kdepim-mimelib'
-         'kdepim-plugins'
-         'kdepim-strigi-analyzer'
          'kdepim-wizards')
-pkgver=4.3.0
+pkgver=4.3.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdepim')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdelibs-experimental' 'kdepimlibs' 'kdepim-runtime' 'gnokii' 'libxss' 'kdebase-runtime' 'pilot-link')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdelibs-experimental' 'kdepimlibs' 'kdepim-runtime' 'gnokii' 'libxss' 'kdebase-runtime' 'pilot-link' 'kde-agent')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('ddc887f19ef9cd454f4f3226c955aaaf')
+md5sums=('1029bc586f29c262f5f60eb079623e62')
 
 build() {
 	cd $srcdir
@@ -67,16 +57,9 @@
 	make DESTDIR=$pkgdir install
 }
 
-package_kdepim-icons() {
-	pkgdesc='KDE PIM icons'
-	groups=()
-	cd $srcdir/build/icons
-	make DESTDIR=$pkgdir install
-}
-
 package_kdepim-kaddressbook() {
 	pkgdesc='Address Manager'
-	depends=('kdepim-libkdepim' 'kdebase-runtime' 'gnokii' 'kdepim-libkleo')
+	depends=('kdepim-libkdepim' 'kdebase-runtime' 'gnokii')
 	install='kdepim.install'
 	cd $srcdir/build/kaddressbook
 	make DESTDIR=$pkgdir install
@@ -106,7 +89,7 @@
 
 package_kdepim-kleopatra() {
 	pkgdesc='Kleopatra Sign/Encrypt Files'
-	depends=('kdepim-libkdepim' 'kdebase-runtime' 'kdepim-libkleo')
+	depends=('kdepim-libkdepim' 'kdebase-runtime')
 	cd $srcdir/build/kleopatra
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/kleopatra
@@ -115,24 +98,19 @@
 
 package_kdepim-kmail() {
 	pkgdesc='Mail Client'
-	depends=('kdepim-libkdepim' 'kdebase-runtime' 'kdepim-mimelib' 'kdepim-libksieve' 'kdepim-libkpgp' 'kdepim-libkleo')
+	depends=('kdepim-libkdepim' 'kdebase-runtime')
 	install='kdepim.install'
-	cd $srcdir/build/kmail
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmail
-	make DESTDIR=$pkgdir install
+	conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' 'kdepim-mimelib' 'kdepim-plugins')
+	replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' 'kdepim-mimelib' 'kdepim-plugins')
+	for i in kmail doc/kmail mimelib libksieve plugins ksendemail kmailcvt; do
+		cd $srcdir/build/${i}
+		make DESTDIR=$pkgdir install
+	done
 }
 
-package_kdepim-kmailcvt() {
-	pkgdesc='Mail Client'
-	depends=('kdepim-kmail' 'kdelibs')
-	cd $srcdir/build/kmailcvt
-	make DESTDIR=$pkgdir install
-}
-
 package_kdepim-knode() {
 	pkgdesc='News Reader'
-	depends=('kdepim-libkpgp' 'kdebase-runtime' 'kdepim-libkdepim')
+	depends=('kdebase-runtime' 'kdepim-libkdepim')
 	install='kdepim.install'
 	cd $srcdir/build/knode
 	make DESTDIR=$pkgdir install
@@ -152,21 +130,16 @@
 
 package_kdepim-kontact() {
 	pkgdesc='Personal Information Manager'
-	depends=('kdebase-runtime' 'kdepim-korganizer' 'kdepim-kontactinterfaces')
+	depends=('kdebase-runtime' 'kdepim-korganizer')
 	install='kdepim.install'
-	cd $srcdir/build/kontact
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kontact
-	make DESTDIR=$pkgdir install
+	conflcits=('kdepim-kontactinterfaces')
+	replaces=('kdepim-kontactinterfaces')
+	for i in kontact doc/kontact kontactinterfaces; do
+		cd $srcdir/build/${i}
+		make DESTDIR=$pkgdir install
+	done
 }
 
-package_kdepim-kontactinterfaces() {
-	pkgdesc='Personal Information Manager'
-	depends=('kdelibs')
-	cd $srcdir/build/kontactinterfaces
-	make DESTDIR=$pkgdir install
-}
-
 package_kdepim-korganizer() {
 	pkgdesc='Calendar and Scheduling Program'
 	depends=('kdepim-libkdepim' 'kdebase-runtime' 'kdelibs-experimental')
@@ -194,16 +167,9 @@
 	make DESTDIR=$pkgdir install
 }
 
-package_kdepim-ksendemail() {
-	pkgdesc='KDE Command Line Emailer'
-	depends=('kdebase-runtime' 'kdelibs')
-	cd $srcdir/build/ksendemail
-	make DESTDIR=$pkgdir install
-}
-
 package_kdepim-ktimetracker() {
 	pkgdesc='Personal Time Tracker'
-	depends=('kdebase-runtime' 'kdepim-kresources' 'libxss')
+	depends=('kdebase-runtime' 'kdepim-libkdepim' 'kdepim-kresources' 'libxss')
 	install='kdepim.install'
 	cd $srcdir/build/ktimetracker
 	make DESTDIR=$pkgdir install
@@ -214,61 +180,18 @@
 package_kdepim-libkdepim() {
 	pkgdesc='Library for KDE PIM'
 	groups=()
-	depends=('kdepimlibs' 'kdepim-icons')
-	cd $srcdir/build/libkdepim
-	make DESTDIR=$pkgdir install
-}
-
-package_kdepim-libkleo() {
-	pkgdesc='Library for Kleopatra'
-	groups=()
 	depends=('kdepimlibs' 'kde-agent')
-	cd $srcdir/build/libkleo
-	make DESTDIR=$pkgdir install
+	conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' 'kdepim-strigi-analyzer')
+	replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' 'kdepim-strigi-analyzer')
+	for i in libkdepim icons libkleo libkpgp strigi-analyzer; do
+		cd $srcdir/build/${i}
+		make DESTDIR=$pkgdir install
+	done
 }
 
-package_kdepim-libkpgp() {
-	pkgdesc='KDE pgp abstraction layer'
-	groups=()
-	depends=('kdelibs' 'kde-agent')
-	cd $srcdir/build/libkpgp
-	make DESTDIR=$pkgdir install
-}
-
-package_kdepim-libksieve() {
-	pkgdesc='KDE sieve library'
-	groups=()
-	depends=('kdelibs')
-	cd $srcdir/build/libksieve
-	make DESTDIR=$pkgdir install
-}
-
-package_kdepim-mimelib() {
-	pkgdesc='KDE mime library'
-	groups=()
-	depends=('kdelibs')
-	cd $srcdir/build/mimelib
-	make DESTDIR=$pkgdir install
-}
-
-package_kdepim-plugins() {
-	pkgdesc='KDE PIM plugins'
-	depends=('kdepim-kmail')
-	cd $srcdir/build/plugins
-	make DESTDIR=$pkgdir install
-}
-
-package_kdepim-strigi-analyzer() {
-	pkgdesc='Strigi-Analyzer for KDE PIM'
-	depends=('kdepimlibs')
-	groups=(${groups[@]} 'strigi-analyzer')
-	cd $srcdir/build/strigi-analyzer
-	make DESTDIR=$pkgdir install
-}
-
 package_kdepim-wizards() {
 	pkgdesc='KDE Groupware Wizard'
-	depends=('kdebase-runtime' 'kdepim-kresources')
+	depends=('kdebase-runtime' 'kdepim-libkdepim' 'kdepim-kresources')
 	cd $srcdir/build/wizards
 	make DESTDIR=$pkgdir install
 }




More information about the arch-commits mailing list