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

Package-Manager: portage-2.1.3.16

5 files changed, 36 insertions, 30 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/Manifest b/sci-electronics/electric/Manifest
index af58df748efd..c33235b9c02c 100644
--- a/sci-electronics/electric/Manifest
+++ b/sci-electronics/electric/Manifest
@@ -17,22 +17,22 @@ SHA256 6fbc2eaad676a814c4d87d5656333073aa35f9e02ab9639fbd4cd48f6a0f9a22 files/el
 DIST electric-7.00.tar.gz 4474722 RMD160 c57a2e0a32e40d435e125cad6dfc5c1b98e9067b SHA1 782652b078e81060928eadfae364cd74da07788e SHA256 75aedee93b6bb7200abdd04098480d0a2c2408cc8574148459b93e5c56d64273
 DIST electricBinary-8.04.jar 9004006 RMD160 702919d652dda254741855272864603db7db470c SHA1 d2bfa22b7f93b32ddcc0df41f315ee3aaae12bb6 SHA256 178f260c448984e0384790619074fb344b928edba11c08fcb9c43c11186edbe2
 DIST electricBinary-8.05.jar 9605679 RMD160 0d4a4c129836638fc7c337e7bef89511742c64d5 SHA1 70f661fe0d81aec41686c6b35ead5878021f4922 SHA256 186233099fa0495df29bcd2c140e8ec6916c03f5d2f33f7cdbd88d0d7a595d17
-EBUILD electric-7.00.ebuild 1081 RMD160 df66fea1367531b0d40331a533f628d3fbe5035b SHA1 828c25d137a4acb9f627171c176be88f0248606e SHA256 83b2e3ded38654a803bdd76b87a8aebd418aad7ff575cca7bd06b1a399ef1f0c
-MD5 4efce5df1dfad53ad982c7ca2bb11090 electric-7.00.ebuild 1081
-RMD160 df66fea1367531b0d40331a533f628d3fbe5035b electric-7.00.ebuild 1081
-SHA256 83b2e3ded38654a803bdd76b87a8aebd418aad7ff575cca7bd06b1a399ef1f0c electric-7.00.ebuild 1081
-EBUILD electric-8.04.ebuild 919 RMD160 9df23bcdd6c4fddf465df83490f9e5812418d6ef SHA1 e92478d4fb1f34d4de47904b110c7f3dbe18f32b SHA256 da5ffb8d73912a5ede9f6a878804a030c5b702b2f7a20c6650d57f6657fb0007
-MD5 cd02e11b28be23bca32599e914d5a130 electric-8.04.ebuild 919
-RMD160 9df23bcdd6c4fddf465df83490f9e5812418d6ef electric-8.04.ebuild 919
-SHA256 da5ffb8d73912a5ede9f6a878804a030c5b702b2f7a20c6650d57f6657fb0007 electric-8.04.ebuild 919
-EBUILD electric-8.05.ebuild 914 RMD160 6a32424d03c01306de54535e042e5bc150a441bb SHA1 99d672d8eaccf897bae7ef1ac99dd13caa6a057a SHA256 4201927eca5ed603493dc406eafca7d6d73d30afbf3c482bc6a7356dd385cad1
-MD5 a9220b7e8171f347a3889cf26a108744 electric-8.05.ebuild 914
-RMD160 6a32424d03c01306de54535e042e5bc150a441bb electric-8.05.ebuild 914
-SHA256 4201927eca5ed603493dc406eafca7d6d73d30afbf3c482bc6a7356dd385cad1 electric-8.05.ebuild 914
-MISC ChangeLog 5209 RMD160 7c9feeb5ad8cdfad1838cc6bbf75514280ce1e49 SHA1 b5c6d71ef4bd4c75a3d2a00506e65b963fe76610 SHA256 0b52c186620ebbe1a5528031902a2ce073eafe2b43d21482ade565ddedf36c86
-MD5 954d8974610c91497c2e8b8268f083af ChangeLog 5209
-RMD160 7c9feeb5ad8cdfad1838cc6bbf75514280ce1e49 ChangeLog 5209
-SHA256 0b52c186620ebbe1a5528031902a2ce073eafe2b43d21482ade565ddedf36c86 ChangeLog 5209
+EBUILD electric-7.00.ebuild 1075 RMD160 9adab9b8591683ac95c42b74a94446efa056c007 SHA1 df9cb90b8a4a48f4d13feff1c015a5ce77164c87 SHA256 b4bcc38ac22a6c623cf67f23c48bf2da9f2a0b1019a3b0165fd1d054c27ddc52
+MD5 9e0a8eb3c32fb517c0dc30efcb58caae electric-7.00.ebuild 1075
+RMD160 9adab9b8591683ac95c42b74a94446efa056c007 electric-7.00.ebuild 1075
+SHA256 b4bcc38ac22a6c623cf67f23c48bf2da9f2a0b1019a3b0165fd1d054c27ddc52 electric-7.00.ebuild 1075
+EBUILD electric-8.04.ebuild 893 RMD160 6a9e8ff944fd8ae4fa2d29161aa3ccc8652df74d SHA1 aefe75ef313b8a2054d38293cf299ab3fc99f143 SHA256 4a913369e488148311b675e81f8ed366ea87e71c32403fffe2442ad3034ae75f
+MD5 093ed8c50ecf5d5f4d7bc6e68d06c917 electric-8.04.ebuild 893
+RMD160 6a9e8ff944fd8ae4fa2d29161aa3ccc8652df74d electric-8.04.ebuild 893
+SHA256 4a913369e488148311b675e81f8ed366ea87e71c32403fffe2442ad3034ae75f electric-8.04.ebuild 893
+EBUILD electric-8.05.ebuild 888 RMD160 1ba37f37350bfd5e366196435cdbef4b443292aa SHA1 f7fa47e70e468ae3fb48536236537d8a4dd0d4a0 SHA256 3e8295063772622b26669db91cde90b5a272850b8c95af6b057c336155228c82
+MD5 ad93c796d1ffb745b8e3fcf868e0ab75 electric-8.05.ebuild 888
+RMD160 1ba37f37350bfd5e366196435cdbef4b443292aa electric-8.05.ebuild 888
+SHA256 3e8295063772622b26669db91cde90b5a272850b8c95af6b057c336155228c82 electric-8.05.ebuild 888
+MISC ChangeLog 5406 RMD160 75e817ae55368e72cdee35ee0ad140b5927fbb4f SHA1 f18240fe85b350d4957ae3c36e853c2bdc86b378 SHA256 41ae3186f4561c08725a3e580d82f63e2cd1faa484be2362b86fcf84e9069552
+MD5 b5517f0a95dfc1003c1643fad966134a ChangeLog 5406
+RMD160 75e817ae55368e72cdee35ee0ad140b5927fbb4f ChangeLog 5406
+SHA256 41ae3186f4561c08725a3e580d82f63e2cd1faa484be2362b86fcf84e9069552 ChangeLog 5406
 MISC metadata.xml 534 RMD160 62b04f9cdc5dfdd2d38c88e1e29c474586c16d1f SHA1 7dc90e0c33c2930831fa3da51420675c09c2efd5 SHA256 bfd68184ac6df69230dcd88fcaf8d03eed7b9db90668e707b1d333172140fa5e
 MD5 ba9cc54f97135e100bcc34fd2e49d751 metadata.xml 534
 RMD160 62b04f9cdc5dfdd2d38c88e1e29c474586c16d1f metadata.xml 534
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"
 }