| 1 |
commit: 6844cf99d773042f158070ba6c79de1b24aa232d |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 4 22:23:43 2014 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 4 22:48:49 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6844cf99 |
| 7 |
|
| 8 |
[kde-base/kdeplasma-addons] Introduce nepomuk and kdepim USE flags, bug #508350 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.10 |
| 11 |
|
| 12 |
--- |
| 13 |
.../kdeplasma-addons-4.13.49.9999.ebuild | 16 ++++++------- |
| 14 |
.../kdeplasma-addons-4.9999.ebuild | 16 ++++++------- |
| 15 |
kde-base/kdeplasma-addons/metadata.xml | 26 ++++++++++++---------- |
| 16 |
3 files changed, 28 insertions(+), 30 deletions(-) |
| 17 |
|
| 18 |
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.13.49.9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.13.49.9999.ebuild |
| 19 |
index ffb8e54..41fef45 100644 |
| 20 |
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.13.49.9999.ebuild |
| 21 |
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.13.49.9999.ebuild |
| 22 |
@@ -9,8 +9,8 @@ inherit kde4-base |
| 23 |
DESCRIPTION="Extra Plasma applets and engines" |
| 24 |
LICENSE="GPL-2 LGPL-2" |
| 25 |
KEYWORDS="" |
| 26 |
-IUSE="attica debug desktopglobe exif fcitx ibus json oauth qalculate qwt scim |
| 27 |
-semantic-desktop" |
| 28 |
+IUSE="attica debug desktopglobe exif fcitx ibus json +kdepim nepomuk oauth |
| 29 |
+qalculate qwt scim" |
| 30 |
|
| 31 |
RESTRICT=test |
| 32 |
# tests hang |
| 33 |
@@ -19,9 +19,9 @@ RESTRICT=test |
| 34 |
COMMON_DEPEND=" |
| 35 |
app-crypt/qca:2 |
| 36 |
app-crypt/qca-ossl:2 |
| 37 |
- $(add_kdebase_dep kdelibs 'semantic-desktop?') |
| 38 |
+ $(add_kdebase_dep kdelibs 'nepomuk?') |
| 39 |
$(add_kdebase_dep krunner '' 4.11) |
| 40 |
- $(add_kdebase_dep plasma-workspace 'semantic-desktop?' 4.11) |
| 41 |
+ $(add_kdebase_dep plasma-workspace 'nepomuk?' 4.11) |
| 42 |
x11-misc/shared-mime-info |
| 43 |
attica? ( dev-libs/libattica ) |
| 44 |
desktopglobe? ( $(add_kdebase_dep marble) ) |
| 45 |
@@ -29,13 +29,11 @@ COMMON_DEPEND=" |
| 46 |
fcitx? ( app-i18n/fcitx[dbus(+)] ) |
| 47 |
ibus? ( app-i18n/ibus ) |
| 48 |
json? ( dev-libs/qjson ) |
| 49 |
+ kdepim? ( $(add_kdebase_dep kdepimlibs) ) |
| 50 |
oauth? ( dev-libs/qoauth ) |
| 51 |
qalculate? ( sci-libs/libqalculate ) |
| 52 |
qwt? ( x11-libs/qwt:5 ) |
| 53 |
scim? ( app-i18n/scim ) |
| 54 |
- semantic-desktop? ( |
| 55 |
- $(add_kdebase_dep kdepimlibs) |
| 56 |
- ) |
| 57 |
" |
| 58 |
DEPEND="${COMMON_DEPEND} |
| 59 |
dev-cpp/eigen:2 |
| 60 |
@@ -51,12 +49,12 @@ src_configure() { |
| 61 |
$(cmake-utils_use_with exif Kexiv2) |
| 62 |
$(cmake-utils_use_build ibus) |
| 63 |
$(cmake-utils_use_with json QJSON) |
| 64 |
+ $(cmake-utils_use_with kdepim KdepimLibs) |
| 65 |
+ $(cmake-utils_use_with nepomuk) |
| 66 |
$(cmake-utils_use_with oauth QtOAuth) |
| 67 |
$(cmake-utils_use_with qalculate) |
| 68 |
$(cmake-utils_use_with qwt) |
| 69 |
$(cmake-utils_use_build scim) |
| 70 |
- $(cmake-utils_use_with semantic-desktop KdepimLibs) |
| 71 |
- $(cmake-utils_use_with semantic-desktop Nepomuk) |
| 72 |
) |
| 73 |
|
| 74 |
kde4-base_src_configure |
| 75 |
|
| 76 |
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.9999.ebuild |
| 77 |
index ffb8e54..41fef45 100644 |
| 78 |
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.9999.ebuild |
| 79 |
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.9999.ebuild |
| 80 |
@@ -9,8 +9,8 @@ inherit kde4-base |
| 81 |
DESCRIPTION="Extra Plasma applets and engines" |
| 82 |
LICENSE="GPL-2 LGPL-2" |
| 83 |
KEYWORDS="" |
| 84 |
-IUSE="attica debug desktopglobe exif fcitx ibus json oauth qalculate qwt scim |
| 85 |
-semantic-desktop" |
| 86 |
+IUSE="attica debug desktopglobe exif fcitx ibus json +kdepim nepomuk oauth |
| 87 |
+qalculate qwt scim" |
| 88 |
|
| 89 |
RESTRICT=test |
| 90 |
# tests hang |
| 91 |
@@ -19,9 +19,9 @@ RESTRICT=test |
| 92 |
COMMON_DEPEND=" |
| 93 |
app-crypt/qca:2 |
| 94 |
app-crypt/qca-ossl:2 |
| 95 |
- $(add_kdebase_dep kdelibs 'semantic-desktop?') |
| 96 |
+ $(add_kdebase_dep kdelibs 'nepomuk?') |
| 97 |
$(add_kdebase_dep krunner '' 4.11) |
| 98 |
- $(add_kdebase_dep plasma-workspace 'semantic-desktop?' 4.11) |
| 99 |
+ $(add_kdebase_dep plasma-workspace 'nepomuk?' 4.11) |
| 100 |
x11-misc/shared-mime-info |
| 101 |
attica? ( dev-libs/libattica ) |
| 102 |
desktopglobe? ( $(add_kdebase_dep marble) ) |
| 103 |
@@ -29,13 +29,11 @@ COMMON_DEPEND=" |
| 104 |
fcitx? ( app-i18n/fcitx[dbus(+)] ) |
| 105 |
ibus? ( app-i18n/ibus ) |
| 106 |
json? ( dev-libs/qjson ) |
| 107 |
+ kdepim? ( $(add_kdebase_dep kdepimlibs) ) |
| 108 |
oauth? ( dev-libs/qoauth ) |
| 109 |
qalculate? ( sci-libs/libqalculate ) |
| 110 |
qwt? ( x11-libs/qwt:5 ) |
| 111 |
scim? ( app-i18n/scim ) |
| 112 |
- semantic-desktop? ( |
| 113 |
- $(add_kdebase_dep kdepimlibs) |
| 114 |
- ) |
| 115 |
" |
| 116 |
DEPEND="${COMMON_DEPEND} |
| 117 |
dev-cpp/eigen:2 |
| 118 |
@@ -51,12 +49,12 @@ src_configure() { |
| 119 |
$(cmake-utils_use_with exif Kexiv2) |
| 120 |
$(cmake-utils_use_build ibus) |
| 121 |
$(cmake-utils_use_with json QJSON) |
| 122 |
+ $(cmake-utils_use_with kdepim KdepimLibs) |
| 123 |
+ $(cmake-utils_use_with nepomuk) |
| 124 |
$(cmake-utils_use_with oauth QtOAuth) |
| 125 |
$(cmake-utils_use_with qalculate) |
| 126 |
$(cmake-utils_use_with qwt) |
| 127 |
$(cmake-utils_use_build scim) |
| 128 |
- $(cmake-utils_use_with semantic-desktop KdepimLibs) |
| 129 |
- $(cmake-utils_use_with semantic-desktop Nepomuk) |
| 130 |
) |
| 131 |
|
| 132 |
kde4-base_src_configure |
| 133 |
|
| 134 |
diff --git a/kde-base/kdeplasma-addons/metadata.xml b/kde-base/kdeplasma-addons/metadata.xml |
| 135 |
index 8d333cd..f465b65 100644 |
| 136 |
--- a/kde-base/kdeplasma-addons/metadata.xml |
| 137 |
+++ b/kde-base/kdeplasma-addons/metadata.xml |
| 138 |
@@ -1,16 +1,18 @@ |
| 139 |
<?xml version="1.0" encoding="UTF-8"?> |
| 140 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 141 |
<pkgmetadata> |
| 142 |
-<herd>kde</herd> |
| 143 |
-<use> |
| 144 |
- <flag name="attica">Enable support for <pkg>dev-libs/libattica</pkg></flag> |
| 145 |
- <flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag> |
| 146 |
- <flag name="desktopglobe">Enable Desktop Globe wallpaper using <pkg>kde-base/marble</pkg></flag> |
| 147 |
- <flag name="fcitx">Use fcitx input method via <pkg>app-i18n/fcitx</pkg></flag> |
| 148 |
- <flag name="json">Enable JSON support via <pkg>dev-libs/qjson</pkg></flag> |
| 149 |
- <flag name="oauth">Enable OAuth support via <pkg>dev-libs/qoauth</pkg></flag> |
| 150 |
- <flag name="qalculate">Enable Qalculate runner using <pkg>sci-libs/libqalculate</pkg></flag> |
| 151 |
- <flag name="qwt">Enable applets that use <pkg>x11-libs/qwt:5</pkg>.</flag> |
| 152 |
- <flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg>.</flag> |
| 153 |
-</use> |
| 154 |
+ <herd>kde</herd> |
| 155 |
+ <use> |
| 156 |
+ <flag name="attica">Enable support for <pkg>dev-libs/libattica</pkg></flag> |
| 157 |
+ <flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag> |
| 158 |
+ <flag name="desktopglobe">Enable Desktop Globe wallpaper using <pkg>kde-base/marble</pkg></flag> |
| 159 |
+ <flag name="fcitx">Use fcitx input method via <pkg>app-i18n/fcitx</pkg></flag> |
| 160 |
+ <flag name="json">Enable JSON support via <pkg>dev-libs/qjson</pkg></flag> |
| 161 |
+ <flag name="kdepim">KDE PIM integration via <pkg>kde-base/kdepimlibs</pkg></flag> |
| 162 |
+ <flag name="nepomuk">Enable Nepomuk based semantic desktop support (deprecated)</flag> |
| 163 |
+ <flag name="oauth">Enable OAuth support via <pkg>dev-libs/qoauth</pkg></flag> |
| 164 |
+ <flag name="qalculate">Enable Qalculate runner using <pkg>sci-libs/libqalculate</pkg></flag> |
| 165 |
+ <flag name="qwt">Enable applets that use <pkg>x11-libs/qwt:5</pkg></flag> |
| 166 |
+ <flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag> |
| 167 |
+ </use> |
| 168 |
</pkgmetadata> |
Archives