diff options
| -rw-r--r-- | dev-java/cacao/ChangeLog | 3 | ||||
| -rw-r--r-- | dev-java/cacao/Manifest | 7 | ||||
| -rw-r--r-- | dev-java/cacao/cacao-0.98.ebuild | 31 | ||||
| -rw-r--r-- | dev-java/cacao/cacao-0.99.2.ebuild | 36 | ||||
| -rw-r--r-- | dev-java/cacao/files/cacao.env | 18 | ||||
| -rw-r--r-- | dev-java/gnu-classpath/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/gnu-classpath/Manifest | 10 | ||||
| -rw-r--r-- | dev-java/gnu-classpath/gnu-classpath-0.96.1.ebuild | 3 | ||||
| -rw-r--r-- | dev-java/gnu-classpath/gnu-classpath-0.97.1.ebuild | 1 | ||||
| -rw-r--r-- | dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild | 1 | ||||
| -rw-r--r-- | dev-java/gnu-classpath/gnu-classpath-0.97.ebuild | 1 |
11 files changed, 102 insertions, 15 deletions
diff --git a/dev-java/cacao/ChangeLog b/dev-java/cacao/ChangeLog index 74c4a7db..89fbe837 100644 --- a/dev-java/cacao/ChangeLog +++ b/dev-java/cacao/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/dev-java/cacao/ChangeLog,v 1.12 2006/10/06 14:25:54 caster Exp $ + 08 Jul 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> cacao-0.99.2.ebuild cacao-0.98.ebuild: + Provide CACAO as a JDK to java-config. + * cacao-0.99.2 (08 Jul 2008) 08 Jul 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> cacao-0.99.2.ebuild: diff --git a/dev-java/cacao/Manifest b/dev-java/cacao/Manifest index 5ff2f78e..576be680 100644 --- a/dev-java/cacao/Manifest +++ b/dev-java/cacao/Manifest @@ -1,8 +1,9 @@ +AUX cacao.env 522 RMD160 a9c9aa965a0d8ebe683bc4dc31d2ff1229db190d SHA1 f768a6384512dcae1385c34672cb52ae6946b9ec SHA256 3be3d2a73dd33fae915656ef5d964159cdcba4370d38fe40c514ab074c97f9ab DIST cacao-0.97.tar.gz 2873069 RMD160 b1b91ac0d0fe548cdecf7ddad9f6f6c6c1a4d610 SHA1 1db66e6912a0b222a01eba74e5c6ed364acc4393 SHA256 24c8c23dcb3214d6617cf1638c355d10dd166db1265e873225e6f9164e8487b3 DIST cacao-0.98.tar.bz2 2393690 RMD160 d40de58053601474b787a78d92418b0df4b3192c SHA1 2adfc4c4514cb29fd15052ad28323eb35824e8b5 SHA256 cb9363add825cedf77764fc49a223aaf43f0a9f485b711ba8c92f16b13fff188 DIST cacao-0.99.2.tar.bz2 3036980 RMD160 eead9ecd1e6da11330d1ca9bacbe57309131f232 SHA1 9b1f25bff55c95d3c6ffef576a2d35a799c2d521 SHA256 670cd8fccb0749e657ebe72fa01e1b2dfbce3d811fe617136ccb8a39fc0bd5da EBUILD cacao-0.97.ebuild 1162 RMD160 1dcab3e00757c427d9ad4f7d9bbae3cf5b02cf2a SHA1 53bfecc0f4612afc9567a544cfc3b5d99ea3a86e SHA256 3a6dc102ed2a6be8669a8d9c45d4a2a5924d48db38e30053ff5d9f40f123c53e -EBUILD cacao-0.98.ebuild 1139 RMD160 77b07b0ef337122095e5f3adf518759d030cffcb SHA1 a1bee6895dac25a503073b1320a3e1a13bc49c5e SHA256 d7b01d006a750b92a6a8948e78a31117e596e9aa46e66cd9a305172eab44751f -EBUILD cacao-0.99.2.ebuild 1115 RMD160 41d88b9b34e4295657f9e8dc78e952f928136ead SHA1 2435dd62596c9a0d193544a0ebe7b81834548140 SHA256 3dc7ce06e39b491739abf9d67ba8ff8160ea56b421b5f3ac16c935e373c1171e -MISC ChangeLog 1853 RMD160 ca5f34e6d34601ac97645cc607e69fcb2c871a77 SHA1 1efd33fa034a3faf6992b554e3b9aa92ed2d6a00 SHA256 118390979a9dcd19e7217fa0b16bae94b3d1e74ad3fb140aabc2f495209214c5 +EBUILD cacao-0.98.ebuild 1765 RMD160 be007d2fe43213e0aaa1f4313f668703ba17c8fd SHA1 cccaa12f240bca47a23137b4238e4b7386f8c035 SHA256 b348edc4f58b1c6e7a80ac144d2b1934a152cd8e09184c86470a056651687ee8 +EBUILD cacao-0.99.2.ebuild 1659 RMD160 d577336c29814011dd8045e15835ba9d1479629b SHA1 b7d4d4ab9503fb2db201386daeafe8a1bf117789 SHA256 eda33f3f9ff62d810a8b6fd55665ee1c3701b51babe0c1e7700168b830e8d443 +MISC ChangeLog 1997 RMD160 34767bfb9834d3f0234b969e99dcc653e413cc08 SHA1 ef6bb7f40bbdf2333bdb78ed56c0594895a55250 SHA256 eafd33a3e8408e62f9145bf4fe2d8786a6b9824960f1e949aee47414485a69b0 MISC metadata.xml 464 RMD160 e30951e25ea7e5e71c8469c303a9f9f1fed5ce39 SHA1 749e55dd6aff90ba6f0b76fbd54c6739be0cc146 SHA256 648976dc31571bed5f135e76d886fe0a5b6a3d8c94d15a6889f76525a4ac3cd7 diff --git a/dev-java/cacao/cacao-0.98.ebuild b/dev-java/cacao/cacao-0.98.ebuild index a554afff..dea4d183 100644 --- a/dev-java/cacao/cacao-0.98.ebuild +++ b/dev-java/cacao/cacao-0.98.ebuild @@ -4,7 +4,7 @@ EAPI=1 -inherit eutils flag-o-matic +inherit eutils flag-o-matic java-vm-2 DESCRIPTION="Cacao Java Virtual Machine" HOMEPAGE="http://www.cacaojvm.org/" @@ -19,6 +19,10 @@ RDEPEND="${DEPEND}" CLASSPATH_DIR=/usr/gnu-classpath-${CLASSPATH_SLOT} +pkg_setup() { + java-vm-2_pkg_setup +} + src_compile() { # Upstream has patches this already so we just use this until the next # version @@ -39,4 +43,29 @@ src_install() { dodir /usr/bin dosym /usr/${P}/bin/cacao /usr/bin/cacao dodoc AUTHORS ChangeLog* NEWS README || die "failed to install docs" + + for files in ${CLASSPATH_DIR}/bin/g*; + do + dosym $files /usr/${P}/bin/$(echo $files|sed "s#$(dirname $files)/g##"); + done + + dodir /usr/${P}/jre/lib + dosym ${CLASSPATH_DIR}/share/classpath/glibj.zip /usr/${P}/jre/lib/rt.jar + dodir /usr/${P}/lib + dosym ${CLASSPATH_DIR}/share/classpath/tools.zip /usr/${P}/lib + + # use ecj for javac + if [ -e /usr/bin/ecj ]; then + dosym /usr/bin/ecj /usr/${P}/bin/javac; + else + dosym $(ls -r /usr/bin/ecj-3*|head -n 1) /usr/${P}/bin/javac; + fi + + set_java_env +} + +pkg_postinst() { + + # Set as default VM if none exists + java-vm-2_pkg_postinst } diff --git a/dev-java/cacao/cacao-0.99.2.ebuild b/dev-java/cacao/cacao-0.99.2.ebuild index c9e68cea..4dce4849 100644 --- a/dev-java/cacao/cacao-0.99.2.ebuild +++ b/dev-java/cacao/cacao-0.99.2.ebuild @@ -4,7 +4,7 @@ EAPI=1 -inherit eutils flag-o-matic +inherit eutils flag-o-matic java-vm-2 DESCRIPTION="Cacao Java Virtual Machine" HOMEPAGE="http://www.cacaojvm.org/" @@ -19,15 +19,16 @@ RDEPEND="${DEPEND}" CLASSPATH_DIR=/usr/gnu-classpath-${CLASSPATH_SLOT} -src_compile() { - # Upstream has patches this already so we just use this until the next - # version - append-flags -Wa,--noexecstack +pkg_setup() { + java-vm-2_pkg_setup +} +src_compile() { # A compiler can be forced with the JAVAC variable if needed unset JAVAC econf --bindir=/usr/${P}/bin \ --libdir=/usr/${P}/lib \ + --datarootdir=/usr/${P}/share \ --disable-dependency-tracking \ --with-java-runtime-library-prefix=${CLASSPATH_DIR} emake || die "emake failed" @@ -38,4 +39,29 @@ src_install() { dodir /usr/bin dosym /usr/${P}/bin/cacao /usr/bin/cacao dodoc AUTHORS ChangeLog* NEWS README || die "failed to install docs" + + for files in ${CLASSPATH_DIR}/bin/g*; + do + dosym $files /usr/${P}/bin/$(echo $files|sed "s#$(dirname $files)/g##"); + done + + dodir /usr/${P}/jre/lib + dosym ${CLASSPATH_DIR}/share/classpath/glibj.zip /usr/${P}/jre/lib/rt.jar + dodir /usr/${P}/lib + dosym ${CLASSPATH_DIR}/share/classpath/tools.zip /usr/${P}/lib + + # use ecj for javac + if [ -e /usr/bin/ecj ]; then + dosym /usr/bin/ecj /usr/${P}/bin/javac; + else + dosym $(ls -r /usr/bin/ecj-3*|head -n 1) /usr/${P}/bin/javac; + fi + + set_java_env +} + +pkg_postinst() { + + # Set as default VM if none exists + java-vm-2_pkg_postinst } diff --git a/dev-java/cacao/files/cacao.env b/dev-java/cacao/files/cacao.env new file mode 100644 index 00000000..adf60565 --- /dev/null +++ b/dev-java/cacao/files/cacao.env @@ -0,0 +1,18 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +VERSION="CACAO @PV@" +JAVA_HOME=/usr/@P@ +JDK_HOME=/usr/@P@ +JAVAC=${JAVA_HOME}/bin/javac +PATH="${JAVA_HOME}/bin" +ROOTPATH="${JAVA_HOME}/bin" +LDPATH="${JAVA_HOME}/lib" +INFOPATH="${JAVA_HOME}/info" +MANPATH="${JAVA_HOME}/man" +PROVIDES_TYPE="JDK JRE" +PROVIDES_VERSION="1.5" +BOOTCLASSPATH="${JAVA_HOME}/jre/lib/rt.jar" +GENERATION="2" +ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH INFOPATH MANPATH" diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog index 62987d1d..bdafbe1b 100644 --- a/dev-java/gnu-classpath/ChangeLog +++ b/dev-java/gnu-classpath/ChangeLog @@ -2,6 +2,12 @@ # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.81 2008/05/17 11:36:40 nixnut Exp $ + 08 Jul 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> gnu-classpath-*.ebuild: + Add vm option so the g* wrappers in bin work with the java selected by java-config. + + 08 Jul 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> gnu-classpath-0.96.1.ebuild: + Fix slot. + 06 Jul 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> gnu-classpath-0.97.1.ebuild gnu-classpath-0.97.2.ebuild gnu-classpath-0.97.ebuild: Replace jdk dependency with ecj and include --with-ecj-jar option so ant works. diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest index ed85e14b..af6f7513 100644 --- a/dev-java/gnu-classpath/Manifest +++ b/dev-java/gnu-classpath/Manifest @@ -3,9 +3,9 @@ DIST classpath-0.96.1.tar.gz 10292454 RMD160 660cd6b0c6ae16c91136cf1cf7b3371139b DIST classpath-0.97.1.tar.gz 10275689 RMD160 665efe03e2f8686bb4ef27d4de8e00d283fcfa04 SHA1 04486b0ce8d4da1f4111d28ae03b149cc475d6dd SHA256 6d03fc6ee0e33a32d6bf9c4b1114505ac568ba17e7c7eef6c76918e53174b7c5 DIST classpath-0.97.2.tar.gz 10318014 RMD160 a33667d2b692da22cb872c57265511115a543a76 SHA1 627e9781f9bb744b1a70e4aaff88d2d0440cbf1f SHA256 001fee5ad3ddd043783d59593153510f09064b0d9b5aea82f535266f62f02db4 DIST classpath-0.97.tar.gz 8379 RMD160 82947e633441635128645fbdb0a6254036f908b5 SHA1 c658a9f56c3dd9fd0881fb4b5a1f353fc2aa3400 SHA256 62273aa444899c8e30269cb944255684a5ff970db121a4473157347410e3bf8f -EBUILD gnu-classpath-0.96.1.ebuild 2565 RMD160 fd83bb450906ece41b2c963309b4b8141b83c3ac SHA1 e7bf2b1a864f4630563a4a3ae1fc5c6be117e54e SHA256 229573cd29c64adb700ec9e1e22e608351740ffd143f8ed9a5aa797dc6bf0d83 -EBUILD gnu-classpath-0.97.1.ebuild 2369 RMD160 6ac105480b56acf6d1fde6c08ec07e266c227539 SHA1 c1cbfc3b18c9e3e21508325f338d57125a31f921 SHA256 4ef7ba0120d9d856c3954805de5cd87ee27b6322f9597df8c123da4a07c9cb28 -EBUILD gnu-classpath-0.97.2.ebuild 2414 RMD160 d9d0737e2da3cfa0a9aba7f0d78fde85ac3316c6 SHA1 2b290a75c2016ba7782a31156cae47651b484287 SHA256 dd56056664f2c0f0eddfacd08526ebcde5dfa5482c11c77172073f2035c101e3 -EBUILD gnu-classpath-0.97.ebuild 2482 RMD160 a411b8b8e779e63d132e9fe93b822492df97cfc4 SHA1 dbb1e064554b7abab3b8302f164933363f3bc8ff SHA256 05683ca3188b7a20adf965b86690816df4a3d2c20d0d472a5078a2b5037c8e5a -MISC ChangeLog 13280 RMD160 ea65789b88acf202d93ec8eb4a2ee36e8963e307 SHA1 d5dd8f1dbefd8c8cc8653dc0d4b6971653ac1c3d SHA256 e26aaf26edd9fc51ebb1c143a3298e2c9a4e81b17b035bf6882eef9e77570755 +EBUILD gnu-classpath-0.96.1.ebuild 2582 RMD160 bde401a39f73cbe2387beea21884fc9777607a8e SHA1 204cf97da1a6c1b312f58d0de1cb3907383bd65f SHA256 c9983269ad93728cde84a8047d77b8bbd169ddf8e3f65f2691ce1d0e79a681a3 +EBUILD gnu-classpath-0.97.1.ebuild 2388 RMD160 92b9d2a0ac92ff65fed6de9ca216af4fa39723c4 SHA1 7f3de4bb478101348adc6e499f7072e8bd1c0597 SHA256 31e25cc856ce4513a3bdb221e31097d190593919aa067df93511b1b386469496 +EBUILD gnu-classpath-0.97.2.ebuild 2433 RMD160 e702408d6b0b7d0e5d91dcc38630b936dcfdf3bd SHA1 66fd166264307aadb401511a8bb4903763098f89 SHA256 407fa53e04d0fef290ee63f55933dd048a901b4fa7bb8d064400bab8d39309e3 +EBUILD gnu-classpath-0.97.ebuild 2501 RMD160 161335e71b1ff3ca6a88ac6edd43da5d04b03120 SHA1 3a949058b04cb4206468c0aca4e9eb9343867957 SHA256 41b58a7d7a03e99a0a3acf8ca5615a5aef985a762327fdaf046dbf569efe72f0 +MISC ChangeLog 13558 RMD160 03fe446b04b8c2f68c578d1f782e7da55bd7e9b2 SHA1 48bc3f3161fcfec2413ca51695a2a1cd05a798a7 SHA256 a250b726a897e65764ebe12e7d22557ad8ce29f339e9a4a4adfa3b5baf74089f MISC metadata.xml 474 RMD160 9096353201034311a6ee33efd5fdcc9ccf12e666 SHA1 37af515c586bfddd4a70152347b3e3a36aebc2a8 SHA256 930ca2d89e79cb2234cb761c2c7fcc0061475767ee17a2501d2470c524ce0b30 diff --git a/dev-java/gnu-classpath/gnu-classpath-0.96.1.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.96.1.ebuild index d45afff0..f0b0c26e 100644 --- a/dev-java/gnu-classpath/gnu-classpath-0.96.1.ebuild +++ b/dev-java/gnu-classpath/gnu-classpath-0.96.1.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz" HOMEPAGE="http://www.gnu.org/software/classpath" LICENSE="GPL-2-with-linking-exception" -SLOT="0.96.1" +SLOT="0.96" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="alsa cairo debug doc dssi examples gconf gtk gstreamer nsplugin qt4 xml" @@ -91,6 +91,7 @@ src_compile() { --host=${CHOST} \ --prefix=/usr/${PN}-${SLOT} \ --with-ecj=/usr/bin/ecj-3.2 \ + --with-vm=java \ || die "configure failed" emake || die "make failed" } diff --git a/dev-java/gnu-classpath/gnu-classpath-0.97.1.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.97.1.ebuild index 9a597f7b..63596cfa 100644 --- a/dev-java/gnu-classpath/gnu-classpath-0.97.1.ebuild +++ b/dev-java/gnu-classpath/gnu-classpath-0.97.1.ebuild @@ -80,6 +80,7 @@ src_compile() { --host=${CHOST} \ --prefix=/usr/${PN}-${SLOT} \ --with-ecj-jar=$(ls -r /usr/share/eclipse-ecj-3.*/lib/ecj.jar|head -n 1) \ + --with-vm=java \ || die "configure failed" emake || die "make failed" } diff --git a/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild index 8d138b81..6dd5e169 100644 --- a/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild +++ b/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild @@ -81,6 +81,7 @@ src_compile() { --host=${CHOST} \ --prefix=/usr/${PN}-${SLOT} \ --with-ecj-jar=$(ls -r /usr/share/eclipse-ecj-3.*/lib/ecj.jar|head -n 1) \ + --with-vm=java \ || die "configure failed" emake || die "make failed" } diff --git a/dev-java/gnu-classpath/gnu-classpath-0.97.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.97.ebuild index 4f7fb5c4..13eb3d99 100644 --- a/dev-java/gnu-classpath/gnu-classpath-0.97.ebuild +++ b/dev-java/gnu-classpath/gnu-classpath-0.97.ebuild @@ -88,6 +88,7 @@ src_compile() { --host=${CHOST} \ --prefix=/usr/${PN}-${SLOT} \ --with-ecj-jar=$(ls -r /usr/share/eclipse-ecj-3.*/lib/ecj.jar|head -n 1) \ + --with-vm=java \ || die "configure failed" emake || die "make failed" } |