Version bump, removed old versions.

Package-Manager: portage-2.1.5_rc10

5 files changed, 16 insertions, 113 deletions

diff --git a/dev-java/resin-servlet-api/ChangeLog b/dev-java/resin-servlet-api/ChangeLog
index d8b20554e186..319721df1556 100644
--- a/dev-java/resin-servlet-api/ChangeLog
+++ b/dev-java/resin-servlet-api/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/resin-servlet-api
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/resin-servlet-api/ChangeLog,v 1.14 2008/05/10 19:47:44 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/resin-servlet-api/ChangeLog,v 1.15 2008/05/10 20:04:14 nelchael Exp $
+
+*resin-servlet-api-3.1.6 (10 May 2008)
+
+  10 May 2008; Krzysiek Pawlik <nelchael@gentoo.org>
+  -resin-servlet-api-3.1.3.ebuild, -resin-servlet-api-3.1.4.ebuild,
+  -resin-servlet-api-3.1.5.ebuild, +resin-servlet-api-3.1.6.ebuild:
+  Version bump, removed old versions.
 
   10 May 2008; Krzysiek Pawlik <nelchael@gentoo.org>
   resin-servlet-api-3.0.25.ebuild:
diff --git a/dev-java/resin-servlet-api/Manifest b/dev-java/resin-servlet-api/Manifest
index 776469c000e5..3275db8a765d 100644
--- a/dev-java/resin-servlet-api/Manifest
+++ b/dev-java/resin-servlet-api/Manifest
@@ -3,25 +3,19 @@ Hash: SHA1
 
 DIST resin-3.0.24-src.zip 10688883 RMD160 84aeee1482ac41d4e596c6800c7ab72c3a448d54 SHA1 76e40d628b662d1b64a8ae4772b7140b0eeaed54 SHA256 d7862e12245f5620dd198bdf10e3c5486fe6bd6262bdf0be3a7bb29280e70a1c
 DIST resin-3.0.25-src.zip 10690692 RMD160 f613bf9f35a2fb99f16a2253aed715104575d3ca SHA1 48e1cdbb7e1e1501d6c1a920361558c70930463a SHA256 ed1e8ce03ea2c5454980bb5353f625d12bdd0713653dd845ac6b00cb239c1cdc
-DIST resin-3.1.3-src.zip 12366224 RMD160 573db137aca6da906f519333b27e67611d2b8a7a SHA1 3ceecbb8f480ad373ca1cf8dcec7401e1cedc577 SHA256 45825f9df5914f6f53633f5e6ce4905a4f9d788ba2b57eedba2a4bff9df78493
-DIST resin-3.1.4-src.zip 12667690 RMD160 205b26d1aa853af5d83c110d751633ea51369bc8 SHA1 98710e42363a2dc98545d374a36ff5205d01d083 SHA256 c8fab8d798e234a8ad6167eff9f35d7a07ce79a14b7759d6b616df086477ca99
-DIST resin-3.1.5-src.zip 13386594 RMD160 6999c8d783fef67a8f659ce58c88569cdf084ec9 SHA1 09308ae749d531c2ba57374c7a489db33ea4a724 SHA256 717ed02899c7aa05a48ce1cbb38e826646153463a68f626350f628c4b5ba9351
+DIST resin-3.1.6-src.zip 13579762 RMD160 c5d1b1ff590d8b11b35bf860e85a85cfd55a074c SHA1 40825e21fe3118c00978f64a5beec81d884cb1e4 SHA256 4e908672ab404f3cbab8bc05106e10e26f2227244930ff80d06ffc154c8fab08
 DIST resin-gentoo-patches-3.0.24.tar.bz2 4788 RMD160 63f81074d7db75cc6fb30e2fe5be2413c1b46ff0 SHA1 386e94852599c24521665bdf8bb6405e1d936ab7 SHA256 9154fcb7fb51ac4367025a6f2ad72a01f525afc8373107f68e5f4ac5e05dcfe0
 DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 RMD160 b7e370e5ce5869e22659caa77f81fe341894e8e6 SHA1 b11675e71cd0a5c019ad4368a2c4440bbe42226a SHA256 6f47dddc3c29ad1465efdb8c912d1625cf769f5f8dc45dd6b0782655ba5c97cd
