sci-visualization/udav: Add variaous anhancements (qt4-r2, EAPI=4, LINUGUAS, Deps) implemented by Michael (kensington), #413551; dropped old

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

6 files changed, 80 insertions, 86 deletions

diff --git a/sci-visualization/udav/ChangeLog b/sci-visualization/udav/ChangeLog
index 06037455b92d..02c02b61a30a 100644
--- a/sci-visualization/udav/ChangeLog
+++ b/sci-visualization/udav/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-visualization/udav
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/udav/ChangeLog,v 1.8 2011/06/04 20:18:08 grozin Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/udav/ChangeLog,v 1.9 2012/05/02 17:26:18 jlec Exp $
+
+*udav-0.7.1.2-r1 (02 May 2012)
+
+  02 May 2012; Justin Lecher <jlec@gentoo.org> -udav-0.6.3.ebuild,
+  -udav-0.7.1.2.ebuild, +udav-0.7.1.2-r1.ebuild,
+  +files/udav-0.7.1.2-desktopfile.patch:
+  Add variaous anhancements (qt4-r2, EAPI=4, LINUGUAS, Deps) implemented by
+  Michael (kensington), #413551; dropped old
 
 *udav-0.7.1.2 (04 Jun 2011)
 
diff --git a/sci-visualization/udav/Manifest b/sci-visualization/udav/Manifest
index d62256039c59..f1149f077b3a 100644
--- a/sci-visualization/udav/Manifest
+++ b/sci-visualization/udav/Manifest
@@ -1,8 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX udav-0.6.3-pro.patch 1315 RMD160 a249e8ed1e719842feddc7a71bf701c6f3133ece SHA1 b927434e2e3e5ae9f052cb0ddd3d1e5c5b2783a0 SHA256 55e845523a6d1419fd2484f32b84954ac356272b233470ca696a2fae06a4d409
+AUX udav-0.7.1.2-desktopfile.patch 219 RMD160 1e990a5598680f2c88f19c7cd90535cd6c197428 SHA1 532bb41e580e4791c5f8b4c8b8bbdacd0e472d00 SHA256 cac3435c72e35541c5f27d7cff1a97f7469f8a0eed78e4efa40d7e9bf406bc0e
 AUX udav-0.7.1.2-pro.patch 586 RMD160 35f3f410d39223c8c9f2d4cf0eecbe67fa7d851f SHA1 f35a2d85ac97e94725f382213f3654254eb172c1 SHA256 ec9b33e7d9c70bd493abfb87076a04d8ac5bc98395436c026153f34084b0f67a
-DIST udav-0.6.3.tgz 234878 RMD160 097e1f10dc67171d4697915350ed03042c7e6cd7 SHA1 0331e736ac6183014fe67449f46c573c4aeabfbe SHA256 3256ed497e89f426ed3d0a94489b48e6d74caba137a21d8139294c0e015c58f6
 DIST udav-0.7.1.2.tar.gz 200642 RMD160 f2454d68eb3d39423c69034d25b73d14712d8d9a SHA1 58491767c33f10bc0bf1e407d6a6e98d2c7431b9 SHA256 f1ad69e3c0e13ede094b63d67045be2e3fb973ece5e3e4ade93667313951297a
-EBUILD udav-0.6.3.ebuild 898 RMD160 9139bd61e19e2038978b1e2eb48d90bc0dd07f06 SHA1 405dba722a4c1ea6464fdad5e3f81fcfd02ce9f4 SHA256 45cd081fe116c7584a8629a75a1404ec8b912968ff64711baf8f6152743a7d18
-EBUILD udav-0.7.1.2.ebuild 903 RMD160 6277d8ccd30a4e4533ca9d04211eca232831bf42 SHA1 adac5fa05cdce3566a3ddae5aa16d1193c0f2a2b SHA256 d8e8d6d6d1633ae1822a9beb561ed6572dcb53cc2d42f51e60869befc22d7e07
-MISC ChangeLog 1668 RMD160 ea1e9d11f3b8d6a55735995db7affe5b03e573fc SHA1 5cf98565cb4d119b9de76b7503afc1d8fcdc14d6 SHA256 1792c91df4fd46ec73cd895a3830565555c4fb33a3591422c934d0bb1302f305
+EBUILD udav-0.7.1.2-r1.ebuild 921 RMD160 dc3ca046346b89c358a3881d2e7ba72c1f1f17f1 SHA1 81971b90c6409dcb93cbcfdd6bca2e7e3986588b SHA256 3025539a20c6e7dc0f345e2727c1661c899cc8f42aa4e41dad725d061a9ae1da
+MISC ChangeLog 1977 RMD160 8beb3fe38508e7a2cedea46165d77a5b594f5d2b SHA1 81af4f6c9d806e4907c1cc6cd51df556414ac3fc SHA256 4f82ef4c1c81e2ed96cdfef26292599cde390ba028a9da76dbc57167b4324b7d
 MISC metadata.xml 321 RMD160 785b31678a268f7aa70328cb429243181428f223 SHA1 2d8c47d8623c0c70f51a72285b89f145bff91318 SHA256 80cfe117ed4425352d610a1805d084390c796a9efe724ed6e872b8f1ff85d46b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREKAAYFAk+hbj8ACgkQgAnW8HDreRazagCZAeSRcMBfGHiN1mpw4FgIorkj
