5 files changed, 194 insertions, 23 deletions

diff --git a/deskutils/kdepimlibs4/Makefile b/deskutils/kdepimlibs4/Makefile
index 49cc1a8ead30..ceefa31edc8e 100644
--- a/deskutils/kdepimlibs4/Makefile
+++ b/deskutils/kdepimlibs4/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	kdepimlibs
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -15,14 +14,11 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Libraries for KDE-PIM applications
 
-BUILD_DEPENDS=	${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
-
 LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
 		sasl2:${PORTSDIR}/security/cyrus-sasl2 \
 		boost_thread:${PORTSDIR}/devel/boost-libs \
-		ical.44:${PORTSDIR}/devel/libical
-
-CONFLICTS=	kdepim-runtime-4.3.[1-4]
+		ical.44:${PORTSDIR}/devel/libical \
+		uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid
 
 USE_KDE4=	kdelibs akonadi kdeprefix kdehier automoc4
 KDE4_BUILDENV=	yes
diff --git a/deskutils/kdepimlibs4/distinfo b/deskutils/kdepimlibs4/distinfo
index 9020ad6f5521..a4203443abc3 100644
--- a/deskutils/kdepimlibs4/distinfo
+++ b/deskutils/kdepimlibs4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdepimlibs-4.5.5.tar.bz2) = 9978a2fbabe398e0f7e39713d4b257548361e047314da714ec33e9ed48ccb546
-SIZE (KDE/kdepimlibs-4.5.5.tar.bz2) = 2674251
+SHA256 (KDE/kdepimlibs-4.6.1.tar.bz2) = 202a0bfb4cabea79ebd23a7c88954da1801c67562e0c4b5add6f470c12ff65eb
+SIZE (KDE/kdepimlibs-4.6.1.tar.bz2) = 3189885
diff --git a/deskutils/kdepimlibs4/files/patch-CMakeLists.txt b/deskutils/kdepimlibs4/files/patch-CMakeLists.txt
index 4c0af635a6fe..671fd488cc8c 100644
--- a/deskutils/kdepimlibs4/files/patch-CMakeLists.txt
+++ b/deskutils/kdepimlibs4/files/patch-CMakeLists.txt
@@ -1,11 +1,11 @@
 --- ./CMakeLists.txt.orig	2010-06-06 12:01:57.000000000 -0400
 +++ ./CMakeLists.txt	2010-06-06 12:02:08.000000000 -0400
-@@ -60,7 +60,7 @@
- 
+@@ -81,7 +81,7 @@
  if (NOT KDEPIM_ONLY_KLEO)
    #FindAkonadi.cmake is only there for compatibility reasons, but we don't want to use that.
--  find_package(Akonadi 1.3.60 QUIET NO_MODULE)
-+  find_package(Akonadi 1.3.60 QUIET)
-   macro_log_feature(Akonadi_FOUND "Akonadi" "Akonadi server libraries (from kdesupport)" "http://pim.kde.org/akonadi" TRUE "1.3.60" "Akonadi is required to build KdepimLibs.")
+   set(Akonadi_MIN_VERSION "1.4.81")
+-  find_package(Akonadi ${Akonadi_MIN_VERSION} QUIET NO_MODULE)
++  find_package(Akonadi ${Akonadi_MIN_VERSION} QUIET)
+   macro_log_feature(Akonadi_FOUND "Akonadi server libraries" "Access to PIM storage and services" "http://pim.kde.org/akonadi" TRUE "${Akonadi_MIN_VERSION}" "")
  
    find_package(Sasl2)
