diff options
| -rw-r--r-- | eclass/kde4-meta.eclass | 63 | ||||
| -rw-r--r-- | kde-base/akonadi/Manifest | 2 | ||||
| -rw-r--r-- | kde-base/akonadi/akonadi-4.2.95.ebuild | 12 |
3 files changed, 53 insertions, 24 deletions
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index c1dd3ff6e6d..9feb2b81b31 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -38,6 +38,23 @@ if [[ ${PN} != khelpcenter ]] && has handbook ${IUSE//+}; then " fi +# SVN wrapping for various simplifying ebuilds +case ${BUILD_TYPE} in + live) + case ${KMNAME} in + extragear*|playground*) + ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}" + ESVN_PROJECT="${KMNAME}${ESVN_PROJECT_SUFFIX}" + ;; + kdepim-runtime) + # for svn the kdepim module is not split + # so just override KMNAME when needed. + KMNAME="kdepim" + ;; + esac + ;; +esac + # Add dependencies that all packages in a certain module share. case ${KMNAME} in kdebase|kdebase-apps|kdebase-workspace|kdebase-runtime|kdegraphics) @@ -56,7 +73,7 @@ case ${KMNAME} in >=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=] " ;; - kdepim) + kdepim|kdepim-runtime) DEPEND="${DEPEND} dev-libs/boost >=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=] @@ -119,23 +136,6 @@ esac debug-print "line ${LINENO} ${ECLASS}: DEPEND ${DEPEND} - after metapackage-specific dependencies" debug-print "line ${LINENO} ${ECLASS}: RDEPEND ${RDEPEND} - after metapackage-specific dependencies" -# Useful to build kde4-meta style stuff from extragear/playground (plasmoids etc) -case ${BUILD_TYPE} in - live) - case ${KMNAME} in - extragear*|playground*) - ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}" - ESVN_PROJECT="${KMNAME}${ESVN_PROJECT_SUFFIX}" - ;; - kdepim-runtime) - # for svn the kdepim module is not split - # so just override KMNAME when needed. - KMNAME="kdepim" - ;; - esac - ;; -esac - # @ECLASS-VARIABLE: KMNAME # @DESCRIPTION: # Name of the parent-module (e.g. kdebase, kdepim, ...). You _must_ set it @@ -383,6 +383,33 @@ kde4-meta_create_extractlists() { libkdegames" fi ;; + kdepim-runtime) + # this is actualy the akonadi :] + KMEXTRACTONLY="${KMEXTRACTONLY} + doc/ + kdepim-mime.xml + kdepim-version.h + akonadi-prefix.h.cmake + Mainpage.dox" + KMEXTRA="${KMEXTRA} + agents/ + akonadiconsole/ + akonadi_next/ + clients/ + defaultsetup/ + kabc/ + kcal/ + kcm/ + kioslave/ + kresources/ + libkdepim-copy/ + migration/ + opensync/ + plugins/ + resources/ + tray/ + xml/" + ;; kdepim) if [[ ${PN} != libkdepim ]]; then KMEXTRACTONLY="${KMEXTRACTONLY} diff --git a/kde-base/akonadi/Manifest b/kde-base/akonadi/Manifest index 5e355feb242..b61516cc3c5 100644 --- a/kde-base/akonadi/Manifest +++ b/kde-base/akonadi/Manifest @@ -1,7 +1,9 @@ DIST kdepim-4.2.90.tar.bz2 12238476 RMD160 0fcb99955c1e1f0a4c15cab7336fbd1c7b07c7dc SHA1 a83f75b88d81c069433bbe435632fc3f765c1a0f SHA256 028d4665c2ba6b952dc0bb7b09086752fd680e29793ccce51be96e7328811e94 DIST kdepim-4.2.91.tar.lzma 10648817 RMD160 c76e8612401e6862342bffbea532f2b46892b7de SHA1 04818a29209acfd9ed38c94e23c58ee8276daefa SHA256 844534da1e323839f58e9cf927db159f5d1b0467001746c0a08f22d8bbb88885 +DIST kdepim-runtime-4.2.95.tar.bz2 741576 RMD160 a2c1ed356f2a4fe1532159a3e6e0f530c36cbc58 SHA1 c65f34b39c8c7e9f4a8159fd65e97a977412c32e SHA256 952fe43f4f70ef43c9a3049f397498573ffbe9c85e5fc01d78e79f34e1d12315 EBUILD akonadi-4.2.90.ebuild 2035 RMD160 46154bfdebfdeb9c01a54ed6bf6a9242621b1fdf SHA1 40f7da935118576ce72b461cd1cecc4f579c1f75 SHA256 d856fcf8807b197ab3fc12218943eec4bb4ba6a553c09630121e0b7c62b159e9 EBUILD akonadi-4.2.91.ebuild 2035 RMD160 46154bfdebfdeb9c01a54ed6bf6a9242621b1fdf SHA1 40f7da935118576ce72b461cd1cecc4f579c1f75 SHA256 d856fcf8807b197ab3fc12218943eec4bb4ba6a553c09630121e0b7c62b159e9 +EBUILD akonadi-4.2.95.ebuild 2128 RMD160 7c488361ad1da25e93d6724cbe187da66f86e235 SHA1 7bc690e4fab1ff6bb3ee3fd8745a4b01bb18383f SHA256 a23598428143fff5fc48bcba8750372852cfc7e31a2cb83d264fdeceff5a118f EBUILD akonadi-4.3.9999.ebuild 1996 RMD160 78efa8eb5416d07587fd6fc9b8130e07f8d5e850 SHA1 10b97b16a714aa88bb7ba86ab70c6407b3e5a46d SHA256 1337163f3f2764b23455a0d56725652dc0de91d9b1c1454d9ecff4ed6cdbf08e EBUILD akonadi-9999.ebuild 1996 RMD160 78efa8eb5416d07587fd6fc9b8130e07f8d5e850 SHA1 10b97b16a714aa88bb7ba86ab70c6407b3e5a46d SHA256 1337163f3f2764b23455a0d56725652dc0de91d9b1c1454d9ecff4ed6cdbf08e MISC metadata.xml 255 RMD160 cc252d52dc3af272430aacb18e2295e5a8a6bc87 SHA1 02a4002e7da00834fc32c8bf89b9e9079ec39b17 SHA256 288a61d69488cb1a8cbeeb07e32f0b3b9910197e7179599fb4c90ca557b432ab diff --git a/kde-base/akonadi/akonadi-4.2.95.ebuild b/kde-base/akonadi/akonadi-4.2.95.ebuild index e83bc86c38a..b869116ebfd 100644 --- a/kde-base/akonadi/akonadi-4.2.95.ebuild +++ b/kde-base/akonadi/akonadi-4.2.95.ebuild @@ -4,7 +4,9 @@ EAPI="2" -KMNAME="kdepim" + +KMNAME="kdepim-runtime" +[[ ${PV} != *9999* ]] && KMNOMODULE="true" inherit kde4-meta DESCRIPTION="An extensible cross-desktop storage service for PIM data and meta data" @@ -31,14 +33,12 @@ RDEPEND="${DEPEND} >=app-office/akonadi-server-1.1.95[mysql] " -KMEXTRACTONLY=" - korganizer/version.h -" - src_prepare() { + local pref="${S}" + [[ ${KMNAME} != "kdepim-runtime" ]] && pref="${S}/${PN}" if ! use semantic-desktop; then sed -i -e "s/add_subdirectory( nepomuktag )//"\ - akonadi/resources/CMakeLists.txt\ + "${pref}"/resources/CMakeLists.txt\ || die "Failed to disable nepomuktag" fi |