From dbc13c032cad4ce72e31d6cb8cd4bcfdca165bc6 Mon Sep 17 00:00:00 2001
From: geos_one <geos_one@6952d904-891a-0410-993b-d76249ca496b>
Date: Sat, 19 Nov 2011 07:11:17 +0000
Subject: [PATCH] apply eapi4 changes

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@3046 6952d904-891a-0410-993b-d76249ca496b
---
 app-editors/xxe/Manifest         |  2 +-
 app-editors/xxe/xxe-5.1.0.ebuild | 37 +++++++++++++++++---------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/app-editors/xxe/Manifest b/app-editors/xxe/Manifest
index a0c88ab5..647f2844 100644
--- a/app-editors/xxe/Manifest
+++ b/app-editors/xxe/Manifest
@@ -9,6 +9,6 @@ EBUILD xxe-4.8.0.ebuild 2771 RMD160 07a5611497941abe7a67f2f4b4471b20929a2754 SHA
 EBUILD xxe-4.9.0.ebuild 2771 RMD160 07a5611497941abe7a67f2f4b4471b20929a2754 SHA1 321a7838c27432da12397f4afe39bbc2c7c8a047 SHA256 2b2ebbf58beac12c8989db88be946d9bf228bc320ee575700aa6db9171e1cdb4
 EBUILD xxe-4.9.1.ebuild 2771 RMD160 07a5611497941abe7a67f2f4b4471b20929a2754 SHA1 321a7838c27432da12397f4afe39bbc2c7c8a047 SHA256 2b2ebbf58beac12c8989db88be946d9bf228bc320ee575700aa6db9171e1cdb4
 EBUILD xxe-5.0.0.ebuild 2771 RMD160 07a5611497941abe7a67f2f4b4471b20929a2754 SHA1 321a7838c27432da12397f4afe39bbc2c7c8a047 SHA256 2b2ebbf58beac12c8989db88be946d9bf228bc320ee575700aa6db9171e1cdb4
-EBUILD xxe-5.1.0.ebuild 2771 RMD160 07a5611497941abe7a67f2f4b4471b20929a2754 SHA1 321a7838c27432da12397f4afe39bbc2c7c8a047 SHA256 2b2ebbf58beac12c8989db88be946d9bf228bc320ee575700aa6db9171e1cdb4
+EBUILD xxe-5.1.0.ebuild 2729 RMD160 ba2f2c2cdbd565bf91473e93a78aeeec4a4f4f5c SHA1 60bc659d396908558c048c41754288636d1e6504 SHA256 ea7b422d4eed48e1467547dcad125286109923bca7b869f8fcc2aaeadd973b12
 MISC ChangeLog 977 RMD160 4cce3bfd75b6941d4bd35c4e1c42a2d179924765 SHA1 e434fb9af59b85c09affa44bef76d8d198ca69e9 SHA256 9965651e97b5760aaea983ea1066ee5ed46d6ca85262197d04c0245e10f8b7f6
 MISC metadata.xml 226 RMD160 bebcbe7a5e3d2be83c25e006192f71ebf45abb14 SHA1 ec2b713fc2363b8c51e9c164d0802eeb59d9d296 SHA256 a9d3f7df2362a9a7ddcbe05c5d97d726eeb4bab135b21643508149a08bf6a2b2
diff --git a/app-editors/xxe/xxe-5.1.0.ebuild b/app-editors/xxe/xxe-5.1.0.ebuild
index c5aedfe9..6350033d 100644
--- a/app-editors/xxe/xxe-5.1.0.ebuild
+++ b/app-editors/xxe/xxe-5.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=4
 
 inherit java-pkg-2 versionator
 
@@ -21,20 +21,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND=">=virtual/jre-1.5
-	dev-java/javahelp
+RDEPEND=">=virtual/jre-1.6
+	dev-java/javahelp:0
 	dev-java/saxon:6.5
 	dev-java/saxon:9
-	dev-java/xml-commons-resolver
+	dev-java/xml-commons-resolver:0
 "
 
-src_install () {
+pkg_setup() { :; }
+
+src_compile() { :; }
+
+src_install() {
 	local dir="/opt/${PN}"
 
 	# buggy binary crap also requires the demo dir ??
 	insinto "${dir}"
-	doins -r addon demo || die
+	doins -r addon demo
 
 	# Xerces has been patched hope this gets upstream was version 2.9.1
 	# relaxng is a heavely modified version of jing 20030619
@@ -64,17 +67,17 @@ src_install () {
 		--main "com.xmlmind.xmleditapp.start.Start" \
 		--java_args "-Xss4m -Xmx512m"
 
-	dodir /opt/bin || die
-	dosym ${dir}/bin/convertdoc /opt/bin/convertdoc || die
-	dosym ${dir}/bin/csscheck /opt/bin/csscheck || die
-	dosym ${dir}/bin/deploywebstart /opt/bin/deploywebstart || die
-	dosym ${dir}/bin/translatexxe /opt/bin/translatexxe || die
-	dosym ${dir}/bin/xmltool /opt/bin/xmltool || die
-	dosym ${dir}/bin/xxe /opt/bin/xxe || die
+	dodir /opt/bin
+	dosym ${dir}/bin/convertdoc /opt/bin/convertdoc
+	dosym ${dir}/bin/csscheck /opt/bin/csscheck
+	dosym ${dir}/bin/deploywebstart /opt/bin/deploywebstart
+	dosym ${dir}/bin/translatexxe /opt/bin/translatexxe
+	dosym ${dir}/bin/xmltool /opt/bin/xmltool
+	dosym ${dir}/bin/xxe /opt/bin/xxe
 
-	dohtml -r doc/* || die
-	dodoc legal/ditac.* legal/expr.* legal/icons.* legal/relaxng.* legal/xerces.* legal/xsdregex.* legal/xxe-* legal.txt || die
+	dohtml -r doc/*
+	dodoc legal/ditac.* legal/expr.* legal/icons.* legal/relaxng.* legal/xerces.* legal/xsdregex.* legal/xxe-* legal.txt
 
-	doicon bin/icon/xxe.png || die
+	doicon bin/icon/xxe.png
 	make_desktop_entry xxe "XMLmind XML Editor Personal Edition" xxe "Development;TextEditor;"
 }