5 files changed, 9 insertions, 89 deletions
diff --git a/sci-electronics/electric/Manifest b/sci-electronics/electric/Manifest
index b1b0770fdd25..dd9a728c294e 100644
--- a/sci-electronics/electric/Manifest
+++ b/sci-electronics/electric/Manifest
@@ -1,9 +1,3 @@
-DIST electricBinary-8.09.jar 11102701 BLAKE2B 657e1ccd4625687da85d7a5489167a33a52dd84b2360a8a7eb526fe6b63c92f48c0a88a5c1dcfd104185767277b53a24f08ad4c287483275ac4a0f0215cdf692 SHA512 9c042b168bf4da177418af6e0ca9543a2c57ddfa9fb22c8be84038b6e3e36302b028f1685c65f765f3506c24081da249ed35be3480254108f955f55bf14b179b
-DIST electricBinary-8.11.jar 12144732 BLAKE2B 66a03db8b6a0444e079649e421dfdaed3d5c9231f875912e113c2f9c9a58953afa168a7e1b95250d4fbb9a0f7f0a9988e7e7e45e40a82aed0d8b1eefd4ea948b SHA512 960355b580f9137c6fe9e5ba00c31ab1f61eacbf5689a51f88f12a48fb0742e702258bf6de4a6349c938f28d16294948cecd0eae261f82898e859f06361669e2
-DIST electricBinary-9.02.jar 23429359 BLAKE2B 8b93db3a9a6cba76708ff9416ae4fc2ac84706ec4d2bbc0f2e95a4ccafbbf65dd5c22e50eaa2a56536f8a1564fbd69af714a6a3bb7a4279ae259d0e27b12b33a SHA512 3c4eab21865bfabb744ab227fb0344552fae7291fbf3c043903ee919fd80238ec9674e3535ac80caab9bf3fa962ec45ca21378629d5d68d470c53849e8ded471
 DIST electricBinary-9.03.jar 23591444 BLAKE2B f5185917821855eed90dbd39dc8f6a390c9b117c06d960a01ef7061ec7650d13b549950e53c43c4bd0864c0adebc32c1c2e5c68a32dd09f2f46d0111aa8a7fe0 SHA512 e4430c87e1c0d335341057950b887988f46bd222ab6c2d989312036592f16db0b51169f3affc01fe0dbd8077674ed934d4896de46a0f9ee00e71453b2a6b18f2
-EBUILD electric-8.09.ebuild 756 BLAKE2B 2e1a536c5a64d58903572e058bc3e829191f3cb17373a9b95649ef68202f91d5eafd12b92277dcaa70ae9dec3b70118552d39c65738276243ef91e97cb6a0482 SHA512 08f0faad39992c4397fdc7c236d27f250e07095364f044a23beabc902c889329bcf296f8b2d307e33f41be4b93ab2ad97941644f1bfae2f8ddb77707cdda3c5b
-EBUILD electric-8.11.ebuild 758 BLAKE2B e8cef88cec59ae547ee1f00e943c6df25aa82ad4da8c280bab61da4ebf6c623e11a754b7aadddef6b90e93df5f7b72114d05eaa92bfaf83d3e679431ca4c66ed SHA512 b4a6a5f114d9b37c5f4189b0910330f765e8b7029a14e8d85ff3faccc6ef6357a82e5d29e3736a7ba0308981e84909f775dcaf0f508fd1a074e263073b4c40dd
-EBUILD electric-9.02.ebuild 756 BLAKE2B 2e1a536c5a64d58903572e058bc3e829191f3cb17373a9b95649ef68202f91d5eafd12b92277dcaa70ae9dec3b70118552d39c65738276243ef91e97cb6a0482 SHA512 08f0faad39992c4397fdc7c236d27f250e07095364f044a23beabc902c889329bcf296f8b2d307e33f41be4b93ab2ad97941644f1bfae2f8ddb77707cdda3c5b
-EBUILD electric-9.03.ebuild 758 BLAKE2B e8cef88cec59ae547ee1f00e943c6df25aa82ad4da8c280bab61da4ebf6c623e11a754b7aadddef6b90e93df5f7b72114d05eaa92bfaf83d3e679431ca4c66ed SHA512 b4a6a5f114d9b37c5f4189b0910330f765e8b7029a14e8d85ff3faccc6ef6357a82e5d29e3736a7ba0308981e84909f775dcaf0f508fd1a074e263073b4c40dd
+EBUILD electric-9.03.ebuild 770 BLAKE2B 178c80f28275df4b0ce02d6b66df0f038d35fa1bae924783e46ae682943c8e32db715d7ce6e6caa6b87b469f0ba41e06c2f7fd0a501ee2ebb2df7a98e4c296a4 SHA512 db206a790fdd1e2384c03b700b93da9e5fc7418d24b62eb2cb4c1d319c8220fd74025c21a82b42b050863e9371ff30cd43e911594e47ea2ed567400f19e433a3
 MISC metadata.xml 639 BLAKE2B df8422e39990021ac0e976721795e5bea9aaebeaf2e064dc930d57809a69388fdcf69418d1057e98f91ec8b1dde1bd6b7ffbe317d92bfe9bbed61f1881b2f5ed SHA512 856409ad27b7e3cc812c369e0ca8d362d8d71d9ba66ac189b68680a62da1501e019d7344a52a4f8c48b4cb6c5e8dec399cf1eca47751131336cd9355a9846973
