remove broken + keyword x86

7 files changed, 9 insertions, 259 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 468c545d2433..a2d6cf30807e 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,28 +1,15 @@
 # ChangeLog for net-www/tomcat
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.4 2004/09/03 15:58:51 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.5 2004/09/03 16:27:04 axxo Exp $
 
-  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
-  tomcat-3.3.2-r2.ebuild, tomcat-4.1.30-r4.ebuild, tomcat-4.1.30-r5.ebuild,
-  tomcat-5.0.27-r3.ebuild, tomcat-5.0.27-r4.ebuild:
-  Masked tomcat-5.0.27-r4.ebuild stable for ppc
+  03 Sep 2004; Thomas Matthijs <axxo@gentoo.org> tomcat-3.3.2-r2.ebuild,
+  -tomcat-4.1.30-r4.ebuild, tomcat-4.1.30-r5.ebuild, -tomcat-5.0.27-r3.ebuild:
+  remove broken + keyword x86
 
   03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   tomcat-3.3.2-r2.ebuild, tomcat-4.1.30-r4.ebuild, tomcat-4.1.30-r5.ebuild,
   tomcat-5.0.27-r3.ebuild:
-  Masked tomcat-5.0.27-r3.ebuild stable for ppc
-
-  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
-  tomcat-3.3.2-r2.ebuild, tomcat-4.1.30-r4.ebuild, tomcat-4.1.30-r5.ebuild:
-  Masked tomcat-4.1.30-r5.ebuild stable for ppc
-
-  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
-  tomcat-3.3.2-r2.ebuild, tomcat-4.1.30-r4.ebuild:
-  Masked tomcat-4.1.30-r4.ebuild stable for ppc
-
-  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
-  tomcat-3.3.2-r2.ebuild:
-  Masked tomcat-3.3.2-r2.ebuild stable for ppc
+  Masked stable for ppc
 
   01 Sep 2004; Thomas Matthijs <axxo@gentoo.org> tomcat-4.1.30-r5.ebuild,
   tomcat-5.0.27-r4.ebuild:
diff --git a/www-servers/tomcat/files/digest-tomcat-4.1.30-r4 b/www-servers/tomcat/files/digest-tomcat-4.1.30-r4
deleted file mode 100644
index a1651a599a01..000000000000
--- a/www-servers/tomcat/files/digest-tomcat-4.1.30-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ff27f6a5900768c1aafab4a68675b2ed jakarta-tomcat-4.1.30.tar.gz 7894019
diff --git a/www-servers/tomcat/files/digest-tomcat-5.0.27-r3 b/www-servers/tomcat/files/digest-tomcat-5.0.27-r3
deleted file mode 100644
index f96d1cd9d33a..000000000000
--- a/www-servers/tomcat/files/digest-tomcat-5.0.27-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b802ee042677e284bcf65738c7bdc3b6 jakarta-tomcat-5.0.27.tar.gz 10298374
diff --git a/www-servers/tomcat/tomcat-3.3.2-r2.ebuild b/www-servers/tomcat/tomcat-3.3.2-r2.ebuild
index 69a5ec174866..bc861aa9d377 100644
--- a/www-servers/tomcat/tomcat-3.3.2-r2.ebuild
+++ b/www-servers/tomcat/tomcat-3.3.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-3.3.2-r2.ebuild,v 1.2 2004/09/03 15:58:51 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-3.3.2-r2.ebuild,v 1.3 2004/09/03 16:27:04 axxo Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ S=${WORKDIR}/jakarta-${P}
 SLOT="${PV/.*}"
 SRC_URI="mirror://apache/jakarta/tomcat-${SLOT}/v${PV}/bin/${JT_P}"
 HOMEPAGE="http://jakarta.apache.org/tomcat"
-KEYWORDS="~x86 ppc ~sparc ~alpha"
+KEYWORDS="x86 ppc ~sparc ~alpha"
 LICENSE="Apache-2.0"
 DEPEND="sys-apps/sed"
 RDEPEND=">=virtual/jdk-1.3
