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)

4 files changed, 45 insertions, 4 deletions

diff --git a/kde-base/kalgebra/ChangeLog b/kde-base/kalgebra/ChangeLog
index b9d395852de7..87995defcd9c 100644
--- a/kde-base/kalgebra/ChangeLog
+++ b/kde-base/kalgebra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kalgebra
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/ChangeLog,v 1.11 2008/06/09 14:59:41 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/ChangeLog,v 1.12 2008/10/02 06:34:46 jmbsvicetto Exp $
+
+*kalgebra-4.1.2 (02 Oct 2008)
+
+  02 Oct 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  files/kalgebra-4.0.2-opengl.patch, metadata.xml, +kalgebra-4.1.2.ebuild:
+  Add kde-4.1.2 into the tree from the kde-testing overlay.
 
   09 Jun 2008; Tobias Heinlein <keytoaster@gentoo.org>
   -kalgebra-4.0.2.ebuild, -kalgebra-4.0.3.ebuild:
diff --git a/kde-base/kalgebra/files/kalgebra-4.0.2-opengl.patch b/kde-base/kalgebra/files/kalgebra-4.0.2-opengl.patch
index 0ca889f566e9..c82bb8fad38b 100644
--- a/kde-base/kalgebra/files/kalgebra-4.0.2-opengl.patch
+++ b/kde-base/kalgebra/files/kalgebra-4.0.2-opengl.patch
@@ -7,9 +7,9 @@ Index: kalgebra/src/CMakeLists.txt
  	varedit.cpp
  	main.cpp
 -	graph3d.cpp
- 	algebrahighlighter.cpp
  	expressionedit.cpp
  	graph2d.cpp
+ 	operatorsmodel.cpp
 @@ -33,6 +32,10 @@
  	functionimpl.cpp
  )
@@ -18,6 +18,6 @@ Index: kalgebra/src/CMakeLists.txt
 +   set(kalgebra_SRCS ${kalgebra_SRCS} graph3d.cpp)
 +endif(OPENGL_FOUND)
 +
- kde4_add_library(analitza ${analitza_SRCS})
- target_link_libraries(analitza ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ${KDE4_KDECORE_LIBS})
+ #uncomment this if oxygen icons for kalgebra are available
+ #kde4_add_app_icon(kalgebra_SRCS "${CMAKE_INSTALL_PREFIX}/share/icons/oxygen/*/apps/kalgebra.png")
  
diff --git a/kde-base/kalgebra/kalgebra-4.1.2.ebuild b/kde-base/kalgebra/kalgebra-4.1.2.ebuild
new file mode 100644
index 000000000000..c7f0fdd2108b
--- /dev/null
+++ b/kde-base/kalgebra/kalgebra-4.1.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/kalgebra-4.1.2.ebuild,v 1.1 2008/10/02 06:34:46 jmbsvicetto Exp $
+
+EAPI="2"
+
+KMNAME=kdeedu
+OPENGL_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="MathML-based graph calculator for KDE."
+KEYWORDS="~amd64 ~x86"
+IUSE="debug htmlhandbook +plasma readline"
+
+DEPEND="opengl? ( virtual/opengl )
+	plasma? ( kde-base/libplasma:${SLOT} )
+	readline? ( sys-libs/readline )"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY=libkdeedu/kdeeduui
+
+# Needed for USE="-opengl"
+PATCHES=( "${FILESDIR}/${PN}-4.0.2-opengl.patch" )
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_with readline Readline)
+		$(cmake-utils_use_with plasma Plasma)
+		$(cmake-utils_use_with opengl OpenGL)"
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kalgebra/metadata.xml b/kde-base/kalgebra/metadata.xml
index 8d1e86a9cefb..b631aad0c45d 100644
--- a/kde-base/kalgebra/metadata.xml
+++ b/kde-base/kalgebra/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<use>
+	<flag name="plasma">Build optional plasma widgets that require <pkg>kde-base/libplasma</pkg>.</flag>
+</use>
 <herd>kde</herd>
 </pkgmetadata>