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

[Patrice Clement]

commit:     4ae81d96daef359a9617c78967de8bd148cfe763
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  6 11:16:22 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Oct  6 15:34:19 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ae81d96

dev-java/commons-jelly: Clean up old.

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

 dev-java/commons-jelly/commons-jelly-1.0-r5.ebuild | 66 ----------------------
 dev-java/commons-jelly/commons-jelly-1.0-r6.ebuild | 66 ----------------------
 2 files changed, 132 deletions(-)

diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r5.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r5.ebuild
deleted file mode 100644
index cefc420..0000000
--- a/dev-java/commons-jelly/commons-jelly-1.0-r5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_P="${P}-src"
-DESCRIPTION="A Java and XML based scripting and processing engine"
-HOMEPAGE="http://commons.apache.org/jelly/"
-SRC_URI="mirror://apache/jakarta/commons/jelly/source/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/commons-beanutils:1.7
-	dev-java/commons-cli:1
-	dev-java/commons-collections:0
-	dev-java/commons-discovery:0
-	dev-java/commons-jexl:1.0
-	dev-java/commons-lang:0
-	dev-java/commons-logging:0
-	dev-java/dom4j:1
-	dev-java/jakarta-jstl:0
-	dev-java/jaxen:1.1
-	dev-java/junit:0
-	java-virtuals/servlet-api:2.5"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.4"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.4
-	test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-java_prepare() {
-	# disables dependency fetching, and remove tests as a dependency of jar
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_EXTRA_ARGS="-Dlibdir=."
-EANT_GENTOO_CLASSPATH="
-	commons-beanutils-1.7,commons-cli-1,commons-collections,commons-discovery
-	commons-jexl-1.0,commons-lang,commons-logging,dom4j-1,jakarta-jstl
-	jaxen-1.1,junit,servlet-api-2.5"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-
-	dodoc NOTICE.txt README.txt RELEASE-NOTES.txt || die
-
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}

diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r6.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r6.ebuild
deleted file mode 100644
index 0aca101..0000000
--- a/dev-java/commons-jelly/commons-jelly-1.0-r6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_P="${P}-src"
-DESCRIPTION="A Java and XML based scripting and processing engine"
-HOMEPAGE="http://commons.apache.org/jelly/"
-SRC_URI="mirror://apache/jakarta/commons/jelly/source/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/commons-beanutils:1.7
-	dev-java/commons-cli:1
-	dev-java/commons-collections:0
-	dev-java/commons-discovery:0
-	dev-java/commons-jexl:1.0
-	dev-java/commons-lang:0
-	dev-java/commons-logging:0
-	dev-java/dom4j:1
-	dev-java/tomcat-jstl-spec:1.2.5
-	dev-java/jaxen:1.1
-	dev-java/junit:0
-	java-virtuals/servlet-api:2.5"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.4"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.4
-	test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-java_prepare() {
-	# disables dependency fetching, and remove tests as a dependency of jar
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_EXTRA_ARGS="-Dlibdir=."
-EANT_GENTOO_CLASSPATH="
-	commons-beanutils-1.7,commons-cli-1,commons-collections,commons-discovery
-	commons-jexl-1.0,commons-lang,commons-logging,dom4j-1,tomcat-jstl-spec-1.2.5
-	jaxen-1.1,junit,servlet-api-2.5"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-
-	dodoc NOTICE.txt README.txt RELEASE-NOTES.txt || die
-
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}