diff --git a/www-servers/tomcat/tomcat-4.1.30-r4.ebuild b/www-servers/tomcat/tomcat-4.1.30-r4.ebuild
deleted file mode 100644
index bf25099c187a..000000000000
--- a/www-servers/tomcat/tomcat-4.1.30-r4.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-4.1.30-r4.ebuild,v 1.2 2004/09/03 15:58:51 pvdabeel Exp $
-
-inherit eutils
-
-DESCRIPTION="Apache Servlet-2.3/JSP-1.2 Container"
-
-JT_P="jakarta-${P}.tar.gz"
-S=${WORKDIR}/jakarta-${P}
-SLOT="${PV/.*}"
-SRC_URI="mirror://apache/jakarta/tomcat-${SLOT}/v${PV}/bin/${JT_P}"
-HOMEPAGE="http://jakarta.apache.org/tomcat"
-KEYWORDS="~x86 ppc ~sparc ~alpha"
-LICENSE="Apache-2.0"
-DEPEND="sys-apps/sed"
-RDEPEND=">=virtual/jdk-1.3
-		jikes? ( dev-java/jikes )"
-IUSE="doc jikes"
-
-TOMCAT_HOME="/opt/${PN}${SLOT}"
-TOMCAT_NAME="${PN}${SLOT}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}/gentoo.diff
-	use jikes && epatch ${FILESDIR}/${PV}/jikes.diff
-}
-
-src_install() {
-	dodoc RELEASE* RUNNING.txt LICENSE
-
-	# INIT SCRIPTS AND ENV
-	insinto /etc/init.d
-	insopts -m0750
-	newins ${FILESDIR}/${PV}/tomcat.init ${TOMCAT_NAME}
-
-	insinto /etc/conf.d
-	insopts -m0644
-	newins ${FILESDIR}/${PV}/tomcat.conf ${TOMCAT_NAME}
-	use jikes && sed -e "\cCATALINA_OPTScaCATALINA_OPTS=\"-Dbuild.compiler.emacs=true\"" -i ${D}/etc/conf.d/${TOMCAT_NAME}
-
-	diropts -m750
-	dodir ${TOMCAT_HOME} /var/log/${TOMCAT_NAME} /etc/${TOMCAT_NAME}
-	keepdir /var/log/${TOMCAT_NAME}
-
-	mv conf/* ${D}/etc/${TOMCAT_NAME}
-	mv bin common server shared temp work ${D}${TOMCAT_HOME}
-	if ! use doc ; then
-		rm -rf webapps/{examples,tomcat-docs}
-	fi
-	mv webapps ${D}${TOMCAT_HOME}
-
-	dosym /etc/${TOMCAT_NAME} ${TOMCAT_HOME}/conf
-	dosym /var/log/${TOMCAT_NAME} ${TOMCAT_HOME}/logs
-
-	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-}
-
-pkg_preinst() {
-	enewgroup tomcat
-	enewuser tomcat -1 -1 /dev/null tomcat
-
-	chown -R tomcat:tomcat ${D}/opt/${TOMCAT_NAME}
-	chown -R tomcat:tomcat ${D}/etc/${TOMCAT_NAME}
-	chown -R tomcat:tomcat ${D}/var/log/${TOMCAT_NAME}
-}
-
-pkg_postinst() {
-	#due to previous ebuild bloopers, make sure everything is correct
-	chown -R root:root /usr/share/doc/${PF}
-	chown root:root /etc/init.d/${TOMCAT_NAME}
-	chown root:root /etc/conf.d/${TOMCAT_NAME}
-
-	chown -R tomcat:tomcat /opt/${TOMCAT_NAME}
-	chown -R tomcat:tomcat /etc/${TOMCAT_NAME}
-	chown -R tomcat:tomcat /var/log/${TOMCAT_NAME}
-
-	chmod 750 /etc/${TOMCAT_NAME}
-
-	einfo " "
-	einfo " NOTICE!"
-	einfo " FILE LOCATIONS:"
-	einfo " 1.  Tomcat home directory: ${TOMCAT_HOME}"
-	einfo "     Contains application data, configuration files."
-	einfo " 2.  Runtime settings: /etc/conf.d/${TOMCAT_NAME}"
-	einfo "     Contains CLASSPATH and JAVA_HOME settings."
-	einfo " 3.  Configuration:  /etc/${TOMCAT_NAME}"
-	einfo " 4.  Logs:  /var/log/${TOMCAT_NAME}/"
-	einfo " "
-	einfo " "
-	einfo " STARTING AND STOPPING TOMCAT:"
-	einfo "   /etc/init.d/${TOMCAT_NAME} start"
-	einfo "   /etc/init.d/${TOMCAT_NAME} stop"
-	einfo "   /etc/init.d/${TOMCAT_NAME} restart"
-	einfo " "
-	einfo " "
-	ewarn " If you are upgrading from older ebuild do NOT use"
-	ewarn " /etc/init.d/tomcat and /etc/conf.d/tomcat you probably"
-	ewarn " want to remove these. "
-	ewarn " A version number has been appended so that tomcat 3, 4 and 5"
-	ewarn " can be installed side by side"
-	einfo " "
-	einfo " NETWORK CONFIGURATION:"
-	einfo " By default, Tomcat runs on port 8080.  You can change this"
-	einfo " value by editing /etc/${TOMCAT_NAME}/server.xml."
-	einfo " "
-	einfo " To test Tomcat while it's running, point your web browser to:"
-	einfo " http://localhost:8080/"
-	einfo " "
-	einfo " "
-	einfo " BUGS:"
-	einfo " Please file any bugs at http://bugs.gentoo.org/ or else it"
-	einfo " may not get seen.  Thank you."
-	einfo " "
-}
diff --git a/www-servers/tomcat/tomcat-4.1.30-r5.ebuild b/www-servers/tomcat/tomcat-4.1.30-r5.ebuild
index 89822b0b6eac..818d8e087be2 100644
--- a/www-servers/tomcat/tomcat-4.1.30-r5.ebuild
+++ b/www-servers/tomcat/tomcat-4.1.30-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-4.1.30-r5.ebuild,v 1.3 2004/09/03 15:58:51 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-4.1.30-r5.ebuild,v 1.4 2004/09/03 16:27:04 axxo Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ S=${WORKDIR}/jakarta-${P}
 SLOT="${PV/.*}"
 SRC_URI="mirror://apache/jakarta/tomcat-${SLOT}/v${PV}/bin/${JT_P}"
 HOMEPAGE="http://jakarta.apache.org/tomcat"
-KEYWORDS="~x86 ppc ~sparc ~alpha"
+KEYWORDS="x86 ppc ~sparc ~alpha"
 LICENSE="Apache-2.0"
 DEPEND="sys-apps/sed"
 RDEPEND=">=virtual/jdk-1.3
diff --git a/www-servers/tomcat/tomcat-5.0.27-r3.ebuild b/www-servers/tomcat/tomcat-5.0.27-r3.ebuild
deleted file mode 100644
index d467d699caac..000000000000
--- a/www-servers/tomcat/tomcat-5.0.27-r3.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.27-r3.ebuild,v 1.2 2004/09/03 15:58:51 pvdabeel Exp $
-
-inherit eutils
-
-DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container"
-
-JT_P="jakarta-${P}.tar.gz"
-S=${WORKDIR}/jakarta-${P}
-SLOT="${PV/.*}"
-SRC_URI="mirror://apache/jakarta/tomcat-${SLOT}/v${PV}/bin/${JT_P}"
-HOMEPAGE="http://jakarta.apache.org/tomcat"
-KEYWORDS="x86 ppc ~sparc ~alpha ~amd64"
-LICENSE="Apache-2.0"
-DEPEND="sys-apps/sed"
-RDEPEND=">=virtual/jdk-1.3
-		jikes? ( dev-java/jikes )"
-IUSE="doc jikes"
-
-TOMCAT_HOME="/opt/${PN}${SLOT}"
-TOMCAT_NAME="${PN}${SLOT}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}/gentoo.diff
-	use jikes && epatch ${FILESDIR}/${PV}/jikes.diff
-}
-
-src_install() {
-	dodoc RELEASE* RUNNING.txt LICENSE
-
-	# INIT SCRIPTS AND ENV
-	insinto /etc/init.d
-	insopts -m0750
-	newins ${FILESDIR}/${PV}/tomcat.init ${TOMCAT_NAME}
-
-	insinto /etc/conf.d
-	insopts -m0644
-	newins ${FILESDIR}/${PV}/tomcat.conf ${TOMCAT_NAME}
-	use jikes && sed -e "\cCATALINA_OPTScaCATALINA_OPTS=\"-Dbuild.compiler.emacs=true\"" -i ${D}/etc/conf.d/${TOMCAT_NAME}
-
-	diropts -m750
-	dodir ${TOMCAT_HOME} /var/log/${TOMCAT_NAME} /etc/${TOMCAT_NAME}
-	keepdir /var/log/${TOMCAT_NAME}
-
-	mv conf/* ${D}/etc/${TOMCAT_NAME}
-	mv bin common server shared temp work ${D}${TOMCAT_HOME}
-	if ! use doc; then
-		rm -rf webapps/{tomcat-docs,jsp-examples,servlets-examples}
-	fi
-	mv webapps ${D}${TOMCAT_HOME}
-
-	dosym /etc/${TOMCAT_NAME} ${TOMCAT_HOME}/conf
-	dosym /var/log/${TOMCAT_NAME} ${TOMCAT_HOME}/logs
-
-	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-}
-
-
-pkg_preinst() {
-	enewgroup tomcat
-	enewuser tomcat -1 -1 /dev/null tomcat
-
-	chown -R tomcat:tomcat ${D}/opt/${TOMCAT_NAME}
-	chown -R tomcat:tomcat ${D}/etc/${TOMCAT_NAME}
-	chown -R tomcat:tomcat ${D}/var/log/${TOMCAT_NAME}
-}
-
-pkg_postinst() {
-	#due to previous ebuild bloopers, make sure everything is correct
-	chown -R root:root /usr/share/doc/${PF}
-	chown root:root /etc/init.d/${TOMCAT_NAME}
-	chown root:root /etc/conf.d/${TOMCAT_NAME}
-
-	chown -R tomcat:tomcat /opt/${TOMCAT_NAME}
-	chown -R tomcat:tomcat /etc/${TOMCAT_NAME}
-	chown -R tomcat:tomcat /var/log/${TOMCAT_NAME}
-
-	chmod 750 /etc/${TOMCAT_NAME}
-
-	einfo " "
-	einfo " NOTICE!"
-	einfo " FILE LOCATIONS:"
-	einfo " 1.  Tomcat home directory: ${TOMCAT_HOME}"
-	einfo "     Contains application data, configuration files."
-	einfo " 2.  Runtime settings: /etc/conf.d/${TOMCAT_NAME}"
-	einfo "     Contains CLASSPATH and JAVA_HOME settings."
-	einfo " 3.  Configuration:  /etc/${TOMCAT_NAME}"
-	einfo " 4.  Logs:  /var/log/${TOMCAT_NAME}/"
-	einfo " "
-	einfo " "
-	einfo " STARTING AND STOPPING TOMCAT:"
-	einfo "   /etc/init.d/${TOMCAT_NAME} start"
-	einfo "   /etc/init.d/${TOMCAT_NAME} stop"
-	einfo "   /etc/init.d/${TOMCAT_NAME} restart"
-	einfo " "
-	einfo " "
-	ewarn " If you are upgrading from older ebuild do NOT use"
-	ewarn " /etc/init.d/tomcat and /etc/conf.d/tomcat you probably"
-	ewarn " want to remove these. "
-	ewarn " A version number has been appended so that tomcat 3, 4 and 5"
-	ewarn " can be installed side by side"
-	einfo " "
-	einfo " NETWORK CONFIGURATION:"
-	einfo " By default, Tomcat runs on port 8080.  You can change this"
-	einfo " value by editing /etc/${TOMCAT_NAME}/server.xml."
-	einfo " "
-	einfo " To test Tomcat while it's running, point your web browser to:"
-	einfo " http://localhost:8080/"
-	einfo " "
-	einfo " "
-	einfo " BUGS:"
-	einfo " Please file any bugs at http://bugs.gentoo.org/ or else it"
-	einfo " may not get seen.  Thank you."
-	einfo " "
-}