diff options
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/tomcat-servlet-api/Manifest | 7 | ||||
| -rw-r--r-- | dev-java/xstream/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/xstream/Manifest | 7 | ||||
| -rw-r--r-- | dev-java/xstream/files/xstream-1.2-javadoc-fix.patch | 12 | ||||
| -rw-r--r-- | dev-java/xstream/xstream-1.2-r1.ebuild | 83 | ||||
| -rw-r--r-- | dev-java/xstream/xstream-1.3.1-r1.ebuild | 4 |
6 files changed, 12 insertions, 107 deletions
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest index cc98d9e90df3..d2b370c73530 100644 --- a/dev-java/tomcat-servlet-api/Manifest +++ b/dev-java/tomcat-servlet-api/Manifest @@ -2,17 +2,14 @@ AUX 2.5-build.xml 2864 RMD160 d69af37473e7526f17ce99d7e5e624d2edac630b SHA1 f3da AUX jsp-api-2.0-manifest 474 RMD160 a443fc3b2085d4eb9bb494202025e03e8123f9e9 SHA1 b2886991939e7270a006bc91e17524c3a75fc68d SHA256 62c4ac2cef5685a2a631270034a945b1eaf774e89362486e27fd357dd928cfd0 AUX servlet-api-2.4-manifest 310 RMD160 7ac278202ae5e30561cea42d602504bbdbb84dae SHA1 4faf5f3e370e8b2741b7eeae9a5181853b496eda SHA256 134371e8d3d0b137096e268df05751c4bcb29911d62746c70510253d6b334fd5 DIST apache-tomcat-4.1.36-src.tar.gz 3715200 RMD160 344230cac551a483cef439153dd18bc5ff570f1a SHA1 7116af55e2e3f964d834da325694e2d4f9a27a36 SHA256 51f9139f10cd865fc331cf5def49faa718ab4a510790af3582b4189a48a5b951 -DIST apache-tomcat-5.5.26-src.tar.gz 5062991 RMD160 c82e7640b36c27cfc6ea51f01dc3ff492441a930 SHA1 1eb1c479023d3a7e459ce03860d9d984b673ab27 SHA256 ddc677d7391c438e6102d0b3e9653eaca661344ef74b0260c1f488340d660395 DIST apache-tomcat-5.5.27-src.tar.gz 7382057 RMD160 8114fa3be19fd28a5d2d0d7e7087f6d82e0f111f SHA1 c6217d78d2e64fa839a30372bd2724ba75030c14 SHA256 90bc8abcddda604e855c37035653b1e24b31c2f09b7a29235e92d65025f7a334 DIST apache-tomcat-6.0.18-src.tar.gz 3484249 RMD160 ef85db0d65a4f3bdd3ca821420d06535050b6a93 SHA1 9182b0d6b2d0cb2d60f04be6211f3b3516bc518e SHA256 f5ad5dd12e221d75e25234ca734fb434cf45f3fcea93623232a73dc9bfd03dc4 DIST apache-tomcat-6.0.20-src.tar.gz 3590562 RMD160 65b1b56132c03855e352e44a24b761bccd65b90c SHA1 ab538484d8d05c83a69c70ab6bf07606282633d8 SHA256 e8f709f0aeda8e164362144aca253249f050bc330e622dbb4196434db9933298 DIST jakarta-servletapi-src.tar.gz 65342 RMD160 9fc0def14700c4850455da1312e50135fd56eea9 SHA1 ffa93e8b69e0aa4384b7ce4cbb7f4552b6dd467a SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 EBUILD tomcat-servlet-api-3.ebuild 992 RMD160 c388b29733e80b91140018dc4ad5a4b2684a85d8 SHA1 2f43377ad740098f2ad930d349c4ec364dbfe5ca SHA256 e146ac9b46608f4628ae87beb66277de2fb88b7999c34736f40aafa762d22af8 EBUILD tomcat-servlet-api-4.1.36.ebuild 1104 RMD160 da01608d88b65a1c5868734743b2becab23c8aca SHA1 2ede17ed40b46625f0db56c6dea89171ea1cdcfb SHA256 8b41296e4f416df8fa9881d7f953603bb414d199691e8d4e2c2f9d4986dd2b8a -EBUILD tomcat-servlet-api-5.5.26.ebuild 1584 RMD160 2394b11291ca8baf4392bc4affad2c7afe711ecc SHA1 2db1559c0add43b29cb71db60f88f09800c0745b SHA256 9f59b58dcd58b8873421c142ecf49dcc797f978a20f61101cec1fdb3e32e8a99 -EBUILD tomcat-servlet-api-5.5.27-r1.ebuild 1530 RMD160 e350ec023732d55e4efd065db00790a576d39312 SHA1 ecdc0954f721c9dd27a27a9af1534840a7bed6df SHA256 7f77811579a65f8ae5ec9bf63b0c4c5d843eea7e92a86825d3aaee116782317b -EBUILD tomcat-servlet-api-5.5.27.ebuild 1585 RMD160 0be08cfa97abcc4474f40d2eca120fc1d237fce0 SHA1 5f87bd989a3d3ba563ed24937bb7faa909d551fc SHA256 3e1934445c8a022edb1f95c73f3f055be43be9360cfd5b405db9e6faa6fa3b9d +EBUILD tomcat-servlet-api-5.5.27-r1.ebuild 1530 RMD160 1cf361e84482f3567fc7b3546cf11105295fe972 SHA1 2f56859d8049ad50b721a354898e0fe9f0557f7e SHA256 fb0ab419553d8ce5cd2d24ad590a49d6fce8246f401b8c2c46370fd9bb3a3292 EBUILD tomcat-servlet-api-6.0.18.ebuild 950 RMD160 c0122ad6f6b49a5e160c73c08e60cc7d5555be35 SHA1 6c4d2d10d5ae15c68d12382fcc6af673fff0d942 SHA256 13d996d9f8637203cc3283f59331022b14f95ff62c4c232c1b2a1e535b0255e3 EBUILD tomcat-servlet-api-6.0.20.ebuild 1004 RMD160 e1c3406a677c97e3e57239cc8624043f8d739799 SHA1 0c4ad1a6ff1fe67dde4cfd42d772c326eee800b9 SHA256 04281c523a4e424b64ead4b80b16ba5f6ce2a65c033cf21674a0ebced5598528 -MISC ChangeLog 11944 RMD160 5ec34cd6a6abbd5f652d8bfcb1ea0455e36a657c SHA1 f16cbbd290d9b576d6e032eec98f30afcd35174f SHA256 e6a4b81dabcbc686eee50628b6b1b2e7a2753ccfc1299ed4f1db69062deb5389 +MISC ChangeLog 12140 RMD160 d1518a3b09d8d3890d52baaf1e1530811bd5756e SHA1 b4df1fcc9484e2ce6f0379d6023607685346cf26 SHA256 e97ec9044e25a0471485c346690562d555a421063f11d07479725b73f1b55080 MISC metadata.xml 265 RMD160 a2216ab83ce6380767c2b520d7db29fbac39758c SHA1 33a911d99c033f3cab73367890ae18925c3b2ce7 SHA256 6b387cd849d192d7139aa572a2638fd4d44d99d7ea78e30f26b0f3f4baeab84b diff --git a/dev-java/xstream/ChangeLog b/dev-java/xstream/ChangeLog index ca48d1c49eda..39d5870578b3 100644 --- a/dev-java/xstream/ChangeLog +++ b/dev-java/xstream/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/xstream # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/ChangeLog,v 1.27 2010/01/20 02:53:05 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/ChangeLog,v 1.28 2010/01/22 11:08:38 caster Exp $ + + 22 Jan 2010; Vlastimil Babka <caster@gentoo.org> -xstream-1.2-r1.ebuild, + -files/xstream-1.2-javadoc-fix.patch, xstream-1.3.1-r1.ebuild: + Add missing test deps on ant-junit and ant-trax, remove old. 20 Jan 2010; Brent Baude <ranger@gentoo.org> xstream-1.3.1-r1.ebuild: Marking xstream-1.3.1-r1 ppc64 for bug 287619 diff --git a/dev-java/xstream/Manifest b/dev-java/xstream/Manifest index 293b9729e77a..ca3e3c651403 100644 --- a/dev-java/xstream/Manifest +++ b/dev-java/xstream/Manifest @@ -1,7 +1,4 @@ -AUX xstream-1.2-javadoc-fix.patch 829 RMD160 64385a5c8ca0750438cebb0ba547073bfbe73536 SHA1 eeca9df4c01083fc05fe67bd8c7abc427621f178 SHA256 b2aadc0ef4857240b31a248a37e532388ce2c45517f348df9ab3bb566948c828 -DIST xstream-1.2.zip 5488349 RMD160 1f55cf75c8ed2cf2746727e3435b119c5caa1eff SHA1 e0713b355dea36be4951299e441ffd510eee6d19 SHA256 7536d9b1f2bf1c1b235d1a1114dbdae08a8ed5953b1fe7a2c760bf807770e26d DIST xstream-distribution-1.3.1-src.zip 7505723 RMD160 01b0993881adc569d16fbb7df72def0046f44258 SHA1 7eace8ba0cc4c3cd7d5d8d31bc394b5b28613ed8 SHA256 df645ea4e2e16c4a149fb45966ea50d48b54776ead4727837348195daad94f6b -EBUILD xstream-1.2-r1.ebuild 1921 RMD160 84e152a318d6844eef338288f83ad1c007b791e8 SHA1 586e44807cee8e81a069aa4d8dafb9b699a2fc7f SHA256 8abae74ae6a1b277340f40602ac83ed3e8a93a01ab5e8855312ba1f6961e2dfe -EBUILD xstream-1.3.1-r1.ebuild 2048 RMD160 b1f7038f2ce09d8e7761453add45b2feba7842dc SHA1 9dcee09af8e5af2bf664c305512977f499e1c905 SHA256 3a3ac6b611c623389ffa13dc029a8a9601d4b4e8a99e1fa920a5707f957e2aef -MISC ChangeLog 3887 RMD160 56e3a1a791b154297a861396dc4536c8d160e233 SHA1 7563b11a6d01509037022eea1b76f713fdebf8ef SHA256 6b7ba77a92f2b221e118736e4ec268fe91c170a3ac2c797165b2b931abd166c8 +EBUILD xstream-1.3.1-r1.ebuild 2089 RMD160 866c4fb8a66c16f2d6cec1679199458992004f2d SHA1 6ec7b0adb1d1343c096c5a2eefa344dcc14204b9 SHA256 ba702a1042dc60c2c37d84167c43c11895d1c38142cd24df640298f937ae7246 +MISC ChangeLog 4091 RMD160 8818d0c346e5d5b2ad7392073d40dbd660fdf328 SHA1 96e54a500a88302bab381311f8d6c324d64668cc SHA256 5743934a63d47dbd5c219f25e94c9bccb17263c9904a775928318ec708fa637b MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb diff --git a/dev-java/xstream/files/xstream-1.2-javadoc-fix.patch b/dev-java/xstream/files/xstream-1.2-javadoc-fix.patch deleted file mode 100644 index 4b46558d058d..000000000000 --- a/dev-java/xstream/files/xstream-1.2-javadoc-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- build.xml.orig 2008-01-08 19:35:17.000000000 +1300 -+++ build.xml 2008-01-08 19:39:04.000000000 +1300 -@@ -141,6 +141,9 @@ - <packageset dir="src/java" defaultexcludes="yes"> - <exclude name="com/thoughtworks/xstream/core/**"/> - <exclude name="com/thoughtworks/xstream/io/xml/xppdom/**"/> -+ <excludesfile name="jdk-1.5-minimum.txt" unless="jdk1.5.available" /> -+ <excludesfile name="jdk-1.5-specific.txt" unless="jdk1.5.available" /> -+ <excludesfile name="jdk-1.4-specific.txt" unless="jdk1.4.available" /> - </packageset> - <doctitle><![CDATA[<h1>XStream ${version}</h1>]]></doctitle> - <bottom><![CDATA[<i>Joe Walnes, <a href="http://xstream.codehaus.org">http://xstream.codehaus.org/</a></i>]]></bottom> diff --git a/dev-java/xstream/xstream-1.2-r1.ebuild b/dev-java/xstream/xstream-1.2-r1.ebuild deleted file mode 100644 index edbe7eb8c742..000000000000 --- a/dev-java/xstream/xstream-1.2-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/xstream-1.2-r1.ebuild,v 1.7 2009/11/17 14:46:49 caster Exp $ - -JAVA_PKG_IUSE="doc examples java5 source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="A text-processing Java classes that serialize objects to XML and back again." -HOMEPAGE="http://xstream.codehaus.org/index.html" -SRC_URI="http://dist.codehaus.org/xstream/distributions/${P}.zip" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="ppc" -IUSE="" - -COMMON_DEPS=" - >=dev-java/commons-lang-2.1 - =dev-java/cglib-2.1* - >=dev-java/dom4j-1.3 - dev-java/jsr173 - ~dev-java/jdom-1.0 - =dev-java/jmock-1* - >=dev-java/joda-time-1.2 - dev-java/xom - >=dev-java/xpp3-1.1.3.4 - =dev-java/xml-commons-external-1.3* -" -#test? ( -# dev-java/ant-junit -# dev-java/ant-trax -# dev-java/xml-writer -# dev-java/stax -# ) - -DEPEND="java5? ( >=virtual/jdk-1.5 ) - !java5? ( =virtual/jdk-1.4* ) - app-arch/unzip - ${COMMON_DEPS}" -RDEPEND=">=virtual/jre-1.4 - ${COMMON_DEPS}" - -JAVA_PKG_BSFIX="off" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${P}-javadoc-fix.patch" - rm -v *.jar || die - rm -v lib/jdk1.3/*.jar || die - cd "${S}/lib" - rm -v *.jar - java-pkg_jar-from xml-commons-external-1.3 - java-pkg_jar-from jsr173 - java-pkg_jar-from cglib-2.1 - java-pkg_jar-from commons-lang-2.1 - java-pkg_jar-from dom4j-1 - java-pkg_jar-from jdom-1.0 - java-pkg_jar-from jmock-1.0 - java-pkg_jar-from joda-time - java-pkg_jar-from xom - java-pkg_jar-from xpp3 - java-pkg_filter-compiler jikes -} - -# Restricted until we get keywords for deps. See: -# https://bugs.gentoo.org/show_bug.cgi?id=184234 -RESTRICT="test" - -src_test() { - java-pkg_jar-from --into lib junit,xml-writer,stax - ANT_TASKS="ant-junit ant-trax" eant test -} - -src_install() { - java-pkg_newjar ${P}.jar - - if use doc; then - java-pkg_dojavadoc javadoc - fi - use source && java-pkg_dosrc src/java/com -} diff --git a/dev-java/xstream/xstream-1.3.1-r1.ebuild b/dev-java/xstream/xstream-1.3.1-r1.ebuild index 58f20ad33668..cd137255ce10 100644 --- a/dev-java/xstream/xstream-1.3.1-r1.ebuild +++ b/dev-java/xstream/xstream-1.3.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/xstream-1.3.1-r1.ebuild,v 1.5 2010/01/20 02:53:05 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/xstream-1.3.1-r1.ebuild,v 1.6 2010/01/22 11:08:38 caster Exp $ EAPI=1 JAVA_PKG_IUSE="doc source test" @@ -28,6 +28,8 @@ COMMON_DEPS=" dev-java/jettison:0 java-virtuals/stax-api test? ( + dev-java/ant-junit + dev-java/ant-trax dev-java/junit:0 dev-java/xml-writer:0 dev-java/commons-lang:2.1 |