explicit qwt dep and fix the patch to find Qwt

(Portage version: 2.1.3.7)

4 files changed, 53 insertions, 2 deletions

diff --git a/dev-ruby/qt4-qtruby/ChangeLog b/dev-ruby/qt4-qtruby/ChangeLog
index c3c879090b78..e54499d07af4 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.11 2007/06/20 20:27:26 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/qt4-qtruby/ChangeLog,v 1.12 2007/09/07 18:41:23 caleb Exp $
+
+*qt4-qtruby-1.4.9-r1 (07 Sep 2007)
+
+  07 Sep 2007; Caleb Tennis <caleb@gentoo.org> files/FindQwt5.cmake.diff,
+  +qt4-qtruby-1.4.9-r1.ebuild:
+  bump, explicit Qwt dep and fix the patch to find Qwt
 
 *qt4-qtruby-1.4.9 (20 Jun 2007)
 
diff --git a/dev-ruby/qt4-qtruby/files/FindQwt5.cmake.diff b/dev-ruby/qt4-qtruby/files/FindQwt5.cmake.diff
index 4e0e327bc4f2..eb216fdb07cb 100644
--- a/dev-ruby/qt4-qtruby/files/FindQwt5.cmake.diff
+++ b/dev-ruby/qt4-qtruby/files/FindQwt5.cmake.diff
@@ -15,7 +15,7 @@
  
  		# Find Qwt5 library linked to Qt4
 -		FIND_LIBRARY( Qwt5_Qt4_TENTATIVE_LIBRARY NAMES qwt5-qt4 qwt-qt4 qwt5 qwt PATHS /usr/local/qwt/lib /usr/local/lib /usr/lib )
-+		FIND_LIBRARY( Qwt5_Qt4_TENTATIVE_LIBRARY NAMES libqwt.so.5 PATHS /usr/lib )
++		FIND_LIBRARY( Qwt5_Qt4_TENTATIVE_LIBRARY qwt PATHS /usr/lib )
  		IF( UNIX AND NOT CYGWIN)
  			IF( Qwt5_Qt4_TENTATIVE_LIBRARY )
  				#MESSAGE("Qwt5_Qt4_TENTATIVE_LIBRARY = ${Qwt5_Qt4_TENTATIVE_LIBRARY}")
diff --git a/dev-ruby/qt4-qtruby/files/digest-qt4-qtruby-1.4.9-r1 b/dev-ruby/qt4-qtruby/files/digest-qt4-qtruby-1.4.9-r1
new file mode 100644
index 000000000000..5bf8ed3eba90
--- /dev/null
+++ b/dev-ruby/qt4-qtruby/files/digest-qt4-qtruby-1.4.9-r1
@@ -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-r1.ebuild b/dev-ruby/qt4-qtruby/qt4-qtruby-1.4.9-r1.ebuild
new file mode 100644
index 000000000000..737c0f99418e
--- /dev/null
+++ b/dev-ruby/qt4-qtruby/qt4-qtruby-1.4.9-r1.ebuild
@@ -0,0 +1,42 @@
+# 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-r1.ebuild,v 1.1 2007/09/07 18:41:23 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
+}
+
+src_compile() {
+	cd ${S} && cmake -DCMAKE_INSTALL_PREFIX=/usr/ . && make || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+}