Version bump, see bug #300535. Cleanup.

(Portage version: 2.1.7.1/cvs/Linux i686, RepoMan options: --force)

4 files changed, 14 insertions, 53 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/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"
 }