Merge from KDE/FreeBSD in preparation for KDE SC 4.14:

common changes:
- don't use deprecated USE_KDE4=kdehier
- drop deprecated @dirrmtry and use absolute path instead of @cwd

databases/akonadi:
- Update to 1.13.0
- add upstream patch to really avoid building Akonadi's unit tests

devel/grantlee:
- update to 0.5.1

devel/libkgapi:
- update to 2.2.0

devel/libkolab:
- update to 0.5.3

multimedia/phonon and multimedia/phonon-designerplugin:
- update to 4.8.1

multimedia/phonon-gstreamer:
- update to 4.8.0
- switch from GStreamer 0.10.x to 1.x

multimedia/phonon-vlc:
- update to 0.8.0

10 files changed, 26 insertions, 52 deletions

diff --git a/multimedia/phonon-designerplugin/Makefile b/multimedia/phonon-designerplugin/Makefile
index 1ee08c61085a..20956f552f8c 100644
--- a/multimedia/phonon-designerplugin/Makefile
+++ b/multimedia/phonon-designerplugin/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	phonon
-PORTVERSION=	4.7.2
-PORTREVISION=	1
+PORTVERSION=	4.8.1
 CATEGORIES=	multimedia kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
 PKGNAMESUFFIX=	-designerplugin
diff --git a/multimedia/phonon-gstreamer/Makefile b/multimedia/phonon-gstreamer/Makefile
index 8f4d51170df7..c4b5e6dd4715 100644
--- a/multimedia/phonon-gstreamer/Makefile
+++ b/multimedia/phonon-gstreamer/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	phonon
-PORTVERSION=	4.7.2
-PORTREVISION=	1
+PORTVERSION=	4.8.0
 CATEGORIES=	multimedia kde
-MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}/src
+MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}
 PKGNAMESUFFIX=	-gstreamer
 DISTNAME=	${PORTNAME}-backend${PKGNAMESUFFIX}-${PORTVERSION}
 DIST_SUBDIR=	KDE
@@ -15,8 +14,8 @@ COMMENT=	GStreamer backend for Phonon
 
 USE_GL=		gl
 USE_GNOME=	glib20 libxml2
-USE_GSTREAMER=	yes
-USE_KDE4=	kdehier kdeprefix automoc4
+USE_GSTREAMER1=	yes
+USE_KDE4=	kdeprefix automoc4
 USE_QT4=	corelib gui opengl phonon \
 		qmake_build moc_build rcc_build uic_build
 USE_XORG=	x11
@@ -26,7 +25,7 @@ SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	GST_PLUGINS
 GST_PLUGINS_DESC=	Install GStreamer plugins
-GST_PLUGINS_RUN_DEPENDS=	gstreamer-plugins-all>=0:${PORTSDIR}/multimedia/gstreamer-plugins-all
+GST_PLUGINS_RUN_DEPENDS=	gstreamer1-plugins-all>=0:${PORTSDIR}/multimedia/gstreamer1-plugins-all
 
 post-install:
 	${MKDIR} ${STAGEDIR}${QT_PLUGINDIR}/phonon_backend
diff --git a/multimedia/phonon-gstreamer/distinfo b/multimedia/phonon-gstreamer/distinfo
index 95326c743fa3..de667d287822 100644
--- a/multimedia/phonon-gstreamer/distinfo
+++ b/multimedia/phonon-gstreamer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/phonon-backend-gstreamer-4.7.2.tar.xz) = 80b72a9092f540dd0a2abd2898328f3d5f9febfa073b0b1d44592a050a99d2b1
-SIZE (KDE/phonon-backend-gstreamer-4.7.2.tar.xz) = 75552
+SHA256 (KDE/phonon-backend-gstreamer-4.8.0.tar.xz) = f819cbd6296e1e19579e365902f7930ec8571e8cbb08718484091a795f70587e
+SIZE (KDE/phonon-backend-gstreamer-4.8.0.tar.xz) = 75608
diff --git a/multimedia/phonon-gstreamer/pkg-plist b/multimedia/phonon-gstreamer/pkg-plist
index 7a2dd32998d8..38ca3188d241 100644
--- a/multimedia/phonon-gstreamer/pkg-plist
+++ b/multimedia/phonon-gstreamer/pkg-plist
@@ -6,9 +6,4 @@ share/icons/hicolor/48x48/apps/phonon-gstreamer.png
 share/icons/hicolor/64x64/apps/phonon-gstreamer.png
 share/icons/hicolor/scalable/apps/phonon-gstreamer.svgz
 share/kde4/services/phononbackends/gstreamer.desktop
