Version bump

(Portage version: 2.2_rc66/cvs/Linux i686)

4 files changed, 55 insertions, 38 deletions

diff --git a/sci-visualization/udav/ChangeLog b/sci-visualization/udav/ChangeLog
index 5160c637e96e..8ea155a31903 100644
--- a/sci-visualization/udav/ChangeLog
+++ b/sci-visualization/udav/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-visualization/udav
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/udav/ChangeLog,v 1.5 2010/01/04 12:07:20 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/udav/ChangeLog,v 1.6 2010/03/08 19:16:04 grozin Exp $
+
+*udav-0.6.1 (09 Mar 2010)
+
+  09 Mar 2010; Andrey Grozin <grozin@gentoo.org>
+  -files/udav-0.5.1-pro.patch, -udav-0.5.2.ebuild, +udav-0.6.1.ebuild,
+  +files/udav-0.6.1-pro.patch:
+  Version bump
 
 *udav-0.6 (04 Jan 2010)
 
diff --git a/sci-visualization/udav/files/udav-0.5.1-pro.patch b/sci-visualization/udav/files/udav-0.5.1-pro.patch
deleted file mode 100644
index ceaf896cdfe9..000000000000
--- a/sci-visualization/udav/files/udav-0.5.1-pro.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- udav-0.5.orig/src/src.pro
-+++ udav-0.5/src/src.pro
-@@ -1,4 +1,4 @@
--DEFINES += MGL_DOC_DIR=\\\"$(MGLDOCDIR)\\\"
-+DEFINES += MGL_DOC_DIR=\\\"/usr/share/doc/$(PF)/\\\"
- 
- TEMPLATE = app
- CONFIG += release \
-@@ -40,7 +40,7 @@ setupdialog.h \
- DISTFILES += ../TODO \
- ../ChangeLog.txt
- 
--target.path = /usr/local/bin/
-+target.path = /usr/bin/
- INSTALLS += target \
-  help \
-  pics
-@@ -54,7 +54,7 @@ LIBS += -lmgl
- help.files += ../help/*.html
- pics.files += ../help/pics/*.png
- 
--help.path = /usr/local/share/doc/udav/
-+help.path = /usr/share/doc/${PF}/
- 
--pics.path = /usr/local/share/doc/udav/pics/
-+pics.path = /usr/share/doc/${PF}/pics/
- 
diff --git a/sci-visualization/udav/files/udav-0.6.1-pro.patch b/sci-visualization/udav/files/udav-0.6.1-pro.patch
new file mode 100644
index 000000000000..78422a314c2e
--- /dev/null
+++ b/sci-visualization/udav/files/udav-0.6.1-pro.patch
@@ -0,0 +1,39 @@
+diff -r -U2 udav-0.6.orig/src/src.pro udav-0.6/src/src.pro
+--- udav-0.6.orig/src/src.pro	2009-12-24 18:38:09.000000000 +0100
++++ udav-0.6/src/src.pro	2010-01-04 18:42:09.000000000 +0100
+@@ -1,3 +1,4 @@
+-DEFINES += MGL_DOC_DIR=\\\"$(MGLDOCDIR)\\\"
++DEFINES += MGL_DOC_DIR=\\\"/usr/share/doc/$(PF)/\\\"
++DEFINES += H5_USE_16_API
+ TEMPLATE = app
+ CONFIG += release \
+@@ -42,5 +43,5 @@
+     ../INSTALL
+ RC_FILE = udav.rc
+-target.path = /usr/local/bin/
++target.path = /usr/bin/
+ INSTALLS += target \
+     help \
+@@ -56,8 +57,8 @@
+ help.files += ../help/*.html
+ pics.files += ../help/pics/*.png
+-help.path = /usr/local/share/doc/udav/
+-pics.path = /usr/local/share/doc/udav/pics/
+-icon.path = /usr/local/share/udav/
+-desc.path = /usr/local/share/applications/
++help.path = /usr/share/doc/${PF}/
++pics.path = /usr/share/doc/${PF}/pics/
++icon.path = /usr/share/icons/hicolor/64x64/apps/
++desc.path = /usr/share/applications/
+ OTHER_FILES += ../ChangeLog.txt \
+     ../TODO
+diff -r -U2 udav-0.6.orig/UDAV.desktop udav-0.6/UDAV.desktop
+--- udav-0.6.orig/UDAV.desktop	2009-12-24 18:38:13.000000000 +0100
++++ udav-0.6/UDAV.desktop	2010-01-04 18:35:30.000000000 +0100
+@@ -4,5 +4,5 @@
+ Type=Application
+ Terminal=false
+-Icon=/usr/local/share/udav/udav.png
++Icon=/usr/share/icons/hicolor/64x64/apps/udav.png
+ Name=UDAV
+ Exec=udav
diff --git a/sci-visualization/udav/udav-0.5.2.ebuild b/sci-visualization/udav/udav-0.6.1.ebuild
index c06edbed0a73..d77c5c487b4c 100644
--- a/sci-visualization/udav/udav-0.5.2.ebuild
+++ b/sci-visualization/udav/udav-0.6.1.ebuild
@@ -1,25 +1,26 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/udav/udav-0.5.2.ebuild,v 1.1 2009/11/26 19:51:43 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/udav/udav-0.6.1.ebuild,v 1.1 2010/03/08 19:16:04 grozin Exp $
 
 EAPI=2
-inherit qt4 fdo-mime flag-o-matic
+inherit qt4 fdo-mime
 
 DESCRIPTION="Universal Data Array Visualization"
 HOMEPAGE="http://udav.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE=""
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-RDEPEND="sci-libs/mathgl[qt4,hdf5]"
+RDEPEND=">=sci-libs/mathgl-1.10.1[qt4,hdf5]"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.5.1-pro.patch
+	epatch "${FILESDIR}"/${P}-pro.patch
+	rm src/Makefile || die "no src/Makefile"
 }
 
 src_compile() {
-	append-flags -DH5_USE_16_API
 	eqmake4
 	emake || die "emake failed"
 }
@@ -27,10 +28,7 @@ src_compile() {
 src_install() {
 	emake INSTALL_ROOT="${D}" install || die "emake install failed"
 
-	make_desktop_entry ${PN}
-	insinto /usr/share/icons/hicolor/48x48/apps
-	doins src/${PN}.png
-	dosym /usr/share/icons/hicolor/48x48/apps/${PN}.png \
+	dosym /usr/share/icons/hicolor/64x64/apps/${PN}.png \
 		/usr/share/pixmaps/${PN}.png
 }