diff options
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/gnu-classpath/ChangeLog | 8 | ||||
-rw-r--r-- | dev-java/gnu-classpath/files/0.93-nsplugin.patch | 28 | ||||
-rw-r--r-- | dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild | 119 | ||||
-rw-r--r-- | dev-java/gnu-classpath/gnu-classpath-0.97.2-r1.ebuild | 95 | ||||
-rw-r--r-- | dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild | 91 | ||||
-rw-r--r-- | dev-java/gnu-classpath/gnu-classpath-0.98-r1.ebuild | 110 |
6 files changed, 7 insertions, 444 deletions
diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog index df252ea935ef..5dad0b06090f 100644 --- a/dev-java/gnu-classpath/ChangeLog +++ b/dev-java/gnu-classpath/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/gnu-classpath # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.111 2010/06/27 18:58:56 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.112 2010/07/06 19:26:20 caster Exp $ + + 06 Jul 2010; Vlastimil Babka <caster@gentoo.org> + -files/0.93-nsplugin.patch, -gnu-classpath-0.97-r1.ebuild, + -gnu-classpath-0.97.2.ebuild, -gnu-classpath-0.97.2-r1.ebuild, + -gnu-classpath-0.98-r1.ebuild: + Remove the now unused 0.97 slot, bug #316477. 27 Jun 2010; Pacho Ramos <pacho@gentoo.org> gnu-classpath-0.98-r3.ebuild: stable amd64, bug 321953 diff --git a/dev-java/gnu-classpath/files/0.93-nsplugin.patch b/dev-java/gnu-classpath/files/0.93-nsplugin.patch deleted file mode 100644 index 1497a28d6c99..000000000000 --- a/dev-java/gnu-classpath/files/0.93-nsplugin.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: configure.ac -=================================================================== -RCS file: /cvsroot/classpath/classpath/configure.ac,v -retrieving revision 1.195 -diff -u -r1.195 configure.ac ---- configure.ac 1 Mar 2007 00:26:08 -0000 1.195 -+++ configure.ac 2 Mar 2007 19:47:02 -0000 -@@ -590,16 +590,16 @@ - if test "x${COMPILE_PLUGIN}" = xyes; then - PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) - if test "x${MOZILLA_FOUND}" = xno; then -- PKG_CHECK_MODULES(MOZILLA, firefox-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) -+ PKG_CHECK_MODULES(MOZILLA, firefox-plugin firefox-xpcom, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) - fi - if test "x${MOZILLA_FOUND}" = xno; then -- PKG_CHECK_MODULES(MOZILLA, xulrunner-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) -+ PKG_CHECK_MODULES(MOZILLA, xulrunner-plugin xulrunner-xpcom, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) - fi - if test "x${MOZILLA_FOUND}" = xno; then -- PKG_CHECK_MODULES(MOZILLA, mozilla-firefox-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) -+ PKG_CHECK_MODULES(MOZILLA, mozilla-firefox-plugin mozilla-firefox-xpcom, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) - fi - if test "x${MOZILLA_FOUND}" = xno; then -- PKG_CHECK_MODULES(MOZILLA, seamonkey-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) -+ PKG_CHECK_MODULES(MOZILLA, seamonkey-plugin seamonkey-xpcom, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) - fi - PKG_CHECK_MODULES(GLIB, glib-2.0) - diff --git a/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild deleted file mode 100644 index 8fafa7cf3835..000000000000 --- a/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild,v 1.15 2010/03/25 13:15:47 caster Exp $ - -EAPI=1 - -inherit eutils multilib java-pkg-2 - -# .properties were from missing from tools.zip so I rolled out my own tarball -# Should be changed back to upstream tarballs fro next release -# - betelgeuse -MY_P=${P/gnu-/}-gentoo -DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java programming language" -SRC_URI="mirror://gentoo/${MY_P}.tar.gz" -HOMEPAGE="http://www.gnu.org/software/classpath" - -LICENSE="GPL-2-with-linking-exception" -SLOT="0.97" -KEYWORDS="amd64 ppc ppc64 x86" - -IUSE="alsa debug doc dssi examples gconf gtk gstreamer qt4 xml" - -RDEPEND="alsa? ( media-libs/alsa-lib ) - doc? ( >=dev-java/gjdoc-0.7.8 ) - dssi? ( >=media-libs/dssi-0.9 ) - gconf? ( - >=gnome-base/gconf-2.6.0 - >=x11-libs/gtk+-2.8 - ) - gtk? ( - >=x11-libs/gtk+-2.8 - >=dev-libs/glib-2.0 - media-libs/freetype - >=x11-libs/cairo-1.1.9 - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXtst - x11-libs/pango - ) - qt4? ( x11-libs/qt-gui:4 ) - xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 ) - gstreamer? ( - >=media-libs/gstreamer-0.10.10 - >=media-libs/gst-plugins-base-0.10.10 - x11-libs/gtk+ - ) - sys-apps/file" - -DEPEND="app-arch/zip - || ( - dev-java/eclipse-ecj:3.3 - >=virtual/jdk-1.6.0 - ) - gtk? ( - || ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1 ) - x11-proto/xproto - ) - ${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - has_version dev-java/eclipse-ecj:3.3 && export HAVE_ECJ=true - if [[ ${HAVE_ECJ} ]]; then - export JAVAC="/usr/bin/ecj-3.3 -nowarn" - else - java-pkg-2_pkg_setup - fi -} - -src_compile() { - # Upstreams sets proper -source and -target - unset JAVACFLAGS - - # Forcing 1.6 for now because of this but perhaps should come up with - # something smart - - #if [[ ( ${GENTOO_VM} == sun-jdk-1.5 || ${GENTOO_VM} == ibm-jdk-bin-1.5 ) \ - # && ${GENTOO_COMPILER} == javac ]]; then - # eerror "javac from ${GENTOO_VM} is not able to compile" - # eerror "${CATEGORY}/${P}, use ecj or sun-jdk-1.6 instead" - # die "Unusable JDK + compiler combination" - #fi - - if [[ ${HAVE_ECJ} ]]; then - local myconf="--with-ecj-jar=$(java-pkg_getjars --build-only eclipse-ecj-3.3)" - - # build system is passing -J-Xmx768M which ecj however ignores - # this will make the ecj launcher do it (bug #225921) - export gjl_java_args="-Xmx768M" - fi - # don't use econf, because it ends up putting things under /usr, which may - # collide with other slots of classpath - ./configure ${compiler} \ - $(use_enable alsa) \ - $(use_enable debug ) \ - $(use_enable examples) \ - $(use_enable gconf gconf-peer) \ - $(use_enable gtk gtk-peer) \ - $(use_enable gstreamer gstreamer-peer) \ - $(use_enable qt4 qt-peer) \ - $(use_enable xml xmlj) \ - $(use_enable dssi ) \ - $(use_with doc gjdoc) \ - ${myconf} \ - --enable-jni \ - --disable-dependency-tracking \ - --disable-Werror \ - --disable-plugin \ - --host=${CHOST} \ - --prefix=/opt/${PN}-${SLOT} \ - || die "configure failed" - emake || die "make failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO || die -} diff --git a/dev-java/gnu-classpath/gnu-classpath-0.97.2-r1.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.97.2-r1.ebuild deleted file mode 100644 index 64c6970334d5..000000000000 --- a/dev-java/gnu-classpath/gnu-classpath-0.97.2-r1.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97.2-r1.ebuild,v 1.4 2010/03/25 13:15:47 caster Exp $ - -EAPI=1 - -inherit eutils multilib java-pkg-2 - -MY_P=${P/gnu-/} -DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java language" -SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz" -HOMEPAGE="http://www.gnu.org/software/classpath" - -LICENSE="GPL-2-with-linking-exception" -SLOT="0.97" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" - -IUSE="alsa debug doc dssi examples gconf gtk gstreamer qt4 xml" - -RDEPEND="alsa? ( media-libs/alsa-lib ) - doc? ( >=dev-java/gjdoc-0.7.8 ) - dssi? ( >=media-libs/dssi-0.9 ) - gconf? ( - >=gnome-base/gconf-2.6.0 - >=x11-libs/gtk+-2.8 - ) - gtk? ( - >=x11-libs/gtk+-2.8 - >=dev-libs/glib-2.0 - media-libs/freetype - >=x11-libs/cairo-1.1.9 - x11-libs/pango - x11-libs/libICE - x11-libs/libSM - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXtst - x11-libs/libX11 - ) - qt4? ( x11-libs/qt-gui:4 ) - xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 ) - gstreamer? ( - >=media-libs/gstreamer-0.10.10 - >=media-libs/gst-plugins-base-0.10.10 - x11-libs/gtk+ - ) - sys-apps/file" - -DEPEND="app-arch/zip - dev-java/eclipse-ecj:3.5 - gtk? ( - x11-libs/libXrender - || ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1 ) - x11-proto/xproto - ) - ${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -src_compile() { - export JAVAC="/usr/bin/ecj-3.5 -nowarn" - - # build system is passing -J-Xmx768M which ecj however ignores - # this will make the ecj launcher do it (bug #225921) - export gjl_java_args="-Xmx768M" - - # don't use econf, because it ends up putting things under /usr, which may - # collide with other slots of classpath - ./configure \ - $(use_enable alsa) \ - $(use_enable debug ) \ - $(use_enable examples) \ - $(use_enable gconf gconf-peer) \ - $(use_enable gtk gtk-peer) \ - $(use_enable gstreamer gstreamer-peer) \ - $(use_enable qt4 qt-peer) \ - $(use_enable xml xmlj) \ - $(use_enable dssi ) \ - $(use_with doc gjdoc) \ - --enable-jni \ - --disable-dependency-tracking \ - --disable-Werror \ - --disable-plugin \ - --host=${CHOST} \ - --prefix=/opt/${PN}-${SLOT} \ - --with-ecj-jar=$(java-pkg_getjar --build-only eclipse-ecj:3.5 ecj.jar) \ - --with-vm=java \ - || die "configure failed" - emake || die "make failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO || die -} diff --git a/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild deleted file mode 100644 index 3edfb1f39e1d..000000000000 --- a/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild,v 1.10 2010/03/25 13:15:47 caster Exp $ - -EAPI=1 - -inherit eutils multilib - -MY_P=${P/gnu-/} -DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java language" -SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz" -HOMEPAGE="http://www.gnu.org/software/classpath" - -LICENSE="GPL-2-with-linking-exception" -SLOT="0.97" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" - -IUSE="alsa debug doc dssi examples gconf gtk gstreamer qt4 xml" - -RDEPEND="alsa? ( media-libs/alsa-lib ) - doc? ( >=dev-java/gjdoc-0.7.8 ) - dssi? ( >=media-libs/dssi-0.9 ) - gconf? ( - >=gnome-base/gconf-2.6.0 - >=x11-libs/gtk+-2.8 - ) - gtk? ( - >=x11-libs/gtk+-2.8 - >=dev-libs/glib-2.0 - media-libs/freetype - >=x11-libs/cairo-1.1.9 - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXtst - x11-libs/pango - ) - qt4? ( x11-libs/qt-gui:4 ) - xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 ) - gstreamer? ( - >=media-libs/gstreamer-0.10.10 - >=media-libs/gst-plugins-base-0.10.10 - x11-libs/gtk+ - ) - sys-apps/file" - -DEPEND="app-arch/zip - dev-java/eclipse-ecj:3.3 - gtk? ( - || ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1 ) - x11-proto/xproto - ) - ${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -src_compile() { - export JAVAC="/usr/bin/ecj-3.3 -nowarn" - - # build system is passing -J-Xmx768M which ecj however ignores - # this will make the ecj launcher do it (bug #225921) - export gjl_java_args="-Xmx768M" - - # don't use econf, because it ends up putting things under /usr, which may - # collide with other slots of classpath - ./configure \ - $(use_enable alsa) \ - $(use_enable debug ) \ - $(use_enable examples) \ - $(use_enable gconf gconf-peer) \ - $(use_enable gtk gtk-peer) \ - $(use_enable gstreamer gstreamer-peer) \ - $(use_enable qt4 qt-peer) \ - $(use_enable xml xmlj) \ - $(use_enable dssi ) \ - $(use_with doc gjdoc) \ - --enable-jni \ - --disable-dependency-tracking \ - --disable-Werror \ - --disable-plugin \ - --host=${CHOST} \ - --prefix=/opt/${PN}-${SLOT} \ - --with-ecj-jar=/usr/share/eclipse-ecj-3.3/lib/ecj.jar \ - --with-vm=java \ - || die "configure failed" - emake || die "make failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO || die -} diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r1.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r1.ebuild deleted file mode 100644 index de1c8e4389c2..000000000000 --- a/dev-java/gnu-classpath/gnu-classpath-0.98-r1.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.98-r1.ebuild,v 1.9 2010/03/25 13:15:47 caster Exp $ - -EAPI=2 - -inherit eutils java-pkg-2 base multilib - -MY_P=${P/gnu-/} -DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java language" -SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz" -HOMEPAGE="http://www.gnu.org/software/classpath" - -LICENSE="GPL-2-with-linking-exception" -SLOT="0.98" -KEYWORDS="amd64 ppc ppc64 x86" - -IUSE="alsa debug doc dssi examples gconf gjdoc gmp gtk gstreamer qt4 xml" - -RDEPEND="alsa? ( media-libs/alsa-lib ) - doc? ( >=dev-java/gjdoc-0.7.9-r2 ) - dssi? ( >=media-libs/dssi-0.9 ) - gconf? ( gnome-base/gconf ) - gjdoc? ( >=dev-java/antlr-2.7.1:0 ) - gmp? ( >=dev-libs/gmp-4.2.4 ) - gstreamer? ( - >=media-libs/gstreamer-0.10.10 - >=media-libs/gst-plugins-base-0.10.10 - x11-libs/gtk+ - ) - gtk? ( - >=x11-libs/gtk+-2.8 - >=dev-libs/glib-2.0 - media-libs/freetype - >=x11-libs/cairo-1.1.9 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXtst - x11-libs/pango - ) - qt4? ( x11-libs/qt-gui:4 ) - xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 ) - dev-java/eclipse-ecj:3.3" - -# We should make the build not pickup the wrong antlr binary from pccts -DEPEND="app-arch/zip - gjdoc? ( !!dev-util/pccts ) - gtk? ( - x11-libs/libXrender - || ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1 ) - x11-proto/xproto - ) - >=virtual/jdk-1.5 - ${RDEPEND}" - -RDEPEND=">=virtual/jre-1.5 - ${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -src_configure() { - # We require ecj anyway, so force it to avoid problems with bad versions of javac - export JAVAC="/usr/bin/ecj-3.3" - export JAVA="/usr/bin/java" - # build takes care of them itself, duplicate -source -target kills ecj - export JAVACFLAGS="-nowarn" - # build system is passing -J-Xmx768M which ecj however ignores - # this will make the ecj launcher do it (seen case where default was not enough heap) - export gjl_java_args="-Xmx768M" - - # don't use econf, because it ends up putting things under /usr, which may - # collide with other slots of classpath - local myconf - if use gjdoc; then - local antlr=$(java-pkg_getjar antlr antlr.jar) - myconf="--with-antlr-jar=${antlr}" - fi - - ANTLR= ./configure \ - $(use_enable alsa) \ - $(use_enable debug ) \ - $(use_enable examples) \ - $(use_enable gconf gconf-peer) \ - $(use_enable gjdoc) \ - $(use_enable gmp) \ - $(use_enable gtk gtk-peer) \ - $(use_enable gstreamer gstreamer-peer) \ - $(use_enable qt4 qt-peer) \ - $(use_enable xml xmlj) \ - $(use_enable dssi ) \ - $(use_with doc gjdoc) \ - --enable-jni \ - --disable-dependency-tracking \ - --disable-plugin \ - --host=${CHOST} \ - --prefix=/usr/${PN}-${SLOT} \ - --with-ecj-jar=$(java-pkg_getjar eclipse-ecj:3.3 ecj.jar) \ - --disable-Werror \ - ${myconf} \ - || die "configure failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO || die - java-pkg_regjar /usr/${P}/share/classpath/glibj.zip -} |