- Modify deskutils/kdepim4 to install libkleo headers. This basically

  reverts http://websvn.kde.org/?view=revision&revision=1070773 (Linux
  distros have done something similar)
- Let net-im/kopete-kde4 depend on libkleo from deskutils/kdepim4 to
  enable the cryptography plugin
- Remove dependencies from kopete-kde4 for protocols that are no longer
  supported (libjingle and MSN/WLM)

PR:		199546
Approved by:	maintainer timeout (3 weeks)

2 files changed, 63 insertions, 0 deletions

diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index d9e1b9b76ebf..5f09e7d5412f 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
@@ -44,4 +45,12 @@ post-patch:
 	${REINPLACE_CMD} -e '1 s|^.*/|/|g' \
 		${WRKSRC}/knotes/configdialog/knotecollectionconfigwidget.cpp
 
+post-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/include/kleo
+	${INSTALL_DATA} ${WRKSRC}/libkleo/kleo/*.h \
+		${STAGEDIR}${PREFIX}/include/kleo
+	${MKDIR} ${STAGEDIR}${PREFIX}/include/kleo/ui
+	${INSTALL_DATA} ${WRKSRC}/libkleo/ui/*.h \
+		${STAGEDIR}${PREFIX}/include/kleo/ui
+
 .include <bsd.port.mk>
diff --git a/deskutils/kdepim4/pkg-plist b/deskutils/kdepim4/pkg-plist
index ed69ca5d8b78..f434adb5b869 100644
--- a/deskutils/kdepim4/pkg-plist
+++ b/deskutils/kdepim4/pkg-plist
@@ -43,6 +43,60 @@ bin/pimsettingexporter
 bin/sieveeditor
 bin/storageservicemanager
 etc/dbus-1/system.d/org.kde.kalarmrtcwake.conf
+include/kleo/abstractimportjob.h
+include/kleo/adduseridjob.h
+include/kleo/changeexpiryjob.h
+include/kleo/changeownertrustjob.h
+include/kleo/changepasswdjob.h
+include/kleo/checksumdefinition.h
+include/kleo/cryptobackend.h
+include/kleo/cryptobackendfactory.h
+include/kleo/cryptoconfig.h
+include/kleo/decryptjob.h
+include/kleo/decryptverifyjob.h
+include/kleo/deletejob.h
+include/kleo/dn.h
+include/kleo/downloadjob.h
+include/kleo/encryptjob.h
+include/kleo/enum.h
+include/kleo/exception.h
+include/kleo/exportjob.h
+include/kleo/hierarchicalkeylistjob.h
+include/kleo/importfromkeyserverjob.h
+include/kleo/importjob.h
+include/kleo/job.h
+include/kleo/kconfigbasedkeyfilter.h
+include/kleo/keyfilter.h
+include/kleo/keyfiltermanager.h
+include/kleo/keygenerationjob.h
+include/kleo/keylistjob.h
+include/kleo/kleo_export.h
+include/kleo/listallkeysjob.h
+include/kleo/multideletejob.h
+include/kleo/oidmap.h
+include/kleo/refreshkeysjob.h
+include/kleo/signencryptjob.h
+include/kleo/signjob.h
+include/kleo/signkeyjob.h
+include/kleo/specialjob.h
+include/kleo/stl_util.h
+include/kleo/ui/cryptoconfigdialog.h
+include/kleo/ui/cryptoconfigmodule.h
+include/kleo/ui/cryptoconfigmodule_p.h
+include/kleo/ui/directoryserviceswidget.h
+include/kleo/ui/dnattributeorderconfigwidget.h
+include/kleo/ui/filenamerequester.h
+include/kleo/ui/kdhorizontalline.h
+include/kleo/ui/keyapprovaldialog.h
+include/kleo/ui/keylistview.h
+include/kleo/ui/keyrequester.h
+include/kleo/ui/keyselectiondialog.h
+include/kleo/ui/messagebox.h
+include/kleo/ui/messagebox_p.h
+include/kleo/ui/progressbar.h
+include/kleo/ui/progressdialog.h
+include/kleo/verifydetachedjob.h
+include/kleo/verifyopaquejob.h
 lib/akonadi/contact/editorpageplugins/cryptopageplugin.so
 lib/kde4/akregator_config_advanced.so
 lib/kde4/akregator_config_appearance.so