Move cmake to DEPEND wrt #220453.

(Portage version: 2.1.5.2)

6 files changed, 13 insertions, 134 deletions

diff --git a/dev-ruby/qt4-qtruby/ChangeLog b/dev-ruby/qt4-qtruby/ChangeLog
index 61ca3ddf6ed4..ad25f7ec1c17 100644
--- a/dev-ruby/qt4-qtruby/ChangeLog
+++ b/dev-ruby/qt4-qtruby/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/qt4-qtruby
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/qt4-qtruby/ChangeLog,v 1.15 2008/03/18 20:03:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/qt4-qtruby/ChangeLog,v 1.16 2008/05/26 11:20:21 drac Exp $
+
+  26 May 2008; Samuli Suominen <drac@gentoo.org> qt4-qtruby-1.4.8.ebuild,
+  -qt4-qtruby-1.4.9.ebuild, -qt4-qtruby-1.4.9-r1.ebuild,
+  -qt4-qtruby-1.4.9-r2.ebuild, qt4-qtruby-1.4.9-r3.ebuild:
+  Move cmake to DEPEND wrt #220453.
 
   18 Mar 2008; Raúl Porcel <armin76@gentoo.org> qt4-qtruby-1.4.9-r3.ebuild:
   Re-add ~sparc
diff --git a/dev-ruby/qt4-qtruby/qt4-qtruby-1.4.8.ebuild b/dev-ruby/qt4-qtruby/qt4-qtruby-1.4.8.ebuild
index 3e030e622209..0512d552ba10 100644
--- a/dev-ruby/qt4-qtruby/qt4-qtruby-1.4.8.ebuild
+++ b/dev-ruby/qt4-qtruby/qt4-qtruby-1.4.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.8.ebuild,v 1.3 2007/07/11 05:23:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/qt4-qtruby/qt4-qtruby-1.4.8.ebuild,v 1.4 2008/05/26 11:20:21 drac Exp $
 
 inherit toolchain-funcs eutils qt4
 
@@ -11,9 +11,9 @@ SRC_URI="http://rubyforge.org/frs/download.php/21925/qt4-qtruby-1.4.8.tgz"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~sparc ~x86"
 IUSE=""
-DEPEND=">=virtual/ruby-1.8
+RDEPEND=">=virtual/ruby-1.8
 	=x11-libs/qt-4*"
-RDEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	>=dev-util/cmake-2.4.6"
 
 SLOT="0"
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
deleted file mode 100644
index 737c0f99418e..000000000000
--- a/dev-ruby/qt4-qtruby/qt4-qtruby-1.4.9-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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
-}
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
deleted file mode 100644
index 86146e8456f5..000000000000
--- a/dev-ruby/qt4-qtruby/qt4-qtruby-1.4.9-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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
-}
diff --git a/dev-ruby/qt4-qtruby/qt4-qtruby-1.4.9-r3.ebuild b/dev-ruby/qt4-qtruby/qt4-qtruby-1.4.9-r3.ebuild
index fa4964c78c11..a977ff14a531 100644
--- a/dev-ruby/qt4-qtruby/qt4-qtruby-1.4.9-r3.ebuild
+++ b/dev-ruby/qt4-qtruby/qt4-qtruby-1.4.9-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r3.ebuild,v 1.2 2008/03/18 20:03:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/qt4-qtruby/qt4-qtruby-1.4.9-r3.ebuild,v 1.3 2008/05/26 11:20:21 drac Exp $
 
 inherit toolchain-funcs eutils qt4 cmake-utils
 
@@ -11,10 +11,10 @@ SRC_URI="http://rubyforge.org/frs/download.php/21951/${P}.tgz"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~sparc ~x86"
 IUSE=""
-DEPEND=">=virtual/ruby-1.8
+RDEPEND=">=virtual/ruby-1.8
 	=x11-libs/qt-4*
 	=x11-libs/qwt-5*"
-RDEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	>=dev-util/cmake-2.4.6"
 
 SLOT="0"
diff --git a/dev-ruby/qt4-qtruby/qt4-qtruby-1.4.9.ebuild b/dev-ruby/qt4-qtruby/qt4-qtruby-1.4.9.ebuild
deleted file mode 100644
index 4a794a0fe318..000000000000
--- a/dev-ruby/qt4-qtruby/qt4-qtruby-1.4.9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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.ebuild,v 1.3 2007/08/11 20:35:52 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 ~sparc ~x86"
-IUSE=""
-DEPEND=">=virtual/ruby-1.8
-	=x11-libs/qt-4*"
-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
-}