diff options
| author | Jonathan Callen <en.ABCD@gmail.com> | 2009-08-16 20:49:24 -0400 |
|---|---|---|
| committer | Jonathan Callen <en.ABCD@gmail.com> | 2009-08-16 20:50:01 -0400 |
| commit | e98316a00fba42bd543bf122d853d1aab8dabc59 (patch) | |
| tree | 41916fd1c60d926880e4b86e988a13fb2faa0c01 /kde-base | |
| parent | b17d5b07f7dfcd6a1a4c468e00997ec947c162a0 (diff) | |
| download | kde-e98316a00fba42bd543bf122d853d1aab8dabc59.tar.gz kde-e98316a00fba42bd543bf122d853d1aab8dabc59.tar.bz2 kde-e98316a00fba42bd543bf122d853d1aab8dabc59.zip | |
[kde-base/libkdepim] Add new dependency on kde-base/akonadi, fix linking with libakonadi-kde.so
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/libkdepim/Manifest | 3 | ||||
| -rw-r--r-- | kde-base/libkdepim/files/libkdepim-fix-link.patch | 12 | ||||
| -rw-r--r-- | kde-base/libkdepim/libkdepim-9999.ebuild | 9 |
3 files changed, 22 insertions, 2 deletions
diff --git a/kde-base/libkdepim/Manifest b/kde-base/libkdepim/Manifest index 5d068021927..0b70d73a970 100644 --- a/kde-base/libkdepim/Manifest +++ b/kde-base/libkdepim/Manifest @@ -1,5 +1,6 @@ +AUX libkdepim-fix-link.patch 380 RMD160 126174f177d884e4e8fd82ef82ffccb5a1fc3367 SHA1 81841662e2ee8b8f879df449f4a7ad954fe73f69 SHA256 e927fdea2bd20512ea07b14ead6dbe0cce1ffb4aa1c77c8106859bc4c2036f26 DIST kdepim-4.3.63.tar.lzma 9440086 RMD160 4bf2642072f5f5110122b61f151818c230d3a9f5 SHA1 45d9ca0b7d313bc0d3310258a530c0233cdd4584 SHA256 11688d5b4c656b689aed76bbb38c7968954ec31b9551169e482deb4ac79056d7 EBUILD libkdepim-4.3.63.ebuild 908 RMD160 99626bd5bdf07eae1b07f175991a9ea9bf34b8c0 SHA1 a1cb7dab38d0e030686351b068f3c07d774d738e SHA256 b7940648f84e93348d751e8583c6692f4b0ef5a86516b7743839dfbfdb432689 EBUILD libkdepim-4.3.9999.ebuild 910 RMD160 19dc46bb4b962de4b60a7559b51438dbe2b5a4a9 SHA1 93676ae49f108aa93b5d830b13c6e0fa993bfe8f SHA256 efa453247321f2d2bb65d4e90585680d687f3ddd50a80ae9923e15c0a135a4ff -EBUILD libkdepim-9999.ebuild 866 RMD160 b47e1226de2263c46a9a4c2450db2718cd56793d SHA1 e9deccb3c614944d693f053916f609fa2ed925c8 SHA256 1da8465fe6219a434f7aeb899a55f4f326229f0bb878455c1cbfe25e069b1d4c +EBUILD libkdepim-9999.ebuild 999 RMD160 ae6d55f8990ea5d224f7c3330185ab2c8f1351fa SHA1 d026ce9854452adf1d137380f845f5a52decb293 SHA256 4d71d8aee5b35d8b3b5e82c6bed7fa35a5f56d4848d388d9366cfe364bdab4a2 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/libkdepim/files/libkdepim-fix-link.patch b/kde-base/libkdepim/files/libkdepim-fix-link.patch new file mode 100644 index 00000000000..53c7216f7de --- /dev/null +++ b/kde-base/libkdepim/files/libkdepim-fix-link.patch @@ -0,0 +1,12 @@ +Index: kdepim/libkdepim/CMakeLists.txt +=================================================================== +--- kdepim/libkdepim/CMakeLists.txt (revision 1011802) ++++ kdepim/libkdepim/CMakeLists.txt (working copy) +@@ -95,6 +95,7 @@ + ${KDEPIMLIBS_KPIMIDENTITIES_LIBS} + ${KDE4_KPARTS_LIBS} + ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS} ++ ${KDEPIMLIBS_AKONADI_LIBS} + akonadi-contact + ) + diff --git a/kde-base/libkdepim/libkdepim-9999.ebuild b/kde-base/libkdepim/libkdepim-9999.ebuild index 87b55435a34..2907393b4b0 100644 --- a/kde-base/libkdepim/libkdepim-9999.ebuild +++ b/kde-base/libkdepim/libkdepim-9999.ebuild @@ -11,18 +11,25 @@ DESCRIPTION="Common library for KDE PIM apps" KEYWORDS="" IUSE="debug" +DEPEND=" + >=kde-base/akonadi-${PV}:${SLOT}[kdeprefix=] +" + # @Since >4.2.65 kode removed from kdepim -RDEPEND=" +RDEPEND="${DEPEND} !kdeprefix? ( !>=kde-base/kode-4.1.0[-kdeprefix] ) kdeprefix? ( !kde-base/kode:${SLOT} ) " KMEXTRACTONLY=" + akonadi/contact/ korganizer/korgac/org.kde.korganizer.KOrgac.xml " KMSAVELIBS="true" +PATCHES=( "${FILESDIR}"/${PN}-fix-link.patch ) + src_install() { kde4-meta_src_install |