--- file_not_specified_in_diff	
+++ file_not_specified_in_diff	
@@ -, +, @@ 
--- qxmledit-0.6.1.ebuild
+++ qxmledit-0.7.0.ebuild
@@ -1,9 +1,10 @@ 
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+# $Header: $
 
-EAPI="2"
+EAPI=4
 
-inherit qt4-r2
+inherit multilib qt4-r2
 
 MY_P="qxmledit-${PV}-src"
 
@@ -16,26 +17,33 @@ 
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-DEPEND="x11-libs/qt-gui:4"
+DEPEND="x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	x11-libs/qt-svg:4
+	x11-libs/qt-xmlpatterns:4"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${P}/src/"
-
 DOCS="AUTHORS NEWS README TODO"
 DOCSDIR="${WORKDIR}/${P}/"
 
-src_prepare(){
+src_prepare() {
+	# fix doc dir
+	sed -i "/^INST_DOC_DIR/ s|/opt/${PN}|/usr/share/doc/${PF}|" src/QXmlEdit.pro || \
+		die "failed to fix installation path"
 	# fix installation path
-	sed -i "/^INST_DIR/ s/\/opt\/${PN}/\/usr\/bin/" QXmlEdit.pro || \
+	sed -i "/^INST_DIR/ s|/opt/${PN}|/usr/bin|" src/QXmlEdit.pro || \
 		die "failed to fix installation path"
+	# fix widget library
+	sed -i "/^INST_DIR/ s|/opt/${PN}|/usr/$(get_libdir)|" \
+		src/QXmlEditWidget.pro || die "failed to fix library installation path"
 	# fix translations
-	sed -i "/^INST_DATA_DIR/ s/\/opt/\/usr\/share/" QXmlEdit.pro || \
+	sed -i "/^INST_DATA_DIR/ s|/opt|/usr/share|" src/QXmlEdit{,Widget}.pro || \
 		die "failed to fix translations"
 	qt4-r2_src_prepare
 }
 
-src_install(){
+src_install() {
 	qt4-r2_src_install
-	newicon "${S}"/images/icon.png ${PN}.png
+	newicon src/images/icon.png ${PN}.png
 	make_desktop_entry QXmlEdit QXmlEdit ${PN} "Qt;Utility;TextEditor"
 }