Version bump, see bug #300535. Cleanup.

Package-Manager: portage-2.1.7.1/cvs/Linux i686
RepoMan-Options: --force

5 files changed, 17 insertions, 60 deletions

diff --git a/sci-electronics/electric/ChangeLog b/sci-electronics/electric/ChangeLog
index 2cd56c1eb4c4..96a5e504c70d 100644
--- a/sci-electronics/electric/ChangeLog
+++ b/sci-electronics/electric/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-electronics/electric
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/electric/ChangeLog,v 1.35 2010/01/12 18:49:05 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/electric/ChangeLog,v 1.36 2010/01/12 19:56:58 calchan Exp $
+
+*electric-8.10 (12 Jan 2010)
+
+  12 Jan 2010; Denis Dupeyron <calchan@gentoo.org> -electric-8.04.ebuild,
+  -electric-8.05.ebuild, -electric-8.06.ebuild, +electric-8.10.ebuild:
+  Version bump, see bug #300535. Cleanup.
 
   12 Jan 2010; nixnut <nixnut@gentoo.org> electric-8.09.ebuild:
   ppc stable #299455
diff --git a/sci-electronics/electric/Manifest b/sci-electronics/electric/Manifest
index 08f61946e25c..9212537d38a5 100644
--- a/sci-electronics/electric/Manifest
+++ b/sci-electronics/electric/Manifest
@@ -3,14 +3,10 @@ AUX 7.00-qt.patch 1373 RMD160 8357f37c8202fb5020b781165f1e32e0e2adee20 SHA1 6e2a
 AUX electric-7.00-gcc4.1-gentoo.patch 390 RMD160 4e825bb96d12522ca53ceddaa2b6a01bbcd0ea8d SHA1 290eb0b8a5de7a86c7c98cb1ab44aaad131d2257 SHA256 a5f4added89c3a2c0822f9caa6f62ee1e0dd94c6e590417948b479ffbb9f944a
 AUX electric-7.00-qt-gentoo.patch 2135 RMD160 65e8950b0e47e19ba5ef579e602efdef86dde6be SHA1 518d7d28c581c7caf334985c268eb4fb4337e3b0 SHA256 6fbc2eaad676a814c4d87d5656333073aa35f9e02ab9639fbd4cd48f6a0f9a22
 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
-DIST electricBinary-8.06.jar 9912652 RMD160 3a0c3fbddb24b4fb1f053ad8e55e279b9ebb3fd3 SHA1 6c369da8e01be7b54c264111c3547d02ff9c9cb5 SHA256 087db656063751e6b36cf3e355b6d920b380d2d07cea340c59e40e864d9d4d86
 DIST electricBinary-8.09.jar 11102701 RMD160 0e4c06bc028a9c96e0427d8b454c841d3c8e0a6c SHA1 c50557bc54b74948e707dc4606009bd93274ec71 SHA256 d214868e8df9f4d50b09a23f6ac86b3e8cfb28cb1f735af3e860822c9d60c391
+DIST electricBinary-8.10.jar 11933511 RMD160 ff0e77ac181c22895214561c114aaf1222417f2a SHA1 03cda6ad4e9389352ed20131378f85bc6b68b926 SHA256 290238c77b6823f286adb08ef21fccc8b40e7721e95b9d0489014b5f7eab8fbd
 EBUILD electric-7.00.ebuild 1066 RMD160 8f8ca88866102358f04876c8905b8e6180d674f1 SHA1 ed24e14d495a8a75704016273a07b03effbf58ba SHA256 fe95a6ca9a44d7a99c732f7f35a6f35117e3b31305d8eb028f3b01ca23299ad5
-EBUILD electric-8.04.ebuild 893 RMD160 06bb9ce311e4eb5cfc01074c19b379f3cc5f2abc SHA1 e1ea52f014952b253f490ab5fc704acb6a694dcf SHA256 dfb65a67953e1c6fbf266a6da43f0796ee8c66661588439b81441d36b4042559
-EBUILD electric-8.05.ebuild 893 RMD160 67d184172e5e5b010b22e8bb4ef8bc21f09a73b1 SHA1 169e23510eb16d900030e569363a450e107f358b SHA256 9955677141719e5770e29d29793673fd35ba2d6ec329490a1147bd73a36b3840
-EBUILD electric-8.06.ebuild 891 RMD160 94ec4bb9993e2824acee62f97d5ad510857f3de8 SHA1 60af2bd35c355a34068445b52b29a3f0258158cb SHA256 56935defaf813ec002945cb24eeec36a6436db129a70cdfed737d1d8202ec182
 EBUILD electric-8.09.ebuild 898 RMD160 f56307f520f614a682ef303e6b79186953db09f2 SHA1 6bca09a013e210096639bc75768ec920e30d006e SHA256 805ccf3f9f30c51846ba672e4476454b3b36120352d1287da9747c6bef6037a5
