[gentoo-commits] proj/qt:master commit in: app-editors/qxmledit/

[Johannes Huber]

commit:     258f9166305b318f1688b15ca3eabc0ba9cdcdcc
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  4 13:40:21 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Feb  4 13:40:21 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=258f9166

[app-editors/qxmledit] EAPI 4

(Portage version: 2.2.0_alpha84/git/Linux i686, unsigned Manifest commit)

---
 app-editors/qxmledit/qxmledit-9999.ebuild |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app-editors/qxmledit/qxmledit-9999.ebuild b/app-editors/qxmledit/qxmledit-9999.ebuild
index eaf5bee..e3e0128 100644
--- a/app-editors/qxmledit/qxmledit-9999.ebuild
+++ b/app-editors/qxmledit/qxmledit-9999.ebuild
@@ -1,17 +1,14 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI=4
 
 inherit qt4-edge subversion
 
-MY_PN="${PN}-src"
-MY_P="${MY_PN}-${PV}"
-
 DESCRIPTION="Qt4 XML Editor"
 HOMEPAGE="http://code.google.com/p/qxmledit/"
-ESVN_REPO_URI="http://qxmledit.googlecode.com/svn/trunk/"
+ESVN_REPO_URI="http://${PN}.googlecode.com/svn/trunk/"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,13 +18,11 @@ IUSE="debug"
 DEPEND="x11-libs/qt-gui:4"
 RDEPEND="${DEPEND}"
 
+DOCS=( AUTHORS NEWS README TODO )
 DOCSDIR="${WORKDIR}/${P}"
-DOCS="AUTHORS NEWS README TODO"
 
 src_prepare(){
 	subversion_src_prepare
-	# workaround for b0rked subversion eclass
-	S="${WORKDIR}/${P}/src"
 	# fix installation path
 	sed -i "/^target.path/ s/\/opt\/${PN}/\/usr\/bin/" src/QXmlEdit.pro || \
 		die "failed to fix installation path"
@@ -39,6 +34,6 @@ src_prepare(){
 
 src_install(){
 	qt4-edge_src_install
-	newicon "${S}"/images/icon.png ${PN}.png
+	newicon "${S}"/src/images/icon.png ${PN}.png
 	make_desktop_entry QXmlEdit QXmlEdit ${PN} "Qt;Utility;TextEditor;"
 }