-DIST resin-gentoo-patches-3.1.3.tar.bz2 3516 RMD160 d71da2fc0f439d52d7023ca94cb18528d82f13dc SHA1 9cfd0514cb74ef88f659ad69a0337cab8e2a991e SHA256 49f649d93ee862461954e16b6b7cd73cb3eb8b60be152ebc821fcb222ed4fd63
-DIST resin-gentoo-patches-3.1.4-r2.tar.bz2 3560 RMD160 4049201161d5414d3db886310184a4b977653d38 SHA1 04dab3d984b3c742525d17a01900820d6cdfc182 SHA256 53340a55609f9ef5e3d1ed7010ad6ef04f11122f673f9c90936a2fe5c0039d28
-DIST resin-gentoo-patches-3.1.5.tar.bz2 3808 RMD160 55edbd158c662014e8140dcc04e3ee4a271ce5df SHA1 5e246c9347380413e707faf89483d58fc0afe78d SHA256 b08df65309d175e2573002ae2df0b687b212a4997b0fe7253842820f7bfa67f1
+DIST resin-gentoo-patches-3.1.6.tar.bz2 3910 RMD160 65e165505887c0f444b0cec9226400b00e527ad4 SHA1 d673be0b1e4088f1fbcf72cbf5bceb398f646e9d SHA256 1fdb0301ab1db0c590001f811d5b1efc553d60a204adc710997b9e48ed61117e
 EBUILD resin-servlet-api-3.0.24.ebuild 1004 RMD160 5fd50a469cee4be2c51f1b31dd0bc4e710e03a0e SHA1 2637c98d7e913e3674b6721e8842b7a508812656 SHA256 1d03304f2706fb65d97835a7db1bc5d6334741debace30b49eddaae643d26701
 EBUILD resin-servlet-api-3.0.25.ebuild 1006 RMD160 b31f6d1aec01dfef01e2c28ffe750d6cd18ecdf4 SHA1 654750559fe56d2e6fbd76fac9cb91a4cbef3ad1 SHA256 4b0950b6a8a125d20f89236cfdab897f77786a78cfeb916c929fc6087c2e426f
-EBUILD resin-servlet-api-3.1.3.ebuild 1017 RMD160 0bc6ed68f1bf4f512091258f91fd57b60df3ed3b SHA1 34b33c135fccffd4f5c23e0211c4aee0781272c1 SHA256 05ee30b865bd2e9ccba69e120d4e75b39bee70d22451f88a4d4f897141867fac
-EBUILD resin-servlet-api-3.1.4.ebuild 1027 RMD160 ab6946e836c762ffb535c207aaae17792730c99a SHA1 f44079428c70f06a6c188b55cc04a3801b1665d6 SHA256 351c7a8cc498a4881946088ed88e6abbbc384e2dc5ce335ddcae90d607afe940
-EBUILD resin-servlet-api-3.1.5.ebuild 1024 RMD160 6bf13c34aaec203ddba4e6f4426c1fc11fb93344 SHA1 3ec70a422c0bccf15fd81da21e80c5ff913d7d55 SHA256 63a271d56eea1cfa32c083c8c3a81eba18fb165cdffe42503c3d6aeb775621e0
-MISC ChangeLog 2694 RMD160 267b452dd0510c57aedf2fe7190ce97230005dfb SHA1 b8dd37c698ff80b92733bc5bc70d4749d70360fe SHA256 98f8c5306bf89e63bbd2d15c22b347433aef0dbffd10281c8360fec18f25a776
+EBUILD resin-servlet-api-3.1.6.ebuild 1024 RMD160 8894c69103daad7ec02912459e8fe122b72d342a SHA1 f09370c61b7b3fa4fd9b1597cc529401dcea984b SHA256 053d11ac3ad23a13f2c8efa5969b65ad03c43be759d3b8e439078778833d1701
+MISC ChangeLog 2962 RMD160 db61cef88da2351ee44cc5a6dda7fa1d18f4573b SHA1 f1111288af139261bd7c0cb254b056243a9611a1 SHA256 f2e22e8a3fbb5f1bee712d45db05b40a86a9bc17e0157e62b90fcac360304c06
 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgl++YACgkQgo/w9rxVVVEFEwCZAfx2RrhBxo5vt38zHctWaTZ2