-@dirrmtry share/kde4/services/phononbackends
-@dirrmtry lib/kde4/plugins/phonon_backend
-@cwd %%QT_PREFIX%%
-%%QT_PLUGINDIR%%/phonon_backend/libphonon_gstreamer.so
-@dirrmtry %%QT_PLUGINDIR%%/phonon_backend
-@dirrmtry %%QT_PLUGINDIR%%
+%%QT_PREFIX%%/%%QT_PLUGINDIR%%/phonon_backend/libphonon_gstreamer.so
diff --git a/multimedia/phonon-vlc/Makefile b/multimedia/phonon-vlc/Makefile
index c7206e30c5da..dd9d1b0966f7 100644
--- a/multimedia/phonon-vlc/Makefile
+++ b/multimedia/phonon-vlc/Makefile
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	phonon
-PORTVERSION=	0.7.2
-PORTREVISION=	1
+PORTVERSION=	0.8.0
 CATEGORIES=	multimedia kde
-MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}/src
+MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}
 PKGNAMESUFFIX=	-vlc
 DISTNAME=	${PORTNAME}-backend${PKGNAMESUFFIX}-${PORTVERSION}
 DIST_SUBDIR=	KDE
@@ -14,7 +13,7 @@ COMMENT=	VLC backend for Phonon
 
 LIB_DEPENDS=	libvlc.so:${PORTSDIR}/multimedia/vlc
 
-USE_KDE4=	kdehier kdeprefix automoc4
+USE_KDE4=	kdeprefix automoc4
 USE_QT4=	corelib gui phonon \
 		qmake_build moc_build rcc_build uic_build
 USES=		cmake pkgconfig tar:xz
diff --git a/multimedia/phonon-vlc/distinfo b/multimedia/phonon-vlc/distinfo
index 4490d6bcbc6b..9ad17d19421b 100644
--- a/multimedia/phonon-vlc/distinfo
+++ b/multimedia/phonon-vlc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/phonon-backend-vlc-0.7.2.tar.xz) = 0a788360df2e3439efefacae70b73252c1e1d4a7ad08f4d93301d77a915d95a9
-SIZE (KDE/phonon-backend-vlc-0.7.2.tar.xz) = 58988
+SHA256 (KDE/phonon-backend-vlc-0.8.0.tar.xz) = e092185ba7798b65da0ee2707e4ebdb32d4d1858282f5bb96bce890336938a42
+SIZE (KDE/phonon-backend-vlc-0.8.0.tar.xz) = 59076
diff --git a/multimedia/phonon-vlc/pkg-plist b/multimedia/phonon-vlc/pkg-plist
index 8ece7bb4a53b..eb8ba21ec9c3 100644
--- a/multimedia/phonon-vlc/pkg-plist
+++ b/multimedia/phonon-vlc/pkg-plist
@@ -1,8 +1,3 @@
 lib/kde4/plugins/phonon_backend/phonon_vlc.so
 share/kde4/services/phononbackends/vlc.desktop
