--- udav-0.7.1.2.ebuild
+++ udav-0.7.1.2.ebuild
@@ -2,39 +2,41 @@
 # 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
+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=""
-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
-}
+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_compile() {
-	eqmake4
-	emake || die "emake failed"
+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() {
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
+	emake INSTALL_ROOT="${D}" install
 
 	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
-}