summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/package.keywords/.kde-4.6.9999/kdedeps-4.67
-rw-r--r--Documentation/package.keywords/.kde-4.6.9999/more-deps19
-rw-r--r--Documentation/package.keywords/.kde-4.6/more-deps19
-rw-r--r--Documentation/package.keywords/.kde-live.base/more-deps2
-rw-r--r--Documentation/package.keywords/.kde-live/more-deps2
-rw-r--r--Documentation/package.keywords/kde-4.6.9999.keywords26
-rw-r--r--Documentation/package.keywords/kde-4.6.keywords26
-rw-r--r--Documentation/package.keywords/kde-live.keywords2
-rw-r--r--Documentation/package.unmask/kde-4.67
-rw-r--r--profiles/package.mask7
-rw-r--r--sets/kdedeps-4.67
11 files changed, 60 insertions, 64 deletions
diff --git a/Documentation/package.keywords/.kde-4.6.9999/kdedeps-4.6 b/Documentation/package.keywords/.kde-4.6.9999/kdedeps-4.6
index c46c3c12aea..7bf070125c3 100644
--- a/Documentation/package.keywords/.kde-4.6.9999/kdedeps-4.6
+++ b/Documentation/package.keywords/.kde-4.6.9999/kdedeps-4.6
@@ -1,7 +1,4 @@
# Polkit and other deps
->=app-office/akonadi-server-1.4.80
+=app-office/akonadi-server-1.5.0
+=dev-libs/libattica-0.2.0
>=dev-libs/soprano-2.5.63_pre
->=kde-misc/polkit-kde-kcmodules-0.98_pre
->=sys-auth/polkit-kde-agent-0.98_pre
->=sys-auth/polkit-qt-0.98_pre
->=sys-power/upower-0.9.7
diff --git a/Documentation/package.keywords/.kde-4.6.9999/more-deps b/Documentation/package.keywords/.kde-4.6.9999/more-deps
index e816cd2adeb..c9e4f69eb3f 100644
--- a/Documentation/package.keywords/.kde-4.6.9999/more-deps
+++ b/Documentation/package.keywords/.kde-4.6.9999/more-deps
@@ -1,16 +1,21 @@
# Version is unrelated, KDE printing won't be stabilized
app-admin/system-config-printer-common
-=dev-db/virtuoso-odbc-6.1.2
-=dev-db/virtuoso-server-6.1.2
+~dev-db/virtuoso-odbc-6.1.2
+~dev-db/virtuoso-server-6.1.2
=dev-libs/libdbusmenu-qt-0.6*
# Some issues with grantlee, let's wait for 0.1.6
-dev-libs/grantlee
-=dev-libs/libattica-0.1.4
-=dev-libs/shared-desktop-ontologies-0.5
+~dev-libs/glib-2.26.1
+~dev-libs/grantlee-0.1.7
+>=dev-libs/shared-desktop-ontologies-0.5
# Unsure about that yet
-=dev-libs/soprano-2.5*
dev-python/pycups
-=net-dns/cagibi-0.1.1
+~dev-python/PyQt4-4.8.3
+~net-dns/cagibi-0.1.1
+>=kde-misc/polkit-kde-kcmodules-0.98_pre
+~sys-auth/polkit-0.99
+~sys-auth/polkit-kde-agent-0.99.0
+~sys-auth/polkit-qt-0.99.0
+>=sys-power/upower-0.9.7
x11-apps/scripts
# Also unrelated
x11-misc/google-gadgets
diff --git a/Documentation/package.keywords/.kde-4.6/more-deps b/Documentation/package.keywords/.kde-4.6/more-deps
index e816cd2adeb..c9e4f69eb3f 100644
--- a/Documentation/package.keywords/.kde-4.6/more-deps
+++ b/Documentation/package.keywords/.kde-4.6/more-deps
@@ -1,16 +1,21 @@
# Version is unrelated, KDE printing won't be stabilized
app-admin/system-config-printer-common
-=dev-db/virtuoso-odbc-6.1.2
-=dev-db/virtuoso-server-6.1.2
+~dev-db/virtuoso-odbc-6.1.2
+~dev-db/virtuoso-server-6.1.2
=dev-libs/libdbusmenu-qt-0.6*
# Some issues with grantlee, let's wait for 0.1.6
-dev-libs/grantlee
-=dev-libs/libattica-0.1.4
-=dev-libs/shared-desktop-ontologies-0.5
+~dev-libs/glib-2.26.1
+~dev-libs/grantlee-0.1.7
+>=dev-libs/shared-desktop-ontologies-0.5
# Unsure about that yet
-=dev-libs/soprano-2.5*
dev-python/pycups
-=net-dns/cagibi-0.1.1
+~dev-python/PyQt4-4.8.3
+~net-dns/cagibi-0.1.1
+>=kde-misc/polkit-kde-kcmodules-0.98_pre
+~sys-auth/polkit-0.99
+~sys-auth/polkit-kde-agent-0.99.0
+~sys-auth/polkit-qt-0.99.0
+>=sys-power/upower-0.9.7
x11-apps/scripts
# Also unrelated
x11-misc/google-gadgets
diff --git a/Documentation/package.keywords/.kde-live.base/more-deps b/Documentation/package.keywords/.kde-live.base/more-deps
index 12448d49f3a..139297b8d7b 100644
--- a/Documentation/package.keywords/.kde-live.base/more-deps
+++ b/Documentation/package.keywords/.kde-live.base/more-deps
@@ -2,9 +2,7 @@ app-admin/system-config-printer-common
=dev-db/virtuoso-odbc-6.1*
=dev-db/virtuoso-server-6.1*
dev-libs/grantlee
-dev-libs/libattica
dev-libs/libdbusmenu-qt
-dev-libs/shared-desktop-ontologies
dev-python/pycups
net-libs/libktorrent
x11-apps/scripts
diff --git a/Documentation/package.keywords/.kde-live/more-deps b/Documentation/package.keywords/.kde-live/more-deps
index 12448d49f3a..139297b8d7b 100644
--- a/Documentation/package.keywords/.kde-live/more-deps
+++ b/Documentation/package.keywords/.kde-live/more-deps
@@ -2,9 +2,7 @@ app-admin/system-config-printer-common
=dev-db/virtuoso-odbc-6.1*
=dev-db/virtuoso-server-6.1*
dev-libs/grantlee
-dev-libs/libattica
dev-libs/libdbusmenu-qt
-dev-libs/shared-desktop-ontologies
dev-python/pycups
net-libs/libktorrent
x11-apps/scripts
diff --git a/Documentation/package.keywords/kde-4.6.9999.keywords b/Documentation/package.keywords/kde-4.6.9999.keywords
index 24bd9440a4b..51b77beaa46 100644
--- a/Documentation/package.keywords/kde-4.6.9999.keywords
+++ b/Documentation/package.keywords/kde-4.6.9999.keywords
@@ -117,12 +117,9 @@
~kde-base/pykde4-4.6.9999 **
~kde-base/smoke-4.6.9999 **
# Polkit and other deps
->=app-office/akonadi-server-1.4.80
+=app-office/akonadi-server-1.5.0
+=dev-libs/libattica-0.2.0
>=dev-libs/soprano-2.5.63_pre
->=kde-misc/polkit-kde-kcmodules-0.98_pre
->=sys-auth/polkit-kde-agent-0.98_pre
->=sys-auth/polkit-qt-0.98_pre
->=sys-power/upower-0.9.7
~kde-base/blinken-4.6.9999 **
~kde-base/cantor-4.6.9999 **
~kde-base/kalgebra-4.6.9999 **
@@ -292,17 +289,22 @@
~kde-base/kde-meta-4.6.9999 **
# Version is unrelated, KDE printing won't be stabilized
app-admin/system-config-printer-common
-=dev-db/virtuoso-odbc-6.1.2
-=dev-db/virtuoso-server-6.1.2
+~dev-db/virtuoso-odbc-6.1.2
+~dev-db/virtuoso-server-6.1.2
=dev-libs/libdbusmenu-qt-0.6*
# Some issues with grantlee, let's wait for 0.1.6
-dev-libs/grantlee
-=dev-libs/libattica-0.1.4
-=dev-libs/shared-desktop-ontologies-0.5
+~dev-libs/glib-2.26.1
+~dev-libs/grantlee-0.1.7
+>=dev-libs/shared-desktop-ontologies-0.5
# Unsure about that yet
-=dev-libs/soprano-2.5*
dev-python/pycups
-=net-dns/cagibi-0.1.1
+~dev-python/PyQt4-4.8.3
+~net-dns/cagibi-0.1.1
+>=kde-misc/polkit-kde-kcmodules-0.98_pre
+~sys-auth/polkit-0.99
+~sys-auth/polkit-kde-agent-0.99.0
+~sys-auth/polkit-qt-0.99.0
+>=sys-power/upower-0.9.7
x11-apps/scripts
# Also unrelated
x11-misc/google-gadgets
diff --git a/Documentation/package.keywords/kde-4.6.keywords b/Documentation/package.keywords/kde-4.6.keywords
index 133e7bf1774..e469c30f855 100644
--- a/Documentation/package.keywords/kde-4.6.keywords
+++ b/Documentation/package.keywords/kde-4.6.keywords
@@ -117,12 +117,9 @@ kde-base/krosspython:4.6
kde-base/pykde4:4.6
kde-base/smoke:4.6
# Polkit and other deps
->=app-office/akonadi-server-1.4.80
+=app-office/akonadi-server-1.5.0
+=dev-libs/libattica-0.2.0
>=dev-libs/soprano-2.5.63_pre
->=kde-misc/polkit-kde-kcmodules-0.98_pre
->=sys-auth/polkit-kde-agent-0.98_pre
->=sys-auth/polkit-qt-0.98_pre
->=sys-power/upower-0.9.7
kde-base/blinken:4.6
kde-base/cantor:4.6
kde-base/kalgebra:4.6
@@ -292,17 +289,22 @@ kde-base/kdebase-meta:4.6
kde-base/kde-meta:4.6
# Version is unrelated, KDE printing won't be stabilized
app-admin/system-config-printer-common
-=dev-db/virtuoso-odbc-6.1.2
-=dev-db/virtuoso-server-6.1.2
+~dev-db/virtuoso-odbc-6.1.2
+~dev-db/virtuoso-server-6.1.2
=dev-libs/libdbusmenu-qt-0.6*
# Some issues with grantlee, let's wait for 0.1.6
-dev-libs/grantlee
-=dev-libs/libattica-0.1.4
-=dev-libs/shared-desktop-ontologies-0.5
+~dev-libs/glib-2.26.1
+~dev-libs/grantlee-0.1.7
+>=dev-libs/shared-desktop-ontologies-0.5
# Unsure about that yet
-=dev-libs/soprano-2.5*
dev-python/pycups
-=net-dns/cagibi-0.1.1
+~dev-python/PyQt4-4.8.3
+~net-dns/cagibi-0.1.1
+>=kde-misc/polkit-kde-kcmodules-0.98_pre
+~sys-auth/polkit-0.99
+~sys-auth/polkit-kde-agent-0.99.0
+~sys-auth/polkit-qt-0.99.0
+>=sys-power/upower-0.9.7
x11-apps/scripts
# Also unrelated
x11-misc/google-gadgets
diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords
index 5aaa525c0c3..de18613285e 100644
--- a/Documentation/package.keywords/kde-live.keywords
+++ b/Documentation/package.keywords/kde-live.keywords
@@ -303,9 +303,7 @@ app-admin/system-config-printer-common
=dev-db/virtuoso-odbc-6.1*
=dev-db/virtuoso-server-6.1*
dev-libs/grantlee
-dev-libs/libattica
dev-libs/libdbusmenu-qt
-dev-libs/shared-desktop-ontologies
dev-python/pycups
net-libs/libktorrent
x11-apps/scripts
diff --git a/Documentation/package.unmask/kde-4.6 b/Documentation/package.unmask/kde-4.6
index 74c83255346..917b37d94f2 100644
--- a/Documentation/package.unmask/kde-4.6
+++ b/Documentation/package.unmask/kde-4.6
@@ -117,12 +117,9 @@ kde-base/krosspython:4.6
kde-base/pykde4:4.6
kde-base/smoke:4.6
# Polkit and other deps
->=app-office/akonadi-server-1.4.80
+=app-office/akonadi-server-1.5.0
+=dev-libs/libattica-0.2.0
>=dev-libs/soprano-2.5.63_pre
->=kde-misc/polkit-kde-kcmodules-0.98_pre
->=sys-auth/polkit-kde-agent-0.98_pre
->=sys-auth/polkit-qt-0.98_pre
->=sys-power/upower-0.9.7
kde-base/blinken:4.6
kde-base/cantor:4.6
kde-base/kalgebra:4.6
diff --git a/profiles/package.mask b/profiles/package.mask
index d4a84ca32f5..d4eaf3dd39d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -124,12 +124,9 @@ kde-base/krosspython:4.6
kde-base/pykde4:4.6
kde-base/smoke:4.6
# Polkit and other deps
->=app-office/akonadi-server-1.4.80
+=app-office/akonadi-server-1.5.0
+=dev-libs/libattica-0.2.0
>=dev-libs/soprano-2.5.63_pre
->=kde-misc/polkit-kde-kcmodules-0.98_pre
->=sys-auth/polkit-kde-agent-0.98_pre
->=sys-auth/polkit-qt-0.98_pre
->=sys-power/upower-0.9.7
kde-base/blinken:4.6
kde-base/cantor:4.6
kde-base/kalgebra:4.6
diff --git a/sets/kdedeps-4.6 b/sets/kdedeps-4.6
index c46c3c12aea..7bf070125c3 100644
--- a/sets/kdedeps-4.6
+++ b/sets/kdedeps-4.6
@@ -1,7 +1,4 @@
# Polkit and other deps
->=app-office/akonadi-server-1.4.80
+=app-office/akonadi-server-1.5.0
+=dev-libs/libattica-0.2.0
>=dev-libs/soprano-2.5.63_pre
->=kde-misc/polkit-kde-kcmodules-0.98_pre
->=sys-auth/polkit-kde-agent-0.98_pre
->=sys-auth/polkit-qt-0.98_pre
->=sys-power/upower-0.9.7