diff --git a/sci-electronics/electric/electric-8.09.ebuild b/sci-electronics/electric/electric-8.09.ebuild
deleted file mode 100644
index 5c969c996b04..000000000000
--- a/sci-electronics/electric/electric-8.09.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils java-pkg-2
-
-DESCRIPTION="Complete Electronic Design Automation system for many forms of circuit design"
-HOMEPAGE="https://www.gnu.org/software/electric/electric.html"
-SRC_URI="mirror://gnu/electric/${PN}Binary-${PV}.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6
-	sci-electronics/electronics-menu"
-DEPEND="app-arch/unzip"
-
-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 "Electronics"
-}
diff --git a/sci-electronics/electric/electric-8.11.ebuild b/sci-electronics/electric/electric-8.11.ebuild
deleted file mode 100644
index e7c190691c95..000000000000
--- a/sci-electronics/electric/electric-8.11.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils java-pkg-2
-
-DESCRIPTION="Complete Electronic Design Automation system for many forms of circuit design"
-HOMEPAGE="https://www.gnu.org/software/electric/electric.html"
-SRC_URI="mirror://gnu/electric/${PN}Binary-${PV}.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6
-	sci-electronics/electronics-menu"
-DEPEND="app-arch/unzip"
-
-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 "Electronics"
-}
diff --git a/sci-electronics/electric/electric-9.02.ebuild b/sci-electronics/electric/electric-9.02.ebuild
deleted file mode 100644
index 5c969c996b04..000000000000
--- a/sci-electronics/electric/electric-9.02.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils java-pkg-2
-
-DESCRIPTION="Complete Electronic Design Automation system for many forms of circuit design"
-HOMEPAGE="https://www.gnu.org/software/electric/electric.html"
-SRC_URI="mirror://gnu/electric/${PN}Binary-${PV}.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6
-	sci-electronics/electronics-menu"
-DEPEND="app-arch/unzip"
-
-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 "Electronics"
-}
diff --git a/sci-electronics/electric/electric-9.03.ebuild b/sci-electronics/electric/electric-9.03.ebuild
index e7c190691c95..eddba70359cf 100644
--- a/sci-electronics/electric/electric-9.03.ebuild
+++ b/sci-electronics/electric/electric-9.03.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils java-pkg-2
+EAPI=6
+
+inherit desktop java-pkg-2
 
 DESCRIPTION="Complete Electronic Design Automation system for many forms of circuit design"
 HOMEPAGE="https://www.gnu.org/software/electric/electric.html"
@@ -12,7 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=virtual/jre-1.6
+RDEPEND="
+	>=virtual/jre-1.6
 	sci-electronics/electronics-menu"
 DEPEND="app-arch/unzip"
 
@@ -20,7 +23,8 @@ 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}
+
+	newicon com/sun/electric/tool/user/help/helphtml/iconplug.png electric.png
 	make_desktop_entry electric "Electric VLSI Design System" electric "Electronics"
 }