+3MAAoL5V5o+SFZBfGGWb1fs/8e4cW+ld
+=6OEi
+-----END PGP SIGNATURE-----
diff --git a/sci-visualization/udav/files/udav-0.7.1.2-desktopfile.patch b/sci-visualization/udav/files/udav-0.7.1.2-desktopfile.patch
new file mode 100644
index 000000000000..dd7c02b24f82
--- /dev/null
+++ b/sci-visualization/udav/files/udav-0.7.1.2-desktopfile.patch
@@ -0,0 +1,13 @@
+--- UDAV.desktop
++++ UDAV.desktop
+@@ -1,9 +1,8 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Version=1.0
+ Type=Application
+ Terminal=false
+-Icon=udav.png
++Icon=udav
+ Name=UDAV
+ Exec=udav
+ Comment=Data handling and plotting tool
diff --git a/sci-visualization/udav/udav-0.6.3.ebuild b/sci-visualization/udav/udav-0.6.3.ebuild
deleted file mode 100644
index 50e2dd409a56..000000000000
--- a/sci-visualization/udav/udav-0.6.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.6.3.ebuild,v 1.1 2010/03/29 21:13:53 grozin Exp $
-
-EAPI=2
-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-1.10.2[qt4,hdf5]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-pro.patch
-}
-
-src_compile() {
-	eqmake4
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
-
-	dosym /usr/share/icons/hicolor/64x64/apps/${PN}.png \
-		/usr/share/pixmaps/${PN}.png
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-visualization/udav/udav-0.7.1.2-r1.ebuild b/sci-visualization/udav/udav-0.7.1.2-r1.ebuild
new file mode 100644
index 000000000000..a8c44da36775
--- /dev/null
+++ b/sci-visualization/udav/udav-0.7.1.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/udav/udav-0.7.1.2-r1.ebuild,v 1.1 2012/05/02 17:26:18 jlec Exp $
+
+EAPI=4
+
+LANGS="ru"
+
+inherit qt4-r2
+
+DESCRIPTION="Universal Data Array Visualization"
+HOMEPAGE="http://udav.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	sci-libs/hdf5
+	>=sci-libs/mathgl-1.10.2[hdf5,gsl,qt4]
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-desktopfile.patch"
+	"${FILESDIR}/${P}-pro.patch"
+)
+
+src_prepare() {
+	qt4-r2_src_prepare
+	if ! use linguas_ru ; then
+		sed -e '/udav_ru.qm$/d' -i src/src.pro || die "sed failed"
+	fi
+}
+
+src_install() {
+	qt4-r2_src_install
+
+	dosym /usr/share/icons/hicolor/64x64/apps/${PN}.png \
+		/usr/share/pixmaps/${PN}.png
+}
diff --git a/sci-visualization/udav/udav-0.7.1.2.ebuild b/sci-visualization/udav/udav-0.7.1.2.ebuild
deleted file mode 100644
index b73ba0c8945f..000000000000
--- a/sci-visualization/udav/udav-0.7.1.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/udav/udav-0.7.1.2.ebuild,v 1.1 2011/06/04 20:18:08 grozin Exp $
-
-EAPI=2
-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}.tar.gz"
-RDEPEND=">=sci-libs/mathgl-1.10.2[qt4,hdf5]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-pro.patch
-}
-
-src_compile() {
-	eqmake4
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
-
-	dosym /usr/share/icons/hicolor/64x64/apps/${PN}.png \
-		/usr/share/pixmaps/${PN}.png
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}