-MISC ChangeLog 6643 RMD160 5625823bcd35cc0e861bb3d33cbff16fb31b38c7 SHA1 c3d539e4c79712fe242af6e1249fa5f8585e48cc SHA256 36dcfff09787f7edb7d15ed9f2ca54406c158900cf6db68e90303268b9f4c551
+EBUILD electric-8.10.ebuild 901 RMD160 e4197729b87fcf0d87319b7f22ef7f88ef57cc93 SHA1 482aa804cc44007a5ecbd110126d6ac0032607e6 SHA256 fbcfd43d760d9f19f81c2287f3a372fea22d9824611e1960d3c082b620e979e2
+MISC ChangeLog 6862 RMD160 642618a25c381f3056963483f0f49d543d52bc2f SHA1 92f2a35806c8c9f051f5bc39d810ac1153238637 SHA256 ddaa595844d8797147328483d8301e329cc80e313649f8c3f65069dd9b4ce89f
 MISC metadata.xml 534 RMD160 62b04f9cdc5dfdd2d38c88e1e29c474586c16d1f SHA1 7dc90e0c33c2930831fa3da51420675c09c2efd5 SHA256 bfd68184ac6df69230dcd88fcaf8d03eed7b9db90668e707b1d333172140fa5e
diff --git a/sci-electronics/electric/electric-8.05.ebuild b/sci-electronics/electric/electric-8.05.ebuild
deleted file mode 100644
index 2a95e898a435..000000000000
--- a/sci-electronics/electric/electric-8.05.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2010 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.5 2010/01/07 22:11:32 ssuominen Exp $
-
-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"
-SRC_URI="mirror://gnu/electric/${PN}Binary-${PV}.jar"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}"
-
-src_install() {
-	java-pkg_newjar "${DISTDIR}"/${PN}Binary-${PV}.jar
-	newicon com/sun/electric/tool/user/help/helphtml/iconplug.png electric.png
-	java-pkg_dolauncher ${PN}
-	make_desktop_entry electric "Electric VLSI Design System" electric "Application;Engineering;Electronics"
-}
diff --git a/sci-electronics/electric/electric-8.06.ebuild b/sci-electronics/electric/electric-8.06.ebuild
deleted file mode 100644
index 24c0e81d0eb4..000000000000
--- a/sci-electronics/electric/electric-8.06.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/electric/electric-8.06.ebuild,v 1.1 2008/04/21 21:28:58 calchan Exp $
-
-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"
-SRC_URI="mirror://gnu/electric/${PN}Binary-${PV}.jar"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}"
-
-src_install() {
-	java-pkg_newjar "${DISTDIR}"/${PN}Binary-${PV}.jar
-	newicon com/sun/electric/tool/user/help/helphtml/iconplug.png electric.png
-	java-pkg_dolauncher ${PN}
-	make_desktop_entry electric "Electric VLSI Design System" electric "Application;Engineering;Electronics"
-}
diff --git a/sci-electronics/electric/electric-8.04.ebuild b/sci-electronics/electric/electric-8.10.ebuild
index 2e5ed2a94e3b..a3f33ccd82ac 100644
--- a/sci-electronics/electric/electric-8.04.ebuild
+++ b/sci-electronics/electric/electric-8.10.ebuild
@@ -1,24 +1,27 @@
 # Copyright 1999-2010 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.7 2010/01/07 22:11:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/electric/electric-8.10.ebuild,v 1.1 2010/01/12 19:56:58 calchan Exp $
 
 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"
 SRC_URI="mirror://gnu/electric/${PN}Binary-${PV}.jar"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
+
+RDEPEND=">=virtual/jre-1.6
+	sci-electronics/electronics-menu"
 DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.3"
 
-S="${WORKDIR}"
+S=${WORKDIR}
 
 src_install() {
 	java-pkg_newjar "${DISTDIR}"/${PN}Binary-${PV}.jar
 	newicon com/sun/electric/tool/user/help/helphtml/iconplug.png electric.png
 	java-pkg_dolauncher ${PN}
-	make_desktop_entry electric "Electric VLSI Design System" electric "Application;Engineering;Electronics"
+	make_desktop_entry electric "Electric VLSI Design System" electric "Electronics"
 }