[gentoo-commits] repo/gentoo:master commit in: dev-java/jdynamite/files/, dev-java/jdynamite/

[Patrice Clement]

commit:     7656ae06b065219d54361b5dbdd2e93ee676f300
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  4 09:43:32 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Nov  4 10:16:22 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7656ae06

dev-java/jdynamite: Switch to java-pkg-simple.eclass.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/jdynamite/files/1.2-build.xml     | 12 -------
 dev-java/jdynamite/jdynamite-1.2-r1.ebuild | 36 ++++++++++++++++++++
 dev-java/jdynamite/jdynamite-1.2.ebuild    | 54 ------------------------------
 3 files changed, 36 insertions(+), 66 deletions(-)

diff --git a/dev-java/jdynamite/files/1.2-build.xml b/dev-java/jdynamite/files/1.2-build.xml
deleted file mode 100644
index 86bd14d..0000000
--- a/dev-java/jdynamite/files/1.2-build.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<project name="jdynamite" default="all" basedir=".">
-
-	<target name="compile">
-		<javac debug="true" srcdir="src" classpath="${gentoo.classpath}" destdir="build"/>
-	</target>
-
-	<target name="jar" depends="compile">
-		<jar destfile="jdynamite.jar" basedir="build"/>
-	</target>
-
-</project>

diff --git a/dev-java/jdynamite/jdynamite-1.2-r1.ebuild b/dev-java/jdynamite/jdynamite-1.2-r1.ebuild
new file mode 100644
index 0000000..dea6e53
--- /dev/null
+++ b/dev-java/jdynamite/jdynamite-1.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PV="${PV/./_}"
+DESCRIPTION="Dynamic Template in Java"
+HOMEPAGE="http://jdynamite.sourceforge.net/doc/jdynamite.html"
+SRC_URI="mirror://sourceforge/${PN}/${PN}${MY_PV}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+CDEPEND="dev-java/gnu-regexp:1"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}${PV}"
+
+JAVA_GENTOO_CLASSPATH="gnu-regexp-1"
+JAVA_SRC_DIR="src/cb/jdynamite"
+
+java_prepare() {
+	rm -fvr "${S}"/{lib/*,cb,src/gnu,build.xml} || die
+}

diff --git a/dev-java/jdynamite/jdynamite-1.2.ebuild b/dev-java/jdynamite/jdynamite-1.2.ebuild
deleted file mode 100644
index 4b84de3..0000000
--- a/dev-java/jdynamite/jdynamite-1.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PV="${PV/./_}"
-DESCRIPTION="Dynamic Template in Java"
-HOMEPAGE="http://jdynamite.sourceforge.net/doc/jdynamite.html"
-SRC_URI="mirror://sourceforge/${PN}/${PN}${MY_PV}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND=">=virtual/jdk-1.2
-	dev-java/gnu-regexp:1"
-RDEPEND=">=virtual/jre-1.2"
-
-S="${WORKDIR}/${PN}${PV}"
-
-# Do not generate docs that don't exist, use bundled.
-EANT_DOC_TARGET=""
-
-java_prepare() {
-	# Yuck! Already compiled!
-	cd "${S}"
-	rm -fr lib/*
-	rm -fr cb
-	rm -fr src/gnu
-
-	cp "${FILESDIR}/${PV}-build.xml" build.xml || die
-	mkdir build || die
-}
-
-src_compile() {
-	EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only gnu-regexp-1 gnu-regexp.jar)"
-
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-
-	if use doc; then
-		java-pkg_dohtml -r doc/*
-	fi
-
-	use source && java-pkg_dosrc src/cb
-}