Remove generation 1 ebuild from the tree so that sun-javamail-bin can be package.masked.

Package-Manager: portage-2.1.2.7

4 files changed, 19 insertions, 95 deletions

diff --git a/www-servers/axis/ChangeLog b/www-servers/axis/ChangeLog
index 4e7ed3bfa0d4..46b16aade3ea 100644
--- a/www-servers/axis/ChangeLog
+++ b/www-servers/axis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/axis
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/axis/ChangeLog,v 1.12 2007/05/19 16:53:45 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/axis/ChangeLog,v 1.13 2007/05/19 21:01:32 betelgeuse Exp $
+
+  19 May 2007; Petteri Räty <betelgeuse@gentoo.org> -axis-1.2_rc2.ebuild:
+  Remove generation 1 ebuild from the tree so that sun-javamail-bin can be
+  package.masked.
 
   19 May 2007; Peter Weller <welp@gentoo.org> axis-1.2_rc2-r1.ebuild:
   Stable on amd64 wrt bug 176963
diff --git a/www-servers/axis/Manifest b/www-servers/axis/Manifest
index d0ffe2b4734d..a07343b19c5a 100644
--- a/www-servers/axis/Manifest
+++ b/www-servers/axis/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX axis-1.2-gentoo.patch 2907 RMD160 3397193b83066f3765097f2221feb2ff422e6d3e SHA1 bbf142e26c6ef8c737689eac32bbf48e6cfbeb3f SHA256 b5ddd460fcce1f0baac621f2a745aa59a0a00670759e21628d16a4dcf0e75fcb
 MD5 46179f667d9c1eefb6b60ae7282c049e files/axis-1.2-gentoo.patch 2907
 RMD160 3397193b83066f3765097f2221feb2ff422e6d3e files/axis-1.2-gentoo.patch 2907
@@ -7,21 +10,21 @@ EBUILD axis-1.2_rc2-r1.ebuild 2057 RMD160 1622a5765ceb2645c3e390e1df8fca8dca678a
 MD5 1358efacafd3a4b9378caced998e4619 axis-1.2_rc2-r1.ebuild 2057
 RMD160 1622a5765ceb2645c3e390e1df8fca8dca678af2 axis-1.2_rc2-r1.ebuild 2057
 SHA256 32217d25d55d7e2285862dc134ec8becd8f9354db188aec606cb45f38393e3e8 axis-1.2_rc2-r1.ebuild 2057
-EBUILD axis-1.2_rc2.ebuild 2019 RMD160 2f45a099779abd4f0e4be2a9370f77e2afbd6c3f SHA1 76520f74724dd49ab10f478dedc301d3ad8686b5 SHA256 691d044f080df441a83a6baafafbd2ce39258a22393bd457441e08878a0bcc27
-MD5 0a516c0e1e91e4c84efbcecbe25d8638 axis-1.2_rc2.ebuild 2019
-RMD160 2f45a099779abd4f0e4be2a9370f77e2afbd6c3f axis-1.2_rc2.ebuild 2019
-SHA256 691d044f080df441a83a6baafafbd2ce39258a22393bd457441e08878a0bcc27 axis-1.2_rc2.ebuild 2019
-MISC ChangeLog 1793 RMD160 1e8f01cf129b4d02c8b495936fbb0e8cb6cdc868 SHA1 db21a82b6e198e542f1655341f9f0665ae47103f SHA256 9e37c2eb1aab799d401cc31f022f906d89484775fd0b00da0a3ddedadc34d75e
-MD5 fcc18f8d0fe7fe033ad320e3ba29eca6 ChangeLog 1793
-RMD160 1e8f01cf129b4d02c8b495936fbb0e8cb6cdc868 ChangeLog 1793
-SHA256 9e37c2eb1aab799d401cc31f022f906d89484775fd0b00da0a3ddedadc34d75e ChangeLog 1793
+MISC ChangeLog 1968 RMD160 f8845a3ab79107d248f7f0257e9acc62d073c30b SHA1 fabc79d61c139037846ee04dd84254fd3e444105 SHA256 ee43c84eb72fae2fa2f69147038b7bafc1dc644d030942c5e96b773278d63fc6
+MD5 9106ac81073c9815430872929151c3d4 ChangeLog 1968
+RMD160 f8845a3ab79107d248f7f0257e9acc62d073c30b ChangeLog 1968
+SHA256 ee43c84eb72fae2fa2f69147038b7bafc1dc644d030942c5e96b773278d63fc6 ChangeLog 1968
 MISC metadata.xml 746 RMD160 6fc15c34f66c99b8d9a3ff7a11516b970b7d96e9 SHA1 e90694966220f7c260ab294a8dfb7b53c06059c3 SHA256 ac3423452ff29d47ceb84cea5a23682744d89f0e029c3567bbcf8a858106ae5b
 MD5 aa938bc7f143d74b90cfa34d1ac729ad metadata.xml 746
 RMD160 6fc15c34f66c99b8d9a3ff7a11516b970b7d96e9 metadata.xml 746
 SHA256 ac3423452ff29d47ceb84cea5a23682744d89f0e029c3567bbcf8a858106ae5b metadata.xml 746
