From: Petteri Räty Date: Fri, 1 Dec 2006 18:45:10 +0000 (+0000) Subject: Changed PROVIDES_TYPE from "JDK" to "JDK JRE" X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7f572f29f0a4386a0a13e1f307cd3626c4d836ad;p=gentoo.git Changed PROVIDES_TYPE from "JDK" to "JDK JRE" Package-Manager: portage-2.1.2_rc2-r3 --- diff --git a/dev-java/kaffe/Manifest b/dev-java/kaffe/Manifest index 954a9711ca30..df1315aeb919 100644 --- a/dev-java/kaffe/Manifest +++ b/dev-java/kaffe/Manifest @@ -5,30 +5,30 @@ AUX kaffe-1.1.6-alsa.patch 1132 RMD160 1fd34e881a4a533f8de66ba8a59b6ecc2a922681 MD5 eddf093a0ea65d4d6f9bc7799250660c files/kaffe-1.1.6-alsa.patch 1132 RMD160 1fd34e881a4a533f8de66ba8a59b6ecc2a922681 files/kaffe-1.1.6-alsa.patch 1132 SHA256 915cfafe78460c5ab55e02d9c93a139a24cc132dbfd8e070f58a6e7275388fd7 files/kaffe-1.1.6-alsa.patch 1132 -AUX kaffe.env 625 RMD160 34f7e6102883831bf3d1db8045238bf1cd47193b SHA1 4c1f8827247a794b0fdb6ed8841c466f0dc7dd30 SHA256 941fe655117838bf19821888bc78c0363eddf1dacc3e11a4f6d85c4407177776 -MD5 5404bc36ff7e48caef289cc631333607 files/kaffe.env 625 -RMD160 34f7e6102883831bf3d1db8045238bf1cd47193b files/kaffe.env 625 -SHA256 941fe655117838bf19821888bc78c0363eddf1dacc3e11a4f6d85c4407177776 files/kaffe.env 625 +AUX kaffe.env 633 RMD160 cbd43938225ef62844bb8351e0fa22aefd34def8 SHA1 207bea3eb2d6338438d5169ee17bdd30ff394f9e SHA256 ef69564ce3802f21355a09f2d9b4af8fb5e1af838abd36ee45d9f9304c8f5b2d +MD5 fd3b5d2c60b80250bd2c8ddb168fd369 files/kaffe.env 633 +RMD160 cbd43938225ef62844bb8351e0fa22aefd34def8 files/kaffe.env 633 +SHA256 ef69564ce3802f21355a09f2d9b4af8fb5e1af838abd36ee45d9f9304c8f5b2d files/kaffe.env 633 DIST kaffe-1.1.7.tar.bz2 10976055 RMD160 8f58ee1b9389f5a562f152dabeeeeb6072eb1d57 SHA1 b922d70419cc6bc0489912f9b826a40a9c8d5a91 SHA256 827f861c2d404a0fefed286f3691da61928b0d84e7d13eda8620d4fe47fa244c -EBUILD kaffe-1.1.7-r3.ebuild 3684 RMD160 f0d0ea99bba3e6fe26d4c1695f1880110e826f8e SHA1 94da339e556643af1e45f4b36d0028c2ac37f01d SHA256 8344d5aedca688fdc861ce54bdfe5aa8c041fb0df8c281c68708b68ee4eab668 -MD5 824c617d73203cb7dfe94be8a0400a90 kaffe-1.1.7-r3.ebuild 3684 -RMD160 f0d0ea99bba3e6fe26d4c1695f1880110e826f8e kaffe-1.1.7-r3.ebuild 3684 -SHA256 8344d5aedca688fdc861ce54bdfe5aa8c041fb0df8c281c68708b68ee4eab668 kaffe-1.1.7-r3.ebuild 3684 -MISC ChangeLog 10309 RMD160 4e2446f7644c83074c47c3974a5dda51c1856bf7 SHA1 a5c2b93e713d79da0204f4e0cc024c0da6dc213b SHA256 3bcd166805b7e4c107b409da9ac508a292b0f57a9a7da1bd8ec5b27e0f59a8bf -MD5 e0379a6685c968fa0b77b7d03ce5c406 ChangeLog 10309 -RMD160 4e2446f7644c83074c47c3974a5dda51c1856bf7 ChangeLog 10309 -SHA256 3bcd166805b7e4c107b409da9ac508a292b0f57a9a7da1bd8ec5b27e0f59a8bf ChangeLog 10309 +EBUILD kaffe-1.1.7-r4.ebuild 3688 RMD160 e04278e917c71731a77b659cacb1f21fdb8f5bad SHA1 a69e01e45b921790ed80f9335d46b4496d7a4aa1 SHA256 7d7f0b8ff024cfb66cb8087f4eb7032549fe8caa584b7cfadd0eef7f999d8d72 +MD5 4ca01961fca2080ad7ed2ed1839d9790 kaffe-1.1.7-r4.ebuild 3688 +RMD160 e04278e917c71731a77b659cacb1f21fdb8f5bad kaffe-1.1.7-r4.ebuild 3688 +SHA256 7d7f0b8ff024cfb66cb8087f4eb7032549fe8caa584b7cfadd0eef7f999d8d72 kaffe-1.1.7-r4.ebuild 3688 +MISC ChangeLog 10509 RMD160 628c5368d5cdefcfaaa8f101de322f91e0b84a7a SHA1 af1f21f7275d849d50aecbeae55ee1e725c313f1 SHA256 5a33db596903e438f7e06adce754d5ae0c73bd59a448905aadf2a8dfb3024628 +MD5 950b5d62368f0c8af9051efe05b61f17 ChangeLog 10509 +RMD160 628c5368d5cdefcfaaa8f101de322f91e0b84a7a ChangeLog 10509 +SHA256 5a33db596903e438f7e06adce754d5ae0c73bd59a448905aadf2a8dfb3024628 ChangeLog 10509 MISC metadata.xml 539 RMD160 ebed312bca45b48f276fef682112676a7db60291 SHA1 7ea3b80e47be90dbc1ee37581186a5b59483a3d8 SHA256 df08b5714a84814335206b660a04b3bba211d3d8fd3b7e9d9afba1be375754b6 MD5 6e04f926f281bd16bb09b7ae372fbaff metadata.xml 539 RMD160 ebed312bca45b48f276fef682112676a7db60291 metadata.xml 539 SHA256 df08b5714a84814335206b660a04b3bba211d3d8fd3b7e9d9afba1be375754b6 metadata.xml 539 -MD5 e336d26d231eefe5244cf5ed40f0a316 files/digest-kaffe-1.1.7-r3 244 -RMD160 d22fe2ab8898f1e7f76b92e40825db8d3903c771 files/digest-kaffe-1.1.7-r3 244 -SHA256 105a9ee7995a77eeaabc82a9ca3264f9f7e61395c42e9dc76f9545ba44a35789 files/digest-kaffe-1.1.7-r3 244 +MD5 e336d26d231eefe5244cf5ed40f0a316 files/digest-kaffe-1.1.7-r4 244 +RMD160 d22fe2ab8898f1e7f76b92e40825db8d3903c771 files/digest-kaffe-1.1.7-r4 244 +SHA256 105a9ee7995a77eeaabc82a9ca3264f9f7e61395c42e9dc76f9545ba44a35789 files/digest-kaffe-1.1.7-r4 244 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFcHegcxLzpIGCsLQRAokyAJ4vTG5BtsGpiPyY0xv/+7psU7KR3wCfbixI -Gij7m2MmvlDo3KC8TZgtJ/4= -=TAWH +iD8DBQFFcHgocxLzpIGCsLQRAn9mAJ9oVeoiGubwq788M4IxpQLm0W9biwCdHDWG +H9+yVbnDAW+Aq6nCGx3svlI= +=yGua -----END PGP SIGNATURE----- diff --git a/dev-java/kaffe/files/digest-kaffe-1.1.7-r3 b/dev-java/kaffe/files/digest-kaffe-1.1.7-r3 deleted file mode 100644 index 728f17b6760f..000000000000 --- a/dev-java/kaffe/files/digest-kaffe-1.1.7-r3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 6ba7a8ef815ddafcb1ec75f268f58897 kaffe-1.1.7.tar.bz2 10976055 -RMD160 8f58ee1b9389f5a562f152dabeeeeb6072eb1d57 kaffe-1.1.7.tar.bz2 10976055 -SHA256 827f861c2d404a0fefed286f3691da61928b0d84e7d13eda8620d4fe47fa244c kaffe-1.1.7.tar.bz2 10976055 diff --git a/dev-java/kaffe/kaffe-1.1.7-r3.ebuild b/dev-java/kaffe/kaffe-1.1.7-r3.ebuild deleted file mode 100644 index 381dd2ebca92..000000000000 --- a/dev-java/kaffe/kaffe-1.1.7-r3.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.7-r3.ebuild,v 1.6 2006/10/26 07:42:42 nichoj Exp $ - -JAVA_SUPPORTS_GENERATION_1="true" -inherit base eutils java-vm-2 flag-o-matic - -DESCRIPTION="A cleanroom, open source Java VM and class libraries" -SRC_URI="ftp://ftp.kaffe.org/pub/${PN}/v1.1.x-development/${P}.tar.bz2" -HOMEPAGE="http://www.kaffe.org/" - -#robilad recommended 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 - 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} - -# We need to build this after kaffe because it is implemented in java -PDEPEND="dev-java/gjdoc" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -#X qt -IUSE="alsa esd gmp gtk nls" - -# kaffe-1.1.6-alsa.patch is needed to prevent compile errors with newer alsas -# (see bug #119272) -#PATCHES="${FILESDIR}/${PN}-1.1.6-alsa.patch" - -# ignore execstack for now. needs to be fixed upstream -# http://kaffe.org/cgi-bin/bugzilla/show_bug.cgi?id=59 -QA_EXECSTACK_x86="opt/${P}/jre/lib/i386/libkaffevm-1.1.7.so" - -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." - epause 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." - epause 3 - fi -} - -src_compile() { - local confargs="" - - # see #88330 - filter-flags "-fomit-frame-pointer" - append-flags "-fno-strict-aliasing" - - 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 ) \ - - # according to dalibor, this is needed on ppc because jit is - # not complete - # TODO needs testing! - use ppc && confargs="${confargs} --with-engine=intrp" - - # Use bundled fastjar until we have a separate fastjar package - # bug #141477 - FASTJAR="$S/external/gcc/fastjar/fastjar" - # --with-rt-jar in 1.1.7 to use the system installed classpath - econf \ - --disable-dependency-tracking \ - --prefix=/opt/${P} \ - --host=${CHOST} \ - $(use_with alsa)\ - $(use_with esd) \ - $(use_with gmp) \ - $(use_enable nls) \ - $(use_enable gtk gtk-peer) \ - ${confargs} \ - --with-jikes \ - --disable-gjdoc || die "Failed to configure." - - # --with-bcel - # --with-profiling - emake || die "Failed to compile" -} - -src_install() { - emake DESTDIR="${D}" install || die "Failed to install" - set_java_env - - # use doexe to ensure executable bit (bug #144635) - echo '#!/bin/bash' > javadoc - echo 'exec /usr/bin/gjdoc "${@}"' >> javadoc - exeinto "/opt/${P}/bin/" - doexe javadoc - - # Remove some files that collide with classpath - rm ${D}/usr/share/info/vmintegration.info \ - ${D}/usr/share/info/hacking.info - - # Add symlink to glibj.zip, for bug #148607 - cd ${D}/opt/${P}/jre/lib - ln -s glibj.zip rt.jar -} - -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!" -}