Version bump

Package-Manager: portage-2.2_rc66/cvs/Linux i686

5 files changed, 59 insertions, 42 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/Manifest b/sci-visualization/udav/Manifest
index 6218d443612c..3fb97ea18481 100644
--- a/sci-visualization/udav/Manifest
+++ b/sci-visualization/udav/Manifest
@@ -1,8 +1,8 @@
-AUX udav-0.5.1-pro.patch 643 RMD160 e084a4539726d8b15abba6218bf57f7d6a9e9c99 SHA1 400958907e34e35ad7b4b71c4d933e7a31d7dae5 SHA256 48c5effbfb305b4eefe4cc673e70109fd5c784c2f7e16b2a197cabbfe3a0efba
 AUX udav-0.6-pro.patch 1315 RMD160 a249e8ed1e719842feddc7a71bf701c6f3133ece SHA1 b927434e2e3e5ae9f052cb0ddd3d1e5c5b2783a0 SHA256 55e845523a6d1419fd2484f32b84954ac356272b233470ca696a2fae06a4d409
-DIST udav-0.5.2.tgz 181774 RMD160 477034b7d2ce3f762423a851af069b5824310b25 SHA1 5d857ded986d65613d8a0f5d482ea33baf30f1b1 SHA256 229177b398986a2d29289f0747fa2d1a2c362887e7a7e73ab05874a3ab165345
+AUX udav-0.6.1-pro.patch 1315 RMD160 a249e8ed1e719842feddc7a71bf701c6f3133ece SHA1 b927434e2e3e5ae9f052cb0ddd3d1e5c5b2783a0 SHA256 55e845523a6d1419fd2484f32b84954ac356272b233470ca696a2fae06a4d409
+DIST udav-0.6.1.tgz 220123 RMD160 3b5b6299d9f79862171dce5c61ee4280d9bd5c17 SHA1 3d0bb0c3792ed152910ac2104bd1852ac285d02c SHA256 fdf46b9b51bee3f204901e54aaef66f309c30ad0f1678965ae46e4da2bc56678
 DIST udav-0.6.tgz 191853 RMD160 6198cec13bd927cfb5b498aa6b03d6b609a97d90 SHA1 a10408d03b1c13548ed7e8f06358856614225bf3 SHA256 4fa4be7368d3dfcc6f3882d29e8a8ff1c681eaeebb4a7cb17c9f977fa1e1b504
-EBUILD udav-0.5.2.ebuild 1025 RMD160 86c034f73a018c81e7a2080bd14fdb86100d81d1 SHA1 bc0716a45746d0bd7649dd9e6ba04aa78cd45304 SHA256 2171c1a46a4c80dd2cbe70ea96ffaf83216d50e8835834ee17243be5fbd2da41
+EBUILD udav-0.6.1.ebuild 940 RMD160 8a4dedc62e20bf5acd350fa29bb8a409247efd31 SHA1 4db65a871f795738776de1f1d8632df72719bdc8 SHA256 48a3d4ef706cbf3fe0e42d5ed80aa6184db04b3d1279dcf528efc94c0cc4d889
 EBUILD udav-0.6.ebuild 886 RMD160 dcd1895c056bee0783975e503ed1bd46bcd7bada SHA1 d5e379ca99a4eab11b68cd3453ada539be0b3f3c SHA256 82cd7b2bc185b56810a909f43f1fbd282bc631bebe8728f00e6a2e17ddccd58c
-MISC ChangeLog 1084 RMD160 0b5ca3cf5d93d4d90a86de89105fe46e4dd049da SHA1 be444c4cb989f43b31b3c57eedf6d502525d671d SHA256 6f39d8823f68704cd2315451d625faff054b3e316c9ef17ec99e9dbca7e06d66
+MISC ChangeLog 1278 RMD160 0841eadc58ac587a177409cff4c2e8170565de80 SHA1 2a072c3639300855a3005feebc5771a07968adf9 SHA256 1a8d3830162f997457336fb20e93324f09ae5f36cb814e001c774934181ed685
 MISC metadata.xml 321 RMD160 785b31678a268f7aa70328cb429243181428f223 SHA1 2d8c47d8623c0c70f51a72285b89f145bff91318 SHA256 80cfe117ed4425352d610a1805d084390c796a9efe724ed6e872b8f1ff85d46b
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
 }