Revision Bump for 2.2 and 2.3.

6 files changed, 23 insertions, 20 deletions

diff --git a/dev-java/servletapi/ChangeLog b/dev-java/servletapi/ChangeLog
index 84c1d551a0b1..ff58be0f1eb7 100644
--- a/dev-java/servletapi/ChangeLog
+++ b/dev-java/servletapi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/servletapi
 # Copyright 1999-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/ChangeLog,v 1.4 2004/01/21 05:45:45 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/ChangeLog,v 1.5 2004/01/22 01:58:32 strider Exp $
+
+*servletapi-2.3-r1 (21 Jan 2004)
+
+  21 Jan 2004; Adrian Almenar <strider@gentoo.org> servletapi-2.2-r1.ebuild,
+  servletapi-2.3-r1.ebuild:
+  Revision Bump for 2.2 and 2.3, cleaner and better slotted install.
 
   21 Jan 2004; Adrian Almenar <strider@gentoo.org> servletapi-2.2.ebuild,
   servletapi-2.3.ebuild:
diff --git a/dev-java/servletapi/Manifest b/dev-java/servletapi/Manifest
index 326f627baf19..9c484f1dc927 100644
--- a/dev-java/servletapi/Manifest
+++ b/dev-java/servletapi/Manifest
@@ -1,6 +1,11 @@
-MD5 55fd8ed58dddb8317cb66bfd20bc1220 servletapi-2.3.ebuild 1024
+MD5 f62a638246ace689ca118666f3030234 servletapi-2.2-r1.ebuild 977
+MD5 49c0b94966e07fcc51ef255d5b0682f2 servletapi-2.3.ebuild 954
+MD5 ee56d6d167a97492b67f7f28e5408073 .servletapi-2.3.ebuild.swp 12288
 MD5 987c0e30b0bf243206f042d4029aea8e servletapi-2.2.ebuild 1053
 MD5 21116e7404eef4ce032292fa721c4636 ChangeLog 1148
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 4d7cb7ceb2a18f96bbd2402d304e57a7 servletapi-2.3-r1.ebuild 951
 MD5 130423ce821911d5ddc38a30df67574b files/digest-servletapi-2.2 74
 MD5 dcffc47728eefea370d29b3bf0d11158 files/digest-servletapi-2.3 75
+MD5 130423ce821911d5ddc38a30df67574b files/digest-servletapi-2.2-r1 74
+MD5 dcffc47728eefea370d29b3bf0d11158 files/digest-servletapi-2.3-r1 75
diff --git a/dev-java/servletapi/files/digest-servletapi-2.2 b/dev-java/servletapi/files/digest-servletapi-2.2-r1
index e41ce4ac8d1f..e41ce4ac8d1f 100644
--- a/dev-java/servletapi/files/digest-servletapi-2.2
+++ b/dev-java/servletapi/files/digest-servletapi-2.2-r1
diff --git a/dev-java/servletapi/files/digest-servletapi-2.3 b/dev-java/servletapi/files/digest-servletapi-2.3-r1
index a28f1848bdb6..a28f1848bdb6 100644
--- a/dev-java/servletapi/files/digest-servletapi-2.3
+++ b/dev-java/servletapi/files/digest-servletapi-2.3-r1
diff --git a/dev-java/servletapi/servletapi-2.2.ebuild b/dev-java/servletapi/servletapi-2.2-r1.ebuild
index ebb2ee7334ce..f586e5fb6c89 100644
--- a/dev-java/servletapi/servletapi-2.2.ebuild
+++ b/dev-java/servletapi/servletapi-2.2-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.2.ebuild,v 1.6 2004/01/21 05:45:45 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.2-r1.ebuild,v 1.1 2004/01/22 01:58:32 strider Exp $
 
 inherit java-pkg
 
 S=${WORKDIR}/jakarta-servletapi-src
 DESCRIPTION="Servlet API ${PV} from jakarta.apache.org"
 HOMEPAGE="http://jakarta.apache.org/"
-SRC_URI="mirror://gentoo/servletapi-2.2-20021101.tar.gz"
+SRC_URI="mirror://gentoo/${PN}-${PV}-20021101.tar.gz"
 DEPEND=">=virtual/jdk-1.3
 	>=dev-java/ant-1.4"
 RDEPEND=">=virtual/jre-1.3"
@@ -22,23 +22,19 @@ src_compile() {
 	if [ -n "`use jikes`" ] ; then
 		myc="${myc} -Dbuild.compiler=jikes"
 	fi
-
 	cd ${S}
 	ANT_OPTS=${myc} ant all
 }
 
 src_install () {
 	cd ..
-	cd dist
-	mv servletapi/lib/servlet.jar servletapi/lib/servlet-${PV}.jar
-	java-pkg_dojar servletapi/lib/servlet-${PV}.jar || die "Unable to install"
+	cd  dist
+	mv servletapi/lib/servlet.jar servletapi/lib/${PN}-${PV}.jar
+	java-pkg_dojar servletapi/lib/${PN}-${PV}.jar || die "Unable to install"
 
 	if [ -n "`use doc`" ] ; then
 		dohtml -r servletapi/docs/*
 	fi
-}
 
-pkg_postinst() {
-	einfo "Check the servlet API Docs in /usr/share/doc/"
+	dodoc dist/README.txt
 }
-
diff --git a/dev-java/servletapi/servletapi-2.3.ebuild b/dev-java/servletapi/servletapi-2.3-r1.ebuild
index b963870d3c0b..b246e7211f0f 100644
--- a/dev-java/servletapi/servletapi-2.3.ebuild
+++ b/dev-java/servletapi/servletapi-2.3-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.3.ebuild,v 1.6 2004/01/21 05:45:45 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.3-r1.ebuild,v 1.1 2004/01/22 01:58:32 strider Exp $
 
 inherit java-pkg
 
 S=${WORKDIR}/jakarta-servletapi-4
 DESCRIPTION="Servlet API ${PV} from jakarta.apache.org"
 HOMEPAGE="http://jakarta.apache.org/"
-SRC_URI="mirror://gentoo/servletapi-2.3-20021101.tar.gz"
+SRC_URI="mirror://gentoo/${PN}-${PV}-20021101.tar.gz"
 DEPEND=">=virtual/jdk-1.3
 	>=dev-java/ant-1.4"
 RDEPEND=">=virtual/jre-1.3"
@@ -27,8 +27,8 @@ src_compile() {
 }
 
 src_install () {
-	mv dist/lib/servlet.jar dist/lib/servlet-${PV}.jar
-	dojar dist/lib/servlet-${PV}.jar || die "Unable to install"
+	mv dist/lib/servlet.jar dist/lib/${PN}-${PV}.jar
+	java-pkg_dojar dist/lib/${PN}-${PV}.jar || die "Unable to install"
 
 	if [ -n "`use doc`" ] ; then
 		dohtml -r dist/docs/*
@@ -36,7 +36,3 @@ src_install () {
 
 	dodoc dist/README.txt
 }
-
-pkg_postinst() {
-	einfo "Check the servlet API Docs in /usr/share/doc/"
-}