--- texmaker-1.99.ebuild.orig	2010-03-27 01:38:00.591242091 +0100
+++ texmaker-1.99.ebuild	2010-03-27 01:42:50.006592830 +0100
@@ -2,69 +2,56 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-1.99.ebuild,v 1.1 2010/02/25 12:04:42 aballier Exp $
 
-EAPI=1
-
-inherit base versionator qt4
-
-DESCRIPTION="A nice LaTeX-IDE"
+EAPI=3
+inherit versionator qt4-r2
 
 # The upstream version numbering is bad, so we have to remove a dot in the
 # minor version number
 MAJOR="$(get_major_version)"
 MINOR_1="$(($(get_version_component_range 2)/10))"
 MINOR_2="$(($(get_version_component_range 2)%10))"
-if [ ${MINOR_2} -eq "0" ] ; then
+if [[ ${MINOR_2} -eq "0" ]] ; then
 	MY_P="${PN}-${MAJOR}.${MINOR_1}"
 else
 	MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
 fi
 
-S="${WORKDIR}/${MY_P}"
+DESCRIPTION="A nice LaTeX-IDE"
 HOMEPAGE="http://www.xm1math.net/texmaker/"
 SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-
 SLOT="0"
-
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
 IUSE=""
 
 COMMON_DEPEND="x11-libs/libX11
 	x11-libs/libXext
-	>=x11-libs/qt-gui-4.5.1:4
-	>=x11-libs/qt-core-4.5.1:4
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
 	>=app-text/hunspell-1.2.4"
-
 RDEPEND="${COMMON_DEPEND}
 	virtual/latex-base
 	app-text/psutils
 	app-text/ghostscript-gpl
 	media-libs/netpbm"
-
 DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig"
 
+S=${WORKDIR}/${MY_P}
 PATCHES=( "${FILESDIR}/${P}-hunspell.patch" )
 
-src_compile() {
-	eqmake4 texmaker.pro || die "qmake failed"
-	emake || die "emake failed"
-}
-
 src_install() {
-	emake INSTALL_ROOT="${D}" install || die "make install failed"
+	emake INSTALL_ROOT="${D}" install || die
 
 	insinto /usr/share/pixmaps/texmaker
-	doins utilities/texmaker*.png || die "doins failed."
-	doins utilities/texmaker.svg || die "doins failed."
+	doins utilities/texmaker*.png || die
+	doins utilities/texmaker.svg || die
 
-	dodoc utilities/AUTHORS utilities/CHANGELOG.txt || die "dodoc failed"
+	dodoc utilities/AUTHORS utilities/CHANGELOG.txt || die
 }
 
 pkg_postinst() {
 	elog "A user manual with many screenshots is available at:"
 	elog "/usr/share/${PN}/usermanual_en.html"
-	elog
 }