[gentoo-commits] proj/kde:master commit in: kde-base/cantor/

[Michael Palimaka]

commit:     b7df78a3c81d81e9eaecccd3f09f5fad6a0d6f12
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 29 17:18:28 2012 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jul 29 17:18:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b7df78a3

[kde-base/cantor] Add libqalculate support and improve ewarn message about backends. Add missing dependency.

(Portage version: 2.1.11.9/git/Linux x86_64, unsigned Manifest commit)

---
 kde-base/cantor/cantor-4.8.49.9999.ebuild |   12 +++++++++---
 kde-base/cantor/cantor-4.8.97.ebuild      |   12 +++++++++---
 kde-base/cantor/cantor-4.9.0.ebuild       |   12 +++++++++---
 kde-base/cantor/cantor-4.9.49.9999.ebuild |   12 +++++++++---
 kde-base/cantor/cantor-9999.ebuild        |   12 +++++++++---
 kde-base/cantor/metadata.xml              |   11 ++++++-----
 6 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/kde-base/cantor/cantor-4.8.49.9999.ebuild b/kde-base/cantor/cantor-4.8.49.9999.ebuild
index 35b844b..0b6e2fa 100644
--- a/kde-base/cantor/cantor-4.8.49.9999.ebuild
+++ b/kde-base/cantor/cantor-4.8.49.9999.ebuild
@@ -10,13 +10,18 @@ inherit kde4-base
 
 DESCRIPTION="KDE4 interface for doing mathematics and scientific computing"
 KEYWORDS=""
-IUSE="analitza debug postscript +R"
+IUSE="analitza debug postscript qalculate +R"
 
 # TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
 RDEPEND="
 	analitza? ( $(add_kdebase_dep analitza) )
+	qalculate? (
+		sci-libs/cln
+		sci-libs/libqalculate
+	)
 	postscript? ( app-text/libspectre )
 	R? ( dev-lang/R )
+	x11-libs/qt-xmlpatterns:4
 "
 DEPEND="${RDEPEND}
 	>=dev-cpp/eigen-2.0.3:2
@@ -26,6 +31,7 @@ src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with analitza)
 		$(cmake-utils_use_with postscript LibSpectre)
+		$(cmake-utils_use_with qalculate)
 		$(cmake-utils_use_with R)
 	)
 	kde4-base_src_configure
@@ -34,11 +40,11 @@ src_configure() {
 pkg_postinst() {
 	kde4-base_pkg_postinst
 
-	if ! use R; then
+	if ! use analitza && ! use qalculate && ! use R; then
 		echo
 		ewarn "You have decided to build ${PN} with no backend."
 		ewarn "To have this application functional, please do one of below:"
-		ewarn "    # emerge -va1 '='${CATEGORY}/${P} with 'R' USE flag enabled"
+		ewarn "    # emerge -va1 '='${CATEGORY}/${P} with 'analitza', 'qalculate' or 'R' USE flag enabled"
 		ewarn "    # emerge -vaDu sci-mathematics/maxima"
 		echo
 	fi

diff --git a/kde-base/cantor/cantor-4.8.97.ebuild b/kde-base/cantor/cantor-4.8.97.ebuild
index 41e4bdf..922b212 100644
--- a/kde-base/cantor/cantor-4.8.97.ebuild
+++ b/kde-base/cantor/cantor-4.8.97.ebuild
@@ -10,13 +10,18 @@ inherit kde4-base
 
 DESCRIPTION="KDE4 interface for doing mathematics and scientific computing"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="analitza debug postscript +R"
+IUSE="analitza debug postscript qalculate +R"
 
 # TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
 RDEPEND="
 	analitza? ( $(add_kdebase_dep analitza) )
+	qalculate? (
+		sci-libs/cln
+		sci-libs/libqalculate
+	)
 	postscript? ( app-text/libspectre )
 	R? ( dev-lang/R )
+	x11-libs/qt-xmlpatterns:4
 "
 DEPEND="${RDEPEND}
 	>=dev-cpp/eigen-2.0.3:2
@@ -26,6 +31,7 @@ src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with analitza)
 		$(cmake-utils_use_with postscript LibSpectre)
+		$(cmake-utils_use_with qalculate)
 		$(cmake-utils_use_with R)
 	)
 	kde4-base_src_configure
