multiple: Undo renamings

kde-baseapps-konsole/PKGBUILD

@@ -4,7 +4,7 @@
 # Include global configuration
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
-pkgname=konsole
+pkgname=kde-baseapps-konsole
 pkgver=${_kdever}
 pkgrel=1
 pkgdesc="KDE terminal emulator"
@@ -15,18 +15,18 @@ license=('GPL' 'LGPL' 'FDL')
 depends=("kde-runtime>=${_kdever}" "kde-baseapps>=${_kdever}")
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kde-baseapps' 'kde-uninstall')
-provides=('kdebase-konsole' 'kde-baseapps-konsole')
-conflicts=('kdebase-konsole' 'kde-baseapps-konsole')
-replaces=('kdebase-konsole' 'kde-baseapps-konsole')
+provides=('kdebase-konsole')
+conflicts=('kdebase-konsole')
+replaces=('kdebase-konsole')
 categories=('system')
 options=('docs' '!header' 'debug' 'log')
-source=("$_mirror/$pkgname-$_kdever.tar.xz"
+source=("$_mirror/konsole-$_kdever.tar.xz"
         "Shell_new.diff")
-sha256sums=(`grep $pkgname-$_kdever.tar.xz  ../checksums.txt | cut -d " " -f1`
+sha256sums=(`grep konsole-$_kdever.tar.xz  ../checksums.txt | cut -d " " -f1`
             '3a3f0fbc43cbeef19fecc5d6602ac97ff9982990a22b933e0f7c8333559e9d8e')
 
 build() {
-    cd "${srcdir}/$pkgname-$pkgver"
+    cd "${srcdir}/konsole-$pkgver"
     patch -p1 -i ${srcdir}/Shell_new.diff
     cmake . \
         -DCMAKE_BUILD_TYPE=${_build_type} \
@@ -36,6 +36,6 @@ build() {
 }
 
 package() {
-    cd "${srcdir}/$pkgname-$pkgver"
+    cd "${srcdir}/konsole-$pkgver"
     make DESTDIR="${pkgdir}" install
 }

kde-baseapps/PKGBUILD

@@ -6,9 +6,9 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgbase="kde-baseapps"
 pkgname=('kde-baseapps'
-        'dolphin'
-        'konqueror'
-        'konqueror-plugins')
+        'kde-baseapps-dolphin'
+        'kde-baseapps-konqueror'
+        'kde-baseapps-konqueror-plugins')
 arch=('x86_64')
 pkgver=${_kdever}
 pkgrel=1
@@ -97,13 +97,13 @@ package_kde-baseapps() {
     sed -i -e "s~Icon=kfind~Icon=edit-find~g" ${pkgdir}/usr/share/applications/kde4/kfind.desktop
 }
 
-package_dolphin() {
+package_kde-baseapps-dolphin() {
     pkgdesc="The default KDE file manager"
     depends=("${pkgbase}>=${_kdever}")
     groups=("${pkgbase}" "kde" "kde-complete" "kde-uninstall")
-    conflicts=("kdebase-dolphin" "kde-baseapps-dolphin")
-    provides=("kdebase-dolphin" "kde-baseapps-dolphin")
-    replaces=("kdebase-dolphin" "kde-baseapps-dolphin")
+    conflicts=("kdebase-dolphin")
+    provides=("kdebase-dolphin")
+    replaces=("kdebase-dolphin")
     categories=('system')
     install=dolphin.install
 
@@ -114,13 +114,13 @@ package_dolphin() {
     done
 }
 
-package_konqueror() {
+package_kde-baseapps-konqueror() {
     pkgdesc="The default KDE web browser"
     depends=("${pkgbase}>=${_kdever}" "dolphin>=${_kdever}")
     groups=("${pkgbase}" "kde" "kde-minimal" "kde-uninstall")
-    conflicts=("kdebase-konqueror" "kde-baseapps-konqueror")
-    provides=("kdebase-konqueror" "kde-baseapps-konqueror")
-    replaces=("kdebase-konqueror" "kde-baseapps-konqueror")
+    conflicts=("kdebase-konqueror")
+    provides=("kdebase-konqueror")
+    replaces=("kdebase-konqueror")
     categories=('network')
     install=konqueror.install
 
@@ -149,7 +149,7 @@ package_konqueror() {
     cp -v ${srcdir}/konqueror.desktop ${pkgdir}/usr/share/kde4/services/konqueror.desktop
 }
 
-package_konqueror-plugins() {
+package_kde-baseapps-konqueror-plugins() {
     pkgdesc="KDE Base Applications - Extra plugins for Konqueror"
     depends=("konqueror>=${_kdever}" 'tidyhtml')
     groups=("${pkgbase}" "kde" "kde-minimal" "kde-uninstall")

kdenetwork-kdnssd/PKGBUILD

@@ -4,26 +4,24 @@
 # Include global configuration
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
-pkgname="kdnssd"
+pkgname="kdenetwork-kdnssd"
 arch=('x86_64')
 pkgver=${_kdever}
 pkgrel=1
 pkgdesc='Monitors the network for DNS-SD services'
 depends=("kdelibs>=${_kdever}")
-provides=("kdenetwork-kdnssd")
-replaces=("kdenetwork-kdnssd")
-conflicts=("kdenetwork-common" "kdenetwork-doc" "kdenetwork-kdnssd")
+conflicts=("kdenetwork-common" "kdenetwork-doc")
 groups=("kde" "kdenetwork" "kde-uninstall")
 categories=('network')
 url="http://www.kde.org"
 license=('GPL' 'LGPL' 'FDL')
 options=('docs' '!header' 'debug' 'log')
 makedepends=('pkg-config' 'cmake' 'automoc4' 'docbook-xsl')
-source=("$_mirror/$pkgname-$_kdever.tar.xz")
-sha256sums=(`grep $pkgname-$_kdever.tar.xz  ../checksums.txt | cut -d " " -f1`)
+source=("$_mirror/kdnssd-$_kdever.tar.xz")
+sha256sums=(`grep kdnssd-$_kdever.tar.xz  ../checksums.txt | cut -d " " -f1`)
 
 build() {
-    cd ${srcdir}/$pkgname-$pkgver
+    cd ${srcdir}/kdnssd-$pkgver
     cmake . \
         -DCMAKE_BUILD_TYPE=${_build_type} \
         -DCMAKE_INSTALL_PREFIX=${_installprefix} \
@@ -33,6 +31,6 @@ build() {
 }
 
 package() {
-    cd ${srcdir}/$pkgname-$pkgver
+    cd ${srcdir}/kdnssd-$pkgver
     make DESTDIR=${pkgdir} install
 }

kdenetwork-kget/PKGBUILD

@@ -4,7 +4,7 @@
 # Include global configuration
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
-pkgname="kget"
+pkgname="kdenetwork-kget"
 arch=('x86_64')
 pkgver=${_kdever}
 pkgrel=1
@@ -20,11 +20,11 @@ install=kdenetwork.install
 license=('GPL' 'LGPL' 'FDL')
 options=('docs' '!header' 'debug' 'log')
 makedepends=('pkg-config' 'cmake' 'automoc4' 'docbook-xsl')
-source=("$_mirror/$pkgname-$_kdever.tar.xz")
-sha256sums=(`grep $pkgname-$_kdever.tar.xz  ../checksums.txt | cut -d " " -f1`)
+source=("$_mirror/kget-$_kdever.tar.xz")
+sha256sums=(`grep kget-$_kdever.tar.xz  ../checksums.txt | cut -d " " -f1`)
 
 build() {
-    cd ${srcdir}/$pkgname-$pkgver
+    cd ${srcdir}/kget-$pkgver
     cmake . \
         -DCMAKE_BUILD_TYPE=${_build_type} \
         -DCMAKE_INSTALL_PREFIX=${_installprefix} \
@@ -34,6 +34,6 @@ build() {
 }
 
 package() {
-    cd ${srcdir}/$pkgname-$pkgver
+    cd ${srcdir}/kget-$pkgver
     make DESTDIR=${pkgdir} install
 }

kdenetwork-kppp/PKGBUILD

@@ -4,7 +4,7 @@
 # Include global configuration
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
-pkgname="kppp"
+pkgname="kdenetwork-kppp"
 arch=('x86_64')
 pkgver=${_kdever}
 pkgrel=1
@@ -20,11 +20,11 @@ install=kdenetwork.install
 license=('GPL' 'LGPL' 'FDL')
 options=('docs' '!header' 'debug' 'log')
 makedepends=('pkg-config' 'cmake' 'automoc4' 'docbook-xsl')
-source=("$_mirror/$pkgname-$_kdever.tar.xz")
-sha256sums=(`grep $pkgname-$_kdever.tar.xz  ../checksums.txt | cut -d " " -f1`)
+source=("$_mirror/kppp-$_kdever.tar.xz")
+sha256sums=(`grep kppp-$_kdever.tar.xz  ../checksums.txt | cut -d " " -f1`)
 
 build() {
-    cd ${srcdir}/$pkgname-$pkgver
+    cd ${srcdir}/kppp-$pkgver
     cmake . \
         -DCMAKE_BUILD_TYPE=${_build_type} \
         -DCMAKE_INSTALL_PREFIX=${_installprefix} \
@@ -34,6 +34,6 @@ build() {
 }
 
 package() {
-    cd ${srcdir}/$pkgname-$pkgver
+    cd ${srcdir}/kppp-$pkgver
     make DESTDIR=${pkgdir} install
 }

kdenetwork-krfb/PKGBUILD

@@ -4,7 +4,7 @@
 # Include global configuration
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
-pkgname="krfb"
+pkgname="kdenetwork-krfb"
 arch=('x86_64')
 pkgver=${_kdever}
 pkgrel=1
@@ -23,11 +23,11 @@ url="http://www.kde.org"
 license=('GPL' 'LGPL' 'FDL')
 options=('docs' '!header' 'debug' 'log')
 makedepends=('pkg-config' 'cmake' 'automoc4' 'docbook-xsl')
-source=("$_mirror/$pkgname-$_kdever.tar.xz")
-sha256sums=(`grep $pkgname-$_kdever.tar.xz  ../checksums.txt | cut -d " " -f1`)
+source=("$_mirror/krfb-$_kdever.tar.xz")
+sha256sums=(`grep krfb-$_kdever.tar.xz  ../checksums.txt | cut -d " " -f1`)
 
 build() {
-    cd ${srcdir}/$pkgname-$pkgver
+    cd ${srcdir}/krfb-$pkgver
     cmake . \
         -DCMAKE_BUILD_TYPE=${_build_type} \
         -DCMAKE_INSTALL_PREFIX=${_installprefix} \
@@ -37,6 +37,6 @@ build() {
 }
 
 package() {
-    cd ${srcdir}/$pkgname-$pkgver
+    cd ${srcdir}/krfb-$pkgver
     make DESTDIR=${pkgdir} install
 }

kdesdk-dolphin-plugins/PKGBUILD

@@ -4,30 +4,27 @@
 # Include global configuration
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
-pkgname="dolphin-plugins"
+pkgname="kdesdk-dolphin-plugins"
 arch=('x86_64')
 pkgver=${_kdever}
 pkgrel=1
 pkgdesc='Dolphin plugins'
 url="http://www.kde.org"
 license=('GPL' 'LGPL' 'FDL')
-depends=("dolphin>=${_kdever}" 'subversion' 'git' "kdesdk-kompare>=${_kdever}")
+depends=("kde-baseapps-dolphin>=${_kdever}" 'subversion' 'git' "kdesdk-kompare>=${_kdever}")
 optdepends=('bzr: bazaar support'
             'git: git support'
             'mercurial: hg support'
             'subversion: svn support')
-provides=('kdesdk-dolphin-plugins')
-conflicts=('kdesdk-dolphin-plugins')
-replaces=('kdesdk-dolphin-plugins')
 categories=('programming')
-install=dolphin-plugins.install
+install=${pkgname}.install
 options=('docs' '!header' 'debug' 'log')
 makedepends=('pkg-config' 'cmake' 'automoc4' 'docbook-xsl')
-source=("$_mirror/$pkgname-$_kdever.tar.xz")
-sha256sums=(`grep $pkgname-$_kdever.tar.xz  ../checksums.txt | cut -d " " -f1`)
+source=("$_mirror/dolphin-plugins-$_kdever.tar.xz")
+sha256sums=(`grep dolphin-plugins-$_kdever.tar.xz  ../checksums.txt | cut -d " " -f1`)
 
 build() {
-    cd ${srcdir}/$pkgname-${pkgver}
+    cd ${srcdir}/dolphin-plugins-${pkgver}
     cmake . \
         -DCMAKE_BUILD_TYPE=${_build_type} \
         -DCMAKE_INSTALL_PREFIX=${_installprefix} \
@@ -36,6 +33,6 @@ build() {
 }
 
 package() {
-    cd ${srcdir}/$pkgname-${pkgver}
+    cd ${srcdir}/dolphin-plugins-${pkgver}
     make DESTDIR=${pkgdir} install 
 }

kdesdk-kate/PKGBUILD

@@ -6,9 +6,9 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgbase='kate'
-pkgname=('kate'
-         'kwrite'
-         'katepart')
+pkgname=('kdesdk-kate'
+         'kde-baseapps-kwrite'
+         'kde-baseapps-katepart')
 pkgver=${_kdever}
 pkgrel=1
 arch=('x86_64')
@@ -46,7 +46,7 @@ build() {
     make
 }
 
-package_katepart() {
+package_kde-baseapps-katepart() {
     pkgdesc='A fast and feature-rich text editor component'
     url='http://kate-editor.org/about-katepart/'
     depends=('kdelibs')
@@ -59,7 +59,7 @@ package_katepart() {
     make DESTDIR="${pkgdir}" install
 }
 
-package_kwrite() {
+package_kde-baseapps-kwrite() {
     pkgdesc='KDE text editor'
     depends=('kde-runtime'
              'katepart')
@@ -78,16 +78,13 @@ package_kwrite() {
     make DESTDIR="${pkgdir}" install
 }
 
-package_kate() {
+package_kdesdk-kate() {
     pkgdesc='KDE Advanced Text Editor'
     depends=('kde-runtime'
              'katepart'
              'qjson')
     groups=('kde'
             'kde-uninstall')
-    provides=("kdesdk-kate")
-    replaces=("kdesdk-kate")
-    conflicts=("kdesdk-kate")
     url='http://www.kde.org/applications/utilities/kate/'
     install='kate.install'
     optdepends=('konsole: Open a terminal in Kate'