Stylistic cleanup.

Package-Manager: portage-2.1.2.3

diff --git a/dev-java/javassist/Manifest b/dev-java/javassist/Manifest
index c486f436462cd0d9eac501b5f4c4377cda6da115..d2e38820689e59d1852b2d5ddc85be5c8948f979 100644 (file)
--- a/dev-java/javassist/Manifest
+++ b/dev-java/javassist/Manifest
@@ -1,35 +1,38 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX javassist-3.1_rc2-classpath.patch 481 RMD160 42f66a9ff4bc998e1294890c216afbe24bd695c1 SHA1 55efdea7acdd89b53134dfd1d58f4e1cb7865a95 SHA256 047c9afb852501a1fb392dea914690e00b941931a577356233404340e2a7a62b
 MD5 9a19379729e3014becdc23b352edfad2 files/javassist-3.1_rc2-classpath.patch 481
 RMD160 42f66a9ff4bc998e1294890c216afbe24bd695c1 files/javassist-3.1_rc2-classpath.patch 481
 SHA256 047c9afb852501a1fb392dea914690e00b941931a577356233404340e2a7a62b files/javassist-3.1_rc2-classpath.patch 481
 DIST javassist-2.6.zip 1143271 RMD160 3a347906edd778f9aec39a82021a0d6bb9c168fd SHA1 8a66498a5c39d85fe4e6fb13209695a79df8688a SHA256 c77a56714df64996c704c76718d07ea97f582c6eba20711bfd9ecbd468bd02e8
 DIST javassist-3.4.zip 1714086 RMD160 dfab91b6ca74c60a3685480ad596754dd5177ac2 SHA1 93ce5becb770699f9c6d107d0f810cb2f849ce7d SHA256 0f7dc85472d72acf4c74a47ce0d62462218709c6a2f272dc9785e17a524ccaff
-EBUILD javassist-2.6-r1.ebuild 881 RMD160 6b132f8a7fb8902dc3f23fc05134279c997bbcce SHA1 a8dbb5707d3356a27ab5b623f50853c7116d29ae SHA256 c62c8b199583037d3208d8cc1ef3a499d0bc89a1cc5f8d0206962d9bf65831b9
-MD5 d4d1927a0ec282e650ba5fc52ed7e5d4 javassist-2.6-r1.ebuild 881
-RMD160 6b132f8a7fb8902dc3f23fc05134279c997bbcce javassist-2.6-r1.ebuild 881
-SHA256 c62c8b199583037d3208d8cc1ef3a499d0bc89a1cc5f8d0206962d9bf65831b9 javassist-2.6-r1.ebuild 881
-EBUILD javassist-2.6.ebuild 1042 RMD160 7dfee5380fd5bf5b2d65abe42dea0301b8a73f80 SHA1 cce9087c6438c154da7eb693b9c79824085a9311 SHA256 82a7504d522ff91c5b2169d9cbf421297056240ff7684550d0f02b6de7e98873
-MD5 85462849aa82e52b83aa4785f82ac4b5 javassist-2.6.ebuild 1042
-RMD160 7dfee5380fd5bf5b2d65abe42dea0301b8a73f80 javassist-2.6.ebuild 1042
-SHA256 82a7504d522ff91c5b2169d9cbf421297056240ff7684550d0f02b6de7e98873 javassist-2.6.ebuild 1042
+EBUILD javassist-2.6-r1.ebuild 885 RMD160 bfda6ae82c17b42e6744a3a84c24d92767a510da SHA1 fa6f62f52d99ec6c3f585a602de846819717dec2 SHA256 2a9e5d076d2626c27a0eda2a813d8784945053748060b20bdfc3eadf302e100f
+MD5 074dfad31eee7376980b0f3edcf79ea8 javassist-2.6-r1.ebuild 885
+RMD160 bfda6ae82c17b42e6744a3a84c24d92767a510da javassist-2.6-r1.ebuild 885
+SHA256 2a9e5d076d2626c27a0eda2a813d8784945053748060b20bdfc3eadf302e100f javassist-2.6-r1.ebuild 885
 EBUILD javassist-3.4.ebuild 1030 RMD160 208bff4b30a9c1d2a2c8859c77fdcc3eb08c64e9 SHA1 5b4097ebafbc53efc52ae9c254a692ec350f375d SHA256 dd4aa611fc379ab1bf9d2abec4f57630984ae05fd83612b983b7232bc8bcef88
 MD5 8a30e3c70be565e708c7243227236a6d javassist-3.4.ebuild 1030
 RMD160 208bff4b30a9c1d2a2c8859c77fdcc3eb08c64e9 javassist-3.4.ebuild 1030
 SHA256 dd4aa611fc379ab1bf9d2abec4f57630984ae05fd83612b983b7232bc8bcef88 javassist-3.4.ebuild 1030
