[gentoo-commits] repo/gentoo:master commit in: dev-java/jigsaw/

[gentoo-commits] repo/gentoo:master commit in: dev-java/jigsaw/

[Patrice Clement]

commit:     c374f97ab44de0ceabefcb5c631bfba3c994696c
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  1 18:47:40 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Dec  1 21:20:10 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c374f97a

dev-java/jigsaw: Clean up old.

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

 dev-java/jigsaw/jigsaw-2.2.6-r1.ebuild |  2 +-
 dev-java/jigsaw/jigsaw-2.2.6.ebuild    | 62 ----------------------------------
 2 files changed, 1 insertion(+), 63 deletions(-)

diff --git a/dev-java/jigsaw/jigsaw-2.2.6-r1.ebuild b/dev-java/jigsaw/jigsaw-2.2.6-r1.ebuild
index a376501..58f4df3 100644
--- a/dev-java/jigsaw/jigsaw-2.2.6-r1.ebuild
+++ b/dev-java/jigsaw/jigsaw-2.2.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

diff --git a/dev-java/jigsaw/jigsaw-2.2.6.ebuild b/dev-java/jigsaw/jigsaw-2.2.6.ebuild
deleted file mode 100644
index db4345b..0000000
--- a/dev-java/jigsaw/jigsaw-2.2.6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source"
-
-# Jigsaw is actually a WWW server, it would be nice to package it as such, not
-# as a raw library like this ebuild does.
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="W3 Consortium's Java-based Web server libraries"
-HOMEPAGE="http://jigsaw.w3.org/"
-SRC_URI="http://jigsaw.w3.org/Distrib/${PN}_${PV}.tar.bz2"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-COMMON_DEP="dev-java/jakarta-oro:2.0
-	java-virtuals/servlet-api:2.3
-	dev-java/xerces:2
-	dev-java/jtidy"
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	${COMMON_DEP}"
-
-EANT_DOC_TARGET="javadocs"
-
-S="${WORKDIR}/Jigsaw"
-
-src_prepare() {
-	rm -f classes/*.jar
-	mkdir -p "${S}/jars" || die "mkdir failed"
-
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-
-	java-pkg_jar-from --into jars/ jakarta-oro-2.0
-	java-pkg_jar-from --into jars/ servlet-api-2.3
-	java-pkg_jar-from --into jars/ xerces-2
-	java-pkg_jar-from --into jars/ jtidy
-
-	cd jars/
-	ln -s $(java-config --tools)
-}
-
-src_install() {
-	java-pkg_dojar classes/jigsaw.jar
-	java-pkg_dojar classes/jigadmin.jar
-	java-pkg_dojar classes/jigedit.jar
-
-	use doc && java-pkg_dojavadoc ant.build/javadocs
-
-	dodoc ANNOUNCE README
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/jigsaw/

[Patrice Clement]

commit:     c39ebc99e207e105e7abc000bf0ccf78aa2a973d
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  1 18:47:06 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Dec  1 21:20:06 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c39ebc99

dev-java/jigsaw: EAPI 5 bump.

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

 dev-java/jigsaw/jigsaw-2.2.6-r1.ebuild | 68 ++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/dev-java/jigsaw/jigsaw-2.2.6-r1.ebuild b/dev-java/jigsaw/jigsaw-2.2.6-r1.ebuild
new file mode 100644
index 0000000..a376501
--- /dev/null
+++ b/dev-java/jigsaw/jigsaw-2.2.6-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+# Jigsaw is actually a WWW server, it would be nice to package it as such, not
+# as a raw library like this ebuild does.
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="W3 Consortium's Java-based Web server libraries"
+HOMEPAGE="http://jigsaw.w3.org/"
+SRC_URI="http://jigsaw.w3.org/Distrib/${PN}_${PV}.tar.bz2"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+CDEPEND="
+	dev-java/jtidy:0
+	dev-java/xerces:2
+	dev-java/jakarta-oro:2.0
+	java-virtuals/servlet-api:2.3"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+EANT_DOC_TARGET="javadocs"
+
+S="${WORKDIR}/Jigsaw"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.xml.patch"
+)
+
+java_prepare() {
+	epatch "${PATCHES[@]}"
+
+	java-pkg_clean
+
+	mkdir -p "${S}/jars" || die "mkdir failed"
+
+	java-pkg_jar-from --into jars/ jakarta-oro-2.0
+	java-pkg_jar-from --into jars/ servlet-api-2.3
+	java-pkg_jar-from --into jars/ xerces-2
+	java-pkg_jar-from --into jars/ jtidy
+
+	cd "${S}/jars" || die
+	ln -s $(java-config --tools) || die
+}
+
+src_install() {
+	java-pkg_dojar classes/{jigsaw,jigadmin,jigedit}.jar
+
+	dodoc ANNOUNCE README
+	use doc && java-pkg_dojavadoc ant.build/javadocs
+}