@@ -34,11 +40,11 @@ src_configure() {
 pkg_postinst() {
 	kde4-base_pkg_postinst
 
-	if ! use R; then
+	if ! use analitza && ! use qalculate && ! use R; then
 		echo
 		ewarn "You have decided to build ${PN} with no backend."
 		ewarn "To have this application functional, please do one of below:"
-		ewarn "    # emerge -va1 '='${CATEGORY}/${P} with 'R' USE flag enabled"
+		ewarn "    # emerge -va1 '='${CATEGORY}/${P} with 'analitza', 'qalculate' or 'R' USE flag enabled"
 		ewarn "    # emerge -vaDu sci-mathematics/maxima"
 		echo
 	fi

diff --git a/kde-base/cantor/cantor-4.9.0.ebuild b/kde-base/cantor/cantor-4.9.0.ebuild
index 41e4bdf..922b212 100644
--- a/kde-base/cantor/cantor-4.9.0.ebuild
+++ b/kde-base/cantor/cantor-4.9.0.ebuild
@@ -10,13 +10,18 @@ inherit kde4-base
 
 DESCRIPTION="KDE4 interface for doing mathematics and scientific computing"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="analitza debug postscript +R"
+IUSE="analitza debug postscript qalculate +R"
 
 # TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
 RDEPEND="
 	analitza? ( $(add_kdebase_dep analitza) )
+	qalculate? (
+		sci-libs/cln
+		sci-libs/libqalculate
+	)
 	postscript? ( app-text/libspectre )
 	R? ( dev-lang/R )
+	x11-libs/qt-xmlpatterns:4
 "
 DEPEND="${RDEPEND}
 	>=dev-cpp/eigen-2.0.3:2
@@ -26,6 +31,7 @@ src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with analitza)
 		$(cmake-utils_use_with postscript LibSpectre)
+		$(cmake-utils_use_with qalculate)
 		$(cmake-utils_use_with R)
 	)
 	kde4-base_src_configure
@@ -34,11 +40,11 @@ src_configure() {
 pkg_postinst() {
 	kde4-base_pkg_postinst
 
-	if ! use R; then
+	if ! use analitza && ! use qalculate && ! use R; then
 		echo
 		ewarn "You have decided to build ${PN} with no backend."
 		ewarn "To have this application functional, please do one of below:"
-		ewarn "    # emerge -va1 '='${CATEGORY}/${P} with 'R' USE flag enabled"
+		ewarn "    # emerge -va1 '='${CATEGORY}/${P} with 'analitza', 'qalculate' or 'R' USE flag enabled"
 		ewarn "    # emerge -vaDu sci-mathematics/maxima"
 		echo
 	fi

diff --git a/kde-base/cantor/cantor-4.9.49.9999.ebuild b/kde-base/cantor/cantor-4.9.49.9999.ebuild
index 35b844b..0b6e2fa 100644
--- a/kde-base/cantor/cantor-4.9.49.9999.ebuild
+++ b/kde-base/cantor/cantor-4.9.49.9999.ebuild
@@ -10,13 +10,18 @@ inherit kde4-base
 
 DESCRIPTION="KDE4 interface for doing mathematics and scientific computing"
 KEYWORDS=""
-IUSE="analitza debug postscript +R"
+IUSE="analitza debug postscript qalculate +R"
 
 # TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
 RDEPEND="
 	analitza? ( $(add_kdebase_dep analitza) )
+	qalculate? (
+		sci-libs/cln
+		sci-libs/libqalculate
+	)
 	postscript? ( app-text/libspectre )
 	R? ( dev-lang/R )
+	x11-libs/qt-xmlpatterns:4
 "
 DEPEND="${RDEPEND}
 	>=dev-cpp/eigen-2.0.3:2
@@ -26,6 +31,7 @@ src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with analitza)
 		$(cmake-utils_use_with postscript LibSpectre)
+		$(cmake-utils_use_with qalculate)
 		$(cmake-utils_use_with R)
 	)
 	kde4-base_src_configure
