explicit qwt dep and fix the patch to find Qwt

Package-Manager: portage-2.1.3.7

5 files changed, 68 insertions, 10 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/Manifest b/dev-ruby/qt4-qtruby/Manifest
index e93bd7db1f7b..7c9f25188785 100644
--- a/dev-ruby/qt4-qtruby/Manifest
+++ b/dev-ruby/qt4-qtruby/Manifest
@@ -2,10 +2,10 @@ AUX FindQwt.cmake.diff 601 RMD160 9512d31dcca1eba08fc7caee92ab4f4791fd6124 SHA1
 MD5 cfed070df71fe8af5d55faf16494875a files/FindQwt.cmake.diff 601
 RMD160 9512d31dcca1eba08fc7caee92ab4f4791fd6124 files/FindQwt.cmake.diff 601
 SHA256 46a4cd9f870c89cc6e186e34e0fbf003240109e2741944170206cc92904226f0 files/FindQwt.cmake.diff 601
-AUX FindQwt5.cmake.diff 1400 RMD160 921fcb907a781cf3fb21a1c75bbf35faab407bf5 SHA1 e719102e8f43a82e90e69be0c44c4c54f04fcfd4 SHA256 cde31d86197378581564caac1edef3da6e6ecf2ccf7657b9738cb29ec1c6e4d6
-MD5 9333b510b1b8ae93e208d7f6a1c20d63 files/FindQwt5.cmake.diff 1400
-RMD160 921fcb907a781cf3fb21a1c75bbf35faab407bf5 files/FindQwt5.cmake.diff 1400
-SHA256 cde31d86197378581564caac1edef3da6e6ecf2ccf7657b9738cb29ec1c6e4d6 files/FindQwt5.cmake.diff 1400
+AUX FindQwt5.cmake.diff 1386 RMD160 f1d803f566b3e7d3b9e60894c98472fc2d868a10 SHA1 02ab0d8d1fca38e6b64d19ccde6660397e97accc SHA256 99d66873a229b509c0d1ab0a91839019e2d803d24e5c77040eb84e229aa7ef41
+MD5 d077827e3c3cd0aaf6eb8b0534630efe files/FindQwt5.cmake.diff 1386
+RMD160 f1d803f566b3e7d3b9e60894c98472fc2d868a10 files/FindQwt5.cmake.diff 1386
+SHA256 99d66873a229b509c0d1ab0a91839019e2d803d24e5c77040eb84e229aa7ef41 files/FindQwt5.cmake.diff 1386
 AUX cmakefix.diff 676 RMD160 4a07000f77b1fdf045d67f8bffd64929c8c1fab4 SHA1 ea42dd280cb3e7a16ae2a2aedcd17b2c427f5496 SHA256 9893db14c4a885e8045fce7b8d335814a39e0f022083d62e1cdc679f5235f2a2
 MD5 3e4df36a7c3f35804b50853c9c0f298a files/cmakefix.diff 676
 RMD160 4a07000f77b1fdf045d67f8bffd64929c8c1fab4 files/cmakefix.diff 676
@@ -29,14 +29,18 @@ EBUILD qt4-qtruby-1.4.8.ebuild 904 RMD160 315a691af023a633f17863836803129f1ac64b
 MD5 abfca67f547eb99f388af8e317fe57a5 qt4-qtruby-1.4.8.ebuild 904
 RMD160 315a691af023a633f17863836803129f1ac64bf4 qt4-qtruby-1.4.8.ebuild 904
 SHA256 c25c0ba80b274674b5a52a2f18db7ab75eb8c3452206b0f134db9992c0e87f0a qt4-qtruby-1.4.8.ebuild 904