-MISC ChangeLog 2110 RMD160 cd1d7bb3d445f55d78fc81bace4c6916d23ea425 SHA1 62c9e748e20332a3c238ef47dff5eee548386bbb SHA256 ee287e659f449b9ae6c3288f667115223f2e41801319ae223c88a84f24a59566
-MD5 c1322c06f8900b3c4239ff3fd3225d6e ChangeLog 2110
-RMD160 cd1d7bb3d445f55d78fc81bace4c6916d23ea425 ChangeLog 2110
-SHA256 ee287e659f449b9ae6c3288f667115223f2e41801319ae223c88a84f24a59566 ChangeLog 2110
+MISC ChangeLog 2251 RMD160 cd1566ec9d9ff5e63df0778fe4460fca3833e504 SHA1 818fce7d6f8badec494f6f5d35f21cfc12cc0ff3 SHA256 a6062f109197ff948b8b4589b9c36188e36a4b5ee2dd5ec4a3cb2f2c3b5bf063
+MD5 6863afb36e7f6804611acf3eea5eec17 ChangeLog 2251
+RMD160 cd1566ec9d9ff5e63df0778fe4460fca3833e504 ChangeLog 2251
+SHA256 a6062f109197ff948b8b4589b9c36188e36a4b5ee2dd5ec4a3cb2f2c3b5bf063 ChangeLog 2251
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata.xml 158
-MD5 d53c6f92adda7930d4d6f743349d54b6 files/digest-javassist-2.6 235
-RMD160 e273e35d200d36de8a508e8a68d00d528e34592a files/digest-javassist-2.6 235
-SHA256 cbcd55abedc51b6720c79e5def16f09a4c64add7935988e8eec68f414b08fe51 files/digest-javassist-2.6 235
 MD5 d53c6f92adda7930d4d6f743349d54b6 files/digest-javassist-2.6-r1 235
 RMD160 e273e35d200d36de8a508e8a68d00d528e34592a files/digest-javassist-2.6-r1 235
 SHA256 cbcd55abedc51b6720c79e5def16f09a4c64add7935988e8eec68f414b08fe51 files/digest-javassist-2.6-r1 235
 MD5 79a46e3a2caa7093380de74c51f93c9d files/digest-javassist-3.4 235
 RMD160 540c191c9a89f164d0b0ca7a75a0a6c0cc223733 files/digest-javassist-3.4 235
 SHA256 ae1c2f802bc989f2c5df0f3eacfc302922aad48b6569becde9d503f264028a5a files/digest-javassist-3.4 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGES8QcxLzpIGCsLQRAuniAJ0U7r1QQ9hJoKHuJ+JLI8ZM/Au/HACeJkeW
+0/mZ3D24pOaJ/N8ib6qk5IU=
+=Twff
+-----END PGP SIGNATURE-----

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index 85095f270feeb4bf49868a0b88294cdf4380774d..ac78cab8374480640f856bee58299fd936057678 100644 (file)
--- a/dev-java/tomcat-servlet-api/ChangeLog
+++ b/dev-java/tomcat-servlet-api/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/tomcat-servlet-api
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.17 2007/03/12 23:59:57 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.18 2007/04/02 16:24:27 betelgeuse Exp $
+
+  02 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  tomcat-servlet-api-5.5.23.ebuild, tomcat-servlet-api-6.0.10.ebuild:
+  Stylistic cleanup.
 
   12 Mar 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   tomcat-servlet-api-5.5.20.ebuild, tomcat-servlet-api-5.5.23.ebuild,

diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.23.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.23.ebuild
index ea72374805ed7fd0ea92e70a3fe0dd54b2407c2b..a904d8fea8c11fb452371eb194c0c151deaded3d 100644 (file)
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.23.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.23.ebuild,v 1.2 2007/03/12 23:59:57 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.23.ebuild,v 1.3 2007/04/02 16:24:27 betelgeuse Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -22,13 +22,6 @@ RDEPEND="java5? ( >=virtual/jdk-1.5 )
 
 S="${WORKDIR}/${MY_P}/servletapi"
 
-pkg_setup() {
-       if use java5; then
-               JAVA_PKG_WANT_SOURCE="1.5"
-               JAVA_PKG_WANT_TARGET="1.5"
-       fi
-}
-
 src_compile() {
        local antflags="jar $(use_doc javadoc examples)"
        eant ${antflags} -f jsr154/build.xml

diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10.ebuild
index 59debda74e975d7edbe26f2f19205ce1b353c8c5..b67c4a54e51666421c7fba36d39f6168d5cc92c4 100644 (file)
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10.ebuild,v 1.2 2007/03/12 23:59:57 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10.ebuild,v 1.3 2007/04/02 16:24:27 betelgeuse Exp $
+
+JAVA_PKG_IUSE="source"
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -13,10 +15,8 @@ SRC_URI="mirror://apache/jakarta/tomcat-6/v${PV/_/-}/src/${MY_P}.tar.gz"
 LICENSE="Apache-1.1"
 SLOT="2.5"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="source"
 
-DEPEND=">=virtual/jdk-1.5
-       source? ( app-arch/zip )"
+DEPEND=">=virtual/jdk-1.5"
 RDEPEND=">=virtual/jre-1.5"
 
 S="${WORKDIR}/${MY_P}/"
@@ -29,18 +29,8 @@ src_unpack() {
        rm */*/build.xml
 }
 
-src_compile() {
-#      local antflags="jar $(use_doc javadoc examples)"
-       local antflags="jar"
-       eant ${antflags}
-}
-
 src_install() {
-       cd "${S}/output/build/lib"
-       java-pkg_dojar *.jar
+       java-pkg_dojar "${S}"/output/build/lib/*.jar
 #      use doc && java-pkg_dohtml -r docs/*
-       if use source; then
-               cd "${S}"
-               java-pkg_dosrc java/javax/servlet/
-       fi
+       use source && java-pkg_dosrc java/javax/servlet/
 }