diff options
-rw-r--r-- | dev-java/servletapi/ChangeLog | 8 | ||||
-rw-r--r-- | dev-java/servletapi/servletapi-2.2.ebuild | 15 | ||||
-rw-r--r-- | dev-java/servletapi/servletapi-2.3.ebuild | 14 |
3 files changed, 26 insertions, 11 deletions
diff --git a/dev-java/servletapi/ChangeLog b/dev-java/servletapi/ChangeLog index de80b3f16fdc..84c1d551a0b1 100644 --- a/dev-java/servletapi/ChangeLog +++ b/dev-java/servletapi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/servletapi -# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/ChangeLog,v 1.3 2003/02/12 05:54:34 vapier Exp $ +# 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 $ + + 21 Jan 2004; Adrian Almenar <strider@gentoo.org> servletapi-2.2.ebuild, + servletapi-2.3.ebuild: + Added ~sparc ~ppc amd64 Keywords. *servletapi-2.3 (02 Nov 2002) diff --git a/dev-java/servletapi/servletapi-2.2.ebuild b/dev-java/servletapi/servletapi-2.2.ebuild index 10de753f7bdb..ebb2ee7334ce 100644 --- a/dev-java/servletapi/servletapi-2.2.ebuild +++ b/dev-java/servletapi/servletapi-2.2.ebuild @@ -1,6 +1,8 @@ # 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.5 2004/01/14 04:00:59 strider Exp $ +# $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" @@ -11,8 +13,8 @@ DEPEND=">=virtual/jdk-1.3 RDEPEND=">=virtual/jre-1.3" LICENSE="Apache-1.1" SLOT="2.2" -KEYWORDS="x86" -IUSE="jikes" +KEYWORDS="x86 ~sparc ~ppc amd64" +IUSE="jikes doc" src_compile() { local myc @@ -29,8 +31,11 @@ src_install () { cd .. cd dist mv servletapi/lib/servlet.jar servletapi/lib/servlet-${PV}.jar - dojar servletapi/lib/servlet-${PV}.jar || die "Unable to install" - dohtml -r servletapi/docs/* + java-pkg_dojar servletapi/lib/servlet-${PV}.jar || die "Unable to install" + + if [ -n "`use doc`" ] ; then + dohtml -r servletapi/docs/* + fi } pkg_postinst() { diff --git a/dev-java/servletapi/servletapi-2.3.ebuild b/dev-java/servletapi/servletapi-2.3.ebuild index 31bd94f32933..b963870d3c0b 100644 --- a/dev-java/servletapi/servletapi-2.3.ebuild +++ b/dev-java/servletapi/servletapi-2.3.ebuild @@ -1,6 +1,8 @@ # 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.5 2004/01/14 04:00:59 strider Exp $ +# $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" @@ -11,8 +13,8 @@ DEPEND=">=virtual/jdk-1.3 RDEPEND=">=virtual/jre-1.3" LICENSE="Apache-1.1" SLOT="2.3" -KEYWORDS="x86" -IUSE="jikes" +KEYWORDS="x86 ~sparc ~ppc amd64" +IUSE="jikes doc" src_compile() { local myc @@ -27,7 +29,11 @@ src_compile() { src_install () { mv dist/lib/servlet.jar dist/lib/servlet-${PV}.jar dojar dist/lib/servlet-${PV}.jar || die "Unable to install" - dohtml -r dist/docs/* + + if [ -n "`use doc`" ] ; then + dohtml -r dist/docs/* + fi + dodoc dist/README.txt } |