diff options
author | Michael Palimaka <kensington@gentoo.org> | 2013-05-13 09:38:38 +0000 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2013-05-13 09:38:38 +0000 |
commit | 3250b469c8f310777f519ba7229730cb36ef4815 (patch) | |
tree | 9abc10c8538ad8853c854d8252be71696432c6dd /kde-base/kdepim-runtime | |
parent | Version bumps. xsl USE flag has been renamed to xslt. (diff) | |
download | gentoo-2-3250b469c8f310777f519ba7229730cb36ef4815.tar.gz gentoo-2-3250b469c8f310777f519ba7229730cb36ef4815.tar.bz2 gentoo-2-3250b469c8f310777f519ba7229730cb36ef4815.zip |
Improve handling of automagic dependencies.
(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
Diffstat (limited to 'kde-base/kdepim-runtime')
-rw-r--r-- | kde-base/kdepim-runtime/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/kdepim-runtime/kdepim-runtime-4.10.3.ebuild | 14 |
2 files changed, 9 insertions, 11 deletions
diff --git a/kde-base/kdepim-runtime/ChangeLog b/kde-base/kdepim-runtime/ChangeLog index d7081941f4c2..4f195ae63ad0 100644 --- a/kde-base/kdepim-runtime/ChangeLog +++ b/kde-base/kdepim-runtime/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdepim-runtime # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.131 2013/05/08 21:00:04 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.132 2013/05/13 09:38:38 kensington Exp $ + + 13 May 2013; Michael Palimaka <kensington@gentoo.org> + kdepim-runtime-4.10.3.ebuild: + Improve handling of automagic dependencies. 08 May 2013; Johannes Huber <johu@gentoo.org> kdepim-runtime-4.10.3.ebuild: Restore accidentally dropped keywords. diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.10.3.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.10.3.ebuild index d7e82c458f4e..7dbcc9343838 100644 --- a/kde-base/kdepim-runtime/kdepim-runtime-4.10.3.ebuild +++ b/kde-base/kdepim-runtime/kdepim-runtime-4.10.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.10.3.ebuild,v 1.2 2013/05/08 21:00:04 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.10.3.ebuild,v 1.3 2013/05/13 09:38:38 kensington Exp $ EAPI=5 @@ -34,17 +34,11 @@ RDEPEND="${DEPEND} # nepomuk_email_feeder moved here in 4.8 add_blocker kdepim-common-libs 4.7.50 -src_prepare() { - sed -e "s:find_package(LibKGAPI QUIET NO_MODULE):macro_optional_find_package(LibKGAPI):g" \ - -i "${S}/CMakeLists.txt" || die "fixing automagic dependencies failed" - - kde4-base_src_prepare -} - src_configure() { local mycmakeargs=( - $(cmake-utils_use_with google LibKGAPI) - $(cmake-utils_use_with kolab Libkolab) + $(cmake-utils_use_find_package google LibKGAPI) + $(cmake-utils_use_find_package kolab Libkolab) + $(cmake-utils_use_find_package kolab Libkolabxml) ) kde4-base_src_configure |