diff --git a/deskutils/kdepimlibs4/files/patch-kcalcore__ConfigureChecks.cmake b/deskutils/kdepimlibs4/files/patch-kcalcore__ConfigureChecks.cmake
new file mode 100644
index 000000000000..84c7422c0c52
--- /dev/null
+++ b/deskutils/kdepimlibs4/files/patch-kcalcore__ConfigureChecks.cmake
@@ -0,0 +1,15 @@
+--- ./kcalcore/ConfigureChecks.cmake.orig	2010-12-03 15:38:57.478419881 +1000
++++ ./kcalcore/ConfigureChecks.cmake	2010-12-03 15:59:50.369411055 +1000
+@@ -2,6 +2,11 @@
+ include(CheckLibraryExists)
+ 
+ check_include_files(uuid/uuid.h HAVE_UUID_UUID_H)
+-check_library_exists(uuid uuid_generate_random "" HAVE_UUID_LIBRARY)
++find_library(UUID_LIBRARY uuid)
++set(UUID_LIBRARY_DIR "")
++if(UUID_LIBRARY)
++   get_filename_component(UUID_LIBRARY_DIR ${UUID_LIBRARY} PATH)
++endif(UUID_LIBRARY)
++check_library_exists(uuid uuid_generate_random "${UUID_LIBRARY_DIR}" HAVE_UUID_LIBRARY)
+ 
+ 
diff --git a/deskutils/kdepimlibs4/pkg-plist b/deskutils/kdepimlibs4/pkg-plist
index b16820a797c5..9a47622b5b79 100644
--- a/deskutils/kdepimlibs4/pkg-plist
+++ b/deskutils/kdepimlibs4/pkg-plist
@@ -14,6 +14,7 @@ include/KDE/Akonadi/AttributeFactory
 include/KDE/Akonadi/CachePolicy
 include/KDE/Akonadi/ChangeRecorder
 include/KDE/Akonadi/Collection
+include/KDE/Akonadi/CollectionAttributesSynchronizationJob
 include/KDE/Akonadi/CollectionComboBox
 include/KDE/Akonadi/CollectionCopyJob
 include/KDE/Akonadi/CollectionCreateJob
@@ -32,6 +33,8 @@ include/KDE/Akonadi/CollectionStatisticsDelegate
 include/KDE/Akonadi/CollectionStatisticsJob
 include/KDE/Akonadi/CollectionStatisticsModel
 include/KDE/Akonadi/CollectionView
+include/KDE/Akonadi/Contact/AbstractContactFormatter
+include/KDE/Akonadi/Contact/AbstractContactGroupFormatter
 include/KDE/Akonadi/Contact/ContactDefaultActions
 include/KDE/Akonadi/Contact/ContactEditor
 include/KDE/Akonadi/Contact/ContactEditorDialog
@@ -44,7 +47,15 @@ include/KDE/Akonadi/Contact/ContactGroupViewerDialog
 include/KDE/Akonadi/Contact/ContactSearchJob
 include/KDE/Akonadi/Contact/ContactViewer
 include/KDE/Akonadi/Contact/ContactViewerDialog
+include/KDE/Akonadi/Contact/ContactsFilterProxyModel
+include/KDE/Akonadi/Contact/ContactsTreeModel
+include/KDE/Akonadi/Contact/EmailAddressSelection
+include/KDE/Akonadi/Contact/EmailAddressSelectionDialog
+include/KDE/Akonadi/Contact/EmailAddressSelectionWidget
 include/KDE/Akonadi/Contact/RecentContactsCollectionRequestJob
+include/KDE/Akonadi/Contact/StandardContactActionManager
+include/KDE/Akonadi/Contact/StandardContactFormatter
+include/KDE/Akonadi/Contact/StandardContactGroupFormatter
 include/KDE/Akonadi/Control
 include/KDE/Akonadi/Entity
 include/KDE/Akonadi/EntityDisplayAttribute
@@ -186,7 +197,52 @@ include/KDE/KCal/SortableList
 include/KDE/KCal/Todo
 include/KDE/KCal/VCalDrag
 include/KDE/KCal/VCalFormat
+include/KDE/KCalCore/Alarm
+include/KDE/KCalCore/Attachment
+include/KDE/KCalCore/Attendee
+include/KDE/KCalCore/CalFilter
+include/KDE/KCalCore/CalFormat
+include/KDE/KCalCore/CalStorage
+include/KDE/KCalCore/Calendar
+include/KDE/KCalCore/Compat
+include/KDE/KCalCore/CustomProperties
+include/KDE/KCalCore/Duration
+include/KDE/KCalCore/Event
+include/KDE/KCalCore/Exception
+include/KDE/KCalCore/FileStorage
+include/KDE/KCalCore/FreeBusy
+include/KDE/KCalCore/FreeBusyCache
+include/KDE/KCalCore/FreeBusyPeriod
+include/KDE/KCalCore/FreeBusyUrlStore
+include/KDE/KCalCore/ICalFormat
+include/KDE/KCalCore/ICalTimeZones
+include/KDE/KCalCore/Incidence
+include/KDE/KCalCore/IncidenceBase
+include/KDE/KCalCore/Journal
+include/KDE/KCalCore/MemoryCalendar
+include/KDE/KCalCore/Period
+include/KDE/KCalCore/Person
+include/KDE/KCalCore/Recurrence
+include/KDE/KCalCore/RecurrenceRule
+include/KDE/KCalCore/ScheduleMessage
+include/KDE/KCalCore/SortableList
+include/KDE/KCalCore/Sorting
+include/KDE/KCalCore/Todo
+include/KDE/KCalCore/VCalFormat
+include/KDE/KCalCore/Visitor
+include/KDE/KCalUtils/DndFactory
+include/KDE/KCalUtils/HTMLExportSettings
+include/KDE/KCalUtils/HtmlExport
+include/KDE/KCalUtils/ICalDrag
+include/KDE/KCalUtils/IncidenceFormatter
+include/KDE/KCalUtils/RecurrenceActions
+include/KDE/KCalUtils/Scheduler
+include/KDE/KCalUtils/Stringify
+include/KDE/KCalUtils/VCalDrag
 include/KDE/KHolidays/AstroSeasons
