Remove old.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

3 files changed, 12 insertions, 153 deletions

diff --git a/www-servers/axis/ChangeLog b/www-servers/axis/ChangeLog
index 17a0c710f26f..c46562cc653a 100644
--- a/www-servers/axis/ChangeLog
+++ b/www-servers/axis/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-servers/axis
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/axis/ChangeLog,v 1.30 2015/06/15 08:12:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/axis/ChangeLog,v 1.31 2015/06/15 08:16:27 monsieurp Exp $
+
+  15 Jun 2015; Patrice Clement <monsieurp@gentoo.org> -axis-1.4-r1.ebuild:
+  Remove old.
 
   15 Jun 2015; Agostino Sarubbo <ago@gentoo.org> axis-1.4-r2.ebuild:
   Stable for x86, wrt bug #520304
diff --git a/www-servers/axis/Manifest b/www-servers/axis/Manifest
index f7e3277721cc..ff2229cc6c22 100644
--- a/www-servers/axis/Manifest
+++ b/www-servers/axis/Manifest
@@ -9,24 +9,17 @@ AUX axis-1.4-targets.xml.patch 2780 SHA256 ea9f43d279ff90a9848cb1795643009753314
 AUX axis-1.4-tools-build.xml.patch 756 SHA256 90609f01b2ed4a598277ad0459fa27433644f8fc4c8ed6a9d22d0ccd6a84213a SHA512 675e34a60090e7b3c37838caa6599ddbddaa072a6547b5582e69d49564d0daaead646b7cc0e7c51f3d013749745a5be21a195563d05e0736f011b8c9083cee8b WHIRLPOOL db8b5bd5b38653f65bfe24003610aebff3424a6a2867b3713bfa08961023777bda7747feb4329ed68395c1ac5dd526e3d55bdfeee2b7cc2c46e4494eb439b16e
 AUX build.properties 282 SHA256 904c7615612013d7397a7d9580d1b7405f0fb9e3ec70f4a57c0f44b93ccfdfd2 SHA512 917a4c142eb44c630e4db9cfc3c884d3c9eb05e8529510c8ef9581e6b7a20565ea39abbf8aa1cc22b073abb4c600c1a987b148ba1f920f24a115c023e22fd2e5 WHIRLPOOL 48589f24f02d2fce890b9267ec0f3321822ae501cfc1e18e2fff739a8eb2e1bb9070aabeaec7290149b8d26b5e8ff727ed465ccfb344bfb7ec0baa4878467224
 DIST axis-src-1_4.tar.gz 17041546 SHA256 911b4467f3d6cfe2e50fb7baea7a754e6aa717902d6ed91cef78f8f52bef8572 SHA512 7d08212b04702e76c960ad772a475f5765fef7f9ebe0aea3d4b949c6ba28a62500e8a76a43c7364b7caf36b7f27aee8592744256154670c7a24d29c5c1518258 WHIRLPOOL cf359caa9e645bdefb7c2ff012673dc64af9d4cc4bbe2a082cb64bcb0211d3a844ef797738ae1a3e9f978d0bbd8dc42bac9ecbdf4c734dd30ff52da18bdd7a91
-EBUILD axis-1.4-r1.ebuild 4053 SHA256 761e3c4aea8288fc6418d2121b9c12cc9c820e16b761a2ab31b07484fdf11bf9 SHA512 a7355a179ef76f48b755cbf7af126e4238cd8f9487e356fc024897bd162d2396b0038eecc499ab08f14c94ef2af8946baf89b3c53d3a1054d7c6e3f0034b27bb WHIRLPOOL 9ae3eb80b54a5010f0495bf9d2c32344da10a1475f67b4649c9de48432f01a62fdb67d23e7c3279c456146f2023f46e27affcd9861b0a8b880dc97f0f6513068
 EBUILD axis-1.4-r2.ebuild 3977 SHA256 885891900153a900b3547e2d64969f2f5609ccf6d2d371556ab7d9eab7916bda SHA512 a81a4bc698bf75e264a2cc6a596d28a8ab3604d21191664df23eee74af82dbf3f0fec4ee94c8f622b06acfa48054d634af39f9b006b94683439f12653c1e8a89 WHIRLPOOL 6e97620b8889d893dde3c04e5f55302b9ad57e12e7c7d6cf461e7bac53c4a6081662a6428e5b05d984e8fa5eb80e0ebfce09a0db5652bb601f63ea465dd44532
