Remove old versions.

Package-Manager: portage-2.1.9.43/cvs/Linux x86_64

4 files changed, 13 insertions, 178 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/Manifest b/dev-java/mojarra/Manifest
index e24084d87298..d53d15cce4ee 100644
--- a/dev-java/mojarra/Manifest
+++ b/dev-java/mojarra/Manifest
@@ -3,15 +3,17 @@ Hash: SHA1
 
 DIST mojarra-1.2_15-b01-FCS-patch.bz2 4369 RMD160 1bd52ebd3c3dc4390b7107458b5fb94e3f136eca SHA1 55647ac19fedf4a2a802431786fa3939cece8fd9 SHA256 c8495b51225201bf23033a01bb853abf1cc0a40214aa6a68c7dd1c30812e6cd1
 DIST mojarra-1.2_15-b01-FCS-source.zip 5091287 RMD160 587843df7d177903f264e913b5d637a9591ea9bd SHA1 ac8af7a7ff191a72604ce20eb95e5005e3be6073 SHA256 8678db1e93a2f605b696ae3a04e145bc14dd46409301ae230dc6ee4477ccb343
-EBUILD mojarra-1.2.15-r1.ebuild 2392 RMD160 e6368ef872253a0d676a1f0119cbe2a019c2da7f SHA1 88242c898f7550af3beb46c7667d086873a90490 SHA256 22b64ff24e2575e40c085ca351bcd76e47471c9f32d77fcbb368fe273889a5b2
 EBUILD mojarra-1.2.15-r2.ebuild 2437 RMD160 568b8952a36ad50cb22cbd79b9e0e2a5b1971292 SHA1 c905f1517170a190d622d27503a21402902dcefd SHA256 a22796679364217317ec4c7c9208a3a08444424cc0b4a74a5e387231a6b5c292
-EBUILD mojarra-1.2.15.ebuild 2396 RMD160 8751cd224d2a271501fd5fb01cc9d892a226da45 SHA1 4148a7d5de35d354607fd85c589a945b19b9bcac SHA256 a78ede1e16f347b80a623925014e02bab3268dc7eeedaf21e14d7944f66d7a8d
-MISC ChangeLog 1458 RMD160 b32af6bc3cfd257c76f2c90d37f71f251a3cd3d9 SHA1 6969f7f48ec2889d481e89a1697cf3738026d556 SHA256 42fa5db49728a61cd5464968add0a3a260eda9c82b167ee779c21c98344a59ef
+MISC ChangeLog 1593 RMD160 2569cef31279ff8a3ef962e8777f59af668cfea5 SHA1 de196b088211f7d31d1c334ff4c3cf92d4bde512 SHA256 e2390063f82519b5e7fd0a8da23b73e4d3cc3aabf4da0ebe95a60396771c3965
 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1UPP4ACgkQnZsgo/h8kNZEagCggm8zC4PdX2mJIaarFent1OOM
-3LUAn1lwlKA0KKZXXJMWaXJ3qMC/VWyJ
-=xzx2
+iQEcBAEBAgAGBQJNf8ouAAoJEBZyv1r2qA5GLHgH/2kzkWYNQeMBNlRs+TNdiX3Q
+Apb+qDlP1xzhXXMKbl1NE7T2L3lThsLhu1St7e/wXGQXnQYTBrzcbgW8E/DjP2Gf
+xjaxcyEIFU+ewOtOOS6DkzndI8nSIMImzzzOu+PjInq6mcDO7g9gUQCQPOPR6PzY
+dL+uwsA/QSlh9BaG+4Un8OEwxApa9NG2P/O2awRCNrDG4MvKeFbBwn1BUjT+MQgi
+vxIicGKFjNx+8+Lx8BtHCmJzNHWsGuXnq4rcG7Jx946NRD+pKlOPGL8+HXzl5CX9
+ElhdZMNyTROxI3I8eFUmW933TTr5cxZTHH6I5HoMFDjwDyK25HxU1T6P9RS7gh8=
+=DiXI
 -----END PGP SIGNATURE-----
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/*
-}