Remove old.

(Portage version: 2.2_rc61/cvs/Linux x86_64)

4 files changed, 6 insertions, 290 deletions

diff --git a/www-servers/axis/ChangeLog b/www-servers/axis/ChangeLog
index b06d3466e463..08f4718de6df 100644
--- a/www-servers/axis/ChangeLog
+++ b/www-servers/axis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/axis
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/axis/ChangeLog,v 1.26 2009/12/10 20:05:30 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/axis/ChangeLog,v 1.27 2010/01/22 11:32:51 caster Exp $
+
+  22 Jan 2010; Vlastimil Babka <caster@gentoo.org> -axis-1.2_rc2-r3.ebuild,
+  -files/axis-1.2-gentoo.patch, -axis-1.4.ebuild:
+  Remove old.
 
   10 Dec 2009; Markus Meier <maekke@gentoo.org> axis-1.4-r1.ebuild:
   amd64/x86 stable, bug #296234
diff --git a/www-servers/axis/axis-1.2_rc2-r3.ebuild b/www-servers/axis/axis-1.2_rc2-r3.ebuild
deleted file mode 100644
index a332ab9be638..000000000000
--- a/www-servers/axis/axis-1.2_rc2-r3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/axis/axis-1.2_rc2-r3.ebuild,v 1.3 2007/11/24 19:29:49 drac Exp $
-
-WANT_ANT_TASKS="ant-nodeps"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PV="${PV//./_}"
-MY_PV="${MY_PV/_rc2/RC2}"
-MY_P="${PN}-${MY_PV}"
-SRCFILE="${MY_P}-src.tar.gz"
-DESCRIPTION="Apache Axis SOAP implementation"
-HOMEPAGE="http://ws.apache.org/axis/"
-SRC_URI="mirror://apache/ws/${PN}/${MY_PV}/${SRCFILE}"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="amd64 x86"
-IUSE="debug doc"
-
-COMMON_DEPEND="
-		=dev-java/servletapi-2.4*
-		dev-java/commons-logging
-		dev-java/commons-discovery
-		dev-java/log4j
-		dev-java/wsdl4j
-		>=dev-java/xerces-2.7
-		=dev-java/rhino-1.5*
-		>=dev-java/castor-1.0
-		>=dev-java/sun-jimi-1.0
-		=dev-java/commons-httpclient-3*
-		>=dev-java/bsf-2.3
-		dev-java/sun-jaf
-		dev-java/sun-javamail"
-RDEPEND="
-		>=virtual/jre-1.4
-		${COMMON_DEPEND}"
-DEPEND="=virtual/jdk-1.4*
-		${COMMON_DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/axis-1.2-gentoo.patch"
-
-	find . -name "*.jar" -exec rm -v {} \;
-
-	cd "${S}/lib"
-	java-pkg_jar-from commons-discovery
-	java-pkg_jar-from commons-logging
-	java-pkg_jar-from log4j
-	java-pkg_jar-from wsdl4j
-	java-pkg_jar-from sun-jaf
-	java-pkg_jar-from servletapi-2.4
-	java-pkg_jar-from sun-javamail
-	java-pkg_jar-from xerces-2
-	java-pkg_jar-from sun-jimi
-	java-pkg_jar-from castor-1.0
-	java-pkg_jar-from commons-httpclient-3
-	java-pkg_jar-from bsf-2.3
-}
-
-src_compile() {
-	local antflags="compile -Ddeprecation=false -Dbase.path=/opt"
-	use debug && antflags="${antflags} -Ddebug=on"
-	use !debug && antflags="${antflags} -Ddebug=off"
-	# has prebuild javadocs
-	eant ${antflags}
-}
-
-src_install() {
-	java-pkg_dojar build/lib/axis*.jar
-	java-pkg_dojar build/lib/jaxrpc.jar
-	java-pkg_dojar build/lib/saaj.jar
-
-	dohtml release-notes.html changelog.html || die
-	if use doc; then
-		java-pkg_dohtml -r docs/*
-		dosym /usr/share/doc/${PF}/html/{apiDocs,api} || die
-	fi
-}
diff --git a/www-servers/axis/axis-1.4.ebuild b/www-servers/axis/axis-1.4.ebuild
deleted file mode 100644
index ed720dd807f6..000000000000
--- a/www-servers/axis/axis-1.4.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/axis/axis-1.4.ebuild,v 1.2 2009/11/09 17:19:18 maekke Exp $
-
-EAPI=2
-WANT_ANT_TASKS="ant-nodeps ant-trax"
-JAVA_PKG_IUSE="doc source examples"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PV="${PV//./_}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Apache's Axis1 implementation of the SOAP (Simple Object Access Protocol)"
-HOMEPAGE="http://ws.apache.org/axis/index.html"
-SRC_URI="mirror://apache/ws/${PN}/${MY_PV}/${PN}-src-${MY_PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND="
-	dev-java/commons-discovery:0
-	dev-java/wsdl4j:0
-	dev-java/sun-jaf:0
-	dev-java/commons-logging:0
-	java-virtuals/javamail:0
-	dev-java/bsf:2.3
-	dev-java/castor:1.0
-	dev-java/commons-httpclient:3
-	dev-java/commons-net:0
-	dev-java/sun-jimi:0
-	dev-java/servletapi:2.4
-	dev-java/saaj:0
-	dev-java/jax-rpc:0
-	dev-java/log4j:0
-	dev-java/xml-commons:0
-	dev-java/xml-xmlbeans:1"
-
-DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )
-	${RDEPEND}"
-RDEPEND=">=virtual/jre-1.4
-	${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-AXIS_NAME="${PN}-${SLOT}"
-
-# not declared mandatory but fails without it
-# mailapi.jar would be enough but that's only in -bin, mail.jar superseedes
-EANT_GENTOO_CLASSPATH="sun-jaf,javamail,log4j,xml-xmlbeans-1,servletapi-2.4,bsf-2.3,sun-jimi,commons-httpclient-3,castor-1.0,xml-commons,commons-net"
-EANT_EXTRA_ARGS="-Ddeprecation=false -Dbase.path=/opt
--Dservlet.jar=servlet-api.jar -Dwsdl4j-1.5.1.jar=wsdl4j.jar
--Dcommons-logging-1.0.4.jar=commons-logging.jar"
-EANT_BUILD_TARGET="compile"
-EANT_DOC_TARGET="javadocs"
-EANT_NEEDS_TOOLS="true"
-
-#TODO-tests require Atlassian clover, need to figure out which ones
-RESTRICT="test"
-
-java_prepare() {
-	# remove some <copy> actions
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-	# remove exact lib paths and global java.classpath from classpath
-	epatch "${FILESDIR}/${P}-path_refs.xml.patch"
-	# add missing target to javac, xml rewriting would break entities
-	epatch "${FILESDIR}/${P}-tools-build.xml.patch"
-	# remove most of <available> checks
-	epatch "${FILESDIR}/${P}-targets.xml.patch"
-	# and replace them with predefined properties
-	cp "${FILESDIR}/build.properties" . \
-		|| die "failed to copy build.properties from ${FILESDIR}"
-
-	rm -rf "${S}"/docs/apiDocs || die
-
-	#Remove test till they are working
-	rm -rf "${S}"/test || die
-	#cd "${S}"/test
-	#mv build_ant.xml build.xml
-	cd "${S}"/webapps/axis/WEB-INF/lib
-	rm -v *.jar || die
-
-	cd "${S}/lib"
-	rm -v *.jar || die
-	java-pkg_jar-from --build-only ant-core
-	java-pkg_jar-from wsdl4j wsdl4j.jar
-	java-pkg_jar-from commons-logging commons-logging.jar
-	java-pkg_jar-from commons-discovery commons-discovery.jar
-
-	if use debug; then
-		EANT_EXTRA_ARGS+=" -Ddebug=on"
-	else
-		EANT_EXTRA_ARGS+=" -Ddebug=off"
-	fi
-
-	cd "${S}"
-	java-ant_rewrite-classpath
-}
-
-src_install() {
-	dodir /usr/share/${AXIS_NAME}
-	mv build/lib/axis-ant.jar build/lib/ant-axis.jar || die
-	java-pkg_dojar build/lib/axis.jar
-	java-pkg_dojar build/lib/ant-axis.jar
-	java-pkg_dojar build/lib/jaxrpc.jar
-	java-pkg_register-ant-task
-	dodir /usr/share/${AXIS_NAME}/webapps
-
-	cp -pR "${S}"/webapps/axis "${D}"/usr/share/${AXIS_NAME}/webapps || die
-
-	dodoc NOTICE README
-	dohtml release-notes.html changelog.html
-
-	if use doc; then
-		java-pkg_dojavadoc build/javadocs/
-		dohtml -r docs/*
-		dodoc xmls/*
-	fi
-
-	use source && java-pkg_dosrc src
-	use examples && java-pkg_doexamples samples
-}
-
-pkg_postinst() {
-	elog "Please note that this package is mainly a dependency library. Contributions"
-	elog "to webapp packaging welcome at https://bugs.gentoo.org/show_bug.cgi?id=89556"
-}
diff --git a/www-servers/axis/files/axis-1.2-gentoo.patch b/www-servers/axis/files/axis-1.2-gentoo.patch
deleted file mode 100644
index 96a9ef2a6c70..000000000000
--- a/www-servers/axis/files/axis-1.2-gentoo.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- build.xml.orig	2004-12-25 15:05:17.518651328 +0100
-+++ build.xml	2004-12-25 15:10:40.325577216 +0100
-@@ -83,6 +83,14 @@
-   &taskdefs;

-   &targets;

- 

-+  

-+  <path id="axis-classpath">

-+        <pathelement path="${classpath}" />

-+        <fileset dir="lib">

-+                <include name="**/*.jar" />

-+        </fileset>

-+  </path>  

-+  

-   <!-- =================================================================== -->

-   <!-- Compiles the source directory                                       -->

-   <!-- =================================================================== -->

-@@ -91,10 +99,7 @@
-     <depend srcdir="${src.dir}" destdir="${build.dest}"

-             cache="${build.dir}/dependencycache" closure="no">

-     </depend>  

--    <javac srcdir="${src.dir}" destdir="${build.dest}"  nowarn="${nowarn}" debug="${debug}"

--      deprecation="${deprecation}" 

--      source="${source}"

--      classpathref="classpath">

-+    <javac srcdir="${src.dir}" destdir="${build.dest}"  nowarn="${nowarn}" debug="${debug}" deprecation="${deprecation}" source="${source}" classpathref="axis-classpath">

-       <exclude name="**/old/**/*" />

-       <exclude name="**/bak/**"/>

-       <exclude name="**/org/apache/axis/components/net/JDK14*.java" unless="jdk14.jsse.present"/>

-@@ -223,12 +228,6 @@
-         </section>

-       </manifest>

-     </jar>

--    <copy file="${wsdl4j.jar}" toDir="${build.lib}"/>

--    <copy file="${commons-logging.jar}" toDir="${build.lib}"/>

--    <copy file="${commons-discovery.jar}" toDir="${build.lib}"/>

--    <copy file="${log4j-core.jar}" toDir="${build.lib}"/>

--    <copy file="${src.dir}/log4j.properties"

--          toDir="${build.lib}"/>

- 

-      <!--  Build the new org.apache.axis.tools.ant stuff -->

-      <mkdir dir="${axis.home}/tools/lib" />

-@@ -272,7 +271,7 @@
- 

-   <path id="test-classpath">

-     <pathelement location="${build.dest}" />

--    <path refid="classpath"/>

-+    <path refid="axis-classpath"/>

-   </path>

- 

-   <target name="buildTest" depends="compile" if="junit.present" unless="tests.built">

-@@ -312,7 +311,7 @@
-       debug="${debug}"

-       source="${source}"

-       deprecation="${deprecation}"

--      classpathref="classpath">

-+      classpathref="axis-classpath">

-       <include name="*.java"/>

-     </javac>

-   </target>

-@@ -362,11 +361,12 @@
-     <mkdir dir="${build.javadocs}"/>

-     <javadoc packagenames="${packages}"

-              sourcepath="${src.dir}"

--             classpathref="classpath"

-+             classpathref="axis-classpath"

-              destdir="${build.javadocs}"

-              author="true"

-              version="true"

--             use="true"

-+	     use="true"

-+	     source="${source}"

-              windowtitle="${Name} API"

-              doctitle="${Name}"

-              bottom="Copyright &#169; ${year} Apache Web Services Project. All Rights Reserved."