+include/KDE/KHolidays/Holiday
+include/KDE/KHolidays/HolidayRegion
+include/KDE/KHolidays/HolidayRegionSelector
 include/KDE/KHolidays/Holidays
 include/KDE/KHolidays/LunarPhase
 include/KDE/KHolidays/Zodiac
@@ -285,17 +341,25 @@ include/KDE/KontactInterface/PimUniqueApplication
 include/KDE/KontactInterface/Plugin
 include/KDE/KontactInterface/Summary
 include/KDE/KontactInterface/UniqueAppHandler
+include/KDE/Mailtransport/DispatchModeAttribute
+include/KDE/Mailtransport/DispatcherInterface
+include/KDE/Mailtransport/ErrorAttribute
+include/KDE/Mailtransport/MessageQueueJob
 include/KDE/Mailtransport/PrecommandJob
 include/KDE/Mailtransport/SendmailJob
+include/KDE/Mailtransport/SentBehaviourAttribute
 include/KDE/Mailtransport/ServerTest
 include/KDE/Mailtransport/SmtpJob
+include/KDE/Mailtransport/Socket
 include/KDE/Mailtransport/Transport
+include/KDE/Mailtransport/TransportAttribute
 include/KDE/Mailtransport/TransportBase
 include/KDE/Mailtransport/TransportComboBox
 include/KDE/Mailtransport/TransportConfigDialog
 include/KDE/Mailtransport/TransportJob
 include/KDE/Mailtransport/TransportManagementWidget
 include/KDE/Mailtransport/TransportManager
+include/KDE/Mailtransport/TransportType
 include/KDE/Syndication/AbstractParser
 include/KDE/Syndication/Category
 include/KDE/Syndication/Constants
@@ -317,7 +381,10 @@ include/KDE/Syndication/SpecificItem
 include/KDE/Syndication/SpecificItemVisitor
 include/KDE/Syndication/Syndication
 include/KDE/Syndication/Tools
+include/akonadi/abstractdifferencesreporter.h
+include/akonadi/agentactionmanager.h
 include/akonadi/agentbase.h
+include/akonadi/agentfactory.h
 include/akonadi/agentfilterproxymodel.h
 include/akonadi/agentinstance.h
 include/akonadi/agentinstancecreatejob.h
@@ -333,8 +400,12 @@ include/akonadi/akonadi_export.h
 include/akonadi/attribute.h
 include/akonadi/attributefactory.h
 include/akonadi/cachepolicy.h
+include/akonadi/cachepolicypage.h
+include/akonadi/calendar/akonadi-calendar_export.h
+include/akonadi/calendar/standardcalendaractionmanager.h
 include/akonadi/changerecorder.h
 include/akonadi/collection.h
+include/akonadi/collectionattributessynchronizationjob.h
 include/akonadi/collectioncombobox.h
 include/akonadi/collectioncopyjob.h
 include/akonadi/collectioncreatejob.h
@@ -356,6 +427,7 @@ include/akonadi/collectionstatisticsjob.h
 include/akonadi/collectionstatisticsmodel.h
 include/akonadi/collectionview.h
 include/akonadi/contact/abstractcontactformatter.h
+include/akonadi/contact/abstractcontactgroupformatter.h
 include/akonadi/contact/akonadi-contact_export.h
 include/akonadi/contact/contactdefaultactions.h
 include/akonadi/contact/contacteditor.h