-MD5 109cde9f8c57337d766394e1b55ede4e files/digest-axis-1.2_rc2 250
-RMD160 643dcf8488bef39724abf63483bd37bcd6bf49c2 files/digest-axis-1.2_rc2 250
-SHA256 2cefc416820596280ba5180969192f8647507a5b5a3573ebcbb8557240d48f37 files/digest-axis-1.2_rc2 250
 MD5 109cde9f8c57337d766394e1b55ede4e files/digest-axis-1.2_rc2-r1 250
 RMD160 643dcf8488bef39724abf63483bd37bcd6bf49c2 files/digest-axis-1.2_rc2-r1 250
 SHA256 2cefc416820596280ba5180969192f8647507a5b5a3573ebcbb8557240d48f37 files/digest-axis-1.2_rc2-r1 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGT2W0cxLzpIGCsLQRApVVAKCCggQZzfpXeLt3Oww99jFmuJe7igCfe9Js
+faJkC7VYtN81nQeZFVXd0TY=
+=4YuG
+-----END PGP SIGNATURE-----
diff --git a/www-servers/axis/axis-1.2_rc2.ebuild b/www-servers/axis/axis-1.2_rc2.ebuild
deleted file mode 100644
index 01d3e0154f25..000000000000
--- a/www-servers/axis/axis-1.2_rc2.ebuild
+++ /dev/null
@@ -1,80 +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.ebuild,v 1.10 2007/05/08 20:58:39 caster Exp $
-
-inherit eutils java-pkg
-
-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-1.1"
-SLOT="1"
-KEYWORDS="x86 amd64"
-IUSE="debug doc"
-
-RDEPEND=">=virtual/jre-1.4
-		=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-0.9*
-		>=dev-java/sun-jimi-1.0
-		=dev-java/commons-httpclient-2*
-		>=dev-java/bsf-2.3
-		dev-java/sun-jaf-bin
-		dev-java/sun-javamail-bin"
-DEPEND=">=virtual/jdk-1.4
-		${RDEPEND}
-		>=dev-java/ant-1.6"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/axis-1.2-gentoo.patch
-
-	find . -name "*.jar" -exec rm {} \;
-
-	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-bin
-	java-pkg_jar-from servletapi-2.4
-	java-pkg_jar-from sun-javamail-bin
-	java-pkg_jar-from xerces-2
-	java-pkg_jar-from sun-jimi
-	java-pkg_jar-from castor-0.9
-	java-pkg_jar-from commons-httpclient
-	java-pkg_jar-from bsf-2.3
-}
-
-src_compile() {
-	local antflags="compile -Ddeprecation=false -Dbase.path=/opt"
-	use doc && antflags="${antflags} javadocs"
-	use debug && antflags="${antflags} -Ddebug=on"
-	use !debug && antflags="${antflags} -Ddebug=off"
-	ant ${antflags} || die "compilation problem"
-}
-
-src_install() {
-	java-pkg_dojar build/lib/axis*.jar
-	java-pkg_dojar build/lib/jaxrpc.jar
-	java-pkg_dojar build/lib/saaj.jar
-
-	if use doc; then
-		dodoc ${S}/release-notes.html ${S}/release-notes.html ${S}/doc/*
-		java-pkg_dohtml ${S}/build/javadocs/
-	fi
-}
diff --git a/www-servers/axis/files/digest-axis-1.2_rc2 b/www-servers/axis/files/digest-axis-1.2_rc2
deleted file mode 100644
index 798d83ec9502..000000000000
--- a/www-servers/axis/files/digest-axis-1.2_rc2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a5424fcb51e2f3e9ad53db2186185ad6 axis-1_2RC2-src.tar.gz 9888710
-RMD160 3543f87a148b524ccb2c1f5e71f7a22f6cf5d338 axis-1_2RC2-src.tar.gz 9888710
-SHA256 58d34b947c524eeb898a76f0d62020377216ee1173d9c62b70d7b5bb87393ce8 axis-1_2RC2-src.tar.gz 9888710