diff --git a/kdegraphics/PKGBUILD b/kdegraphics/PKGBUILD
index ebcf7c3a3..4e9c13843 100644
--- a/kdegraphics/PKGBUILD
+++ b/kdegraphics/PKGBUILD
@@ -7,17 +7,10 @@
 # include global config
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
-
-
-# original name (used for the source and pkgnames)
-_origname=kdegraphics
-
-
-
 #
 # package info
 #
-pkgbase=('kdegraphics')
+pkgbase="kdegraphics"
 pkgname=('kdegraphics-common'
          'kdegraphics-doc'
          'kdegraphics-gwenview'
@@ -30,7 +23,7 @@ pkgname=('kdegraphics-common'
 
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=2
+pkgrel=1
 
 pkgdesc="split package"
 url="http://www.kde.org"
@@ -42,17 +35,15 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' "kdelibs>=${_kdever}" "kdebase-runti
              'poppler-qt' 'libspectre' 'sane' 'chmlib' 'libdjvu' 'lcms' 'qca'
              'qimageblitz' 'ebook-tools' 'libxxf86vm')
 
-source=("$_mirror/${_origname}-$_kdever.tar.bz2")
-
-md5sums=("`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`")
+source=("$_mirror/${pkgbase}-$_kdever.tar.bz2")
+md5sums=("`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`")
 
 #
 # build function
 #
 build()
 {
-	cd ${srcdir}/${_origname}-${pkgver}
-	#msg "apply patches ..."
+	cd ${srcdir}/${pkgbase}-${pkgver}
 
 	msg "starting build ..."
 	cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
@@ -63,8 +54,6 @@ build()
 	make || return 1
 }
 
-
-
 #
 # split-install functions
 #
@@ -76,42 +65,42 @@ package_kdegraphics-common()
 	#       but nvidia providing libgl does not depend on libxxf86vm
 	depends=("kdelibs>=${_kdever}" "kdebase-runtime>=${_kdever}" 'libxxf86vm' 'sane' 'lcms')
 	replaces=('libkexiv2' 'libkdcraw')
-	conflicts=("kdemod-${_origname}-common")
-	groups=("kde" "kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	provides=('libkexiv2' 'libkdcraw' 'ksaneplugin' 'kgamma' 'svgpart')
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kgamma ksaneplugin libs strigi-analyzer svgpart thumbnailers"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 
 	# WORKAROUND -> install cmake modules
-	install -D -m644 $srcdir/${_origname}-${pkgver}/cmake/modules/FindKSane.cmake \
-		$pkgdir/usr/share/apps/cmake/modules/FindKSane.cmake
+	#install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindKSane.cmake \
+	#	$pkgdir/usr/share/apps/cmake/modules/FindKSane.cmake
 
-#	# include our patches into the package
-#	ls -1 ${startdir}/* | grep patch &>/dev/null 2>&1
-#	if [ "$?" = "0" ]; then
-#		warning "incuding patches into package"
-#		mkdir -p ${pkgdir}/usr/share/chakra/patches/${_origname} &>/dev/null
-#		for i in ${startdir}/*.patch; do
-#			msg "$i"
-#			cp $i ${pkgdir}/usr/share/chakra/patches/${_origname}/ &>/dev/null
-#		done
-#	else
-#		warning "no patches found, skipping to include them into the package..."
-#	fi
+	# include our patches into the package
+	ls -1 ${startdir}/* | grep patch &>/dev/null 2>&1
+	if [ "${?}" = "0" ]; then
+		warning "incuding patches into package"
+		mkdir -p ${pkgdir}/usr/share/chakra/patches/${pkgbase} &>/dev/null
+		for i in ${startdir}/*.patch; do
+			msg "$i"
+			cp $i ${pkgdir}/usr/share/chakra/patches/${pkgbase}/ &>/dev/null
+		done
+	else
+		warning "no patches found, skipping to include them into the package..."
+	fi
 }
 
 package_kdegraphics-doc()
 {
 	pkgdesc="KDE Graphics - Documentation"
-	groups=("kde-complete" "${_origname}" "kde-doc" "kde-uninstall")
+	groups=("kde" "${pkgbase}" "kde-doc" "kde-uninstall")
 
 	splitdirs="doc"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -119,14 +108,13 @@ package_kdegraphics-doc()
 package_kdegraphics-gwenview()
 {
 	pkgdesc="A full-featured picture viewer and maniplator"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-gwenview")
-	groups=("kde" "kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="gwenview"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -134,14 +122,13 @@ package_kdegraphics-gwenview()
 package_kdegraphics-kamera()
 {
 	pkgdesc="Digital camera io_slave for Konqueror"
-	depends=("${_origname}-common>=${_kdever}" 'libgphoto2')
-	conflicts=("kdemod-${_origname}-kamera")
-	groups=("kde" "kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}" 'libgphoto2')
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kamera"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 
@@ -154,14 +141,13 @@ package_kdegraphics-kamera()
 package_kdegraphics-kcolorchooser()
 {
 	pkgdesc="A color value editor and a color picker"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kcolorchooser")
-	groups=("kde" "kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kcolorchooser"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -169,14 +155,13 @@ package_kdegraphics-kcolorchooser()
 package_kdegraphics-kolourpaint()
 {
 	pkgdesc="An easy-to-use paint program designed for everyday tasks like drawing simple diagrams,logos,icons and editing screenshots"
-	depends=("${_origname}-common>=${_kdever}" 'qimageblitz')
-	conflicts=("kdemod-${_origname}-kolourpaint")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}" 'qimageblitz')
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kolourpaint"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -184,14 +169,13 @@ package_kdegraphics-kolourpaint()
 package_kdegraphics-kruler()
 {
 	pkgdesc="A ruler in inch, centimeter and pixel to check distances on the screen"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kruler")
-	groups=("kde" "kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kruler"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -199,14 +183,13 @@ package_kdegraphics-kruler()
 package_kdegraphics-ksnapshot()
 {
 	pkgdesc="Make snapshots of the screen contents"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-ksnapshot")
-	groups=("kde" "kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="ksnapshot"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -214,15 +197,14 @@ package_kdegraphics-ksnapshot()
 package_kdegraphics-okular()
 {
 	pkgdesc="An all-purpose document viewer"
-	depends=("${_origname}-common>=${_kdever}" 'qimageblitz' 'poppler-qt'
+	depends=("${pkgbase}-common>=${_kdever}" 'qimageblitz' 'poppler-qt'
                  'chmlib' 'libdjvu' 'libspectre' 'ebook-tools')
-	conflicts=("kdemod-${_origname}-okular")
-	groups=("kde" "kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="okular"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }