commit: 6844cf99d773042f158070ba6c79de1b24aa232d
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun May 4 22:23:43 2014 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun May 4 22:48:49 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6844cf99
[kde-base/kdeplasma-addons] Introduce nepomuk and kdepim USE flags, bug #508350
Package-Manager: portage-2.2.10
---
.../kdeplasma-addons-4.13.49.9999.ebuild | 16 ++++++-------
.../kdeplasma-addons-4.9999.ebuild | 16 ++++++-------
kde-base/kdeplasma-addons/metadata.xml | 26 ++++++++++++----------
3 files changed, 28 insertions(+), 30 deletions(-)
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
index ffb8e54..41fef45 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.13.49.9999.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.13.49.9999.ebuild
@@ -9,8 +9,8 @@ inherit kde4-base
DESCRIPTION="Extra Plasma applets and engines"
LICENSE="GPL-2 LGPL-2"
KEYWORDS=""
-IUSE="attica debug desktopglobe exif fcitx ibus json oauth qalculate qwt scim
-semantic-desktop"
+IUSE="attica debug desktopglobe exif fcitx ibus json +kdepim nepomuk oauth
+qalculate qwt scim"
RESTRICT=test
# tests hang
@@ -19,9 +19,9 @@ RESTRICT=test
COMMON_DEPEND="
app-crypt/qca:2
app-crypt/qca-ossl:2
- $(add_kdebase_dep kdelibs 'semantic-desktop?')
+ $(add_kdebase_dep kdelibs 'nepomuk?')
$(add_kdebase_dep krunner '' 4.11)
- $(add_kdebase_dep plasma-workspace 'semantic-desktop?' 4.11)
+ $(add_kdebase_dep plasma-workspace 'nepomuk?' 4.11)
x11-misc/shared-mime-info
attica? ( dev-libs/libattica )
desktopglobe? ( $(add_kdebase_dep marble) )
@@ -29,13 +29,11 @@ COMMON_DEPEND="
fcitx? ( app-i18n/fcitx[dbus(+)] )
ibus? ( app-i18n/ibus )
json? ( dev-libs/qjson )
+ kdepim? ( $(add_kdebase_dep kdepimlibs) )
oauth? ( dev-libs/qoauth )
qalculate? ( sci-libs/libqalculate )
qwt? ( x11-libs/qwt:5 )
scim? ( app-i18n/scim )
- semantic-desktop? (
- $(add_kdebase_dep kdepimlibs)
- )
"
DEPEND="${COMMON_DEPEND}
dev-cpp/eigen:2
@@ -51,12 +49,12 @@ src_configure() {
$(cmake-utils_use_with exif Kexiv2)
$(cmake-utils_use_build ibus)
$(cmake-utils_use_with json QJSON)
+ $(cmake-utils_use_with kdepim KdepimLibs)
+ $(cmake-utils_use_with nepomuk)
$(cmake-utils_use_with oauth QtOAuth)
$(cmake-utils_use_with qalculate)
$(cmake-utils_use_with qwt)
$(cmake-utils_use_build scim)
- $(cmake-utils_use_with semantic-desktop KdepimLibs)
- $(cmake-utils_use_with semantic-desktop Nepomuk)
)
kde4-base_src_configure
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.9999.ebuild
b/kde-base/kdeplasma-addons/kdeplasma-addons-4.9999.ebuild
index ffb8e54..41fef45 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.9999.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.9999.ebuild
@@ -9,8 +9,8 @@ inherit kde4-base
DESCRIPTION="Extra Plasma applets and engines"
LICENSE="GPL-2 LGPL-2"
KEYWORDS=""
-IUSE="attica debug desktopglobe exif fcitx ibus json oauth qalculate qwt scim
-semantic-desktop"
+IUSE="attica debug desktopglobe exif fcitx ibus json +kdepim nepomuk oauth
+qalculate qwt scim"
RESTRICT=test
# tests hang
@@ -19,9 +19,9 @@ RESTRICT=test
COMMON_DEPEND="
app-crypt/qca:2
app-crypt/qca-ossl:2
- $(add_kdebase_dep kdelibs 'semantic-desktop?')
+ $(add_kdebase_dep kdelibs 'nepomuk?')
$(add_kdebase_dep krunner '' 4.11)
- $(add_kdebase_dep plasma-workspace 'semantic-desktop?' 4.11)
+ $(add_kdebase_dep plasma-workspace 'nepomuk?' 4.11)
x11-misc/shared-mime-info
attica? ( dev-libs/libattica )
desktopglobe? ( $(add_kdebase_dep marble) )
@@ -29,13 +29,11 @@ COMMON_DEPEND="
fcitx? ( app-i18n/fcitx[dbus(+)] )
ibus? ( app-i18n/ibus )
json? ( dev-libs/qjson )
+ kdepim? ( $(add_kdebase_dep kdepimlibs) )
oauth? ( dev-libs/qoauth )
qalculate? ( sci-libs/libqalculate )
qwt? ( x11-libs/qwt:5 )
scim? ( app-i18n/scim )
- semantic-desktop? (
- $(add_kdebase_dep kdepimlibs)
- )
"
DEPEND="${COMMON_DEPEND}
dev-cpp/eigen:2
@@ -51,12 +49,12 @@ src_configure() {
$(cmake-utils_use_with exif Kexiv2)
$(cmake-utils_use_build ibus)
$(cmake-utils_use_with json QJSON)
+ $(cmake-utils_use_with kdepim KdepimLibs)
+ $(cmake-utils_use_with nepomuk)
$(cmake-utils_use_with oauth QtOAuth)
$(cmake-utils_use_with qalculate)
$(cmake-utils_use_with qwt)
$(cmake-utils_use_build scim)
- $(cmake-utils_use_with semantic-desktop KdepimLibs)
- $(cmake-utils_use_with semantic-desktop Nepomuk)
)
kde4-base_src_configure
diff --git a/kde-base/kdeplasma-addons/metadata.xml
b/kde-base/kdeplasma-addons/metadata.xml
index 8d333cd..f465b65 100644
--- a/kde-base/kdeplasma-addons/metadata.xml
+++ b/kde-base/kdeplasma-addons/metadata.xml
@@ -1,16 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
-<herd>kde</herd>
-<use>
- <flag name="attica">Enable support for
<pkg>dev-libs/libattica</pkg></flag>
- <flag name="ibus">Use ibus input method via
<pkg>app-i18n/ibus</pkg></flag>
- <flag name="desktopglobe">Enable Desktop Globe wallpaper using
<pkg>kde-base/marble</pkg></flag>
- <flag name="fcitx">Use fcitx input method via
<pkg>app-i18n/fcitx</pkg></flag>
- <flag name="json">Enable JSON support via
<pkg>dev-libs/qjson</pkg></flag>
- <flag name="oauth">Enable OAuth support via
<pkg>dev-libs/qoauth</pkg></flag>
- <flag name="qalculate">Enable Qalculate runner using
<pkg>sci-libs/libqalculate</pkg></flag>
- <flag name="qwt">Enable applets that use
<pkg>x11-libs/qwt:5</pkg>.</flag>
- <flag name="scim">Enable applets that use
<pkg>app-i18n/scim</pkg>.</flag>
-</use>
+ <herd>kde</herd>
+ <use>
+ <flag name="attica">Enable support for
<pkg>dev-libs/libattica</pkg></flag>
+ <flag name="ibus">Use ibus input method via
<pkg>app-i18n/ibus</pkg></flag>
+ <flag name="desktopglobe">Enable Desktop Globe wallpaper using
<pkg>kde-base/marble</pkg></flag>
+ <flag name="fcitx">Use fcitx input method via
<pkg>app-i18n/fcitx</pkg></flag>
+ <flag name="json">Enable JSON support via
<pkg>dev-libs/qjson</pkg></flag>
+ <flag name="kdepim">KDE PIM integration via
<pkg>kde-base/kdepimlibs</pkg></flag>
+ <flag name="nepomuk">Enable Nepomuk based semantic desktop
support (deprecated)</flag>
+ <flag name="oauth">Enable OAuth support via
<pkg>dev-libs/qoauth</pkg></flag>
+ <flag name="qalculate">Enable Qalculate runner using
<pkg>sci-libs/libqalculate</pkg></flag>
+ <flag name="qwt">Enable applets that use
<pkg>x11-libs/qwt:5</pkg></flag>
+ <flag name="scim">Enable applets that use
<pkg>app-i18n/scim</pkg></flag>
+ </use>
</pkgmetadata>
