diff options
88 files changed, 230 insertions, 890 deletions
diff --git a/Documentation/package.keywords/kde-4.5.keywords b/Documentation/package.keywords/kde-4.5.keywords index cb6c5b8ca36..76481f8b314 100644 --- a/Documentation/package.keywords/kde-4.5.keywords +++ b/Documentation/package.keywords/kde-4.5.keywords @@ -215,7 +215,6 @@ kde-base/krfb:4.5 kde-base/kfloppy:4.5 kde-base/kppp:4.5 kde-base/policykit-kde:4.5 -kde-base/akonadi:4.5 kde-base/akregator:4.5 kde-base/blogilo:4.5 kde-base/kabcclient:4.5 @@ -223,6 +222,7 @@ kde-base/kaddressbook:4.5 kde-base/kalarm:4.5 kde-base/kdepim-icons:4.5 kde-base/kdepim-kresources:4.5 +kde-base/kdepim-libs:4.5 kde-base/kdepim-strigi-analyzer:4.5 kde-base/kdepim-wizards:4.5 kde-base/kdepim-runtime:4.5 @@ -235,14 +235,6 @@ kde-base/konsolekalendar:4.5 kde-base/kontact:4.5 kde-base/korganizer:4.5 kde-base/ktimetracker:4.5 -kde-base/libkdepim:4.5 -kde-base/libkleo:4.5 -kde-base/libkpgp:4.5 -kde-base/messagecomposer:4.5 -kde-base/messagecore:4.5 -kde-base/messagelist:4.5 -kde-base/messageviewer:4.5 -kde-base/templateparser:4.5 kde-base/cervisia:4.5 kde-base/dolphin-plugins:4.5 kde-base/kapptemplate:4.5 diff --git a/Documentation/package.keywords/kde-live.d/kdepim-live b/Documentation/package.keywords/kde-live.d/kdepim-live index 56a04681d76..2daff66b4e5 100644 --- a/Documentation/package.keywords/kde-live.d/kdepim-live +++ b/Documentation/package.keywords/kde-live.d/kdepim-live @@ -1,4 +1,3 @@ -~kde-base/akonadi-9999 ** ~kde-base/akregator-9999 ** ~kde-base/blogilo-9999 ** ~kde-base/kabcclient-9999 ** @@ -6,6 +5,7 @@ ~kde-base/kalarm-9999 ** ~kde-base/kdepim-icons-9999 ** ~kde-base/kdepim-kresources-9999 ** +~kde-base/kdepim-libs-9999 ** ~kde-base/kdepim-strigi-analyzer-9999 ** ~kde-base/kdepim-wizards-9999 ** ~kde-base/kdepim-runtime-9999 ** @@ -18,11 +18,3 @@ ~kde-base/kontact-9999 ** ~kde-base/korganizer-9999 ** ~kde-base/ktimetracker-9999 ** -~kde-base/libkdepim-9999 ** -~kde-base/libkleo-9999 ** -~kde-base/libkpgp-9999 ** -~kde-base/messagecomposer-9999 ** -~kde-base/messagecore-9999 ** -~kde-base/messagelist-9999 ** -~kde-base/messageviewer-9999 ** -~kde-base/templateparser-9999 ** diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords index 705f3ec98c6..8ba1eaee686 100644 --- a/Documentation/package.keywords/kde-live.keywords +++ b/Documentation/package.keywords/kde-live.keywords @@ -229,7 +229,6 @@ ~kde-base/kfloppy-9999 ** ~kde-base/kppp-9999 ** ~kde-base/policykit-kde-9999 ** -~kde-base/akonadi-9999 ** ~kde-base/akregator-9999 ** ~kde-base/blogilo-9999 ** ~kde-base/kabcclient-9999 ** @@ -237,6 +236,7 @@ ~kde-base/kalarm-9999 ** ~kde-base/kdepim-icons-9999 ** ~kde-base/kdepim-kresources-9999 ** +~kde-base/kdepim-libs-9999 ** ~kde-base/kdepim-strigi-analyzer-9999 ** ~kde-base/kdepim-wizards-9999 ** ~kde-base/kdepim-runtime-9999 ** @@ -249,14 +249,6 @@ ~kde-base/kontact-9999 ** ~kde-base/korganizer-9999 ** ~kde-base/ktimetracker-9999 ** -~kde-base/libkdepim-9999 ** -~kde-base/libkleo-9999 ** -~kde-base/libkpgp-9999 ** -~kde-base/messagecomposer-9999 ** -~kde-base/messagecore-9999 ** -~kde-base/messagelist-9999 ** -~kde-base/messageviewer-9999 ** -~kde-base/templateparser-9999 ** ~kde-base/cervisia-9999 ** ~kde-base/dolphin-plugins-9999 ** ~kde-base/kapptemplate-9999 ** diff --git a/Documentation/package.unmask/kde-4.5 b/Documentation/package.unmask/kde-4.5 index 3189f211baa..7357ba266c3 100644 --- a/Documentation/package.unmask/kde-4.5 +++ b/Documentation/package.unmask/kde-4.5 @@ -212,7 +212,6 @@ kde-base/krfb:4.5 kde-base/kfloppy:4.5 kde-base/kppp:4.5 kde-base/policykit-kde:4.5 -kde-base/akonadi:4.5 kde-base/akregator:4.5 kde-base/blogilo:4.5 kde-base/kabcclient:4.5 @@ -220,6 +219,7 @@ kde-base/kaddressbook:4.5 kde-base/kalarm:4.5 kde-base/kdepim-icons:4.5 kde-base/kdepim-kresources:4.5 +kde-base/kdepim-libs:4.5 kde-base/kdepim-strigi-analyzer:4.5 kde-base/kdepim-wizards:4.5 kde-base/kdepim-runtime:4.5 @@ -232,14 +232,6 @@ kde-base/konsolekalendar:4.5 kde-base/kontact:4.5 kde-base/korganizer:4.5 kde-base/ktimetracker:4.5 -kde-base/libkdepim:4.5 -kde-base/libkleo:4.5 -kde-base/libkpgp:4.5 -kde-base/messagecomposer:4.5 -kde-base/messagecore:4.5 -kde-base/messagelist:4.5 -kde-base/messageviewer:4.5 -kde-base/templateparser:4.5 kde-base/cervisia:4.5 kde-base/dolphin-plugins:4.5 kde-base/kapptemplate:4.5 diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live index f92b048d4fc..21e1ff8cbc7 100644 --- a/Documentation/package.unmask/kde-live +++ b/Documentation/package.unmask/kde-live @@ -300,7 +300,6 @@ kde-base/krfb:live kde-base/kfloppy:live kde-base/kppp:live kde-base/policykit-kde:live -kde-base/akonadi:live kde-base/akregator:live kde-base/blogilo:live kde-base/kabcclient:live @@ -308,6 +307,7 @@ kde-base/kaddressbook:live kde-base/kalarm:live kde-base/kdepim-icons:live kde-base/kdepim-kresources:live +kde-base/kdepim-libs:live kde-base/kdepim-strigi-analyzer:live kde-base/kdepim-wizards:live kde-base/kdepim-runtime:live @@ -320,14 +320,6 @@ kde-base/konsolekalendar:live kde-base/kontact:live kde-base/korganizer:live kde-base/ktimetracker:live -kde-base/libkdepim:live -kde-base/libkleo:live -kde-base/libkpgp:live -kde-base/messagecomposer:live -kde-base/messagecore:live -kde-base/messagelist:live -kde-base/messageviewer:live -kde-base/templateparser:live kde-base/cervisia:live kde-base/dolphin-plugins:live kde-base/kapptemplate:live diff --git a/kde-base/akonadi/Manifest b/kde-base/akonadi/Manifest index ebb5cbf02f5..1fe1a8173b7 100644 --- a/kde-base/akonadi/Manifest +++ b/kde-base/akonadi/Manifest @@ -1,5 +1,2 @@ -DIST kdepim-4.4.75.tar.xz 7990416 RMD160 4072b0ab954c5869323bc1b26f37070600b709fe SHA1 8dd940989e16d5ca1c8c72fa239e0c4e39639355 SHA256 1f726105cf596343a8c29634f1f587a40dc31aa725717808acf1eb5152326422 -EBUILD akonadi-4.4.75.ebuild 1088 RMD160 b3daf37a184a001d1e65342c84e8c2800f8ce075 SHA1 47f5daf2043602567805df8ee62e82e4c9879086 SHA256 1e8965d96345a236f3fd33d99ab221f239c0a50857a22e847c8f700bf5025e37 EBUILD akonadi-4.4.9999.ebuild 945 RMD160 fe8ad88d6e6c9fb20d01037219c34393e6827527 SHA1 0ea818f96dcc9608560a3acd8884d866efce2b16 SHA256 6955a11b1bc5b9b288dbdfc99553323a5fa4d80ac995253736a6ed69bfc93dd3 -EBUILD akonadi-9999.ebuild 1015 RMD160 996f007b38dac49142d4e42a44d47a06fe5cc4bc SHA1 e3449f5d44feabee637b0bc356bee2fa60306512 SHA256 fb4d3ef776bd92b14f8bd95aae7c2376251df209316c721b037999638a674fb9 MISC metadata.xml 264 RMD160 4d66ebe451b6634cb712a67519338b16a556b983 SHA1 272c64cf9e24ac997a3a9d4ce32249a09f4d62bd SHA256 7c3b87ecba257c3c302e5beccf9e21d858c9651ea7b6b723b79a3364f671b7e5 diff --git a/kde-base/akonadi/akonadi-4.4.75.ebuild b/kde-base/akonadi/akonadi-4.4.75.ebuild deleted file mode 100644 index 2094da993d4..00000000000 --- a/kde-base/akonadi/akonadi-4.4.75.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="3" - -KMNAME="kdepim" -inherit kde4-meta - -DESCRIPTION="An extensible cross-desktop storage service for PIM data and meta data" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="debug" - -DEPEND=" - >=app-office/akonadi-server-1.3.60 - $(add_kdebase_dep kdelibs 'semantic-desktop') - $(add_kdebase_dep kdepimlibs 'akonadi') - $(add_kdebase_dep libkdepim) - $(add_kdebase_dep messageviewer) -" -RDEPEND="${DEPEND} - $(add_kdebase_dep kdepim-runtime) -" - -KMEXTRA=" - akonadiconsole/ -" - -KMEXTRACTONLY=" - messageviewer/ -" - -# @since 4.3 - blocks kdemaildir - no longer provided (it's in akonadi now) -add_blocker kdemaildir -add_blocker kdepim-kresources '<4.2.95' - -src_configure() { - mycmakeargs=( - # Set the dbus dirs, otherwise it searches in KDEDIR - -DAKONADI_DBUS_INTERFACES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/interfaces" - -DAKONADI_DBUS_SERVICES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/services" - ) - - kde4-meta_src_configure -} diff --git a/kde-base/akonadi/akonadi-9999.ebuild b/kde-base/akonadi/akonadi-9999.ebuild deleted file mode 100644 index 1ae308e85ca..00000000000 --- a/kde-base/akonadi/akonadi-9999.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="3" - -KMNAME="kdepim" -inherit kde4-meta - -DESCRIPTION="An extensible cross-desktop storage service for PIM data and meta data" -KEYWORDS="" -IUSE="debug" - -DEPEND=" - >=app-office/akonadi-server-1.3.60 - $(add_kdebase_dep kdelibs 'semantic-desktop') - $(add_kdebase_dep kdepimlibs 'akonadi') - $(add_kdebase_dep libkdepim) - $(add_kdebase_dep messageviewer) -" -RDEPEND="${DEPEND} - $(add_kdebase_dep kdepim-runtime) -" - -KMEXTRA=" - akonadiconsole/ -" - -KMEXTRACTONLY=" - messageviewer/ -" - -# @since 4.3 - blocks kdemaildir - no longer provided (it's in akonadi now) -add_blocker kdemaildir -add_blocker kdepim-kresources '<4.2.95' - -src_configure() { - mycmakeargs=( - # Set the dbus dirs, otherwise it searches in KDEDIR - -DAKONADI_DBUS_INTERFACES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/interfaces" - -DAKONADI_DBUS_SERVICES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/services" - ) - - kde4-meta_src_configure -} diff --git a/kde-base/akregator/Manifest b/kde-base/akregator/Manifest index 63a74bc7e5e..7099371362f 100644 --- a/kde-base/akregator/Manifest +++ b/kde-base/akregator/Manifest @@ -1,5 +1,5 @@ DIST kdepim-4.4.75.tar.xz 7990416 RMD160 4072b0ab954c5869323bc1b26f37070600b709fe SHA1 8dd940989e16d5ca1c8c72fa239e0c4e39639355 SHA256 1f726105cf596343a8c29634f1f587a40dc31aa725717808acf1eb5152326422 -EBUILD akregator-4.4.75.ebuild 431 RMD160 f5428417eb9a1260e4f96a26205de5d2068949a1 SHA1 7170d7f16752799eb2234e0a10868ca4bc25e69f SHA256 9a3b1b44bec13131a846b24388570942858afee46b939eac1ea9d6357aa3665f +EBUILD akregator-4.4.75.ebuild 435 RMD160 61d8c1879878e183ec6da9ae587cea30f15a495e SHA1 62482027a264767a2c72313689ee5afc81cc295a SHA256 07235b2808a383d0b72ef390975ca722d25d4563e1a46318549103d285f65e59 EBUILD akregator-4.4.9999.ebuild 358 RMD160 e1eac4f7d3eea973f0b3241954000d14072d29fc SHA1 3caad65cafc421caf80a6546ffee27e128ba15bd SHA256 ff7b73fadda837d548c3e70eeb6ed73cdc08775947f225f2405213309220d927 -EBUILD akregator-9999.ebuild 358 RMD160 e1eac4f7d3eea973f0b3241954000d14072d29fc SHA1 3caad65cafc421caf80a6546ffee27e128ba15bd SHA256 ff7b73fadda837d548c3e70eeb6ed73cdc08775947f225f2405213309220d927 +EBUILD akregator-9999.ebuild 362 RMD160 4005c6512819180f1a0858517def4cb36161c49c SHA1 dee225872f840b10c4416cd860834cb8109a620f SHA256 ae4ad373b71b891451e20f824933d46b3ce7e506de218fcefcfbcdf6bd4690cd MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/akregator/akregator-4.4.75.ebuild b/kde-base/akregator/akregator-4.4.75.ebuild index a1f0a12c088..508d58f1e98 100644 --- a/kde-base/akregator/akregator-4.4.75.ebuild +++ b/kde-base/akregator/akregator-4.4.75.ebuild @@ -13,8 +13,8 @@ IUSE="debug +handbook" DEPEND=" $(add_kdebase_dep kdepimlibs) - $(add_kdebase_dep libkdepim) + $(add_kdebase_dep kdepim-libs) " RDEPEND="${DEPEND}" -KMLOADLIBS="libkdepim" +KMLOADLIBS="kdepim-libs" diff --git a/kde-base/akregator/akregator-9999.ebuild b/kde-base/akregator/akregator-9999.ebuild index 236af76701e..bf5ba81d3a2 100644 --- a/kde-base/akregator/akregator-9999.ebuild +++ b/kde-base/akregator/akregator-9999.ebuild @@ -13,8 +13,8 @@ IUSE="debug +handbook" DEPEND=" $(add_kdebase_dep kdepimlibs) - $(add_kdebase_dep libkdepim) + $(add_kdebase_dep kdepim-libs) " RDEPEND="${DEPEND}" -KMLOADLIBS="libkdepim" +KMLOADLIBS="kdepim-libs" diff --git a/kde-base/kaddressbook/Manifest b/kde-base/kaddressbook/Manifest index 5648fa768af..6177b9de7f5 100644 --- a/kde-base/kaddressbook/Manifest +++ b/kde-base/kaddressbook/Manifest @@ -1,5 +1,5 @@ DIST kdepim-4.4.75.tar.xz 7990416 RMD160 4072b0ab954c5869323bc1b26f37070600b709fe SHA1 8dd940989e16d5ca1c8c72fa239e0c4e39639355 SHA256 1f726105cf596343a8c29634f1f587a40dc31aa725717808acf1eb5152326422 -EBUILD kaddressbook-4.4.75.ebuild 843 RMD160 f5fe9d9170ae1a07f350a33f9e1a5a924679e7e2 SHA1 cb5b942b5a35871705b3cf279272cb1eab09d0fe SHA256 8b210eda0f6f5a82ccb2ae45c436bda58cacb093d35bc28e5aa079a75153e55f +EBUILD kaddressbook-4.4.75.ebuild 791 RMD160 315712f15e35f41401aadb785724d0a14ac6a24c SHA1 23432ffb56690beb6674605220b9cd9bbd66fdf3 SHA256 baa4928789707c946c9eea42d008644448b57831601efadc3c7cba28847fa35a EBUILD kaddressbook-4.4.9999.ebuild 770 RMD160 369e76994fc80093af3f7e3de30fc3de9907a350 SHA1 a69036d04be6968e2cc677bafd419826d456f1d4 SHA256 5d25d0d5af61a65e9f19b3bd76e62f5c13c6d9853084c10982510cd7be1d840d -EBUILD kaddressbook-9999.ebuild 770 RMD160 369e76994fc80093af3f7e3de30fc3de9907a350 SHA1 a69036d04be6968e2cc677bafd419826d456f1d4 SHA256 5d25d0d5af61a65e9f19b3bd76e62f5c13c6d9853084c10982510cd7be1d840d +EBUILD kaddressbook-9999.ebuild 718 RMD160 de44654c92e74a832647d190154d676622a72362 SHA1 219eac0f3269ad316eb45e6c403add3912972559 SHA256 aa1de9a690565884e9a1ad75e9926bfb |