summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2013-05-18 21:41:18 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2013-05-18 21:41:18 +0000
commitae34ba7e60803eaf3f167e489ecb77e227c60033 (patch)
tree7d00d8dff1043666f5496f6dddeab26d110087cb /profiles
parentStable for alpha, wrt bug #461182 (diff)
downloadgentoo-2-ae34ba7e60803eaf3f167e489ecb77e227c60033.tar.gz
gentoo-2-ae34ba7e60803eaf3f167e489ecb77e227c60033.tar.bz2
gentoo-2-ae34ba7e60803eaf3f167e489ecb77e227c60033.zip
Remove mask of akonadi-google, since it is still needed for kdepim-4.4
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask7
2 files changed, 5 insertions, 7 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 5a6d59d4d8c9..3df2012bbea1 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7850 2013/05/16 19:29:27 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7851 2013/05/18 21:41:18 dilfridge Exp $
#
# This ChangeLog should include records for all changes in profiles directory.
# Only typo fixes which don't affect portage/repoman behaviour could be avoided
# here. If in doubt put a record here!
+ 18 May 2013; Andreas K. Huettel <dilfridge@gentoo.org> package.mask:
+ Remove mask of akonadi-google, since it is still needed for kdepim-4.4
+
16 May 2013; Magnus Granberg <zorry@gentoo.org> hardened/ChangLog:
Add new ChangLog for hardened profile
diff --git a/profiles/package.mask b/profiles/package.mask
index 8071cf5209b1..602f7c85f3e3 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,6 +1,6 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14761 2013/05/16 16:01:43 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14762 2013/05/18 21:41:18 dilfridge Exp $
#
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -69,11 +69,6 @@ dev-python/envisageplugins
# Removal in 30 days
dev-python/gdl-python
-# Johannes Huber <johu@gentoo.org> (09 May 2013)
-# Masked for removal in 30 days. Package is obsolete.
-# Upstream replaced it with net-libs/libkgapi.
-kde-misc/akonadi-google
-
# Alexis Ballier <aballier@gentoo.org> (08 May 2013)
# Breaks it sole rev. dep: vlc
# Keep it masked until fixed.