Add a patch for QScintilla finding per bug #196702

(Portage version: 2.1.3.16)

4 files changed, 91 insertions, 1 deletions

diff --git a/dev-ruby/qt4-qtruby/ChangeLog b/dev-ruby/qt4-qtruby/ChangeLog
index e54499d07af4..db638b32429d 100644
--- a/dev-ruby/qt4-qtruby/ChangeLog
+++ b/dev-ruby/qt4-qtruby/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/qt4-qtruby
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/qt4-qtruby/ChangeLog,v 1.12 2007/09/07 18:41:23 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/qt4-qtruby/ChangeLog,v 1.13 2007/11/06 12:34:54 caleb Exp $
+
+*qt4-qtruby-1.4.9-r2 (06 Nov 2007)
+
+  06 Nov 2007; Caleb Tennis <caleb@gentoo.org>
+  +files/FindQScintilla.cmake.diff, +qt4-qtruby-1.4.9-r2.ebuild:
+  add a patch for QScintilla finding per bug #196702
 
 *qt4-qtruby-1.4.9-r1 (07 Sep 2007)
 
diff --git a/dev-ruby/qt4-qtruby/files/FindQScintilla.cmake.diff b/dev-ruby/qt4-qtruby/files/FindQScintilla.cmake.diff
new file mode 100644
index 000000000000..0c846caf24f8
--- /dev/null
+++ b/dev-ruby/qt4-qtruby/files/FindQScintilla.cmake.diff
@@ -0,0 +1,38 @@
+--- cmake/modules/FindQScintilla.cmake.org	2007-10-22 11:36:52.000000000 +0200
++++ cmake/modules/FindQScintilla.cmake	2007-10-22 11:37:02.000000000 +0200
+@@ -14,11 +14,11 @@
+     INCLUDE(FindQt4)
+ ENDIF(NOT QT4_FOUND)
+ 
+-SET(QSCINTILLA_FOUND "NO")
++SET(QSCINTILLA_FOUND FALSE)
+ 
+ IF(QT4_FOUND)
+     FIND_PATH(QSCINTILLA_INCLUDE_DIR qsciglobal.h
+-    "${QT_INCLUDE_DIR}/Qsci"
++        /usr/include/Qsci
+     )
+ 
+     SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2)
+@@ -27,10 +27,10 @@
+         PATHS ${QT_LIBRARY_DIR}
+     )
+ 
+-    IF (QSCINTILLA_LIBRARY)
++    IF (QSCINTILLA_LIBRARY AND QSCINTILLA_INCLUDE_DIR)
+ 
+         SET(QSCINTILLA_LIBRARIES ${QSCINTILLA_LIBRARY})
+-        SET(QSCINTILLA_FOUND "YES")
++        SET(QSCINTILLA_FOUND TRUE)
+ 
+         IF (CYGWIN)
+             IF(BUILD_SHARED_LIBS)
+@@ -40,7 +40,7 @@
+             ENDIF(BUILD_SHARED_LIBS)
+         ENDIF (CYGWIN)
+ 
+-    ENDIF (QSCINTILLA_LIBRARY)
++    ENDIF (QSCINTILLA_LIBRARY AND QSCINTILLA_INCLUDE_DIR)
+ ENDIF(QT4_FOUND)
+ 
+ IF (QSCINTILLA_FOUND)
diff --git a/dev-ruby/qt4-qtruby/files/digest-qt4-qtruby-1.4.9-r2 b/dev-ruby/qt4-qtruby/files/digest-qt4-qtruby-1.4.9-r2
new file mode 100644
index 000000000000..5bf8ed3eba90
--- /dev/null
+++ b/dev-ruby/qt4-qtruby/files/digest-qt4-qtruby-1.4.9-r2
@@ -0,0 +1,3 @@
+MD5 b63717da097a0988067b80bff0274a21 qt4-qtruby-1.4.9.tgz 774524
+RMD160 e4f451d860e69a071bc13d57515d979bb1c79166 qt4-qtruby-1.4.9.tgz 774524
+SHA256 fa2ef6f3b081d3997de407346612fc6ae4b4e06afd82dc69c9bc0022e7b2eb15 qt4-qtruby-1.4.9.tgz 774524
diff --git a/dev-ruby/qt4-qtruby/qt4-qtruby-1.4.9-r2.ebuild b/dev-ruby/qt4-qtruby/qt4-qtruby-1.4.9-r2.ebuild
new file mode 100644
index 000000000000..86146e8456f5
--- /dev/null
+++ b/dev-ruby/qt4-qtruby/qt4-qtruby-1.4.9-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/qt4-qtruby/qt4-qtruby-1.4.9-r2.ebuild,v 1.1 2007/11/06 12:34:54 caleb Exp $
+
+inherit toolchain-funcs eutils qt4
+
+DESCRIPTION="Ruby bindings for QT4"
+HOMEPAGE="http://rubyforge.org/projects/korundum"
+SRC_URI="http://rubyforge.org/frs/download.php/21951/${P}.tgz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND=">=virtual/ruby-1.8
+	=x11-libs/qt-4*
+	=x11-libs/qwt-5*"
+RDEPEND="${DEPEND}
+	>=dev-util/cmake-2.4.6"
+
+SLOT="0"
+
+QT4_BUILT_WITH_USE_CHECK="opengl dbus"
+
+pkg_setup() {
+	qt4_pkg_setup
+}
+
+src_unpack() {
+	unpack $A
+	cd "${S}"
+	epatch "${FILESDIR}/libCMakeLists.diff"
+	epatch "${FILESDIR}/FindQwt5.cmake.diff"
+	epatch "${FILESDIR}/cmakefix.diff"
+	epatch "${FILESDIR}/FindQScintilla.cmake.diff"
+}
+
+src_compile() {
+	cd "${S}" && cmake -DCMAKE_INSTALL_PREFIX=/usr/ . && make || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+}