-MISC ChangeLog 4303 SHA256 04f4d40b362d9b28bec229e6aefb2fcc19102e1d95a788a0218f2c9ae6e8980f SHA512 d2caa8ce3eb1a7e5c9a66d28294eb12a0b820d8be212197d07d65a8df753a479ff107360088117d214162e64eaaf399e804a02f0e29e47b2971ea725d638ea9f WHIRLPOOL fbce8c54940d4763976b8ff65acaff99808f1c92b4e132dffdba5d0f5602e339d92e62e528609ebce34f9822fde18f218d4ff4b462476c632aa9d9b16bc91031
+MISC ChangeLog 4399 SHA256 e6fe1c7335b9d3b1857fcb0200eed15108a4e33375347be914b5d18602871afc SHA512 a5a6b7656195c243d84bab574de15cf1d6ac762c8bf55b1801ce65dd8ec3d3d4533b9c67eb1627c33000dd49842b4df81b8e3e05e3fa02c7921af4575d7a5347 WHIRLPOOL 2550fb884b6d6b58e4e1270dde3b040f8a0a3c83ec63c1e58bdbf576587d52f924f31416481073955d4ed5d0dc11573d470bb09f1f769f99fd02175f2c338771
 MISC metadata.xml 742 SHA256 332e698c934cea8ec2bb1ad5600bb7edb69298af92ca92085e3bad370be820ff SHA512 46ae800820ebe071b57a3fc5de573152413399a2db1401d2f9edded1a24f6ae316a019871bef70be04ce45a4103c045b063f59d87399f7f1c466ca3ecbdb1e2f WHIRLPOOL 8a8fb0b6bfbcd3003d3722538439e13d97368a6dd82b21d2cfc2483d8f02c1fabbdb9d7b6113b8f8b294d7d5c584faaf261047fe27244f547ac5025f520b7d61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVfokCAAoJELp701BxlEWf/68P/3ZZPk0sKEqrLTC7fkBvA6Hs
-zSyy7zk020qrrxzIt9qAKGWT43Gf5/FS6kvpa0/BPu+kfCFRdk07yeIblRrRlcuf
-KdV571DUbF91BH4/szf6CpAbJ7fhcQuDEG2rfNJKzHvgicBthWWACaWIGEgafrPU
-kfuvjsQUJGWAMnRsARLaKVQ/PdBXwAlz1j06jhkF4qL0oIlWVypnWNdJGtx0OS4N
-3DPw4DmlzU8EpDxk9XL53tJMqchalm8b5jAuDT7XycTguAw7wEMyqVVwr9JgJBeO
-jdGBwkHZbQZlUPGMq94FtI0Joj/fCUZcBlpMuZwm3GvoXF1NEXAGmFg1S9jf1+vQ
-KCxMhHsOX2lZUuFljQvGPSdem2TVw3S2AeUz8DxbkiZXTIzC4t212Reoq7NgcR+6
-jq+QJ8zq5mzeikq1NSwIrLdqz+dZLLAq6J5KydGRovQuy/U1XLanCHr82h10HBg5
-0vSt9uUj0Tu+HwncpMfVIUr+wf5R2KJTyVg1JJs5mDnGbHLvclju8lXu2rs28qft
-p7elhZsqBrR9DKaUX2Jk+1Jt6cMYDttyC/h4EWLDxIKEoZRnr3Ki97hJcYdtryOI
-F+yvxXe4I+QUaYsYn0+Xbqw2Gb5Q00sqfBw9V7RoW9aZUYJJRasEIIkh7LTES0v/
-/FdkJ/FzLZN6fhz4us4u
-=OMrI
+iQEcBAEBCAAGBQJVfphjAAoJEJGRpfGTSRu4NkIH/j/8vUat8PK711EmJPzc7H0H
+K+jj590UX9X0Nr9+jGwUxiBInxpgqZLpG+Ol6iO6B9qdLXHwnP49DCRuVDqwxTwR
+Sg2G6aWTU4970VE9juj9rl5/nOCobr3hYanTsCyqOLRakrFyJZ7KVCso11puptap
+id6fR9Tc/nE8I/pu6oMKU1GnRn5HTPl8Vqb8Bmb5h0m4kgvhB6VadREdDhlfjX9B
+iEVZ8aKJeOjeNBF74LQwCT06+oH5oVrJOyx1PvOh7NmUDBaCYP3pTcDptv/LNuF8
+153aCS1bmWbX9TzOYy+iKNzLqELMGaLnNQdQb01Dlzr33pw8VU/4SThVKzFxRE0=
+=/pqL
 -----END PGP SIGNATURE-----
diff --git a/www-servers/axis/axis-1.4-r1.ebuild b/www-servers/axis/axis-1.4-r1.ebuild
deleted file mode 100644
index d5e80ef8c9a5..000000000000
--- a/www-servers/axis/axis-1.4-r1.ebuild
+++ /dev/null
@@ -1,137 +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-r1.ebuild,v 1.2 2009/12/10 20:05:30 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
-	${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"
-}