diff options
| author |   Krzysztof Pawlik <nelchael@gentoo.org> | 2006-09-11 16:03:19 +0000 |
|---|---|---|
| committer | Krzysztof Pawlik <nelchael@gentoo.org> | 2006-09-11 16:03:19 +0000 |
| commit | 666598a7781c66b20049e99e56b7573553f6d223 (patch) | |
| tree | 7280f35c64e51bb3efcba7e9c4e900b5cfc50cbc /dev-java/javassist | |
| parent | version bump, also fixes security bug #146800 (diff) | |
| download | historical-666598a7781c66b20049e99e56b7573553f6d223.tar.gz historical-666598a7781c66b20049e99e56b7573553f6d223.tar.bz2 historical-666598a7781c66b20049e99e56b7573553f6d223.zip | |
Remove unneeded version, -r1 compiles with Java strict.
Package-Manager: portage-2.1.1
Diffstat (limited to 'dev-java/javassist')
| -rw-r--r-- | dev-java/javassist/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/javassist/files/javassist-3.1_rc2-classpath.patch | 13 | ||||
| -rw-r--r-- | dev-java/javassist/javassist-3.1_rc2-r1.ebuild | 22 |
3 files changed, 39 insertions, 3 deletions
diff --git a/dev-java/javassist/ChangeLog b/dev-java/javassist/ChangeLog index 8411cc56a8d0..32acbca47ce6 100644 --- a/dev-java/javassist/ChangeLog +++ b/dev-java/javassist/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/javassist # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/javassist/ChangeLog,v 1.5 2006/08/05 17:14:25 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/javassist/ChangeLog,v 1.6 2006/09/11 16:03:19 nelchael Exp $ + + 11 Sep 2006; Krzysiek Pawlik <nelchael@gentoo.org> + +files/javassist-3.1_rc2-classpath.patch, -javassist-3.1_rc2.ebuild, + javassist-3.1_rc2-r1.ebuild: + Remove unneeded version, -r1 compiles with Java strict. *javassist-3.1_rc2-r1 (05 Aug 2006) *javassist-2.6-r1 (05 Aug 2006) diff --git a/dev-java/javassist/files/javassist-3.1_rc2-classpath.patch b/dev-java/javassist/files/javassist-3.1_rc2-classpath.patch new file mode 100644 index 000000000000..44627d4e0e32 --- /dev/null +++ b/dev-java/javassist/files/javassist-3.1_rc2-classpath.patch @@ -0,0 +1,13 @@ +diff -Nru javassist-3.1RC2.vanilla/build.xml javassist-3.1RC2/build.xml +--- javassist-3.1RC2.vanilla/build.xml 2006-09-11 17:53:58.000000000 +0200 ++++ javassist-3.1RC2/build.xml 2006-09-11 17:54:29.000000000 +0200 +@@ -19,6 +19,9 @@ + <!-- Build classpath --> + <path id="classpath"> + <pathelement location="${build.classes.dir}"/> ++ <fileset dir="lib"> ++ <include name="**/*.jar"/> ++ </fileset> + </path> + + <property name="build.classpath" refid="classpath"/> diff --git a/dev-java/javassist/javassist-3.1_rc2-r1.ebuild b/dev-java/javassist/javassist-3.1_rc2-r1.ebuild index f4fa6d52dfb7..9064e2f21972 100644 --- a/dev-java/javassist/javassist-3.1_rc2-r1.ebuild +++ b/dev-java/javassist/javassist-3.1_rc2-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/javassist/javassist-3.1_rc2-r1.ebuild,v 1.1 2006/08/05 17:14:25 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/javassist/javassist-3.1_rc2-r1.ebuild,v 1.2 2006/09/11 16:03:19 nelchael Exp $ -inherit java-pkg-2 java-ant-2 +inherit java-pkg-2 java-ant-2 eutils MY_PV=${PV/_rc/RC} MY_P="${PN}-${MY_PV}" @@ -22,13 +22,31 @@ DEPEND=">=virtual/jdk-1.4 source? ( app-arch/zip )" S="${WORKDIR}/${MY_P}" +src_unpack() { + + unpack "${A}" + cd "${S}" + epatch "${FILESDIR}/${P}-classpath.patch" + +} + src_compile() { + + mkdir "${S}/lib" + cd "${S}/lib" + ln -s "${JAVA_HOME}/lib/tools.jar" + + cd "${S}" eant clean jar $(use_doc javadocs) + } src_install() { + java-pkg_dojar ${PN}.jar java-pkg_dohtml Readme.html + use doc && java-pkg_dojavadoc html use source && java-pkg_dosrc src/main/javassist + } |