Fixed bug #197710, thanks to Petteri Räty. Removed useless dodoc COPYING.

(Portage version: 2.1.3.16)

4 files changed, 20 insertions, 14 deletions

diff --git a/sci-electronics/electric/ChangeLog b/sci-electronics/electric/ChangeLog
index 671da3c1865f..8d7e47c32c8d 100644
--- a/sci-electronics/electric/ChangeLog
+++ b/sci-electronics/electric/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/electric
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/electric/ChangeLog,v 1.24 2007/07/29 13:36:35 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/electric/ChangeLog,v 1.25 2007/11/01 16:46:28 calchan Exp $
+
+  01 Nov 2007; Denis Dupeyron <calchan@gentoo.org> electric-7.00.ebuild,
+  electric-8.04.ebuild, electric-8.05.ebuild:
+  Fixed bug #197710, thanks to Petteri Räty. Removed useless dodoc COPYING.
 
 *electric-8.05 (29 Jul 2007)
 
diff --git a/sci-electronics/electric/electric-7.00.ebuild b/sci-electronics/electric/electric-7.00.ebuild
index 55966bb614cd..905c4fe84575 100644
--- a/sci-electronics/electric/electric-7.00.ebuild
+++ b/sci-electronics/electric/electric-7.00.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/electric/electric-7.00.ebuild,v 1.10 2006/08/21 04:29:01 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/electric/electric-7.00.ebuild,v 1.11 2007/11/01 16:46:28 calchan Exp $
 
 inherit eutils qt3
 
@@ -34,5 +34,5 @@ src_compile() {
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 
-	dodoc ChangeLog COPYING README
+	dodoc ChangeLog README
 }
diff --git a/sci-electronics/electric/electric-8.04.ebuild b/sci-electronics/electric/electric-8.04.ebuild
index bc06beb71857..ac8c78504442 100644
--- a/sci-electronics/electric/electric-8.04.ebuild
+++ b/sci-electronics/electric/electric-8.04.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/electric/electric-8.04.ebuild,v 1.4 2007/07/29 10:08:25 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/electric/electric-8.04.ebuild,v 1.5 2007/11/01 16:46:28 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 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
-DEPEND=">=virtual/jre-1.3"
+DEPEND="app-arch/unzip"
+RDEPEND=">=virtual/jre-1.3"
 
 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"
 }
diff --git a/sci-electronics/electric/electric-8.05.ebuild b/sci-electronics/electric/electric-8.05.ebuild
index c1df507de6fd..2a064902fa5b 100644
--- a/sci-electronics/electric/electric-8.05.ebuild
+++ b/sci-electronics/electric/electric-8.05.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/electric/electric-8.05.ebuild,v 1.2 2007/11/01 16:46:28 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 @@ LICENSE="GPL-2"
 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"
 }