removed rpath patch - nolonger needed as per bug #137918. KDE plugin path added as per bug #137918. Both bugs thanks to Michael. KDE plugin path patch thanks to Andreas Beckermann kde bug #129737

(Portage version: 2.1.1_pre1-r5)

4 files changed, 77 insertions, 1 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index ab938189d669..9bb3eebae854 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-util/cmake
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.33 2006/05/25 03:02:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.34 2006/06/30 08:39:12 dragonheart Exp $
+
+  30 Jun 2006; Daniel Black <dragonheart@gentoo.org>
+  +files/cmake-2.4.2-kde.patch, +cmake-2.4.2-r1.ebuild:
+  removed rpath patch - nolonger needed as per bug #137918. KDE plugin path
+  added as per bug #137918. Both bugs thanks to Michael. KDE plugin path patch
+  thanks to Andreas Beckermann kde bug #129737
+
+*cmake-2.4.2-r1 (30 Jun 2006)
+
+  30 Jun 2006; Daniel Black <dragonheart@gentoo.org>  cmake-2.4.2-r1.ebuild files/digest-cmake-2.4.2-r1
+  # INSERT ENTRY HERE
 
   25 May 2006; Diego Pettenò <flameeyes@gentoo.org> cmake-2.4.2.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/dev-util/cmake/cmake-2.4.2-r1.ebuild b/dev-util/cmake/cmake-2.4.2-r1.ebuild
new file mode 100644
index 000000000000..430105c482af
--- /dev/null
+++ b/dev-util/cmake/cmake-2.4.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.4.2-r1.ebuild,v 1.1 2006/06/30 08:39:12 dragonheart Exp $
+
+inherit toolchain-funcs eutils versionator
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="http://www.cmake.org/"
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-kde.patch"
+}
+
+src_compile() {
+	cd ${S}
+	tc-export CC CXX LD
+	./bootstrap \
+		--prefix=/usr \
+		--docdir=/share/doc/${PN} \
+		--datadir=/share/${PN} \
+		--mandir=/share/man || die "./bootstrap failed"
+	emake || die
+}
+
+src_test() {
+	einfo "Self tests broken"
+	make test || \
+		einfo "note test failure on qtwrapping was expected - nature of portage rather than a true failure"
+}
+
+src_install() {
+	make install DESTDIR=${D} || die "install failed"
+	mv ${D}usr/share/doc/cmake ${D}usr/share/doc/${PF}
+}
diff --git a/dev-util/cmake/files/cmake-2.4.2-kde.patch b/dev-util/cmake/files/cmake-2.4.2-kde.patch
new file mode 100644
index 000000000000..cd2d88d93e44
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.4.2-kde.patch
@@ -0,0 +1,20 @@
+--- Modules/kde3uic.cmake.orig	2006-06-30 16:41:59.000000000 +1000
++++ Modules/kde3uic.cmake	2006-06-30 16:42:46.000000000 +1000
+@@ -5,6 +5,7 @@
+ 
+ 
+ EXECUTE_PROCESS(COMMAND uic
++   -L ${KDE_UIC_PLUGIN_DIR}
+    -nounload -tr tr2i18n
+    -impl ${KDE_UIC_H_FILE}
+    ${KDE_UIC_FILE}
+--- Modules/KDE3Macros.cmake.orig	2006-06-30 16:40:19.000000000 +1000
++++ Modules/KDE3Macros.cmake	2006-06-30 16:40:50.000000000 +1000
+@@ -171,6 +171,7 @@
+          COMMAND ${CMAKE_COMMAND}
+          ARGS
+          -DKDE_UIC_FILE:STRING=${_tmp_FILE}
++		 -DKDE_UIC_PLUGIN_DIR:PATH=${KDE3_LIB_DIR}/kde3/plugins/designer
+          -DKDE_UIC_CPP_FILE:STRING=${_src}
+          -DKDE_UIC_H_FILE:STRING=${_header}
+          -P ${KDE3_MODULE_DIR}/kde3uic.cmake
diff --git a/dev-util/cmake/files/digest-cmake-2.4.2-r1 b/dev-util/cmake/files/digest-cmake-2.4.2-r1
new file mode 100644
index 000000000000..8de6e5fb1e69
--- /dev/null
+++ b/dev-util/cmake/files/digest-cmake-2.4.2-r1
@@ -0,0 +1,3 @@
+MD5 c774f932cbd0c77d3cd76f0f8f46e0d9 cmake-2.4.2.tar.gz 2948510
+RMD160 436ea51033c4f20767f194165188b4d39ff4a0ab cmake-2.4.2.tar.gz 2948510
+SHA256 bfe2f4d1999fd232b3c983d930d64fdec94610b9d3aed2ae1e3b6709bf990e77 cmake-2.4.2.tar.gz 2948510