[gentoo-commits] proj/java:master commit in: dev-java/jakarta-cactus/, dev-java/jakarta-cactus/files/

[gentoo-commits] proj/java:master commit in: dev-java/jakarta-cactus/, dev-java/jakarta-cactus/files/

[James Le Cuirot]

commit:     f28cb3ae4d532f71f9a76f4cc28b17618b416703
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Aug  5 20:36:07 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Aug  5 21:31:22 2015 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=f28cb3ae

[dev-java/jakarta-cactus] Drop, unavailable dependencies

 dev-java/jakarta-cactus/ChangeLog                  |   7 -
 dev-java/jakarta-cactus/Manifest                   |   1 -
 .../files/jakarta-cactus-1.7.2-build.properties    | 257 ---------------------
 .../files/jakarta-cactus-1.7.2-gentoo.patch        |  18 --
 .../jakarta-cactus/jakarta-cactus-1.7.2.ebuild     |  60 -----
 dev-java/jakarta-cactus/metadata.xml               |   6 -
 6 files changed, 349 deletions(-)

diff --git a/dev-java/jakarta-cactus/ChangeLog b/dev-java/jakarta-cactus/ChangeLog
deleted file mode 100644
index 4c83e54..0000000
--- a/dev-java/jakarta-cactus/ChangeLog
+++ /dev/null
@@ -1,7 +0,0 @@
-# ChangeLog for dev-java/jakarta-cactus
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  22 Jan 2009; Alistair Bush <ali_bush@gentoo.org> ChangeLog:
-  Add ChangeLog for QA.
-

diff --git a/dev-java/jakarta-cactus/Manifest b/dev-java/jakarta-cactus/Manifest
deleted file mode 100644
index a4f565d..0000000
--- a/dev-java/jakarta-cactus/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jakarta-cactus-src-1.7.2.zip 2269774 SHA256 02d96de97f690825d65c57a7c0507170c4942af9217da0abb1d39b9e970ed743

