commit: acce6decb30b7d13820cc3a6a9f0051c9fe4e3d6
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 14:04:06 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 14:12:42 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acce6dec
dev-java/zeus-jscl: Add default to src_prepare phase. Clean up old.
Package-Manager: portage-2.2.28
dev-java/zeus-jscl/Manifest | 1 -
dev-java/zeus-jscl/zeus-jscl-1.08.ebuild | 35 -----------------------------
dev-java/zeus-jscl/zeus-jscl-1.64-r1.ebuild | 4 ++++
dev-java/zeus-jscl/zeus-jscl-1.64.ebuild | 35 -----------------------------
4 files changed, 4 insertions(+), 71 deletions(-)
diff --git a/dev-java/zeus-jscl/Manifest b/dev-java/zeus-jscl/Manifest
index a51bf65..2b9be4e 100644
--- a/dev-java/zeus-jscl/Manifest
+++ b/dev-java/zeus-jscl/Manifest
@@ -1,2 +1 @@
-DIST zeus-jscl_v1_08.zip 411676 SHA256
c33ef05673399d3da9c8ae495bd7efd9513bfae953c056d5bb62467d0be37953 SHA512
7c8de7475fdcf307ed1b604eed98eb3ec28304f112e1aed9e5349f648356ace38338ebbc0a204b40e10c52dcd48bed878523187ba75165f494a08d688d8d38ac
WHIRLPOOL
2e5a5e0adcd4791657da1094c4b4502affc32096dbd26fe1faebe822976f3633a1e84e285dcb49106ab5bbcd72a7c90583fcec807ce09d2105fb5a504bdd5bc9
DIST zeus-jscl_v1_64.zip 585558 SHA256
d76ddc5b76648b75b5ede5f02df6ed498db12d708413adec2900a67e1e0c4e9a SHA512
e756df28da39322121575041a949965f47eecea6106e7dd619a4f0764a239131e1ab8a9dcf7c6d461fc4861ea86acaceb19a5a51c8002c990999193050e03b10
WHIRLPOOL
832b7198472a8e0ed1ceeceb171b18fc66a3c9249c785e40430e2e01e75d21a3848a31afbe92ffb0f479e462357cf782e611b6e9f131d0fa9e0a5b3f6b59e3ad
diff --git a/dev-java/zeus-jscl/zeus-jscl-1.08.ebuild
b/dev-java/zeus-jscl/zeus-jscl-1.08.ebuild
deleted file mode 100644
index 47ba26b..0000000
--- a/dev-java/zeus-jscl/zeus-jscl-1.08.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}_v${PV//./_}"
-
-DESCRIPTION="Zeus Java Swing Components Library"
-HOMEPAGE="http://sourceforge.net/projects/zeus-jscl/";
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND=""
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEPEND}"
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip
- ${COMMON_DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_install() {
- java-pkg_newjar lib/${PN}.jar ${PN}.jar
- use source && java-pkg_dosrc src
- use doc && java-pkg_dojavadoc doc/api
-}
diff --git a/dev-java/zeus-jscl/zeus-jscl-1.64-r1.ebuild
b/dev-java/zeus-jscl/zeus-jscl-1.64-r1.ebuild
index 0e0cddf..e19531a 100644
--- a/dev-java/zeus-jscl/zeus-jscl-1.64-r1.ebuild
+++ b/dev-java/zeus-jscl/zeus-jscl-1.64-r1.ebuild
@@ -24,6 +24,10 @@ DEPEND=">=virtual/jdk-1.5"
S="${WORKDIR}/${PN}"
+src_prepare() {
+ default
+}
+
src_install() {
java-pkg_newjar lib/${P}.jar ${PN}.jar
use source && java-pkg_dosrc src
diff --git a/dev-java/zeus-jscl/zeus-jscl-1.64.ebuild
b/dev-java/zeus-jscl/zeus-jscl-1.64.ebuild
deleted file mode 100644
index ba1e0cb..0000000
--- a/dev-java/zeus-jscl/zeus-jscl-1.64.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}_v${PV//./_}"
-
-DESCRIPTION="Zeus Java Swing Components Library"
-HOMEPAGE="http://sourceforge.net/projects/zeus-jscl/";
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND=""
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEPEND}"
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip
- ${COMMON_DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_install() {
- java-pkg_newjar lib/${P}.jar ${PN}.jar
- use source && java-pkg_dosrc src
- use doc && java-pkg_dojavadoc doc/api
-}