-@dirrmtry share/kde4/services/phononbackends
-@dirrmtry lib/kde4/plugins/phonon_backend
-@cwd %%QT_PREFIX%%
-%%QT_PLUGINDIR%%/phonon_backend/libphonon_vlc.so
-@dirrmtry %%QT_PLUGINDIR%%/phonon_backend
-@dirrmtry %%QT_PLUGINDIR%%
+%%QT_PREFIX%%/%%QT_PLUGINDIR%%/phonon_backend/libphonon_vlc.so
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index 847e9be07428..93c3d33fca4d 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	phonon
-PORTVERSION=	4.7.2
-PORTREVISION=	1
+PORTVERSION=	4.8.1
 CATEGORIES=	multimedia kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
 DIST_SUBDIR=	KDE
@@ -15,7 +14,7 @@ LICENSE=	LGPL21
 
 LIB_DEPENDS=	libqzeitgeist.so:${PORTSDIR}/sysutils/qzeitgeist
 
-USE_KDE4=	kdehier kdeprefix automoc4
+USE_KDE4=	kdeprefix automoc4
 USE_QT4=	corelib dbus gui \
 		qmake_build moc_build rcc_build uic_build
 USES=		cmake tar:xz
diff --git a/multimedia/phonon/distinfo b/multimedia/phonon/distinfo
index 901bf375120e..33de80ceb7f0 100644
--- a/multimedia/phonon/distinfo
+++ b/multimedia/phonon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/phonon-4.7.2.tar.xz) = 819e9734d20e254b4599d8ab45f15a68d95444c4e2088c7eb5769b58976a11be
-SIZE (KDE/phonon-4.7.2.tar.xz) = 330244
+SHA256 (KDE/phonon-4.8.1.tar.xz) = b6ca0126cd5330731875acc1cc0b60f8c9ed7ebc71e1d0210b74bf21658027d1
+SIZE (KDE/phonon-4.8.1.tar.xz) = 321652
diff --git a/multimedia/phonon/pkg-plist b/multimedia/phonon/pkg-plist
index 4f23b7d3eab7..4b9ea72f5a2c 100644
--- a/multimedia/phonon/pkg-plist
+++ b/multimedia/phonon/pkg-plist
@@ -179,22 +179,10 @@ share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
 %%DATADIR%%/buildsystem/MacroPushRequiredVars.cmake
 %%DATADIR%%/buildsystem/PhononMacros.cmake
 %%DATADIR%%/buildsystem/cmake_uninstall.cmake.in
-@dirrm %%DATADIR%%/buildsystem
-@dirrm %%DATADIR%%
-@dirrm lib/cmake/phonon
-@dirrmtry lib/cmake
-@dirrm include/phonon/experimental
-@dirrm include/phonon
-@dirrm include/KDE/Phonon/Experimental
-@dirrm include/KDE/Phonon
-@cwd %%QT_PREFIX%%
-%%QT_INCDIR%%/Phonon
-%%QT_INCDIR%%/phonon
-%%QT_LIBDIR%%/libphonon.so
-%%QT_LIBDIR%%/libphonon.so.4
-%%QT_LIBDIR%%/libphononexperimental.so
-%%QT_LIBDIR%%/libphononexperimental.so.4
-share/qt4/mkspecs/modules/qt_phonon.pri
-@dirrmtry share/qt4/mkspecs/modules
-@dirrmtry %%QT_LIBDIR%%
-@dirrmtry %%QT_INCDIR%%
+%%QT_PREFIX%%/%%QT_INCDIR%%/Phonon
+%%QT_PREFIX%%/%%QT_INCDIR%%/phonon
+%%QT_PREFIX%%/%%QT_LIBDIR%%/libphonon.so
+%%QT_PREFIX%%/%%QT_LIBDIR%%/libphonon.so.4
+%%QT_PREFIX%%/%%QT_LIBDIR%%/libphononexperimental.so
+%%QT_PREFIX%%/%%QT_LIBDIR%%/libphononexperimental.so.4
+%%QT_PREFIX%%/%%QT_MKSPECDIR%%/modules/qt_phonon.pri