diff --git a/dev-java/jakarta-cactus/files/jakarta-cactus-1.7.2-build.properties b/dev-java/jakarta-cactus/files/jakarta-cactus-1.7.2-build.properties
deleted file mode 100644
index 4383b74..0000000
--- a/dev-java/jakarta-cactus/files/jakarta-cactus-1.7.2-build.properties
+++ /dev/null
@@ -1,257 +0,0 @@
-# ========================================================================
-# 
-# Copyright 2001-2004 The Apache Software Foundation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# ========================================================================
-
-# -----------------------------------------------------------------------------
-# build.properties.default
-#
-# This file contains the default values to configure the Cactus build system.
-# You are expected to create a copy of this file named build.properties in 
-# which you'll provide your customization for your local environment (such as
-# defining which container to use for running the Cactus tests, etc).
-#
-# $Id: build.properties.default 366642 2006-01-07 03:13:11Z felipeal $
-# -----------------------------------------------------------------------------
-
-# Note 1:  The relative paths below are relative to the directory where the
-# build.xml file is located.
-
-# Note 2: The libraries defined below can be automatically downloaded by
-# typing "ant -f download.xml".
-
-# -----------------------------------------------------------------------------
-# Mandatory properties shared by several subprojects
-# -----------------------------------------------------------------------------
-
-# Location of the jar repository. This is where the jars are expected to be
-# found. The default format is that of a Maven repository format. However you 
-# can use any location and any format you wish, by tuning the default jar 
-# locations at the bottom of this file.
-lib.repo = ${user.home}/.maven/repository
-
-# The location of the J2EE API jars. Depending on their versions the corresponding
-# Cactus Framework will be built. For example if you use the J2EE 1.3 jars, then 
-# the Cactus jar will contain the Filter Redirector which is only available for
-# Servlet 2.3+ (part of J2EE 1.3+).
-#
-# Valid values are:
-# - J2EE 1.2: j2ee.12.jar, servlet.22.jar, jsp.11.jar
-# - J2EE 1.3: j2ee.13.jar, servlet.23.jar, jsp.12.jar
-# - J2EE 1.4: j2ee.14.jar, servlet.24.jar, jsp.20.jar
-#
-# Note: If you're using J2EE 1.2, you won't be able to automatically download
-# the jar file as it's only available through the Sun website and is not
-# redistributable. You can download it manually here:
-#   http://java.sun.com/j2ee/sdk_1.2.1/
-
-# The J2EE API version to use
-j2ee.jar = ${j2ee.13.jar}
-
-# The Servlet API version to use
-servlet.jar = ${servlet.23.jar}
-
-# The Servlet API version to use
-jsp.jar = ${jsp.12.jar}
-
-# -----------------------------------------------------------------------------
-# Mandatory properties for the Eclipse plugin only
-# -----------------------------------------------------------------------------
-
-# Do we build the Eclipse project as part of the master build? Uncomment
-# to build Eclipse projects.
-#eclipse.build = true
-
-# Location of Eclipse.
-#eclipse.home = D:/dev/eclipse-2.1
-
-# Locations of Eclipse dependent plugin jars
-
-# Example for Eclipse 2.1.2 - Windows platform
-#eclipse.ant.core.jar = ${eclipse.home}/plugins/org.eclipse.ant.core_2.1.1/antsupport.jar
-#eclipse.core.boot.jar = ${eclipse.home}/plugins/org.eclipse.core.boot_2.1.2/boot.jar
-#eclipse.core.resources.jar = ${eclipse.home}/plugins/org.eclipse.core.resources_2.1.1/resources.jar
-#eclipse.core.runtime.jar = ${eclipse.home}/plugins/org.eclipse.core.runtime_2.1.1/runtime.jar
-#eclipse.debug.core.jar = ${eclipse.home}/plugins/org.eclipse.debug.core_2.1.2/dtcore.jar
-#eclipse.debug.ui.jar = ${eclipse.home}/plugins/org.eclipse.debug.ui_2.1.1/dtui.jar
-#eclipse.jdt.core.jar = ${eclipse.home}/plugins/org.eclipse.jdt.core_2.1.2/jdtcore.jar
-#eclipse.jdt.junit.jar = ${eclipse.home}/plugins/org.eclipse.jdt.junit_2.1.1/junitsupport.jar
-#eclipse.jdt.launching.jar = ${eclipse.home}/plugins/org.eclipse.jdt.launching_2.1.1/launching.jar
-#eclipse.jdt.ui.jar = ${eclipse.home}/plugins/org.eclipse.jdt.ui_2.1.2/jdt.jar
-#eclipse.jface.jar = ${eclipse.home}/plugins/org.eclipse.jface_2.1.1/jface.jar
-#eclipse.swt.jar = ${eclipse.home}/plugins/org.eclipse.swt.win32_2.1.2/ws/win32/swt.jar
-#eclipse.ui.externaltools.jar = ${eclipse.home}/plugins/org.eclipse.ui.externaltools_2.1.1/externaltools.jar
-#eclipse.ui.workbench.jar = ${eclipse.home}/plugins/org.eclipse.ui.workbench_2.1.1/workbench.jar
-
-# -----------------------------------------------------------------------------
-# Optional properties share by several subprojects
-# -----------------------------------------------------------------------------
-
-# Should we instrument our code with Clover (test coverage tool)?
-# For this to work, the clover.jar needs to be in ANTHOME/lib.
-# Comment out to disable Clover (setting the property to false will have no
-# effect).
-#clover.enable = true
-
-# -----------------------------------------------------------------------------
-# Optional properties for the Servlet Sample subproject
-# -----------------------------------------------------------------------------
-
-# The port to use for starting the servers during unit testing. If not
-# specified, it defaults to port 8080.
-#cactus.port = 8081
-
-# Servlet engine locations for the tests
-
-# Note: If you don't want to run the test on a given servlet engine, just
-#       comment it's home property. For example, if you don't want to run the
-#       tests on Resin 2.x, comment the "cactus.home.resin2x" property.
-
-#cactus.home.resin2x = c:/Apps/resin-2.1.14
-#cactus.home.resin3x = c:/Apps/resin-3.0.9
-#cactus.home.tomcat3x = c:/Apps/jakarta-tomcat-3.3.2
-#cactus.home.tomcat4x = c:/Apps/jakarta-tomcat-4.1.31
-#cactus.home.tomcat5x = c:/Apps/jakarta-tomcat-5.0.29
-#cactus.home.orion1x = c:/Apps/orion-1.6.0b
-#cactus.home.orion2x = c:/Apps/orion-2.0.4
-#cactus.home.jboss3x = c:/Apps/jboss-3.2.6
-#cactus.home.weblogic7x = c:/bea/weblogic700
-
-# -----------------------------------------------------------------------------
-# Optional properties for the Servlet Documentation subproject
-# -----------------------------------------------------------------------------
-
-# Decide whether or not to include the javadoc from the other subprojects in
-# the web site. This is an option useful for reducing web site build time as
-# javadoc do not need to be always updated. Uncomment to activate inclusion
-# of javadoc.
-#javadoc.include = true
-
-# Properties needed to upload the documentation to the Cactus web site
-#jakarta.username = vmassol
-#scp = pscp
-#ssh = tortoisePlink
-
-# -----------------------------------------------------------------------------
-# Optional properties for downloading the jar libraries
-# -----------------------------------------------------------------------------
-
-# If you're behind a firewall set the following properties
-proxyhost = 
-proxyuser = 
-proxypassword =
-proxyport = 80
-
-# -----------------------------------------------------------------------------
-# Properties that could be changed but you shouldn't bother touching. They 
-# define the location of the jar libraries used by the build scripts. These 
-# properties are also used by the download.xml Ant script to download the 
-# corresponding jars and to put them in the locations defined below.
-# -----------------------------------------------------------------------------
-
-# List all available J2EE API versions. Note that it is required to list all
-# versions if you wish to call "ant release" in jakarta-cactus. If you only
-# wish to build a single Cactus project you only need to list the version you
-# wish to use.
-# Note: If you're using J2EE 1.2, you won't be able to automatically download
-# the jar file as it's only available through the Sun website and is not
-# redistributable. You'll need to manually download it (from 
-# http://java.sun.com/j2ee/sdk_1.2.1/) and put in ${j2ee.12.jar}.
-j2ee.12.jar = ${basedir}/lib/j2ee-1.2.jar
-j2ee.13.jar = ${basedir}/lib/j2ee-1.3.jar
-j2ee.14.jar = ${basedir}/lib/j2ee-1.4.jar
-# j2ee.13 is distributed in order to run the examples, so it must be an
-# ASL2-compliant JAR
-j2ee-dist.13.jar = ${basedir}/lib/j2ee-1.3.jar
-
-# List all available Servlet versions. Note that it is required to list all
-# versions if you wish to call "ant release" in jakarta-cactus. If you only
-# wish to build a single Cactus project you only need to list the version you
-# wish to use.
-servlet.22.jar = ${basedir}/lib/servlet-2.2.jar
-servlet.23.jar = ${basedir}/lib/servlet-2.3.jar
-servlet.24.jar = ${basedir}/lib/servlet-2.4.jar
-
-# List all available JSP versions. Note that it is required to list all
-# versions if you wish to call "ant release" in jakarta-cactus. If you only
-# wish to build a single Cactus project you only need to list the version you
-# wish to use.
-jsp.11.jar = ${basedir}/lib/servlet-2.2.jar
-jsp.12.jar = ${basedir}/lib/servlet-2.3.jar
-jsp.20.jar = ${basedir}/lib/jsp-2.0.jar
-
-# The location of the Cargo jar
-cargo.jar = ${basedir}/lib/cargo.jar
-
-# The location of the Commons Logging jar
-commons.logging.jar = ${basedir}/lib/commons-logging.jar
-
-# The location of the log4j jar
-log4j.jar = ${basedir}/lib/log4j.jar
-
-# The location of the Commons Httpclient jar
-commons.httpclient.jar = ${basedir}/lib/commons-httpclient.jar
-
-# The location of the AspectJ runtime jar
-aspectjrt.jar = ${basedir}/lib/aspectjrt.jar
-
-# The location of the Junit jar
-junit.jar = ${basedir}/lib/junit.jar
-
-# The location of the MockObjects jar (needed for our unit tests)
-mockobjects.jar = ${basedir}/lib/mockobjects.jar
-
-# The location of the JSTL jar
-jstl.jar = ${basedir}/lib/jstl.jar
- 
-# The location of the JSTL jar
-standard.jar = ${basedir}/lib/standard.jar
-
-# The location of the Httpunit jar
-httpunit.jar = ${basedir}/lib/httpunit.jar
-
-# Neko HTML (required by HttpUnit)
-nekohtml.jar = ${basedir}/lib/nekohtml.jar
-
-# Xerces (required by HttpUnit)
-xerces.jar = ${basedir}/lib/xerces.jar
-
-# XML Parsers API (required by HttpUnit)
-xmlapis.jar = ${basedir}/lib/xml-apis.jar
-
-# The location of the Jetty jar
-jetty.jar = ${lib.repo}/${jetty.project}/jars/${jetty.artifact}-${jetty.version}.jar
-
-# The location of the Jasper compiler jar (provided with Tomcat). Required for 
-# the Jetty sample.
-jasper-compiler.jar = ${lib.repo}/${jasper-compiler.project}/jars/${jasper-compiler.artifact}-${jasper-compiler.version}.jar
-
-# The location of the Jasper runtime jar (provided with Tomcat). Required for 
-# the Jetty sample.
-jasper-runtime.jar = ${lib.repo}/${jasper-runtime.project}/jars/${jasper-runtime.artifact}-${jasper-runtime.version}.jar
-
-# The location of the AspectJ tools jar.
-aspectj-tools.jar = ${basedir}/lib/aspectj-tools.jar
-
-# Dependencies for Checkstyle code auditing.
-antlr.jar = ${basedir}/lib/antlr.jar
-checkstyle.jar = ${basedir}/lib/checkstyle.jar
-commons.beanutils.jar = ${basedir}/lib/commons-beanutils.jar
-commons.collections.jar = ${basedir}/lib/commons-collections.jar
-regexp.jar = ${basedir}/lib/regexp.jar
-
-# Clover jar. This is required if clover is enabled (i.e. clover.enable is defined)
-clover.jar = ${basedir}/lib/clover.jar

