From a8e8b0ba3117061d0536beeb58f89327c8cacc9b Mon Sep 17 00:00:00 2001 From: Adrian Almenar Date: Thu, 22 Jan 2004 01:58:32 +0000 Subject: Revision Bump for 2.2 and 2.3. --- dev-java/servletapi/ChangeLog | 8 +++- dev-java/servletapi/Manifest | 10 ++--- dev-java/servletapi/files/digest-servletapi-2.2 | 1 - dev-java/servletapi/files/digest-servletapi-2.2-r1 | 1 + dev-java/servletapi/files/digest-servletapi-2.3 | 1 - dev-java/servletapi/files/digest-servletapi-2.3-r1 | 1 + dev-java/servletapi/servletapi-2.2-r1.ebuild | 40 ++++++++++++++++++++ dev-java/servletapi/servletapi-2.2.ebuild | 44 ---------------------- dev-java/servletapi/servletapi-2.3-r1.ebuild | 38 +++++++++++++++++++ dev-java/servletapi/servletapi-2.3.ebuild | 42 --------------------- 10 files changed, 92 insertions(+), 94 deletions(-) delete mode 100644 dev-java/servletapi/files/digest-servletapi-2.2 create mode 100644 dev-java/servletapi/files/digest-servletapi-2.2-r1 delete mode 100644 dev-java/servletapi/files/digest-servletapi-2.3 create mode 100644 dev-java/servletapi/files/digest-servletapi-2.3-r1 create mode 100644 dev-java/servletapi/servletapi-2.2-r1.ebuild delete mode 100644 dev-java/servletapi/servletapi-2.2.ebuild create mode 100644 dev-java/servletapi/servletapi-2.3-r1.ebuild delete mode 100644 dev-java/servletapi/servletapi-2.3.ebuild (limited to 'dev-java') 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 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 servletapi-2.2.ebuild, servletapi-2.3.ebuild: diff --git a/dev-java/servletapi/Manifest b/dev-java/servletapi/Manifest index 326f627baf19..4a2fb695d718 100644 --- a/dev-java/servletapi/Manifest +++ b/dev-java/servletapi/Manifest @@ -1,6 +1,6 @@ -MD5 55fd8ed58dddb8317cb66bfd20bc1220 servletapi-2.3.ebuild 1024 -MD5 987c0e30b0bf243206f042d4029aea8e servletapi-2.2.ebuild 1053 -MD5 21116e7404eef4ce032292fa721c4636 ChangeLog 1148 +MD5 97b98264074f2a62c68ca320d42f4467 servletapi-2.2-r1.ebuild 997 +MD5 ecc251768d7c68ab7ef1240319adfa65 ChangeLog 1357 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 -MD5 130423ce821911d5ddc38a30df67574b files/digest-servletapi-2.2 74 -MD5 dcffc47728eefea370d29b3bf0d11158 files/digest-servletapi-2.3 75 +MD5 5f71818fdf46f4ecf7050571c1a9fe2c servletapi-2.3-r1.ebuild 954 +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 deleted file mode 100644 index e41ce4ac8d1f..000000000000 --- a/dev-java/servletapi/files/digest-servletapi-2.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 4ab97805b2ba8b55ba21ff580f99ed6a servletapi-2.2-20021101.tar.gz 65342 diff --git a/dev-java/servletapi/files/digest-servletapi-2.2-r1 b/dev-java/servletapi/files/digest-servletapi-2.2-r1 new file mode 100644 index 000000000000..e41ce4ac8d1f --- /dev/null +++ b/dev-java/servletapi/files/digest-servletapi-2.2-r1 @@ -0,0 +1 @@ +MD5 4ab97805b2ba8b55ba21ff580f99ed6a servletapi-2.2-20021101.tar.gz 65342 diff --git a/dev-java/servletapi/files/digest-servletapi-2.3 b/dev-java/servletapi/files/digest-servletapi-2.3 deleted file mode 100644 index a28f1848bdb6..000000000000 --- a/dev-java/servletapi/files/digest-servletapi-2.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 93c8d908366f778d893ef672803a764a servletapi-2.3-20021101.tar.gz 127874 diff --git a/dev-java/servletapi/files/digest-servletapi-2.3-r1 b/dev-java/servletapi/files/digest-servletapi-2.3-r1 new file mode 100644 index 000000000000..a28f1848bdb6 --- /dev/null +++ b/dev-java/servletapi/files/digest-servletapi-2.3-r1 @@ -0,0 +1 @@ +MD5 93c8d908366f778d893ef672803a764a servletapi-2.3-20021101.tar.gz 127874 diff --git a/dev-java/servletapi/servletapi-2.2-r1.ebuild b/dev-java/servletapi/servletapi-2.2-r1.ebuild new file mode 100644 index 000000000000..f586e5fb6c89 --- /dev/null +++ b/dev-java/servletapi/servletapi-2.2-r1.ebuild @@ -0,0 +1,40 @@ +# 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-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/${PN}-${PV}-20021101.tar.gz" +DEPEND=">=virtual/jdk-1.3 + >=dev-java/ant-1.4" +RDEPEND=">=virtual/jre-1.3" +LICENSE="Apache-1.1" +SLOT="2.2" +KEYWORDS="x86 ~sparc ~ppc amd64" +IUSE="jikes doc" + +src_compile() { + local myc + + 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/${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 + + dodoc dist/README.txt +} diff --git a/dev-java/servletapi/servletapi-2.2.ebuild b/dev-java/servletapi/servletapi-2.2.ebuild deleted file mode 100644 index ebb2ee7334ce..000000000000 --- a/dev-java/servletapi/servletapi-2.2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# 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 $ - -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" -DEPEND=">=virtual/jdk-1.3 - >=dev-java/ant-1.4" -RDEPEND=">=virtual/jre-1.3" -LICENSE="Apache-1.1" -SLOT="2.2" -KEYWORDS="x86 ~sparc ~ppc amd64" -IUSE="jikes doc" - -src_compile() { - local myc - - 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" - - if [ -n "`use doc`" ] ; then - dohtml -r servletapi/docs/* - fi -} - -pkg_postinst() { - einfo "Check the servlet API Docs in /usr/share/doc/" -} - diff --git a/dev-java/servletapi/servletapi-2.3-r1.ebuild b/dev-java/servletapi/servletapi-2.3-r1.ebuild new file mode 100644 index 000000000000..b246e7211f0f --- /dev/null +++ b/dev-java/servletapi/servletapi-2.3-r1.ebuild @@ -0,0 +1,38 @@ +# 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-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/${PN}-${PV}-20021101.tar.gz" +DEPEND=">=virtual/jdk-1.3 + >=dev-java/ant-1.4" +RDEPEND=">=virtual/jre-1.3" +LICENSE="Apache-1.1" +SLOT="2.3" +KEYWORDS="x86 ~sparc ~ppc amd64" +IUSE="jikes doc" + +src_compile() { + local myc + + if [ -n "`use jikes`" ] ; then + myc="${myc} -Dbuild.compiler=jikes" + fi + cd ${S} + ANT_OPTS=${myc} ant all +} + +src_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/* + fi + + dodoc dist/README.txt +} diff --git a/dev-java/servletapi/servletapi-2.3.ebuild b/dev-java/servletapi/servletapi-2.3.ebuild deleted file mode 100644 index b963870d3c0b..000000000000 --- a/dev-java/servletapi/servletapi-2.3.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# 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 $ - -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" -DEPEND=">=virtual/jdk-1.3 - >=dev-java/ant-1.4" -RDEPEND=">=virtual/jre-1.3" -LICENSE="Apache-1.1" -SLOT="2.3" -KEYWORDS="x86 ~sparc ~ppc amd64" -IUSE="jikes doc" - -src_compile() { - local myc - - if [ -n "`use jikes`" ] ; then - myc="${myc} -Dbuild.compiler=jikes" - fi - cd ${S} - ANT_OPTS=${myc} ant all -} - -src_install () { - mv dist/lib/servlet.jar dist/lib/servlet-${PV}.jar - dojar dist/lib/servlet-${PV}.jar || die "Unable to install" - - if [ -n "`use doc`" ] ; then - dohtml -r dist/docs/* - fi - - dodoc dist/README.txt -} - -pkg_postinst() { - einfo "Check the servlet API Docs in /usr/share/doc/" -} -- cgit v1.2.3-65-gdbad