Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-java/servletapi
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java/servletapi')
-rw-r--r--dev-java/servletapi/ChangeLog6
-rw-r--r--dev-java/servletapi/Manifest18
-rw-r--r--dev-java/servletapi/files/digest-servletapi-2.3-r11
-rw-r--r--dev-java/servletapi/servletapi-2.2-r1.ebuild27
-rw-r--r--dev-java/servletapi/servletapi-2.3-r1.ebuild35
-rw-r--r--dev-java/servletapi/servletapi-2.3-r2.ebuild6
6 files changed, 21 insertions, 72 deletions
diff --git a/dev-java/servletapi/ChangeLog b/dev-java/servletapi/ChangeLog
index 6d032e12d4a9..3c18634a3199 100644
--- a/dev-java/servletapi/ChangeLog
+++ b/dev-java/servletapi/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/servletapi
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/ChangeLog,v 1.32 2005/06/04 22:04:46 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/ChangeLog,v 1.33 2005/07/09 16:07:56 axxo Exp $
+
+ 09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> servletapi-2.2-r1.ebuild,
+ -servletapi-2.3-r1.ebuild, servletapi-2.3-r2.ebuild:
+ small cleanups
04 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org>
servletapi-2.4-r2.ebuild:
diff --git a/dev-java/servletapi/Manifest b/dev-java/servletapi/Manifest
index d66dc2bff879..9a385c3e5ab5 100644
--- a/dev-java/servletapi/Manifest
+++ b/dev-java/servletapi/Manifest
@@ -1,21 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8859ae9f02b0713a987a38defb62d946 servletapi-2.2-r1.ebuild 1004
+MD5 a681b7eed76f451886e6bb2ae638f12f servletapi-2.2-r1.ebuild 930
MD5 65a7da8781643b6099e5b75b6c098fdc servletapi-2.4-r2.ebuild 1485
-MD5 8a936871d7a2d73ea5dcde25b3eff820 servletapi-2.3-r2.ebuild 974
-MD5 d9cf7f157cb40ea323f6ae81ca963d42 ChangeLog 4584
+MD5 b861fed1c8969de9e4c9b0ce155bdf84 servletapi-2.3-r2.ebuild 967
+MD5 99c89d705cbe745babd7283a2bb03ed1 ChangeLog 4732
MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 2836cf7dc4f5a6ab9bcc8ba2e71dffc8 servletapi-2.3-r1.ebuild 975
MD5 9a8f107226db82b54f939c300a6d68e5 files/gentoo-servletapi-2.4-patch 4281
MD5 130423ce821911d5ddc38a30df67574b files/digest-servletapi-2.2-r1 74
-MD5 dcffc47728eefea370d29b3bf0d11158 files/digest-servletapi-2.3-r1 75
MD5 dcffc47728eefea370d29b3bf0d11158 files/digest-servletapi-2.3-r2 75
MD5 b0c3c4a010bfa47361652ebf6d68ea77 files/digest-servletapi-2.4-r2 78
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCoiWQ06ebR+OMO78RAkxFAJ4uuUdGIOkjOL0Qw2mMgJ6GTyKGCgCeOGXr
-splG1CdyBy787ypgg9c7v8k=
-=AZp5
------END PGP SIGNATURE-----
diff --git a/dev-java/servletapi/files/digest-servletapi-2.3-r1 b/dev-java/servletapi/files/digest-servletapi-2.3-r1
deleted file mode 100644
index a28f1848bdb6..000000000000
--- a/dev-java/servletapi/files/digest-servletapi-2.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-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
index bda83058c83c..4dff3986fb02 100644
--- a/dev-java/servletapi/servletapi-2.2-r1.ebuild
+++ b/dev-java/servletapi/servletapi-2.2-r1.ebuild
@@ -1,13 +1,12 @@
# Copyright 1999-2005 Gentoo Foundation
# 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.6 2005/03/23 12:09:11 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.2-r1.ebuild,v 1.7 2005/07/09 16:07:56 axxo 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"
+SRC_URI="mirror://gentoo/${P}-20021101.tar.gz"
DEPEND=">=virtual/jdk-1.3
>=dev-java/ant-core-1.4
jikes? ( dev-java/jikes )"
@@ -16,26 +15,20 @@ LICENSE="Apache-1.1"
SLOT="2.2"
KEYWORDS="x86 ~sparc ~ppc amd64"
IUSE="jikes doc"
+S=${WORKDIR}/jakarta-servletapi-src
src_compile() {
- local myc
+ local antflags="all"
- if use jikes ; then
- myc="${myc} -Dbuild.compiler=jikes"
- fi
- cd ${S}
- ANT_OPTS=${myc} ant all
+ use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+ ant ${antflags} || die "failed to compile"
}
-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"
+src_install() {
+ cd ../dist
+ java-pkg_dojar servletapi/lib/servlet.jar || die "Unable to install"
- if use doc ; then
- java-pkg_dohtml -r servletapi/docs/*
- fi
+ use doc && java-pkg_dohtml -r servletapi/docs/*
dodoc dist/README.txt
}
diff --git a/dev-java/servletapi/servletapi-2.3-r1.ebuild b/dev-java/servletapi/servletapi-2.3-r1.ebuild
deleted file mode 100644
index 6fef0ed50875..000000000000
--- a/dev-java/servletapi/servletapi-2.3-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# 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.11 2005/06/04 16:02:01 luckyduck 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"
-
-LICENSE="Apache-1.1"
-SLOT="2.3"
-KEYWORDS="x86 sparc ppc amd64 ppc64"
-IUSE="doc jikes source"
-
-DEPEND=">=virtual/jdk-1.3
- >=dev-java/ant-core-1.4
- jikes? ( dev-java/jikes )
- source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.3"
-
-src_compile() {
- local antflags="all"
- use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
- ant ${antflags} || die "compilation failed"
-}
-
-src_install () {
- java-pkg_dojar dist/lib/servlet.jar
-
- use doc && java-pkg_dohtml -r dist/docs/*
- use source && java-pkg_dosrc src/share/javax
- dodoc dist/README.txt
-}
diff --git a/dev-java/servletapi/servletapi-2.3-r2.ebuild b/dev-java/servletapi/servletapi-2.3-r2.ebuild
index 91613f6f4f3e..c7d6decec2c6 100644
--- a/dev-java/servletapi/servletapi-2.3-r2.ebuild
+++ b/dev-java/servletapi/servletapi-2.3-r2.ebuild
@@ -1,13 +1,12 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.3-r2.ebuild,v 1.1 2005/06/04 16:02:01 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.3-r2.ebuild,v 1.2 2005/07/09 16:07:56 axxo 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"
+SRC_URI="mirror://gentoo/${P}-20021101.tar.gz"
LICENSE="Apache-1.1"
SLOT="2.3"
@@ -19,6 +18,7 @@ DEPEND=">=virtual/jdk-1.3
jikes? ( dev-java/jikes )
source? ( app-arch/zip )"
RDEPEND=">=virtual/jre-1.3"
+S=${WORKDIR}/jakarta-servletapi-4
src_compile() {
local antflags="all"