diff options
| author |   Joshua Nichols <nichoj@gentoo.org> | 2005-10-07 14:25:06 +0000 |
|---|---|---|
| committer | Joshua Nichols <nichoj@gentoo.org> | 2005-10-07 14:25:06 +0000 |
| commit | 5eb8ae8d99b45bd8885e47c6dea3d13c6e1c4138 (patch) | |
| tree | 7c814d1453e1ee83d185532dc3c01e2cb2329dad | |
| parent | Version bump committed to official. (diff) | |
| download | java-5eb8ae8d99b45bd8885e47c6dea3d13c6e1c4138.tar.gz java-5eb8ae8d99b45bd8885e47c6dea3d13c6e1c4138.tar.bz2 java-5eb8ae8d99b45bd8885e47c6dea3d13c6e1c4138.zip | |
Way to many things to have kept track of. I really ought to commit more regularly.
SRC_URI I had hosted elsewhere now point at gentooexperimental
Several slot fixes.
Added a package.mask for things in process / that are broken
svn path=/gentoo-java-experimental/; revision=946
246 files changed, 1951 insertions, 797 deletions
diff --git a/README.nichoj b/README.nichoj new file mode 100644 index 00000000..2b3d92ed --- /dev/null +++ b/README.nichoj @@ -0,0 +1,45 @@ + +Notes so I don't forget to fix them eventually: + +################ +# Packages that don't need full ant, only ant-core +################ +dev-java/adaptx +dev-java/xmlrpc +dev-java/joda-time +dev-java/poi +dev-java/joscar +dev-java/asm-1.4 +dev-java/ant-owanttask +dev-java/ant-contrib +dev-java/glazedlists + +################################################### +# Packages that just need ant-tasks for unit tests +# and/or should use src_test for testing +################################################### +dev-java/commons-pool +dev-java/commons-jexl +dev-java/commons-digester +dev-java/commons-discovery +dev-java/commons-httpclient +dev-java/junitperf +dev-java/xpp3 +dev-java/saxpath + +#################################################### +# Broken jikes +################################################### +dev-java/joda-time + + +################################################### +# Get rid of xjavac +################################################### +xerces + + +################################## +# doesn't need ant +################################## +dev-java/trove diff --git a/app-text/jasperreports/Manifest b/app-text/jasperreports/Manifest index 468563f7..f2cf7252 100644 --- a/app-text/jasperreports/Manifest +++ b/app-text/jasperreports/Manifest @@ -1,2 +1,2 @@ -MD5 a7581fdc809cfacddacc432563642f13 jasperreports-0.6.8.ebuild 2229 +MD5 238eaa3831626ea482c5d0bf9216e419 jasperreports-0.6.8.ebuild 2235 MD5 f41cec946fbb9f666c780516d87ffd89 files/digest-jasperreports-0.6.8 78 diff --git a/app-text/jasperreports/jasperreports-0.6.8.ebuild b/app-text/jasperreports/jasperreports-0.6.8.ebuild index 3feb7364..d02c28c6 100644 --- a/app-text/jasperreports/jasperreports-0.6.8.ebuild +++ b/app-text/jasperreports/jasperreports-0.6.8.ebuild @@ -8,7 +8,7 @@ DESCRIPTION="JasperReports is a powerful report-generating tool that has the abi HOMEPAGE="http://jasperreports.sourceforge.net/" SRC_URI="mirror://sourceforge/jasperreports/${P}-project.zip" LICENSE="LGPL-2.1" -SLOT="0" +SLOT="0.6" KEYWORDS="~x86" IUSE="jikes doc" COMMON_DEPEND="=dev-java/itext-1.3* @@ -44,7 +44,7 @@ src_unpack() { java-pkg_jar-from commons-collections java-pkg_jar-from commons-digester java-pkg_jar-from commons-logging - java-pkg_jar-from eclipse-jdtcore jdtcore.jar + java-pkg_jar-from eclipse-jdtcore-3.0 jdtcore.jar java-pkg_jar-from hsqldb hsqldb.jar java-pkg_jar-from poi poi.jar java-pkg_jar-from servletapi-2.3 diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest index 1b746728..27ae501a 100644 --- a/dev-java/ant-ivy/Manifest +++ b/dev-java/ant-ivy/Manifest @@ -1,4 +1,4 @@ -MD5 9baaf15de6262d6cb3c8a37eab237670 ant-ivy-1.1.ebuild 1607 +MD5 de8c1dde41c74cdb56d69d75739dee8c ant-ivy-1.1.ebuild 1626 MD5 996454b479f2fbb15f2067a15aec6a01 files/ivy-1.1-tasks.patch 938 MD5 a4792750a34edc5d5387aa1de0bc6cf1 files/ivy-1.1-noresolve.patch 712 MD5 b7fd9f9cd08ec84aa98975bbb92d6693 files/digest-ant-ivy-1.1 60 diff --git a/dev-java/ant-ivy/ant-ivy-1.1.ebuild b/dev-java/ant-ivy/ant-ivy-1.1.ebuild index b3723cef..ff414601 100644 --- a/dev-java/ant-ivy/ant-ivy-1.1.ebuild +++ b/dev-java/ant-ivy/ant-ivy-1.1.ebuild @@ -21,6 +21,7 @@ LDEPEND="=dev-java/commons-cli-1* dev-java/commons-logging" # TODO test earlier vm? DEPEND=">=virtual/jdk-1.4 + dev-java/ant-core app-arch/unzip jikes? (dev-java/jikes) ${LDEPEND}" diff --git a/dev-java/aopalliance/Manifest b/dev-java/aopalliance/Manifest index 34de5f99..a92ed9af 100644 --- a/dev-java/aopalliance/Manifest +++ b/dev-java/aopalliance/Manifest @@ -1,2 +1,2 @@ -MD5 8fd534d819de95f628525942119298c8 aopalliance-1.0.ebuild 1165 +MD5 24ec0e155779a9063b09aadb6f3ad656 aopalliance-1.0.ebuild 1157 MD5 fd354756e670948cd99f495f781a77ba files/digest-aopalliance-1.0 66 diff --git a/dev-java/aopalliance/aopalliance-1.0.ebuild b/dev-java/aopalliance/aopalliance-1.0.ebuild index 69105c9f..90316259 100644 --- a/dev-java/aopalliance/aopalliance-1.0.ebuild +++ b/dev-java/aopalliance/aopalliance-1.0.ebuild @@ -5,7 +5,7 @@ inherit java-pkg DESCRIPTION="Aspect-Oriented Programming (AOP) Alliance classes" -SRC_URI="http://www.scorec.rpi.edu/~nichoj/projects/java/${P}.tar.bz2" +SRC_URI="http://gentooexperimental.org/distfiles/${P}.tar.bz2" #SRC_URI="mirror://gentoo/${P}.tar.bz2" #cvs -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/aopalliance login # cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/aopalliance export -r interception_1_0 aopalliance diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest index d0091e24..f7225300 100644 --- a/dev-java/asm/Manifest +++ b/dev-java/asm/Manifest @@ -1,4 +1,4 @@ -MD5 da324597e4a127ff9fa86c8356d63d25 asm-1.5.2-r1.ebuild 998 -MD5 8e59733a5694cdd731a3f0756727a9cc asm-2.0.ebuild 996 +MD5 dbc159cb2c1c94f73deb73f21e395712 asm-1.5.2-r1.ebuild 1003 +MD5 eba701c7d6b9b05bd295257af67fe701 asm-2.0.ebuild 1001 MD5 947e688c1e6dc0951aeacfce6f56d645 files/digest-asm-2.0 59 MD5 7d7bc01bc5c7f583f0ab7ef377b4823b files/digest-asm-1.5.2-r1 61 diff --git a/dev-java/asm/asm-1.5.2-r1.ebuild b/dev-java/asm/asm-1.5.2-r1.ebuild index f0e173dc..a294e060 100644 --- a/dev-java/asm/asm-1.5.2-r1.ebuild +++ b/dev-java/asm/asm-1.5.2-r1.ebuild @@ -13,7 +13,7 @@ KEYWORDS="x86 amd64 ppc" IUSE="doc jikes" DEPEND=">=virtual/jdk-1.3 jikes? ( >=dev-java/jikes-1.21 ) - dev-java/ant + dev-java/ant-core dev-java/ant-owanttask" RDEPEND=">=virtual/jre-1.3" diff --git a/dev-java/asm/asm-2.0.ebuild b/dev-java/asm/asm-2.0.ebuild index fae4446d..a49e56a0 100644 --- a/dev-java/asm/asm-2.0.ebuild +++ b/dev-java/asm/asm-2.0.ebuild @@ -13,7 +13,7 @@ KEYWORDS="x86 amd64 ppc" IUSE="doc jikes" DEPEND=">=virtual/jdk-1.3 jikes? ( >=dev-java/jikes-1.21 ) - dev-java/ant + dev-java/ant-core dev-java/ant-owanttask" RDEPEND=">=virtual/jre-1.3" diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest index 63c30609..09743a1a 100644 --- a/dev-java/bcprov/Manifest +++ b/dev-java/bcprov/Manifest @@ -1,3 +1,3 @@ -MD5 398708fb885b06d49d65f2d67260cee5 bcprov-1.28.ebuild 917 +MD5 b93f5dde721751158d4128911a4e33c0 bcprov-1.28.ebuild 922 MD5 75a63d5125fbd5eb7a634bec23352230 files/digest-bcprov-1.28 69 MD5 41c0dc45f2d148a0f8f9786abd6e6f15 files/1.28/build.xml 1538 diff --git a/dev-java/bcprov/bcprov-1.28.ebuild b/dev-java/bcprov/bcprov-1.28.ebuild index 837ff455..e5e1ae48 100644 --- a/dev-java/bcprov/bcprov-1.28.ebuild +++ b/dev-java/bcprov/bcprov-1.28.ebuild @@ -18,7 +18,7 @@ KEYWORDS="~x86" IUSE="jikes doc" DEPEND="=virtual/jdk-1.4* - dev-java/ant + dev-java/ant-core jikes? (dev-java/jikes)" RDEPEND="=virtual/jre-1.4*" diff --git a/dev-java/buildmagic-tasks/Manifest b/dev-java/buildmagic-tasks/Manifest index 7daa1f99..a999b293 100644 --- a/dev-java/buildmagic-tasks/Manifest +++ b/dev-java/buildmagic-tasks/Manifest @@ -1,4 +1,4 @@ -MD5 2b6a722e329411fb72db8b7053e52660 buildmagic-tasks-2.0.ebuild 3681 +MD5 220aa9adfa4e9d22e9f56c8ecf78f700 buildmagic-tasks-2.0.ebuild 3676 MD5 a423b6ae393db5604e0610c372d880d4 files/digest-buildmagic-tasks-2.0 147 MD5 41a6429eed909cf88248f5e94b38c9a8 files/2.0-local.properties 479 MD5 b89d97874f66df322901a9daca9e78a4 files/jboss4-buildmagic-tasks-build_xml.patch 973 diff --git a/dev-java/buildmagic-tasks/buildmagic-tasks-2.0.ebuild b/dev-java/buildmagic-tasks/buildmagic-tasks-2.0.ebuild index 1b117b66..e2576aee 100644 --- a/dev-java/buildmagic-tasks/buildmagic-tasks-2.0.ebuild +++ b/dev-java/buildmagic-tasks/buildmagic-tasks-2.0.ebuild @@ -6,7 +6,7 @@ inherit java-pkg eutils DESCRIPTION="JBoss buildmagic tasks module" HOMEPAGE="http://www.jboss.org" -BASE_URL="http://sigmachi.yi.org/~nichoj/projects/java" +BASE_URL="http://gentooexperimental.org/distfiles" #BASE_URL="mirror://gentoo" # These source files were obtained from jpackage's srpm for # jboss4-buildmagic-tasks diff --git a/dev-java/burlap/Manifest b/dev-java/burlap/Manifest index 277ac89d..b9cc0dac 100644 --- a/dev-java/burlap/Manifest +++ b/dev-java/burlap/Manifest @@ -1,3 +1,3 @@ -MD5 d0625816678f543d6233195d706d07f7 burlap-2.1.12.ebuild 1263 +MD5 a9dfaeed107c0715d8c9480c3384c8e1 burlap-2.1.12.ebuild 1267 MD5 c089b7d34f96c556a34bb8c402794023 files/build-2.1.12.xml 1546 MD5 7f2aa42b2e06ae864ebe9f4e946c1446 files/digest-burlap-2.1.12 66 diff --git a/dev-java/burlap/burlap-2.1.12.ebuild b/dev-java/burlap/burlap-2.1.12.ebuild index 886b1158..f01e7e07 100644 --- a/dev-java/burlap/burlap-2.1.12.ebuild +++ b/dev-java/burlap/burlap-2.1.12.ebuild @@ -18,7 +18,7 @@ IUSE="doc jikes" DEPEND="virtual/jdk app-arch/unzip - dev-java/ant" + dev-java/ant-core" RDEPEND="virtual/jre =dev-java/servletapi-2.3*" diff --git a/dev-java/carol/Manifest b/dev-java/carol/Manifest index 8d587aa4..203ef268 100644 --- a/dev-java/carol/Manifest +++ b/dev-java/carol/Manifest @@ -1,3 +1,3 @@ -MD5 32d01571bac01953363b74a9a9da0727 carol-2.0.5.ebuild 1413 +MD5 f3bdfc975e84018f5faa17171894f3a9 carol-2.0.5.ebuild 1432 MD5 776db2d3eb0aa1d84ae85c135e22f1bb files/carol-2.0.5-jikes.patch 818 MD5 6d4686fbf0174aa8cf990a3a5e1795c3 files/digest-carol-2.0.5 65 diff --git a/dev-java/carol/carol-2.0.5.ebuild b/dev-java/carol/carol-2.0.5.ebuild index 740d7223..58dd777a 100644 --- a/dev-java/carol/carol-2.0.5.ebuild +++ b/dev-java/carol/carol-2.0.5.ebuild @@ -14,7 +14,8 @@ SLOT="2.0" KEYWORDS="~x86" IUSE="doc jikes" -DEPEND="virtual/jdk" +DEPEND="virtual/jdk + dev-java/ant-core" RDEPEND="virtual/jre dev-java/commons-collections dev-java/commons-logging diff --git a/dev-java/commons-attributes/Manifest b/dev-java/commons-attributes/Manifest index 03c26424..8a6d921a 100644 --- a/dev-java/commons-attributes/Manifest +++ b/dev-java/commons-attributes/Manifest @@ -1,4 +1,4 @@ -MD5 da77e4d9a43168bfe276c8932e4c1f79 commons-attributes-2.1.ebuild 1604 +MD5 f2f1ef6f6bb0c02495ba350d1bf22e27 commons-attributes-2.1.ebuild 1596 MD5 ba8d8b401870a2b2017ad6fe2b8a81bc files/commons-attributes-2.1-build_xml.patch 2525 MD5 02d5609bcdd04538df28834127b4bf8d files/digest-commons-attributes-2.1 74 MD5 afa7033a8f1ac9174d37628b7734a1f8 files/anttasks.properties 856 diff --git a/dev-java/commons-attributes/commons-attributes-2.1.ebuild b/dev-java/commons-attributes/commons-attributes-2.1.ebuild index 018b8a95..9a326e61 100644 --- a/dev-java/commons-attributes/commons-attributes-2.1.ebuild +++ b/dev-java/commons-attributes/commons-attributes-2.1.ebuild @@ -6,7 +6,7 @@ inherit eutils java-pkg DESCRIPTION="Commons Attributes enables Java programmers to use C#/.Net-style attributes in their code." HOMEPAGE="http://jakarta.apache.org/commons/attributes/" -SRC_URI="http://www.wmwweb.com/apache/jakarta/commons/attributes/source/${P}-src.tgz" +SRC_URI="mirror://apache/jakarta/commons/attributes/source/${P}-src.tgz" LICENSE="Apache-2" SLOT="2" @@ -15,7 +15,7 @@ IUSE="doc jikes" # TODO determine jvm version requirements DEPEND="virtual/jdk - dev-java/ant + dev-java/ant-core jikes? (dev-java/jikes) dev-java/xjavadoc" RDEPEND="virtual/jre diff --git a/dev-java/commons-grant/Manifest b/dev-java/commons-grant/Manifest index 62c45ff3..1dcb7c88 100644 --- a/dev-java/commons-grant/Manifest +++ b/dev-java/commons-grant/Manifest @@ -1,3 +1,3 @@ -MD5 f7cb54e4d4c13b2ac3cf987824a26192 commons-grant-1.0_p20040118.ebuild 1160 +MD5 2542a7d657f27239f6c4a401bc116a48 commons-grant-1.0_p20040118.ebuild 1175 MD5 33a807e6c54d644eef9e59f9f4609ecf files/digest-commons-grant-1.0_p20040118 82 MD5 a05c0258c189c350524bb14761e9c3cd files/commons-grant-1.0_p20040118-gentoo.diff 1254 diff --git a/dev-java/commons-grant/commons-grant-1.0_p20040118.ebuild b/dev-java/commons-grant/commons-grant-1.0_p20040118.ebuild index 0a45346b..0f491ef8 100644 --- a/dev-java/commons-grant/commons-grant-1.0_p20040118.ebuild +++ b/dev-java/commons-grant/commons-grant-1.0_p20040118.ebuild @@ -7,9 +7,9 @@ MY_PV=${PV%%_*}.b5.cvs20040118 MY_P=${PN}-${MY_PV} DESCRIPTION="A small collection of hacks to make using Ant in an embedded envinronment much easier." -# This is borked, but I don't have anywhere else to turn +# This seems dead, but I don't have anywhere else to turn HOMEPAGE="http://jakarta.apache.org/commons/sandbox/grant/" -SRC_URI="mirror://gentoo/distfiles/${MY_P}.tar.gz" +SRC_URI="http://gentooexperimental.org/distfiles/${MY_P}.tar.gz" DEPEND=">=virtual/jdk-1.3 jikes? ( dev-java/jikes ) dev-java/ant-core diff --git a/dev-java/commons-graph/Manifest b/dev-java/commons-graph/Manifest index d1fd3889..43b9c604 100644 --- a/dev-java/commons-graph/Manifest +++ b/dev-java/commons-graph/Manifest @@ -1,6 +1,4 @@ -MD5 ca924c273fe83de771463800760204d9 commons-graph-0.8.1_p20040118.ebuild 1481 -MD5 795ef63b932265642b379dafcc160f78 ChangeLog 317 -MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 +MD5 999d33ebc37af6b35e8ab51990755e53 commons-graph-0.8.1_p20040118.ebuild 1454 MD5 c36b9db47ffd6ed005033793666310e9 files/digest-commons-graph-0.8.1 74 MD5 bf85b87a012c334e20d661447bbf52b4 files/digest-commons-graph-0.8.1_p20040118 75 MD5 977cd4fd53f5843205e47b05dc1f684b files/commons-graph-0.8.1_p20040118-gentoo.diff 1450 diff --git a/dev-java/commons-graph/commons-graph-0.8.1_p20040118.ebuild b/dev-java/commons-graph/commons-graph-0.8.1_p20040118.ebuild index 4e6c65a6..e1673d5f 100644 --- a/dev-java/commons-graph/commons-graph-0.8.1_p20040118.ebuild +++ b/dev-java/commons-graph/commons-graph-0.8.1_p20040118.ebuild @@ -7,11 +7,10 @@ MY_PN=graph2 MY_PV=${PV%%_*}.cvs20040118 MY_P=${MY_PN}-${MY_PV} DESCRIPTION="A toolkit for managing graphs and graph based data structures" -# This is borked, but I don't have anywhere else to turn +# This page is broken, but I don't have anywhere else to turn HOMEPAGE="http://jakarta.apache.org/commons/sandbox/graph/" -# this was extracted from a source rpm at jpackage... maybe I'll use it directly -# at some point -SRC_URI="mirror://gentoo/distfiles/${MY_P}.tar.gz" +# this was extracted from a source rpm at jpackage +SRC_URI="http://gentooexperimental.org/distfiles/${MY_P}.tar.gz" LDEPEND="dev-java/log4j dev-java/commons-collections dev-java/junit diff --git a/dev-java/commons-io/Manifest b/dev-java/commons-io/Manifest index 87c712a5..f6d94dc0 100644 --- a/dev-java/commons-io/Manifest +++ b/dev-java/commons-io/Manifest @@ -1,4 +1,4 @@ -MD5 c3a86a3faa7dff8db244c7e7afeac795 commons-io-1.0.ebuild 1333 +MD5 b7f6b5ed579766b578c6fbbb631ee65f commons-io-1.0.ebuild 1327 MD5 1822014318ff58d7aeed32a1b9d1af96 ChangeLog 651 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 MD5 5c8037358c1bd4650695b23df55e89fe files/digest-commons-io-1.0 70 diff --git a/dev-java/commons-io/commons-io-1.0.ebuild b/dev-java/commons-io/commons-io-1.0.ebuild index 133f8cc5..71ffed8a 100644 --- a/dev-java/commons-io/commons-io-1.0.ebuild +++ b/dev-java/commons-io/commons-io-1.0.ebuild @@ -13,9 +13,9 @@ SLOT="1" KEYWORDS="x86 amd64 ~ppc" IUSE="doc jikes junit source" -DEPEND="jikes? ( >=dev-java/jikes-1.21 ) - junit? ( >=dev-java/junit-3.8 dev-java/ant ) - !junit? ( dev-java/ant-core ) +DEPEND="dev-java/ant-core + jikes? ( >=dev-java/jikes-1.21 ) + junit? ( >=dev-java/junit-3.8 dev-java/ant-tasks ) source? ( app-arch/zip ) >=virtual/jdk-1.3" RDEPEND=">=virtual/jre-1.3" diff --git a/dev-java/commons-jelly/Manifest b/dev-java/commons-jelly/Manifest index c764af88..2f35a853 100644 --- a/dev-java/commons-jelly/Manifest +++ b/dev-java/commons-jelly/Manifest @@ -1,4 +1,3 @@ -MD5 34747fd104cc0b568301de0596e87ade .commons-jelly-1.0.ebuild.swp 12288 MD5 b2a7a2c7217478940455560745cacdb1 commons-jelly-1.0.ebuild 1573 MD5 b8e360e5058c49cde7c1a2b1e7d09542 files/digest-commons-jelly-1.0 73 MD5 02f70aa727e825f409b2893f3f165bc4 files/commons-jelly-1.0-gentoo.patch 2371 diff --git a/dev-java/commons-math/Manifest b/dev-java/commons-math/Manifest new file mode 100644 index 00000000..3887d00e --- /dev/null +++ b/dev-java/commons-math/Manifest @@ -0,0 +1,2 @@ +MD5 5d6f74a81fb7f14c77ed4c30e539224c commons-math-1.0.ebuild 1579 +MD5 225eba09b9c291a68c0b00eb8648f0ec files/digest-commons-math-1.0 72 diff --git a/dev-java/commons-math/commons-math-1.0.ebuild b/dev-java/commons-math/commons-math-1.0.ebuild new file mode 100644 index 00000000..f06ed3f6 --- /dev/null +++ b/dev-java/commons-math/commons-math-1.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit java-pkg + +DESCRIPTION=" Math is a library of lightweight, self-contained mathematics and statistics components addressing the most common practical problems not immediately available in the Java programming language." +HOMEPAGE="http://jakarta.apache.org/commons/math/" +SRC_URI="mirror://apache/jakarta/commons/math/source/${P}-src.tar.gz" +DEPEND=">=virtual/jdk-1.3 + >=dev-java/ant-core-1.5.4 + junit? ( dev-java/junit + dev-java/ant-tasks) + jikes? ( dev-java/jikes ) + source? ( app-arch/zip )" +RDEPEND=">=virtual/jre-1.3 + >=dev-java/commons-discovery-0.2 + >=dev-java/commons-logging-1.0.3" +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~x86 ~sparc ~ppc ~amd64 ~ppc64" +IUSE="doc jikes junit source" + +src_unpack() { + unpack ${A} + + cd ${S} + sed -i 's|depends="get-deps"||' build.xml || die "sed failed" + + if ! use junit ; then + sed -i 's/depends="compile,test"/depends="compile"/' \ + build.xml || die "Failed to disable junit" + fi + + mkdir -p target/lib + cd target/lib + java-pkg_jar-from commons-discovery || die "Could not link to discovery" + java-pkg_jar-from commons-logging || die "Could not link to commons-logging" + +} + +src_compile() { + local antflags="jar" + use jikes && antflags="${antflags} -Dbuild.compiler=jikes" + use doc && antflags="${antflags} javadoc" + ant ${antflags} || die "died on ant" +} + +src_install() { + java-pkg_newjar target/${P}.jar ${PN}.jar + + use doc && java-pkg_dohtml -r dist/docs/ + use source && java-pkg_dosrc src/java/org +} diff --git a/dev-java/commons-math/files/digest-commons-math-1.0 b/dev-java/commons-math/files/digest-commons-math-1.0 new file mode 100644 index 00000000..e44b8988 --- /dev/null +++ b/dev-java/commons-math/files/digest-commons-math-1.0 @@ -0,0 +1 @@ +MD5 0b5d92acc9259f45676bd64b4894b5ad commons-math-1.0-src.tar.gz 208541 diff --git a/dev-java/commons-validator/Manifest b/dev-java/commons-validator/Manifest index 751b7fc6..e6fa69f1 100644 --- a/dev-java/commons-validator/Manifest +++ b/dev-java/commons-validator/Manifest @@ -1,2 +1,2 @@ -MD5 4681f33fb250ff407fc1f5347872f4c4 commons-validator-1.1.4.ebuild 2501 -MD5 8252273e37c86fd62f26cac69743121b files/digest-commons-validator-1.1.4 173 +MD5 6bc2a783c8ef83f95189a6bacdaf109b commons-validator-1.1.4.ebuild 2506 +MD5 a25749c1c11c8c380ef72a7074718af9 files/digest-commons-validator-1.1.4 173 diff --git a/dev-java/commons-validator/commons-validator-1.1.4.ebuild b/dev-java/commons-validator/commons-validator-1.1.4.ebuild index 6f6164e1..ef5ee905 100644 --- a/dev-java/commons-validator/commons-validator-1.1.4.ebuild +++ b/dev-java/commons-validator/commons-validator-1.1.4.ebuild @@ -18,7 +18,7 @@ SRC_URI="mirror://apache/jakarta/commons/validator/source/${MY_P}.tar.gz mirror: # TODO: report this travesty DEPEND=">=virtual/jdk-1.3 - >=dev-java/ant-1.4 + >=dev-java/ant-core-1.4 jikes? ( dev-java/jikes ) source? ( app-arch/zip )" RDEPEND=">=virtual/jre-1.3 diff --git a/dev-java/commons-validator/files/digest-commons-validator-1.1.4 b/dev-java/commons-validator/files/digest-commons-validator-1.1.4 index 6f9e5bd9..3ad67bb7 100644 --- a/dev-java/commons-validator/files/digest-commons-validator-1.1.4 +++ b/dev-java/commons-validator/files/digest-commons-validator-1.1.4 @@ -1,2 +1,2 @@ MD5 6a4ef07da77dd86223e80870999448e8 commons-validator-1.1.4-src.tar.gz 181446 -MD5 a5075853ae90166c67dc0f23a5c2a65e commons-validator-1.1.4-gentoo-missingfiles.tar.bz2 4157 +MD5 62aa855c6c61dce1e5e3e94f0dbb911f commons-validator-1.1.4-gentoo-missingfiles.tar.bz2 4161 diff --git a/dev-java/cos/Manifest b/dev-java/cos/Manifest index a0df7dee..8e4797f2 100644 --- a/dev-java/cos/Manifest +++ b/dev-java/cos/Manifest @@ -1,3 +1,3 @@ -MD5 06ab3f91828d9dcad3457e2140927a7d cos-20021105.ebuild 1320 +MD5 203421eaef217679aba6b484c2f36f2b cos-20021105.ebuild 1297 MD5 fca821d7d012a080084ef23c6f803a83 files/digest-cos-20021105 62 MD5 c089b7d34f96c556a34bb8c402794023 files/build-20021105.xml 1546 diff --git a/dev-java/dvsl/Manifest b/dev-java/dvsl/Manifest index 9d5ecf33..611f10d3 100644 --- a/dev-java/dvsl/Manifest +++ b/dev-java/dvsl/Manifest @@ -1,2 +1,2 @@ -MD5 c279fd438eefd65df317b8046f4bcefd dvsl-20050702.ebuild 1672 +MD5 2375e5b024f20dbd0b5671322e1cd4a7 dvsl-20050702.ebuild 1667 MD5 78cc8706d9a8a9dcdbed6d7910972c23 files/digest-dvsl-20050702 67 diff --git a/dev-java/dvsl/dvsl-20050702.ebuild b/dev-java/dvsl/dvsl-20050702.ebuild index e93ba143..0c13f5c9 100644 --- a/dev-java/dvsl/dvsl-20050702.ebuild +++ b/dev-java/dvsl/dvsl-20050702.ebuild @@ -10,7 +10,7 @@ DESCRIPTION="Declarative Velocity Style Language." HOMEPAGE="http://jakarta.apache.org/velocity/dvsl/index.html" # TODO figure out how i checked this out... # TODO find out if there's a tagged branch or something -SRC_URI="http://sigmachi.yi.org/~nichoj/projects/java/${P}.tar.bz2" +SRC_URI="http://gentooexperimental.org/distfiles/${P}.tar.bz2" # I'm guessing some sort of apache-ness LICENSE="" diff --git a/dev-java/easymock/Manifest b/dev-java/easymock/Manifest index 50cccda7..8fa0958a 100644 --- a/dev-java/easymock/Manifest +++ b/dev-java/easymock/Manifest @@ -1,3 +1,3 @@ -MD5 6ae73a8424315d635b1e48b2a824ff07 easymock-1.1.ebuild 1020 +MD5 b6d5cacddbb0badb2081be3a0bde6534 easymock-1.1.ebuild 1025 MD5 15031496739f2e0a134d0ad4981d0aeb files/digest-easymock-1.1 60 MD5 c089b7d34f96c556a34bb8c402794023 files/build-1.1.xml 1546 diff --git a/dev-java/easymock/easymock-1.1.ebuild b/dev-java/easymock/easymock-1.1.ebuild index 79b98b1e..683e9ca5 100644 --- a/dev-java/easymock/easymock-1.1.ebuild +++ b/dev-java/easymock/easymock-1.1.ebuild @@ -16,7 +16,7 @@ KEYWORDS="~x86" IUSE="doc jikes" DEPEND="virtual/jdk - dev-java/ant + dev-java/ant-core app-arch/zip jikes? (dev-java/jikes)" RDEPEND="virtual/jre" diff --git a/dev-java/eclipse-ecj-compat/Manifest b/dev-java/eclipse-ecj-compat/Manifest index 517b5e88..99d0671b 100644 --- a/dev-java/eclipse-ecj-compat/Manifest +++ b/dev-java/eclipse-ecj-compat/Manifest @@ -1,2 +1,2 @@ -MD5 4536b57219b4145cba6cb2de453ecacc eclipse-ecj-compat-0.1.ebuild 948 +MD5 bfd25cd94edde4a079a9350aa16d98e2 eclipse-ecj-compat-0.1.ebuild 940 MD5 f30069a48999efeb10b55d40d7f043b8 files/digest-eclipse-ecj-compat-0.1 74 diff --git a/dev-java/eclipse-ecj-compat/eclipse-ecj-compat-0.1.ebuild b/dev-java/eclipse-ecj-compat/eclipse-ecj-compat-0.1.ebuild index 2844eedb..623e722d 100644 --- a/dev-java/eclipse-ecj-compat/eclipse-ecj-compat-0.1.ebuild +++ b/dev-java/eclipse-ecj-compat/eclipse-ecj-compat-0.1.ebuild @@ -6,7 +6,7 @@ inherit eutils java-pkg DESCRIPTION="Javac compatibility wrapper for the Eclipse Compiler for Java" HOMEPAGE="http://www.eclipse.org/" -SRC_URI="http://www.scorec.rpi.edu/~nichoj/projects/java/${P}.tar.bz2" +SRC_URI="http://gentooexperimental.org/distfiles/${P}.tar.bz2" LICENSE="GPL-2" KEYWORDS="~x86" SLOT="0" diff --git a/dev-java/freemarker/Manifest b/dev-java/freemarker/Manifest index a68106ed..d03190c6 100644 --- a/dev-java/freemarker/Manifest +++ b/dev-java/freemarker/Manifest @@ -1,2 +1,2 @@ -MD5 5685ecd6e14b9c54f9996714d256a6f9 freemarker-2.3.2.ebuild 1276 +MD5 ca94a2c058ea12975628bf1376acfe03 freemarker-2.3.2.ebuild 1306 MD5 44579f091d8c56304639000ecae66de2 files/digest-freemarker-2.3.2 69 diff --git a/dev-java/freemarker/freemarker-2.3.2.ebuild b/dev-java/freemarker/freemarker-2.3.2.ebuild index 4544d910..b6cfffc7 100644 --- a/dev-java/freemarker/freemarker-2.3.2.ebuild +++ b/dev-java/freemarker/freemarker-2.3.2.ebuild @@ -16,7 +16,8 @@ IUSE="doc jikes" # TODO determine vm requirement DEPEND="virtual/jdk - dev-java/ant" + jikes? (dev-java/jikes) + dev-java/ant-core" RDEPEND="virtual/jre =dev-java/servletapi-2.3* =dev-java/jdom-1.0_beta9* diff --git a/dev-java/gjt-jpl-pattern/Manifest b/dev-java/gjt-jpl-pattern/Manifest index be452149..660bc880 100644 --- a/dev-java/gjt-jpl-pattern/Manifest +++ b/dev-java/gjt-jpl-pattern/Manifest @@ -1,4 +1,4 @@ -MD5 fe7b2bb7511dc9fed208ae0582869273 gjt-jpl-pattern-0.2.ebuild 1109 +MD5 4a55911cae53eb71c3032b6608786058 gjt-jpl-pattern-0.2.ebuild 1114 MD5 c089b7d34f96c556a34bb8c402794023 files/build-0.2.xml 1546 MD5 1df621a70498bda50cffaba986c04d51 files/digest-gjt-jpl-pattern-0.2 76 MD5 31f43a6dcb9fdada02302017722003b8 files/digest-gjt-jpl-pattern-1 70 diff --git a/dev-java/gjt-jpl-pattern/gjt-jpl-pattern-0.2.ebuild b/dev-java/gjt-jpl-pattern/gjt-jpl-pattern-0.2.ebuild index 2d8e3e2e..0ab48ea3 100644 --- a/dev-java/gjt-jpl-pattern/gjt-jpl-pattern-0.2.ebuild +++ b/dev-java/gjt-jpl-pattern/gjt-jpl-pattern-0.2.ebuild @@ -16,7 +16,7 @@ KEYWORDS="~x86" IUSE="doc jikes" DEPEND="virtual/jdk - dev-java/ant + dev-java/ant-core jikes? (dev-java/jikes)" RDEPEND="virtual/jre" diff --git a/dev-java/gjt-jpl-util/Manifest b/dev-java/gjt-jpl-util/Manifest index 96f94a97..bc07cb42 100644 --- a/dev-java/gjt-jpl-util/Manifest +++ b/dev-java/gjt-jpl-util/Manifest @@ -1,4 +1,4 @@ -MD5 20ea885ae19f6674a2c21103d94a61d6 gjt-jpl-util-0.6.ebuild 1302 +MD5 bd6a60c6b30cb06eef125da842f236bf gjt-jpl-util-0.6.ebuild 1307 MD5 bd0c3074ae3990cea9832f1ece3b4166 files/gjt-jpl-util-build_xml-jpp.patch 1316 MD5 c089b7d34f96c556a34bb8c402794023 files/build-1.xml 1546 MD5 41f01fa2bf737a8a312271930654588d files/digest-gjt-jpl-util-0.6 73 diff --git a/dev-java/gjt-jpl-util/gjt-jpl-util-0.6.ebuild b/dev-java/gjt-jpl-util/gjt-jpl-util-0.6.ebuild index dcff56ef..cabfd171 100644 --- a/dev-java/gjt-jpl-util/gjt-jpl-util-0.6.ebuild +++ b/dev-java/gjt-jpl-util/gjt-jpl-util-0.6.ebuild @@ -18,7 +18,7 @@ KEYWORDS="~x86" IUSE="doc jikes" DEPEND="virtual/jdk - dev-java/ant + dev-java/ant-core jikes? (dev-java/jikes)" RDEPEND="virtual/jre dev-java/gjt-jpl-pattern" diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest index 45aa0004..87e3c5f6 100644 --- a/dev-java/gnu-classpath/Manifest +++ b/dev-java/gnu-classpath/Manifest @@ -1,2 +1,2 @@ -MD5 9518c7071a208dda4443b2edb10514b3 gnu-classpath-0.18.ebuild 1929 +MD5 4d212875100c6d355a2f9080cd8d8b1a gnu-classpath-0.18.ebuild 1963 MD5 e8174eff88cbeae8528507c699821eea files/digest-gnu-classpath-0.18 67 diff --git a/dev-java/gnu-classpath/gnu-classpath-0.18.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.18.ebuild index d9128294..29dfb360 100644 --- a/dev-java/gnu-classpath/gnu-classpath-0.18.ebuild +++ b/dev-java/gnu-classpath/gnu-classpath-0.18.ebuild @@ -47,9 +47,10 @@ src_compile() { $(use_enable examples) \ $(use_enable gtk gtk-peer) \ $(use_enable xml2 xmlj) \ - $(use_with doc gjdoc) \ --enable-jni \ || die "configure failed" +# disabled for now... see above. +# $(use_with doc gjdoc) \ emake || die "make failed" } diff --git a/dev-java/gnu-crypto/Manifest b/dev-java/gnu-crypto/Manifest index 0e2b08e4..8764f18e 100644 --- a/dev-java/gnu-crypto/Manifest +++ b/dev-java/gnu-crypto/Manifest @@ -1,3 +1,4 @@ -MD5 9516e8c3391f362f47995a67ad846614 gnu-crypto-2.0.1-r2.ebuild 1278 +MD5 4405644335e0b0e483079228b3e79dfe gnu-crypto-2.0.1-r2.ebuild 1331 +MD5 73d7f444c165543aa69b5c9c3f3bf426 files/gnu-crypto-2.0.1-clone-exception.patch 1080 MD5 a30727b2c8c5fc36a69558733c20d877 files/digest-gnu-crypto-2.0.1-r2 70 MD5 8450af49bee9ffde3a26100560db5842 files/gnu-crypto-2.0.1-jdk15.patch 1551 diff --git a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild index 9098548e..9ef2b405 100644 --- a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild +++ b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild @@ -24,14 +24,16 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/${P}-jdk15.patch +# epatch ${FILESDIR}/${P}-clone-exception.patch } src_compile() { # jikes support disabled, doesnt work: #86655 - local my_javac=${JAVAC} - use jikes && my_javac="jikes -bootclasspath ${JAVA_HOME}/jre/lib/rt.jar" +# local my_javac=${JAVAC} +# use jikes && my_javac="jikes -bootclasspath ${JAVA_HOME}/jre/lib/rt.jar" - JAVAC=${my_javac} econf \ + #JAVAC=${my_javac} + econf \ --with-jce=yes \ --with-sasl=yes \ || die diff --git a/dev-java/hessian/Manifest b/dev-java/hessian/Manifest index 3ece23e1..49dc8de4 100644 --- a/dev-java/hessian/Manifest +++ b/dev-java/hessian/Manifest @@ -1,6 +1,6 @@ -MD5 a27664f842de38618421a30791ea0e01 hessian-3.0.8.ebuild 1346 -MD5 6efb7a140f3ccd2e96688c42d8018276 hessian-2.1.12.ebuild 1248 -MD5 8c97ce778c0908d439bdc839ccdc9732 hessian-3.0.13.ebuild 1350 +MD5 75a653fe33d0ee4c947312d5df8880df hessian-3.0.8.ebuild 1350 +MD5 ad15c7e156fade8c58ea08bbdb8db4b1 hessian-2.1.12.ebuild 1252 +MD5 d80de4a02b3b460a2f94297ea56b41f0 hessian-3.0.13.ebuild 1420 MD5 c089b7d34f96c556a34bb8c402794023 files/build-2.1.12.xml 1546 MD5 dd6372768b0929aa8504a4526358ff34 files/digest-hessian-2.1.12 67 MD5 ee3436c82ea5c8b7be0a8c7d2620f896 files/digest-hessian-3.0.13 67 diff --git a/dev-java/hessian/hessian-2.1.12.ebuild b/dev-java/hessian/hessian-2.1.12.ebuild index 6a29ce92..b129396b 100644 --- a/dev-java/hessian/hessian-2.1.12.ebuild +++ b/dev-java/hessian/hessian-2.1.12.ebuild @@ -15,7 +15,7 @@ KEYWORDS="~x86" IUSE="jikes doc" DEPEND="virtual/jdk - dev-java/ant" + dev-java/ant-core" RDEPEND="virtual/jre =dev-java/servletapi-2.3*" diff --git a/dev-java/hessian/hessian-3.0.13.ebuild b/dev-java/hessian/hessian-3.0.13.ebuild index 6e7eabac..5b8afc10 100644 --- a/dev-java/hessian/hessian-3.0.13.ebuild +++ b/dev-java/hessian/hessian-3.0.13.ebuild @@ -17,9 +17,10 @@ IUSE="jikes doc" DEPEND="virtual/jdk app-arch/unzip jikes? (dev-java/jikes) - dev-java/ant" + dev-java/ant-core" RDEPEND="virtual/jre - =dev-java/servletapi-2.3*" + =dev-java/servletapi-2.3* + =dev-java/burlap-2.1*" SERVLET="servletapi-2.3 servlet.jar" @@ -42,7 +43,7 @@ src_unpack() { } src_compile() { - local antflags="-Dproject.name=${PN} jar" + local antflags="-Dproject.name=${PN} -Dclasspath=$(java-pkg_getjars burlap-2.1) jar" use jikes && antflags="-Dbuild.compiler=jikes ${antflags}" use doc && antflags="${antflags} javadoc" diff --git a/dev-java/hessian/hessian-3.0.8.ebuild b/dev-java/hessian/hessian-3.0.8.ebuild index 053e0e73..2bc57a00 100644 --- a/dev-java/hessian/hessian-3.0.8.ebuild +++ b/dev-java/hessian/hessian-3.0.8.ebuild @@ -17,7 +17,7 @@ IUSE="jikes doc" DEPEND="virtual/jdk app-arch/unzip jikes? (dev-java/jikes) - dev-java/ant" + dev-java/ant-core" RDEPEND="virtual/jre =dev-java/servletapi-2.3*" diff --git a/dev-java/hibernate-extensions/Manifest b/dev-java/hibernate-extensions/Manifest index ee394436..21a70faa 100644 --- a/dev-java/hibernate-extensions/Manifest +++ b/dev-java/hibernate-extensions/Manifest @@ -1,4 +1,4 @@ -MD5 b43591a35e619b57659ae9165e6c4532 hibernate-extensions-2.1.3.ebuild 1934 +MD5 7191a229a52af60a5499248f3d36972b hibernate-extensions-2.1.3.ebuild 1939 MD5 6b855d7e18f19b2003f9308f91b57e41 files/hibernate-extensions-2.1.3-hbm2java_timestamp.patch 4306 MD5 cfb44d2efdfbea1a8e8a5c84aec6abb1 files/hibernate-extensions-2.1.3-console_build.patch 1469 MD5 2d4be7c3d7fda88bb94ab0cbd17f9b0b files/digest-hibernate-extensions-2.1.3 148 diff --git a/dev-java/hibernate-extensions/hibernate-extensions-2.1.3.ebuild b/dev-java/hibernate-extensions/hibernate-extensions-2.1.3.ebuild index 20a2f37f..cd42e273 100644 --- a/dev-java/hibernate-extensions/hibernate-extensions-2.1.3.ebuild +++ b/dev-java/hibernate-extensions/hibernate-extensions-2.1.3.ebuild @@ -19,7 +19,7 @@ KEYWORDS="~x86" IUSE="jikes doc" DEPEND=">=virtual/jdk-1.4 - dev-java/ant + dev-java/ant-core jikes? (dev-java/jikes)" RDEPEND=">=virtual/jre-1.4 =dev-java/velocity-1* diff --git a/dev-java/hibernate/Manifest b/dev-java/hibernate/Manifest index ac66e125..e26585aa 100644 --- a/dev-java/hibernate/Manifest +++ b/dev-java/hibernate/Manifest @@ -1,4 +1,4 @@ -MD5 98f8f06da4869dd1856305f12eb9ba73 hibernate-2.1.8-r1.ebuild 2640 +MD5 6f1f257c9b78616a73c664f1385fedfc hibernate-2.1.8-r1.ebuild 2652 MD5 63bf201269b5735a51e96d6bca622db4 hibernate-3.0.5.ebuild 2175 MD5 b442a0c8138baf4b3737d0a382cfe360 files/digest-hibernate-2.1.8 69 MD5 afbb35def9477318d2ce0419786ce260 files/digest-hibernate-3.0.5 69 diff --git a/dev-java/hibernate/hibernate-2.1.8-r1.ebuild b/dev-java/hibernate/hibernate-2.1.8-r1.ebuild index 3add150f..3a32594f 100644 --- a/dev-java/hibernate/hibernate-2.1.8-r1.ebuild +++ b/dev-java/hibernate/hibernate-2.1.8-r1.ebuild @@ -36,7 +36,7 @@ DEPEND="${RDEPEND} >=virtual/jdk-1.4 >=dev-java/ant-core-1.5 junit? ( - dev-java/ant + >=dev-java/ant-tasks-1.5 dev-java/junit dev-db/hsqldb )" diff --git a/dev-java/howl-logger/Manifest b/dev-java/howl-logger/Manifest index 01fbd966..33b2bab5 100644 --- a/dev-java/howl-logger/Manifest +++ b/dev-java/howl-logger/Manifest @@ -1,2 +1,2 @@ -MD5 605ee24625a2364710bf762f587edc06 howl-logger-0.1.9.ebuild 1075 +MD5 97bebc049f5613e1f6c11ece1678c93a howl-logger-0.1.9.ebuild 1080 MD5 e76bdbf3d26fbd289fd66072df761cd3 files/digest-howl-logger-0.1.9 69 diff --git a/dev-java/howl-logger/howl-logger-0.1.9.ebuild b/dev-java/howl-logger/howl-logger-0.1.9.ebuild index 4ee1f96d..9f14221b 100644 --- a/dev-java/howl-logger/howl-logger-0.1.9.ebuild +++ b/dev-java/howl-logger/howl-logger-0.1.9.ebuild @@ -17,7 +17,7 @@ KEYWORDS="~x86" IUSE="doc jikes" DEPEND="virtual/jdk - dev-java/ant + dev-java/ant-core jikes? (dev-java/jikes)" RDEPEND="virtual/jre" diff --git a/dev-java/httpunit/Manifest b/dev-java/httpunit/Manifest index cf7e2c53..9ff80496 100644 --- a/dev-java/httpunit/Manifest +++ b/dev-java/httpunit/Manifest @@ -1,2 +1,2 @@ -MD5 c1efc6c5a00750e8433f9df7cc70c885 httpunit-1.6.ebuild 1759 +MD5 b5ddbeee0ee1f8eac041e75f8c2f560c httpunit-1.6.ebuild 1818 MD5 ecffbbe16b69b044d1b979bea06a4af4 files/digest-httpunit-1.6 133 diff --git a/dev-java/httpunit/httpunit-1.6.ebuild b/dev-java/httpunit/httpunit-1.6.ebuild index 634f5520..f82e8203 100644 --- a/dev-java/httpunit/httpunit-1.6.ebuild +++ b/dev-java/httpunit/httpunit-1.6.ebuild @@ -6,8 +6,10 @@ inherit java-pkg DESCRIPTION="HttpUnit emulates the relevant portions of browser behavior, including form submission, JavaScript, basic http authentication, cookies and automatic page redirection, and allows Java test code to examine returned pages either as text, an XML DOM, or containers of forms, tables, and links." HOMEPAGE="http://httpunit.sourceforge.net/" +# TODO what is metainf for? +# TODO where did it come from? SRC_URI="mirror://sourceforge/${PN}/${P}.zip - http://sigmachi.yi.org/~nichoj/projects/java/${P}-metainf.tar.gz" + http://gentooexperimental.org/distfiles/${P}-metainf.tar.gz" # TODO: new license needed? # http://httpunit.sourceforge.net/doc/license.html @@ -17,7 +19,7 @@ KEYWORDS="~x86" IUSE="doc" DEPEND="virtual/jdk - dev-java/ant" + dev-java/ant-core" RDEPEND="virtual/jre dev-java/jtidy =dev-java/rhino-1.6* diff --git a/dev-java/jacorb/Manifest b/dev-java/jacorb/Manifest index a7fdf5ce..1e3379b3 100644 --- a/dev-java/jacorb/Manifest +++ b/dev-java/jacorb/Manifest @@ -1,3 +1,3 @@ -MD5 5ca81a0b1387e69b0cba9d3877f4ca37 jacorb-2.2.1.ebuild 2046 +MD5 92e6abdc45f53236ac3777c409e0cb4d jacorb-2.2.1.ebuild 2051 MD5 d0a4963a08696964954d9642bc9f54a9 files/digest-jacorb-2.2.1 70 MD5 7d02f7e78d35d4e6412c767a800f136c files/jacorb-2.2.1-dist.patch 5097 diff --git a/dev-java/jacorb/jacorb-2.2.1.ebuild b/dev-java/jacorb/jacorb-2.2.1.ebuild index 45142281..6ea410a5 100644 --- a/dev-java/jacorb/jacorb-2.2.1.ebuild +++ b/dev-java/jacorb/jacorb-2.2.1.ebuild @@ -20,7 +20,7 @@ IUSE="doc" # TODO: test other vm's # TODO: test if X is needed at runtime DEPEND=">=virtual/jdk-1.4 - dev-java/ant + dev-java/ant-core jikes? (dev-java/jikes) virtual/x11" RDEPEND=">=virtual/jre-1.4 diff --git a/dev-java/jamon/Manifest b/dev-java/jamon/Manifest index 9765b5ab..4e613916 100644 --- a/dev-java/jamon/Manifest +++ b/dev-java/jamon/Manifest @@ -1,3 +1,3 @@ -MD5 c4072150544d791cc118ddcb26a25408 jamon-1.0.ebuild 1382 +MD5 67fe282751999318810971a3b9dc6651 jamon-1.0.ebuild 1386 MD5 c089b7d34f96c556a34bb8c402794023 files/build-1.0.xml 1546 MD5 5146e7d9155602b66633d3c32c96db1d files/digest-jamon-1.0 65 diff --git a/dev-java/jamon/jamon-1.0.ebuild b/dev-java/jamon/jamon-1.0.ebuild index 5e9eaf9a..ea42f905 100644 --- a/dev-java/jamon/jamon-1.0.ebuild +++ b/dev-java/jamon/jamon-1.0.ebuild @@ -15,9 +15,9 @@ KEYWORDS="~x86" IUSE="doc jikes" DEPEND="virtual/jdk - dev-java/ant + dev-java/ant-core app-arch/unzip - jikes? (dev-java/jikes)" + jikes? (dev-java/jikes)" RDEPEND="virtual/jre" src_unpack() { diff --git a/dev-java/jarjar/Manifest b/dev-java/jarjar/Manifest index 0e1f6020..28c2e02a 100644 --- a/dev-java/jarjar/Manifest +++ b/dev-java/jarjar/Manifest @@ -1,3 +1,3 @@ -MD5 572e8d5ca86cbe83e894553a8f898147 jarjar-0.6.ebuild 1034 +MD5 bd19aeebc92ca8409cc48709e8623b64 jarjar-0.6.ebuild 1039 MD5 32e25e8c0b1eebdf6e1ab7f328e558cf files/digest-jarjar-0.6 63 MD5 42693e47c1e9772fa96128d0a646b4fd files/jarjar-0.6-properties.patch 6981 diff --git a/dev-java/jarjar/jarjar-0.6.ebuild b/dev-java/jarjar/jarjar-0.6.ebuild index a4cb431f..2923833a 100644 --- a/dev-java/jarjar/jarjar-0.6.ebuild +++ b/dev-java/jarjar/jarjar-0.6.ebuild @@ -17,7 +17,7 @@ LIB_DEPEND="=dev-java/asm-2* =dev-java/gnu-regexp-1*" DEPEND="virtual/jdk app-arch/unzip - dev-java/ant + dev-java/ant-core jikes? (dev-java/jikes) ${LIB_DEPEND}" RDEPEND="virtual/jre diff --git a/dev-java/java-kernel-support/Manifest b/dev-java/java-kernel-support/Manifest index 6c64e25b..b58560e7 100644 --- a/dev-java/java-kernel-support/Manifest +++ b/dev-java/java-kernel-support/Manifest @@ -1,2 +1,2 @@ -MD5 884ebed894cd5dc650cf0a4b149b1c40 java-kernel-support-1.01.ebuild 751 +MD5 3ee4fcc6069633f3b370f339838957fa java-kernel-support-1.01.ebuild 793 MD5 aa01e5ad0927b7d862a151f82327a582 files/digest-java-kernel-support-1.01 86 diff --git a/dev-java/java-kernel-support/java-kernel-support-1.01.ebuild b/dev-java/java-kernel-support/java-kernel-support-1.01.ebuild index 2da16ab7..2606616d 100644 --- a/dev-java/java-kernel-support/java-kernel-support-1.01.ebuild +++ b/dev-java/java-kernel-support/java-kernel-support-1.01.ebuild @@ -4,9 +4,11 @@ inherit eutils linux-info +MY_PV="20050425" +MY_P="${PN}-gentoo-${MY_PV}" DESCRIPTION="Java(tm) Binary Kernel Support for Linux" HOMEPAGE="http://www.linuxhq.com/java.html" -SRC_URI="mirror://gentoo/java-kernel-support-gentoo-20050425.tar.bz2" +SRC_URI="http://gentooexperimental.org/distfiles/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~x86" diff --git a/dev-java/javassist/Manifest b/dev-java/javassist/Manifest index 26165c32..cab50022 100644 --- a/dev-java/javassist/Manifest +++ b/dev-java/javassist/Manifest @@ -1,5 +1,5 @@ -MD5 b7242669c398598a77d7038d4f07696e javassist-3.1_rc20050706.ebuild 1038 +MD5 f1ac00f58b4a81ef9dc9d10fdf11603c javassist-3.1_rc20050706.ebuild 1030 MD5 c014f5f4012370bec8c4e42922c51331 javassist-3.0.ebuild 902 MD5 9c24b818e4e0126da3f47a046f4b43d0 files/digest-javassist-20050706 71 MD5 bb876377b6f758b77dd8a68cb7a37dd0 files/digest-javassist-3.0 63 -MD5 9c24b818e4e0126da3f47a046f4b43d0 files/digest-javassist-3.1_rc20050706 71 +MD5 ed270eaa8926b51798e31ed93950aa63 files/digest-javassist-3.1_rc20050706 71 diff --git a/dev-java/javassist/files/digest-javassist-3.1_rc20050706 b/dev-java/javassist/files/digest-javassist-3.1_rc20050706 index d787c22e..6cdd688e 100644 --- a/dev-java/javassist/files/digest-javassist-3.1_rc20050706 +++ b/dev-java/javassist/files/digest-javassist-3.1_rc20050706 @@ -1 +1 @@ -MD5 b744d676699bcdbb528126d61a87db1c javassist-20050706.tar.bz2 860227 +MD5 56205bf063878415881c427cbed639e1 javassist-20050706.tar.bz2 205414 diff --git a/dev-java/javassist/javassist-3.1_rc20050706.ebuild b/dev-java/javassist/javassist-3.1_rc20050706.ebuild index 3ca2982f..448f6d99 100644 --- a/dev-java/javassist/javassist-3.1_rc20050706.ebuild +++ b/dev-java/javassist/javassist-3.1_rc20050706.ebuild @@ -7,7 +7,7 @@ inherit java-pkg MY_PV="20050706" MY_P="${PN}-${MY_PV}" DESCRIPTION="Javassist makes Java bytecode manipulation simple." -SRC_URI="http://www.scorec.rpi.edu/~nichoj/projects/java/${MY_P}.tar.bz2" +SRC_URI="http://gentooexperimental.org/distfiles/${MY_P}.tar.bz2" HOMEPAGE="http://www.csg.is.titech.ac.jp/~chiba/javassist/" LICENSE="MPL-1.1" diff --git a/dev-java/jboss-module-cache/Manifest b/dev-java/jboss-module-cache/Manifest index a00586b3..da0038d8 100644 --- a/dev-java/jboss-module-cache/Manifest +++ b/dev-java/jboss-module-cache/Manifest @@ -1,2 +1,2 @@ -MD5 8af344de17cabd13cc047dd161986c08 jboss-module-cache-4.0.2.ebuild 1145 -MD5 ceb3961dc16eaf65cd39a9a679238574 files/digest-jboss-module-cache-4.0.2 310 +MD5 dd732867dab2b7a3489eba5314aaab34 jboss-module-cache-4.0.2.ebuild 1193 +MD5 79ae9f53294c5ad9ab66335fe7787b02 files/digest-jboss-module-cache-4.0.2 384 diff --git a/dev-java/jboss-module-cache/files/digest-jboss-module-cache-4.0.2 b/dev-java/jboss-module-cache/files/digest-jboss-module-cache-4.0.2 index 404b5d0f..d3552d38 100644 --- a/dev-java/jboss-module-cache/files/digest-jboss-module-cache-4.0.2 +++ b/dev-java/jboss-module-cache/files/digest-jboss-module-cache-4.0.2 @@ -1,4 +1,5 @@ MD5 e7f910c760bd22c5d9a330a07f9717f1 jboss-module-cache-4.0.2-gentoo.tar.bz2 356325 +MD5 abd11accc7e56ee899f0eccc7fd4e378 jboss-4.0.2-gentoo-r2.data 7494 +MD5 bc87129d59b6d3ce73f48b052bf80aa3 jboss-tools-4.0.2-gentoo-r1.tar.bz2 4524270 +MD5 e06fa477d7d92fdefd19d206e55a29b6 jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586285 MD5 7badd85e1e175f77cd93e08b1a04b967 jboss-4.0.2-gentoo.data 6445 -MD5 7228556e7c3be008637d9331635f41e2 jboss-tools-4.0.2-gentoo.tar.bz2 67666 -MD5 6867a4d4112d47cdc9d5b1daba6ad2ce jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586293 diff --git a/dev-java/jboss-module-cache/jboss-module-cache-4.0.2.ebuild b/dev-java/jboss-module-cache/jboss-module-cache-4.0.2.ebuild index ad30588e..11e3b33d 100644 --- a/dev-java/jboss-module-cache/jboss-module-cache-4.0.2.ebuild +++ b/dev-java/jboss-module-cache/jboss-module-cache-4.0.2.ebuild @@ -5,6 +5,7 @@ inherit jboss-4 DESCRIPTION="Cache module of JBoss Application Server" +GENTOO_CONF="jboss-${PV}-gentoo-r2.data" SRC_URI="${BASE_URL}/${P}-gentoo.tar.bz2 ${BASE_URL}/${GENTOO_CONF} ${ECLASS_URI}" HOMEPAGE="http://www.jboss.org" LICENSE="LGPL-2" @@ -23,7 +24,7 @@ COMMON_DEPEND=" dev-db/db-je =dev-java/crimson-1* dev-java/gnu-jaxp - dev-java/jmx + =dev-java/mx4j-3.0* dev-java/xdoclet =dev-java/jboss-module-j2ee-${PV}* =dev-java/jboss-module-common-${PV}* diff --git a/dev-java/jboss-module-cluster/Manifest b/dev-java/jboss-module-cluster/Manifest index ef202061..db55432e 100644 --- a/dev-java/jboss-module-cluster/Manifest +++ b/dev-java/jboss-module-cluster/Manifest @@ -1,2 +1,2 @@ -MD5 d76347b2c4d77f7b01d9d3b828e6483b jboss-module-cluster-4.0.2.ebuild 1419 -MD5 a96e3fd0bcd25bcede44e5eb2c5e61b6 files/digest-jboss-module-cluster-4.0.2 311 +MD5 931c2c7cf06f204cd63aa95f84db6a97 jboss-module-cluster-4.0.2.ebuild 1421 +MD5 209daeab41b7f2f7d03dab3ca8ac33b5 files/digest-jboss-module-cluster-4.0.2 385 diff --git a/dev-java/jboss-module-cluster/files/digest-jboss-module-cluster-4.0.2 b/dev-java/jboss-module-cluster/files/digest-jboss-module-cluster-4.0.2 index 32e6f09e..f700d071 100644 --- a/dev-java/jboss-module-cluster/files/digest-jboss-module-cluster-4.0.2 +++ b/dev-java/jboss-module-cluster/files/digest-jboss-module-cluster-4.0.2 @@ -1,4 +1,5 @@ MD5 cba9a9961eb97d8768f20da3d40f0994 jboss-module-cluster-4.0.2-gentoo.tar.bz2 95574 +MD5 abd11accc7e56ee899f0eccc7fd4e378 jboss-4.0.2-gentoo-r2.data 7494 +MD5 bc87129d59b6d3ce73f48b052bf80aa3 jboss-tools-4.0.2-gentoo-r1.tar.bz2 4524270 +MD5 e06fa477d7d92fdefd19d206e55a29b6 jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586285 MD5 7badd85e1e175f77cd93e08b1a04b967 jboss-4.0.2-gentoo.data 6445 -MD5 7228556e7c3be008637d9331635f41e2 jboss-tools-4.0.2-gentoo.tar.bz2 67666 -MD5 6867a4d4112d47cdc9d5b1daba6ad2ce jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586293 diff --git a/dev-java/jboss-module-cluster/jboss-module-cluster-4.0.2.ebuild b/dev-java/jboss-module-cluster/jboss-module-cluster-4.0.2.ebuild index c310465c..096cab9c 100644 --- a/dev-java/jboss-module-cluster/jboss-module-cluster-4.0.2.ebuild +++ b/dev-java/jboss-module-cluster/jboss-module-cluster-4.0.2.ebuild @@ -5,7 +5,7 @@ inherit jboss-4 DESCRIPTION="Cluster module of JBoss Application Server." -GENTOO_CONF="jboss-${PVR}-gentoo.data" +GENTOO_CONF="jboss-${PV}-gentoo-r2.data" SRC_URI="${BASE_URL}/${P}-gentoo.tar.bz2 ${BASE_URL}/${GENTOO_CONF} ${ECLASS_URI}" HOMEPAGE="http://www.jboss.org" LICENSE="LGPL-2" diff --git a/dev-java/jboss-module-common/Manifest b/dev-java/jboss-module-common/Manifest index 9f0e2337..45af26fb 100644 --- a/dev-java/jboss-module-common/Manifest +++ b/dev-java/jboss-module-common/Manifest @@ -1,3 +1,3 @@ -MD5 12e0ce683e14a192c3647e265f943256 jboss-module-common-4.0.2.ebuild 1067 -MD5 59adebecb4154ec2763435ddcc8ea6be files/digest-jboss-module-common-4.0.2 311 +MD5 eaad4d227c1fb5f3d8833cd74ed7761a jboss-module-common-4.0.2.ebuild 1104 +MD5 28a4fa06990b58510fa8cd57c39a5b41 files/digest-jboss-module-common-4.0.2 388 MD5 97197036c0ac1eef441be061cd92a347 files/jboss-module-4.0.2-gentoo.patch 21810 diff --git a/dev-java/jboss-module-common/files/digest-jboss-module-common-4.0.2 b/dev-java/jboss-module-common/files/digest-jboss-module-common-4.0.2 index 0e70396d..c4f7dac1 100644 --- a/dev-java/jboss-module-common/files/digest-jboss-module-common-4.0.2 +++ b/dev-java/jboss-module-common/files/digest-jboss-module-common-4.0.2 @@ -1,4 +1,5 @@ -MD5 45e31ed1d70a1010c5541175ed3fd56b jboss-module-common-4.0.2-gentoo.tar.bz2 169313 +MD5 389412e4a32330da54412be09c05e0b4 jboss-module-common-4.0.2-gentoo-r1.tar.bz2 169217 +MD5 abd11accc7e56ee899f0eccc7fd4e378 jboss-4.0.2-gentoo-r2.data 7494 +MD5 bc87129d59b6d3ce73f48b052bf80aa3 jboss-tools-4.0.2-gentoo-r1.tar.bz2 4524270 +MD5 e06fa477d7d92fdefd19d206e55a29b6 jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586285 MD5 7badd85e1e175f77cd93e08b1a04b967 jboss-4.0.2-gentoo.data 6445 -MD5 7228556e7c3be008637d9331635f41e2 jboss-tools-4.0.2-gentoo.tar.bz2 67666 -MD5 6867a4d4112d47cdc9d5b1daba6ad2ce jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586293 diff --git a/dev-java/jboss-module-common/jboss-module-common-4.0.2.ebuild b/dev-java/jboss-module-common/jboss-module-common-4.0.2.ebuild index 960a5cd1..0a354f8d 100644 --- a/dev-java/jboss-module-common/jboss-module-common-4.0.2.ebuild +++ b/dev-java/jboss-module-common/jboss-module-common-4.0.2.ebuild @@ -5,9 +5,9 @@ inherit jboss-4 DESCRIPTION="Common module of JBoss Application Server" -GENTOO_CONF="jboss-${PVR}-gentoo.data" -SRC_URI="${BASE_URL}/${P}-gentoo.tar.bz2 ${BASE_URL}/${GENTOO_CONF} ${ECLASS_URI}" -MY_A="${P}-gentoo.tar.bz2 ${MY_A}" +GENTOO_CONF="jboss-${PVR}-gentoo-r2.data" +SRC_URI="${BASE_URL}/${P}-gentoo-r1.tar.bz2 ${BASE_URL}/${GENTOO_CONF} ${ECLASS_URI}" +MY_A="${P}-gentoo-r1.tar.bz2 jboss-tools-${PV}-gentoo-r1.tar.bz2" LICENSE="LGPL-2" HOMEPAGE="http://www.jboss.org" @@ -27,10 +27,10 @@ COMMON_DEPEND="=dev-java/bsf-2.3* =dev-java/commons-httpclient-2* dev-java/commons-lang dev-java/commons-logging - dev-java/log4j dev-java/jakarta-slide-webdavclient =dev-java/gnu-regexp-1* dev-java/concurrent-util + dev-java/log4j =dev-java/dtdparser-1.21*" DEPEND=">=virtual/jdk-1.3 dev-java/ant-core diff --git a/dev-java/jboss-module-connector/Manifest b/dev-java/jboss-module-connector/Manifest index 5e5bf90c..834aa705 100644 --- a/dev-java/jboss-module-connector/Manifest +++ b/dev-java/jboss-module-connector/Manifest @@ -1,2 +1,2 @@ -MD5 e35d045e8ca37ff6dd8dc243407b814f jboss-module-connector-4.0.2.ebuild 1101 -MD5 4ced25239221b325c75bbfefdd4dcf08 files/digest-jboss-module-connector-4.0.2 314 +MD5 713db04cf628caf5702034caedaf3aec jboss-module-connector-4.0.2.ebuild 1099 +MD5 8fc1860422339485c0e49f059aae61e9 files/digest-jboss-module-connector-4.0.2 388 diff --git a/dev-java/jboss-module-connector/files/digest-jboss-module-connector-4.0.2 b/dev-java/jboss-module-connector/files/digest-jboss-module-connector-4.0.2 index e89a5c59..978696ec 100644 --- a/dev-java/jboss-module-connector/files/digest-jboss-module-connector-4.0.2 +++ b/dev-java/jboss-module-connector/files/digest-jboss-module-connector-4.0.2 @@ -1,4 +1,5 @@ MD5 e0861510d02d02ac0d54407b037fdc46 jboss-module-connector-4.0.2-gentoo.tar.bz2 123635 +MD5 abd11accc7e56ee899f0eccc7fd4e378 jboss-4.0.2-gentoo-r2.data 7494 +MD5 bc87129d59b6d3ce73f48b052bf80aa3 jboss-tools-4.0.2-gentoo-r1.tar.bz2 4524270 +MD5 e06fa477d7d92fdefd19d206e55a29b6 jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586285 MD5 7badd85e1e175f77cd93e08b1a04b967 jboss-4.0.2-gentoo.data 6445 -MD5 7228556e7c3be008637d9331635f41e2 jboss-tools-4.0.2-gentoo.tar.bz2 67666 -MD5 6867a4d4112d47cdc9d5b1daba6ad2ce jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586293 diff --git a/dev-java/jboss-module-connector/jboss-module-connector-4.0.2.ebuild b/dev-java/jboss-module-connector/jboss-module-connector-4.0.2.ebuild index 39bfea0f..d286c56b 100644 --- a/dev-java/jboss-module-connector/jboss-module-connector-4.0.2.ebuild +++ b/dev-java/jboss-module-connector/jboss-module-connector-4.0.2.ebuild @@ -5,7 +5,7 @@ inherit jboss-4 DESCRIPTION="JCA module of JBoss Application Server" -GENTOO_CONF="jboss-${PVR}-gentoo.data" +GENTOO_CONF="jboss-${PV}-gentoo-r2.data" SRC_URI="${BASE_URL}/${P}-gentoo.tar.bz2 ${BASE_URL}/${GENTOO_CONF} ${ECLASS_URI}" HOMEPAGE="http://www.jboss.org" LICENSE="LGPL-2" @@ -25,7 +25,7 @@ COMMON_DEPEND=" dev-java/commons-logging dev-java/log4j dev-java/concurrent-util - dev-java/sun-javamail-bin + dev-java/gnu-javamail =dev-java/jboss-module-j2ee-${PV}* =dev-java/jboss-module-security-${PV}* =dev-java/jboss-module-server-${PV}* diff --git a/dev-java/jboss-module-console/Manifest b/dev-java/jboss-module-console/Manifest index 7f1ee37d..9963ba18 100644 --- a/dev-java/jboss-module-console/Manifest +++ b/dev-java/jboss-module-console/Manifest @@ -1,2 +1,2 @@ -MD5 b8e44a98d30ac58c1335115347d70d41 jboss-module-console-4.0.2.ebuild 1288 -MD5 313158356c232ddcbf51c83a5d134e5c files/digest-jboss-module-console-4.0.2 381 +MD5 6db09675d668f8f6821cd7393bba5b32 jboss-module-console-4.0.2.ebuild 1287 +MD5 7bd34de7fd62cd2d109962f0c799202d files/digest-jboss-module-console-4.0.2 386 diff --git a/dev-java/jboss-module-console/files/digest-jboss-module-console-4.0.2 b/dev-java/jboss-module-console/files/digest-jboss-module-console-4.0.2 index a2aebddf..1dc65c2d 100644 --- a/dev-java/jboss-module-console/files/digest-jboss-module-console-4.0.2 +++ b/dev-java/jboss-module-console/files/digest-jboss-module-console-4.0.2 @@ -1,5 +1,5 @@ MD5 ac681199893092a5f95b250a8850ec3c jboss-module-console-4.0.2-gentoo.tar.bz2 118248 -MD5 07995693a6ea981aa44c5d77ec31af68 jboss-4.0.2-gentoo-r1.data 7291 -MD5 7228556e7c3be008637d9331635f41e2 jboss-tools-4.0.2-gentoo.tar.bz2 67666 -MD5 6867a4d4112d47cdc9d5b1daba6ad2ce jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586293 +MD5 abd11accc7e56ee899f0eccc7fd4e378 jboss-4.0.2-gentoo-r2.data 7494 +MD5 bc87129d59b6d3ce73f48b052bf80aa3 jboss-tools-4.0.2-gentoo-r1.tar.bz2 4524270 +MD5 e06fa477d7d92fdefd19d206e55a29b6 jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586285 MD5 7badd85e1e175f77cd93e08b1a04b967 jboss-4.0.2-gentoo.data 6445 diff --git a/dev-java/jboss-module-console/jboss-module-console-4.0.2.ebuild b/dev-java/jboss-module-console/jboss-module-console-4.0.2.ebuild index 391f62e2..30813561 100644 --- a/dev-java/jboss-module-console/jboss-module-console-4.0.2.ebuild +++ b/dev-java/jboss-module-console/jboss-module-console-4.0.2.ebuild @@ -4,7 +4,7 @@ inherit jboss-4 DESCRIPTION="Console module of JBoss Application Server" -GENTOO_CONF="jboss-${PVR}-gentoo-r1.data" +GENTOO_CONF="jboss-${PV}-gentoo-r2.data" # TODO: upload jboss-module-console-4.0.2-gentoo.tar.bz2 # TODO: upload new .data file SRC_URI="${BASE_URL}/${P}-gentoo.tar.bz2 ${BASE_URL}/${GENTOO_CONF} ${ECLASS_URI}" diff --git a/dev-java/jboss-module-deployment/Manifest b/dev-java/jboss-module-deployment/Manifest index ec18cfe0..2c25eb92 100644 --- a/dev-java/jboss-module-deployment/Manifest +++ b/dev-java/jboss-module-deployment/Manifest @@ -1,2 +1,2 @@ -MD5 f2def617aa0160a0eab7f4f0969cf700 jboss-module-deployment-4.0.2.ebuild 682 -MD5 71707b701d98f99ef59c4e5ab65012a4 files/digest-jboss-module-deployment-4.0.2 314 +MD5 9ac629fbafe945c991fcde7f711c7f8b jboss-module-deployment-4.0.2.ebuild 684 +MD5 80de99aaa9fccd927fa01b9f655e9503 files/digest-jboss-module-deployment-4.0.2 388 diff --git a/dev-java/jboss-module-deployment/files/digest-jboss-module-deployment-4.0.2 b/dev-java/jboss-module-deployment/files/digest-jboss-module-deployment-4.0.2 index a3f26915..723b3cec 100644 --- a/dev-java/jboss-module-deployment/files/digest-jboss-module-deployment-4.0.2 +++ b/dev-java/jboss-module-deployment/files/digest-jboss-module-deployment-4.0.2 @@ -1,4 +1,5 @@ MD5 8250297b04002e0c393d7ee763945420 jboss-module-deployment-4.0.2-gentoo.tar.bz2 16257 +MD5 abd11accc7e56ee899f0eccc7fd4e378 jboss-4.0.2-gentoo-r2.data 7494 +MD5 bc87129d59b6d3ce73f48b052bf80aa3 jboss-tools-4.0.2-gentoo-r1.tar.bz2 4524270 +MD5 e06fa477d7d92fdefd19d206e55a29b6 jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586285 MD5 7badd85e1e175f77cd93e08b1a04b967 jboss-4.0.2-gentoo.data 6445 -MD5 7228556e7c3be008637d9331635f41e2 jboss-tools-4.0.2-gentoo.tar.bz2 67666 -MD5 6867a4d4112d47cdc9d5b1daba6ad2ce jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586293 diff --git a/dev-java/jboss-module-deployment/jboss-module-deployment-4.0.2.ebuild b/dev-java/jboss-module-deployment/jboss-module-deployment-4.0.2.ebuild index 7096dce4..027adca0 100644 --- a/dev-java/jboss-module-deployment/jboss-module-deployment-4.0.2.ebuild +++ b/dev-java/jboss-module-deployment/jboss-module-deployment-4.0.2.ebuild @@ -5,7 +5,7 @@ inherit jboss-4 DESCRIPTION="Deployment module of JBoss Application Server" -GENTOO_CONF="jboss-${PVR}-gentoo.data" +GENTOO_CONF="jboss-${PV}-gentoo-r2.data" SRC_URI="${BASE_URL}/${P}-gentoo.tar.bz2 ${BASE_URL}/${GENTOO_CONF} ${ECLASS_URI}" HOMEPAGE="http://www.jboss.org" LICENSE="LGPL-2" diff --git a/dev-java/jboss-module-hibernate/Manifest b/dev-java/jboss-module-hibernate/Manifest index 55c18586..7cbc6031 100644 --- a/dev-java/jboss-module-hibernate/Manifest +++ b/dev-java/jboss-module-hibernate/Manifest @@ -1,3 +1,3 @@ -MD5 2071b631cd70c65c123ab0de4592ac46 jboss-module-hibernate-4.0.2.ebuild 1405 -MD5 acb46afe475fba9d59b90a5bdd7a372d files/digest-jboss-module-hibernate-4.0.2 382 +MD5 3353a6552f7b7ed61f769f4764f2e9c2 jboss-module-hibernate-4.0.2.ebuild 1404 +MD5 59c1b7518f424944db656311313486ef files/digest-jboss-module-hibernate-4.0.2 387 MD5 f878c4a307d00aefd5876a94dafb7a5e files/digest-jboss-module-tomcat-4.0.2 311 diff --git a/dev-java/jboss-module-hibernate/files/digest-jboss-module-hibernate-4.0.2 b/dev-java/jboss-module-hibernate/files/digest-jboss-module-hibernate-4.0.2 index 7022d454..940884b8 100644 --- a/dev-java/jboss-module-hibernate/files/digest-jboss-module-hibernate-4.0.2 +++ b/dev-java/jboss-module-hibernate/files/digest-jboss-module-hibernate-4.0.2 @@ -1,5 +1,5 @@ MD5 755df88693213822e0188bd474d968b2 jboss-module-hibernate-4.0.2-gentoo.tar.bz2 14942 -MD5 07995693a6ea981aa44c5d77ec31af68 jboss-4.0.2-gentoo-r1.data 7291 -MD5 7228556e7c3be008637d9331635f41e2 jboss-tools-4.0.2-gentoo.tar.bz2 67666 -MD5 6867a4d4112d47cdc9d5b1daba6ad2ce jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586293 +MD5 abd11accc7e56ee899f0eccc7fd4e378 jboss-4.0.2-gentoo-r2.data 7494 +MD5 bc87129d59b6d3ce73f48b052bf80aa3 jboss-tools-4.0.2-gentoo-r1.tar.bz2 4524270 +MD5 e06fa477d7d92fdefd19d206e55a29b6 jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586285 MD5 7badd85e1e175f77cd93e08b1a04b967 jboss-4.0.2-gentoo.data 6445 diff --git a/dev-java/jboss-module-hibernate/jboss-module-hibernate-4.0.2.ebuild b/dev-java/jboss-module-hibernate/jboss-module-hibernate-4.0.2.ebuild index efd1c271..082ccc2b 100644 --- a/dev-java/jboss-module-hibernate/jboss-module-hibernate-4.0.2.ebuild +++ b/dev-java/jboss-module-hibernate/jboss-module-hibernate-4.0.2.ebuild @@ -4,7 +4,7 @@ inherit jboss-4 DESCRIPTION="Hibernate module of JBoss Application Server" -GENTOO_CONF="jboss-${PVR}-gentoo-r1.data" +GENTOO_CONF="jboss-${PV}-gentoo-r2.data" SRC_URI="${BASE_URL}/${P}-gentoo.tar.bz2 ${BASE_URL}/${GENTOO_CONF} ${ECLASS_URI}" HOMEPAGE="http://www.jboss.org" LICENSE="LGPL-2" diff --git a/dev-java/jboss-module-iiop/Manifest b/dev-java/jboss-module-iiop/Manifest index e2553e71..eb5fa1f1 100644 --- a/dev-java/jboss-module-iiop/Manifest +++ b/dev-java/jboss-module-iiop/Manifest @@ -1,2 +1,2 @@ -MD5 06b7d980498dbfa3303f0b791b31f2c2 jboss-module-iiop-4.0.2.ebuild 928 -MD5 43622ff2860454d448fb30fc51acdb86 files/digest-jboss-module-iiop-4.0.2 308 +MD5 8720c5ae56b74e766534f804b7d94121 jboss-module-iiop-4.0.2.ebuild 926 +MD5 cd5cfa426b716760541360474af6312e files/digest-jboss-module-iiop-4.0.2 382 diff --git a/dev-java/jboss-module-iiop/files/digest-jboss-module-iiop-4.0.2 b/dev-java/jboss-module-iiop/files/digest-jboss-module-iiop-4.0.2 index ae94a8d3..02933600 100644 --- a/dev-java/jboss-module-iiop/files/digest-jboss-module-iiop-4.0.2 +++ b/dev-java/jboss-module-iiop/files/digest-jboss-module-iiop-4.0.2 @@ -1,4 +1,5 @@ MD5 cf9298944387b4c4856d88b8217cbca5 jboss-module-iiop-4.0.2-gentoo.tar.bz2 99573 +MD5 abd11accc7e56ee899f0eccc7fd4e378 jboss-4.0.2-gentoo-r2.data 7494 +MD5 bc87129d59b6d3ce73f48b052bf80aa3 jboss-tools-4.0.2-gentoo-r1.tar.bz2 4524270 +MD5 e06fa477d7d92fdefd19d206e55a29b6 jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586285 MD5 7badd85e1e175f77cd93e08b1a04b967 jboss-4.0.2-gentoo.data 6445 -MD5 7228556e7c3be008637d9331635f41e2 jboss-tools-4.0.2-gentoo.tar.bz2 67666 -MD5 6867a4d4112d47cdc9d5b1daba6ad2ce jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586293 diff --git a/dev-java/jboss-module-iiop/jboss-module-iiop-4.0.2.ebuild b/dev-java/jboss-module-iiop/jboss-module-iiop-4.0.2.ebuild index cd71798e..58f9d895 100644 --- a/dev-java/jboss-module-iiop/jboss-module-iiop-4.0.2.ebuild +++ b/dev-java/jboss-module-iiop/jboss-module-iiop-4.0.2.ebuild @@ -5,7 +5,7 @@ inherit jboss-4 DESCRIPTION="IIOP module of JBoss Application Server" -GENTOO_CONF="jboss-${PVR}-gentoo.data" +GENTOO_CONF="jboss-${PV}-gentoo-r2.data" SRC_URI="${BASE_URL}/${P}-gentoo.tar.bz2 ${BASE_URL}/${GENTOO_CONF} ${ECLASS_URI}" HOMEPAGE="http://www.jboss.org" LICENSE="LGPL-2" @@ -20,7 +20,7 @@ COMMON_DEPEND=" =dev-java/avalon-logkit-1.2* dev-java/log4j dev-java/junit - dev-java/sun-javamail-bin + dev-java/gnu-javamail =dev-java/jboss-module-j2ee-${PV}* =dev-java/jboss-module-common-${PV}* =dev-java/jboss-module-system-${PV}* diff --git a/dev-java/jboss-module-j2ee/Manifest b/dev-java/jboss-module-j2ee/Manifest index 7de76275..b26d72ba 100644 --- a/dev-java/jboss-module-j2ee/Manifest +++ b/dev-java/jboss-module-j2ee/Manifest @@ -1,2 +1,2 @@ -MD5 28c6b37165b0dd5ef6ea886ca4e88926 jboss-module-j2ee-4.0.2.ebuild 595 -MD5 c7912c2ae1ae520756d17c32cd2e44d3 files/digest-jboss-module-j2ee-4.0.2 309 +MD5 b6f3e28e6c4cd64c3b87e5350b0af62c jboss-module-j2ee-4.0.2.ebuild 597 +MD5 e4496f3a980d48c776c4af9cde917da7 files/digest-jboss-module-j2ee-4.0.2 383 diff --git a/dev-java/jboss-module-j2ee/files/digest-jboss-module-j2ee-4.0.2 b/dev-java/jboss-module-j2ee/files/digest-jboss-module-j2ee-4.0.2 index a1fba269..41de4b3d 100644 --- a/dev-java/jboss-module-j2ee/files/digest-jboss-module-j2ee-4.0.2 +++ b/dev-java/jboss-module-j2ee/files/digest-jboss-module-j2ee-4.0.2 @@ -1,4 +1,5 @@ MD5 46ef9293f15f223e381b66a69462920b jboss-module-j2ee-4.0.2-gentoo.tar.bz2 138209 +MD5 abd11accc7e56ee899f0eccc7fd4e378 jboss-4.0.2-gentoo-r2.data 7494 +MD5 bc87129d59b6d3ce73f48b052bf80aa3 jboss-tools-4.0.2-gentoo-r1.tar.bz2 4524270 +MD5 e06fa477d7d92fdefd19d206e55a29b6 jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586285 MD5 7badd85e1e175f77cd93e08b1a04b967 jboss-4.0.2-gentoo.data 6445 -MD5 7228556e7c3be008637d9331635f41e2 jboss-tools-4.0.2-gentoo.tar.bz2 67666 -MD5 6867a4d4112d47cdc9d5b1daba6ad2ce jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586293 diff --git a/dev-java/jboss-module-j2ee/jboss-module-j2ee-4.0.2.ebuild b/dev-java/jboss-module-j2ee/jboss-module-j2ee-4.0.2.ebuild index 57a45f77..50f2da2f 100644 --- a/dev-java/jboss-module-j2ee/jboss-module-j2ee-4.0.2.ebuild +++ b/dev-java/jboss-module-j2ee/jboss-module-j2ee-4.0.2.ebuild @@ -5,7 +5,7 @@ inherit jboss-4 DESCRIPTION="J2EE module of JBoss Application Server" -GENTOO_CONF="jboss-${PVR}-gentoo.data" +GENTOO_CONF="jboss-${PV}-gentoo-r2.data" SRC_URI="${BASE_URL}/${P}-gentoo.tar.bz2 ${BASE_URL}/${GENTOO_CONF} ${ECLASS_URI}" HOMEPAGE="http://www.jboss.org" LICENSE="LGPL-2" @@ -13,7 +13,7 @@ IUSE="jikes" SLOT="4" KEYWORDS="~x86" -COMMON_DEPEND="dev-java/sun-jaf-bin +COMMON_DEPEND="=dev-java/gnu-jaf-1* ~dev-java/servletapi-2.4 =dev-java/jboss-module-common-4.0.2*" DEPEND=">=virtual/jdk-1.3 diff --git a/dev-java/jboss-module-jaxrpc/Manifest b/dev-java/jboss-module-jaxrpc/Manifest index be9b07a1..f0cef28c 100644 --- a/dev-java/jboss-module-jaxrpc/Manifest +++ b/dev-java/jboss-module-jaxrpc/Manifest @@ -1,2 +1,2 @@ -MD5 cac7921de222614b84b8ca2594cfad53 jboss-module-jaxrpc-4.0.2.ebuild 1089 -MD5 d2847304e8bb22a6cb7d870429fafb3f files/digest-jboss-module-jaxrpc-4.0.2 311 +MD5 6df0eda490be9061e46f7391f8800e42 jboss-module-jaxrpc-4.0.2.ebuild 1087 +MD5 c3f634be187b81993d204e6da4f76eda files/digest-jboss-module-jaxrpc-4.0.2 385 diff --git a/dev-java/jboss-module-jaxrpc/files/digest-jboss-module-jaxrpc-4.0.2 b/dev-java/jboss-module-jaxrpc/files/digest-jboss-module-jaxrpc-4.0.2 index 1122bbba..3d1a49ac 100644 --- a/dev-java/jboss-module-jaxrpc/files/digest-jboss-module-jaxrpc-4.0.2 +++ b/dev-java/jboss-module-jaxrpc/files/digest-jboss-module-jaxrpc-4.0.2 @@ -1,4 +1,5 @@ MD5 6a7bac6fe90e93830aa430c16e3b478c jboss-module-jaxrpc-4.0.2-gentoo.tar.bz2 549628 +MD5 abd11accc7e56ee899f0eccc7fd4e378 jboss-4.0.2-gentoo-r2.data 7494 +MD5 bc87129d59b6d3ce73f48b052bf80aa3 jboss-tools-4.0.2-gentoo-r1.tar.bz2 4524270 +MD5 e06fa477d7d92fdefd19d206e55a29b6 jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586285 MD5 7badd85e1e175f77cd93e08b1a04b967 jboss-4.0.2-gentoo.data 6445 -MD5 7228556e7c3be008637d9331635f41e2 jboss-tools-4.0.2-gentoo.tar.bz2 67666 -MD5 6867a4d4112d47cdc9d5b1daba6ad2ce jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586293 diff --git a/dev-java/jboss-module-jaxrpc/jboss-module-jaxrpc-4.0.2.ebuild b/dev-java/jboss-module-jaxrpc/jboss-module-jaxrpc-4.0.2.ebuild index 8b23faa7..2b1b2f6f 100644 --- a/dev-java/jboss-module-jaxrpc/jboss-module-jaxrpc-4.0.2.ebuild +++ b/dev-java/jboss-module-jaxrpc/jboss-module-jaxrpc-4.0.2.ebuild @@ -5,7 +5,7 @@ inherit jboss-4 DESCRIPTION="JAX-RPC module of JBoss Application Server" -GENTOO_CONF="jboss-${PVR}-gentoo.data" +GENTOO_CONF="jboss-${PV}-gentoo-r2.data" SRC_URI="${BASE_URL}/${P}-gentoo.tar.bz2 ${BASE_URL}/${GENTOO_CONF} ${ECLASS_URI}" HOMEPAGE="http://www.jboss.org" LICENSE="LGPL-2" @@ -28,8 +28,8 @@ COMMON_DEPEND=" =dev-java/xerces-2* dev-java/gnu-jaxp dev-java/wsdl4j - dev-java/sun-jaf-bin - dev-java/sun-javamail-bin + =dev-java/gnu-jaf-1* + dev-java/gnu-javamail ~dev-java/servletapi-2.4 =dev-java/jboss-module-common-${PV}* =dev-java/jboss-module-j2ee-${PV}* diff --git a/dev-java/jboss-module-jms/Manifest b/dev-java/jboss-module-jms/Manifest index dd25c324..6bbf5fa8 100644 --- a/dev-java/jboss-module-jms/Manifest +++ b/dev-java/jboss-module-jms/Manifest @@ -1,2 +1,2 @@ -MD5 afb19cc2e6126e73eef6037ca00e24c9 jboss-module-jms-4.0.2.ebuild 798 -MD5 62f8135a03d5165260ef6ed89d752e9d files/digest-jboss-module-jms-4.0.2 307 +MD5 ebe52031ab42d30d114e30f630f9a46d jboss-module-jms-4.0.2.ebuild 800 +MD5 bb240d70cc64f6e43ec1fcaa3f941360 files/digest-jboss-module-jms-4.0.2 381 diff --git a/dev-java/jboss-module-jms/files/digest-jboss-module-jms-4.0.2 b/dev-java/jboss-module-jms/files/digest-jboss-module-jms-4.0.2 index 4ae7c0bb..c53d44a7 100644 --- a/dev-java/jboss-module-jms/files/digest-jboss-module-jms-4.0.2 +++ b/dev-java/jboss-module-jms/files/digest-jboss-module-jms-4.0.2 @@ -1,4 +1,5 @@ MD5 4d8024ab27a833d87fe8799927aa630f jboss-module-jms-4.0.2-gentoo.tar.bz2 52174 +MD5 abd11accc7e56ee899f0eccc7fd4e378 jboss-4.0.2-gentoo-r2.data 7494 +MD5 bc87129d59b6d3ce73f48b052bf80aa3 jboss-tools-4.0.2-gentoo-r1.tar.bz2 4524270 +MD5 e06fa477d7d92fdefd19d206e55a29b6 jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586285 MD5 7badd85e1e175f77cd93e08b1a04b967 jboss-4.0.2-gentoo.data 6445 -MD5 7228556e7c3be008637d9331635f41e2 jboss-tools-4.0.2-gentoo.tar.bz2 67666 -MD5 6867a4d4112d47cdc9d5b1daba6ad2ce jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586293 diff --git a/dev-java/jboss-module-jms/jboss-module-jms-4.0.2.ebuild b/dev-java/jboss-module-jms/jboss-module-jms-4.0.2.ebuild index 578756fe..ebe3f494 100644 --- a/dev-java/jboss-module-jms/jboss-module-jms-4.0.2.ebuild +++ b/dev-java/jboss-module-jms/jboss-module-jms-4.0.2.ebuild @@ -5,7 +5,7 @@ inherit jboss-4 DESCRIPTION="JMS module of JBoss Application Server" -GENTOO_CONF="jboss-${PVR}-gentoo.data" +GENTOO_CONF="jboss-${PV}-gentoo-r2.data" SRC_URI="${BASE_URL}/${P}-gentoo.tar.bz2 ${BASE_URL}/${GENTOO_CONF} ${ECLASS_URI}" HOMEPAGE="http://www.jboss.org" LICENSE="LGPL-2" diff --git a/dev-java/jboss-module-jmx-remoting/Manifest b/dev-java/jboss-module-jmx-remoting/Manifest index 83b7bd0e..cb7e77a9 100644 --- a/dev-java/jboss-module-jmx-remoting/Manifest +++ b/dev-java/jboss-module-jmx-remoting/Manifest @@ -1,2 +1,2 @@ -MD5 c5ae5c45111f2d3ab1cd6c100cec0aad jboss-module-jmx-remoting-4.0.2.ebuild 631 -MD5 1103e3b9847eb5e4b5684b2d8d9f0b2d files/digest-jboss-module-jmx-remoting-4.0.2 316 +MD5 765ff29c035323dc933321057b47bd9a jboss-module-jmx-remoting-4.0.2.ebuild 654 +MD5 756bd41badfea7b6b239ae96164db143 files/digest-jboss-module-jmx-remoting-4.0.2 390 diff --git a/dev-java/jboss-module-jmx-remoting/files/digest-jboss-module-jmx-remoting-4.0.2 b/dev-java/jboss-module-jmx-remoting/files/digest-jboss-module-jmx-remoting-4.0.2 index c6ab26e7..67fcd51e 100644 --- a/dev-java/jboss-module-jmx-remoting/files/digest-jboss-module-jmx-remoting-4.0.2 +++ b/dev-java/jboss-module-jmx-remoting/files/digest-jboss-module-jmx-remoting-4.0.2 @@ -1,4 +1,5 @@ MD5 c40c99e575622e8da49cf7dc7d7b54f7 jboss-module-jmx-remoting-4.0.2-gentoo.tar.bz2 27965 +MD5 abd11accc7e56ee899f0eccc7fd4e378 jboss-4.0.2-gentoo-r2.data 7494 +MD5 bc87129d59b6d3ce73f48b052bf80aa3 jboss-tools-4.0.2-gentoo-r1.tar.bz2 4524270 +MD5 e06fa477d7d92fdefd19d206e55a29b6 jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586285 MD5 7badd85e1e175f77cd93e08b1a04b967 jboss-4.0.2-gentoo.data 6445 -MD5 7228556e7c3be008637d9331635f41e2 jboss-tools-4.0.2-gentoo.tar.bz2 67666 -MD5 6867a4d4112d47cdc9d5b1daba6ad2ce jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586293 diff --git a/dev-java/jboss-module-jmx-remoting/jboss-module-jmx-remoting-4.0.2.ebuild b/dev-java/jboss-module-jmx-remoting/jboss-module-jmx-remoting-4.0.2.ebuild index 21545862..f195ed39 100644 --- a/dev-java/jboss-module-jmx-remoting/jboss-module-jmx-remoting-4.0.2.ebuild +++ b/dev-java/jboss-module-jmx-remoting/jboss-module-jmx-remoting-4.0.2.ebuild @@ -5,7 +5,7 @@ inherit jboss-4 DESCRIPTION="JMX-Remoting module of JBoss Application Server" -GENTOO_CONF="jboss-${PVR}-gentoo.data" +GENTOO_CONF="jboss-${PV}-gentoo-r2.data" SRC_URI="${BASE_URL}/${P}-gentoo.tar.bz2 ${BASE_URL}/${GENTOO_CONF} ${ECLASS_URI}" HOMEPAGE="http://www.jboss.org" LICENSE="LGPL-2" @@ -19,3 +19,5 @@ COMMON_DEPEND="dev-java/log4j =dev-java/jboss-module-remoting-${PV}*" DEPEND=">=virtual/jdk-1.3 ${COMMON_DEPEND}" RDEPEND=">=virtual/jre-1.3 ${COMMON_DEPEND}" + +ANT_TARGET="output" diff --git a/dev-java/jboss-module-jmx/Manifest b/dev-java/jboss-module-jmx/Manifest index e3919536..8e44abd7 100644 --- a/dev-java/jboss-module-jmx/Manifest +++ b/dev-java/jboss-module-jmx/Manifest @@ -1,2 +1,2 @@ -MD5 fc05cd65fab695c88673717eacdde484 jboss-module-jmx-4.0.2.ebuild 1042 -MD5 79c6312c80040e56e105505ec91d7733 files/digest-jboss-module-jmx-4.0.2 308 +MD5 a8666799b97197f5b4268a5728152155 jboss-module-jmx-4.0.2.ebuild 1065 +MD5 1c647ebf9240b3198084e0343b9e2c36 files/digest-jboss-module-jmx-4.0.2 382 diff --git a/dev-java/jboss-module-jmx/files/digest-jboss-module-jmx-4.0.2 b/dev-java/jboss-module-jmx/files/digest-jboss-module-jmx-4.0.2 index 979a8780..f2f02cae 100644 --- a/dev-java/jboss-module-jmx/files/digest-jboss-module-jmx-4.0.2 +++ b/dev-java/jboss-module-jmx/files/digest-jboss-module-jmx-4.0.2 @@ -1,4 +1,5 @@ MD5 4ea69789b920326335e9573d67b0a16d jboss-module-jmx-4.0.2-gentoo.tar.bz2 344039 +MD5 abd11accc7e56ee899f0eccc7fd4e378 jboss-4.0.2-gentoo-r2.data 7494 +MD5 bc87129d59b6d3ce73f48b052bf80aa3 jboss-tools-4.0.2-gentoo-r1.tar.bz2 4524270 +MD5 e06fa477d7d92fdefd19d206e55a29b6 jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586285 MD5 7badd85e1e175f77cd93e08b1a04b967 jboss-4.0.2-gentoo.data 6445 -MD5 7228556e7c3be008637d9331635f41e2 jboss-tools-4.0.2-gentoo.tar.bz2 67666 -MD5 6867a4d4112d47cdc9d5b1daba6ad2ce jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586293 diff --git a/dev-java/jboss-module-jmx/jboss-module-jmx-4.0.2.ebuild b/dev-java/jboss-module-jmx/jboss-module-jmx-4.0.2.ebuild index 6ade6bfc..44e8cdd4 100644 --- a/dev-java/jboss-module-jmx/jboss-module-jmx-4.0.2.ebuild +++ b/dev-java/jboss-module-jmx/jboss-module-jmx-4.0.2.ebuild @@ -5,7 +5,7 @@ inherit jboss-4 DESCRIPTION="JMX module of JBoss Application Server" -GENTOO_CONF="jboss-${PVR}-gentoo.data" +GENTOO_CONF="jboss-${PV}-gentoo-r2.data" SRC_URI="${BASE_URL}/${P}-gentoo.tar.bz2 ${BASE_URL}/${GENTOO_CONF} ${ECLASS_URI}" MY_A="${P}-gentoo.tar.bz2 ${MY_A}" LICENSE="LGPL-2" @@ -37,3 +37,5 @@ COMMON_DEPEND="=dev-java/jboss-module-common-${PV}* dev-java/sax" DEPEND=">=virtual/jdk-1.3 ${COMMON_DEPEND}" RDEPEND=">=virtual/jre-1.3 ${COMMON_DEPEND}" + +ANT_TARGET="output" diff --git a/dev-java/jboss-module-management/Manifest b/dev-java/jboss-module-management/Manifest index 72ee4766..63370eaf 100644 --- a/dev-java/jboss-module-management/Manifest +++ b/dev-java/jboss-module-management/Manifest @@ -1,2 +1,2 @@ -MD5 5e84774fbe72728c2ee7f5789388d348 jboss-module-management-4.0.2.ebuild 1044 -MD5 fa2eeb39d79f65566494447c2c98c0eb files/digest-jboss-module-management-4.0.2 314 +MD5 71184748294ff0f3a1ea40ba9053265d jboss-module-management-4.0.2.ebuild 1046 +MD5 f85f83a86072bae4f88533a933194ae0 files/digest-jboss-module-management-4.0.2 388 diff --git a/dev-java/jboss-module-management/files/digest-jboss-module-management-4.0.2 b/dev-java/jboss-module-management/files/digest-jboss-module-management-4.0.2 index f9132472..550f28be 100644 --- a/dev-java/jboss-module-management/files/digest-jboss-module-management-4.0.2 +++ b/dev-java/jboss-module-management/files/digest-jboss-module-management-4.0.2 @@ -1,4 +1,5 @@ MD5 fb87a8ce9d634db5e9ec9b70048dab66 jboss-module-management-4.0.2-gentoo.tar.bz2 51727 +MD5 abd11accc7e56ee899f0eccc7fd4e378 jboss-4.0.2-gentoo-r2.data 7494 +MD5 bc87129d59b6d3ce73f48b052bf80aa3 jboss-tools-4.0.2-gentoo-r1.tar.bz2 4524270 +MD5 e06fa477d7d92fdefd19d206e55a29b6 jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586285 MD5 7badd85e1e175f77cd93e08b1a04b967 jboss-4.0.2-gentoo.data 6445 -MD5 7228556e7c3be008637d9331635f41e2 jboss-tools-4.0.2-gentoo.tar.bz2 67666 -MD5 6867a4d4112d47cdc9d5b1daba6ad2ce jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586293 diff --git a/dev-java/jboss-module-management/jboss-module-management-4.0.2.ebuild b/dev-java/jboss-module-management/jboss-module-management-4.0.2.ebuild index 6cee2e1f..d63809d3 100644 --- a/dev-java/jboss-module-management/jboss-module-management-4.0.2.ebuild +++ b/dev-java/jboss-module-management/jboss-module-management-4.0.2.ebuild @@ -5,7 +5,7 @@ inherit jboss-4 DESCRIPTION="Management module of JBoss Application Server" -GENTOO_CONF="jboss-${PVR}-gentoo.data" +GENTOO_CONF="jboss-${PV}-gentoo-r2.data" SRC_URI="${BASE_URL}/${P}-gentoo.tar.bz2 ${BASE_URL}/${GENTOO_CONF} ${ECLASS_URI}" HOMEPAGE="http://www.jboss.org" LICENSE="LGPL-2" diff --git a/dev-java/jboss-module-media/Manifest b/dev-java/jboss-module-media/Manifest index 34a78d44..e2a57090 100644 --- a/dev-java/jboss-module-media/Manifest +++ b/dev-java/jboss-module-media/Manifest @@ -1,2 +1,2 @@ -MD5 d96407d8b30bdb47388da24e823c9d52 jboss-module-media-4.0.2.ebuild 820 -MD5 3cb397dff8596567f92654fdb5cd8608 files/digest-jboss-module-media-4.0.2 309 +MD5 1479bb82aa978df4a73dd387a306e715 jboss-module-media-4.0.2.ebuild 822 +MD5 c1befd500141b6eca166cd6bec38656e files/digest-jboss-module-media-4.0.2 383 diff --git a/dev-java/jboss-module-media/files/digest-jboss-module-media-4.0.2 b/dev-java/jboss-module-media/files/digest-jboss-module-media-4.0.2 index 7dcb62d7..839bc1ea 100644 --- a/dev-java/jboss-module-media/files/digest-jboss-module-media-4.0.2 +++ b/dev-java/jboss-module-media/files/digest-jboss-module-media-4.0.2 @@ -1,4 +1,5 @@ MD5 4f802e2ed2e80591bf4ab14baae9caee jboss-module-media-4.0.2-gentoo.tar.bz2 58347 +MD5 abd11accc7e56ee899f0eccc7fd4e378 jboss-4.0.2-gentoo-r2.data 7494 +MD5 bc87129d59b6d3ce73f48b052bf80aa3 jboss-tools-4.0.2-gentoo-r1.tar.bz2 4524270 +MD5 e06fa477d7d92fdefd19d206e55a29b6 jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586285 MD5 7badd85e1e175f77cd93e08b1a04b967 jboss-4.0.2-gentoo.data 6445 -MD5 7228556e7c3be008637d9331635f41e2 jboss-tools-4.0.2-gentoo.tar.bz2 67666 -MD5 6867a4d4112d47cdc9d5b1daba6ad2ce jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586293 diff --git a/dev-java/jboss-module-media/jboss-module-media-4.0.2.ebuild b/dev-java/jboss-module-media/jboss-module-media-4.0.2.ebuild index 846c4fa2..9e1c3c72 100644 --- a/dev-java/jboss-module-media/jboss-module-media-4.0.2.ebuild +++ b/dev-java/jboss-module-media/jboss-module-media-4.0.2.ebuild @@ -5,7 +5,7 @@ inherit jboss-4 DESCRIPTION="Media module of JBoss Applation Server" -GENTOO_CONF="jboss-${PVR}-gentoo.data" +GENTOO_CONF="jboss-${PV}-gentoo-r2.data" SRC_URI="${BASE_URL}/${P}-gentoo.tar.bz2 ${BASE_URL}/${GENTOO_CONF} ${ECLASS_URI}" HOMEPAGE="http://www.jboss.org" LICENSE="LGPL-2" diff --git a/dev-java/jboss-module-messaging/Manifest b/dev-java/jboss-module-messaging/Manifest index b46cac06..e4ec1bae 100644 --- a/dev-java/jboss-module-messaging/Manifest +++ b/dev-java/jboss-module-messaging/Manifest @@ -1,2 +1,2 @@ -MD5 40c18074ca287cee75e5420ccd8f0537 jboss-module-messaging-4.0.2.ebuild 1113 -MD5 7fb1965e82686d641ade3b7187025b7c files/digest-jboss-module-messaging-4.0.2 314 +MD5 078e9f2a57cfe80944b11d2827565a98 jboss-module-messaging-4.0.2.ebuild 1115 +MD5 b9fd6f5cb64193948af1ef7beb1b8b34 files/digest-jboss-module-messaging-4.0.2 388 diff --git a/dev-java/jboss-module-messaging/files/digest-jboss-module-messaging-4.0.2 b/dev-java/jboss-module-messaging/files/digest-jboss-module-messaging-4.0.2 index 3ed66b47..562cfdd3 100644 --- a/dev-java/jboss-module-messaging/files/digest-jboss-module-messaging-4.0.2 +++ b/dev-java/jboss-module-messaging/files/digest-jboss-module-messaging-4.0.2 @@ -1,4 +1,5 @@ MD5 6a0db0b88dda7d3270557b4214670833 jboss-module-messaging-4.0.2-gentoo.tar.bz2 168661 +MD5 abd11accc7e56ee899f0eccc7fd4e378 jboss-4.0.2-gentoo-r2.data 7494 +MD5 bc87129d59b6d3ce73f48b052bf80aa3 jboss-tools-4.0.2-gentoo-r1.tar.bz2 4524270 +MD5 e06fa477d7d92fdefd19d206e55a29b6 jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586285 MD5 7badd85e1e175f77cd93e08b1a04b967 jboss-4.0.2-gentoo.data 6445 -MD5 7228556e7c3be008637d9331635f41e2 jboss-tools-4.0.2-gentoo.tar.bz2 67666 -MD5 6867a4d4112d47cdc9d5b1daba6ad2ce jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586293 diff --git a/dev-java/jboss-module-messaging/jboss-module-messaging-4.0.2.ebuild b/dev-java/jboss-module-messaging/jboss-module-messaging-4.0.2.ebuild index a713bcf9..59c03aaf 100644 --- a/dev-java/jboss-module-messaging/jboss-module-messaging-4.0.2.ebuild +++ b/dev-java/jboss-module-messaging/jboss-module-messaging-4.0.2.ebuild @@ -5,7 +5,7 @@ inherit jboss-4 DESCRIPTION="Messaging module of JBoss Application" -GENTOO_CONF="jboss-${PVR}-gentoo.data" +GENTOO_CONF="jboss-${PV}-gentoo-r2.data" SRC_URI="${BASE_URL}/${P}-gentoo.tar.bz2 ${BASE_URL}/${GENTOO_CONF} ${ECLASS_URI}" HOMEPAGE="http://www.jboss.org" LICENSE="LGPL-2" diff --git a/dev-java/jboss-module-naming/Manifest b/dev-java/jboss-module-naming/Manifest index 390e620b..f8921b31 100644 --- a/dev-java/jboss-module-naming/Manifest +++ b/dev-java/jboss-module-naming/Manifest @@ -1,2 +1,2 @@ -MD5 8d190dd9eb3ac0309bf05f6739fdbeff jboss-module-naming-4.0.2.ebuild 624 -MD5 2eecd400017d00986c9634fdd6d38a14 files/digest-jboss-module-naming-4.0.2 310 +MD5 a07e5d70f1a5e4c4fbdb6721a56a328c jboss-module-naming-4.0.2.ebuild 626 +MD5 be923e508d56eb92f5688d7ddfd47f64 files/digest-jboss-module-naming-4.0.2 384 diff --git a/dev-java/jboss-module-naming/files/digest-jboss-module-naming-4.0.2 b/dev-java/jboss-module-naming/files/digest-jboss-module-naming-4.0.2 index 28ee5381..75fdfbf6 100644 --- a/dev-java/jboss-module-naming/files/digest-jboss-module-naming-4.0.2 +++ b/dev-java/jboss-module-naming/files/digest-jboss-module-naming-4.0.2 @@ -1,4 +1,5 @@ MD5 e49a6557c4178efcd495cfdd7c9fbdc9 jboss-module-naming-4.0.2-gentoo.tar.bz2 26253 +MD5 abd11accc7e56ee899f0eccc7fd4e378 jboss-4.0.2-gentoo-r2.data 7494 +MD5 bc87129d59b6d3ce73f48b052bf80aa3 jboss-tools-4.0.2-gentoo-r1.tar.bz2 4524270 +MD5 e06fa477d7d92fdefd19d206e55a29b6 jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586285 MD5 7badd85e1e175f77cd93e08b1a04b967 jboss-4.0.2-gentoo.data 6445 -MD5 7228556e7c3be008637d9331635f41e2 jboss-tools-4.0.2-gentoo.tar.bz2 67666 -MD5 6867a4d4112d47cdc9d5b1daba6ad2ce jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586293 diff --git a/dev-java/jboss-module-naming/jboss-module-naming-4.0.2.ebuild b/dev-java/jboss-module-naming/jboss-module-naming-4.0.2.ebuild index 1dcd780e..c5380da6 100644 --- a/dev-java/jboss-module-naming/jboss-module-naming-4.0.2.ebuild +++ b/dev-java/jboss-module-naming/jboss-module-naming-4.0.2.ebuild @@ -5,7 +5,7 @@ inherit jboss-4 DESCRIPTION="Naming module of JBoss Application Server" -GENTOO_CONF="jboss-${PVR}-gentoo.data" +GENTOO_CONF="jboss-${PV}-gentoo-r2.data" SRC_URI="${BASE_URL}/${P}-gentoo.tar.bz2 ${BASE_URL}/${GENTOO_CONF} ${ECLASS_URI}" HOMEPAGE="http://www.jboss.org" LICENSE="LGPL-2" diff --git a/dev-java/jboss-module-net/Manifest b/dev-java/jboss-module-net/Manifest index 3658234e..b0df4c29 100644 --- a/dev-java/jboss-module-net/Manifest +++ b/dev-java/jboss-module-net/Manifest @@ -1,2 +1,2 @@ -MD5 7fe97fffbafd3bd053d2f94bd02705b4 jboss-module-net-4.0.2.ebuild 1290 -MD5 b435d26b71a7cf9785f9356801946549 files/digest-jboss-module-net-4.0.2 308 +MD5 e8dfe35df7717be9349436f327851d93 jboss-module-net-4.0.2.ebuild 1288 +MD5 e0fdafa6fb76c26236fcca09ff7f6858 files/digest-jboss-module-net-4.0.2 382 diff --git a/dev-java/jboss-module-net/files/digest-jboss-module-net-4.0.2 b/dev-java/jboss-module-net/files/digest-jboss-module-net-4.0.2 index ba26da98..b6211d96 100644 --- a/dev-java/jboss-module-net/files/digest-jboss-module-net-4.0.2 +++ b/dev-java/jboss-module-net/files/digest-jboss-module-net-4.0.2 @@ -1,4 +1,5 @@ MD5 4b9446f51607bc1eb51dfac43febb5a9 jboss-module-net-4.0.2-gentoo.tar.bz2 944393 +MD5 abd11accc7e56ee899f0eccc7fd4e378 jboss-4.0.2-gentoo-r2.data 7494 +MD5 bc87129d59b6d3ce73f48b052bf80aa3 jboss-tools-4.0.2-gentoo-r1.tar.bz2 4524270 +MD5 e06fa477d7d92fdefd19d206e55a29b6 jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586285 MD5 7badd85e1e175f77cd93e08b1a04b967 jboss-4.0.2-gentoo.data 6445 -MD5 7228556e7c3be008637d9331635f41e2 jboss-tools-4.0.2-gentoo.tar.bz2 67666 -MD5 6867a4d4112d47cdc9d5b1daba6ad2ce jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586293 diff --git a/dev-java/jboss-module-net/jboss-module-net-4.0.2.ebuild b/dev-java/jboss-module-net/jboss-module-net-4.0.2.ebuild index 3e25748c..2639fa1a 100644 --- a/dev-java/jboss-module-net/jboss-module-net-4.0.2.ebuild +++ b/dev-java/jboss-module-net/jboss-module-net-4.0.2.ebuild @@ -5,7 +5,7 @@ inherit jboss-4 DESCRIPTION="JBoss.net module of JBoss Application Server" -GENTOO_CONF="jboss-${PVR}-gentoo.data" +GENTOO_CONF="jboss-${PV}-gentoo-r2.data" SRC_URI="${BASE_URL}/${P}-gentoo.tar.bz2 ${BASE_URL}/${GENTOO_CONF} ${ECLASS_URI}" HOMEPAGE="http://www.jboss.org" LICENSE="LGPL-2" @@ -28,8 +28,8 @@ COMMON_DEPEND="=dev-java/commons-beanutils-1.6* dev-java/dom4j dev-java/wsdl4j dev-java/junit - dev-java/sun-jaf-bin - dev-java/sun-javamail-bin + =dev-java/gnu-jaf-1* + dev-java/gnu-javamail =dev-java/servletapi-2.4* =dev-java/jboss-module-common-${PV}* =dev-java/jboss-module-j2ee-${PV}* diff --git a/dev-java/jboss-module-remoting/Manifest b/dev-java/jboss-module-remoting/Manifest index 75e05596..f3c73fe7 100644 --- a/dev-java/jboss-module-remoting/Manifest +++ b/dev-java/jboss-module-remoting/Manifest @@ -1,2 +1,2 @@ -MD5 6c614ab6d2ee5d6d410138fc7b6ff0d5 jboss-module-remoting-4.0.2.ebuild 1193 -MD5 4feab0fea4882cab49a4eeb9f97258af files/digest-jboss-module-remoting-4.0.2 313 +MD5 725c5356f83b88f92c058fb9a84e0bef jboss-module-remoting-4.0.2.ebuild 1202 +MD5 56953030deafa3af432ba419486a021b files/digest-jboss-module-remoting-4.0.2 387 diff --git a/dev-java/jboss-module-remoting/files/digest-jboss-module-remoting-4.0.2 b/dev-java/jboss-module-remoting/files/digest-jboss-module-remoting-4.0.2 index 3561a561..e6590acd 100644 --- a/dev-java/jboss-module-remoting/files/digest-jboss-module-remoting-4.0.2 +++ b/dev-java/jboss-module-remoting/files/digest-jboss-module-remoting-4.0.2 @@ -1,4 +1,5 @@ MD5 9a060c398e633853868dde0b3743b9de jboss-module-remoting-4.0.2-gentoo.tar.bz2 614356 +MD5 abd11accc7e56ee899f0eccc7fd4e378 jboss-4.0.2-gentoo-r2.data 7494 +MD5 bc87129d59b6d3ce73f48b052bf80aa3 jboss-tools-4.0.2-gentoo-r1.tar.bz2 4524270 +MD5 e06fa477d7d92fdefd19d206e55a29b6 jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586285 MD5 7badd85e1e175f77cd93e08b1a04b967 jboss-4.0.2-gentoo.data 6445 -MD5 7228556e7c3be008637d9331635f41e2 jboss-tools-4.0.2-gentoo.tar.bz2 67666 -MD5 6867a4d4112d47cdc9d5b1daba6ad2ce jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586293 diff --git a/dev-java/jboss-module-remoting/jboss-module-remoting-4.0.2.ebuild b/dev-java/jboss-module-remoting/jboss-module-remoting-4.0.2.ebuild index 85b61487..e99b6cc6 100644 --- a/dev-java/jboss-module-remoting/jboss-module-remoting-4.0.2.ebuild +++ b/dev-java/jboss-module-remoting/jboss-module-remoting-4.0.2.ebuild @@ -5,7 +5,7 @@ inherit jboss-4 DESCRIPTION="Remoting module of JBoss Application Server" -GENTOO_CONF="jboss-${PVR}-gentoo.data" +GENTOO_CONF="jboss-${PV}-gentoo-r2.data" SRC_URI="${BASE_URL}/${P}-gentoo.tar.bz2 ${BASE_URL}/${GENTOO_CONF} ${ECLASS_URI}" HOMEPAGE="http://www.jboss.org" LICENSE="LGPL-2" @@ -30,7 +30,7 @@ COMMON_DEPEND="=dev-java/commons-beanutils-1.6* =dev-java/crimson-1* dev-java/gnu-jaxp dev-java/xalan - dev-java/jmx + =dev-java/mx4j-3.0* =dev-java/jboss-module-common-${PV}* =dev-java/jboss-module-j2ee-${PV}* =dev-java/jboss-module-jaxrpc-${PV}* diff --git a/dev-java/jboss-module-security/Manifest b/dev-java/jboss-module-security/Manifest index 13fdb0e1..3e13ad44 100644 --- a/dev-java/jboss-module-security/Manifest +++ b/dev-java/jboss-module-security/Manifest @@ -1,2 +1,2 @@ -MD5 c50a528f46fa7c5c42b0c6c2a1f72cd0 jboss-module-security-4.0.2.ebuild 844 -MD5 9336979dbe9f56febc1137332d88cfbd files/digest-jboss-module-security-4.0.2 313 +MD5 2f998524d7b3d8fdf25cf45c8ac77bc6 jboss-module-security-4.0.2.ebuild 846 +MD5 5239004980b216e6f5ce6a5bb42ec5a8 files/digest-jboss-module-security-4.0.2 387 diff --git a/dev-java/jboss-module-security/files/digest-jboss-module-security-4.0.2 b/dev-java/jboss-module-security/files/digest-jboss-module-security-4.0.2 index db2f7894..3be3feca 100644 --- a/dev-java/jboss-module-security/files/digest-jboss-module-security-4.0.2 +++ b/dev-java/jboss-module-security/files/digest-jboss-module-security-4.0.2 @@ -1,4 +1,5 @@ -MD5 a0e437c0746083066f92b1b561b9780a jboss-module-security-4.0.2-gentoo.tar.bz2 167497 +MD5 80afe37e5e3838fb32e5e445a58dfc9e jboss-module-security-4.0.2-gentoo.tar.bz2 167674 +MD5 abd11accc7e56ee899f0eccc7fd4e378 jboss-4.0.2-gentoo-r2.data 7494 +MD5 bc87129d59b6d3ce73f48b052bf80aa3 jboss-tools-4.0.2-gentoo-r1.tar.bz2 4524270 +MD5 e06fa477d7d92fdefd19d206e55a29b6 jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586285 MD5 7badd85e1e175f77cd93e08b1a04b967 jboss-4.0.2-gentoo.data 6445 -MD5 7228556e7c3be008637d9331635f41e2 jboss-tools-4.0.2-gentoo.tar.bz2 67666 -MD5 6867a4d4112d47cdc9d5b1daba6ad2ce jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586293 diff --git a/dev-java/jboss-module-security/jboss-module-security-4.0.2.ebuild b/dev-java/jboss-module-security/jboss-module-security-4.0.2.ebuild index a5f02e96..02e781cd 100644 --- a/dev-java/jboss-module-security/jboss-module-security-4.0.2.ebuild +++ b/dev-java/jboss-module-security/jboss-module-security-4.0.2.ebuild @@ -5,7 +5,7 @@ inherit jboss-4 DESCRIPTION="Security module of JBoss Application Server" -GENTOO_CONF="jboss-${PVR}-gentoo.data" +GENTOO_CONF="jboss-${PV}-gentoo-r2.data" SRC_URI="${BASE_URL}/${P}-gentoo.tar.bz2 ${BASE_URL}/${GENTOO_CONF} ${ECLASS_URI}" HOMEPAGE="http://www.jboss.org" LICENSE="LGPL-2" diff --git a/dev-java/jboss-module-server/Manifest b/dev-java/jboss-module-server/Manifest index a5527302..681f6120 100644 --- a/dev-java/jboss-module-server/Manifest +++ b/dev-java/jboss-module-server/Manifest @@ -1,2 +1,2 @@ -MD5 aad3df8ab3d5e347f44cbaec73a57102 jboss-module-server-4.0.2.ebuild 1194 -MD5 a9b18815a8dc635f2929e1fcb0f4f912 files/digest-jboss-module-server-4.0.2 311 +MD5 946708b3f49b171527b6f99d8e6064ad jboss-module-server-4.0.2.ebuild 1196 +MD5 abf9c6c1a875bd84eaebe63bfb297443 files/digest-jboss-module-server-4.0.2 385 diff --git a/dev-java/jboss-module-server/files/digest-jboss-module-server-4.0.2 b/dev-java/jboss-module-server/files/digest-jboss-module-server-4.0.2 index a5bccf18..38bd4f21 100644 --- a/dev-java/jboss-module-server/files/digest-jboss-module-server-4.0.2 +++ b/dev-java/jboss-module-server/files/digest-jboss-module-server-4.0.2 @@ -1,4 +1,5 @@ MD5 72c79811f18f4f9a6eacf74b79132026 jboss-module-server-4.0.2-gentoo.tar.bz2 783033 +MD5 abd11accc7e56ee899f0eccc7fd4e378 jboss-4.0.2-gentoo-r2.data 7494 +MD5 bc87129d59b6d3ce73f48b052bf80aa3 jboss-tools-4.0.2-gentoo-r1.tar.bz2 4524270 +MD5 e06fa477d7d92fdefd19d206e55a29b6 jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586285 MD5 7badd85e1e175f77cd93e08b1a04b967 jboss-4.0.2-gentoo.data 6445 -MD5 7228556e7c3be008637d9331635f41e2 jboss-tools-4.0.2-gentoo.tar.bz2 67666 -MD5 6867a4d4112d47cdc9d5b1daba6ad2ce jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586293 diff --git a/dev-java/jboss-module-server/jboss-module-server-4.0.2.ebuild b/dev-java/jboss-module-server/jboss-module-server-4.0.2.ebuild index 2dd32a65..9826eefc 100644 --- a/dev-java/jboss-module-server/jboss-module-server-4.0.2.ebuild +++ b/dev-java/jboss-module-server/jboss-module-server-4.0.2.ebuild @@ -5,7 +5,7 @@ inherit jboss-4 DESCRIPTION="Server module for JBoss Application Server" -GENTOO_CONF="jboss-${PVR}-gentoo.data" +GENTOO_CONF="jboss-${PV}-gentoo-r2.data" SRC_URI="${BASE_URL}/${P}-gentoo.tar.bz2 ${BASE_URL}/${GENTOO_CONF} ${ECLASS_URI}" HOMEPAGE="http://www.jboss.org" LICENSE="LGPL-2" diff --git a/dev-java/jboss-module-system/Manifest b/dev-java/jboss-module-system/Manifest index b5d56d5d..aed1bd77 100644 --- a/dev-java/jboss-module-system/Manifest +++ b/dev-java/jboss-module-system/Manifest @@ -1,2 +1,2 @@ -MD5 e28dad136771ea00f5ae9c520f9f1d64 jboss-module-system-4.0.2.ebuild 958 -MD5 edadab0cce9d2ae9be1b01d575775c93 files/digest-jboss-module-system-4.0.2 311 +MD5 835fbe9d9c767709b72afdd3d03f55dd jboss-module-system-4.0.2.ebuild 961 +MD5 50c00f196b2ae78fe44f1a9176ebd044 files/digest-jboss-module-system-4.0.2 385 diff --git a/dev-java/jboss-module-system/files/digest-jboss-module-system-4.0.2 b/dev-java/jboss-module-system/files/digest-jboss-module-system-4.0.2 index fb1146a5..6ae0e995 100644 --- a/dev-java/jboss-module-system/files/digest-jboss-module-system-4.0.2 +++ b/dev-java/jboss-module-system/files/digest-jboss-module-system-4.0.2 @@ -1,4 +1,5 @@ MD5 d48f214ac1ac0cb3bcbcf71bef58606d jboss-module-system-4.0.2-gentoo.tar.bz2 103741 +MD5 abd11accc7e56ee899f0eccc7fd4e378 jboss-4.0.2-gentoo-r2.data 7494 +MD5 bc87129d59b6d3ce73f48b052bf80aa3 jboss-tools-4.0.2-gentoo-r1.tar.bz2 4524270 +MD5 e06fa477d7d92fdefd19d206e55a29b6 jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586285 MD5 7badd85e1e175f77cd93e08b1a04b967 jboss-4.0.2-gentoo.data 6445 -MD5 7228556e7c3be008637d9331635f41e2 jboss-tools-4.0.2-gentoo.tar.bz2 67666 -MD5 6867a4d4112d47cdc9d5b1daba6ad2ce jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586293 diff --git a/dev-java/jboss-module-system/jboss-module-system-4.0.2.ebuild b/dev-java/jboss-module-system/jboss-module-system-4.0.2.ebuild index 2dfe0c43..e06f1382 100644 --- a/dev-java/jboss-module-system/jboss-module-system-4.0.2.ebuild +++ b/dev-java/jboss-module-system/jboss-module-system-4.0.2.ebuild @@ -5,7 +5,7 @@ inherit jboss-4 DESCRIPTION="System module for JBoss Application Server" -GENTOO_CONF="jboss-${PVR}-gentoo.data" +GENTOO_CONF="jboss-${PVR}-gentoo-r2.data" SRC_URI="${BASE_URL}/${P}-gentoo.tar.bz2 ${BASE_URL}/${GENTOO_CONF} ${ECLASS_URI}" HOMEPAGE="http://www.jboss.org" LICENSE="LGPL-2" diff --git a/dev-java/jboss-module-tomcat/Manifest b/dev-java/jboss-module-tomcat/Manifest index 3e88a69e..12be6a52 100644 --- a/dev-java/jboss-module-tomcat/Manifest +++ b/dev-java/jboss-module-tomcat/Manifest @@ -1,2 +1,2 @@ -MD5 c90fbda95d090658e781c3fbbdf7b5d9 jboss-module-tomcat-4.0.2.ebuild 1558 -MD5 f878c4a307d00aefd5876a94dafb7a5e files/digest-jboss-module-tomcat-4.0.2 311 +MD5 3fc50fa28d31b74dbef2a830a0a4abf3 jboss-module-tomcat-4.0.2.ebuild 1560 +MD5 94b7b3684e8e95fff89b0c38d862b4eb files/digest-jboss-module-tomcat-4.0.2 385 diff --git a/dev-java/jboss-module-tomcat/files/digest-jboss-module-tomcat-4.0.2 b/dev-java/jboss-module-tomcat/files/digest-jboss-module-tomcat-4.0.2 index f661338e..70d66e5c 100644 --- a/dev-java/jboss-module-tomcat/files/digest-jboss-module-tomcat-4.0.2 +++ b/dev-java/jboss-module-tomcat/files/digest-jboss-module-tomcat-4.0.2 @@ -1,4 +1,5 @@ MD5 b203e1b196d3c63a9084200f89fbcbc7 jboss-module-tomcat-4.0.2-gentoo.tar.bz2 130048 +MD5 abd11accc7e56ee899f0eccc7fd4e378 jboss-4.0.2-gentoo-r2.data 7494 +MD5 bc87129d59b6d3ce73f48b052bf80aa3 jboss-tools-4.0.2-gentoo-r1.tar.bz2 4524270 +MD5 e06fa477d7d92fdefd19d206e55a29b6 jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586285 MD5 7badd85e1e175f77cd93e08b1a04b967 jboss-4.0.2-gentoo.data 6445 -MD5 7228556e7c3be008637d9331635f41e2 jboss-tools-4.0.2-gentoo.tar.bz2 67666 -MD5 6867a4d4112d47cdc9d5b1daba6ad2ce jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586293 diff --git a/dev-java/jboss-module-tomcat/jboss-module-tomcat-4.0.2.ebuild b/dev-java/jboss-module-tomcat/jboss-module-tomcat-4.0.2.ebuild index 2964cbe5..802a7213 100644 --- a/dev-java/jboss-module-tomcat/jboss-module-tomcat-4.0.2.ebuild +++ b/dev-java/jboss-module-tomcat/jboss-module-tomcat-4.0.2.ebuild @@ -7,7 +7,7 @@ inherit jboss-4 DESCRIPTION="Tomcat module of JBoss Application Server" -GENTOO_CONF="jboss-${PVR}-gentoo.data" +GENTOO_CONF="jboss-${PV}-gentoo-r2.data" SRC_URI="${BASE_URL}/${P}-gentoo.tar.bz2 ${BASE_URL}/${GENTOO_CONF} ${ECLASS_URI}" HOMEPAGE="http://www.jboss.org" LICENSE="LGPL-2" diff --git a/dev-java/jboss-module-transaction/Manifest b/dev-java/jboss-module-transaction/Manifest index 39769667..2e74caca 100644 --- a/dev-java/jboss-module-transaction/Manifest +++ b/dev-java/jboss-module-transaction/Manifest @@ -1,2 +1,2 @@ -MD5 a44f8f2cc432cd6fb4b9032656dbafc2 jboss-module-transaction-4.0.2.ebuild 953 -MD5 565bebaa83980c7b13c1c5291340b8b8 files/digest-jboss-module-transaction-4.0.2 315 +MD5 242b0ddd688071b553ef4f3c19c2c6a0 jboss-module-transaction-4.0.2.ebuild 955 +MD5 9f2d6e5f765db36037c7b2709f0b55db files/digest-jboss-module-transaction-4.0.2 389 diff --git a/dev-java/jboss-module-transaction/files/digest-jboss-module-transaction-4.0.2 b/dev-java/jboss-module-transaction/files/digest-jboss-module-transaction-4.0.2 index 09288783..0fcd3a40 100644 --- a/dev-java/jboss-module-transaction/files/digest-jboss-module-transaction-4.0.2 +++ b/dev-java/jboss-module-transaction/files/digest-jboss-module-transaction-4.0.2 @@ -1,4 +1,5 @@ MD5 20bdac868f50eac6149bd96fb9f53ef5 jboss-module-transaction-4.0.2-gentoo.tar.bz2 31457 +MD5 abd11accc7e56ee899f0eccc7fd4e378 jboss-4.0.2-gentoo-r2.data 7494 +MD5 bc87129d59b6d3ce73f48b052bf80aa3 jboss-tools-4.0.2-gentoo-r1.tar.bz2 4524270 +MD5 e06fa477d7d92fdefd19d206e55a29b6 jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586285 MD5 7badd85e1e175f77cd93e08b1a04b967 jboss-4.0.2-gentoo.data 6445 -MD5 7228556e7c3be008637d9331635f41e2 jboss-tools-4.0.2-gentoo.tar.bz2 67666 -MD5 6867a4d4112d47cdc9d5b1daba6ad2ce jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586293 diff --git a/dev-java/jboss-module-transaction/jboss-module-transaction-4.0.2.ebuild b/dev-java/jboss-module-transaction/jboss-module-transaction-4.0.2.ebuild index 954765f3..63e87d58 100644 --- a/dev-java/jboss-module-transaction/jboss-module-transaction-4.0.2.ebuild +++ b/dev-java/jboss-module-transaction/jboss-module-transaction-4.0.2.ebuild @@ -5,7 +5,7 @@ inherit jboss-4 DESCRIPTION="Transaction module for JBoss Application Server" -GENTOO_CONF="jboss-${PVR}-gentoo.data" +GENTOO_CONF="jboss-${PV}-gentoo-r2.data" SRC_URI="${BASE_URL}/${P}-gentoo.tar.bz2 ${BASE_URL}/${GENTOO_CONF} ${ECLASS_URI}" HOMEPAGE="http://www.jboss.org" LICENSE="LGPL-2" diff --git a/dev-java/jboss-module-varia/Manifest b/dev-java/jboss-module-varia/Manifest index cb0b89a4..b04bfea5 100644 --- a/dev-java/jboss-module-varia/Manifest +++ b/dev-java/jboss-module-varia/Manifest @@ -1,2 +1,2 @@ -MD5 e47ecb7bda67be6eb264f7dc79d087d8 jboss-module-varia-4.0.2.ebuild 1482 -MD5 bd33672a34f4458c8e1b433ad62e65a7 files/digest-jboss-module-varia-4.0.2 380 +MD5 abb61216590d923b4fe925fd3ea03367 jboss-module-varia-4.0.2.ebuild 1477 +MD5 60e8324c423c2de768ab38cac6b87585 files/digest-jboss-module-varia-4.0.2 385 diff --git a/dev-java/jboss-module-varia/files/digest-jboss-module-varia-4.0.2 b/dev-java/jboss-module-varia/files/digest-jboss-module-varia-4.0.2 index 856b22c5..f1c7721e 100644 --- a/dev-java/jboss-module-varia/files/digest-jboss-module-varia-4.0.2 +++ b/dev-java/jboss-module-varia/files/digest-jboss-module-varia-4.0.2 @@ -1,5 +1,5 @@ MD5 718d60a5c1697d9d5019545035387a0a jboss-module-varia-4.0.2-gentoo.tar.bz2 1941460 -MD5 07995693a6ea981aa44c5d77ec31af68 jboss-4.0.2-gentoo-r1.data 7291 -MD5 7228556e7c3be008637d9331635f41e2 jboss-tools-4.0.2-gentoo.tar.bz2 67666 -MD5 6867a4d4112d47cdc9d5b1daba6ad2ce jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586293 +MD5 abd11accc7e56ee899f0eccc7fd4e378 jboss-4.0.2-gentoo-r2.data 7494 +MD5 bc87129d59b6d3ce73f48b052bf80aa3 jboss-tools-4.0.2-gentoo-r1.tar.bz2 4524270 +MD5 e06fa477d7d92fdefd19d206e55a29b6 jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586285 MD5 7badd85e1e175f77cd93e08b1a04b967 jboss-4.0.2-gentoo.data 6445 diff --git a/dev-java/jboss-module-varia/jboss-module-varia-4.0.2.ebuild b/dev-java/jboss-module-varia/jboss-module-varia-4.0.2.ebuild index b4bfbca1..c7d00ea5 100644 --- a/dev-java/jboss-module-varia/jboss-module-varia-4.0.2.ebuild +++ b/dev-java/jboss-module-varia/jboss-module-varia-4.0.2.ebuild @@ -7,7 +7,7 @@ inherit jboss-4 DESCRIPTION="Remoting module of JBoss Application Server" -GENTOO_CONF="jboss-${PVR}-gentoo-r1.data" +GENTOO_CONF="jboss-${PV}-gentoo-r2.data" SRC_URI="${BASE_URL}/${P}-gentoo.tar.bz2 ${BASE_URL}/${GENTOO_CONF} ${ECLASS_URI}" HOMEPAGE="http://www.jboss.org" LICENSE="LGPL-2" @@ -34,8 +34,8 @@ COMMON_DEPEND="=dev-java/commons-beanutils-1.6* dev-java/junit dev-java/joesnmp dev-java/concurrent-util - dev-java/sun-jaf-bin - dev-java/sun-javamail-bin + =dev-java/gnu-jaf-1* + dev-java/gnu-javamail =dev-java/servletapi-2.4* dev-java/juddi =dev-java/jboss-module-jaxrpc-${PV}* diff --git a/dev-java/jboss-module-webservice/Manifest b/dev-java/jboss-module-webservice/Manifest index 5b2b4f6a..895dc25d 100644 --- a/dev-java/jboss-module-webservice/Manifest +++ b/dev-java/jboss-module-webservice/Manifest @@ -1,4 +1,4 @@ -MD5 f8ebcc91e239dc5553224e8b3ecaed13 jboss-module-webservice-4.0.2.ebuild 1491 -MD5 84134792c37e98331af61324dc50df4e files/digest-jboss-module-webservice-4.0.2 383 +MD5 42bda89bf73a61859ab1678ad710fff4 jboss-module-webservice-4.0.2.ebuild 1486 +MD5 1c6201b7c43572ef80f2a4000dbbae75 files/digest-jboss-module-webservice-4.0.2 388 MD5 1f123505b8d168f22a80dddf3775bf70 files/digest-jboss-module-hibernate-4.0.2 382 MD5 f878c4a307d00aefd5876a94dafb7a5e files/digest-jboss-module-tomcat-4.0.2 311 diff --git a/dev-java/jboss-module-webservice/files/digest-jboss-module-webservice-4.0.2 b/dev-java/jboss-module-webservice/files/digest-jboss-module-webservice-4.0.2 index 19c9cbf2..181fb9c2 100644 --- a/dev-java/jboss-module-webservice/files/digest-jboss-module-webservice-4.0.2 +++ b/dev-java/jboss-module-webservice/files/digest-jboss-module-webservice-4.0.2 @@ -1,5 +1,5 @@ MD5 139b0161606a39711f63d7599b47e044 jboss-module-webservice-4.0.2-gentoo.tar.bz2 94437 -MD5 07995693a6ea981aa44c5d77ec31af68 jboss-4.0.2-gentoo-r1.data 7291 -MD5 7228556e7c3be008637d9331635f41e2 jboss-tools-4.0.2-gentoo.tar.bz2 67666 -MD5 6867a4d4112d47cdc9d5b1daba6ad2ce jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586293 +MD5 abd11accc7e56ee899f0eccc7fd4e378 jboss-4.0.2-gentoo-r2.data 7494 +MD5 bc87129d59b6d3ce73f48b052bf80aa3 jboss-tools-4.0.2-gentoo-r1.tar.bz2 4524270 +MD5 e06fa477d7d92fdefd19d206e55a29b6 jboss-thirdparty-4.0.2-gentoo.tar.bz2 13586285 MD5 7badd85e1e175f77cd93e08b1a04b967 jboss-4.0.2-gentoo.data 6445 diff --git a/dev-java/jboss-module-webservice/jboss-module-webservice-4.0.2.ebuild b/dev-java/jboss-module-webservice/jboss-module-webservice-4.0.2.ebuild index b355208a..95e809c3 100644 --- a/dev-java/jboss-module-webservice/jboss-module-webservice-4.0.2.ebuild +++ b/dev-java/jboss-module-webservice/jboss-module-webservice-4.0.2.ebuild @@ -4,7 +4,7 @@ inherit jboss-4 DESCRIPTION="Web Service module of JBoss Application Server" -GENTOO_CONF="jboss-${PVR}-gentoo-r1.data" +GENTOO_CONF="jboss-${PV}-gentoo-r2.data" SRC_URI="${BASE_URL}/${P}-gentoo.tar.bz2 ${BASE_URL}/${GENTOO_CONF} ${ECLASS_URI}" HOMEPAGE="http://www.jboss.org" LICENSE="LGPL-2" @@ -26,8 +26,8 @@ COMMON_DEPEND="=dev-java/commons-beanutils-1.6* dev-java/gnu-jaxp =dev-java/dom4j-1* dev-java/wsdl4j - dev-java/sun-jaf-bin - dev-java/sun-javamail-bin + =dev-java/gnu-jaf-1* + dev-java/gnu-javamail ~dev-java/servletapi-2.4 =dev-java/jboss-module-common-${PV}* =dev-java/jboss-module-j2ee-${PV}* diff --git a/dev-java/jcs/Manifest b/dev-java/jcs/Manifest index 2618680e..1c72583f 100644 --- a/dev-java/jcs/Manifest +++ b/dev-java/jcs/Manifest @@ -1,4 +1,4 @@ -MD5 17eacac4141bf578891a2b7f12ba68e4 jcs-1.2.6.5.ebuild 1681 +MD5 fed7e327f70a86bfa61132bcaa0a656c jcs-1.2.6.5.ebuild 1700 MD5 d685cf61cc7028b37051d3f4f2a10b41 files/digest-jcs-1.2.6.5 65 MD5 95ab804603c71190b154dc77cf6a5222 files/jcs-1.2.6.5-jikes.patch 1204 MD5 e965f2f2c67683e91e2ef982804b1b76 files/build-1.2.6.5.xml 1551 diff --git a/dev-java/jcs/jcs-1.2.6.5.ebuild b/dev-java/jcs/jcs-1.2.6.5.ebuild index 69a8d920..2a540a7b 100644 --- a/dev-java/jcs/jcs-1.2.6.5.ebuild +++ b/dev-java/jcs/jcs-1.2.6.5.ebuild @@ -28,6 +28,7 @@ COMMON_DEPEND="dev-java/jgroups =dev-java/struts-1.1* dev-db/hsqldb" DEPEND="virtual/jdk + dev-java/ant-core jikes? (dev-java/jikes) ${COMMON_DEPEND}" RDEPEND="virtual/jre diff --git a/dev-java/jdbc-mysql/ChangeLog b/dev-java/jdbc-mysql/ChangeLog new file mode 100644 index 00000000..09560f3b --- /dev/null +++ b/dev-java/jdbc-mysql/ChangeLog @@ -0,0 +1,166 @@ +# ChangeLog for dev-java/jdbc-mysql +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.23 2005/09/03 21:07:52 hansmi Exp $ + + 03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> + jdbc-mysql-3.0.17.ebuild: + Stable on ppc. + + 12 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> + jdbc-mysql-3.0.17.ebuild: + Stable on sparc + + 25 Jul 2005; Thomas Matthijs <axxo@gentoo.org> jdbc-mysql-3.0.16.ebuild, + jdbc-mysql-3.0.17.ebuild, jdbc-mysql-3.1.10.ebuild: + keyword x86 + + 15 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> + jdbc-mysql-3.0.16.ebuild, jdbc-mysql-3.0.17.ebuild: + To ~sparc + +*jdbc-mysql-3.0.16 (10 Jul 2005) + + 10 Jul 2005; Thomas Matthijs <axxo@gentoo.org> +jdbc-mysql-3.0.16.ebuild: + moving connectorj into jdbc-mysql as they are the same package + + 10 Jul 2005; Thomas Matthijs <axxo@gentoo.org> + -jdbc-mysql-3.0.11-r1.ebuild, -jdbc-mysql-3.0.15.ebuild, + -jdbc-mysql-3.1.7.ebuild: + remove older + +*jdbc-mysql-3.1.10 (10 Jul 2005) +*jdbc-mysql-3.0.17 (10 Jul 2005) + + 10 Jul 2005; Thomas Matthijs <axxo@gentoo.org> +jdbc-mysql-3.0.17.ebuild, + +jdbc-mysql-3.1.10.ebuild: + version bump + + 10 Jul 2005; Thomas Matthijs <axxo@gentoo.org> + jdbc-mysql-3.0.11-r1.ebuild, jdbc-mysql-3.1.7.ebuild: + add dep on log4j thanks hollow + small cleanups + + 17 Jun 2005; Thomas Matthijs <axxo@gentoo.org> jdbc-mysql-3.0.11.ebuild, + jdbc-mysql-3.0.11-r1.ebuild, jdbc-mysql-3.0.15.ebuild, + jdbc-mysql-3.1.7.ebuild: + license fix, gpl not lgpl + +*jdbc-mysql-3.1.7 (06 Mar 2005) + + 06 Mar 2005; Thomas Matthijs <axxo@gentoo.org> +jdbc-mysql-3.1.7.ebuild: + version bump + + 23 Oct 2004; Dylan Carlson <absinthe@gentoo.org> + jdbc-mysql-3.0.11-r1.ebuild: + Keywords ~amd64. + +*jdbc-mysql-3.0.15 (20 Oct 2004) + + 20 Oct 2004; Dylan Carlson <absinthe@gentoo.org> + +jdbc-mysql-3.0.15.ebuild: + Version bump. + + 28 Sep 2004; Thomas Matthijs <axxo@gentoo.org> + jdbc-mysql-3.0.11-r1.ebuild: + depend on ant + +*jdbc-mysql-3.0.11-r1 (26 Sep 2004) + + 26 Sep 2004; Thomas Matthijs <axxo@gentoo.org> +jdbc-mysql-3.0.11-r1.ebuild: + Now builds from source, Ebuild submitted by Hendrik Sticher + <hendrik_sticher@gmx.de> Thanks, bug 63280 + +*jdbc-mysql-3.0.11 (22 Mar 2004) + + 22 Mar 2004; Chris Aniszczyk <zx@gentoo.org> jdbc-mysql-2.0.14.ebuild, + jdbc-mysql-3.0.11.ebuild, jdbc-mysql-3.0.8.ebuild, jdbc-mysql-3.0.9.ebuild: + Clean up + QA fixes + + 25 Feb 2004; Dylan Carlson <absinthe@gentoo.org> jdbc-mysql-3.0.9.ebuild: + Added amd64 keyword. + + 10 Feb 2004; Adrian Almenar <strider@gentoo.org> jdbc-mysql-2.0.14.ebuild, + jdbc-mysql-3.0.8.ebuild, jdbc-mysql-3.0.9.ebuild: + Removed alpha keyword. + + 17 Jan 2004; Adrian Almenar <strider@gentoo.org> jdbc-mysql-2.0.14.ebuild, + jdbc-mysql-3.0.8.ebuild, jdbc-mysql-3.0.9.ebuild: + Removed keywords with non-java support. Moved Version 3.0.9 to stable. + +*jdbc-mysql-3.0.9 (24 Dec 2003) + + 24 Dec 2003; Martin Holzer <mholzer@gentoo.org> jdbc-mysql-3.0.9.ebuild: + Version bumped. Closes 34116 + +*jdbc-mysql-3.0.8 (04 Jun 2003) + + 04 Jun 2003; Dylan Carlson <absinthe@gentoo.org> jdbc-mysql-3.0.8.ebuild: + Bugfix version bump. Closes #22178. + + Changes in this version: + * Allow bogus URLs in Driver.getPropertyInfo(). + * Return list of generated keys when using multi-value INSERTS with + Statement.getGeneratedKeys(). + * Use JVM charset with filenames and 'LOAD DATA [LOCAL] INFILE' + * Fix infinite loop with Connection.cleanup(). + * Changed Ant target 'compile-core' to 'compile-driver', and made testsuite + compilation a separate target. + * Fixed result set not getting set for Statement.executeUpdate(), which + affected getGeneratedKeys() and getUpdateCount() in some cases. + * Unicode character 0xFFFF in a string would cause the driver to throw an + ArrayOutOfBoundsException + * Return correct amount of generated keys when using 'REPLACE' statements. + * Fix problem detecting server character set in some cases. + * Fix row data decoding error when using _very_ large packets. + * Optimized row data decoding. + * Issue exception when operating on an already-closed prepared statement. + * Fixed SJIS encoding bug, thanks to Naoto Sato. + * Optimized usage of EscapeProcessor. + * Fixed numbering of KEY_SEQ column in DBMD.getImported/Exported keys + * Allow multiple calls to Statement.close() + * Use hex escaping for PreparedStatement.setBytes()/setBinaryStream() when + the character set is Shift_JIS, workaround for parsing bug in server. + * Added whitespace insensitivity to EscapeProcessor. + +*jdbc-mysql-2.0.14 (14 May 2003) + + 14 May 2003; Dylan Carlson <absinthe@gentoo.org> jdbc-mysql-2.0.14.ebuild, + jdbc-mysql-3.0.7.ebuild: + "mmmysql" has been retired from Sourceforge, and is now officially part of + MySQL's family, now known as Connector/J. In an effort to also keep the naming + consistent with other jdbc offerings, this port is being renamed to + jdbc-mysql. + + The name of the JAR file has changed as well, so please make a note of it. + +*mysql-jdbc-3.07 (26 Apr 2003) + + 08 May 2003; Robin Johnson <robbat2@gentoo.org> mysql-jdbc-3.07.ebuild: + mark as stable for x86 + + 26 Apr 2003; Robin Johnson <robbat2@gentoo.org> mysql-jdbc-3.07.ebuild, + files/21mysqlconnector: + added new version in unstable + +*mysql-jdbc-2.0.14 (08 Jul 2002) + + 08 Jul 2002; Maik Schreiber <blizzy@gentoo.org> : + + New version, closes bug #3760. + +*mysql-jdbc-1.2.3-r1 (01 Feb 2002) + + 20 Sep 2002; Mike Frysinger <vapier@gentoo.org> : + + Updated HOMEPAGE variable + + 01 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> mysql-jdbc-1.2.3-r1.ebuild : + + Added LICENSE, SLOT and KEYWORDS. + + 01 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog : + + Added initial ChangeLog which should be updated whenever the package is + updated in any way. This changelog is targetted to users. This means that the + comments should well explained and written in clean English. The details about + writing correct changelogs are explained in the skel.ChangeLog file which you + can find in the root directory of the portage repository. diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest new file mode 100644 index 00000000..073a1495 --- /dev/null +++ b/dev-java/jdbc-mysql/Manifest @@ -0,0 +1,12 @@ +MD5 b76669ba677f039cd256f4b271500d10 jdbc-mysql-3.0.16.ebuild 864 +MD5 66d9e5d3fd943de18c5fb5919ed8ba77 jdbc-mysql-3.0.11.ebuild 628 +MD5 0e63dc5d581332547128398e64245076 jdbc-mysql-3.1.10-r1.ebuild 1351 +MD5 71349d5dd7bd1efab76a45a39e5fb5ed jdbc-mysql-3.0.17.ebuild 1012 +MD5 93eba048f2140ff5153feb1edad6c0dd ChangeLog 6084 +MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 +MD5 96778981695f92599ce9eac1c669a9b0 files/digest-jdbc-mysql-3.0.11 86 +MD5 702d2b80aba3c4eb8db59e08716c954a files/digest-jdbc-mysql-3.0.16 83 +MD5 d3e310eef0498efe3d56ad6ddcd306d9 files/digest-jdbc-mysql-3.0.17 83 +MD5 28a1e7fdcedd48ae04a5f1631ac8b3b3 files/digest-jdbc-mysql-3.1.10 80 +MD5 28a1e7fdcedd48ae04a5f1631ac8b3b3 files/digest-jdbc-mysql-3.1.10-r1 80 +MD5 9275519a591f40e7ab6b3746d884f67f files/compile-without-log4j.patch 682 diff --git a/dev-java/jdbc-mysql/files/compile-without-log4j.patch b/dev-java/jdbc-mysql/files/compile-without-log4j.patch new file mode 100644 index 00000000..48d78338 --- /dev/null +++ b/dev-java/jdbc-mysql/files/compile-without-log4j.patch @@ -0,0 +1,19 @@ +--- src/com/mysql/jdbc/ConnectionProperties.java.orig 2005-07-10 20:42:46.000000000 +0200 ++++ src/com/mysql/jdbc/ConnectionProperties.java 2005-07-10 20:43:16.000000000 +0200 +@@ -26,7 +26,6 @@ + + import com.mysql.jdbc.log.Jdk14Logger; + import com.mysql.jdbc.log.Log; +-import com.mysql.jdbc.log.Log4JLogger; + import com.mysql.jdbc.log.StandardLogger; + + import java.io.UnsupportedEncodingException; +@@ -2392,7 +2391,7 @@ + try { + // Is Log4J available? + Class.forName("org.apache.log4j.Level"); +- setLogger(Log4JLogger.class.getName()); ++ setLogger("com.mysql.jdbc.log.Log4JLogger"); + } catch (Throwable t) { + try { + // Are we running on JDK-1.4? diff --git a/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.0.11 b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.0.11 new file mode 100644 index 00000000..0ad42429 --- /dev/null +++ b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.0.11 @@ -0,0 +1 @@ +MD5 f394fdc6086e8710a3446c6fafff4b20 mysql-connector-java-3.0.11-stable.tar.gz 777018 diff --git a/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.0.16 b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.0.16 new file mode 100644 index 00000000..c4bfe4d6 --- /dev/null +++ b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.0.16 @@ -0,0 +1 @@ +MD5 9b76101f74f1812013a695d156c71333 mysql-connector-java-3.0.16-ga.tar.gz 1087566 diff --git a/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.0.17 b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.0.17 new file mode 100644 index 00000000..339d1767 --- /dev/null +++ b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.0.17 @@ -0,0 +1 @@ +MD5 b73b172e5059ec9b35f93d0d0a8762cd mysql-connector-java-3.0.17-ga.tar.gz 1316942 diff --git a/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.10 b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.10 new file mode 100644 index 00000000..bd14bfdd --- /dev/null +++ b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.10 @@ -0,0 +1 @@ +MD5 337f7f31e726fb615d3f4f062030d1b5 mysql-connector-java-3.1.10.tar.gz 6892037 diff --git a/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.10-r1 b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.10-r1 new file mode 100644 index 00000000..bd14bfdd --- /dev/null +++ b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.10-r1 @@ -0,0 +1 @@ +MD5 337f7f31e726fb615d3f4f062030d1b5 mysql-connector-java-3.1.10.tar.gz 6892037 diff --git a/dev-java/jdbc-mysql/jdbc-mysql-3.0.11.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-3.0.11.ebuild new file mode 100644 index 00000000..96201489 --- /dev/null +++ b/dev-java/jdbc-mysql/jdbc-mysql-3.0.11.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-3.0.11.ebuild,v 1.5 2005/07/16 16:39:49 axxo Exp $ + +inherit java-pkg + +At=mysql-connector-java-${PV}-stable + +DESCRIPTION="MySQL JDBC driver" +HOMEPAGE="http://www.mysql.com" +SRC_URI="mirror://mysql/Downloads/Connector-J/${At}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86 ppc sparc amd64" +IUSE="" +DEPEND="" +RDEPEND=">=virtual/jre-1.2" + +S=${WORKDIR}/${At} + +src_compile() { :; } + +src_install() { + java-pkg_dojar ${At}-bin.jar + dodoc README CHANGES COPYING +} diff --git a/dev-java/jdbc-mysql/jdbc-mysql-3.0.16.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-3.0.16.ebuild new file mode 100644 index 00000000..8adcc705 --- /dev/null +++ b/dev-java/jdbc-mysql/jdbc-mysql-3.0.16.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-3.0.16.ebuild,v 1.4 2005/07/25 14:39:03 axxo Exp $ + +inherit java-pkg + +DESCRIPTION="Connector/J: A MySQL JDBC connector" +HOMEPAGE="http://dev.mysql.com/downloads/connector/j/3.0.html" +SRC_URI="mirror://mysql/Downloads/Connector-J/mysql-connector-java-${PV}-ga.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86 ~ppc amd64 ~sparc" +IUSE="doc" + +DEPEND=">=virtual/jdk-1.4 + dev-java/junit + dev-java/ant-core" +RDEPEND=">=virtual/jre-1.3" + +S=${WORKDIR}/mysql-connector-java-${PV}-ga + +src_compile() { + ant || die "Failed to compile" +} + +src_install() { + java-pkg_dojar mysql-connector-java-${PV}-ga-bin.jar + + dodoc COPYING CHANGES README + use doc && cp docs/connector-j-en.pdf ${D}/usr/share/doc/${PF}/ +} diff --git a/dev-java/jdbc-mysql/jdbc-mysql-3.0.17.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-3.0.17.ebuild new file mode 100644 index 00000000..37133c4c --- /dev/null +++ b/dev-java/jdbc-mysql/jdbc-mysql-3.0.17.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-3.0.17.ebuild,v 1.6 2005/09/03 21:07:52 hansmi Exp $ + +inherit eutils java-pkg + +At=mysql-connector-java-${PV}-ga + +DESCRIPTION="MySQL JDBC driver" +HOMEPAGE="http://www.mysql.com" +SRC_URI="mirror://mysql/Downloads/Connector-J/${At}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ppc sparc x86" +IUSE="" +RDEPEND=">=virtual/jre-1.2 + dev-java/jta + dev-java/log4j + dev-java/jdbc2-stdext" +DEPEND=">=virtual/jdk-1.2 + ${RDEPEND} + dev-java/junit + dev-java/ant-core" + +S=${WORKDIR}/${At} + +src_unpack() { + unpack ${A} + cd ${S} + rm -f *.jar + + cd lib + rm -f *.jar + java-pkg_jar-from jta + java-pkg_jar-from jdbc2-stdext + java-pkg_jar-from log4j +} + +src_compile() { + local antflags="dist" + ant ${antflags} || die "build failed!" +} + +src_install() { + java-pkg_newjar ${WORKDIR}/build-mysql-jdbc/${At}/${At}-bin.jar ${PN}.jar + dodoc README CHANGES COPYING +} + diff --git a/dev-java/jdbc-mysql/jdbc-mysql-3.1.10-r1.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-3.1.10-r1.ebuild new file mode 100644 index 00000000..3e56a168 --- /dev/null +++ b/dev-java/jdbc-mysql/jdbc-mysql-3.1.10-r1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-3.1.10.ebuild,v 1.4 2005/09/08 23:52:53 axxo Exp $ + +inherit eutils java-pkg + +At=mysql-connector-java-${PV} + +DESCRIPTION="MySQL JDBC driver" +HOMEPAGE="http://www.mysql.com" +SRC_URI="mirror://mysql/Downloads/Connector-J/${At}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc x86" +IUSE="log4j c3p0" +RDEPEND=">=virtual/jre-1.2 + dev-java/jta + log4j? ( dev-java/log4j ) + c3p0? ( dev-java/c3p0 ) + dev-java/jdbc2-stdext" +DEPEND=">=virtual/jdk-1.2 + ${RDEPEND} + dev-java/junit + dev-java/ant-core" + +S=${WORKDIR}/${At} + +src_unpack() { + unpack ${A} + cd ${S} + rm -f *.jar + epatch ${FILESDIR}/compile-without-log4j.patch + + # Need to change what dist depends on, because it tries to build unit tests. + # One of these use a Sun-specific class, which won't be available on + # non-Sun/Blackdown JDK's. + sed -i -e 's,{buildDir}/MANIFEST.MF,{buildDir}/META-INF/MANIFEST.MF,' \ + -e's/name=\"dist\" depends="init, compile\"/name=\"dist\" depends="init, compile-driver\"/' \ + build.xml || die "sed failed" + + mkdir src/lib-nodist + cd src/lib + rm -f *.jar + java-pkg_jar-from jta + java-pkg_jar-from jdbc2-stdext + use log4j && java-pkg_jar-from log4j + use c3p0 && java-pkg_jar-from c3p0 +} + +src_compile() { + local antflags="dist" + ant ${antflags} || die "build failed!" +} + +src_install() { + java-pkg_newjar build/${At}/${At}-bin.jar ${PN}.jar + dodoc README CHANGES COPYING +} + diff --git a/dev-java/jdbc-mysql/metadata.xml b/dev-java/jdbc-mysql/metadata.xml new file mode 100644 index 00000000..838c00a4 --- /dev/null +++ b/dev-java/jdbc-mysql/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>java</herd> +</pkgmetadata> diff --git a/dev-java/jeremie/Manifest b/dev-java/jeremie/Manifest index c27160c0..01b92924 100644 --- a/dev-java/jeremie/Manifest +++ b/dev-java/jeremie/Manifest @@ -1,2 +1,2 @@ -MD5 a5e28b96dd382518c6087f2b1d3419af jeremie-4.2.ebuild 1686 +MD5 5fabaa2573ee6e066398e5a8166fdfb2 jeremie-4.2.ebuild 1713 MD5 9253abdae053d4027a4d778d20f460c0 files/digest-jeremie-4.2 64 diff --git a/dev-java/jeremie/jeremie-4.2.ebuild b/dev-java/jeremie/jeremie-4.2.ebuild index b267d387..ea2c6767 100644 --- a/dev-java/jeremie/jeremie-4.2.ebuild +++ b/dev-java/jeremie/jeremie-4.2.ebuild @@ -6,7 +6,7 @@ inherit java-pkg DESCRIPTION="Jeremie provides an RMI-like programming style." HOMEPAGE="http://jonathan.objectweb.org/" -SRC_URI="mirror://gentoo/${P}.tar.bz2" +SRC_URI="http://gentooexperimental.org/distfiles/${P}.tar.bz2" # cvs -d:pserver:anonymous@cvs.forge.objectweb.org:/cvsroot/jonathan login # cvs -z3 -d:pserver:anonymous@cvs.forge.objectweb.org:/cvsroot/jonathan export -r JEREMIE_4_2 jeremie # tar cjvf jeremie-4.2.tar.bz jeremie @@ -17,7 +17,7 @@ KEYWORDS="~x86" IUSE="doc jikes" DEPEND="virtual/jdk - app-arch/unzip + dev-java/ant-core jikes? (dev-java/jikes) dev-java/ant-owanttask" RDEPEND="virtual/jre diff --git a/dev-java/jessie/Manifest b/dev-java/jessie/Manifest new file mode 100644 index 00000000..efeb9730 --- /dev/null +++ b/dev-java/jessie/Manifest @@ -0,0 +1,3 @@ +MD5 fbb5e3bfbe0a5edcbafb39579d48cc73 jessie-1.0.0-r1.ebuild 1502 +MD5 5f70d8a7822ce83c05a4089c92968a31 files/jessie-1.0.0-javadoc.patch 2893 +MD5 c614b4d53c89c67391b2d7e5c0d06fcf files/digest-jessie-1.0.0-r1 64 diff --git a/dev-java/jessie/files/digest-jessie-1.0.0-r1 b/dev-java/jessie/files/digest-jessie-1.0.0-r1 new file mode 100644 index 00000000..e748129e --- /dev/null +++ b/dev-java/jessie/files/digest-jessie-1.0.0-r1 @@ -0,0 +1 @@ +MD5 eba2838a9ae10f581ed7f8514242a1c5 jessie-1.0.0.tar.gz 876447 diff --git a/dev-java/jessie/files/jessie-1.0.0-javadoc.patch b/dev-java/jessie/files/jessie-1.0.0-javadoc.patch new file mode 100644 index 00000000..ca7f94a7 --- /dev/null +++ b/dev-java/jessie/files/jessie-1.0.0-javadoc.patch @@ -0,0 +1,24 @@ +diff -ru jessie-1.0.0/Makefile.in jessie-1.0.0-patched/Makefile.in +--- jessie-1.0.0/Makefile.in 2004-06-09 00:58:58.000000000 -0400 ++++ jessie-1.0.0-patched/Makefile.in 2005-09-04 11:22:27.000000000 -0400 +@@ -1857,8 +1857,8 @@ + rm -rf classes + + apidoc: .FORCE +- -mkdir apidoc +- javadoc -d apidoc/ -classpath $(CLASSPATH) -sourcepath $(srcdir) -bottom "<div style=\"float: left;\"><em>Verbatim copying and distribution of this documentation is permitted in any medium.</em></div><div style=\"margin-top: 10px; margin-bottom: 10px; float: right; text-align: right;\"<a href=\"http://metastatic.org/source/jessie/\"><img src=\"http://metastatic.org/images/jessie-small.png\" width=\"150\" height=\"52\" alt=\"Jessie: A Free Software Implementation of the JSSE\" style=\"border: none;\" /></a></div>" -windowtitle "Jessie API documentation, version $(VERSION)" -link http://www.gnu.org/software/gnu-crypto/api/ -link http://java.sun.com/j2se/1.4.2/docs/api/ -breakiterator -group "JSSE API" javax.net:javax.net.ssl:javax.security.cert -group "Jessie Provider" org.metastatic.jessie:org.metastatic.jessie.https javax.net javax.net.ssl javax.security.cert org.metastatic.jessie org.metastatic.jessie.https ++ -mkdir -p apidoc ++ javadoc -d apidoc/ -classpath $(CLASSPATH) -sourcepath $(srcdir) -bottom "<div style=\"float: left;\"><em>Verbatim copying and distribution of this documentation is permitted in any medium.</em></div><div style=\"margin-top: 10px; margin-bottom: 10px; float: right; text-align: right;\"<a href=\"http://metastatic.org/source/jessie/\"><img src=\"http://metastatic.org/images/jessie-small.png\" width=\"150\" height=\"52\" alt=\"Jessie: A Free Software Implementation of the JSSE\" style=\"border: none;\" /></a></div>" -windowtitle "Jessie API documentation, version $(VERSION)" -link http://www.gnu.org/software/gnu-crypto/manual/api/ -link http://java.sun.com/j2se/1.4.2/docs/api/ -breakiterator -group "JSSE API" javax.net:javax.net.ssl:javax.security.cert -group "Jessie Provider" org.metastatic.jessie:org.metastatic.jessie.https javax.net javax.net.ssl javax.security.cert org.metastatic.jessie org.metastatic.jessie.https + + gjdoc: gjdoccatalog.xml .FORCE + -mkdir -p apidoc-xml apidoc/common +diff -ru jessie-1.0.0/javax/net/SocketFactory.java jessie-1.0.0-patched/javax/net/SocketFactory.java +--- jessie-1.0.0/javax/net/SocketFactory.java 2003-10-15 19:36:40.000000000 -0400 ++++ jessie-1.0.0-patched/javax/net/SocketFactory.java 2005-09-04 11:23:18.000000000 -0400 +@@ -154,5 +154,5 @@ + * @return A socket connected to <i>host</i> on <i>port</i>. + * @throws IOException If a network error occurs. + */ +- public abstract Socket createSocket(InetAddress hast, int port, InetAddress localHost, int localPort) throws IOException; ++ public abstract Socket createSocket(InetAddress host, int port, InetAddress localHost, int localPort) throws IOException; + } diff --git a/dev-java/jessie/jessie-1.0.0-r1.ebuild b/dev-java/jessie/jessie-1.0.0-r1.ebuild new file mode 100644 index 00000000..b155f3af --- /dev/null +++ b/dev-java/jessie/jessie-1.0.0-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit java-pkg eutils + +DESCRIPTION="Free JSSE implementation" +HOMEPAGE="http://www.nongnu.org/jessie" +SRC_URI="http://syzygy.metastatic.org/jessie/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" +IUSE="doc ssl" +#IUSE="doc jikes ssl" + +LDEPEND=">=dev-java/gnu-classpath-0.08_rc1 + ssl? ( dev-java/gnu-crypto )" +RDEPEND=">=virtual/jre-1.4 + ${LDEPEND}" +DEPEND=">=virtual/jdk-1.4 + ${LDEPEND}" +# Jikes needs to learn how to get system libraries so it can play nice. +# Until then, we're going to disable jikes support +# jikes? ( >=dev-java/jikes-1.19 ) + +src_unpack() { + unpack ${A} + cd ${S} + # TODO file upstream + # without this, make apidoc fails (a URL has changed) + epatch ${FILESDIR}/${P}-javadoc.patch +} + +src_compile() { + + local MY_CLASSPATH=${CLASSPATH}:/usr/share/classpath/glibj.zip + use ssl && MY_CLASSPATH=${MY_CLASSPATH}:$(java-pkg_getjars gnu-crypto) + +# local MY_JAVAC=$(java-config -c) +# if use jikes; then +# MY_JAVAC=$(which jikes) +# MY_CLASSPATH=${MY_CLASSPATH}:$(java-config -O)/jre/lib/rt.jar +# fi + + # Must check later that this actually works + CLASSPATH=${MY_CLASSPATH} econf --with-java-target=1.4 --disable-awt || die + make || die + use doc && emake apidoc +} + +src_install() { + einstall || die + rm ${D}/usr/share/*.jar + + java-pkg_dojar lib/*.jar + if use doc; then + mv apidoc api + java-pkg_dohtml -r api + fi + dodoc AUTHORS FAQ INSTALL NEWS README THANKS TODO +} diff --git a/dev-java/jfor/Manifest b/dev-java/jfor/Manifest index 6dcbdb89..88eadfc3 100644 --- a/dev-java/jfor/Manifest +++ b/dev-java/jfor/Manifest @@ -1,3 +1,3 @@ -MD5 4eb784d3d0e77c2f156ccb69374216ba jfor-0.7.2_rc1.ebuild 761 -MD5 e31c12bec3d5670195e4c85c1fb8eb7c files/digest-jfor-0.7.2_rc1 72 +MD5 d41ac1553b3d8075eb561002631b9d2f jfor-0.7.2_rc1.ebuild 766 MD5 0b80d5f98fe9621d9dc322f47499ed0b files/jfor 271 +MD5 e31c12bec3d5670195e4c85c1fb8eb7c files/digest-jfor-0.7.2_rc1 72 diff --git a/dev-java/jfor/jfor-0.7.2_rc1.ebuild b/dev-java/jfor/jfor-0.7.2_rc1.ebuild index 8dde1476..e7fff47c 100644 --- a/dev-java/jfor/jfor-0.7.2_rc1.ebuild +++ b/dev-java/jfor/jfor-0.7.2_rc1.ebuild @@ -25,7 +25,7 @@ KEYWORDS="~x86 ~ppc" IUSE="" DEPEND="virtual/jdk - dev-java/ant + dev-java/ant-core dev-java/xerces || ( dev-java/avalon-logkit dev-java/avalon-logkit-bin)" diff --git a/dev-java/jisp/Manifest b/dev-java/jisp/Manifest index 58b6f7dd..d9057589 100644 --- a/dev-java/jisp/Manifest +++ b/dev-java/jisp/Manifest @@ -1,3 +1,3 @@ -MD5 a18124acf8bec11b5fc88f933abcf5df jisp-2.5.1.ebuild 875 +MD5 d9284f79fe7b30584178e9e88ce6445f jisp-2.5.1.ebuild 894 MD5 1a897f417a9ba4226716c67df0054985 files/build-2.5.1.xml 1588 MD5 64b6a59173de47481e28297dfaef22da files/digest-jisp-2.5.1 68 diff --git a/dev-java/jisp/jisp-2.5.1.ebuild b/dev-java/jisp/jisp-2.5.1.ebuild index 93ee4626..7f425d65 100644 --- a/dev-java/jisp/jisp-2.5.1.ebuild +++ b/dev-java/jisp/jisp-2.5.1.ebuild @@ -14,6 +14,7 @@ KEYWORDS="~x86" IUSE="doc jikes" DEPEND="virtual/jdk + dev-java/ant-core jikes? (dev-java/jikes)" RDEPEND="virtual/jre" diff --git a/dev-java/joesnmp/Manifest b/dev-java/joesnmp/Manifest index 01e1b610..b79c3fcd 100644 --- a/dev-java/joesnmp/Manifest +++ b/dev-java/joesnmp/Manifest @@ -1,3 +1,3 @@ -MD5 62e111e26f75d68fd7b2abc1e1672224 joesnmp-0.3.3.ebuild 1035 +MD5 15a23b69300aa9f5f3116daeab407a2b joesnmp-0.3.3.ebuild 1040 MD5 af93e06c5f709f3df1060b030f9dfb00 files/joesnmp-0.3.3-gentoo.patch 761 MD5 a8d45953a27b81ec5bd212e97ebeae22 files/digest-joesnmp-0.3.3 63 diff --git a/dev-java/joesnmp/joesnmp-0.3.3.ebuild b/dev-java/joesnmp/joesnmp-0.3.3.ebuild index 0be9d337..1d82c817 100644 --- a/dev-java/joesnmp/joesnmp-0.3.3.ebuild +++ b/dev-java/joesnmp/joesnmp-0.3.3.ebuild @@ -16,7 +16,7 @@ IUSE="doc jikes" # TODO determine java veresions DEPEND="virtual/jdk app-arch/unzip - dev-java/ant + dev-java/ant-core jikes? (dev-java/jikes)" RDEPEND="virtual/jre" diff --git a/dev-java/jonathan-core/Manifest b/dev-java/jonathan-core/Manifest index ae9fcb41..218f649f 100644 --- a/dev-java/jonathan-core/Manifest +++ b/dev-java/jonathan-core/Manifest @@ -1,2 +1,2 @@ -MD5 2b8af90db94c882fa29779438116fc24 jonathan-core-4.1.ebuild 1549 +MD5 d502e45e81d533a9be81eace414baec9 jonathan-core-4.1.ebuild 1578 MD5 c917b26774cb537b274d6e3fd1b50fc3 files/digest-jonathan-core-4.1 70 diff --git a/dev-java/jonathan-core/jonathan-core-4.1.ebuild b/dev-java/jonathan-core/jonathan-core-4.1.ebuild index 369138ac..786706fc 100644 --- a/dev-java/jonathan-core/jonathan-core-4.1.ebuild +++ b/dev-java/jonathan-core/jonathan-core-4.1.ebuild @@ -7,7 +7,7 @@ inherit java-pkg MY_PN="${PN//-/}" DESCRIPTION="Jonathan is a Distributed Object Platform (DOP) written entirely in Java." HOMEPAGE="http://jonathan.objectweb.org/index.html" -SRC_URI="mirror://gentoo/${P}.tar.bz2" +SRC_URI="http://gentooexperimental.org/distfiles/${P}.tar.bz2" # cvs -d:pserver:anonymous@cvs.forge.objectweb.org:/cvsroot/jonathan login # cvs -z3 -d:pserver:anonymous@cvs.forge.objectweb.org:/cvsroot/jonathan export -r JONATHAN_CORE_4_1 jonathancore # tar cjvf jonathan-core-4.1.tar.bz2 jonathancore @@ -18,7 +18,7 @@ KEYWORDS="~x86" IUSE="doc jikes" DEPEND="virtual/jdk - dev-java/ant + dev-java/ant-core jikes? (dev-java/jikes)" RDEPEND="virtual/jre =dev-java/nanoxml-2.2* diff --git a/dev-java/joram/Manifest b/dev-java/joram/Manifest new file mode 100644 index 00000000..8b1fb8e1 --- /dev/null +++ b/dev-java/joram/Manifest @@ -0,0 +1,2 @@ +MD5 8855c883104b97cae19ca8588e6cd9be joram-4.3.1.ebuild 423 +MD5 580d91dd2e024d0527d6ff62db63a657 files/digest-joram-4.3.1 65 diff --git a/dev-java/joram/files/digest-joram-4.3.1 b/dev-java/joram/files/digest-joram-4.3.1 new file mode 100644 index 00000000..f190ec22 --- /dev/null +++ b/dev-java/joram/files/digest-joram-4.3.1 @@ -0,0 +1 @@ +MD5 fd7263b00abece82c5194c4046a43da5 joram-4.3.1-src.tgz 4049301 diff --git a/dev-java/joram/joram-4.3.1.ebuild b/dev-java/joram/joram-4.3.1.ebuild new file mode 100644 index 00000000..0a47ace4 --- /dev/null +++ b/dev-java/joram/joram-4.3.1.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit java-pkg + +DESCRIPTION="" +HOMEPAGE="" +SRC_URI="http://download.us.forge.objectweb.org/${PN}/${P}-src.tgz" + +LICENSE="" +SLOT="0" +KEYWORDS="~x86" +IUSE="" + +LDEPEND="dev-java/gnu-activation + dev-java/jakarta-regexp" +DEPEND="virtual/jdk + dev-java/ant-core" +RDEPEND="virtual/jre" + +src_unpack() { + :; +} diff --git a/dev-java/jotm/Manifest b/dev-java/jotm/Manifest index dff03ef8..17594b17 100644 --- a/dev-java/jotm/Manifest +++ b/dev-java/jotm/Manifest @@ -1,3 +1,3 @@ -MD5 f065220228f06d926f279ceb137bf64e jotm-2.0.10.ebuild 2048 +MD5 64c97dc31790864c9067425e4a14b343 jotm-2.0.10.ebuild 2053 MD5 8be3870929137216cd4233f0158442c0 files/jotm-2.0.10-gentoo.patch 7633 MD5 6e70c2a5e7eb3f10d011d5be9668fbc6 files/digest-jotm-2.0.10 65 diff --git a/dev-java/jotm/jotm-2.0.10.ebuild b/dev-java/jotm/jotm-2.0.10.ebuild index 13ab8962..6f28c5ad 100644 --- a/dev-java/jotm/jotm-2.0.10.ebuild +++ b/dev-java/jotm/jotm-2.0.10.ebuild @@ -14,7 +14,7 @@ KEYWORDS="~x86" IUSE="doc jikes" DEPEND="virtual/jdk - dev-java/ant + dev-java/ant-core jikes? (dev-java/jikes)" # TODO: verify that jacorb actually provides JTS classes # ( org.omg.CosTransactions.PropagationContextHelper ) diff --git a/dev-java/juddi/Manifest b/dev-java/juddi/Manifest index 82247e2e..e37e4707 100644 --- a/dev-java/juddi/Manifest +++ b/dev-java/juddi/Manifest @@ -1,2 +1,2 @@ -MD5 a2e0d86e4a98dbdf054cc57537a4409b juddi-0.9_rc3.ebuild 2037 +MD5 a37c91a7d992f75987c0355cce803ce9 juddi-0.9_rc3.ebuild 2141 MD5 1a157a4dbfe55db2d214d0652615f5bc files/digest-juddi-0.9_rc3 69 diff --git a/dev-java/juddi/juddi-0.9_rc3.ebuild b/dev-java/juddi/juddi-0.9_rc3.ebuild index fde2953c..43f07cd3 100644 --- a/dev-java/juddi/juddi-0.9_rc3.ebuild +++ b/dev-java/juddi/juddi-0.9_rc3.ebuild @@ -2,12 +2,14 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -inherit java-pkg +inherit java-pkg versionator -MY_PV=0.9rc3 +MY_PV=$(replace_version_separator 2 '') +MY_P="${PN}-${MY_PV}-src" DESCRIPTION="jUDDI is an open source Java implementation of the Universal Description, Discovery, and Integration (UDDI) specification for Web Services." HOMEPAGE="http://ws.apache.org/juddi/" -SRC_URI="http://archive.apache.org/dist/ws/${PN}/${MY_PV}/${PN}-${MY_PV}-src.tar.gz" +MY_PV_DIR=$(replace_version_separator 1 _ ${MY_PV}) +SRC_URI="http://archive.apache.org/dist/ws/${PN}/${MY_PV_DIR}/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" @@ -17,7 +19,7 @@ IUSE="jikes doc" # TODO claims to be >= 1.3.1, but needs testing DEPEND="=virtual/jdk-1.4* jikes? (dev-java/jikes) - dev-java/ant" + dev-java/ant-core" RDEPEND="=virtual/jre-1.4* =dev-java/servletapi-2.4* =dev-java/gnu-jaf-1* @@ -29,7 +31,7 @@ RDEPEND="=virtual/jre-1.4* dev-java/commons-pool dev-java/log4j dev-java/wsdl4j" -S="${WORKDIR}/${PN}-${MY_PV}-src" +S="${WORKDIR}/${MY_P}" SERVLET_API="servletapi-2.4 servlet-api.jar" ACTIVATION="gnu-jaf-1" diff --git a/dev-java/kilim/Manifest b/dev-java/kilim/Manifest index 4dbe3d5c..f9445824 100644 --- a/dev-java/kilim/Manifest +++ b/dev-java/kilim/Manifest @@ -1,5 +1,5 @@ -MD5 e3202f034e5e597688e1461ad89d10dd kilim-2.0.32.ebuild 1246 -MD5 e9daf707e604e9b47e9e4c4e3bc00abf kilim-1.1.3.ebuild 1107 +MD5 666117f3048a13b68fecaa5bac8b840c kilim-2.0.32.ebuild 1251 +MD5 846066011ed828ec9ba5dfd59d6be8b7 kilim-1.1.3.ebuild 1112 MD5 d9a229ff14e854b38396030f8609d68b files/digest-kilim-1.1.3 67 MD5 dca27125a40467540ca5e734eee662d6 files/kilim-2.0.32-gentoo.patch 4640 MD5 fa33146ee39ee6acd09b0b5198c5f4af files/digest-kilim-2.0.32 69 diff --git a/dev-java/kilim/kilim-1.1.3.ebuild b/dev-java/kilim/kilim-1.1.3.ebuild index 7eaf4b8f..a4a294a3 100644 --- a/dev-java/kilim/kilim-1.1.3.ebuild +++ b/dev-java/kilim/kilim-1.1.3.ebuild @@ -15,7 +15,7 @@ KEYWORDS="~x86" IUSE="doc jikes" DEPEND="virtual/jdk - dev-java/ant + dev-java/ant-core jikes? (dev-java/jikes)" RDEPEND="virtual/jre =dev-java/nanoxml-2.2*" diff --git a/dev-java/kilim/kilim-2.0.32.ebuild b/dev-java/kilim/kilim-2.0.32.ebuild index 805b2848..f147a208 100644 --- a/dev-java/kilim/kilim-2.0.32.ebuild +++ b/dev-java/kilim/kilim-2.0.32.ebuild @@ -14,7 +14,7 @@ KEYWORDS="~x86" IUSE="doc jikes" DEPEND="virtual/jdk - dev-java/ant + dev-java/ant-core jikes? (dev-java/jikes)" RDEPEND="virtual/jre dev-java/monolog diff --git a/dev-java/maven/Manifest b/dev-java/maven/Manifest index 92d27072..91c92422 100644 --- a/dev-java/maven/Manifest +++ b/dev-java/maven/Manifest @@ -1,4 +1,4 @@ -MD5 c96f1932b5f9384d931d3423b854f05c maven-1.1_beta1.ebuild 11737 +MD5 f59e39936794d3ce45fdc295777a51ea maven-1.1_beta1.ebuild 11785 MD5 f28d5b5c7b150d15035a9fe12fdbe1b3 files/maven-plugins-20050905-gentoo.patch 603 MD5 95485c7874dc8f40d3caa720b080ee98 files/digest-maven-1.0.2 65 MD5 c9f23f580107966ea59b33718ee1bfb6 files/maven-1.1_beta1-gentoo.patch 634 diff --git a/dev-java/maven/maven-1.1_beta1.ebuild b/dev-java/maven/maven-1.1_beta1.ebuild index 9ceaffc5..4da8228f 100644 --- a/dev-java/maven/maven-1.1_beta1.ebuild +++ b/dev-java/maven/maven-1.1_beta1.ebuild @@ -6,8 +6,8 @@ inherit java-pkg eutils MY_P=${P/_beta/-beta-}-src DESCRIPTION="Project Management and Comprehension Tool for Java" -SRC_URI="mirror://gentoo/${MY_P}.tar.bz2 -mirror://gentoo/maven-plugins-20050905.tar.bz2" +SRC_URI="http://gentooexperimental.org/distfiles/${MY_P}.tar.bz2 +http://gentooexperimental.org/distfiles/maven-plugins-20050905.tar.bz2" # svn co http://svn.apache.org/repos/asf/maven/maven-1/core/tags/maven-1.1-beta-1/ # on 2005-09-05: # svn co http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/ maven-plugins diff --git a/dev-java/monolog/Manifest b/dev-java/monolog/Manifest index ab7025c8..522e9133 100644 --- a/dev-java/monolog/Manifest +++ b/dev-java/monolog/Manifest @@ -1,2 +1,2 @@ -MD5 ec207ba7de5ac70261ab505c3c57f686 monolog-1.9.1.ebuild 918 +MD5 711d4157274a6cf2a782f8521df6c31d monolog-1.9.1.ebuild 923 MD5 fb7160d110e5a3cd71ae4cfb2894075a files/digest-monolog-1.9.1 67 diff --git a/dev-java/monolog/monolog-1.9.1.ebuild b/dev-java/monolog/monolog-1.9.1.ebuild index ae28bb6e..4e1a4691 100644 --- a/dev-java/monolog/monolog-1.9.1.ebuild +++ b/dev-java/monolog/monolog-1.9.1.ebuild @@ -16,7 +16,7 @@ KEYWORDS="~x86" IUSE="jikes" DEPEND="virtual/jdk - dev-java/ant + dev-java/ant-core jikes? (dev-java/jikes) app-arch/unzip" RDEPEND="virtual/jre diff --git a/dev-java/mx4j/Manifest b/dev-java/mx4j/Manifest index e463c6b0..661f051f 100644 --- a/dev-java/mx4j/Manifest +++ b/dev-java/mx4j/Manifest @@ -1,4 +1,4 @@ -MD5 afe7685755b8e246ee75f14769f87aa8 mx4j-3.0.1.ebuild 1828 +MD5 e999f819f9ffd81865fee146a7ec3250 mx4j-3.0.1.ebuild 1833 MD5 e3cc9e5976952688b1ad3cea4da48449 ChangeLog 594 MD5 7973f86372fa9120f93c1c7f5caeb4bf metadata.xml 756 MD5 be55fe365b4d3539f734ecfb88cf1738 files/mx4j-2.1.0-gentoo.patch 4583 diff --git a/dev-java/mx4j/mx4j-3.0.1.ebuild b/dev-java/mx4j/mx4j-3.0.1.ebuild index 926b1761..a574ccc7 100644 --- a/dev-java/mx4j/mx4j-3.0.1.ebuild +++ b/dev-java/mx4j/mx4j-3.0.1.ebuild @@ -8,7 +8,7 @@ DESCRIPTION="MX4J is a project to build an Open Source implementation of the Jav HOMEPAGE="http://mx4j.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz" DEPEND=">=virtual/jdk-1.4 - >=dev-java/ant-1.6 + >=dev-java/ant-core-1.6 jikes? ( >=dev-java/jikes-1.21 ) source? ( app-arch/zip )" RDEPEND=">=virtual/jre-1.4 diff --git a/dev-java/nekohtml/Manifest b/dev-java/nekohtml/Manifest index c395d268..88dddd4e 100644 --- a/dev-java/nekohtml/Manifest +++ b/dev-java/nekohtml/Manifest @@ -1,3 +1,3 @@ -MD5 66de55b185060719771539395c077b73 nekohtml-0.9.4.ebuild 1256 +MD5 9873c82801f54bd296f5b6cd4e887ed9 nekohtml-0.9.4.ebuild 1305 MD5 6eb6d65240ffe56d704a8804dddcce99 files/nekohtml-0.9.4-build-html.xml.patch 1978 MD5 d3507742224767162115208dee4764e6 files/digest-nekohtml-0.9.4 66 diff --git a/dev-java/nekohtml/nekohtml-0.9.4.ebuild b/dev-java/nekohtml/nekohtml-0.9.4.ebuild index cacc38ab..5ac425a9 100644 --- a/dev-java/nekohtml/nekohtml-0.9.4.ebuild +++ b/dev-java/nekohtml/nekohtml-0.9.4.ebuild @@ -11,7 +11,8 @@ standard XML interfaces." HOMEPAGE="http://people.apache.org/~andyc/neko/doc/html/" SRC_URI="www.apache.org/~andyc/neko/${P}.tar.gz" DEPEND=">=virtual/jdk-1.3 - dev-java/ant" + dev-java/ant-core + test? (dev-java/junit dev-java/ant-tasks)" RDEPEND=">=virtual/jre-1.3 =dev-java/xerces-2* dev-java/xalan" diff --git a/dev-java/opensaml/Manifest b/dev-java/opensaml/Manifest index 989fe6b6..244baa93 100644 --- a/dev-java/opensaml/Manifest +++ b/dev-java/opensaml/Manifest @@ -1,3 +1,3 @@ -MD5 d7c048fc556bf90b2c5c449a6493a821 opensaml-1.0.1.ebuild 1220 +MD5 11dc7501963183d46a80e85a009e2cb4 opensaml-1.0.1.ebuild 1166 MD5 dab74a64de0a4d026adf6f5063377253 files/digest-opensaml-1.0.1 72 MD5 1239f8bc7e5f62235230433bb235a153 files/opensaml-1.0.1-ioexception.patch 749 diff --git a/dev-java/opensaml/opensaml-1.0.1.ebuild b/dev-java/opensaml/opensaml-1.0.1.ebuild index 324d2f48..b42bb023 100644 --- a/dev-java/opensaml/opensaml-1.0.1.ebuild +++ b/dev-java/opensaml/opensaml-1.0.1.ebuild @@ -6,7 +6,7 @@ inherit java-pkg eutils DESCRIPTION="an Open Source Security Assertion Markup Language implementation" HOMEPAGE="http://www.opensaml.org/" -SRC_URI="http://wayf.internet2.edu/shibboleth/opensaml-java-1.0.1.tar.gz" +SRC_URI="http://wayf.internet2.edu/shibboleth/archive/${PN}-java-${PV}.tar.gz" LICENSE="" SLOT="0" @@ -14,11 +14,11 @@ KEYWORDS="~x86" IUSE="doc" DEPEND="=virtual/jdk-1.4* - dev-java/ant" + dev-java/ant-core" RDEPEND="=virtual/jre-1.4* =dev-java/servletapi-2.3* dev-java/xalan - dev-java/xml-security" + =dev-java/xml-security-1.2*" S="${WORKDIR}/${PN}/java" @@ -26,7 +26,7 @@ JUNIT="junit junit.jar" LOG4J="log4j log4j.jar" # The packed jar _says_ 2.2, but 2.3 works fine SERVLET="servletapi-2.3 servlet.jar" -XMLSEC="xml-security xmlsec.jar" +XMLSEC="xml-security-1.2 xmlsec.jar" src_unpack() { unpack ${A} @@ -35,7 +35,6 @@ src_unpack() { epatch ${FILESDIR}/${P}-ioexception.patch cd ${S}/lib - # We're going to start from scratch...lots of cruff in the lib directory rm *.jar java-pkg_jar-from ${LOG4J} java-pkg_jar-from ${SERVLET} diff --git a/dev-java/sablevm-sdk/sablevm-sdk-1.12.ebuild b/dev-java/sablevm-sdk/sablevm-sdk-1.12.ebuild index 22fc2d95..b1ab04d6 100644 --- a/dev-java/sablevm-sdk/sablevm-sdk-1.12.ebuild +++ b/dev-java/sablevm-sdk/sablevm-sdk-1.12.ebuild @@ -7,7 +7,7 @@ inherit java DESCRIPTION="A robust, clean, extremely portable, efficient, and specification-compliant Java virtual machine." HOMEPAGE="http://sablevm.org/" -SRC_URI="http://sablevm.org/download/release/${PV}/${PN}-${PV}.tar.gz" +SRC_URI="http://sablevm.org/download/release/${PV}/${PV}.tar.gz" LICENSE="LGPL-2.1 GPL-2 libffi as-is IBM" SLOT="0" diff --git a/dev-java/sesame/Manifest b/dev-java/sesame/Manifest index 0691f00b..4a388969 100644 --- a/dev-java/sesame/Manifest +++ b/dev-java/sesame/Manifest @@ -1,2 +1,2 @@ -MD5 142c9ccec4eabcfe47f229b917c0d385 sesame-1.2.ebuild 1916 +MD5 963d7026341654fa29a86ad429f4cdbb sesame-1.2.ebuild 1911 MD5 e39d0d6506a82e160849b090579a4cdb files/digest-sesame-1.2 67 diff --git a/dev-java/spring/Manifest b/dev-java/spring/Manifest index 301b201b..ebb336d0 100644 --- a/dev-java/spring/Manifest +++ b/dev-java/spring/Manifest @@ -1,7 +1,11 @@ -MD5 c33c898bf5ba18c2a639c7f511d09194 spring-1.2.4.ebuild 7823 -MD5 5135aaae38d62b2c0e4a70395a7d385f spring-1.2.1.ebuild 7441 +MD5 ca1e31d83081068472e83fd2ed7a34f4 spring-1.2.4.ebuild 7888 +MD5 954b7c4071b9ee08154a4f87c1aee9b0 spring-1.2.1.ebuild 7446 +MD5 ca1e31d83081068472e83fd2ed7a34f4 spring-1.2.5.ebuild 7888 MD5 1e80a4af4773e57420e9b35987b9e868 files/spring-1.2.1-excludes.patch 1027 +MD5 641058823d1ba9cbf1ebadfb21a7163e files/spring-1.2.5-excludes.patch 1028 MD5 04551c4800839ec28f2ade6847d61c25 files/digest-spring-1.2.1 73 MD5 b81428023727cdad6b6c23725beaa986 files/digest-spring-1.2.4 73 +MD5 23861d2f7a9606757acec4c9e3e411b7 files/digest-spring-1.2.5 73 MD5 641058823d1ba9cbf1ebadfb21a7163e files/spring-1.2.4-excludes.patch 1028 +MD5 38d40e9109885660aeaa49ffe230b1d5 files/spring-1.2.5-gentoo.patch 1350 MD5 38d40e9109885660aeaa49ffe230b1d5 files/spring-1.2.4-gentoo.patch 1350 diff --git a/dev-java/spring/files/digest-spring-1.2.5 b/dev-java/spring/files/digest-spring-1.2.5 new file mode 100644 index 00000000..8e195348 --- /dev/null +++ b/dev-java/spring/files/digest-spring-1.2.5 @@ -0,0 +1 @@ +MD5 f92dcb2bfbcf12061ec32d61cce483c5 spring-framework-1.2.5.zip 17657622 diff --git a/dev-java/spring/files/spring-1.2.5-excludes.patch b/dev-java/spring/files/spring-1.2.5-excludes.patch new file mode 100644 index 00000000..152d2364 --- /dev/null +++ b/dev-java/spring/files/spring-1.2.5-excludes.patch @@ -0,0 +1,22 @@ +diff -ru spring-framework-1.2.4/build.xml spring-framework-1.2.4-patched/build.xml +--- spring-framework-1.2.4/build.xml 2005-08-27 23:59:46.000000000 -0400 ++++ spring-framework-1.2.4-patched/build.xml 2005-08-28 00:03:58.000000000 -0400 +@@ -140,11 +140,12 @@ + <!-- Include Commons Attributes generated Java sources -->
+ <src path="${commons.attributes.tempdir.src}"/>
+ <classpath refid="all-libs"/>
+- <exclude name="**/toplink/**"/>
+- <exclude name="**/ojb/**"/>
+- <exclude name="**/jsf/**"/>
+- <exclude name="**/jdo/**"/>
+- <exclude name="**/ibatis/**"/>
++ <exclude name="**/toplink/**"/>
++ <exclude name="**/ojb/**"/>
++ <exclude name="**/jsf/**"/>
++ <exclude name="**/jdo/**"/>
++ <exclude name="**/ibatis/**"/>
++
+ </javac>
+
+ <rmic base="${target.classes.dir}" classname="org.springframework.remoting.rmi.RmiInvocationWrapper"/>
+Only in spring-framework-1.2.4: build.xml.orig diff --git a/dev-java/spring/files/spring-1.2.5-gentoo.patch b/dev-java/spring/files/spring-1.2.5-gentoo.patch new file mode 100644 index 00000000..0ab6e8fd --- /dev/null +++ b/dev-java/spring/files/spring-1.2.5-gentoo.patch @@ -0,0 +1,43 @@ +diff -ru spring-framework-1.2.4/build.xml spring-framework-1.2.4-patched/build.xml +--- spring-framework-1.2.4/build.xml 2005-07-22 17:57:14.000000000 -0400 ++++ spring-framework-1.2.4-patched/build.xml 2005-08-28 00:05:08.000000000 -0400 +@@ -54,7 +54,9 @@ +
+
+ <path id="attribute-compiler-classpath">
++ <path refid="all-libs"/>
+
++ <!--
+ <fileset dir="lib/jakarta-commons">
+ <include name="commons-attributes-compiler.jar"/>
+ <include name="commons-collections.jar"/>
+@@ -62,7 +64,7 @@ + <fileset dir="lib/xdoclet">
+ <include name="xjavadoc-1.1.jar"/>
+ </fileset>
+-
++ -->
+ </path>
+
+
+@@ -140,6 +142,12 @@ + <!-- Include Commons Attributes generated Java sources -->
+ <src path="${commons.attributes.tempdir.src}"/>
+ <classpath refid="all-libs"/>
++ <exclude name="**/toplink/**"/>
++ <exclude name="**/ojb/**"/>
++ <exclude name="**/jsf/**"/>
++ <exclude name="**/jdo/**"/>
++ <exclude name="**/ibatis/**"/>
++
+ </javac>
+
+ <rmic base="${target.classes.dir}" classname="org.springframework.remoting.rmi.RmiInvocationWrapper"/>
+@@ -1432,4 +1440,4 @@ + </jrc>
+ </target>
+
+-</project> +\ No newline at end of file ++</project>
+Only in spring-framework-1.2.4-patched/: build.xml.orig diff --git a/dev-java/spring/spring-1.2.1.ebuild b/dev-java/spring/spring-1.2.1.ebuild index 6ba39df8..6db5276e 100644 --- a/dev-java/spring/spring-1.2.1.ebuild +++ b/dev-java/spring/spring-1.2.1.ebuild @@ -19,7 +19,7 @@ KEYWORDS="~x86" IUSE="doc" DEPEND="virtual/jdk - dev-java/ant + dev-java/ant-core dev-java/antlr" # jikes? (dev-java/jikes) RDEPEND="virtual/jre diff --git a/dev-java/spring/spring-1.2.4.ebuild b/dev-java/spring/spring-1.2.4.ebuild index 1241da6d..3f7819fa 100644 --- a/dev-java/spring/spring-1.2.4.ebuild +++ b/dev-java/spring/spring-1.2.4.ebuild @@ -16,11 +16,12 @@ KEYWORDS="~x86" # Jikes is broken: # http://opensource.atlassian.com/projects/spring/browse/SPR-1097 #IUSE="doc jikes" -IUSE="doc" +IUSE="doc source" DEPEND=">=virtual/jdk-1.4 - dev-java/ant - dev-java/antlr" + dev-java/ant-core + dev-java/antlr + app-arch/zip" # jikes? (dev-java/jikes) # TODO replace sun-jdbc-rowset-bin with free implementation RDEPEND=">=virtual/jre-1.4 @@ -280,6 +281,7 @@ src_install() { dodoc changelog.txt notice.txt readme.txt use doc && java-pkg_dohtml -r docs/{MVC-step-by-step,api,taglib} reference + use source && java-pkg_dosrc ${S}/src } # TODO figure out what the heck we should say here diff --git a/dev-java/spring/spring-1.2.5.ebuild b/dev-java/spring/spring-1.2.5.ebuild new file mode 100644 index 00000000..1241da6d --- /dev/null +++ b/dev-java/spring/spring-1.2.5.ebuild @@ -0,0 +1,292 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit java-pkg eutils + +MY_PN=${PN}-framework +MY_P=${MY_PN}-${PV} +DESCRIPTION="Spring is a layered Java/J2EE application framework, based on code published in Expert One-on-One J2EE Design and Development by Rod Johnson (Wrox, 2002)." +HOMEPAGE="http://www.springframework.org/" +SRC_URI="mirror://sourceforge/${MY_PN/-/}/${MY_P}.zip" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~x86" +# Jikes is broken: +# http://opensource.atlassian.com/projects/spring/browse/SPR-1097 +#IUSE="doc jikes" +IUSE="doc" + +DEPEND=">=virtual/jdk-1.4 + dev-java/ant + dev-java/antlr" +# jikes? (dev-java/jikes) +# TODO replace sun-jdbc-rowset-bin with free implementation +RDEPEND=">=virtual/jre-1.4 + =www-servers/axis-1* + =dev-java/aopalliance-1* + dev-java/wsdl4j + dev-java/c3p0 + =dev-java/burlap-2.1* + =dev-java/hessian-2.1* + =dev-java/cglib-2.1* + dev-java/cos + =dev-java/dom4j-1* + =dev-java/easymock-1* + dev-java/ehcache + =dev-java/freemarker-2.3* + =dev-java/hibernate-2* + =dev-java/hibernate-3* + dev-java/itext + =dev-java/gnu-jaf-1* + =dev-java/jboss-module-j2ee-4.0* + =dev-java/servletapi-2.4* + dev-java/jakarta-jstl + dev-java/sun-jdbc-rowset-bin + =dev-java/xerces-2* + =dev-java/commons-attributes-2* + =dev-java/commons-beanutils-1.7* + dev-java/commons-dbcp + dev-java/commons-digester + dev-java/commons-fileupload + =dev-java/commons-httpclient-3* + dev-java/commons-lang + dev-java/commons-logging + dev-java/commons-pool + =app-text/jasperreports-0.6* + =dev-java/jamon-1* + =dev-java/jotm-2.0* + =dev-java/xapool-1.5* + dev-java/junit + dev-java/log4j + =dev-java/jakarta-oro-2.0* + dev-java/poi + dev-java/quartz + =dev-java/struts-1.2* + =dev-java/velocity-1* + dev-java/velocity-tools + dev-java/xjavadoc + =dev-java/gnu-javamail-1* + =dev-java/mx4j-3.0* + =dev-java/jboss-module-j2ee-4.0* + dev-java/wsdl4j" +# dev-java/jmx +# dev-java/jta +# dev-java/jms +# dev-java/jdbc2-stdext +# dev-java/sun-qname-bin +S=${WORKDIR}/${MY_P} + +ANTLR="antlr antlr.jar antlr-2.7.5H3.jar" +AOPALLIANCE="aopalliance-1 aopalliance.jar" +AXIS="axis-1 axis.jar" +SAAJ="axis-1 saaj.jar" +WSDL4J="wsdl4j wsdl4j.jar" +C3P0="c3p0 c3p0.jar c3p0-0.8.5.2.jar" +BURLAP="burlap-2.1 burlap.jar" +HESSIAN="hessian-2.1 hessian.jar" +CGLIB="cglib-2.1 cglib.jar cglib-nodep-2.1.jar" +COS="cos cos.jar" +DOM4J="dom4j-1" +EASYMOCK="easymock-1" +EHCACHE="ehcache ehcache.jar" +FREEMARKER="freemarker-2.3 freemarker.jar" +HIBERNATE2="hibernate-2 hibernate2.jar" +HIBERNATE3="hibernate-3 hibernate3.jar" +HSQLDB="hsqldb hsqldb.jar" +ITEXT="itext iText.jar itext-1.1.4.jar" +ACTIVATION="gnu-jaf-1 activation.jar" +J2EE="jboss-module-j2ee-4 jboss-j2ee.jar" +JAXRPC="jboss-module-j2ee-4 jboss-jaxrpc.jar" +QNAME="wsdl4j qname.jar" +JDBC_STDEXT="jdbc2-stdext jdbc2_0-stdext.jar" +#JMS="jms jms.jar" +JMS="jboss-module-j2ee-4 jboss-j2ee.jar" +JSP_API="servletapi-2.4 jsp-api.jar" +JSTL="jakarta-jstl jstl.jar" +JTA="jta jta.jar" +MAIL="gnu-javamail-1 gnumail.jar mail.jar" +ROWSET="sun-jdbc-rowset-bin rowset.jar" +SERVLET_API="servletapi-2.4 servlet-api.jar" +XML_APIS="xerces-2 xml-apis.jar" +COMMON_COLLECTIONS="commons-collections commons-collections.jar" +COMMONS_ATTRIBUTES_API="commons-attributes-2 commons-attributes-api.jar" +COMMONS_ATTRIBUTES_COMPILER="commons-attributes-2 commons-attributes-compiler.jar" +COMMONS_BEANUTILS="commons-beanutils-1.7" +COMMONS_DBCP="commons-dbcp commons-dbcp.jar" +COMMONS_DIGESTER="commons-digester commons-digester.jar" +COMMONS_FILEUPLOAD="commons-fileupload commons-fileupload.jar" +COMMONS_HTTPCLIENT="commons-httpclient commons-httpclient.jar" +COMMONS_LANG="commons-lang commons-lang.jar" +COMMONS_LOGGING="commons-logging commons-logging.jar" +COMMONS_POOL="commons-pool commons-pool.jar" +STANDARD="jakarta-jstl standard.jar" +JAMON="jamon-1 jamon.jar JAMon.jar" +JASPERREPORTS="jasperreports-0.6 jasperreports.jar jaspereports-0.6.6.jar" +MX4J="mx4j-3.0 mx4j.jar" +MX4J_REMOTE="mx4j-3.0 mx4j-remote.jar" +JOTM="jotm-2.0 jotm.jar" +XAPOOL="xapool-1.5 xapool.jar" +JUNIT="junit junit.jar" +LOG4J="log4j log4j.jar log4j-1.2.9.jar" +JAKARTA_ORO="jakarta-oro-2.0 jakarta-oro.jar jakarta-oro-2.0.8.jar" +POI="poi poi.jar poi-2.5.1.jar" +QUARTZ="quartz quartz.jar" +STRUTS="struts-1.2 struts.jar" +VELOCITY="velocity-1 velocity.jar velocity-1.4.jar" +VELOCITY_TOOLS_GENERIC="velocity-tools velocity-tools-generic.jar velocity-tools-generic-1.1.jar" +VELOCITY_TOOLS_VIEW="velocity-tools velocity-tools-view.jar velocity-tools-view.1.jar" +XJAVADOC="xjavadoc xjavadoc.jar xjavadoc-1.1.jar" + +src_unpack() { + unpack ${A} + # disable support for toplink, ojb, jsf, jdo, and ibatis until they can be + # propertly packaged + # tweak build.xml, so it doesn't try to use specific jars in its classpaths + epatch ${FILESDIR}/${P}-gentoo.patch + + + cd ${S} + mkdir -p lib + cd lib + + java-pkg_jar-from ${ANTLR} + + mkdir aopalliance + cd aopalliance + java-pkg_jar-from ${AOPALLIANCE} + cd .. + + java-pkg_jar-from ${AXIS} + java-pkg_jar-from ${SAAJ} + java-pkg_jar-from ${WSDL4J} + + #96751 + java-pkg_jar-from ${C3P0} + + java-pkg_jar-from ${BURLAP} #97005 + java-pkg_jar-from ${HESSIAN} #97007 + + java-pkg_jar-from ${CGLIB} + + #97011 + java-pkg_jar-from ${COS} + + java-pkg_jar-from ${DOM4J} + + java-pkg_jar-from ${EASYMOCK} + + java-pkg_jar-from ${EHCACHE} + + java-pkg_jar-from ${FREEMARKER} + + java-pkg_jar-from ${HIBERNATE2} + java-pkg_jar-from ${HIBERNATE3} + + # ${S}/lib/hsqldb needed for example only + # TODO: ${S}/lib/ibatis + + java-pkg_jar-from ${ITEXT} + + java-pkg_jar-from ${ACTIVATION} + java-pkg_jar-from ${J2EE} + java-pkg_jar-from ${JAXRPC} + java-pkg_jar-from ${QNAME} + java-pkg_jar-from ${JDBC_STDEXT} + java-pkg_jar-from ${JMS} + java-pkg_jar-from ${JSP_API} + java-pkg_jar-from ${JSTL} + java-pkg_jar-from ${MAIL} + java-pkg_jar-from ${ROWSET} #97012 + java-pkg_jar-from ${SERVLET_API} + java-pkg_jar-from ${XML_APIS} + # don't need for compiling +# java-pkg_jar-from ${JTA} + +# cd ${S}/lib/jakarta-commons + # the following are only used for the example + #rm commons-{beanutils,discovery,validator}.jar + java-pkg_jar-from ${COMMONS_ATTRIBUTES_API} #97008 + java-pkg_jar-from ${COMMONS_ATTRIBUTES_COMPILER} #97008 + +# cd .. + java-pkg_jar-from ${COMMONS_BEANUTILS} + java-pkg_jar-from ${COMMONS_DBCP} + java-pkg_jar-from ${COMMONS_DIGESTER} + java-pkg_jar-from ${COMMONS_FILEUPLOAD} + java-pkg_jar-from ${COMMONS_HTTPCLIENT} + java-pkg_jar-from ${COMMONS_LANG} + java-pkg_jar-from ${COMMONS_LOGGING} + java-pkg_jar-from ${COMMONS_POOL} + + java-pkg_jar-from ${STANDARD} + + #97009 + java-pkg_jar-from ${JAMON} + + #96906 + java-pkg_jar-from ${JASPERREPORTS} + + # TODO ${S}/lib/jdo + + java-pkg_jar-from ${MX4J} + java-pkg_jar-from ${MX4J_REMOTE} +# rm jmxremote_optional.jar # only needed for testing + + java-pkg_jar-from ${JOTM} + java-pkg_jar-from ${XAPOOL} + + # TODO ${S}/lib/jsf + + java-pkg_jar-from ${JUNIT} + + java-pkg_jar-from ${LOG4J} + + # TODO ${S}/lib/ojb + + java-pkg_jar-from ${JAKARTA_ORO} + + java-pkg_jar-from ${POI} + + java-pkg_jar-from ${QUARTZ} + + java-pkg_jar-from ${STRUTS} + + # TODO toplink + + java-pkg_jar-from ${VELOCITY} + java-pkg_jar-from ${VELOCITY_TOOLS_GENERIC} + java-pkg_jar-from ${VELOCITY_TOOLS_VIEW} + +# mkdir xdoclet +# cd xdoclet + java-pkg_jar-from ${XJAVADOC} +} + +src_compile() { + local antflags="alljars" +# use jikes && antflags="${antflags} -Dbuild.compiler=jikes" + use doc && antflags="${antflags} javadoc14" + + ant ${antflags} || die "Compilation failed" + + cp -r docs/reference/html_single reference +} + +src_install() { + java-pkg_dojar dist/*.jar + + dodoc changelog.txt notice.txt readme.txt + + use doc && java-pkg_dohtml -r docs/{MVC-step-by-step,api,taglib} reference +} + +# TODO figure out what the heck we should say here +#pkg_postinst() { +# einfo "Notice:" +# einfo "A number of Spring's features require packages which have" +# einfo "not made their way into portage." +# einfo "These features have been built using 3rd party JAR files," +# einfo "" +#} diff --git a/dev-java/struts-sslext/Manifest b/dev-java/struts-sslext/Manifest index ac11ed1a..8436bcf6 100644 --- a/dev-java/struts-sslext/Manifest +++ b/dev-java/struts-sslext/Manifest @@ -1,3 +1,3 @@ -MD5 1364f39076883455e87283dea3853c84 struts-sslext-1.10.ebuild 1292 +MD5 774a3431fa8610e4adc3592023c3859a struts-sslext-1.10.ebuild 1301 MD5 8500c4b7ffde270e3b4d85673e9bf301 files/digest-struts-sslext-1.10 72 MD5 c089b7d34f96c556a34bb8c402794023 files/build-1.10.xml 1546 diff --git a/dev-java/struts-sslext/struts-sslext-1.10.ebuild b/dev-java/struts-sslext/struts-sslext-1.10.ebuild index 788497b6..eeeb3c7d 100644 --- a/dev-java/struts-sslext/struts-sslext-1.10.ebuild +++ b/dev-java/struts-sslext/struts-sslext-1.10.ebuild @@ -19,7 +19,7 @@ COMMON_DEPEND="=dev-java/struts-1.1* =dev-java/servletapi-2.4* dev-java/commons-digester" DEPEND="virtual/jdk - dev-java/ant + dev-java/ant-core jikes? (dev-java/jikes) ${COMMON_DEPEND}" RDEPEND="virtual/jre @@ -34,7 +34,7 @@ src_unpack() { cp ${FILESDIR}/build-${PVR}.xml build.xml local classpath; - for dependency in struts servletapi-2.4 commons-digester; do + for dependency in struts-1.1 servletapi-2.4 commons-digester; do local dependency_classpath=$(java-pkg_getjars ${dependency}) if [ -z "${classpath}" ] ; then classpath=${dependency_classpath} diff --git a/dev-java/struts/Manifest b/dev-java/struts/Manifest index 846b0726..3b4a49e7 100644 --- a/dev-java/struts/Manifest +++ b/dev-java/struts/Manifest @@ -1,2 +1,2 @@ -MD5 531d9514a7ab29de0295cc4654a6da62 struts-1.2.7.ebuild 2769 +MD5 7192be671543f8212199f0673cff3c2c struts-1.2.7.ebuild 2774 MD5 33b698810f68be4fe9e819ab01fb9230 files/digest-struts-1.2.7 69 diff --git a/dev-java/struts/struts-1.2.7.ebuild b/dev-java/struts/struts-1.2.7.ebuild index 8ebf7f23..692ba3ba 100644 --- a/dev-java/struts/struts-1.2.7.ebuild +++ b/dev-java/struts/struts-1.2.7.ebuild @@ -24,7 +24,7 @@ RDEPEND=">=virtual/jre-1.4 =dev-java/servletapi-2.3*" DEPEND=">=virtual/jdk-1.4 ${RDEPEND} - >=dev-java/ant-1.6.0 + >=dev-java/ant-core-1.6.0 jikes? ( dev-java/jikes ) source? ( app-arch/zip )" IUSE="doc examples jikes source" diff --git a/dev-java/sun-jaxrpc-bin/Manifest b/dev-java/sun-jaxrpc-bin/Manifest index e482d216..0277172b 100644 --- a/dev-java/sun-jaxrpc-bin/Manifest +++ b/dev-java/sun-jaxrpc-bin/Manifest @@ -1,2 +1,2 @@ -MD5 ccfc3c72d92e05a178f2c0f5146fe476 sun-jaxrpc-bin-0.9.ebuild 578 +MD5 cbc8aa949987800bc3376b082839799f sun-jaxrpc-bin-0.9.ebuild 565 MD5 c891a194dd988a65a8dd25f5085ebd13 files/digest-sun-jaxrpc-bin-0.9 145 diff --git a/dev-java/sun-jaxrpc-bin/sun-jaxrpc-bin-0.9.ebuild b/dev-java/sun-jaxrpc-bin/sun-jaxrpc-bin-0.9.ebuild index 287961af..9cd54c99 100644 --- a/dev-java/sun-jaxrpc-bin/sun-jaxrpc-bin-0.9.ebuild +++ b/dev-java/sun-jaxrpc-bin/sun-jaxrpc-bin-0.9.ebuild @@ -17,8 +17,7 @@ SLOT="0" KEYWORDS="~x86" IUSE="doc" -DEPEND="virtual/jdk - app-arch/unzip" +DEPEND="app-arch/unzip" RDEPEND="virtual/jre" src_unpack() { diff --git a/dev-java/sun-qname-bin/Manifest b/dev-java/sun-qname-bin/Manifest index 82d56ecf..a2711830 100644 --- a/dev-java/sun-qname-bin/Manifest +++ b/dev-java/sun-qname-bin/Manifest @@ -1,3 +1,3 @@ -MD5 cb1e029f770602e1a187e776527b4f16 sun-qname-bin-1.0.ebuild 1472 +MD5 a7b63f89017151c1ddba5c6cbc0606c9 sun-qname-bin-1.0.ebuild 1475 MD5 9c46f72609764c1cbefe5e39ffcec43f files/digest-sun-qname-bin-1.0 69 MD5 9c46f72609764c1cbefe5e39ffcec43f files/digest-sun-jax-qname-bin-1.0 69 diff --git a/dev-java/sun-qname-bin/sun-qname-bin-1.0.ebuild b/dev-java/sun-qname-bin/sun-qname-bin-1.0.ebuild index 743ed0b6..fe9e485a 100644 --- a/dev-java/sun-qname-bin/sun-qname-bin-1.0.ebuild +++ b/dev-java/sun-qname-bin/sun-qname-bin-1.0.ebuild @@ -16,7 +16,7 @@ SLOT="0" KEYWORDS="~x86" IUSE="" -DEPEND="virtual/jdk" +DEPEND="app-arch/unzip" RDEPEND="virtual/jre" DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=7751-javax_qname-1.0-fr-class-oth-JSpec&SiteId=JSC&TransactionId=noreg" diff --git a/dev-java/sun-treetable/Manifest b/dev-java/sun-treetable/Manifest index b27a5a07..97f5efc9 100644 --- a/dev-java/sun-treetable/Manifest +++ b/dev-java/sun-treetable/Manifest @@ -1,2 +1,2 @@ -MD5 b92aee9fac96fce7cb277cd12e09e841 sun-treetable-20050508.ebuild 552 +MD5 ad65b455db96ca9de711a9611bd1ea04 sun-treetable-20050508.ebuild 1073 MD5 d923397ccde647117ce8eec1397d63b2 files/digest-sun-treetable-20050508 78 diff --git a/dev-java/sun-treetable/sun-treetable-20050508.ebuild b/dev-java/sun-treetable/sun-treetable-20050508.ebuild index c3e065db..22d76a4d 100644 --- a/dev-java/sun-treetable/sun-treetable-20050508.ebuild +++ b/dev-java/sun-treetable/sun-treetable-20050508.ebuild @@ -17,6 +17,7 @@ KEYWORDS="~x86" IUSE="doc jikes source" DEPEND="virtual/jdk + dev-java/ant-core app-arch/unzip jikes? (dev-java/jikes) source? (app-arch/zip) " diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest index 1b359a87..5c6003c4 100644 --- a/dev-java/velocity/Manifest +++ b/dev-java/velocity/Manifest @@ -1,3 +1,3 @@ -MD5 c3211d071889e7b5bd0aec95b381d552 velocity-1.4-r3.ebuild 1761 +MD5 3ee52fe52a67fb1711245af464175aa0 velocity-1.4-r3.ebuild 1766 MD5 1b739fb0994afdb5b18dc46f157211f7 files/velocity-1.4-versioned_jar.patch 2237 MD5 ebc2b845ee1e201a404b4eceb168952a files/digest-velocity-1.4-r3 65 diff --git a/dev-java/velocity/velocity-1.4-r3.ebuild b/dev-java/velocity/velocity-1.4-r3.ebuild index b729cea9..6cc0a1db 100644 --- a/dev-java/velocity/velocity-1.4-r3.ebuild +++ b/dev-java/velocity/velocity-1.4-r3.ebuild @@ -14,7 +14,7 @@ KEYWORDS="~x86" IUSE="doc j2ee jikes junit" DEPEND=">=virtual/jdk-1.3.1 - dev-java/ant + dev-java/ant-core dev-java/antlr dev-java/junit jikes? (dev-java/jikes)" diff --git a/dev-java/wagon-file/Manifest b/dev-java/wagon-file/Manifest index a6f0f70e..92d602bd 100644 --- a/dev-java/wagon-file/Manifest +++ b/dev-java/wagon-file/Manifest @@ -1,2 +1,2 @@ -MD5 7c80716ec207d145e9108b3de75cb2f3 wagon-file-1.0_alpha4.ebuild 537 +MD5 89bceec0910dfe8a565c96a6532d4eac wagon-file-1.0_alpha4.ebuild 481 MD5 e03f39a2b2d60b155e7d6280277c7f4a files/digest-wagon-file-1.0_alpha4 134 diff --git a/dev-java/wagon-ftp/Manifest b/dev-java/wagon-ftp/Manifest index ff1adcdd..3b588988 100644 --- a/dev-java/wagon-ftp/Manifest +++ b/dev-java/wagon-ftp/Manifest @@ -1,2 +1,2 @@ -MD5 c35ea0f7bce6eb8b9f9600b936fce7b9 wagon-ftp-1.0_alpha4.ebuild 535 +MD5 c205fa00f6e92f4d053f00f475ce58d1 wagon-ftp-1.0_alpha4.ebuild 532 MD5 330d0052f91f2029dd1e8d5b0ddd46d9 files/digest-wagon-ftp-1.0_alpha4 134 diff --git a/dev-java/wagon-http/Manifest b/dev-java/wagon-http/Manifest index f750f4aa..9a1c03c8 100644 --- a/dev-java/wagon-http/Manifest +++ b/dev-java/wagon-http/Manifest @@ -1,2 +1,2 @@ -MD5 82f1225331f7ec0f9a0c0e6c964cdeb2 wagon-http-1.0_alpha4.ebuild 726 +MD5 5b7e10ff166265dd5845413c3478949d wagon-http-1.0_alpha4.ebuild 668 MD5 98dbfa51d67e100ca10d76b97977c2d9 files/digest-wagon-http-1.0_alpha4 135 diff --git a/dev-java/wagon-provider-api/Manifest b/dev-java/wagon-provider-api/Manifest index c6a3894d..d12ea23c 100644 --- a/dev-java/wagon-provider-api/Manifest +++ b/dev-java/wagon-provider-api/Manifest @@ -1,2 +1,2 @@ -MD5 10d4e9e962339a9a7e1d782c92be5ed9 wagon-provider-api-1.0_alpha4.ebuild 396 +MD5 b3e0a0c5819a004162e0b1846663e7aa wagon-provider-api-1.0_alpha4.ebuild 321 MD5 b6a9eeb37c49b981fa6e4faaaebe3a94 files/digest-wagon-provider-api-1.0_alpha4 143 diff --git a/dev-java/wagon-ssh-external/Manifest b/dev-java/wagon-ssh-external/Manifest index b5e31665..0f016d8c 100644 --- a/dev-java/wagon-ssh-external/Manifest +++ b/dev-java/wagon-ssh-external/Manifest @@ -1,2 +1,2 @@ -MD5 a53198874f88e49af68ce95bc10350d0 wagon-ssh-external-1.0_alpha4.ebuild 590 +MD5 fa90402f162a3b5a8eff1725c2157e47 wagon-ssh-external-1.0_alpha4.ebuild 534 MD5 35a7319a63dfe03f915d274cd8b03959 files/digest-wagon-ssh-external-1.0_alpha4 143 diff --git a/dev-java/wagon-ssh/Manifest b/dev-java/wagon-ssh/Manifest index 6b63a1b9..974d3777 100644 --- a/dev-java/wagon-ssh/Manifest +++ b/dev-java/wagon-ssh/Manifest @@ -1,3 +1,2 @@ -MD5 1217f2d5864d5ee3c5c771a8316d3ae0 wagon-ssh-1.0_alpha4.ebuild 629 -MD5 086cee054e50c19d6de9d6033422cebc .wagon-ssh-1.0_alpha4.ebuild.swp 12288 +MD5 17eb56b56755f2be38b0a1bd842ff458 wagon-ssh-1.0_alpha4.ebuild 573 MD5 f3624ab03d45299fca3b369e8a13e033 files/digest-wagon-ssh-1.0_alpha4 134 diff --git a/dev-java/werken-xpath/Manifest b/dev-java/werken-xpath/Manifest index 36436d49..108cb2c1 100644 --- a/dev-java/werken-xpath/Manifest +++ b/dev-java/werken-xpath/Manifest @@ -1,4 +1,4 @@ -MD5 2ff30e922d3f0b26408221c80b0430b8 werken-xpath-0.9.4_beta.ebuild 1383 +MD5 5aae7bffa53c338f64f329292eea2cc7 werken-xpath-0.9.4_beta.ebuild 1416 MD5 72e762a216369d14fcf180a0229e03a5 files/werken-xpath-0.9.4_beta-jpp-tests.patch 353 MD5 28584ccbd78d4037e8b242d825e03f33 files/werken-xpath-0.9.4_beta-jpp-compile.patch 1189 MD5 e2a3cd20c9fb62710b171d6b9e179061 files/werken-xpath-0.9.4_beta-jpp-jdom.patch 3606 diff --git a/dev-java/werken-xpath/werken-xpath-0.9.4_beta.ebuild b/dev-java/werken-xpath/werken-xpath-0.9.4_beta.ebuild index 1b47a416..f7fd3006 100644 --- a/dev-java/werken-xpath/werken-xpath-0.9.4_beta.ebuild +++ b/dev-java/werken-xpath/werken-xpath-0.9.4_beta.ebuild @@ -5,12 +5,13 @@ inherit java-pkg eutils MY_PN=${PN//-/.} +# TODO make MY_PV more maintainable MY_PV="0.9.4-beta" MY_P="${MY_PN}-${MY_PV}" DESCRIPTION="W3C XPath-Rec implementation for DOM4J" HOMEPAGE="http://sourceforge.net/projects/werken-xpath/" -SRC_URI="http://www.scorec.rpi.edu/~nichoj/projects/java/${MY_P}-src.tar.gz" -#SRC_URI="mirror://gentoo/${MY_P}-src.tar.gz" +#SRC_URI="http://gentooexperimental.org/distfiles/${MY_P}-src.tar.gz" +SRC_URI="mirror://gentoo/${MY_P}-src.tar.gz" # This tarball was acquired from jpacckage's src rpm for the package of the same # name @@ -20,7 +21,7 @@ KEYWORDS="~x86" IUSE="doc jikes" DEPEND="virtual/jdk - dev-java/ant + dev-java/ant-core dev-java/antlr jikes? (dev-java/jikes)" RDEPEND="virtual/jre diff --git a/dev-java/werkz/Manifest b/dev-java/werkz/Manifest index eaa911c2..a17bcd7c 100644 --- a/dev-java/werkz/Manifest +++ b/dev-java/werkz/Manifest @@ -1,3 +1,3 @@ -MD5 b00f421a8eefd932a0107184f1bd6e63 werkz-1.0_beta4.ebuild 1398 +MD5 56784d2ec879ed6292e7180ce4d23bab werkz-1.0_beta4.ebuild 1418 MD5 d7ae696bd026a13cb042bb3ab3bb8f3b files/werkz-1.0_beta4-gentoo.patch 860 MD5 e0d177ca84d96cf3e1a938d1cb32511e files/digest-werkz-1.0_beta4 67 diff --git a/dev-java/werkz/werkz-1.0_beta4.ebuild b/dev-java/werkz/werkz-1.0_beta4.ebuild index 119fbd59..ff5c48d7 100644 --- a/dev-java/werkz/werkz-1.0_beta4.ebuild +++ b/dev-java/werkz/werkz-1.0_beta4.ebuild @@ -6,7 +6,7 @@ inherit java-pkg eutils DESCRIPTION="Goal-oriented process framework" HOMEPAGE="http://werkz.sourceforge.net/" -SRC_URI="mirror://gentoo/${P}.tar.bz2" +SRC_URI="http://gentooexperimental.org/distfiles/${P}.tar.bz2" # cvs -d :pserver:anonymous@cvs.werkz.codehaus.org:/home/projects/werkz/scm login # cvs -z3 -d :pserver:anonymous@cvs.werkz.codehaus.org:/home/projects/werkz/scm export -r WERKZ_MAVEN_1_0-BRANCH werkz # tar cjvf werkz-1.0_beta4.tar.bz2 werkz @@ -17,7 +17,7 @@ IUSE="doc jikes" LDEPEND="dev-java/commons-logging =dev-java/commons-jelly-1* - =dev-java/commons-jelly-tags-ant-1.0*" + =dev-java/commons-jelly-tags-ant-1*" DEPEND="virtual/jdk dev-java/ant-core dev-java/junit @@ -35,7 +35,7 @@ src_unpack() { cd ${S}/lib java-pkg_jar-from commons-logging java-pkg_jar-from commons-jelly-1 - java-pkg_jar-from commons-jelly-tags-ant-1.0 + java-pkg_jar-from commons-jelly-tags-ant-1 } src_compile() { diff --git a/dev-java/xapool/Manifest b/dev-java/xapool/Manifest index c11a0f23..92ff7407 100644 --- a/dev-java/xapool/Manifest +++ b/dev-java/xapool/Manifest @@ -1,4 +1,4 @@ -MD5 35345700b58293949698f7d890da251c xapool-1.5.0.ebuild 1535 +MD5 40fca3c7be7f95d6ef75b58640c41a17 xapool-1.5.0.ebuild 1540 MD5 b5515a766674c6f1d9955a285b167274 files/digest-xapool-1.5.0 66 MD5 a82d2d1471d5c0782b8a514e308fe04b files/xapool-1.5.0-no-instandb-no-oracle.patch 1468 MD5 8ecb1cec45f725c3097d548649f21dfe files/xapool-1.5.0-gentoo.patch 1852 diff --git a/dev-java/xapool/xapool-1.5.0.ebuild b/dev-java/xapool/xapool-1.5.0.ebuild index 6919a7c5..47de8576 100644 --- a/dev-java/xapool/xapool-1.5.0.ebuild +++ b/dev-java/xapool/xapool-1.5.0.ebuild @@ -15,7 +15,7 @@ KEYWORDS="~x86" IUSE="doc jikes" DEPEND="virtual/jdk - dev-java/ant + dev-java/ant-core jikes? (dev-java/jikes)" RDEPEND="virtual/jre =dev-java/carol-2.0* diff --git a/dev-java/xml-security/Manifest b/dev-java/xml-security/Manifest index 17cd6d04..6e541c43 100644 --- a/dev-java/xml-security/Manifest +++ b/dev-java/xml-security/Manifest @@ -1,2 +1,2 @@ -MD5 4c40866351bdd0d53e668fbbdb2c5806 xml-security-1.2.1.ebuild 2106 +MD5 0552f3533e4488cc05f354aa3bfc9592 xml-security-1.2.1.ebuild 2233 MD5 7183f893482c6a7c5586771182861b5b files/digest-xml-security-1.2.1 72 diff --git a/dev-java/xml-security/xml-security-1.2.1.ebuild b/dev-java/xml-security/xml-security-1.2.1.ebuild index 6713dc3a..af13b3ee 100644 --- a/dev-java/xml-security/xml-security-1.2.1.ebuild +++ b/dev-java/xml-security/xml-security-1.2.1.ebuild @@ -4,19 +4,23 @@ inherit java-pkg +# TODO use versionator MY_PV=${PV//./_} MY_P=${PN}-${MY_PV} +# TODO find a description. Doesn't seem to be any on website. DESCRIPTION="" HOMEPAGE="http://xml.apache.org/security/Java/index.html" SRC_URI="http://xml.apache.org/security/dist/java-library/xml-security-src-1_2_1.zip" LICENSE="Apache-2.0" -SLOT="0" +SLOT="1.2" KEYWORDS="~x86" IUSE="jikes doc" +# TODO check if junit is only needed at buildtime DEPEND=">=virtual/jdk-1.4 + dev-java/ant-core jikes? (dev-java/jikes) app-arch/unzip" RDEPEND=">=virtual/jre-1.4 @@ -41,7 +45,7 @@ S="${WORKDIR}/${MY_P}" src_unpack() { unpack ${A} - + cd ${S} echo lib.logging=`java-pkg_getjar ${COMMONS_LOGGING}` > build.properties @@ -63,9 +67,10 @@ src_compile() { } src_install() { - java-pkg_newjar build/xmlsec-${PV}.jar xmlsec.jar - java-pkg_newjar build/xmlsecSamples-${PV}.jar xmlsecSamples.jar - java-pkg_newjar build/xmlsecTests-${PV}.jar xmlsecTests.jar + # TODO install samples based on use flag + for jar in xmlsec xmlsecSamples xmlsecTests; do + java-pkg_newjar build/${jar}-${PV}.jar ${jar}.jar + done dodoc INSTALL KEYS NOTICE README TODO dohtml Readme.html diff --git a/distfiles/jboss-4.0.2-gentoo-r2.data b/distfiles/jboss-4.0.2-gentoo-r2.data new file mode 100644 index 00000000..41b3d14e --- /dev/null +++ b/distfiles/jboss-4.0.2-gentoo-r2.data @@ -0,0 +1,102 @@ +tools_lib_pkgs="ant-core,ant-tasks,bsf-2.3,buildmagic-tasks,xml-commons-resolver,xalan,xerces-2" + +thirdparty_apache_avalon_lib_pkgs="avalon-framework-4.1,avalon-logkit-1.2" +thirdparty_apache_bcel_lib_pkgs="bcel" +thirdparty_apache_commons_lib_pkgs="commons-codec,commons-collections,commons-digester,commons-discovery,commons-fileupload,commons-httpclient,commons-lang,commons-logging" +thirdparty_apache_jaxme_lib_pkgs="jaxme" +thirdparty_apache_log4j_lib_pkgs="log4j" +thirdparty_apache_slide_client_lib_pkgs="jakarta-slide-webdavclient" +thirdparty_apache_tomcat55_pkgs="tomcat-5.5,commons-el,commons-modeler" +thirdparty_apache_velocity_lib_pkgs="velocity-1" +thirdparty_apache_xalan_lib_pkgs="xalan,bsf-2.3" +thirdparty_apache_xerces_lib_pkgs="xml-commons-resolver,xerces-2,gnu-jaxp" +thirdparty_beanshell_beanshell_lib_pkgs="bsh" +thirdparty_dom4j_dom4j_lib_pkgs="dom4j-1,jaxen-1.1" +thirdparty_gjt_jpl_util_lib_pkgs="gjt-jpl-util,gjt-jpl-pattern" +thirdparty_gnu_regexp_lib_pkgs="gnu-regexp-1" +thirdparty_gnu_getopt_lib_pkgs="java-getopt-1 gnu.getopt.jar getopt.jar" +thirdparty_hsqldb_hsqldb_lib_pkgs="hsqldb" +thirdparty_ibm_wsdl4j_lib_pkgs="wsdl4j" +thirdparty_javagroups_javagroups_lib_pkgs="jgroups" +thirdparty_javassist_lib_pkgs="javassist-3.1" +thirdparty_jboss_aop_lib_pkgs="jboss-aop" +thirdparty_juddi_juddi_lib_pkgs="juddi" +thirdparty_junit_junit_lib_pkgs="junit" +thirdparty_opennms_joesnmp_lib_pkgs="joesnmp-0.3" +thirdparty_oswego_concurrent_lib_pkgs="concurrent-util" +thirdparty_wutka_dtdparser_lib_pkgs="dtdparser-1.21" +thirdparty_sleepycat_lib_pkgs="db-je" +thirdparty_sun_jaxp_lib_pkgs="crimson-1,gnu-jaxp,xalan" +thirdparty_sun_jaf_lib_pkgs="gnu-jaf-1" +thirdparty_sun_javamail_lib_pkgs="gnu-javamail-1" +thirdparty_sun_javacc_lib_pkgs="javacc" +thirdparty_sun_jmf_lib_pkgs="jmf-bin" +thirdparty_sun_jmx_lib_pkgs="mx4j-3.0" +thirdparty_sun_servlet_lib_pkgs="servletapi-2.4" +thirdparty_xml_sax_lib_pkgs="sax" +thirdparty_xdoclet_xdoclet_lib_pkgs="xdoclet,xjavadoc,commons-logging" +thirdparty_jfreechart_lib_pkgs="jcommon,jfreechart" +thirdparty_trove_lib_pkgs="trove" +thirdparty_hibernate_lib_pkgs="asm-1.5,hibernate-3" +thirdparty_odmg_lib_pkgs="odmg" +thirdparty_cglib_lib_pkgs="cglib-2.1" + +common_library_dirs="apache-commons/lib apache-jaxme/lib apache-log4j/lib apache-slide/client/lib apache-xalan/lib apache-xerces/lib dom4j-dom4j/lib gnu-regexp/lib oswego-concurrent/lib wutka-dtdparser/lib" +#common_library_dirs="apache-commons/lib apache-jaxme/lib apache-slide/client/lib apache-xalan/lib apache-xerces/lib dom4j-dom4j/lib gnu-regexp/lib oswego-concurrent/lib wutka-dtdparser/lib" +jmx_library_dirs="apache-bcel/lib apache-commons/lib apache-log4j/lib apache-xalan/lib dom4j-dom4j/lib gnu-regexp/lib junit-junit/lib oswego-concurrent/lib sun-jaxp/lib xml-sax/lib" +system_library_dirs="apache-commons/lib apache-log4j/lib dom4j-dom4j/lib gnu-getopt/lib junit-junit/lib oswego-concurrent/lib" +j2ee_library_dirs="sun-jaf/lib sun-servlet/lib" +deployment_library_dirs="dom4j-dom4j/lib" +jaxrpc_library_dirs="apache-commons/lib apache-log4j/lib apache-xerces/lib ibm-wsdl4j/lib sun-jaf/lib sun-javamail/lib sun-servlet/lib" +naming_library_dirs="apache-log4j/lib junit-junit/lib" +transaction_library_dirs="apache-commons/lib apache-log4j/lib oswego-concurrent/lib" +server_library_dirs="apache-log4j/lib apache-bcel/lib apache-commons/lib gjt-jpl-util/lib ibm-wsdl4j/lib oswego-concurrent/lib junit-junit/lib sun-javacc/lib sun-servlet/lib gnu-getopt/lib" +security_library_dirs="apache-log4j/lib dom4j-dom4j/lib junit-junit/lib hsqldb-hsqldb/lib sun-javacc/lib oswego-concurrent/lib" +connector_library_dirs="apache-log4j/lib apache-commons/lib oswego-concurrent/lib sun-javamail/lib" +# iiop needs jacorb-jacorb/lib too +iiop_library_dirs="apache-avalon/lib apache-log4j/lib junit-junit/lib oswego-concurrent/lib" +# jboss.net needs apache-addressing/lib and apache-wss4j/lib too +net_library_dirs="apache-commons/lib apache-log4j/lib dom4j-dom4j/lib ibm-wsdl4j/lib junit-junit/lib sun-jaf/lib sun-javamail/lib sun-servlet/lib" +media_library_dirs="apache-xalan/lib dom4j-dom4j/lib junit-junit/lib sun-jmf/lib" +messaging_library_dirs="apache-commons/lib apache-log4j/lib apache-xalan/lib junit-junit/lib gnu-regexp/lib oswego-concurrent/lib" +cluster_library_dirs="apache-commons/lib apache-log4j/lib javagroups-javagroups/lib oswego-concurrent/lib" +management_library_dirs="apache-commons/lib apache-log4j/lib" +remoting_library_dirs="apache-commons/lib apache-log4j/lib javagroups-javagroups/lib jboss-aop/lib junit-junit/lib oswego-concurrent/lib sun-jaxp/lib sun-jmx/lib" +# varia needs apache-scout/lib +varia_library_dirs="apache-commons/lib apache-log4j/lib apache-velocity/lib apache-xalan/lib beanshell-beanshell/lib gnu-regexp/lib hsqldb-hsqldb/lib javagroups-javagroups/lib opennms/joesnmp/lib sun-jaf/lib sun-javamail/lib sun-servlet/lib juddi-juddi/lib" +cache_library_dirs="apache-xalan/lib apache-log4j/lib gnu-regexp/lib junit-junit/lib javagroups-javagroups/lib oswego-concurrent/lib sleepycat/lib sun-jaxp/lib sun-jmx/lib xdoclet-xdoclet/lib" +jms_library_dirs="javassist/lib javagroups-javagroups/lib junit-junit/lib oswego-concurrent/lib" +jmx_remoting_library_dirs="apache-log4j/lib oswego-concurrent/lib" +tomcat_library_dirs="apache-commons/lib apache-tomcat55 dom4j-dom4j/lib javagroups-javagroups/lib junit-junit/lib oswego-concurrent/lib sun-servlet/lib" +console_library_dirs="gnu-getopt/lib apache-log4j/lib apache-commons/lib dom4j-dom4j/lib beanshell-beanshell/lib sun-servlet/lib jfreechart/lib trove/lib" +hibernate_library_dirs="apache-commons/lib apache-xalan/lib dom4j-dom4j/lib hibernate/lib odmg/lib cglib/lib" +webservice_library_dirs="apache-commons/lib apache-xerces/lib dom4j-dom4j/lib ibm-wsdl4j/lib sun-jaf/lib sun-javamail/lib sun-servlet/lib" + + +common_module_depends="" +jmx_module_depends="common" +system_module_depends="common jmx" +j2ee_module_depends="common" +deployment_module_depends="common j2ee jmx system" +jaxrpc_module_depends="common j2ee" +naming_module_depends="common" +transaction_module_depends="j2ee common system jmx" +server_module_depends="j2ee common system jmx naming transaction" +security_module_depends="j2ee common system naming server jmx" +connector_module_depends="common j2ee security server system jmx transaction" +iiop_module_depends="j2ee common system naming server jmx security transaction" +# actually jboss.net... didn't want to risk confusing the parser +net_module_depends="common j2ee jaxrpc jmx server security system" +media_module_depends="j2ee common system server jmx" +messaging_module_depends="j2ee common system naming server jmx security transaction" +cluster_module_depends="j2ee common system naming messaging server security jmx transaction" +management_module_depends="cluster common connector server system jmx j2ee" +remoting_module_depends="common j2ee jaxrpc naming jmx system transaction" +varia_module_depends="jaxrpc j2ee common cluster system jmx naming server security transaction messaging" +cache_module_depends="j2ee common system naming messaging server security jmx management transaction remoting" +jms_module_depends="common j2ee remoting jmx system" +jmx_remoting_module_depends="common jmx remoting" +tomcat_module_depends="j2ee system security server common jmx cluster cache connector" +console_module_depends="common jmx management server messaging system varia aop" +hibernate_module_depends="cache common jmx j2ee server system transaction" +webservice_module_depends="common j2ee jaxrpc remoting server system jmx" diff --git a/eclass/commons-jelly-tags.eclass b/eclass/commons-jelly-tags.eclass index 920e81f9..d01836d9 100644 --- a/eclass/commons-jelly-tags.eclass +++ b/eclass/commons-jelly-tags.eclass @@ -56,7 +56,7 @@ IUSE="doc jikes" LICENSE="" #SRC_URI="mirror://gentoo/${P}.tar.bz2 mirror://gentoo/commons-jelly-tags-1.0-gentoo.patch.bz2" -SRC_URI="http://www.scorec.rpi.edu/~nichoj/projects/java/${P}.tar.bz2 http://www.scorec.rpi.edu/~nichoj/projects/java/commons-jelly-tags-1.0-gentoo.patch.bz2" +SRC_URI="http://gentooexperimental.org/distfiles/${P}.tar.bz2 http://gentooexperimental.org/distfiles/commons-jelly-tags-1.0-gentoo.patch.bz2" EXPORT_FUNCTIONS src_unpack src_compile src_install src_test diff --git a/eclass/jboss-4.eclass b/eclass/jboss-4.eclass index b4011ca6..b71926a8 100644 --- a/eclass/jboss-4.eclass +++ b/eclass/jboss-4.eclass @@ -30,10 +30,10 @@ JBOSS_THIRDPARTY="${JBOSS_ROOT}/thirdparty" S="${JBOSS_ROOT}/${MODULE}" THIRDPARTY_P="jboss-thirdparty-${PV}-gentoo" -TOOLS_P="jboss-tools-${PV}-gentoo" +TOOLS_P="jboss-tools-${PV}-gentoo-r1" GENTOO_CONF="jboss-${PVR}-gentoo.data" -BASE_URL="http://www.scorec.rpi.edu/~nichoj/projects/java" -#BASE_URL="mirror://gentoo" +#BASE_URL="http://www.scorec.rpi.edu/~nichoj/projects/java" +BASE_URL="http://gentooexperimental.org/distfiles" ECLASS_URI="${BASE_URL}/${TOOLS_P}.tar.bz2 ${BASE_URL}/${THIRDPARTY_P}.tar.bz2 mirror://gentoo/${GENTOO_CONF}" MY_A="${P}-gentoo.tar.bz2 ${TOOLS_P}.tar.bz2 ${THIRDPARTY_P}.tar.bz2" @@ -145,13 +145,14 @@ jboss-4_fix-module() { mkdir -p ${dir} quiet_pushd ${dir} - java-pkg_jar-from ${pkg} + java-pkg_jar-from ${pkg} || die "Couldn't find a package.." local libdir="/usr/share/${pkg}/lib" for jar in ${libdir}/*.jar; do if [ -d "${jar}" ]; then ln -sf ${jar} fi done + # TODO: only perform this if there are actual files local servicedir="/usr/share/${pkg}/services" for sar in ${servicedir}/*.sar; do if [ -d "${sar}" ]; then @@ -169,6 +170,8 @@ jboss-4_src_unpack() { unpack ${MY_A} + mkdir -p ${JBOSS_THIRDPARTY}/sun-servlet/lib # workaround because something + # depends on this being around jboss-4_fix-dir tools/lib jboss-4_fix-thirdparty jboss-4_fix-modules @@ -178,7 +181,7 @@ jboss-4_src_compile() { debug-print-function ${FUNCNAME} $* cd ${S} - local antflags + local antflags="${ANT_TARGET:-jars}" use jikes && antflags="-Dbuild.compiler=jikes" ant ${antflags} || die "Build script failed" @@ -282,460 +285,460 @@ jboss-4_dosar() { ################################################# ################################################# ################################################# -jboss-4_fix-tools() { - debug-print-function "Fixing jars in ${JBOSS_ROOT}/tools/lib" - quiet_pushd ${JBOSS_ROOT}/tools/lib - java-pkg_jar-from ${ANT_JAVAMAIL} - java-pkg_jar-from ${ANT_JUNIT} - java-pkg_jar-from ${ANT_LAUNCHER} - java-pkg_jar-from ${ANT_NODEPS} - java-pkg_jar-from ${ANT_TRAX} - java-pkg_jar-from ${ANT_XSLP} - java-pkg_jar-from ${ANT} - java-pkg_jar-from ${BSF} - java-pkg_jar-from ${BUILDMAGIC_TASKS} - java-pkg_jar-from ${JUNIT} - java-pkg_jar-from ${RESOLVER} - java-pkg_jar-from ${XALAN} - java-pkg_jar-from ${XERCES_IMPL} - java-pkg_jar-from ${XML_APIS} - quiet_popd -} - -jboss-4_clean_jars() { - einfo "Removing jars from ${JBOSS_ROOT}" - find ${JBOSS_ROOT} -name *.jar -exec rm {} \; -} - -jboss-4_fix-apache-addressing() { - quiet_pushd ${JBOSS_THIRDPARTY}/apache-addressing/lib - quiet_popd -} - -jboss-4_fix-apache-avalon() { - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-avalon/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/apache-avalon/lib - java-pkg_jar-from ${AVALON_FRAMEWORK} - java-pkg_jar-from ${LOGKIT} - quiet_popd -} - -jboss-4_fix-apache-bcel() { - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-bcel/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/apache-bcel/lib - java-pkg_jar-from ${BCEL} - quiet_popd -} - -jboss-4_fix-apache-commons() { - # RDEPENDS: - # =dev-java/commons-beanutils-1.6* - # dev-java/commons-codec - # dev-java/commons-collections - # dev-java/commons-digester - # dev-java/commons-discovery - # dev-java/commons-fileupload - # dev-java/commons-httpclient - # dev-java/commons-lang - # dev-java/commons-logging - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-commons/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/apache-commons/lib - java-pkg_jar-from ${COMMONS_BEANUTILS} - java-pkg_jar-from ${COMMONS_CODEC} commons-codec-1.2.jar - java-pkg_jar-from ${COMMONS_COLLECTIONS} - java-pkg_jar-from ${COMMONS_DIGESTER} commons-digest-1.6.jar - java-pkg_jar-from ${COMMONS_DISCOVERY} - java-pkg_jar-from ${COMMONS_FILEUPLOAD} - java-pkg_jar-from ${COMMONS_HTTPCLIENT} - java-pkg_jar-from ${COMMONS_LANG} commons-lang-1.0.jar - java-pkg_jar-from ${COMMONS_LOGGING} - java-pkg_jar-from ${COMMONS_LOGGING_API} - quiet_popd -} - -jboss-4_fix-apache-jaxme() { - # bug #94432 - quiet_pushd ${JBOSS_THIRDPARTY}/apache-jaxme - quiet_popd -} - -jboss-4_fix-apache-log4j() { - # RDEPENDS: - # dev-java/log4j - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-log4j/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/apache-log4j/lib - java-pkg_jar-from ${LOG4J} - # TODO: replace snmpTrapAppender.jar - quiet_popd -} - -jboss-4_fix-apache-myfaces() { - # bug #94434 - quiet_pushd ${JBOSS_THIRDPARTY}/apache-myfaces/lib - quiet_popd -} - -jboss-4_fix-apache-scout() { - # bug #94460 - quiet_pushd ${thirdparty}/apache-scout/lib - quiet_popd -} - -jboss-4_fix-apache-slide() { - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-slide/client/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/apache-slide/client/lib - java-pkg_jar-from ${WEBDAVLIB} - quiet_popd -} - -jboss-4_fix-apache-tomcat-50() { - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-tomcat-50" - quiet_pushd ${JBOSS_THIRDPARTY}/apache-tomcat50 - java-pkg_jar-from ${TOMCAT5} - java-pkg_jar-from ${SERVLET24} - java-pkg_jar-from ${COMMONS_BEANUTILS} - java-pkg_jar-from ${COMMONS_COLLECTIONS} - java-pkg_jar-from ${COMMONS_EL} - java-pkg_jar-from ${COMMONS_DIGESTER} - java-pkg_jar-from ${COMMONS_LOGGING} - java-pkg_jar-from ${COMMONS_MODELER} - java-pkg_jar-from ${JAKARTA_REGEXP} - quiet_popd -} - -jboss-4_fix-apache-tomcat-55() { - # bug #75224 - quiet_pushd ${JBOSS_THIRDPARTY}/apache-tomcat-55 - quiet_popd -} - -jboss-4_fix-apache-velocity() { - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-velocity" - quiet_pushd ${JBOSS_THIRDPARTY} - java-pkg_jar-from ${VELOCITY} - quiet_popd -} - -jboss-4_fix-apache-xalan() { - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-xalan/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/apache-xalan/lib - java-pkg_jar-from ${XALAN} - quiet_popd -} - -jboss-4_fix-apache-xerces() { -# fix_dir ${JBOSS_THIRDPARTY}/apache-xerces/lib \ -# "${RESOLVER}" \ -# "${XERCES_IMPL}" \ -# "${XML_APIS}" - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-xerces/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/apache-xerces/lib - java-pkg_jar-from ${RESOLVER} - java-pkg_jar-from ${XERCES_IMPL} - java-pkg_jar-from ${XML_APIS} - quiet_popd -} - -jboss-4_fix-apache-xmlsec() { - # bug #94438 - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-xmlsec/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/apache-xmlsec/lib - java-pkg_jar-from ${XMLSEC} - quiet_popd -} - -jboss-4_fix-beanshell() { - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/beahshell-beanshell/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/beanshell-beanshell/lib - java-pkg_jar-from ${BSH} bsh-1.3.0.jar - quiet_popd -} - -jboss-4_fix-bouncycastle() { - # bug #944346 - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/bouncycastle/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/bouncycastle/lib - java-pkg_jar-from ${BCPROV} bcprov-jdk14-124.jar - quiet_popd -} -jboss-4_fix-cglib() { - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/cglib/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/cglib/lib - java-pkg_jar-from ${CGLIB} cglib-2.1.jar - quiet_popd -} - -jboss-4_fix-dom4j() { - # bug #63268 - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/dom4j-dom4j/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/dom4j-dom4j/lib - java-pkg_jar-from ${DOM4J} - java-pkg_jar-from ${JAXEN} jaxen-1.1-beta-4.jar - quiet_popd -} - -jboss-4_fix-eclipse-jdt() { - # bug #80526 - quiet_pushd ${JBOSS_THIRDPARTY}/eclipse-jdt/lib - quiet_popd -} - -jboss-4_fix-gjt-jpl-util() { - # bug #94439 - quiet_pushd ${JBOSS_THIRDPARTY}/gjt-jpl-util/lib - quiet_popd -} - -jboss-4_fix-gnu-getopt() { - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/gnu-getopt/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/gnu-getopt/lib - java-pkg_jar-from ${GNU_GETOPT} getopt.jar - quiet_popd -} - -jboss-4_fix-gnu-regexp() { - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/gnu-regexp/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/gnu-regexp/lib - java-pkg_jar-from ${GNU_REGEXP} - quiet_popd -} - -jboss-4_fix-hibernate() { - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/hibernate/lib" - # TODO: need a new hibernate ebuild, bug #91986 - quiet_pushd ${JBOSS_THIRDPARTY}/hibernate/lib - java-pkg_jar-from ${ANTLR} - java-pkg_jar-from ${ASM_ATTRS} - java-pkg_jar-from ${ASM} - #java-pkg_jar-from ${HIBERNATE3} - #java-pkg_jar-from ${HIBERNATE_METADATA} - quiet_popd -} - -jboss-4_fix-hsqldb() { - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/hsqldb-hsqldb/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/hsqldb-hsqldb/lib - java-pkg_jar-from ${HSQLDB} - quiet_popd -} - -jboss-4_fix-ibm-wsdl4j() { - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/ibm-wsdl4j/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/ibm-wsdl4j/lib - java-pkg_jar-from ${WSDL4J} - quiet_popd -} - -jboss-4_fix-jacorb() { - # Not in portage yet, bug #93396 - # TODO: where are jacorb_g.jar and idl_g.jar from?? - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/jacorb-jacorb/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/jacorb-jacorb/lib - java-pkg_jar-from ${JACORB} - java-pkg_jar-from ${IDL} - quiet_popd - -} - -jboss-4_fix-javagroups() { - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/javagroups-javagroups/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/javagroups-javagroups/lib - java-pkg_jar-from ${JGROUPS} - quiet_popd -} - -jboss-4_fix-javassist() { - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/javassist-javassist" - quiet_pushd ${JBOSS_THIRDPARTY}/javassist/lib - java-pkg_jar-from ${JAVASSIST} - quiet_popd -} - -jboss-4_fix-jfreechart() { - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/jfreechart-jfreechart/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/jfreechart/lib - # jfreechart.jar may be patched! - #java-pkg_jar-from ${JFREECHART} - java-pkg_jar-from ${JCOMMON} - quiet_popd -} - -jboss-4_fix-juddi() { - # bug #94441 - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/juddi-juddi/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/juddi-juddi/lib - java-pkg_jar-from ${JUDDI} - # TODO replace war file - quiet_popd -} - -jboss-4_fix-junit() { - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/junit-junit/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/junit-junit/lib - java-pkg_jar-from ${JUNIT} - quiet_popd -} - -jboss-4_fix-junitejb() { - # bug #94442 - quiet_pushd ${JBOSS_THIRDPARTY}/junitejb/junitejb/lib - quiet_popd -} - -jboss-4_fix-odmg() { - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/odmg/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/odmg/lib - java-pkg_jar-from ${ODMG} - quiet_popd -} - -jboss-4_fix-opensaml() { - # bug #94428 - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/opensaml/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/opensaml/lib - java-pkg_jar-from ${OPENSAML} - quiet_popd -} - -jboss-4_fix-opennms() { - # bug #94426 - quiet_pushd ${JBOSS_THIRDPARTY}/opennms/lib - quiet_popd -} - -jboss-4_fix-oswego-concurrent() { - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/oswego-concurrent/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/oswego-concurrent/lib - java-pkg_jar-from ${CONCURRENT} - quiet_popd -} - -jboss-4_fix-qdox() { - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/qdox/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/qdox/lib - java-pkg_jar-from ${QDOX} - quiet_popd -} - -jboss-4_fix-sleepycat() { - # bug #94430 - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/sleepycat/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/sleepycat/lib - java-pkg_jar-from ${JE} - quiet_popd -} - -jboss-4_fix-sun-jaf() { - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/sun-jaf/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/sun-jaf/lib - java-pkg_jar-from ${ACTIVATION} - quiet_popd -} - -jboss-4_fix-sun-javacc() { - # I don't think our packaged javacc.jar is a drop in replacement for - # JavaCC.zip - #einfo "Fixing jars in thirdparty/sun/javacc/lib" - quiet_pushd ${thirdparty}/sun/javacc/lib - #java-pkg_jar-from javacc javacc.jar JavaCC.zip - quiet_popd -} - -jboss-4_fix-sun-javamail() { - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/sun-javamail/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/sun-javamail/lib - java-pkg_jar-from ${IMAP} - java-pkg_jar-from ${MAIL} - java-pkg_jar-from ${MAILAPI} - java-pkg_jar-from ${POP3} - java-pkg_jar-from ${SMTP} - quiet_popd -} - -jboss-4_fix-sun-jaxp() { - quiet_pushd ${JBOSS_THIRDPARTY}/sun-jaxp/lib - quiet_popd -} - -jboss-4_fix-sun-jmf() { - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/sun-jmf/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/sun-jmf/lib - java-pkg_jar-from ${JMF} - quiet_popd -} - -jboss-4_fix-sun-jmx() { - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/sun-jmx/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/sun-jmx/lib - java-pkg_jar-from ${JMXRI} - java-pkg_jar-from ${JMXTOOLS} - # TODO: need to replace jmxgrinder.jar - quiet_popd -} - -jboss-4_fix-sun-servlet() { - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/sun-servlet/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/sun-servlet/lib - java-pkg_jar-from ${SERVLET24} - quiet_popd -} - -jboss-4_fix-trove() { - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/trove/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/trove/lib - java-pkg_jar-from ${TROVE} - quiet_popd -} - -jboss-4_fix-wukta-dtdparser() { - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/wutka-dtdparser/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/wutka-dtdparser/lib - java-pkg_jar-from ${DTDPARSER} - quiet_popd -} - -jboss-4_fix-xdoclet() { - # I suspect that these are patched by jboss... - #einfo "Fixing jars in xdoclet-xdoclet/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/xdoclet/xdoclet/lib - #java-pkg_jar-from ${COMMONS_LOGGING} - #java-pkg_jar-from ${XDOCLET} - #java-pkg_jar-from ${XDOCLET_BEA} - #java-pkg_jar-from ${XDOCLET_EJB} - #java-pkg_jar-from ${XDOCLET_JAVA} - #java-pkg_jar-from ${XDOCLET_JBOSS} - #java-pkg_jar-from ${XDOCLET_JDO} - #java-pkg_jar-from ${XDOCLET_JMX} - #java-pkg_jar-from ${XDOCLET_WEB} - #java-pkg_jar-from ${XDOCLET_XDOCLET} - #java-pkg_jar-from ${XJAVADOC} - quiet_popd -} - -jboss-4_fix-xml-sax() { - einfo "Fixing jars in ${JBOSS_THIRDPARTY}/xml-sax/lib" - quiet_pushd ${JBOSS_THIRDPARTY}/xml-sax/lib - java-pkg_jar-from ${SAX} - quiet_popd -} - -jboss-4_fix-jboss-common() { - einfo "Populating ${JBOSS_ROOT}/common/output/lib" - mkdir -p ${JBOSS_ROOT}/common/output/lib - quiet_pushd ${JBOSS_ROOT}/common/output/lib - java-pkg_jar-from ${JBOSS_COMMON} - quiet_popd -} - -jboss-4_fix-jboss-jmx() { - einfo "Populating ${JBOSS_ROOT}/jmx/output/lib" - mkdir -p ${JBOSS_ROOT}/jmx/output/lib - quiet_pushd ${JBOSS_ROOT}/jmx/output/lib - java-pkg_jar-from ${JBOSS_JMX} - quiet_popd -} +#jboss-4_fix-tools() { +# debug-print-function "Fixing jars in ${JBOSS_ROOT}/tools/lib" +# quiet_pushd ${JBOSS_ROOT}/tools/lib +# java-pkg_jar-from ${ANT_JAVAMAIL} +# java-pkg_jar-from ${ANT_JUNIT} +# java-pkg_jar-from ${ANT_LAUNCHER} +# java-pkg_jar-from ${ANT_NODEPS} +# java-pkg_jar-from ${ANT_TRAX} +# java-pkg_jar-from ${ANT_XSLP} +# java-pkg_jar-from ${ANT} +# java-pkg_jar-from ${BSF} +# java-pkg_jar-from ${BUILDMAGIC_TASKS} +# java-pkg_jar-from ${JUNIT} +# java-pkg_jar-from ${RESOLVER} +# java-pkg_jar-from ${XALAN} +# java-pkg_jar-from ${XERCES_IMPL} +# java-pkg_jar-from ${XML_APIS} +# quiet_popd +#} +# +#jboss-4_clean_jars() { +# einfo "Removing jars from ${JBOSS_ROOT}" +# find ${JBOSS_ROOT} -name *.jar -exec rm {} \; +#} +# +#jboss-4_fix-apache-addressing() { +# quiet_pushd ${JBOSS_THIRDPARTY}/apache-addressing/lib +# quiet_popd +#} +# +#jboss-4_fix-apache-avalon() { +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-avalon/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/apache-avalon/lib +# java-pkg_jar-from ${AVALON_FRAMEWORK} +# java-pkg_jar-from ${LOGKIT} +# quiet_popd +#} +# +#jboss-4_fix-apache-bcel() { +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-bcel/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/apache-bcel/lib +# java-pkg_jar-from ${BCEL} +# quiet_popd +#} -#fix_dir() { +#jboss-4_fix-apache-commons() { +# # RDEPENDS: +# # =dev-java/commons-beanutils-1.6* +# # dev-java/commons-codec +# # dev-java/commons-collections +# # dev-java/commons-digester +# # dev-java/commons-discovery +# # dev-java/commons-fileupload +# # dev-java/commons-httpclient +# # dev-java/commons-lang +# # dev-java/commons-logging +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-commons/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/apache-commons/lib +# java-pkg_jar-from ${COMMONS_BEANUTILS} +# java-pkg_jar-from ${COMMONS_CODEC} commons-codec-1.2.jar +# java-pkg_jar-from ${COMMONS_COLLECTIONS} +# java-pkg_jar-from ${COMMONS_DIGESTER} commons-digest-1.6.jar +# java-pkg_jar-from ${COMMONS_DISCOVERY} +# java-pkg_jar-from ${COMMONS_FILEUPLOAD} +# java-pkg_jar-from ${COMMONS_HTTPCLIENT} +# java-pkg_jar-from ${COMMONS_LANG} commons-lang-1.0.jar +# java-pkg_jar-from ${COMMONS_LOGGING} +# java-pkg_jar-from ${COMMONS_LOGGING_API} +# quiet_popd +#} +# +#jboss-4_fix-apache-jaxme() { +# # bug #94432 +# quiet_pushd ${JBOSS_THIRDPARTY}/apache-jaxme +# quiet_popd +#} +# +#jboss-4_fix-apache-log4j() { +# # RDEPENDS: +# # dev-java/log4j +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-log4j/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/apache-log4j/lib +# java-pkg_jar-from ${LOG4J} +# # TODO: replace snmpTrapAppender.jar +# quiet_popd +#} +# +#jboss-4_fix-apache-myfaces() { +# # bug #94434 +# quiet_pushd ${JBOSS_THIRDPARTY}/apache-myfaces/lib +# quiet_popd +#} +# +#jboss-4_fix-apache-scout() { +# # bug #94460 +# quiet_pushd ${thirdparty}/apache-scout/lib +# quiet_popd +#} +# +#jboss-4_fix-apache-slide() { +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-slide/client/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/apache-slide/client/lib +# java-pkg_jar-from ${WEBDAVLIB} +# quiet_popd +#} +# +#jboss-4_fix-apache-tomcat-50() { +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-tomcat-50" +# quiet_pushd ${JBOSS_THIRDPARTY}/apache-tomcat50 +# java-pkg_jar-from ${TOMCAT5} +# java-pkg_jar-from ${SERVLET24} +# java-pkg_jar-from ${COMMONS_BEANUTILS} +# java-pkg_jar-from ${COMMONS_COLLECTIONS} +# java-pkg_jar-from ${COMMONS_EL} +# java-pkg_jar-from ${COMMONS_DIGESTER} +# java-pkg_jar-from ${COMMONS_LOGGING} +# java-pkg_jar-from ${COMMONS_MODELER} +# java-pkg_jar-from ${JAKARTA_REGEXP} +# quiet_popd +#} +# +#jboss-4_fix-apache-tomcat-55() { +# # bug #75224 +# quiet_pushd ${JBOSS_THIRDPARTY}/apache-tomcat-55 +# quiet_popd +#} +# +#jboss-4_fix-apache-velocity() { +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-velocity" +# quiet_pushd ${JBOSS_THIRDPARTY} +# java-pkg_jar-from ${VELOCITY} +# quiet_popd +#} +# +#jboss-4_fix-apache-xalan() { +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-xalan/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/apache-xalan/lib +# java-pkg_jar-from ${XALAN} +# quiet_popd +#} +# +#jboss-4_fix-apache-xerces() { +## fix_dir ${JBOSS_THIRDPARTY}/apache-xerces/lib \ +## "${RESOLVER}" \ +## "${XERCES_IMPL}" \ +## "${XML_APIS}" +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-xerces/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/apache-xerces/lib +# java-pkg_jar-from ${RESOLVER} +# java-pkg_jar-from ${XERCES_IMPL} +# java-pkg_jar-from ${XML_APIS} +# quiet_popd +#} +# +#jboss-4_fix-apache-xmlsec() { +# # bug #94438 +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/apache-xmlsec/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/apache-xmlsec/lib +# java-pkg_jar-from ${XMLSEC} +# quiet_popd +#} +# +#jboss-4_fix-beanshell() { +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/beahshell-beanshell/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/beanshell-beanshell/lib +# java-pkg_jar-from ${BSH} bsh-1.3.0.jar +# quiet_popd +#} +# +#jboss-4_fix-bouncycastle() { +# # bug #944346 +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/bouncycastle/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/bouncycastle/lib +# java-pkg_jar-from ${BCPROV} bcprov-jdk14-124.jar +# quiet_popd +#} +#jboss-4_fix-cglib() { +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/cglib/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/cglib/lib +# java-pkg_jar-from ${CGLIB} cglib-2.1.jar +# quiet_popd +#} +# +#jboss-4_fix-dom4j() { +# # bug #63268 +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/dom4j-dom4j/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/dom4j-dom4j/lib +# java-pkg_jar-from ${DOM4J} +# java-pkg_jar-from ${JAXEN} jaxen-1.1-beta-4.jar +# quiet_popd +#} +# +#jboss-4_fix-eclipse-jdt() { +# # bug #80526 +# quiet_pushd ${JBOSS_THIRDPARTY}/eclipse-jdt/lib +# quiet_popd +#} +# +#jboss-4_fix-gjt-jpl-util() { +# # bug #94439 +# quiet_pushd ${JBOSS_THIRDPARTY}/gjt-jpl-util/lib +# quiet_popd +#} +# +#jboss-4_fix-gnu-getopt() { +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/gnu-getopt/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/gnu-getopt/lib +# java-pkg_jar-from ${GNU_GETOPT} getopt.jar +# quiet_popd +#} +# +#jboss-4_fix-gnu-regexp() { +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/gnu-regexp/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/gnu-regexp/lib +# java-pkg_jar-from ${GNU_REGEXP} +# quiet_popd +#} +# +#jboss-4_fix-hibernate() { +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/hibernate/lib" +# # TODO: need a new hibernate ebuild, bug #91986 +# quiet_pushd ${JBOSS_THIRDPARTY}/hibernate/lib +# java-pkg_jar-from ${ANTLR} +# java-pkg_jar-from ${ASM_ATTRS} +# java-pkg_jar-from ${ASM} +# #java-pkg_jar-from ${HIBERNATE3} +# #java-pkg_jar-from ${HIBERNATE_METADATA} +# quiet_popd +#} +# +#jboss-4_fix-hsqldb() { +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/hsqldb-hsqldb/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/hsqldb-hsqldb/lib +# java-pkg_jar-from ${HSQLDB} +# quiet_popd +#} +# +#jboss-4_fix-ibm-wsdl4j() { +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/ibm-wsdl4j/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/ibm-wsdl4j/lib +# java-pkg_jar-from ${WSDL4J} +# quiet_popd +#} +# +#jboss-4_fix-jacorb() { +# # Not in portage yet, bug #93396 +# # TODO: where are jacorb_g.jar and idl_g.jar from?? +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/jacorb-jacorb/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/jacorb-jacorb/lib +# java-pkg_jar-from ${JACORB} +# java-pkg_jar-from ${IDL} +# quiet_popd +# +#} +# +#jboss-4_fix-javagroups() { +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/javagroups-javagroups/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/javagroups-javagroups/lib +# java-pkg_jar-from ${JGROUPS} +# quiet_popd +#} +# +#jboss-4_fix-javassist() { +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/javassist-javassist" +# quiet_pushd ${JBOSS_THIRDPARTY}/javassist/lib +# java-pkg_jar-from ${JAVASSIST} +# quiet_popd +#} +# +#jboss-4_fix-jfreechart() { +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/jfreechart-jfreechart/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/jfreechart/lib +# # jfreechart.jar may be patched! +# #java-pkg_jar-from ${JFREECHART} +# java-pkg_jar-from ${JCOMMON} +# quiet_popd +#} +# +#jboss-4_fix-juddi() { +# # bug #94441 +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/juddi-juddi/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/juddi-juddi/lib +# java-pkg_jar-from ${JUDDI} +# # TODO replace war file +# quiet_popd +#} +# +#jboss-4_fix-junit() { +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/junit-junit/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/junit-junit/lib +# java-pkg_jar-from ${JUNIT} +# quiet_popd +#} +# +#jboss-4_fix-junitejb() { +# # bug #94442 +# quiet_pushd ${JBOSS_THIRDPARTY}/junitejb/junitejb/lib +# quiet_popd +#} +# +#jboss-4_fix-odmg() { +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/odmg/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/odmg/lib +# java-pkg_jar-from ${ODMG} +# quiet_popd +#} +# +#jboss-4_fix-opensaml() { +# # bug #94428 +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/opensaml/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/opensaml/lib +# java-pkg_jar-from ${OPENSAML} +# quiet_popd +#} +# +#jboss-4_fix-opennms() { +# # bug #94426 +# quiet_pushd ${JBOSS_THIRDPARTY}/opennms/lib +# quiet_popd +#} +# +#jboss-4_fix-oswego-concurrent() { +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/oswego-concurrent/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/oswego-concurrent/lib +# java-pkg_jar-from ${CONCURRENT} +# quiet_popd +#} +# +#jboss-4_fix-qdox() { +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/qdox/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/qdox/lib +# java-pkg_jar-from ${QDOX} +# quiet_popd +#} +# +#jboss-4_fix-sleepycat() { +# # bug #94430 +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/sleepycat/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/sleepycat/lib +# java-pkg_jar-from ${JE} +# quiet_popd +#} +# +#jboss-4_fix-sun-jaf() { +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/sun-jaf/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/sun-jaf/lib +# java-pkg_jar-from ${ACTIVATION} +# quiet_popd +#} +# +#jboss-4_fix-sun-javacc() { +# # I don't think our packaged javacc.jar is a drop in replacement for +# # JavaCC.zip +# #einfo "Fixing jars in thirdparty/sun/javacc/lib" +# quiet_pushd ${thirdparty}/sun/javacc/lib +# #java-pkg_jar-from javacc javacc.jar JavaCC.zip +# quiet_popd +#} +# +#jboss-4_fix-sun-javamail() { +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/sun-javamail/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/sun-javamail/lib +# java-pkg_jar-from ${IMAP} +# java-pkg_jar-from ${MAIL} +# java-pkg_jar-from ${MAILAPI} +# java-pkg_jar-from ${POP3} +# java-pkg_jar-from ${SMTP} +# quiet_popd +#} +# +#jboss-4_fix-sun-jaxp() { +# quiet_pushd ${JBOSS_THIRDPARTY}/sun-jaxp/lib +# quiet_popd +#} +# +#jboss-4_fix-sun-jmf() { +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/sun-jmf/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/sun-jmf/lib +# java-pkg_jar-from ${JMF} +# quiet_popd +#} +# +#jboss-4_fix-sun-jmx() { +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/sun-jmx/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/sun-jmx/lib +# java-pkg_jar-from ${JMXRI} +# java-pkg_jar-from ${JMXTOOLS} +# # TODO: need to replace jmxgrinder.jar +# quiet_popd +#} +# +#jboss-4_fix-sun-servlet() { +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/sun-servlet/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/sun-servlet/lib +# java-pkg_jar-from ${SERVLET24} +# quiet_popd +#} +# +#jboss-4_fix-trove() { +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/trove/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/trove/lib +# java-pkg_jar-from ${TROVE} +# quiet_popd +#} +# +#jboss-4_fix-wukta-dtdparser() { +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/wutka-dtdparser/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/wutka-dtdparser/lib +# java-pkg_jar-from ${DTDPARSER} +# quiet_popd +#} +# +#jboss-4_fix-xdoclet() { +# # I suspect that these are patched by jboss... +# #einfo "Fixing jars in xdoclet-xdoclet/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/xdoclet/xdoclet/lib +# #java-pkg_jar-from ${COMMONS_LOGGING} +# #java-pkg_jar-from ${XDOCLET} +# #java-pkg_jar-from ${XDOCLET_BEA} +# #java-pkg_jar-from ${XDOCLET_EJB} +# #java-pkg_jar-from ${XDOCLET_JAVA} +# #java-pkg_jar-from ${XDOCLET_JBOSS} +# #java-pkg_jar-from ${XDOCLET_JDO} +# #java-pkg_jar-from ${XDOCLET_JMX} +# #java-pkg_jar-from ${XDOCLET_WEB} +# #java-pkg_jar-from ${XDOCLET_XDOCLET} +# #java-pkg_jar-from ${XJAVADOC} +# quiet_popd +#} +# +#jboss-4_fix-xml-sax() { +# einfo "Fixing jars in ${JBOSS_THIRDPARTY}/xml-sax/lib" +# quiet_pushd ${JBOSS_THIRDPARTY}/xml-sax/lib +# java-pkg_jar-from ${SAX} +# quiet_popd +#} +# +#jboss-4_fix-jboss-common() { +# einfo "Populating ${JBOSS_ROOT}/common/output/lib" +# mkdir -p ${JBOSS_ROOT}/common/output/lib +# quiet_pushd ${JBOSS_ROOT}/common/output/lib +# java-pkg_jar-from ${JBOSS_COMMON} +# quiet_popd +#} +# +#jboss-4_fix-jboss-jmx() { +# einfo "Populating ${JBOSS_ROOT}/jmx/output/lib" +# mkdir -p ${JBOSS_ROOT}/jmx/output/lib +# quiet_pushd ${JBOSS_ROOT}/jmx/output/lib +# java-pkg_jar-from ${JBOSS_JMX} +# quiet_popd +#} +# +##fix_dir() { # local target_dir=${1}; # local jar_from_commands=${@##${1}} # all arguments, except the first # diff --git a/eclass/wagon.eclass b/eclass/wagon.eclass index b3d9155b..9c2b31b7 100644 --- a/eclass/wagon.eclass +++ b/eclass/wagon.eclass @@ -15,7 +15,7 @@ HOMEPAGE="" MY_PV="${PV/_alpha/-alpha-}" MY_P="${PN}-${MY_PV}" S="${WORKDIR}/${MY_P}" -SRC_URI="mirror://gentoo/${MY_P}.tar.bz2 mirror://gentoo/build-wagon.xml.bz2" +SRC_URI="http://gentooexperimental.org/distfiles/${MY_P}.tar.bz2 http://gentooexperimental.org/distfiles/build-wagon.xml.bz2" DEPEND="virtual/jdk dev-java/ant-core" diff --git a/licenses/INRIA b/licenses/INRIA new file mode 100644 index 00000000..320def32 --- /dev/null +++ b/licenses/INRIA @@ -0,0 +1,35 @@ +/********************************************************************* + * This Software is copyright INRIA. 1997. + * + * INRIA holds all the ownership rights on the Software. The scientific + * community is asked to use the SOFTWARE in order to test and evaluate + * it. + * + * INRIA freely grants the right to use the Software. Any use or + * reproduction of this Software to obtain profit or for commercial ends + * being subject to obtaining the prior express authorization of INRIA. + * + * INRIA authorizes any reproduction of this Software + * + * - in limits defined in clauses 9 and 10 of the Berne agreement for + * the protection of literary and artistic works respectively specify in + * their paragraphs 2 and 3 authorizing only the reproduction and quoting + * of works on the condition that : + * + * - "this reproduction does not adversely affect the normal + * exploitation of the work or cause any unjustified prejudice to the + * legitimate interests of the author". + * + * - that the quotations given by way of illustration and/or tuition + * conform to the proper uses and that it mentions the source and name of + * the author if this name features in the source", + * + * - under the condition that this file is included with any reproduction. + * + * Any commercial use made without obtaining the prior express agreement + * of INRIA would therefore constitute a fraudulent imitation. + * + * The Software being currently developed, INRIA is assuming no + * liability, and should not be responsible, in any manner or any case, + * for any direct or indirect damages sustained by the user. + *********************************************************************/ diff --git a/licenses/notes.txt b/licenses/notes.txt deleted file mode 100644 index 9a491bea..00000000 --- a/licenses/notes.txt +++ /dev/null @@ -1,3 +0,0 @@ -All the licenses for mdr have the same principle. -Everyone of them permits redistribution. -Besides these we also need spl of course. diff --git a/profiles/package.mask b/profiles/package.mask new file mode 100644 index 00000000..d9ff6b0e --- /dev/null +++ b/profiles/package.mask @@ -0,0 +1,17 @@ +##################################################################### +# $Header: $ +# When you add an entry to this file, add your name, the date, and an +# explanation of why something is getting masked +# +# NOTE: Please add your entry at the top! +# + +# Joshua Nichols <nichoj@alum.rpi.edu> (26 Aug 2005) +# Place-holder ebuilds for tapestry. +dev-java/tapestry +dev-java/hivemind + + +# Joshua Nichols <nichoj@alum.rpi.edu> (05 Sept 2005) +# Hessian 3.0.13 wants Java 1.5 +>=dev-java/hessian-3.0.13 diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest index e0dbc968..3efced58 100644 --- a/sys-libs/db/Manifest +++ b/sys-libs/db/Manifest @@ -9,6 +9,7 @@ MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r11 61 MD5 fee87f3b3eb96ac9a15f44aa5ff1c08c files/db-4.3-libtool.patch 2161 MD5 0101200dac8a9299fc1578081ac72b71 files/db-4.0.14-jarlocation.patch 565 MD5 eb9b0f2c1d8440c6c49fc1d916c2dc0e files/db-4.0.14-fix-dep-link.patch 1119 +MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r5 118 MD5 b1df069d8d9a974fe864e681dc165cfc files/db-4.3-jarlocation.patch 599 MD5 72688c24d0217c7e214b816417d8ef97 files/db-4.3.27-fix-dep-link.patch 1179 MD5 194200b3295b95b46b4564980af27f1f files/db-3.2.9-fix-dep-link.patch 1005 diff --git a/sys-libs/db/files/digest-db-4.1.25_p1-r5 b/sys-libs/db/files/digest-db-4.1.25_p1-r5 new file mode 100644 index 00000000..4f81c12b --- /dev/null +++ b/sys-libs/db/files/digest-db-4.1.25_p1-r5 @@ -0,0 +1,2 @@ +MD5 df71961002b552c0e72c6e4e358f27e1 db-4.1.25.tar.gz 3080234 +MD5 1e073d12cd89f9345e281ca07368f74b patch.4.1.25.1 610 diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 505b7743..54047dfb 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -1,5 +1,5 @@ MD5 b1b082a9d71411ae91913bd9afe99c9f tomcat-5.0.27-r4.ebuild 3716 -MD5 6d5700af86e461652bcfe0d326e71544 tomcat-5.5.9.ebuild 9758 +MD5 35a2e8324b21228101d6921a9273ab63 tomcat-5.5.9.ebuild 9790 MD5 b8bdcdd27b76556b90401621fc29996c tomcat-4.1.30-r5.ebuild 3614 MD5 257ce52cfc15f63798cb7b13ee761cb4 tomcat-3.3.2-r2.ebuild 3217 MD5 bd83fcedaedc2fbc6bcc8493bfc3f4f6 tomcat-5.0.28-r4.ebuild 9481 diff --git a/www-servers/tomcat/tomcat-5.5.9.ebuild b/www-servers/tomcat/tomcat-5.5.9.ebuild index 08fc121b..7e2ca2bf 100644 --- a/www-servers/tomcat/tomcat-5.5.9.ebuild +++ b/www-servers/tomcat/tomcat-5.5.9.ebuild @@ -31,16 +31,16 @@ RDEPEND=">=virtual/jdk-1.4 >=dev-java/commons-pool-1.2 ~dev-java/jaxen-1.0 >=dev-java/junit-3.8.1 - dev-java/jmx + =dev-java/mx4j-2.1* >=dev-java/log4j-1.2.8 >=dev-java/jakarta-regexp-1.3 >=dev-java/saxpath-1.0 ~dev-java/servletapi-2.4 =dev-java/struts-1.1* - dev-java/sun-jaf-bin + =dev-java/gnu-jaf-1* >=dev-java/xerces-2.6.2-r1 jikes? ( dev-java/jikes )" -IUSE="examples jikes" +IUSE="doc examples jikes" S=${WORKDIR}/jakarta-${P}-src @@ -64,7 +64,7 @@ src_unpack() { mkdir ./bin && cd ./bin java-pkg_jar-from commons-logging commons-logging-api.jar - java-pkg_jar-from jmx jmxri.jar jmx.jar + java-pkg_jar-from mx4j-2.1 mx4j.jar jmx.jar java-pkg_jar-from commons-daemon mkdir ../common/endorsed && cd ../common/endorsed @@ -91,7 +91,7 @@ src_compile(){ local antflags="-Dbase.path=${T}" use jikes && antflags="${antflags} -Dbuild.compiler=jikes" - antflags="${antflags} -Dactivation.jar=$(java-config -p sun-jaf-bin)" + antflags="${antflags} -Dactivation.jar=$(java-config -p gnu-jaf-1)" antflags="${antflags} -Dcommons-collections.jar=$(java-config -p commons-collections)" antflags="${antflags} -Dcommons-daemon.jar=$(java-config -p commons-daemon)" antflags="${antflags} -Dcommons-digester.jar=$(java-config -p commons-digester)" @@ -106,13 +106,13 @@ src_compile(){ antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-jdtcore-3.0 jdtcore.jar)" antflags="${antflags} -Dlog4j.jar=$(java-config -p log4j)" antflags="${antflags} -Dregexp.jar=$(java-config -p jakarta-regexp-1.3)" - antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts struts.jar)" + antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts-1.1 struts.jar)" antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)" antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)" antflags="${antflags} -Djaxen.jar=$(java-pkg_getjar jaxen jaxen-full.jar)" - antflags="${antflags} -Djmx.jar=$(java-pkg_getjar jmx jmxri.jar)" - antflags="${antflags} -Djmx-tools.jar=$(java-pkg_getjar jmx jmxtools.jar)" + antflags="${antflags} -Djmx.jar=$(java-pkg_getjar mx4j-2.1 mx4j.jar)" + antflags="${antflags} -Djmx-tools.jar=$(java-pkg_getjar mx4j-2.1 mx4j-tools.jar)" antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)" antflags="${antflags} -DxercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)" antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xerces-2 xml-apis.jar)" @@ -191,7 +191,7 @@ src_install() { # replace a packed struts.jar cd server/webapps/admin/WEB-INF/lib rm -f struts.jar - java-pkg_jar-from struts struts.jar + java-pkg_jar-from struts-1.1 struts.jar cd ${base} # replace the default pw with a random one, see #92281 |