[arch-commits] Commit in kdebase/trunk (PKGBUILD)

[Pierre Schmitz]

    Date: Saturday, August 29, 2009 @ 16:11:03
  Author: pierre
Revision: 50547

prepare KDE 4.3.1; package cleanup

Modified:
  kdebase/trunk/PKGBUILD

----------+
 PKGBUILD |   32 +++++++++-----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-08-29 20:10:59 UTC (rev 50546)
+++ PKGBUILD	2009-08-29 20:11:03 UTC (rev 50547)
@@ -6,16 +6,14 @@
          'kdebase-kappfinder'
          'kdebase-kdepasswd'
          'kdebase-kdialog'
-         'kdebase-keditbookmarks'
          'kdebase-kfind'
          'kdebase-kinfocenter'
          'kdebase-konqueror'
          'kdebase-konsole'
          'kdebase-kwrite'
          'kdebase-lib'
-         'kdebase-nsplugins'
          'kdebase-plasma')
-pkgver=4.3.0
+pkgver=4.3.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -23,7 +21,7 @@
 groups=('kde' 'kdebase')
 makedepends=('kdebase-workspace' 'pkgconfig' 'cmake' 'automoc4' 'libraw1394')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('6de0b96b78504d8f5fcdee819d080fb1')
+md5sums=('10dae53739f1e8bd6f5f615443649e4f')
 
 build() {
 	cd $srcdir
@@ -72,13 +70,6 @@
 	make DESTDIR=$pkgdir install
 }
 
-package_kdebase-keditbookmarks() {
-	pkgdesc='a utility for editing the KDE bookmark store'
-	depends=('kdebase-runtime' 'kdelibs')
-	cd $srcdir/build/apps/keditbookmarks
-	make DESTDIR=$pkgdir install
-}
-
 package_kdebase-kfind() {
 	pkgdesc='Find Files/Folders'
 	depends=('kdebase-runtime' 'kdebase-lib')
@@ -100,12 +91,14 @@
 
 package_kdebase-konqueror() {
 	pkgdesc='KDE File Manager & Web Browser'
-	depends=('kdebase-runtime' 'kdebase-lib' 'kdebase-nsplugins' 'kdebase-keditbookmarks')
+	depends=('kdebase-runtime' 'kdebase-lib')
 	install='kdebase.install'
-	cd $srcdir/build/apps/konqueror
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/apps/doc/konqueror
-	make DESTDIR=$pkgdir install
+	conflicts=('kdebase-keditbookmarks' 'kdebase-nsplugins')
+	replaces=('kdebase-keditbookmarks' 'kdebase-nsplugins')
+	for i in konqueror doc/konqueror keditbookmarks nsplugins; do
+		cd $srcdir/build/apps/${i}
+		make DESTDIR=$pkgdir install
+	done
 }
 
 package_kdebase-konsole() {
@@ -134,13 +127,6 @@
 	make DESTDIR=$pkgdir install
 }
 
-package_kdebase-nsplugins() {
-	pkgdesc='Configure the browser plugins'
-	depends=('kdebase-runtime' 'kdelibs')
-	cd $srcdir/build/apps/nsplugins
-	make DESTDIR=$pkgdir install
-}
-
 package_kdebase-plasma() {
 	pkgdesc='Display the contents of folders (User´s home folder as default)'
 	depends=('kdebase-workspace' 'kdebase-lib')