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

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

5 files changed, 67 insertions, 82 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/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
-}