Version bump

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 88 insertions, 2 deletions

diff --git a/sci-mathematics/qtoctave/ChangeLog b/sci-mathematics/qtoctave/ChangeLog
index 09640ba5a447..3e188da4a2e5 100644
--- a/sci-mathematics/qtoctave/ChangeLog
+++ b/sci-mathematics/qtoctave/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/qtoctave
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/qtoctave/ChangeLog,v 1.7 2009/12/04 04:37:20 markusle Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/qtoctave/ChangeLog,v 1.8 2010/06/16 05:56:39 bicatali Exp $
+
+*qtoctave-0.9.1 (16 Jun 2010)
+
+  16 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  +qtoctave-0.9.1.ebuild, +files/qtoctave-0.9.1-doc-path.patch,
+  +files/qtoctave-0.9.1-qt-version.patch:
+  Version bump
 
   04 Dec 2009; Markus Dittrich <markusle@gentoo.org> qtoctave-0.8.2.ebuild:
   Updated dependency on octave (see bug #263872).
diff --git a/sci-mathematics/qtoctave/files/qtoctave-0.9.1-doc-path.patch b/sci-mathematics/qtoctave/files/qtoctave-0.9.1-doc-path.patch
new file mode 100644
index 000000000000..2b66b53a571d
--- /dev/null
+++ b/sci-mathematics/qtoctave/files/qtoctave-0.9.1-doc-path.patch
@@ -0,0 +1,22 @@
+--- qtoctave-0.9.1/qtoctave/src/CMakeLists.txt	2010-01-25 15:19:48.000000000 +0200
++++ qtoctave-0.9.1/qtoctave/src/CMakeLists.txt	2010-04-21 00:03:03.000000000 +0300
+@@ -52,7 +52,7 @@
+ 
+ install (
+ 	DIRECTORY qtoctave_doc
+-	DESTINATION share/doc/qtoctave
++	DESTINATION share/qtoctave
+ 	PATTERN ".svn" EXCLUDE
+ 	)
+ 
+--- qtoctave-0.9.1/qtoctave/src/configure.h.in	2010-01-25 15:19:50.000000000 +0200
++++ qtoctave-0.9.1/qtoctave/src/configure.h.in	2010-04-21 00:03:12.000000000 +0300
+@@ -5,7 +5,7 @@
+ #define HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/octave-html/octave_doc/index.html"
+ #define ICON_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/images"
+ #define LANG_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/lang"
+-#define QTOCTAVE_HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/qtoctave/qtoctave_doc/index.html"
++#define QTOCTAVE_HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/qtoctave_doc/index.html"
+ 
+ #define PKG_CMD_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/pkg-commands.list"
+ #endif
diff --git a/sci-mathematics/qtoctave/files/qtoctave-0.9.1-qt-version.patch b/sci-mathematics/qtoctave/files/qtoctave-0.9.1-qt-version.patch
new file mode 100644
index 000000000000..d38d4acca22a
--- /dev/null
+++ b/sci-mathematics/qtoctave/files/qtoctave-0.9.1-qt-version.patch
@@ -0,0 +1,18 @@
+--- qtoctave-0.9.1/CMakeLists.txt	2010-01-25 15:19:48.000000000 +0200
++++ qtoctave-0.9.1/CMakeLists.txt	2010-04-21 00:33:08.000000000 +0300
+@@ -28,13 +28,13 @@
+ 
+ include(UseQt4)
+ 
+-if( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR NOT ${QT_VERSION_MINOR} EQUAL 6   )
++if( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR ${QT_VERSION_MINOR} LESS 5   )
+ 	MESSAGE (FATAL_ERROR 
+ 			"Qt version 4.6 required.\n"
+ 			"Qt version installed is: ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}\n"
+ 			"Please install required version.\n"
+ 		)
+-endif( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR NOT ${QT_VERSION_MINOR} EQUAL 6   )
++endif( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR ${QT_VERSION_MINOR} LESS 5   )
+ 
+ add_subdirectory (qtoctave_pkg/src)
+ add_subdirectory (xmlwidget/qt4)
diff --git a/sci-mathematics/qtoctave/qtoctave-0.9.1.ebuild b/sci-mathematics/qtoctave/qtoctave-0.9.1.ebuild
new file mode 100644
index 000000000000..a684b7ac5950
--- /dev/null
+++ b/sci-mathematics/qtoctave/qtoctave-0.9.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/qtoctave/qtoctave-0.9.1.ebuild,v 1.1 2010/06/16 05:56:39 bicatali Exp $
+
+EAPI="2"
+
+#CMAKE_IN_SOURCE_BUILD=1
+inherit eutils cmake-utils
+
+PID=1760
+
+DESCRIPTION="QtOctave is a Qt4 front-end for Octave"
+HOMEPAGE="http://forja.rediris.es/projects/csl-qtoctave/"
+SRC_URI="http://forja.rediris.es/frs/download.php/${PID}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=x11-libs/qt-gui-4.5
+	>=x11-libs/qt-svg-4.5"
+
+RDEPEND="${DEPEND}
+	>=sci-mathematics/octave-3.2.0"
+
+S="${WORKDIR}/${P}"
+DOCS="readme.txt leeme.txt"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.9.1-qt-version.patch
+	epatch "${FILESDIR}"/${PN}-0.9.1-doc-path.patch
+	epatch "${FILESDIR}"/${PN}-0.8.1-gcc4.4.patch
+}
+
+src_configure() {
+	mycmakeargs=(-DCMAKE_SKIP_RPATH:BOOL=YES )
+	cmake-utils_src_configure
+}