Version bump

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 103 insertions, 3 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/Manifest b/sci-mathematics/qtoctave/Manifest
index 5b3bb583cad4..3f642ed6142e 100644
--- a/sci-mathematics/qtoctave/Manifest
+++ b/sci-mathematics/qtoctave/Manifest
@@ -1,7 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX qtoctave-0.8.1-gcc4.4.patch 410 RMD160 971ffd6ea7641b129a681d0011e73de0cd217c8e SHA1 6f2a693a59a963d92b788211065eb492027efce5 SHA256 c6e8ad6fa19758bc3de11430f124fe86214fcef9cb76b5c2f328f7838bd680e5
+AUX qtoctave-0.9.1-doc-path.patch 999 RMD160 80de26d5be7404b36886f309c23847c30c09a08e SHA1 ca3ca1c6fe91b9c6a58b0fa022ea32a131338501 SHA256 a6d2026fb2bf5a633cba73ec68ae91f4cbe42be75c1def17f3c3104bcf2de50b
+AUX qtoctave-0.9.1-qt-version.patch 730 RMD160 5138ec093731f0284c0d3a6a026444ca6ce2d3ec SHA1 8d51a0d5f831999989f710878f840f50d3f9eea3 SHA256 50ab3eebbe994ee042094ef928938405a4094f2805916c1ced12a825f2a267b2
 DIST qtoctave-0.8.1.tar.gz 1707919 RMD160 41bb670f630ce08ce5b440b2c8dbe16fdbe282b0 SHA1 e7cb555eed318c0e62b2de974e5904e40579d2c4 SHA256 d5654f5aaa2ea86b473accb49cea4a85c2899d2822fe4c3d980f0260bbe87498
 DIST qtoctave-0.8.2.tar.gz 4554545 RMD160 18cedfecea53d4c86b46ebc8474a6e2b6ebee313 SHA1 d2aed8be03fb77d0f37cc72b7cd74ff7c73934dd SHA256 f7c42f0c215209e3f3faf98bed366afa49969a66a01a5733d83ce38118a0f1a3
+DIST qtoctave-0.9.1.tar.bz2 3335725 RMD160 9e4725cc2a52cfe9b7ec1e1b74becba8146b74f0 SHA1 1d18058c7549a3f25cd648183db3d99ef755257e SHA256 dd54c1dda166811e1ab32043211e37b803135b01d5f7d9101e85300ea9cfc986
 EBUILD qtoctave-0.8.1.ebuild 891 RMD160 06331169ffbe1d060761bcc2e557e72e12b6d582 SHA1 6350b6816d197f967ad3d4767d806cace098a265 SHA256 8ac66aeff417bded48c07ce9f53b36264822a6c74e3b89f7d185207804ec7c14
 EBUILD qtoctave-0.8.2.ebuild 875 RMD160 a3a07a030b862d2c72b607d0221498c38885bc00 SHA1 8863ae3714939fab42be529168a938145a8261b1 SHA256 0e4ff25095270e85a16c99b0d9dad0faf790338eb946eaa1d5d7f41a59325292
-MISC ChangeLog 1257 RMD160 44673e94261e62bdc8664541386ddfe2a7c86cb3 SHA1 01e49d4973e246556925cf92f2443998ba5b10fb SHA256 04ef3e1f21df938cefe13a743a3e47117c3111ad41080ef18987fc0137aadca4
+EBUILD qtoctave-0.9.1.ebuild 958 RMD160 197508e50c07f53fd81dee0253dd82281e904e74 SHA1 20889b52a9026512583daea81862188b4820acba SHA256 072220969e6e3a371a0f88c5152508c4df95c68475850d7b2fae705d72c1a3b5
+MISC ChangeLog 1465 RMD160 177b65f2d02bf284568f209907c803a0bb11d167 SHA1 76d68271216e9ce75e33e595425f2ce8b1229eff SHA256 96924886647689a0f9a783fc5f8ef8552d894803a65f82f2aa56932a343ab67b
 MISC metadata.xml 168 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 SHA1 95c9e4f7368f82053d631bbcd469612c92ca13cb SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwYZ6AACgkQ1ycZbhPLE2BVPwCfSZoCXQKPjMmeIvoqqUNJ4n20
+JEAAmgLEXUxX2BfJlCH9KPW7S97qcGqV
+=lOiO
+-----END PGP SIGNATURE-----
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
+}