Remove old versions.

(Portage version: 2.1.9.43/cvs/Linux x86_64)

3 files changed, 5 insertions, 172 deletions

diff --git a/dev-java/mojarra/ChangeLog b/dev-java/mojarra/ChangeLog
index e6b2cf0da9c8..62c4a0e765cf 100644
--- a/dev-java/mojarra/ChangeLog
+++ b/dev-java/mojarra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/mojarra
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mojarra/ChangeLog,v 1.9 2011/02/10 19:33:37 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mojarra/ChangeLog,v 1.10 2011/03/15 20:20:57 nelchael Exp $
+
+  15 Mar 2011; Krzysztof Pawlik <nelchael@gentoo.org> -mojarra-1.2.15.ebuild,
+  -mojarra-1.2.15-r1.ebuild:
+  Remove old versions.
 
   10 Feb 2011; Thomas Kahle <tomka@gentoo.org> mojarra-1.2.15-r2.ebuild:
   x86 stable per bug 351421
diff --git a/dev-java/mojarra/mojarra-1.2.15-r1.ebuild b/dev-java/mojarra/mojarra-1.2.15-r1.ebuild
deleted file mode 100644
index 96473826af0e..000000000000
--- a/dev-java/mojarra/mojarra-1.2.15-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mojarra/mojarra-1.2.15-r1.ebuild,v 1.1 2010/11/06 09:40:58 betelgeuse Exp $
-
-EAPI=3
-
-WANT_ANT_TASKS="ant-trax"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PV="$(get_version_component_range 1-2)_$(get_version_component_range 3)-b01-FCS"
-
-DESCRIPTION="Project Mojarra - GlassFish's Implementation for JavaServer Faces API"
-HOMEPAGE="https://javaserverfaces.dev.java.net/"
-SRC_URI="https://javaserverfaces.dev.java.net/files/documents/1866/151669/${PN}-${MY_PV}-source.zip
-	mirror://gentoo/${PN}-${MY_PV}-patch.bz2"
-
-LICENSE="CDDL"
-SLOT="1.2"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-COMMON_DEP="
-	dev-java/commons-beanutils:1.7
-	dev-java/commons-collections:0
-	dev-java/commons-digester:0
-	dev-java/commons-logging:0
-	dev-java/glassfish-servlet-api:2.5
-	dev-java/groovy:0
-	dev-java/jakarta-jstl:0
-	dev-java/portletapi:1
-	"
-
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	dev-java/ant-contrib
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${PN}-${MY_PV}-sources"
-
-src_prepare() {
-	epatch "${DISTDIR}/${PN}-${MY_PV}-patch.bz2"
-
-	mkdir -p "${S}/dependencies/jars" || die
-
-	# Should we remove those files? I don't see a reason to pull in three
-	# different web app server for this package.
-	rm -f \
-		"${S}/jsf-ri/src/com/sun/faces/vendor/GlassFishInjectionProvider.java" \
-		"${S}/jsf-ri/src/com/sun/faces/vendor/Jetty6InjectionProvider.java" \
-		"${S}/jsf-ri/src/com/sun/faces/vendor/Tomcat6InjectionProvider.java"
-
-	find -name '*.jar' -exec rm -f {} \;
-
-	cd "${S}/common/lib/"
-	java-pkg_jarfrom --build-only ant-contrib
-
-	cd "${S}/dependencies/jars"
-	java-pkg_jarfrom commons-beanutils-1.7
-	java-pkg_jarfrom commons-collections
-	java-pkg_jarfrom commons-digester
-	java-pkg_jarfrom commons-logging
-	java-pkg_jarfrom glassfish-servlet-api-2.5
-	java-pkg_jarfrom groovy
-	java-pkg_jarfrom jakarta-jstl
-	java-pkg_jarfrom portletapi-1
-}
-
-src_compile() {
-	cd "${S}/jsf-api"
-	eant -Djsf.build.home="${S}" -Dcontainer.name=glassfish jars
-
-	cd "${S}/jsf-ri"
-	eant -Djsf.build.home="${S}" -Dcontainer.name=glassfish jars
-}
-
-src_install() {
-	java-pkg_dojar "${S}/jsf-api/build/lib/jsf-api.jar"
-	java-pkg_dojar "${S}/jsf-ri/build/lib/jsf-impl.jar"
-	use source && java-pkg_dosrc "${S}"/jsf-api/src/* "${S}"/jsf-ri/src/*
-}
diff --git a/dev-java/mojarra/mojarra-1.2.15.ebuild b/dev-java/mojarra/mojarra-1.2.15.ebuild
deleted file mode 100644
index ccb3b591a9a0..000000000000
--- a/dev-java/mojarra/mojarra-1.2.15.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mojarra/mojarra-1.2.15.ebuild,v 1.2 2010/08/19 19:18:19 nelchael Exp $
-
-EAPI=3
-
-WANT_ANT_TASKS="ant-trax"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PV="$(get_version_component_range 1-2)_$(get_version_component_range 3)-b01-FCS"
-
-DESCRIPTION="Project Mojarra - GlassFish's Implementation for JavaServer Faces API"
-HOMEPAGE="https://javaserverfaces.dev.java.net/"
-SRC_URI="https://javaserverfaces.dev.java.net/files/documents/1866/151669/${PN}-${MY_PV}-source.zip
-	mirror://gentoo/${PN}-${MY_PV}-patch.bz2"
-
-LICENSE="CDDL"
-SLOT="1.2"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-COMMON_DEP="
-	dev-java/commons-beanutils:1.6
-	dev-java/commons-collections
-	dev-java/commons-digester
-	dev-java/commons-logging
-	dev-java/glassfish-servlet-api:2.5
-	dev-java/groovy
-	dev-java/jakarta-jstl
-	dev-java/portletapi:1
-	"
-
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	dev-java/ant-contrib
-	dev-java/ant-trax
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${PN}-${MY_PV}-sources"
-
-src_prepare() {
-	epatch "${DISTDIR}/${PN}-${MY_PV}-patch.bz2"
-
-	mkdir -p "${S}/dependencies/jars" || die
-
-	# Should we remove those files? I don't see a reason to pull in three
-	# different web app server for this package.
-	rm -f \
-		"${S}/jsf-ri/src/com/sun/faces/vendor/GlassFishInjectionProvider.java" \
-		"${S}/jsf-ri/src/com/sun/faces/vendor/Jetty6InjectionProvider.java" \
-		"${S}/jsf-ri/src/com/sun/faces/vendor/Tomcat6InjectionProvider.java"
-
-	find -name '*.jar' -exec rm -f {} \;
-
-	cd "${S}/common/lib/"
-	java-pkg_jarfrom --build-only ant-contrib
-
-	cd "${S}/dependencies/jars"
-	java-pkg_jarfrom commons-beanutils-1.6
-	java-pkg_jarfrom commons-collections
-	java-pkg_jarfrom commons-digester
-	java-pkg_jarfrom commons-logging
-	java-pkg_jarfrom glassfish-servlet-api-2.5
-	java-pkg_jarfrom groovy
-	java-pkg_jarfrom jakarta-jstl
-	java-pkg_jarfrom portletapi-1
-}
-
-src_compile() {
-	cd "${S}/jsf-api"
-	eant -Djsf.build.home="${S}" -Dcontainer.name=glassfish jars
-
-	cd "${S}/jsf-ri"
-	eant -Djsf.build.home="${S}" -Dcontainer.name=glassfish jars
-}
-
-src_install() {
-	java-pkg_dojar "${S}/jsf-api/build/lib/jsf-api.jar"
-	java-pkg_dojar "${S}/jsf-ri/build/lib/jsf-impl.jar"
-	use source && java-pkg_dosrc "${S}"/jsf-api/src/* "${S}"/jsf-ri/src/*
-}