From: Petteri Räty Date: Sat, 10 Sep 2005 16:48:52 +0000 (+0000) Subject: Added missing dependencies to all the ebuilds. Fixed the env file with a new revision... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c1a4d981842fb95135a7495d6b4e877ed8c45531;p=gentoo.git Added missing dependencies to all the ebuilds. Fixed the env file with a new revision for the latest stable and unstable version. 1.1.4-r1 will be marked stable shortly after being a while in unstable. 1.1.5-r1 also has new gtk and gmp use flags. Fixes bug #103978. Package-Manager: portage-2.0.51.22-r2 --- diff --git a/dev-java/kaffe/ChangeLog b/dev-java/kaffe/ChangeLog index 14eeee4abecb..ae7c36261150 100644 --- a/dev-java/kaffe/ChangeLog +++ b/dev-java/kaffe/ChangeLog @@ -1,6 +1,19 @@ # ChangeLog for dev-java/kaffe # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.32 2005/05/18 15:46:55 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.33 2005/09/10 16:48:52 betelgeuse Exp $ + +*kaffe-1.1.5-r1 (10 Sep 2005) +*kaffe-1.1.4-r1 (10 Sep 2005) + + 10 Sep 2005; Petteri Räty +files/kaffe-1.1.4-r1, + -files/30kaffe, files/kaffe-1.1.4_p20041220, files/kaffe-1.1.5, + metadata.xml, kaffe-1.1.4.ebuild, +kaffe-1.1.4-r1.ebuild, + kaffe-1.1.4_p20041220.ebuild, +kaffe-1.1.5-r1.ebuild: + Added missing dependencies to all the ebuilds. + Fixed the env file with a new revision for the + latest stable and unstable version. 1.1.4-r1 will be + marked stable shortly after being a while in unstable. + 1.1.5-r1 also has new gtk and gmp use flags. Fixes bug #103978. 18 May 2005; Thomas Matthijs kaffe-1.1.4.ebuild, kaffe-1.1.4_p20041220.ebuild, kaffe-1.1.5.ebuild: diff --git a/dev-java/kaffe/Manifest b/dev-java/kaffe/Manifest index 09de2d198e37..1a3a2f611717 100644 --- a/dev-java/kaffe/Manifest +++ b/dev-java/kaffe/Manifest @@ -1,22 +1,26 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 a2894bacca95d56855b0beb0c3c507a2 kaffe-1.1.5.ebuild 1423 -MD5 66fd4b0722180ed232a682d5e976c1cd kaffe-1.1.4_p20041220.ebuild 1449 -MD5 7785713d92dae4abb4398225177cce2f ChangeLog 4870 -MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 -MD5 8ed9385e5940619509e1e21db0730f2f kaffe-1.1.4.ebuild 1272 -MD5 4a6fc17bcff6810e87fb591315e3d110 files/kaffe-1.1.4_p20041220 514 +MD5 c612f6ec4a42ec12e403844b07d81123 kaffe-1.1.5-r1.ebuild 2589 +MD5 50a31c49c6105047597061c91da7bf2d kaffe-1.1.4-r1.ebuild 1429 +MD5 5537a1325fe5c1edf280f06e46a14a5d kaffe-1.1.5.ebuild 1431 +MD5 bedc2c8045f4427b9e5b5f7d4a0feb2d kaffe-1.1.4_p20041220.ebuild 1595 +MD5 8a0b46dfe3588c5bd9d6a56b4e40d5c6 ChangeLog 5474 +MD5 0dbd2265323a31ffe6c44ccbf42e92e7 metadata.xml 344 +MD5 73eba47e4376b8ef0277917e9775d215 kaffe-1.1.4.ebuild 1384 +MD5 2e1f733100256452cb1fd7749144206c files/kaffe-1.1.4_p20041220 474 MD5 5705b7951b83fc326ce97b101de8cb49 files/kaffe-1.1.4 506 -MD5 c209796e135afcce01fe11b56990c93f files/kaffe-1.1.5 504 -MD5 22d8f8b117ca1322d67d6343f07aca01 files/30kaffe 89 +MD5 db3c5b7c7434756580165a330667dde8 files/kaffe-1.1.5 464 MD5 89ab9ab78ed555baabd7d861d042b7c2 files/digest-kaffe-1.1.4_p20041220 75 +MD5 6b922132b47393ca82554800904339da files/kaffe-1.1.4-r1 467 MD5 d9c1b3469316eb29e7b79058353f007f files/digest-kaffe-1.1.4 64 MD5 15d4e7be27bfaa5a835fd5acc810f3ba files/digest-kaffe-1.1.5 64 +MD5 d9c1b3469316eb29e7b79058353f007f files/digest-kaffe-1.1.4-r1 64 +MD5 15d4e7be27bfaa5a835fd5acc810f3ba files/digest-kaffe-1.1.5-r1 64 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) +Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFC3UhG/rLF9B432nYRAmOhAJwK6ycXlhKIDzjdeR+ZSMEQvOIuuwCgwxbD -o0nf5P63RuLsoxjoMqsdPd0= -=+qYD +iD8DBQFDIw6LQiJ/wx066S4RAmASAJ41BGiyBCMT/sCJxhpKyESxq/idWACfRcwZ +V6YZOl2tcy0E9H8vxHtSS2g= +=CUz7 -----END PGP SIGNATURE----- diff --git a/dev-java/kaffe/files/30kaffe b/dev-java/kaffe/files/30kaffe deleted file mode 100644 index 867b3fbf8dcb..000000000000 --- a/dev-java/kaffe/files/30kaffe +++ /dev/null @@ -1,4 +0,0 @@ -PATH=/opt/kaffe/bin -ROOTPATH=/opt/kaffe/bin -MANPATH=/opt/kaffe/man -LDPATH=/opt/kaffe/lib diff --git a/dev-java/kaffe/files/digest-kaffe-1.1.4-r1 b/dev-java/kaffe/files/digest-kaffe-1.1.4-r1 new file mode 100644 index 000000000000..ea8519bcf9a7 --- /dev/null +++ b/dev-java/kaffe/files/digest-kaffe-1.1.4-r1 @@ -0,0 +1 @@ +MD5 94d6e7035ba68c2221dce68bb5b3f6e9 kaffe-1.1.4.tar.gz 8891220 diff --git a/dev-java/kaffe/files/digest-kaffe-1.1.5-r1 b/dev-java/kaffe/files/digest-kaffe-1.1.5-r1 new file mode 100644 index 000000000000..9acebff14bad --- /dev/null +++ b/dev-java/kaffe/files/digest-kaffe-1.1.5-r1 @@ -0,0 +1 @@ +MD5 928c578d4808012fe5ba5587071d2aa2 kaffe-1.1.5.tar.gz 9796278 diff --git a/dev-java/kaffe/files/kaffe-1.1.4-r1 b/dev-java/kaffe/files/kaffe-1.1.4-r1 new file mode 100644 index 000000000000..7342bf25c392 --- /dev/null +++ b/dev-java/kaffe/files/kaffe-1.1.4-r1 @@ -0,0 +1,12 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/files/kaffe-1.1.4-r1,v 1.1 2005/09/10 16:48:52 betelgeuse Exp $ + +VERSION="Kaffe @PV@" +JAVA_HOME=/opt/@P@ +JDK_HOME=/opt/@P@ +JAVAC=${JAVA_HOME}/bin/javac +MANPATH=/opt/@P@/man +ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" +ADDLDPATH="/opt/@P@/jre/lib/i386/" +ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH" diff --git a/dev-java/kaffe/files/kaffe-1.1.4_p20041220 b/dev-java/kaffe/files/kaffe-1.1.4_p20041220 index d4f12e244617..0d52ceaec623 100644 --- a/dev-java/kaffe/files/kaffe-1.1.4_p20041220 +++ b/dev-java/kaffe/files/kaffe-1.1.4_p20041220 @@ -1,13 +1,12 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/files/kaffe-1.1.4_p20041220,v 1.1 2004/12/22 13:52:26 karltk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/files/kaffe-1.1.4_p20041220,v 1.2 2005/09/10 16:48:52 betelgeuse Exp $ VERSION="Kaffe @PV@" JAVA_HOME=/opt/@P@ -CLASSPATH=/opt/@P@/jre/lib/rt.jar JDK_HOME=/opt/@P@ JAVAC=${JAVA_HOME}/bin/javac MANPATH=/opt/@P@/man ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" ADDLDPATH="/opt/@P@/jre/lib/i386/" -ENV_VARS="JAVA_HOME CLASSPATH JDK_HOME JAVAC ADDPATH ADDLDPATH" +ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH" diff --git a/dev-java/kaffe/files/kaffe-1.1.5 b/dev-java/kaffe/files/kaffe-1.1.5 index 884c6d5bf323..aff8f1197759 100644 --- a/dev-java/kaffe/files/kaffe-1.1.5 +++ b/dev-java/kaffe/files/kaffe-1.1.5 @@ -1,13 +1,12 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/files/kaffe-1.1.5,v 1.1 2005/04/09 18:53:35 karltk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/files/kaffe-1.1.5,v 1.2 2005/09/10 16:48:52 betelgeuse Exp $ VERSION="Kaffe @PV@" JAVA_HOME=/opt/@P@ -CLASSPATH=/opt/@P@/jre/lib/rt.jar JDK_HOME=/opt/@P@ JAVAC=${JAVA_HOME}/bin/javac MANPATH=/opt/@P@/man ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" ADDLDPATH="/opt/@P@/jre/lib/i386/" -ENV_VARS="JAVA_HOME CLASSPATH JDK_HOME JAVAC ADDPATH ADDLDPATH" +ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH" diff --git a/dev-java/kaffe/kaffe-1.1.4-r1.ebuild b/dev-java/kaffe/kaffe-1.1.4-r1.ebuild new file mode 100644 index 000000000000..aa93a3ec2e6c --- /dev/null +++ b/dev-java/kaffe/kaffe-1.1.4-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.4-r1.ebuild,v 1.1 2005/09/10 16:48:52 betelgeuse Exp $ + +inherit java flag-o-matic + +DESCRIPTION="A cleanroom, open source Java VM and class libraries" +SRC_URI="http://www.kaffe.org/ftp/pub/kaffe/v1.1.x-development/${P/_/-}.tar.gz" +HOMEPAGE="http://www.kaffe.org/" +DEPEND=">=dev-libs/gmp-3.1 + >=media-libs/jpeg-6b + >=media-libs/libpng-1.2.1 + virtual/libc + virtual/x11 + app-arch/zip + >=dev-java/java-config-0.2.4 + alsa? ( >=media-libs/alsa-lib-1.0.1 ) + esd? ( >=media-sound/esound-0.2.1 )" +RDEPEND=${DEPEND} +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" +IUSE="alsa esd" + +PROVIDE="virtual/jdk + virtual/jre" + +src_compile() { + # see #88330 + strip-flags "-fomit-frame-pointer" + + ./configure \ + --prefix=/opt/${P} \ + --host=${CHOST} \ + `use_enable alsa`\ + `use_enable esd` + # --with-bcel + # --with-profiling + make || die +} + +src_install() { + make DESTDIR=${D} install || die + cp ${FILESDIR}/${PF} ${T}/${VMHANDLE} || die + set_java_env ${T}/${VMHANDLE} || die +} + +pkg_postinst() { + ewarn "Please, do not use Kaffe as your default JDK/JRE!" + ewarn "Kaffe is currently meant for testing... it should be" + ewarn "only be used by developers or bug-hunters willing to deal" + ewarn "with oddities that are bound to come up while using Kaffe!" +} diff --git a/dev-java/kaffe/kaffe-1.1.4.ebuild b/dev-java/kaffe/kaffe-1.1.4.ebuild index c9dd22e1a409..b88ecaad167d 100644 --- a/dev-java/kaffe/kaffe-1.1.4.ebuild +++ b/dev-java/kaffe/kaffe-1.1.4.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/kaffe/kaffe-1.1.4.ebuild,v 1.16 2005/07/19 18:36:27 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.4.ebuild,v 1.17 2005/09/10 16:48:52 betelgeuse Exp $ inherit java flag-o-matic @@ -12,7 +12,11 @@ DEPEND=">=dev-libs/gmp-3.1 >=media-libs/libpng-1.2.1 virtual/libc virtual/x11 - >=dev-java/java-config-0.2.4" + app-arch/zip + >=dev-java/java-config-0.2.4 + alsa? ( >=media-libs/alsa-lib-1.0.1 ) + esd? ( >=media-sound/esound-0.2.1 )" +RDEPEND=${DEPEND} LICENSE="GPL-2" SLOT="0" KEYWORDS="x86 sparc ~ppc hppa amd64" @@ -41,7 +45,7 @@ src_install() { } pkg_postinst() { - ewarn "By all means, do not use Kaffe as your default JDK/JRE!" + ewarn "Please, do not use Kaffe as your default JDK/JRE!" ewarn "Kaffe is currently meant for testing... it should be" ewarn "only be used by developers or bug-hunters willing to deal" ewarn "with oddities that are bound to come up while using Kaffe!" diff --git a/dev-java/kaffe/kaffe-1.1.4_p20041220.ebuild b/dev-java/kaffe/kaffe-1.1.4_p20041220.ebuild index 645e339e360b..10995b6ecc00 100644 --- a/dev-java/kaffe/kaffe-1.1.4_p20041220.ebuild +++ b/dev-java/kaffe/kaffe-1.1.4_p20041220.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/kaffe/kaffe-1.1.4_p20041220.ebuild,v 1.5 2005/07/19 18:36:27 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.4_p20041220.ebuild,v 1.6 2005/09/10 16:48:52 betelgeuse Exp $ inherit java flag-o-matic @@ -14,7 +14,13 @@ DEPEND=">=dev-libs/gmp-3.1 virtual/libc virtual/x11 >=dev-java/java-config-0.2.4 - dev-java/jikes" + dev-java/jikes + app-arch/zip + >=dev-java/java-config-0.2.4 + alsa? ( >=media-libs/alsa-lib-1.0.1 ) + esd? ( >=media-sound/esound-0.2.1 )" +RDEPEND=${DEPEND} + LICENSE="GPL-2" SLOT="0" KEYWORDS="~x86" diff --git a/dev-java/kaffe/kaffe-1.1.5-r1.ebuild b/dev-java/kaffe/kaffe-1.1.5-r1.ebuild new file mode 100644 index 000000000000..7a6cc9d93153 --- /dev/null +++ b/dev-java/kaffe/kaffe-1.1.5-r1.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.5-r1.ebuild,v 1.1 2005/09/10 16:48:52 betelgeuse Exp $ + +inherit java flag-o-matic + +DESCRIPTION="A cleanroom, open source Java VM and class libraries" +SRC_URI="http://www.kaffe.org/ftp/pub/kaffe/v1.1.x-development/${P/_/-}.tar.gz" +HOMEPAGE="http://www.kaffe.org/" + +#robilad recommned in bug 103978 that we leave the X and QT +#awt backends disabled for now. Please check the status of these +#backends with new upstream versions. +# X?( virtual/x11 ) +# qt?( =x11-libs/qt-3.3* ) + +DEPEND=" + >=media-libs/jpeg-6b + >=media-libs/libpng-1.2.1 + virtual/libc + >=dev-java/java-config-0.2.4 + app-arch/zip + dev-java/jikes + dev-libs/libxml2 + sys-libs/zlib + gtk? ( + >=dev-libs/glib-2.0 + >=x11-libs/gtk+-2.0 + >=media-libs/libart_lgpl-2.0 ) + esd?( >=media-sound/esound-0.2.1 ) + alsa?( >=media-libs/alsa-lib-1.0.1 ) + gmp?( >=dev-libs/gmp-3.1 )" +RDEPEND=${DEPEND} +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~sparc ~amd64 -ppc" +#X qt +IUSE="alsa esd gmp gtk nls" + +PROVIDE="virtual/jdk + virtual/jre" +#S=${WORKDIR}/kaffe-${date} + +pkg_setup() { + if ! use gmp; then + ewarn "You have don't have the gmp use flag set." + ewarn "Using gmp is the default upstream setting." + sleep 3 + fi + + if ! use gtk; then + ewarn "" + ewarn "The gtk use flag is needed for a awt implementation." + ewarn "Don't file bugs for awt not working when you have" + ewarn "gtk use flag turned off." + sleep 3 + fi +} + +src_compile() { + local confargs="" + + # see #88330 + strip-flags "-fomit-frame-pointer" + + if ! use alsa && ! use esd; then + confargs="${confargs} --disable-sound" + fi + + ! use gmp && confargs="${confargs} --enable-pure-java-math" + +# $(use_with X x) \ +# $(use_with X kaffe-x-awt) \ +# $(use_with qt kaffe-qt-awt ) \ + + ./configure \ + --prefix=/opt/${P} \ + --host=${CHOST} \ + $(use_with alsa)\ + $(use_with esd) \ + $(use_with gmp) \ + $(use_enable nls) \ + $(use_with gtk classpath-gtk-awt) \ + ${confargs} \ + --with-jikes || die "Failed to configure" + # --with-bcel + # --with-profiling + make || die "Failed to compile" +} + +src_install() { + make DESTDIR=${D} install || die "Failed to install" + set_java_env ${FILESDIR}/${VMHANDLE} || die "Failed to install environment files" +} + +pkg_postinst() { + ewarn "Please, do not use Kaffe as your default JDK/JRE!" + ewarn "Kaffe is currently meant for testing... it should be" + ewarn "only be used by developers or bug-hunters willing to deal" + ewarn "with oddities that are bound to come up while using Kaffe!" +} diff --git a/dev-java/kaffe/kaffe-1.1.5.ebuild b/dev-java/kaffe/kaffe-1.1.5.ebuild index dc133435282f..def88ff7e1c1 100644 --- a/dev-java/kaffe/kaffe-1.1.5.ebuild +++ b/dev-java/kaffe/kaffe-1.1.5.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/kaffe/kaffe-1.1.5.ebuild,v 1.7 2005/07/19 18:36:27 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.5.ebuild,v 1.8 2005/09/10 16:48:52 betelgeuse Exp $ inherit java flag-o-matic @@ -44,7 +44,7 @@ src_install() { } pkg_postinst() { - ewarn "Plase do not use Kaffe as your default JDK/JRE!" + ewarn "Please, do not use Kaffe as your default JDK/JRE!" ewarn "Kaffe is currently meant for testing... it should be" ewarn "only be used by developers or bug-hunters willing to deal" ewarn "with oddities that are bound to come up while using Kaffe!" diff --git a/dev-java/kaffe/metadata.xml b/dev-java/kaffe/metadata.xml index 838c00a4a448..936ea0d649ce 100644 --- a/dev-java/kaffe/metadata.xml +++ b/dev-java/kaffe/metadata.xml @@ -2,4 +2,8 @@ java + +Kaffe is a clean room implementation of the Java virtual machine, plus +the associated class libraries needed to provide a Java runtime environment. +