+EBUILD qt4-qtruby-1.4.9-r1.ebuild 937 RMD160 aab27bc4ab4ebfd195a37e2bd3964798611daee2 SHA1 e0efd2645262bb250a3541f90996273b2abefc7c SHA256 56500297d23801dacc6906f57270a428570cceff13ab3965ea22e957e94803b2
+MD5 84bc12e9573208cb816e87d9095eec6a qt4-qtruby-1.4.9-r1.ebuild 937
+RMD160 aab27bc4ab4ebfd195a37e2bd3964798611daee2 qt4-qtruby-1.4.9-r1.ebuild 937
+SHA256 56500297d23801dacc6906f57270a428570cceff13ab3965ea22e957e94803b2 qt4-qtruby-1.4.9-r1.ebuild 937
 EBUILD qt4-qtruby-1.4.9.ebuild 923 RMD160 2364cef6b82990e3b1eaaecc3ea17c31a0897e91 SHA1 b5d20d5f9e0b270a444da9117444cfd5d8c7599d SHA256 3fbf2b8e671ce965addc6b8572b7426814e5f23042afc4a02653acdeffb886f0
 MD5 af9b97588e8c8a3d407ff2ab4ee849ee qt4-qtruby-1.4.9.ebuild 923
 RMD160 2364cef6b82990e3b1eaaecc3ea17c31a0897e91 qt4-qtruby-1.4.9.ebuild 923
 SHA256 3fbf2b8e671ce965addc6b8572b7426814e5f23042afc4a02653acdeffb886f0 qt4-qtruby-1.4.9.ebuild 923
-MISC ChangeLog 2267 RMD160 eca53c43b810c46b85d50d9375be299756c2b162 SHA1 0bb54ba289cf339e56de2d228c9f1376616de75c SHA256 310ac3cc222e596398e0db0fce1dc889c6b9a2d0e07e0d6660d6548b2f5ef8b9
-MD5 6730e3f077bf57dfaff5ddb4d1e07e39 ChangeLog 2267
-RMD160 eca53c43b810c46b85d50d9375be299756c2b162 ChangeLog 2267
-SHA256 310ac3cc222e596398e0db0fce1dc889c6b9a2d0e07e0d6660d6548b2f5ef8b9 ChangeLog 2267
+MISC ChangeLog 2464 RMD160 085dfbeb00c31756264426e5ec3f453fed62ac53 SHA1 8539f66c1a193d95014bd8755510f28ab2a9b953 SHA256 07559bd50c8793d7eedc772422abf0c140e941152da4a2d39a9764e5fdab4226
+MD5 29c122767656dbaecdac08d88b008a48 ChangeLog 2464
+RMD160 085dfbeb00c31756264426e5ec3f453fed62ac53 ChangeLog 2464
+SHA256 07559bd50c8793d7eedc772422abf0c140e941152da4a2d39a9764e5fdab4226 ChangeLog 2464
 MISC metadata.xml 173 RMD160 0e74fa947de4273e46416b4c84b1962dc315c11d SHA1 d2fd246c10e4f8a47fdaee4179e54d09beb024e8 SHA256 f03e5e219fa6ac14d2fce157ca05c271a9e38a7919e2b60c0dd26acb23df8aa8
 MD5 0d29f65fec5b925adb6f0f04ec7714cf metadata.xml 173
 RMD160 0e74fa947de4273e46416b4c84b1962dc315c11d metadata.xml 173
@@ -50,3 +54,6 @@ SHA256 d77178851d4cc084f69fa232a91265d531dcfc6028dca2fe744cb218c246686b files/di
 MD5 b7e7e686e325aa7f880b6f0a014d2c09 files/digest-qt4-qtruby-1.4.9 241
 RMD160 35a70440c1fd3954d6bb2f29c64551d3b037633a files/digest-qt4-qtruby-1.4.9 241
 SHA256 6ca670328202579615ddc0b158fc30f64f14e9e84d451a2a5b88a840a2f75443 files/digest-qt4-qtruby-1.4.9 241
+MD5 b7e7e686e325aa7f880b6f0a014d2c09 files/digest-qt4-qtruby-1.4.9-r1 241
+RMD160 35a70440c1fd3954d6bb2f29c64551d3b037633a files/digest-qt4-qtruby-1.4.9-r1 241
+SHA256 6ca670328202579615ddc0b158fc30f64f14e9e84d451a2a5b88a840a2f75443 files/digest-qt4-qtruby-1.4.9-r1 241
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
+}