From 948365b815196f4c80902ca0001928d867509b9b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petteri=20R=C3=A4ty?= Date: Sat, 28 Apr 2007 18:02:58 +0000 Subject: [PATCH] Add missing dev-java/servletapi to RDEPEND and switch to java-pkg_dojavadoc. Package-Manager: portage-2.1.2.5 --- dev-java/cos/ChangeLog | 7 +++++-- dev-java/cos/Manifest | 26 ++++++++++++++++++-------- dev-java/cos/cos-20021105-r1.ebuild | 14 +++++++------- 3 files changed, 30 insertions(+), 17 deletions(-) diff --git a/dev-java/cos/ChangeLog b/dev-java/cos/ChangeLog index a6af1a300eaa..a3c5704712f2 100644 --- a/dev-java/cos/ChangeLog +++ b/dev-java/cos/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/cos -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/cos/ChangeLog,v 1.1 2007/02/10 19:42:01 nichoj Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/cos/ChangeLog,v 1.2 2007/04/28 18:02:58 betelgeuse Exp $ + + 28 Apr 2007; Petteri Räty cos-20021105-r1.ebuild: + Add missing dev-java/servletapi to RDEPEND and switch to java-pkg_dojavadoc. *cos-20021105-r1 (10 Feb 2007) diff --git a/dev-java/cos/Manifest b/dev-java/cos/Manifest index 6a5a16128c8e..d75f53d9e3b4 100644 --- a/dev-java/cos/Manifest +++ b/dev-java/cos/Manifest @@ -1,16 +1,19 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX build-20021105.xml 1546 RMD160 ebd507967b0bb2fabe2aac044ef60e3785189654 SHA1 68699e0269a51d6f4eba82e5b15bd485974d8084 SHA256 db486d24f063b5ec263d6da56b52dd2a7cae686cb9c347fb9702cc0d3dda7868 MD5 c089b7d34f96c556a34bb8c402794023 files/build-20021105.xml 1546 RMD160 ebd507967b0bb2fabe2aac044ef60e3785189654 files/build-20021105.xml 1546 SHA256 db486d24f063b5ec263d6da56b52dd2a7cae686cb9c347fb9702cc0d3dda7868 files/build-20021105.xml 1546 DIST cos-05Nov2002.zip 372387 RMD160 74b16e245513750cd81f362325c0da58ed1c2f8c SHA1 f8e45bc5b86bb9a14133ce63b036d113728039ca SHA256 96f9959e8252eddacce24b592a9c4c1dbf0082749115d7e75619504f70df1d90 -EBUILD cos-20021105-r1.ebuild 1188 RMD160 e572b6a9d96bc47cb77d4c302faa4ed236f2b448 SHA1 d48de08d497d70ade6682ff2b1ea930760970381 SHA256 8c6f4dfbd2f2c847217a3d6db6d449bde6f58d1eed90ffce4111ba2e76883a4e -MD5 98f81d830abc5b9812186bf10ce7de7d cos-20021105-r1.ebuild 1188 -RMD160 e572b6a9d96bc47cb77d4c302faa4ed236f2b448 cos-20021105-r1.ebuild 1188 -SHA256 8c6f4dfbd2f2c847217a3d6db6d449bde6f58d1eed90ffce4111ba2e76883a4e cos-20021105-r1.ebuild 1188 -MISC ChangeLog 379 RMD160 7e0f34683d042f0e56cc4f9a6e39806e6963f126 SHA1 64fd4d9213fdd94995f1daf5b82898233deb0e49 SHA256 49f602099ed9bd1e6cea9e9f6424f65a4bdff81ddef3410689555a7251d26bca -MD5 e50c7f11e7e43bc3a9f148a4c52b0ad0 ChangeLog 379 -RMD160 7e0f34683d042f0e56cc4f9a6e39806e6963f126 ChangeLog 379 -SHA256 49f602099ed9bd1e6cea9e9f6424f65a4bdff81ddef3410689555a7251d26bca ChangeLog 379 +EBUILD cos-20021105-r1.ebuild 1192 RMD160 0f59ca10782a2ad0e0d7904d5f2256480a89cccd SHA1 08ab3ddbab7d54853eaa4d6fbf708f29a1a60378 SHA256 f9aa3aa615208cf9588f70362c02bec27ec702757e3ab4c7dac4574975b8bf37 +MD5 79f3d749d041667e6218ec627a653fe0 cos-20021105-r1.ebuild 1192 +RMD160 0f59ca10782a2ad0e0d7904d5f2256480a89cccd cos-20021105-r1.ebuild 1192 +SHA256 f9aa3aa615208cf9588f70362c02bec27ec702757e3ab4c7dac4574975b8bf37 cos-20021105-r1.ebuild 1192 +MISC ChangeLog 540 RMD160 fd2d33debbb4ff0b3c9a751d068371d208b106e3 SHA1 7ed254e2c3cff2a80649de32993ef5f8063b60f4 SHA256 2f510b84bfed6e0c47aee22ebb12343560dd48ebd459756ed6bcebbc6cb64be7 +MD5 04246f5deaa1b23b5d28f9de36d4ecf2 ChangeLog 540 +RMD160 fd2d33debbb4ff0b3c9a751d068371d208b106e3 ChangeLog 540 +SHA256 2f510b84bfed6e0c47aee22ebb12343560dd48ebd459756ed6bcebbc6cb64be7 ChangeLog 540 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158 @@ -18,3 +21,10 @@ SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata MD5 4faf8e22934e91a94551904f2a50227b files/digest-cos-20021105-r1 232 RMD160 b60537162c8304b305e5c6bff14025fa76d67ebb files/digest-cos-20021105-r1 232 SHA256 39477f5e0ac052f27c715c3e9862f5d4c2300d2a67cd11e0d5bad847ce038305 files/digest-cos-20021105-r1 232 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.3 (GNU/Linux) + +iD8DBQFGM4xYcxLzpIGCsLQRAhiUAJwIcFuW5eMNXVqik3xqFdLhuBcmvACdFlTp +9xLnUkVEw5Ff+0ameFxVBxY= +=1XMv +-----END PGP SIGNATURE----- diff --git a/dev-java/cos/cos-20021105-r1.ebuild b/dev-java/cos/cos-20021105-r1.ebuild index c59e874eb1d2..80a52e60d9c3 100644 --- a/dev-java/cos/cos-20021105-r1.ebuild +++ b/dev-java/cos/cos-20021105-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/cos/cos-20021105-r1.ebuild,v 1.1 2007/02/10 19:42:01 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/cos/cos-20021105-r1.ebuild,v 1.2 2007/04/28 18:02:58 betelgeuse Exp $ inherit java-pkg-2 java-ant-2 @@ -15,11 +15,11 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="doc" -DEPEND=">=virtual/jdk-1.4 - app-arch/unzip - dev-java/ant-core" RDEPEND=">=virtual/jre-1.4 =dev-java/servletapi-2.3*" +DEPEND=">=virtual/jdk-1.4 + app-arch/unzip + ${RDEPEND}" S=${WORKDIR} src_unpack() { @@ -42,7 +42,7 @@ src_compile() { src_install() { java-pkg_dojar dist/${PN}.jar - dodoc readme.txt license.txt + dodoc readme.txt license.txt || die - use doc && java-pkg_dohtml -r dist/doc/api + use doc && java-pkg_dojavadoc dist/doc/api } -- 2.26.2