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

[Pierre Schmitz]

    Date: Tuesday, September 1, 2009 @ 11:04:00
  Author: pierre
Revision: 50781

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

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

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

----------+
 PKGBUILD |   52 +++++++++++-----------------------------------------
 1 file changed, 11 insertions(+), 41 deletions(-)


Property changes on: kdegraphics/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /kdegraphics/trunk:1-48836
   + /kdegraphics/trunk:1-50778

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-09-01 15:03:52 UTC (rev 50780)
+++ extra-i686/PKGBUILD	2009-09-01 15:04:00 UTC (rev 50781)
@@ -8,14 +8,10 @@
          'kdegraphics-kgamma'
          'kdegraphics-kolourpaint'
          'kdegraphics-kruler'
-         'kdegraphics-ksaneplugin'
          'kdegraphics-ksnapshot'
          'kdegraphics-libs'
-         'kdegraphics-okular'
-         'kdegraphics-strigi-analyzer'
-         'kdegraphics-svgpart'
-         'kdegraphics-thumbnailers')
-pkgver=4.3.0
+         'kdegraphics-okular')
+pkgver=4.3.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -25,7 +21,7 @@
              'poppler-qt' 'libspectre' 'sane' 'chmlib' 'libdjvu' 'lcms' 'qca'
              'qimageblitz' 'ebook-tools' 'libxxf86vm')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('5d3838a2575a82777f00ced90332c41a')
+md5sums=('1657ac3a8773db36b2d89e0bdb332d8b')
 
 build() {
 	cd $srcdir
@@ -80,7 +76,7 @@
 
 package_kdegraphics-kolourpaint() {
 	pkgdesc='Paint Program'
-	depends=('kdelibs' 'kdebase-runtime' 'qimageblitz')
+	depends=('kdelibs' 'kdebase-runtime' 'qimageblitz' 'kdegraphics-libs')
 	install='kdegraphics.install'
 	cd $srcdir/build/kolourpaint
 	make DESTDIR=$pkgdir install
@@ -98,13 +94,6 @@
 	make DESTDIR=$pkgdir install
 }
 
-package_kdegraphics-ksaneplugin() {
-	pkgdesc='KDE Scan Service'
-	depends=('kdegraphics-libs')
-	cd $srcdir/build/ksaneplugin
-	make DESTDIR=$pkgdir install
-}
-
 package_kdegraphics-ksnapshot() {
 	pkgdesc='Screen Capture Program'
 	depends=('kdelibs' 'kdebase-runtime')
@@ -119,17 +108,20 @@
 	pkgdesc='Support library for KDE Graphics Software'
 	groups=()
 	depends=('kdelibs' 'sane' 'lcms')
-	replaces=('libkexiv2' 'libkdcraw')
+	conflicts=('kdegraphics-ksaneplugin' 'kdegraphics-strigi-analyzer' 'kdegraphics-svgpart' 'kdegraphics-thumbnailers')
+	replaces=('libkexiv2' 'libkdcraw' 'kdegraphics-ksaneplugin' 'kdegraphics-strigi-analyzer' 'kdegraphics-svgpart' 'kdegraphics-thumbnailers')
 	install='kdegraphics.install'
-	cd $srcdir/build/libs
-	make DESTDIR=$pkgdir install
+	for i in libs ksaneplugin strigi-analyzer svgpart thumbnailers; do
+		cd $srcdir/build/${i}
+		make DESTDIR=$pkgdir install
+	done
 	install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindKSane.cmake \
 		$pkgdir/usr/share/apps/cmake/modules/FindKSane.cmake
 }
 
 package_kdegraphics-okular() {
 	pkgdesc='Document Viewer'
-	depends=('kdelibs' 'kdebase-runtime' 'qimageblitz' 'qca' 'poppler-qt' 'chmlib' 'libdjvu' 'libspectre' 'ebook-tools')
+	depends=('kdelibs' 'kdebase-runtime' 'qimageblitz' 'qca' 'poppler-qt' 'chmlib' 'libdjvu' 'libspectre' 'ebook-tools' 'kdegraphics-libs')
 	install='kdegraphics.install'
 	cd $srcdir/build/okular
 	make DESTDIR=$pkgdir install
@@ -138,25 +130,3 @@
 	install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindOkular.cmake \
 		$pkgdir/usr/share/apps/cmake/modules/FindOkular.cmake
 }
-
-package_kdegraphics-strigi-analyzer() {
-	pkgdesc='Strigi-Analyzer for KDE Graphics Software'
-	depends=('strigi')
-	groups=(${groups[@]} 'strigi-analyzer')
-	cd $srcdir/build/strigi-analyzer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-svgpart() {
-	pkgdesc='Svg Part'
-	depends=('kdelibs')
-	cd $srcdir/build/svgpart
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-thumbnailers() {
-	pkgdesc='Thumb creator for KDE Graphics Software'
-	depends=('kdebase-runtime' 'kdegraphics-libs')
-	cd $srcdir/build/thumbnailers
-	make DESTDIR=$pkgdir install
-}