--- /usr/portage/www-servers/tomcat/tomcat-7.0.12.ebuild	2011-04-07 16:13:49.000000000 +0200
+++ tomcat-7.0.12.ebuild	2011-04-23 00:38:52.301382108 +0200
@@ -57,7 +57,7 @@
 
 EANT_NEEDS_TOOLS="true"
 EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPIS},eclipse-ecj-${ECJV}"
-
+EANT_GENTOO_CLASSPATH_EXTRA=${S}/output/classes
 EANT_BUILD_TARGET="package"
 EANT_DOC_TARGET="build-docs"
 
@@ -84,6 +84,10 @@
 		EANT_EXTRA_ARGS+=" -Dnobuild.docs=true"
 	fi
 
+	if ! use examples; then
+		EANT_EXTRA_ARGS+=" -Dnobuild.examples=true"
+	fi
+
 	EANT_EXTRA_ARGS+=" -Djdt.jar=$(java-pkg_getjar eclipse-ecj-${ECJV} ecj.jar)"
 	java-pkg_jarfrom --build-only ant-core ant.jar
 }
@@ -144,14 +148,19 @@
 	cp -pR host-manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
 	cp -pR manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
 	if use doc; then
+		cd "${S}"/output/build/webapps
 		cp -pR docs "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
 	fi
 	if use examples; then
-		cd "${S}"/webapps/examples/WEB-INF/lib
+		cd "${S}"/output/build/webapps/examples/WEB-INF/lib
 		java-pkg_jar-from jakarta-jstl jstl.jar
 		java-pkg_jar-from jakarta-jstl standard.jar
-		cd "${S}"/webapps
-		cp -pR examples "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
+		cd "${S}"/output/build/webapps/examples
+		mkdir META-INF
+		cp "${FILESDIR}/${SLOT}/context.xml" META-INF
+		cd "${S}"/output/build/webapps
+		cp -pR examples "${D}/usr/share/${TOMCAT_NAME}/webapps" || die
+		chown -R tomcat:tomcat "${D}/usr/share/${TOMCAT_NAME}/webapps/examples"
 	fi
 
 	# replace catalina.policy with gentoo specific one bug #176701