Merge branch 'master' into kde-git

Conflicts:
	media-sound/amarok/Manifest
	media-sound/amarok/amarok-2.3.90.ebuild
	media-sound/amarok/amarok-9999.ebuild

1 files changed, 46 insertions, 0 deletions

diff --git a/kde-base/cantor/cantor-4.6.9999.ebuild b/kde-base/cantor/cantor-4.6.9999.ebuild
new file mode 100644
index 00000000000..035820aee2e
--- /dev/null
+++ b/kde-base/cantor/cantor-4.6.9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+KDE_HANDBOOK="optional"
+KMNAME="kdeedu"
+inherit kde4-meta
+
+DESCRIPTION="KDE4 interface for doing mathematics and scientific computing"
+KEYWORDS=""
+IUSE="debug ps +R"
+
+# TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
+RDEPEND="
+	ps? ( app-text/libspectre )
+	R? ( dev-lang/R )
+"
+DEPEND="${RDEPEND}
+	>=dev-cpp/eigen-2.0.3:2
+"
+
+RESTRICT=test
+
+src_configure() {
+	mycmakeargs+="
+		$(cmake-utils_use_with ps LibSpectre)
+		$(cmake-utils_use_with R)
+	"
+
+	kde4-meta_src_configure
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if ! 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 -vaDu sci-mathematics/maxima"
+		echo
+	fi
+}