@@ -376,18 +448,26 @@ include/akonadi/contact/emailaddressselection.h
 include/akonadi/contact/emailaddressselectiondialog.h
 include/akonadi/contact/emailaddressselectionwidget.h
 include/akonadi/contact/recentcontactscollectionrequestjob.h
+include/akonadi/contact/standardcontactactionmanager.h
 include/akonadi/contact/standardcontactformatter.h
+include/akonadi/contact/standardcontactgroupformatter.h
 include/akonadi/control.h
+include/akonadi/dbusconnectionpool.h
+include/akonadi/differencesalgorithminterface.h
 include/akonadi/entity.h
 include/akonadi/entitydisplayattribute.h
 include/akonadi/entityhiddenattribute.h
 include/akonadi/entitylistview.h
 include/akonadi/entitymimetypefiltermodel.h
+include/akonadi/entityorderproxymodel.h
+include/akonadi/entityrightsfiltermodel.h
 include/akonadi/entitytreemodel.h
 include/akonadi/entitytreeview.h
 include/akonadi/entitytreeviewstatesaver.h
+include/akonadi/etmviewstatesaver.h
 include/akonadi/exception.h
 include/akonadi/favoritecollectionsmodel.h
+include/akonadi/indexpolicyattribute.h
 include/akonadi/item.h
 include/akonadi/itemcopyjob.h
 include/akonadi/itemcreatejob.h
@@ -414,10 +494,12 @@ include/akonadi/kmime/messageflags.h
 include/akonadi/kmime/messagefolderattribute.h
 include/akonadi/kmime/messagemodel.h
 include/akonadi/kmime/messageparts.h
+include/akonadi/kmime/messagestatus.h
 include/akonadi/kmime/messagethreaderproxymodel.h
 include/akonadi/kmime/messagethreadingattribute.h
 include/akonadi/kmime/specialmailcollections.h
 include/akonadi/kmime/specialmailcollectionsrequestjob.h
+include/akonadi/kmime/standardmailactionmanager.h
 include/akonadi/linkjob.h
 include/akonadi/mimetypechecker.h
 include/akonadi/monitor.h
@@ -426,7 +508,11 @@ include/akonadi/persistentsearchattribute.h
 include/akonadi/preprocessorbase.h
 include/akonadi/private/collectionpathresolver_p.h
 include/akonadi/qtest_akonadi.h
+include/akonadi/recursivecollectionfilterproxymodel.h
+include/akonadi/recursiveitemfetchjob.h
 include/akonadi/resourcebase.h
+include/akonadi/resourcebasesettings.h
+include/akonadi/resourcesettings.h
 include/akonadi/resourcesynchronizationjob.h
 include/akonadi/searchcreatejob.h
 include/akonadi/selectionproxymodel.h
@@ -441,6 +527,7 @@ include/akonadi/transactionsequence.h
 include/akonadi/transportresourcebase.h
 include/akonadi/unlinkjob.h
 include/gpgme++/assuanresult.h
+include/gpgme++/configuration.h
 include/gpgme++/context.h
 include/gpgme++/data.h
 include/gpgme++/decryptionresult.h
@@ -577,9 +664,55 @@ include/kcal/sortablelist.h
 include/kcal/todo.h
 include/kcal/vcaldrag.h
 include/kcal/vcalformat.h
+include/kcalcore/alarm.h
+include/kcalcore/attachment.h
+include/kcalcore/attendee.h
+include/kcalcore/calendar.h
+include/kcalcore/calfilter.h
+include/kcalcore/calformat.h
+include/kcalcore/calstorage.h
+include/kcalcore/compat.h
+include/kcalcore/customproperties.h
+include/kcalcore/duration.h
+include/kcalcore/event.h
+include/kcalcore/exceptions.h
+include/kcalcore/filestorage.h
+include/kcalcore/freebusy.h
+include/kcalcore/freebusycache.h
+include/kcalcore/freebusyperiod.h
+include/kcalcore/freebusyurlstore.h
+include/kcalcore/icalformat.h
+include/kcalcore/icaltimezones.h
+include/kcalcore/incidence.h
+include/kcalcore/incidencebase.h
+include/kcalcore/journal.h
+include/kcalcore/kcalcore_export.h
+include/kcalcore/memorycalendar.h
+include/kcalcore/period.h
+include/kcalcore/person.h
+include/kcalcore/recurrence.h
+include/kcalcore/recurrencerule.h
+include/kcalcore/schedulemessage.h
+include/kcalcore/sortablelist.h
+include/kcalcore/sorting.h
+include/kcalcore/supertrait.h
+include/kcalcore/todo.h
+include/kcalcore/vcalformat.h
+include/kcalcore/visitor.h
+include/kcalutils/dndfactory.h
+include/kcalutils/htmlexport.h
+include/kcalutils/htmlexportsettings.h
+include/kcalutils/icaldrag.h
+include/kcalutils/incidenceformatter.h
+include/kcalutils/kcalutils_export.h
+include/kcalutils/recurrenceactions.h
+include/kcalutils/scheduler.h
+include/kcalutils/stringify.h
+include/kcalutils/vcaldrag.h
 include/kholidays/astroseasons.h
 include/kholidays/holiday.h
 include/kholidays/holidayregion.h
