kde-base: pkgmove KDE PIM to kde-apps/

hanetzer · Dec 29, 2015 · 0d5c6a9 · 0d5c6a9
1 parent d504999
commit 0d5c6a9
Show file tree

Hide file tree

Showing 230 changed files with 556 additions and 531 deletions.
diff --git a/app-accessibility/simon/metadata.xml b/app-accessibility/simon/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
  <herd>accessibility</herd>
  <use>
- <flag name='kdepim'>Use <pkg>kde-base/kdepimlibs</pkg></flag>
+ <flag name='kdepim'>Use <pkg>kde-apps/kdepimlibs</pkg></flag>
  <flag name='opencv'>Use <pkg>media-libs/opencv</pkg></flag>
  <flag name='sphinx'>Build sphinx backend (pulls <pkg>app-accessibility/julius</pkg> if disabled</flag>
  </use>

diff --git a/app-accessibility/simon/simon-0.4.1.ebuild b/app-accessibility/simon/simon-0.4.1.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
  x11-libs/libX11
  x11-libs/libXtst
  x11-libs/qwt:6
- kdepim? ( kde-base/kdepimlibs:4 )
+ kdepim? ( kde-apps/kdepimlibs:4 )
  libsamplerate? ( media-libs/libsamplerate )
  nls? (
  kde-apps/kde4-l10n

diff --git a/app-office/calligra/calligra-2.8.5.ebuild b/app-office/calligra/calligra-2.8.5.ebuild
@@ -104,7 +104,7 @@ RDEPEND="
  jpeg2k? ( media-libs/openjpeg:0 )
  kdcraw? ( $(add_kdeapps_dep libkdcraw) )
  kde? ( $(add_kdebase_dep kactivities) )
- kdepim? ( $(add_kdebase_dep kdepimlibs) )
+ kdepim? ( $(add_kdeapps_dep kdepimlibs) )
  lcms? (
  media-libs/lcms:2
  x11-libs/libX11

diff --git a/app-office/calligra/calligra-2.8.7.ebuild b/app-office/calligra/calligra-2.8.7.ebuild
@@ -103,7 +103,7 @@ RDEPEND="
  jpeg2k? ( media-libs/openjpeg:0 )
  kdcraw? ( $(add_kdeapps_dep libkdcraw) )
  kde? ( $(add_kdebase_dep kactivities) )
- kdepim? ( $(add_kdebase_dep kdepimlibs) )
+ kdepim? ( $(add_kdeapps_dep kdepimlibs) )
  lcms? (
  media-libs/lcms:2
  x11-libs/libX11

diff --git a/app-office/calligra/calligra-2.9.6.ebuild b/app-office/calligra/calligra-2.9.6.ebuild
@@ -93,7 +93,7 @@ RDEPEND="
  jpeg2k? ( media-libs/openjpeg:0 )
  kdcraw? ( $(add_kdeapps_dep libkdcraw) )
  kde? ( $(add_kdebase_dep kactivities) )
- kdepim? ( $(add_kdebase_dep kdepimlibs) )
+ kdepim? ( $(add_kdeapps_dep kdepimlibs) )
  lcms? (
  media-libs/lcms:2
  x11-libs/libX11

diff --git a/app-office/calligra/calligra-2.9.7.ebuild b/app-office/calligra/calligra-2.9.7.ebuild
@@ -93,7 +93,7 @@ RDEPEND="
  jpeg2k? ( media-libs/openjpeg:0 )
  kdcraw? ( $(add_kdeapps_dep libkdcraw) )
  kde? ( $(add_kdebase_dep kactivities) )
- kdepim? ( $(add_kdebase_dep kdepimlibs) )
+ kdepim? ( $(add_kdeapps_dep kdepimlibs) )
  lcms? (
  media-libs/lcms:2
  x11-libs/libX11

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
@@ -93,7 +93,7 @@ RDEPEND="
  jpeg2k? ( media-libs/openjpeg:0 )
  kdcraw? ( $(add_kdeapps_dep libkdcraw) )
  kde? ( $(add_kdebase_dep kactivities) )
- kdepim? ( $(add_kdebase_dep kdepimlibs) )
+ kdepim? ( $(add_kdeapps_dep kdepimlibs) )
  lcms? (
  media-libs/lcms:2
  x11-libs/libX11

diff --git a/app-office/kmymoney/kmymoney-4.7.2.ebuild b/app-office/kmymoney/kmymoney-4.7.2.ebuild
@@ -27,7 +27,7 @@ COMMON_DEPEND="
  >=app-office/libalkimia-4.3.2
  dev-libs/gmp:0
  dev-libs/libgpg-error
- $(add_kdebase_dep kdepimlibs)
+ $(add_kdeapps_dep kdepimlibs)
  x11-misc/shared-mime-info
  calendar? ( dev-libs/libical:= )
  hbci? (

diff --git a/app-office/kraft/kraft-0.58.ebuild b/app-office/kraft/kraft-0.58.ebuild
@@ -22,7 +22,7 @@ DEPEND="
  dev-qt/qtcore:4
  dev-qt/qtgui:4
  dev-qt/qtsql:4[mysql,sqlite]
- $(add_kdebase_dep kdepimlibs)
+ $(add_kdeapps_dep kdepimlibs)
 "
 RDEPEND="${DEPEND}"
 

diff --git a/app-office/kraft/kraft-0.59.ebuild b/app-office/kraft/kraft-0.59.ebuild
@@ -22,7 +22,7 @@ DEPEND="
  dev-qt/qtcore:4
  dev-qt/qtgui:4
  dev-qt/qtsql:4[mysql,sqlite]
- $(add_kdebase_dep kdepimlibs)
+ $(add_kdeapps_dep kdepimlibs)
 "
 RDEPEND="${DEPEND}"
 

diff --git a/app-office/skrooge/skrooge-1.10.0.ebuild b/app-office/skrooge/skrooge-1.10.0.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
- $(add_kdebase_dep kdepimlibs)
+ $(add_kdeapps_dep kdepimlibs)
  app-crypt/qca:2[qt4(+)]
  dev-db/sqlite:3
  dev-libs/grantlee:0

diff --git a/app-office/skrooge/skrooge-1.12.5.ebuild b/app-office/skrooge/skrooge-1.12.5.ebuild
@@ -20,7 +20,7 @@ IUSE="debug"
 
 DEPEND="
  $(add_kdebase_dep kactivities)
- $(add_kdebase_dep kdepimlibs)
+ $(add_kdeapps_dep kdepimlibs)
  app-crypt/qca:2[qt4]
  dev-db/sqlite:3
  dev-libs/grantlee:0

diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
@@ -28,7 +28,7 @@ case ${KMNAME} in
  case ${PN} in
  akregator|kaddressbook|kjots|kmail|knode|knotes|korganizer|ktimetracker)
  IUSE+=" +kontact"
- RDEPEND+=" kontact? ( $(add_kdebase_dep kontact) )"
+ RDEPEND+=" kontact? ( $(add_kdeapps_dep kontact) )"
  ;;
  esac
  ;;

diff --git a/kde-base/akonadiconsole/Manifest → kde-apps/akonadiconsole/Manifest b/kde-base/akonadiconsole/Manifest → kde-apps/akonadiconsole/Manifest
diff --git a/...nadiconsole/akonadiconsole-4.14.10.ebuild → ...nadiconsole/akonadiconsole-4.14.10.ebuild b/...nadiconsole/akonadiconsole-4.14.10.ebuild → ...nadiconsole/akonadiconsole-4.14.10.ebuild
@@ -14,8 +14,8 @@ IUSE="debug"
 
 DEPEND="
  >=app-office/akonadi-server-1.12.90
- $(add_kdebase_dep kdepimlibs 'akonadi(+)')
- $(add_kdebase_dep kdepim-common-libs)
+ $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
+ $(add_kdeapps_dep kdepim-common-libs)
 "
 RDEPEND="${DEPEND}"
 

diff --git a/...onadiconsole/akonadiconsole-4.14.8.ebuild → ...onadiconsole/akonadiconsole-4.14.8.ebuild b/...onadiconsole/akonadiconsole-4.14.8.ebuild → ...onadiconsole/akonadiconsole-4.14.8.ebuild
@@ -14,8 +14,8 @@ IUSE="debug"
 
 DEPEND="
  >=app-office/akonadi-server-1.12.90
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs)
+ $(add_kdeapps_dep kdepimlibs)
+ $(add_kdeapps_dep kdepim-common-libs)
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-base/calendarjanitor/metadata.xml → kde-apps/akonadiconsole/metadata.xml b/kde-base/calendarjanitor/metadata.xml → kde-apps/akonadiconsole/metadata.xml
diff --git a/kde-base/akregator/Manifest → kde-apps/akregator/Manifest b/kde-base/akregator/Manifest → kde-apps/akregator/Manifest
diff --git a/kde-base/akregator/akregator-4.14.10.ebuild → kde-apps/akregator/akregator-4.14.10.ebuild b/kde-base/akregator/akregator-4.14.10.ebuild → kde-apps/akregator/akregator-4.14.10.ebuild
@@ -15,8 +15,8 @@ KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
- $(add_kdebase_dep kdepimlibs 'akonadi(+)')
- $(add_kdebase_dep kdepim-common-libs)
+ $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
+ $(add_kdeapps_dep kdepim-common-libs)
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-base/akregator/akregator-4.14.8.ebuild → kde-apps/akregator/akregator-4.14.8.ebuild b/kde-base/akregator/akregator-4.14.8.ebuild → kde-apps/akregator/akregator-4.14.8.ebuild
@@ -15,8 +15,8 @@ KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs)
+ $(add_kdeapps_dep kdepimlibs)
+ $(add_kdeapps_dep kdepim-common-libs)
 "
 RDEPEND="${DEPEND}"
 

diff --git a/...se/akregator/akregator-4.4.2015.06.ebuild → ...ps/akregator/akregator-4.4.2015.06.ebuild b/...se/akregator/akregator-4.4.2015.06.ebuild → ...ps/akregator/akregator-4.4.2015.06.ebuild
@@ -15,8 +15,8 @@ IUSE="debug"
 
 DEPEND="
  $(add_kdebase_dep kdelibs '' 4.6)
- $(add_kdebase_dep kdepimlibs '' 4.6)
- $(add_kdebase_dep libkdepim)
+ $(add_kdeapps_dep kdepimlibs '' 4.6)
+ $(add_kdeapps_dep libkdepim '' 4.4.2015)
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-base/kdepim-meta/metadata.xml → kde-apps/akregator/metadata.xml b/kde-base/kdepim-meta/metadata.xml → kde-apps/akregator/metadata.xml
diff --git a/kde-base/blogilo/Manifest → kde-apps/blogilo/Manifest b/kde-base/blogilo/Manifest → kde-apps/blogilo/Manifest
diff --git a/kde-base/blogilo/blogilo-4.14.10.ebuild → kde-apps/blogilo/blogilo-4.14.10.ebuild b/kde-base/blogilo/blogilo-4.14.10.ebuild → kde-apps/blogilo/blogilo-4.14.10.ebuild
@@ -15,8 +15,8 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
- $(add_kdebase_dep kdepim-common-libs)
- $(add_kdebase_dep kdepimlibs 'akonadi(+)')
+ $(add_kdeapps_dep kdepim-common-libs)
+ $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
  >=net-libs/libkgapi-2.2.0:4
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-base/blogilo/blogilo-4.14.8.ebuild → kde-apps/blogilo/blogilo-4.14.8.ebuild b/kde-base/blogilo/blogilo-4.14.8.ebuild → kde-apps/blogilo/blogilo-4.14.8.ebuild
@@ -15,8 +15,8 @@ KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
- $(add_kdebase_dep kdepim-common-libs)
- $(add_kdebase_dep kdepimlibs)
+ $(add_kdeapps_dep kdepim-common-libs)
+ $(add_kdeapps_dep kdepimlibs)
  >=net-libs/libkgapi-2.2.0:4
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-base/blogilo/blogilo-4.4.2015.06.ebuild → kde-apps/blogilo/blogilo-4.4.2015.06.ebuild b/kde-base/blogilo/blogilo-4.4.2015.06.ebuild → kde-apps/blogilo/blogilo-4.4.2015.06.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
- $(add_kdebase_dep kdepimlibs '' 4.6)
+ $(add_kdeapps_dep kdepimlibs '' 4.6)
 "
 RDEPEND="${DEPEND}
  !kde-misc/bilbo

diff --git a/kde-base/ktnef/metadata.xml → kde-apps/blogilo/metadata.xml b/kde-base/ktnef/metadata.xml → kde-apps/blogilo/metadata.xml
diff --git a/kde-base/calendarjanitor/Manifest → kde-apps/calendarjanitor/Manifest b/kde-base/calendarjanitor/Manifest → kde-apps/calendarjanitor/Manifest
diff --git a/...darjanitor/calendarjanitor-4.14.10.ebuild → ...darjanitor/calendarjanitor-4.14.10.ebuild b/...darjanitor/calendarjanitor-4.14.10.ebuild → ...darjanitor/calendarjanitor-4.14.10.ebuild
@@ -16,8 +16,8 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
- $(add_kdebase_dep kdepim-common-libs)
- $(add_kdebase_dep kdepimlibs 'akonadi(+)')
+ $(add_kdeapps_dep kdepim-common-libs)
+ $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
 "
 RDEPEND="${DEPEND}"
 

diff --git a/...ndarjanitor/calendarjanitor-4.14.8.ebuild → ...ndarjanitor/calendarjanitor-4.14.8.ebuild b/...ndarjanitor/calendarjanitor-4.14.8.ebuild → ...ndarjanitor/calendarjanitor-4.14.8.ebuild
@@ -16,8 +16,8 @@ KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
- $(add_kdebase_dep kdepim-common-libs)
- $(add_kdebase_dep kdepimlibs)
+ $(add_kdeapps_dep kdepim-common-libs)
+ $(add_kdeapps_dep kdepimlibs)
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-base/kdepim-kresources/metadata.xml → kde-apps/calendarjanitor/metadata.xml b/kde-base/kdepim-kresources/metadata.xml → kde-apps/calendarjanitor/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+ <herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-apps/drkonqi/drkonqi-15.08.3.ebuild b/kde-apps/drkonqi/drkonqi-15.08.3.ebuild
@@ -12,7 +12,7 @@ KEYWORDS=" ~amd64 ~x86"
 IUSE="debug"
 
 DEPEND="
- $(add_kdebase_dep kdepimlibs)
+ $(add_kdeapps_dep kdepimlibs)
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-apps/drkonqi/drkonqi-4.14.3.ebuild b/kde-apps/drkonqi/drkonqi-4.14.3.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
- $(add_kdebase_dep kdepimlibs)
+ $(add_kdeapps_dep kdepimlibs)
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-apps/gpgmepp/gpgmepp-4.14.10.ebuild b/kde-apps/gpgmepp/gpgmepp-4.14.10.ebuild
@@ -21,7 +21,7 @@ DEPEND="
 # boost is not linked to, but headers which include it are installed
 # bug #418071
 RDEPEND="${DEPEND}
- !kde-base/kdepimlibs:4
+ !kde-apps/kdepimlibs:4
 "
 
 PATCHES=( "${FILESDIR}/kdepimlibs-4.9.1-boostincludes.patch" )

diff --git a/kde-base/kabcclient/Manifest → kde-apps/kabcclient/Manifest b/kde-base/kabcclient/Manifest → kde-apps/kabcclient/Manifest
diff --git a/...base/kabcclient/kabcclient-4.14.10.ebuild → ...apps/kabcclient/kabcclient-4.14.10.ebuild b/...base/kabcclient/kabcclient-4.14.10.ebuild → ...apps/kabcclient/kabcclient-4.14.10.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
- $(add_kdebase_dep kdepimlibs 'akonadi(+)')
+ $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-base/kabcclient/kabcclient-4.14.8.ebuild → kde-apps/kabcclient/kabcclient-4.14.8.ebuild b/kde-base/kabcclient/kabcclient-4.14.8.ebuild → kde-apps/kabcclient/kabcclient-4.14.8.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
- $(add_kdebase_dep kdepimlibs)
+ $(add_kdeapps_dep kdepimlibs)
 "
 RDEPEND="${DEPEND}"
 

diff --git a/.../kabcclient/kabcclient-4.4.2015.06.ebuild → .../kabcclient/kabcclient-4.4.2015.06.ebuild b/.../kabcclient/kabcclient-4.4.2015.06.ebuild → .../kabcclient/kabcclient-4.4.2015.06.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
- $(add_kdebase_dep kdepimlibs '' 4.6)
+ $(add_kdeapps_dep kdepimlibs '' 4.6)
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-base/kaddressbook/metadata.xml → kde-apps/kabcclient/metadata.xml b/kde-base/kaddressbook/metadata.xml → kde-apps/kabcclient/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+ <herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kaddressbook/Manifest → kde-apps/kaddressbook/Manifest b/kde-base/kaddressbook/Manifest → kde-apps/kaddressbook/Manifest
diff --git a/.../kaddressbook/kaddressbook-4.14.10.ebuild → .../kaddressbook/kaddressbook-4.14.10.ebuild b/.../kaddressbook/kaddressbook-4.14.10.ebuild → .../kaddressbook/kaddressbook-4.14.10.ebuild
@@ -15,8 +15,8 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
- $(add_kdebase_dep kdepimlibs 'akonadi(+)')
- $(add_kdebase_dep kdepim-common-libs)
+ $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
+ $(add_kdeapps_dep kdepim-common-libs)
  dev-libs/grantlee:0
  !kde-base/contactthemeeditor
 "
@@ -44,9 +44,9 @@ KMLOADLIBS="kdepim-common-libs"
 pkg_postinst() {
  kde4-meta_pkg_postinst
 
- if ! has_version kde-base/kdepim-kresources:${SLOT}; then
+ if ! has_version kde-apps/kdepim-kresources:${SLOT}; then
  echo
- elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
+ elog "For groupware functionality, please install kde-apps/kdepim-kresources:${SLOT}"
  echo
  fi
 }
diff --git a/...e/kaddressbook/kaddressbook-4.14.8.ebuild → ...s/kaddressbook/kaddressbook-4.14.8.ebuild b/...e/kaddressbook/kaddressbook-4.14.8.ebuild → ...s/kaddressbook/kaddressbook-4.14.8.ebuild
@@ -15,8 +15,8 @@ KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs)
+ $(add_kdeapps_dep kdepimlibs)
+ $(add_kdeapps_dep kdepim-common-libs)
  dev-libs/grantlee:0
  !kde-base/contactthemeeditor
 "
@@ -44,9 +44,9 @@ KMLOADLIBS="kdepim-common-libs"
 pkg_postinst() {
  kde4-meta_pkg_postinst
 
- if ! has_version kde-base/kdepim-kresources:${SLOT}; then
+ if ! has_version kde-apps/kdepim-kresources:${SLOT}; then
  echo
- elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
+ elog "For groupware functionality, please install kde-apps/kdepim-kresources:${SLOT}"
  echo
  fi
 }
diff --git a/...dressbook/kaddressbook-4.4.2015.06.ebuild → ...dressbook/kaddressbook-4.4.2015.06.ebuild b/...dressbook/kaddressbook-4.4.2015.06.ebuild → ...dressbook/kaddressbook-4.4.2015.06.ebuild
@@ -14,9 +14,9 @@ IUSE="debug"
 
 DEPEND="
  $(add_kdebase_dep kdelibs '' 4.13.1)
- $(add_kdebase_dep kdepimlibs '' 4.13.1)
- $(add_kdebase_dep libkdepim)
- $(add_kdebase_dep libkleo)
+ $(add_kdeapps_dep kdepimlibs '' 4.13.1)
+ $(add_kdeapps_dep libkdepim '' 4.4.2015)
+ $(add_kdeapps_dep libkleo '' 4.4.2015)
 "
 RDEPEND="${DEPEND}"
 
@@ -33,8 +33,8 @@ KMLOADLIBS="libkdepim"
 src_install() {
  kde4-meta_src_install
 
- # file collision with kde-base/kdepimlibs-4.14.9
- rm -f "${ED}/usr/share/kde4/servicetypes/kaddressbookimprotocol.desktop"
+ # file collision with kde-apps/kdepimlibs-4.14.9
+ rm -f "${ED}usr/share/kde4/servicetypes/kaddressbookimprotocol.desktop" || die
 
  # install additional headers needed by kresources
  insinto "${KDEDIR}"/include/${PN}
@@ -45,9 +45,9 @@ src_install() {
 pkg_postinst() {
  kde4-meta_pkg_postinst
 
- if ! has_version kde-base/kdepim-kresources:${SLOT}; then
+ if ! has_version kde-apps/kdepim-kresources:${SLOT}; then
  echo
- elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
+ elog "For groupware functionality, please install kde-apps/kdepim-kresources:${SLOT}"
  echo
  fi
 }
diff --git a/kde-base/kalarm/metadata.xml → kde-apps/kaddressbook/metadata.xml b/kde-base/kalarm/metadata.xml → kde-apps/kaddressbook/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+ <herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kalarm/Manifest → kde-apps/kalarm/Manifest b/kde-base/kalarm/Manifest → kde-apps/kalarm/Manifest
diff --git a/.../files/kalarm-4.4.11.1-underlinking.patch → .../files/kalarm-4.4.11.1-underlinking.patch b/.../files/kalarm-4.4.11.1-underlinking.patch → .../files/kalarm-4.4.11.1-underlinking.patch
diff --git a/kde-base/kalarm/kalarm-4.14.10.ebuild → kde-apps/kalarm/kalarm-4.14.10.ebuild b/kde-base/kalarm/kalarm-4.14.10.ebuild → kde-apps/kalarm/kalarm-4.14.10.ebuild
@@ -15,8 +15,8 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
- $(add_kdebase_dep kdepimlibs 'akonadi(+)')
- $(add_kdebase_dep kdepim-common-libs)
+ $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
+ $(add_kdeapps_dep kdepim-common-libs)
  media-libs/phonon[qt4]
  x11-libs/libX11
 "