Add kde-4.1.2 into the tree from the kde-testing overlay.

(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64)

3 files changed, 66 insertions, 6 deletions

diff --git a/kde-base/kalzium/ChangeLog b/kde-base/kalzium/ChangeLog
index 336b44dcec19..fae6af887f5b 100644
--- a/kde-base/kalzium/ChangeLog
+++ b/kde-base/kalzium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kalzium
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/ChangeLog,v 1.100 2008/09/13 23:57:21 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/ChangeLog,v 1.101 2008/10/02 06:43:33 jmbsvicetto Exp $
+
+*kalzium-4.1.2 (02 Oct 2008)
+
+  02 Oct 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  metadata.xml, +kalzium-4.1.2.ebuild:
+  Add kde-4.1.2 into the tree from the kde-testing overlay.
 
 *kalzium-3.5.10 (13 Sep 2008)
 
diff --git a/kde-base/kalzium/kalzium-4.1.2.ebuild b/kde-base/kalzium/kalzium-4.1.2.ebuild
new file mode 100644
index 000000000000..e9db12975893
--- /dev/null
+++ b/kde-base/kalzium/kalzium-4.1.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-4.1.2.ebuild,v 1.1 2008/10/02 06:43:33 jmbsvicetto Exp $
+
+EAPI="2"
+
+KMNAME=kdeedu
+CPPUNIT_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="KDE: periodic table of the elements."
+KEYWORDS="~amd64 ~x86"
+IUSE="editor debug htmlhandbook solver"
+
+COMMONDEPEND=">=kde-base/libkdeedu-${PV}:${SLOT}
+	editor? ( >=dev-cpp/eigen-1.0.5
+		>=sci-chemistry/openbabel-2.2
+		|| ( x11-libs/qt-opengl:4
+			=x11-libs/qt-4.3*:4[opengl] )
+		virtual/opengl )"
+DEPEND="${DEPEND} ${COMMONDEPEND}
+	solver? ( dev-ml/facile[ocamlopt] )"
+RDEPEND="${RDEPEND} ${COMMONDEPEND}"
+
+KMEXTRACTONLY="libkdeedu/kdeeduui libkdeedu/libscience"
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_with editor Eigen)
+		$(cmake-utils_use_with editor OpenBabel2)
+		$(cmake-utils_use_with editor OpenGL)
+		$(cmake-utils_use_with solver OCaml)
+		$(cmake-utils_use_with solver Libfacile)"
+
+	sed -i -e "s:add_subdirectory(cmake):#dontwantit:g" CMakeLists.txt \
+		|| die  "disabling cmake includes failed"
+	sed -i -e "s:add_subdirectory( cmake ):#dontwantit:g" CMakeLists.txt \
+		|| die "disabling cmake includes failed"
+
+	kde4-meta_src_configure
+}
+
+src_compile() {
+	if use solver ; then
+		# Compile the solver on its own as the cmake-based build is
+		# currently broken. Fixes bug 206620.
+		cd "${S}/${PN}/src/solver"
+		emake || die "compiling the ocaml resolver failed"
+		mkdir -p "${WORKDIR}/${PN}_build/${PN}/src/"
+		cp * "${WORKDIR}/${PN}_build/${PN}/src/"
+	fi
+	kde4-meta_src_compile
+}
diff --git a/kde-base/kalzium/metadata.xml b/kde-base/kalzium/metadata.xml
index b4ad6f3420b8..e64e5efaad4d 100644
--- a/kde-base/kalzium/metadata.xml
+++ b/kde-base/kalzium/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="cviewer">Enable Kalzium compound viewer</flag>
-    <flag name="solver">Enable the equation solver</flag>
-  </use>
+<use>
+	<flag name="cviewer">Enable Kalzium compound viewer</flag>
+	<flag name="editor">Enable the embedded molecule editor/viewer</flag>
+	<flag name="solver">Enable the equation solver</flag>
+</use>
+<herd>kde</herd>
 </pkgmetadata>