--- electric-8.05.ebuild	2007-07-29 16:36:35.000000000 +0300
+++ electric-8.05-r1.ebuild	2007-11-01 02:52:24.000000000 +0200
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sci-electronics/electric/electric-8.05.ebuild,v 1.1 2007/07/29 13:36:35 calchan Exp $
 
-inherit eutils java-pkg
+inherit eutils java-pkg-2
 
 DESCRIPTION="Complete Electronic Design Automation (EDA) system that can handle many forms of circuit design"
 HOMEPAGE="http://www.gnu.org/software/electric/electric.html"
@@ -11,13 +11,14 @@
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-DEPEND=">=virtual/jre-1.6"
+DEPEND="app-arch/unzip"
+RDEPEND=">=virtual/jre-1.6"
 
 S="${WORKDIR}"
 
 src_install() {
-	java-pkg_dojar ${DISTDIR}/${PN}Binary-${PV}.jar
+	java-pkg_newjar "${DISTDIR}/${PN}Binary-${PV}.jar"
 	newicon com/sun/electric/tool/user/help/helphtml/iconplug.png electric.png
-	make_wrapper electric "java -jar /usr/share/electric/lib/${PN}Binary-${PV}.jar"
+	java-pkg_dolauncher ${PN}
 	make_desktop_entry electric "Electric VLSI Design System" electric.png "Application;Engineering;Electronics"
 }