Revbump to remove dependency on 1.5 jdk - bug #292001.

Package-Manager: portage-2.2_rc48/cvs/Linux x86_64

4 files changed, 163 insertions, 2 deletions

diff --git a/www-servers/axis/ChangeLog b/www-servers/axis/ChangeLog
index f77fecabb5cc..a9ecd54548a4 100644
--- a/www-servers/axis/ChangeLog
+++ b/www-servers/axis/ChangeLog
@@ -1,6 +1,12 @@
 # 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.23 2009/11/01 23:09:17 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/axis/ChangeLog,v 1.24 2009/11/08 21:25:55 caster Exp $
+
+*axis-1.4-r1 (08 Nov 2009)
+
+  08 Nov 2009; Vlastimil Babka <caster@gentoo.org> +axis-1.4-r1.ebuild,
+  +files/axis-1.4-java6.patch:
+  Revbump to remove dependency on 1.5 jdk - bug #292001.
 
 *axis-1.4 (01 Nov 2009)
 
diff --git a/www-servers/axis/Manifest b/www-servers/axis/Manifest
index 53957d7f551b..2071df11d262 100644
--- a/www-servers/axis/Manifest
+++ b/www-servers/axis/Manifest
@@ -1,5 +1,6 @@
 AUX axis-1.2-gentoo.patch 2907 RMD160 3397193b83066f3765097f2221feb2ff422e6d3e SHA1 bbf142e26c6ef8c737689eac32bbf48e6cfbeb3f SHA256 b5ddd460fcce1f0baac621f2a745aa59a0a00670759e21628d16a4dcf0e75fcb
 AUX axis-1.4-build.xml.patch 517 RMD160 831d8d2bbf65da81896b5f23127ae78e16beac4e SHA1 210117032afeaa3c4d82f6da38ba7b4586486d33 SHA256 30d1e9a91ee70113720833678b661554d99d89326a41927f1156e33d7712d952
+AUX axis-1.4-java6.patch 450 RMD160 c06a34617b41b611b57cf054b01ba3715d175de4 SHA1 9a3946e080bd56f43e171a00c28f79235f0a0ceb SHA256 5c00ac2e6944e56dcd428113d9a83fcb36e13c3ad9a9bcb9e4159747f384cd0b
 AUX axis-1.4-path_refs.xml.patch 762 RMD160 3f6a8bb0288842adee09e75d977d1673f5380a22 SHA1 dea66dc8fb494fccbc4e56c29b4ad9891a87ca12 SHA256 940964f57376c042442c9cb2d6d6ca9ca06566abfa06770025cbbedfe0c1ea8a
 AUX axis-1.4-targets.xml.patch 2780 RMD160 f8ecdf60f8285eff52e5946ff738ba305b15bdc9 SHA1 9c3c5693a42f60eddbb9f5aecab823e6ae8921bc SHA256 ea9f43d279ff90a9848cb17956430097533141ada147994d66018c808a66b0e2
 AUX axis-1.4-tools-build.xml.patch 756 RMD160 d62b5c3f7b86e416e52b025ad4527c27743a446b SHA1 3525ee11e6d08a12b588ef599c55b541e68f0b7b SHA256 90609f01b2ed4a598277ad0459fa27433644f8fc4c8ed6a9d22d0ccd6a84213a
@@ -7,6 +8,7 @@ AUX build.properties 282 RMD160 3bd03454c8cf97a39d72584bb52d1babfe86a030 SHA1 f2
 DIST axis-1_2RC2-src.tar.gz 9888710 RMD160 3543f87a148b524ccb2c1f5e71f7a22f6cf5d338 SHA1 b3f5142136790bf4bafe8c47b66b69c46fae5d2c SHA256 58d34b947c524eeb898a76f0d62020377216ee1173d9c62b70d7b5bb87393ce8
 DIST axis-src-1_4.tar.gz 17041546 RMD160 5bf0a7b6c9708b2217ee06e226255766735ce323 SHA1 52b3703c8e807dc212e06b8c216685b4d18f32b5 SHA256 911b4467f3d6cfe2e50fb7baea7a754e6aa717902d6ed91cef78f8f52bef8572
 EBUILD axis-1.2_rc2-r3.ebuild 2059 RMD160 466153f90868e69c5c40aeb64d4113fce56ee10f SHA1 9bcf5b325b9f137f3385b739c63ee2dee638eba4 SHA256 131addfaa00701ed81c175613451355c8ce43732a152f354ac9a7fb5097d3e31