@@ -34,11 +40,11 @@ src_configure() {
 pkg_postinst() {
 	kde4-base_pkg_postinst
 
-	if ! use R; then
+	if ! use analitza && ! use qalculate && ! use R; then
 		echo
 		ewarn "You have decided to build ${PN} with no backend."
 		ewarn "To have this application functional, please do one of below:"
-		ewarn "    # emerge -va1 '='${CATEGORY}/${P} with 'R' USE flag enabled"
+		ewarn "    # emerge -va1 '='${CATEGORY}/${P} with 'analitza', 'qalculate' or 'R' USE flag enabled"
 		ewarn "    # emerge -vaDu sci-mathematics/maxima"
 		echo
 	fi

diff --git a/kde-base/cantor/cantor-9999.ebuild b/kde-base/cantor/cantor-9999.ebuild
index 35b844b..0b6e2fa 100644
--- a/kde-base/cantor/cantor-9999.ebuild
+++ b/kde-base/cantor/cantor-9999.ebuild
@@ -10,13 +10,18 @@ inherit kde4-base
 
 DESCRIPTION="KDE4 interface for doing mathematics and scientific computing"
 KEYWORDS=""
-IUSE="analitza debug postscript +R"
+IUSE="analitza debug postscript qalculate +R"
 
 # TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
 RDEPEND="
 	analitza? ( $(add_kdebase_dep analitza) )
+	qalculate? (
+		sci-libs/cln
+		sci-libs/libqalculate
+	)
 	postscript? ( app-text/libspectre )
 	R? ( dev-lang/R )
+	x11-libs/qt-xmlpatterns:4
 "
 DEPEND="${RDEPEND}
 	>=dev-cpp/eigen-2.0.3:2
@@ -26,6 +31,7 @@ src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with analitza)
 		$(cmake-utils_use_with postscript LibSpectre)
+		$(cmake-utils_use_with qalculate)
 		$(cmake-utils_use_with R)
 	)
 	kde4-base_src_configure
@@ -34,11 +40,11 @@ src_configure() {
 pkg_postinst() {
 	kde4-base_pkg_postinst
 
-	if ! use R; then
+	if ! use analitza && ! use qalculate && ! use R; then
 		echo
 		ewarn "You have decided to build ${PN} with no backend."
 		ewarn "To have this application functional, please do one of below:"
-		ewarn "    # emerge -va1 '='${CATEGORY}/${P} with 'R' USE flag enabled"
+		ewarn "    # emerge -va1 '='${CATEGORY}/${P} with 'analitza', 'qalculate' or 'R' USE flag enabled"
 		ewarn "    # emerge -vaDu sci-mathematics/maxima"
 		echo
 	fi

diff --git a/kde-base/cantor/metadata.xml b/kde-base/cantor/metadata.xml
index 9e268d5..0bed71d 100644
--- a/kde-base/cantor/metadata.xml
+++ b/kde-base/cantor/metadata.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
-<use>
-	<flag name="analitza">Enable support <pkg>kde-base/analitza</pkg></flag>
-	<flag name="R">Enable R backend support</flag>
-</use>
+	<herd>kde</herd>
+	<use>
+		<flag name="analitza">Enable <pkg>kde-base/analitza</pkg> backend support</flag>
+		<flag name="qalculate">Enable <pkg>sci-libs/libqalculate</pkg> backend support</flag>
+		<flag name="R">Enable <pkg>dev-lang/R</pkg> backend support</flag>
+	</use>
 </pkgmetadata>