+include/kholidays/holidayregionselector.h
 include/kholidays/holidays.h
 include/kholidays/kholidays_export.h
 include/kholidays/lunarphase.h
@@ -639,6 +772,9 @@ include/kldap/ldapserver.h
 include/kldap/ldapstructureproxymodel.h
 include/kldap/ldapurl.h
 include/kldap/ldif.h
+include/kmbox/kmbox_export.h
+include/kmbox/mbox.h
+include/kmbox/mboxentry.h
 include/kmime/boolflags.h
 include/kmime/kmime_charfreq.h
 include/kmime/kmime_codecs.h
@@ -669,9 +805,11 @@ include/kpimtextedit/kpimtextedit_export.h
 include/kpimtextedit/textedit.h
 include/kpimtextedit/textutils.h
 include/kpimutils/email.h
+include/kpimutils/emailvalidator.h
 include/kpimutils/kfileio.h
 include/kpimutils/kpimutils_export.h
 include/kpimutils/linklocator.h
+include/kpimutils/networkaccesshelper.h
 include/kpimutils/processes.h
 include/kpimutils/spellingfilter.h
 include/kpimutils/supertrait.h
@@ -703,9 +841,11 @@ include/mailtransport/mailtransport_export.h
 include/mailtransport/messagequeuejob.h
 include/mailtransport/precommandjob.h
 include/mailtransport/sendmailjob.h
+include/mailtransport/sentactionattribute.h
 include/mailtransport/sentbehaviourattribute.h
 include/mailtransport/servertest.h
 include/mailtransport/smtpjob.h
+include/mailtransport/socket.h
 include/mailtransport/transport.h
 include/mailtransport/transportattribute.h
 include/mailtransport/transportbase.h
@@ -786,10 +926,10 @@ include/syndication/specificitem.h
 include/syndication/specificitemvisitor.h
 include/syndication/syndication.h
 include/syndication/tools.h
-lib/KdepimLibs/cmake/KDEPimLibsLibraryTargetsWithPrefix-%%KDE4_BUILD_TYPE%%.cmake
-lib/KdepimLibs/cmake/KDEPimLibsLibraryTargetsWithPrefix.cmake
-lib/KdepimLibs/cmake/KdepimLibsConfig.cmake
-lib/KdepimLibs/cmake/KdepimLibsConfigVersion.cmake
+lib/cmake/KdepimLibs/KDEPimLibsLibraryTargetsWithPrefix-%%KDE4_BUILD_TYPE%%.cmake
+lib/cmake/KdepimLibs/KDEPimLibsLibraryTargetsWithPrefix.cmake
+lib/cmake/KdepimLibs/KdepimLibsConfig.cmake
+lib/cmake/KdepimLibs/KdepimLibsConfigVersion.cmake
 lib/gpgmepp/GpgmeppConfig.cmake
 lib/gpgmepp/GpgmeppLibraryDepends.cmake
 lib/kde4/kabc_directory.so
@@ -809,6 +949,10 @@ lib/kde4/kio_nntp.so
 lib/kde4/kio_pop3.so
 lib/kde4/kio_sieve.so
 lib/kde4/kio_smtp.so
+lib/kde4/plugins/designer/kholidayswidgets.so
+lib/libakonadi-calendar.so
+lib/libakonadi-calendar.so.5
+lib/libakonadi-calendar.so.5.0.1
 lib/libakonadi-contact.so
 lib/libakonadi-contact.so.5
 lib/libakonadi-contact.so.5.0.1