diff --git a/dev-java/jakarta-cactus/files/jakarta-cactus-1.7.2-gentoo.patch b/dev-java/jakarta-cactus/files/jakarta-cactus-1.7.2-gentoo.patch
deleted file mode 100644
index a6e98ff..0000000
--- a/dev-java/jakarta-cactus/files/jakarta-cactus-1.7.2-gentoo.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Pouze v jakarta-cactus-src-1.7.2: build.properties
-diff -ru jakarta-cactus-src-1.7.2.original/framework/build.xml jakarta-cactus-src-1.7.2/framework/build.xml
---- jakarta-cactus-src-1.7.2.original/framework/build.xml	2006-11-04 15:43:31.000000000 +0100
-+++ jakarta-cactus-src-1.7.2/framework/build.xml	2006-11-04 17:52:08.000000000 +0100
-@@ -153,9 +153,11 @@
-       </and>
-     </condition>
- 
-+    <!--
-     <fail unless="properties.ok">One or more required dependencies could not
- be resolved. Please check you build.properties file, and run Ant with the 
- -verbose option for more details</fail>
-+    -->
- 
-   </target>
- 
-Pouze v jakarta-cactus-src-1.7.2/framework: target-13
-Pouze v jakarta-cactus-src-1.7.2: lib

diff --git a/dev-java/jakarta-cactus/jakarta-cactus-1.7.2.ebuild b/dev-java/jakarta-cactus/jakarta-cactus-1.7.2.ebuild
deleted file mode 100644
index 52f0d28..0000000
--- a/dev-java/jakarta-cactus/jakarta-cactus-1.7.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header$
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Cactus is a simple test framework for unit testing server-side java code (Servlets, EJBs, Tag Libs, Filters, ...)."
-HOMEPAGE="http://jakarta.apache.org/cactus/"
-SRC_URI="mirror://apache/jakarta/cactus/source/${PN}-src-${PV}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc source"
-
-COMMON_DEPEND="
-	>=dev-java/aspectj-1.2
-	=dev-java/commons-httpclient-2*
-	>=dev-java/commons-logging-1.0.3
-	=dev-java/junit-3.8*
-	=dev-java/sun-j2ee-1.3*
-	"
-DEPEND="=virtual/jdk-1.4*
-	app-arch/unzip
-	dev-java/ant-core
-	source? ( app-arch/zip )
-	${COMMON_DEPEND}"
-RDEPEND="=virtual/jre-1.4*
-	${COMMON_DEPEND}"
-
-S="${WORKDIR}/${PN}-src-${PV}"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-gentoo.patch
-	cp ${FILESDIR}/${P}-build.properties ${S}/build.properties
-
-	mkdir ${S}/lib && cd ${S}/lib
-	java-pkg_jar-from aspectj aspectjrt.jar
-	java-pkg_jar-from aspectj aspectjtools.jar aspectj-tools.jar
-	java-pkg_jar-from commons-httpclient
-	java-pkg_jar-from commons-logging commons-logging.jar
-	java-pkg_jar-from junit
-	java-pkg_jar-from sun-j2ee-1.3 j2ee.jar j2ee-1.3.jar
-}
-
-src_compile() {
-	cd ${S}/framework
-	eant jar $(use_doc doc)
-}
-
-src_install() {
-	java-pkg_newjar framework/target-13/cactus-${PV}.jar ${PN}.jar
-
-	dodoc README
-	java-pkg_dohtml *.html
-	use doc && java-pkg_dohtml -r framework/target-13/doc/api
-	use source && java-pkg_dosrc framework/src/java/*
-}

diff --git a/dev-java/jakarta-cactus/metadata.xml b/dev-java/jakarta-cactus/metadata.xml
deleted file mode 100644
index 604e0a4..0000000
--- a/dev-java/jakarta-cactus/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>java</herd>
-</pkgmetadata>
-