diff options
| author |   Johannes Huber <johu@gentoo.org> | 2012-07-26 23:00:00 +0000 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2012-07-26 23:00:00 +0000 |
| commit | afbb6080f09ec561d7eff22c52509ef70443ae9e (patch) | |
| tree | 287b4d77e5aebf0aa6c2c48307100ab7533cd5f5 | |
| parent | Remove old (diff) | |
| download | gentoo-2-afbb6080f09ec561d7eff22c52509ef70443ae9e.tar.gz gentoo-2-afbb6080f09ec561d7eff22c52509ef70443ae9e.tar.bz2 gentoo-2-afbb6080f09ec561d7eff22c52509ef70443ae9e.zip | |
Block kde-base/akonadiconsole to prevent file collisions, bug #428182.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
| -rw-r--r-- | kde-base/akonadi/ChangeLog | 8 | ||||
| -rw-r--r-- | kde-base/akonadi/akonadi-4.4.11.1.ebuild | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/kde-base/akonadi/ChangeLog b/kde-base/akonadi/ChangeLog index 07f25ca8c2d0..b7d17de7ac3b 100644 --- a/kde-base/akonadi/ChangeLog +++ b/kde-base/akonadi/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/akonadi -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/ChangeLog,v 1.91 2011/06/02 22:05:13 dilfridge Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/ChangeLog,v 1.92 2012/07/26 23:00:00 johu Exp $ + + 26 Jul 2012; Johannes Huber <johu@gentoo.org> akonadi-4.4.11.1.ebuild: + Block kde-base/akonadiconsole to prevent file collisions, bug #428182. 02 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> -akonadi-4.4.9.ebuild, -akonadi-4.4.10.ebuild: @@ -359,4 +362,3 @@ 02 Oct 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> +metadata.xml, +akonadi-4.1.2.ebuild: Add kde-4.1.2 into the tree from the kde-testing overlay. - diff --git a/kde-base/akonadi/akonadi-4.4.11.1.ebuild b/kde-base/akonadi/akonadi-4.4.11.1.ebuild index ff52ab4cc31a..8288c8b872fa 100644 --- a/kde-base/akonadi/akonadi-4.4.11.1.ebuild +++ b/kde-base/akonadi/akonadi-4.4.11.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/akonadi-4.4.11.1.ebuild,v 1.5 2011/06/01 19:34:52 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/akonadi-4.4.11.1.ebuild,v 1.6 2012/07/26 23:00:00 johu Exp $ EAPI=4 @@ -28,6 +28,8 @@ KMEXTRA=" # @since 4.3 - blocks kdemaildir - no longer provided (it's in akonadi now) add_blocker kdemaildir add_blocker kdepim-kresources '<4.2.95' +# bug #428182 +add_blocker akonadiconsole src_configure() { mycmakeargs=( |