@@ -826,13 +970,13 @@ lib/libakonadi-kmime.so.5
 lib/libakonadi-kmime.so.5.0.1
 %%WITH_PTH%%lib/libgpgme++-pth.so
 %%WITH_PTH%%lib/libgpgme++-pth.so.2
-%%WITH_PTH%%lib/libgpgme++-pth.so.2.6.0
+%%WITH_PTH%%lib/libgpgme++-pth.so.2.8.0
 lib/libgpgme++-pthread.so
 lib/libgpgme++-pthread.so.2
-lib/libgpgme++-pthread.so.2.6.0
+lib/libgpgme++-pthread.so.2.8.0
 lib/libgpgme++.so
 lib/libgpgme++.so.2
-lib/libgpgme++.so.2.6.0
+lib/libgpgme++.so.2.8.0
 lib/libkabc.so
 lib/libkabc.so.5
 lib/libkabc.so.5.0.1
@@ -845,6 +989,12 @@ lib/libkblog.so.5.0.1
 lib/libkcal.so
 lib/libkcal.so.5
 lib/libkcal.so.5.0.1
+lib/libkcalcore.so
+lib/libkcalcore.so.5
+lib/libkcalcore.so.5.0.1
+lib/libkcalutils.so
+lib/libkcalutils.so.5
+lib/libkcalutils.so.5.0.1
 lib/libkholidays.so
 lib/libkholidays.so.5
 lib/libkholidays.so.5.0.1
@@ -854,6 +1004,9 @@ lib/libkimap.so.5.0.1
 lib/libkldap.so
 lib/libkldap.so.5
 lib/libkldap.so.5.0.1
+lib/libkmbox.so
+lib/libkmbox.so.5
+lib/libkmbox.so.5.0.1
 lib/libkmime.so
 lib/libkmime.so.5
 lib/libkmime.so.5.0.1
@@ -997,6 +1150,7 @@ share/apps/libkholidays/plan2/holiday_yt_fr
 share/apps/libkholidays/plan2/holiday_za_en-gb
 share/config.kcfg/mailtransport.kcfg
 share/config.kcfg/recentcontactscollections.kcfg
+share/config.kcfg/resourcebase.kcfg
 share/config.kcfg/specialmailcollections.kcfg
 share/dbus-1/interfaces/org.kde.KResourcesManager.xml
 share/dbus-1/interfaces/org.kde.pim.IdentityManager.xml
@@ -1084,10 +1238,10 @@ share/mime/packages/kdepimlibs-mime.xml
 @dirrm share/apps/akonadi/contact/data
 @dirrm share/apps/akonadi/contact
 @dirrm share/apps/akonadi-kde
-@dirrm share/apps/akonadi
+@dirrmtry share/apps/akonadi
 @dirrm lib/gpgmepp
-@dirrm lib/KdepimLibs/cmake
-@dirrm lib/KdepimLibs
+@dirrm lib/cmake/KdepimLibs
+@dirrmtry lib/cmake
 @dirrm include/syndication/rss2
 @dirrm include/syndication/rdf
 @dirrm include/syndication/atom
@@ -1103,9 +1257,12 @@ share/mime/packages/kdepimlibs-mime.xml
 @dirrm include/kpimidentities
 @dirrm include/kontactinterface
 @dirrm include/kmime
+@dirrm include/kmbox
 @dirrm include/kldap
 @dirrm include/kimap
 @dirrm include/kholidays
+@dirrm include/kcalutils
+@dirrm include/kcalcore
 @dirrm include/kcal
 @dirrm include/kblog
 @dirrm include/kabc
@@ -1116,6 +1273,7 @@ share/mime/packages/kdepimlibs-mime.xml
 @dirrm include/akonadi/kcal
 @dirrm include/akonadi/kabc
 @dirrm include/akonadi/contact
+@dirrm include/akonadi/calendar
 @dirrmtry include/akonadi
 @dirrm include/KDE/Syndication
 @dirrm include/KDE/Mailtransport
@@ -1129,6 +1287,8 @@ share/mime/packages/kdepimlibs-mime.xml
 @dirrm include/KDE/KLDAP
 @dirrm include/KDE/KIMAP
 @dirrm include/KDE/KHolidays
+@dirrm include/KDE/KCalUtils
+@dirrm include/KDE/KCalCore
 @dirrm include/KDE/KCal
 @dirrm include/KDE/KBlog
 @dirrm include/KDE/KABC