From 540f24964bd0e5d291cfdb1f621a8ef00cc03e70 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Miroslav=20=C5=A0ulc?= <fordfrog@gentoo.org>
Date: Fri, 19 Feb 2016 22:45:21 +0100
Subject: [PATCH] www-servers/tomcat: removed oracle-javamail from deps and
 hence from tomcat classpath (bug #453212)

this jar should not be on tomcat's classpath, if one needs it on global classpath, he/she should use TOMCAT_EXTRA_JARS in /etc/conf.d/tomcat-SLOT[-suffix] to put it on the global classpath. the before-the-fix version of the ebuilds made it impossible to put javamail jar inside web application as that resulted in conflict which could be avoided only by removal of javamail jar from the global classpath

Package-Manager: portage-2.2.27
---
 .../{tomcat-7.0.68.ebuild => tomcat-7.0.68-r1.ebuild}    | 7 +++----
 .../{tomcat-8.0.32.ebuild => tomcat-8.0.32-r1.ebuild}    | 7 +++----
 ...9.0.0_alpha3.ebuild => tomcat-9.0.0_alpha3-r1.ebuild} | 9 ++++-----
 3 files changed, 10 insertions(+), 13 deletions(-)
 rename www-servers/tomcat/{tomcat-7.0.68.ebuild => tomcat-7.0.68-r1.ebuild} (95%)
 rename www-servers/tomcat/{tomcat-8.0.32.ebuild => tomcat-8.0.32-r1.ebuild} (95%)
 rename www-servers/tomcat/{tomcat-9.0.0_alpha3.ebuild => tomcat-9.0.0_alpha3-r1.ebuild} (94%)

diff --git a/www-servers/tomcat/tomcat-7.0.68.ebuild b/www-servers/tomcat/tomcat-7.0.68-r1.ebuild
similarity index 95%
rename from www-servers/tomcat/tomcat-7.0.68.ebuild
rename to www-servers/tomcat/tomcat-7.0.68-r1.ebuild
index cfc066197b85..b98587f6ce56 100644
--- a/www-servers/tomcat/tomcat-7.0.68.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.68-r1.ebuild
@@ -25,7 +25,6 @@ ECJ_SLOT="4.4"
 SAPI_SLOT="3.0"
 
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/oracle-javamail:0
 	dev-java/tomcat-servlet-api:${SAPI_SLOT}"
 RDEPEND="${COMMON_DEP}
 	websockets? ( >=virtual/jre-1.7 )
@@ -45,8 +44,8 @@ pkg_setup() {
 }
 
 java_prepare() {
-	# Remove bundled javamail, servlet-api
-	rm -rv java/javax/{el,mail,servlet} || die
+	# Remove bundled servlet-api
+	rm -rv java/javax/{el,servlet} || die
 
 	java-pkg_clean
 
@@ -61,7 +60,7 @@ java_prepare() {
 JAVA_ANT_REWRITE_CLASSPATH="true"
 
 EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
 EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
 EANT_NEEDS_TOOLS="true"
 EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
diff --git a/www-servers/tomcat/tomcat-8.0.32.ebuild b/www-servers/tomcat/tomcat-8.0.32-r1.ebuild
similarity index 95%
rename from www-servers/tomcat/tomcat-8.0.32.ebuild
rename to www-servers/tomcat/tomcat-8.0.32-r1.ebuild
index c6d846333b54..ac0869f61f8c 100644
--- a/www-servers/tomcat/tomcat-8.0.32.ebuild
+++ b/www-servers/tomcat/tomcat-8.0.32-r1.ebuild
@@ -25,7 +25,6 @@ ECJ_SLOT="4.4"
 SAPI_SLOT="3.1"
 
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/oracle-javamail:0
 	dev-java/tomcat-servlet-api:${SAPI_SLOT}"
 RDEPEND="${COMMON_DEP}
 	!<dev-java/tomcat-native-1.1.24
@@ -49,8 +48,8 @@ pkg_setup() {
 java_prepare() {
 	find -name '*.jar' -type f -delete -print || die
 
-	# Remove bundled javamail, servlet-api
-	rm -rv java/javax/{el,mail,servlet} || die
+	# Remove bundled servlet-api
+	rm -rv java/javax/{el,servlet} || die
 
 	epatch "${FILESDIR}/${P}-build.xml.patch"
 
@@ -63,7 +62,7 @@ java_prepare() {
 JAVA_ANT_REWRITE_CLASSPATH="true"
 
 EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
 EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
 EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
 EANT_NEEDS_TOOLS="true"
diff --git a/www-servers/tomcat/tomcat-9.0.0_alpha3.ebuild b/www-servers/tomcat/tomcat-9.0.0_alpha3-r1.ebuild
similarity index 94%
rename from www-servers/tomcat/tomcat-9.0.0_alpha3.ebuild
rename to www-servers/tomcat/tomcat-9.0.0_alpha3-r1.ebuild
index 881e9a90419f..2b5821693538 100644
--- a/www-servers/tomcat/tomcat-9.0.0_alpha3.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.0_alpha3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -26,7 +26,6 @@ ECJ_SLOT="4.5"
 SAPI_SLOT="4.0"
 
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/oracle-javamail:0
 	dev-java/tomcat-servlet-api:${SAPI_SLOT}"
 RDEPEND="${COMMON_DEP}
 	!<dev-java/tomcat-native-1.1.24
@@ -50,8 +49,8 @@ pkg_setup() {
 java_prepare() {
 	find -name '*.jar' -type f -delete -print || die
 
-	# Remove bundled javamail, servlet-api
-	rm -rv java/javax/{el,mail,servlet} || die
+	# Remove bundled servlet-api
+	rm -rv java/javax/{el,servlet} || die
 
 	epatch "${FILESDIR}/${P}-build.xml.patch"
 
@@ -64,7 +63,7 @@ java_prepare() {
 JAVA_ANT_REWRITE_CLASSPATH="true"
 
 EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
 EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
 EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
 EANT_NEEDS_TOOLS="true"
-- 
2.26.2