[gentoo-commits] proj/kde:master commit in: kde-base/kalgebra/files/, kde-base/kalgebra/

[gentoo-commits] proj/kde:master commit in: kde-base/kalgebra/files/, kde-base/kalgebra/

[Andreas Hüttel]

commit:     cc1fdec5d713664ac1ac622cdef2201c7254c75f
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Wed Jun  8 22:00:27 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jun  8 22:00:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=cc1fdec5

[kde-base/kalgebra] Make it build without building libkdeedu

(Portage version: 2.1.10/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 kde-base/kalgebra/files/kalgebra-4.6.4-nolib.patch |   21 ++++++++++++++++++++
 kde-base/kalgebra/kalgebra-4.6.4.ebuild            |    2 +
 kde-base/kalgebra/kalgebra-4.6.49.9999.ebuild      |    2 +
 3 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/kde-base/kalgebra/files/kalgebra-4.6.4-nolib.patch b/kde-base/kalgebra/files/kalgebra-4.6.4-nolib.patch
new file mode 100644
index 0000000..ec90fc0
--- /dev/null
+++ b/kde-base/kalgebra/files/kalgebra-4.6.4-nolib.patch
@@ -0,0 +1,21 @@
+diff -ruN kdeedu-4.6.4.orig/libkdeedu/CMakeLists.txt kdeedu-4.6.4/libkdeedu/CMakeLists.txt
+--- kdeedu-4.6.4.orig/libkdeedu/CMakeLists.txt	2011-06-03 23:41:38.000000000 +0200
++++ kdeedu-4.6.4/libkdeedu/CMakeLists.txt	2011-06-08 23:55:50.000000000 +0200
+@@ -23,10 +23,10 @@
+     set(_LibKdeEdu_CONFIG_DEST "${LIB_INSTALL_DIR}/libkdeedu")
+ endif(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
+ 
+-install( FILES
+-        "${LibKdeEdu_BINARY_DIR}/LibKdeEduConfig.cmake"
+-        DESTINATION "${_LibKdeEdu_CONFIG_DEST}" )
+-install( EXPORT LibKdeEduTargets
+-         DESTINATION "${_LibKdeEdu_CONFIG_DEST}"
+-         NAMESPACE LibKdeEduImport__
+-         FILE LibKdeEduTargets.cmake )
++#install( FILES
++#        "${LibKdeEdu_BINARY_DIR}/LibKdeEduConfig.cmake"
++#        DESTINATION "${_LibKdeEdu_CONFIG_DEST}" )
++#install( EXPORT LibKdeEduTargets
++#         DESTINATION "${_LibKdeEdu_CONFIG_DEST}"
++#         NAMESPACE LibKdeEduImport__
++#         FILE LibKdeEduTargets.cmake )

diff --git a/kde-base/kalgebra/kalgebra-4.6.4.ebuild b/kde-base/kalgebra/kalgebra-4.6.4.ebuild
index 61bb7a6..31e588c 100644
--- a/kde-base/kalgebra/kalgebra-4.6.4.ebuild
+++ b/kde-base/kalgebra/kalgebra-4.6.4.ebuild
@@ -20,6 +20,7 @@ RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY="
 	libkdeedu/kdeeduui/
+	libkdeedu/LibKdeEduConfig.cmake.in
 "
 KMEXTRA="
 	libkdeedu/qtmmlwidget/
@@ -27,6 +28,7 @@ KMEXTRA="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.5.73-solaris-graph2d.patch
+	"${FILESDIR}"/${PN}-4.6.4-nolib.patch
 )
 
 src_configure() {

diff --git a/kde-base/kalgebra/kalgebra-4.6.49.9999.ebuild b/kde-base/kalgebra/kalgebra-4.6.49.9999.ebuild
index 08ba50e..d462437 100644
--- a/kde-base/kalgebra/kalgebra-4.6.49.9999.ebuild
+++ b/kde-base/kalgebra/kalgebra-4.6.49.9999.ebuild
@@ -20,6 +20,7 @@ RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY="
 	libkdeedu/kdeeduui/
+	libkdeedu/LibKdeEduConfig.cmake.in
 "
 KMEXTRA="
 	libkdeedu/qtmmlwidget/
@@ -27,6 +28,7 @@ KMEXTRA="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.5.73-solaris-graph2d.patch
+	"${FILESDIR}"/${PN}-4.6.4-nolib.patch
 )
 
 src_configure() {