diff options
author | Thomas Matthijs <axxo@gentoo.org> | 2005-07-09 16:07:45 +0000 |
---|---|---|
committer | Thomas Matthijs <axxo@gentoo.org> | 2005-07-09 16:07:45 +0000 |
commit | ffa16e59901c8d274ea1b4254d67a5129a9db349 (patch) | |
tree | 4febb1a3d38c04378857df788ba5c63eefbffa94 | |
parent | fix deps, small cleanup (diff) | |
download | historical-ffa16e59901c8d274ea1b4254d67a5129a9db349.tar.gz historical-ffa16e59901c8d274ea1b4254d67a5129a9db349.tar.bz2 historical-ffa16e59901c8d274ea1b4254d67a5129a9db349.zip |
fix deps, and source useflag support, small cleanup
Package-Manager: portage-2.0.51.22-r1
-rw-r--r-- | dev-java/jzlib/ChangeLog | 5 | ||||
-rw-r--r-- | dev-java/jzlib/Manifest | 4 | ||||
-rw-r--r-- | dev-java/jzlib/jzlib-1.0.5.ebuild | 13 | ||||
-rw-r--r-- | dev-java/libreadline-java/ChangeLog | 6 | ||||
-rw-r--r-- | dev-java/libreadline-java/Manifest | 4 | ||||
-rw-r--r-- | dev-java/libreadline-java/libreadline-java-0.8.0-r1.ebuild | 20 | ||||
-rw-r--r-- | dev-java/rhino/ChangeLog | 6 | ||||
-rw-r--r-- | dev-java/rhino/Manifest | 6 | ||||
-rw-r--r-- | dev-java/rhino/rhino-1.5.5-r1.ebuild | 6 | ||||
-rw-r--r-- | dev-java/rhino/rhino-1.6.1-r1.ebuild | 21 | ||||
-rw-r--r-- | dev-java/saxpath/ChangeLog | 5 | ||||
-rw-r--r-- | dev-java/saxpath/Manifest | 6 | ||||
-rw-r--r-- | dev-java/saxpath/saxpath-1.0.ebuild | 16 | ||||
-rw-r--r-- | dev-java/velocity/Manifest | 16 |
14 files changed, 74 insertions, 60 deletions
diff --git a/dev-java/jzlib/ChangeLog b/dev-java/jzlib/ChangeLog index 9be3369a9e79..42de972909b1 100644 --- a/dev-java/jzlib/ChangeLog +++ b/dev-java/jzlib/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/jzlib # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jzlib/ChangeLog,v 1.14 2005/01/26 21:30:26 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jzlib/ChangeLog,v 1.15 2005/07/09 16:06:24 axxo Exp $ + + 09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> jzlib-1.0.5.ebuild: + fix deps, and source useflag support, small cleanup 26 Jan 2005; Markus Rothe <corsair@gentoo.org> jzlib-1.0.5.ebuild: Stable on ppc64 diff --git a/dev-java/jzlib/Manifest b/dev-java/jzlib/Manifest index 982a2551ea22..dc70b0178b16 100644 --- a/dev-java/jzlib/Manifest +++ b/dev-java/jzlib/Manifest @@ -1,5 +1,5 @@ -MD5 bb7ea07aa16b89d009c013b11094e89a ChangeLog 1656 -MD5 c244572baeb7739c3adbe43f91c1694f jzlib-1.0.5.ebuild 1109 +MD5 8678452243d0eebf241d0344b1a3fb9d jzlib-1.0.5.ebuild 1135 +MD5 4a76d0219dfb70656031a5b69947643a ChangeLog 1780 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 MD5 a01cb77a2d242530ff728832e6aac5a0 files/digest-jzlib-1.0.5 62 MD5 031e9bb6bd536d127ef97138851c233c files/jzlib_build.xml 1688 diff --git a/dev-java/jzlib/jzlib-1.0.5.ebuild b/dev-java/jzlib/jzlib-1.0.5.ebuild index d60a8d31b3f5..2162f652bc57 100644 --- a/dev-java/jzlib/jzlib-1.0.5.ebuild +++ b/dev-java/jzlib/jzlib-1.0.5.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jzlib/jzlib-1.0.5.ebuild,v 1.7 2005/01/26 21:30:26 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jzlib/jzlib-1.0.5.ebuild,v 1.8 2005/07/09 16:06:24 axxo Exp $ inherit java-pkg DESCRIPTION="JZlib is a re-implementation of zlib in pure Java." HOMEPAGE="http://www.jcraft.com/jzlib/" -SRC_URI="http://www.jcraft.com/${PN}/${PN}-${PV}.tar.gz" +SRC_URI="http://www.jcraft.com/${PN}/${P}.tar.gz" LICENSE="jcraft" SLOT="0" @@ -16,8 +16,9 @@ RESTRICT="nomirror" DEPEND=">=virtual/jdk-1.4 >=dev-java/ant-core-1.4 + source? ( app-arch/zip ) jikes? ( >=dev-java/jikes-1.17 )" -RDEPEND=">=virtual/jdk-1.4" +RDEPEND=">=virtual/jre-1.4" src_unpack() { @@ -35,8 +36,8 @@ src_compile() { } src_install() { - mv dist/lib/jzlib{*,}.jar - java-pkg_dojar dist/lib/jzlib.jar || die "installation failed" + java-pkg_newjar dist/lib/jzlib*.jar jzlib.jar || die "installation failed" use doc && java-pkg_dohtml -r javadoc/* - dodoc LICENSE.txt README ChangeLog + use source && java-pkg_dosrc src + dodoc README ChangeLog } diff --git a/dev-java/libreadline-java/ChangeLog b/dev-java/libreadline-java/ChangeLog index 85af0b12b318..e9391d3ecd8c 100644 --- a/dev-java/libreadline-java/ChangeLog +++ b/dev-java/libreadline-java/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/libreadline-java # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/libreadline-java/ChangeLog,v 1.18 2005/01/26 21:10:02 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/libreadline-java/ChangeLog,v 1.19 2005/07/09 16:06:44 axxo Exp $ + + 09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> + libreadline-java-0.8.0-r1.ebuild: + fix deps, and source useflag support, small cleanup 26 Jan 2005; Markus Rothe <corsair@gentoo.org> libreadline-java-0.8.0-r1.ebuild: diff --git a/dev-java/libreadline-java/Manifest b/dev-java/libreadline-java/Manifest index 6de1d5c8e575..1edc5cc9e5d8 100644 --- a/dev-java/libreadline-java/Manifest +++ b/dev-java/libreadline-java/Manifest @@ -1,5 +1,5 @@ -MD5 4264396ddd566ce4d6c052d41e8affd9 ChangeLog 2414 -MD5 aaa417138bfba506bdcd576eabfa6a4e libreadline-java-0.8.0-r1.ebuild 875 +MD5 32cedfe23444f3d54a776bf00a9a47a3 ChangeLog 2554 +MD5 1af6b41879ea2a58ee18e81043b62f1d libreadline-java-0.8.0-r1.ebuild 1020 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 MD5 9e6c8c38a34f297ef3ff5d65648dc214 files/digest-libreadline-java-0.8.0-r1 77 MD5 dcfb40cea2d4ce6b93a3a05548f702a0 files/termcap-to-ncurses.patch 498 diff --git a/dev-java/libreadline-java/libreadline-java-0.8.0-r1.ebuild b/dev-java/libreadline-java/libreadline-java-0.8.0-r1.ebuild index f98bd94e0912..79f70131184c 100644 --- a/dev-java/libreadline-java/libreadline-java-0.8.0-r1.ebuild +++ b/dev-java/libreadline-java/libreadline-java-0.8.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/libreadline-java/libreadline-java-0.8.0-r1.ebuild,v 1.9 2005/01/26 21:10:02 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/libreadline-java/libreadline-java-0.8.0-r1.ebuild,v 1.10 2005/07/09 16:06:44 axxo Exp $ inherit java-pkg eutils @@ -11,10 +11,14 @@ SRC_URI="mirror://sourceforge/java-readline/${P}-src.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="x86 sparc ppc amd64 ppc64" -IUSE="doc" +IUSE="doc source" -DEPEND=">=virtual/jdk-1.4 +RDEPEND=">=virtual/jre-1.4 sys-libs/ncurses" +DEPEND=">=virtual/jdk-1.4 + source? ( app-arch/zip ) + ${RDEPEND}" +RESTRICT="test" src_unpack() { unpack ${A} @@ -24,15 +28,15 @@ src_unpack() { src_compile() { make || die "failed to compile" - use doc && make apidoc + if use doc; then + make apidoc || die "failed to generate docs" + fi } -#bug 63102 -src_test() { :; } - src_install() { - dolib.so *.so + java-pkg_doso *.so java-pkg_dojar *.jar + use source && java-pkg_dosrc src/* use doc && java-pkg_dohtml -r api/* dodoc ChangeLog NEWS README README.1st TODO } diff --git a/dev-java/rhino/ChangeLog b/dev-java/rhino/ChangeLog index 23dcc508d954..d1436b866641 100644 --- a/dev-java/rhino/ChangeLog +++ b/dev-java/rhino/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/rhino # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.28 2005/02/01 13:01:10 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.29 2005/07/09 16:07:21 axxo Exp $ + + 09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> rhino-1.5.5-r1.ebuild, + rhino-1.6.1-r1.ebuild: + fix deps, and source useflag support, small cleanup 01 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> files/1.5.5_jdk15.patch: modified the recently added patch diff --git a/dev-java/rhino/Manifest b/dev-java/rhino/Manifest index 6ddb9f4f3668..de6bf1062847 100644 --- a/dev-java/rhino/Manifest +++ b/dev-java/rhino/Manifest @@ -1,6 +1,6 @@ -MD5 1b9c3e4ae0426269156ee02c9459cb16 rhino-1.5.5-r1.ebuild 1335 -MD5 5eeeee81ebba44cbb1dfd00df9f064ca rhino-1.6.1-r1.ebuild 1362 -MD5 847ebd6191cf5acf0e7d85f767338e1a ChangeLog 3661 +MD5 cfdb5e3626d885ce0fce686020fa11dc rhino-1.5.5-r1.ebuild 1416 +MD5 92bc74b12ce4863869d5f3bbaf1f2544 rhino-1.6.1-r1.ebuild 1431 +MD5 c1cef1ecb1a7c34f20ed9ea1f66e2a1f ChangeLog 3813 MD5 4622606981d4aa0930c917b65cf2f202 metadata.xml 350 MD5 c663f3b82777d7ee2506dc0a03955198 files/jsscript 123 MD5 6d48e39fc85ff462180102a36f8fc589 files/digest-rhino-1.5.5-r1 126 diff --git a/dev-java/rhino/rhino-1.5.5-r1.ebuild b/dev-java/rhino/rhino-1.5.5-r1.ebuild index ec3f75d806dc..09db40fc66d3 100644 --- a/dev-java/rhino/rhino-1.5.5-r1.ebuild +++ b/dev-java/rhino/rhino-1.5.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.5.5-r1.ebuild,v 1.3 2005/01/31 22:44:55 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.5.5-r1.ebuild,v 1.4 2005/07/09 16:07:21 axxo Exp $ inherit eutils java-pkg @@ -11,11 +11,12 @@ HOMEPAGE="http://www.mozilla.org/rhino/" LICENSE="NPL-1.1" SLOT="1.5" KEYWORDS="x86 ppc amd64 sparc ppc64" -IUSE="jikes doc" +IUSE="jikes doc source" S="${WORKDIR}/${MY_P}" DEPEND="dev-java/ant-core >=virtual/jdk-1.3 app-arch/unzip + source? ( app-arch/zip ) jikes? ( dev-java/jikes )" RDEPEND=">=virtual/jre-1.3" @@ -38,5 +39,6 @@ src_compile() { src_install() { dobin ${FILESDIR}/jsscript java-pkg_dojar build/*/js.jar + use source && java-pkg_dosrc {src,toolsrc}/org use doc && java-pkg_dohtml -r docs/* } diff --git a/dev-java/rhino/rhino-1.6.1-r1.ebuild b/dev-java/rhino/rhino-1.6.1-r1.ebuild index cbfe7d00e1d6..f08bd0b65a9b 100644 --- a/dev-java/rhino/rhino-1.6.1-r1.ebuild +++ b/dev-java/rhino/rhino-1.6.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.6.1-r1.ebuild,v 1.1 2005/01/29 21:16:24 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.6.1-r1.ebuild,v 1.2 2005/07/09 16:07:21 axxo Exp $ inherit java-pkg eutils @@ -11,14 +11,16 @@ HOMEPAGE="http://www.mozilla.org/rhino/" LICENSE="NPL-1.1" SLOT="1.6" KEYWORDS="~x86 ~amd64" -IUSE="jikes doc" +IUSE="jikes doc source" S="${WORKDIR}/${MY_P}" +RDEPEND=">=virtual/jre-1.4 + >=dev-java/xml-xmlbeans-20041217" DEPEND="dev-java/ant-core >=virtual/jdk-1.4 app-arch/unzip - jikes? ( dev-java/jikes )" -RDEPEND=">=virtual/jre-1.4 - >=dev-java/xml-xmlbeans-20041217" + source? ( app-arch/zip ) + jikes? ( dev-java/jikes ) + ${RDEPEND}" src_unpack() { unpack ${MY_P}.zip @@ -34,16 +36,13 @@ src_unpack() { src_compile() { local antflags="jar" - if use jikes; then - antflags="${antflags} -Dbuild.compiler=jikes" - fi + use jikes && antflags="${antflags} -Dbuild.compiler=jikes" ant ${antflags} || die "compilation error" } src_install() { dobin ${FILESDIR}/jsscript java-pkg_dojar build/*/js.jar - if use doc; then - java-pkg_dohtml -r docs/* - fi + use source && java-pkg_dosrc {src,toolsrc}/org + use doc && java-pkg_dohtml -r docs/* } diff --git a/dev-java/saxpath/ChangeLog b/dev-java/saxpath/ChangeLog index 80e0059e84ff..6c3c12958fbc 100644 --- a/dev-java/saxpath/ChangeLog +++ b/dev-java/saxpath/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/saxpath # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/saxpath/ChangeLog,v 1.6 2005/05/29 15:48:49 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/saxpath/ChangeLog,v 1.7 2005/07/09 16:07:45 axxo Exp $ + + 09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> saxpath-1.0.ebuild: + fix deps, and source useflag support, small cleanup 29 May 2005; Markus Rothe <corsair@gentoo.org> saxpath-1.0.ebuild: Stable on ppc64 diff --git a/dev-java/saxpath/Manifest b/dev-java/saxpath/Manifest index c2355af43f00..efc279aff7b6 100644 --- a/dev-java/saxpath/Manifest +++ b/dev-java/saxpath/Manifest @@ -1,5 +1,5 @@ -MD5 084caa9d3861e29ecf193c28e0038389 ChangeLog 945 +MD5 b2cadce8cd0ced9e1c2df6bf17ea217f saxpath-1.0.ebuild 1162 +MD5 be463c10ac87ce6a5b64780f5050d448 ChangeLog 1069 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 -MD5 ba304b0a7a2b92be1fbe2f8611d7c6f0 saxpath-1.0.ebuild 1117 -MD5 cb58720b66697c1ef1f47de80c839e00 files/MANIFEST.MF 276 MD5 3d3ef900f2efc99e36d9d4f87026d5b2 files/digest-saxpath-1.0 64 +MD5 cb58720b66697c1ef1f47de80c839e00 files/MANIFEST.MF 276 diff --git a/dev-java/saxpath/saxpath-1.0.ebuild b/dev-java/saxpath/saxpath-1.0.ebuild index 3e2fb99c5f3d..0c62ef535ab8 100644 --- a/dev-java/saxpath/saxpath-1.0.ebuild +++ b/dev-java/saxpath/saxpath-1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/saxpath/saxpath-1.0.ebuild,v 1.6 2005/05/29 15:48:49 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/saxpath/saxpath-1.0.ebuild,v 1.7 2005/07/09 16:07:45 axxo Exp $ inherit java-pkg @@ -10,12 +10,15 @@ SRC_URI="mirror://sourceforge/saxpath/${P}.tar.gz" LICENSE="saxpath" SLOT="0" KEYWORDS="amd64 ~ppc ppc64 ~sparc x86" -IUSE="doc junit" -DEPEND="dev-java/ant - junit? ( dev-java/junit ) +IUSE="doc junit source" + +RDEPEND=">=virtual/jre-1.4 dev-java/xalan >=dev-java/xerces-2.6.2-r1" -#RDEPEND="" +DEPEND=">=virtual/jdk-1.4 + dev-java/ant + junit? ( dev-java/junit ) + ${RDEPEND}" S=${WORKDIR}/${P}-FCS @@ -26,7 +29,7 @@ src_unpack() { mkdir src/conf cp ${FILESDIR}/MANIFEST.MF src/conf cd lib - rm -f jakarta-ant-1.3-optional.jar ant-1.3.jar xerces.jar junit.jar + rm -f *.jar use junit && java-pkg_jar-from junit java-pkg_jar-from xalan java-pkg_jar-from xerces-2 @@ -43,4 +46,5 @@ src_install() { java-pkg_dojar build/saxpath.jar use doc && java-pkg_dohtml -r build/doc/* + use source && java-pkg_dosrc src/java/main/* } diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest index 4e2702a6a9e9..c4d38395f818 100644 --- a/dev-java/velocity/Manifest +++ b/dev-java/velocity/Manifest @@ -1,16 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 f4e7837744659c8e2e042d74cbdc52d7 velocity-1.4-r2.ebuild 1412 -MD5 dabf70a15d379b9a9b2197db930c33ae velocity-1.4-r1.ebuild 1389 MD5 ce29cb44c25a7dafa441a5f3bf79bb3a ChangeLog 2450 -MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 MD5 ebc2b845ee1e201a404b4eceb168952a files/digest-velocity-1.4-r1 65 MD5 ebc2b845ee1e201a404b4eceb168952a files/digest-velocity-1.4-r2 65 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCizEl/rLF9B432nYRAl/rAJ45LdXJBLBV/ddBKfh6zlDAXyBK5wCeK8R0 -ToF9DntUqiWxiJzNc7+4UhA= -=+8pb ------END PGP SIGNATURE----- +MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 +MD5 f7c82002bd3eb938af9a2bd2fdb49e07 velocity-1.4-r1.ebuild 1381 +MD5 4e082868b6f7b2f1c51367dd225647c6 velocity-1.4-r2.ebuild 1409 |