+EBUILD axis-1.4-r1.ebuild 4055 RMD160 e98203b1b222edab175eea5963e54be3ae0dcc41 SHA1 219eb08437b286b6f2cc8b310db3ef36bbdc5d8c SHA256 48a06cf12506ec07564bdc4c8c42e6165102a10f5c731647b5ed5b95be91461b
 EBUILD axis-1.4.ebuild 3688 RMD160 9bbb3f7098b5eaad58941756729501d898676c50 SHA1 20046e364dbf568ba8398a0a3ed7fe7703780956 SHA256 4414c6b9b02eb669cd302126d444a3049530a0d8c5dddbb324916b83d69a5bcf
-MISC ChangeLog 3343 RMD160 0c7e527e1760f462d92672cabd8467381ab1f3c5 SHA1 36f9a3640ffa5720cce8adab55db85afb59c856b SHA256 5ea226d0eca5e25cf9aea06b8b421af81bfd0f5849b6cb79a5e103124a169da4
+MISC ChangeLog 3532 RMD160 747558aa42c8ede948ffde0faf04a59e89745308 SHA1 2efe06552c558f9961a7550974d82fbadcdd6e09 SHA256 0adcbc5f139f3e53090f745d6dd3318ca5cc452d4460f87bbd042dfab7aa611f
 MISC metadata.xml 742 RMD160 8cdf22b8bb2f82933b9c42fb834d0284eab1a708 SHA1 6e907aeb23531d1390c708450bea8699819eaf1d SHA256 332e698c934cea8ec2bb1ad5600bb7edb69298af92ca92085e3bad370be820ff
diff --git a/www-servers/axis/axis-1.4-r1.ebuild b/www-servers/axis/axis-1.4-r1.ebuild
new file mode 100644
index 000000000000..4b6c3c78350c
--- /dev/null
+++ b/www-servers/axis/axis-1.4-r1.ebuild
@@ -0,0 +1,137 @@
+# 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-r1.ebuild,v 1.1 2009/11/08 21:25:55 caster 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
+	${RDEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${RDEPEND}"
+
+# uses enum as identifier
+JAVA_PKG_WANT_SOURCE="1.4"
+JAVA_PKG_WANT_TARGET="1.4"
+
+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"
+	# this clashes with java6 method
+	epatch "${FILESDIR}/${P}-java6.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"
+	mv saaj.jar endorsed/ || die
+	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
+	java-ant_rewrite-bootclasspath auto build.xml "lib/endorsed/xml-apis-2.6.2.jar:lib/endorsed/xercesImpl-2.6.2.jar:lib/endorsed/saaj.jar"
+	sed -i '/<bootclasspath refid="boot.classpath"/d' build.xml || die
+}
+
+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.4-java6.patch b/www-servers/axis/files/axis-1.4-java6.patch
new file mode 100644
index 000000000000..2e9bd4289900
--- /dev/null
+++ b/www-servers/axis/files/axis-1.4-java6.patch
@@ -0,0 +1,16 @@
+--- src/org/apache/axis/i18n/ProjectResourceBundle.java.orig	2006-04-23 03:57:27.000000000 +0200
++++ src/org/apache/axis/i18n/ProjectResourceBundle.java	2009-11-08 19:08:20.000000000 +0100
+@@ -357,13 +357,6 @@
+         return resourceName;
+     }
+ 
+-    /**
+-     * Clears the internal cache
+-     */
+-    public static void clearCache()
+-    {
+-        bundleCache.clear();
+-    }
+     
+     public String toString() {
+         return resourceName;