-YhgAnjPPDy04MGMfJ702ELanym3WZoUE
-=emFf
+iEYEARECAAYFAkgl/8QACgkQgo/w9rxVVVFjOQCgnTPtguorZhavvEz9g/DsIqns
+24AAoIbs4wGmfhvjJTWrR+RZAV9l9CE2
+=mBB7
 -----END PGP SIGNATURE-----
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-3.1.3.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-3.1.3.ebuild
deleted file mode 100644
index af5f8fbef101..000000000000
--- a/dev-java/resin-servlet-api/resin-servlet-api-3.1.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/resin-servlet-api/resin-servlet-api-3.1.3.ebuild,v 1.2 2007/11/10 12:41:21 nelchael Exp $
-
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Resin Servlet API 2.5/JSP API 2.1 implementation"
-HOMEPAGE="http://www.caucho.com/"
-SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip
-	mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2.5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-
-IUSE=""
-
-COMMON_DEP=""
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	${COMMON_DEP}"
-
-S="${WORKDIR}/resin-${PV}"
-
-src_unpack() {
-
-	unpack ${A}
-
-	mkdir "${S}/lib"
-
-	cd "${S}"
-	epatch "${WORKDIR}/${PV}/resin-${PV}-build.xml.patch"
-
-}
-
-EANT_BUILD_TARGET="jsdk"
-EANT_DOC_TARGET=""
-
-src_install() {
-
-	java-pkg_newjar "lib/jsdk-15.jar"
-	use source && java-pkg_dosrc "${S}"/modules/jsdk/src/*
-
-}
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-3.1.4.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-3.1.4.ebuild
deleted file mode 100644
index c5842d4f99c4..000000000000
--- a/dev-java/resin-servlet-api/resin-servlet-api-3.1.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/resin-servlet-api/resin-servlet-api-3.1.4.ebuild,v 1.2 2007/12/14 16:09:51 nelchael Exp $
-
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Resin Servlet API 2.5/JSP API 2.1 implementation"
-HOMEPAGE="http://www.caucho.com/"
-SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip
-	mirror://gentoo/resin-gentoo-patches-${PV}-r2.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2.5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-
-IUSE=""
-
-COMMON_DEP=""
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	${COMMON_DEP}"
-
-S="${WORKDIR}/resin-${PV}"
-
-src_unpack() {
-
-	unpack ${A}
-
-	mkdir "${S}/lib"
-
-	cd "${S}"
-	epatch "${WORKDIR}/${PV}/resin-${PV}-build.xml.patch" || die
-
-}
-
-EANT_BUILD_TARGET="jsdk"
-EANT_DOC_TARGET=""
-
-src_install() {
-
-	java-pkg_newjar "lib/jsdk-15.jar"
-	use source && java-pkg_dosrc "${S}"/modules/jsdk/src/*
-
-}
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-3.1.5.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-3.1.6.ebuild
index 5ac9fff83ef4..92eb43993f49 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-3.1.5.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-3.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/resin-servlet-api/resin-servlet-api-3.1.5.ebuild,v 1.1 2008/02/27 22:04:34 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/resin-servlet-api/resin-servlet-api-3.1.6.ebuild,v 1.1 2008/05/10 20:04:14 nelchael Exp $
 
 JAVA_PKG_IUSE="source"