public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-java/gnu-classpath/
@ 2016-01-10 20:50 James Le Cuirot
  0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2016-01-10 20:50 UTC (permalink / raw
  To: gentoo-commits

commit:     040c1d83edf3fa7992664595216f20e53ee54761
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 10 20:34:46 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jan 10 20:50:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=040c1d83

dev-java/gnu-classpath: Build with regular javac instead of ECJ

I believe GNU Classpath favoured ECJ because it was the only FOSS
compiler capable of building it at the time. OpenJDK is now preferable
and the statement in configure.ac that not using ECJ results in
com.sun.tools.javac not being included doesn't hold true.

The simplification is nice but this also avoids a race condition
occuring with ECJ on ppc. This is almost certainly a CACAO issue. See
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2782.

Package-Manager: portage-2.2.26

 ...sspath-0.98-r4.ebuild => gnu-classpath-0.98-r5.ebuild} | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r4.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild
similarity index 81%
rename from dev-java/gnu-classpath/gnu-classpath-0.98-r4.ebuild
rename to dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild
index 2dc9217..7db6dd6 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.98-r4.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,7 +7,7 @@ EAPI=5
 inherit eutils java-pkg-2 multilib
 
 MY_P=${P/gnu-/}
-DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java language"
+DESCRIPTION="Free core class libraries for use with Java VMs and compilers"
 SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz"
 HOMEPAGE="https://www.gnu.org/software/classpath"
 
@@ -45,7 +45,6 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 		xml? ( >=dev-libs/libxml2-2.6.8:2= >=dev-libs/libxslt-1.1.11 )"
 
 DEPEND="app-arch/zip
-		dev-java/eclipse-ecj
 		gtk? (
 			x11-libs/libXrender
 			>=x11-libs/libXtst-1.1.0
@@ -64,15 +63,6 @@ java_prepare() {
 }
 
 src_configure() {
-	# We require ecj anyway, so force it to avoid problems with bad versions of javac
-	export JAVAC="${EPREFIX}/usr/bin/ecj"
-	export JAVA="${EPREFIX}/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
@@ -106,7 +96,6 @@ src_configure() {
 		--disable-plugin \
 		--host=${CHOST} \
 		--prefix="${EPREFIX}"/usr/${PN}-${SLOT} \
-		--with-ecj-jar=$(java-pkg_getjar --build-only eclipse-ecj-* ecj.jar) \
 		--disable-Werror \
 		${myconf} || die "configure failed"
 }


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/gnu-classpath/
@ 2016-01-14 21:44 James Le Cuirot
  0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2016-01-14 21:44 UTC (permalink / raw
  To: gentoo-commits

commit:     ad4d673c5e709e6e06ba6e3ac085f13460b19095
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  2 20:38:44 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 21:42:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad4d673c

dev-java/gnu-classpath: Mark 0.98-r5 stable on behalf of arch teams

Needs to be done in conjunction with other changes so I am doing the
commit with their permission.

Package-Manager: portage-2.2.26

 dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild
index 7db6dd6..e252411 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnu.org/software/classpath"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0.98"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="alsa debug doc dssi examples gconf +gjdoc gmp gtk gstreamer qt4 xml"
 REQUIRED_USE="doc? ( gjdoc )"


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/gnu-classpath/
@ 2016-01-14 21:44 James Le Cuirot
  0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2016-01-14 21:44 UTC (permalink / raw
  To: gentoo-commits

commit:     4819e64c227062c12b5c11b984786f56da8ab9a0
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  2 20:39:43 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 21:42:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4819e64c

dev-java/gnu-classpath: Remove old

Package-Manager: portage-2.2.26

 .../gnu-classpath/gnu-classpath-0.98-r3.ebuild     | 115 ---------------------
 1 file changed, 115 deletions(-)

diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild
deleted file mode 100644
index 38638c0..0000000
--- a/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils java-pkg-2 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="https://www.gnu.org/software/classpath"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0.98"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-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:0.10
-			>=media-libs/gst-plugins-base-0.10.10:0.10
-			x11-libs/gtk+:2
-		)
-		gtk? (
-				>=x11-libs/gtk+-2.8:2
-				>=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? ( dev-qt/qtgui:4 )
-		xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
-
-# java-config >2.1.11 needed for ecj version globbing
-# We should make the build not pickup the wrong antlr binary from pccts
-DEPEND="app-arch/zip
-		dev-java/eclipse-ecj
-		>=dev-java/java-config-2.1.11
-		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}
-
-java_prepare() {
-	epatch "${FILESDIR}"/${PF}-freetype-2.5.3-support.patch
-}
-
-src_configure() {
-	# We require ecj anyway, so force it to avoid problems with bad versions of javac
-	export JAVAC="${EPREFIX}/usr/bin/ecj"
-	export JAVA="${EPREFIX}/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="${EPREFIX}"/usr/${PN}-${SLOT} \
-		--with-ecj-jar=$(java-pkg_getjar --build-only eclipse-ecj-* ecj.jar) \
-		--disable-Werror \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO
-	java-pkg_regjar /usr/${P}/share/classpath/glibj.zip
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/gnu-classpath/
@ 2017-05-30 22:42 James Le Cuirot
  0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2017-05-30 22:42 UTC (permalink / raw
  To: gentoo-commits

commit:     a5a24ce961a8e624f93a44cf8161a3f76f82cdfb
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue May 30 22:42:20 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue May 30 22:42:20 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5a24ce9

dev-java/gnu-classpath: Force Qt version, fixes bug #619004

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild
index a8d1cb55b48..da840a48a04 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -77,6 +77,9 @@ src_configure() {
 		chmod 755 tools/gjdoc.build || die
 	fi
 
+	# Force Qt version, bug #619004.
+	export QT_SELECT=qt4
+
 	ANTLR= ./configure \
 		$(use_enable alsa) \
 		$(use_enable debug ) \


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/gnu-classpath/
@ 2017-08-29 22:00 James Le Cuirot
  0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2017-08-29 22:00 UTC (permalink / raw
  To: gentoo-commits

commit:     ab6b6706cfef340a742bbc5a48e1fbd8a9a95ebc
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 29 21:58:38 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Aug 29 22:00:20 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab6b6706

dev-java/gnu-classpath: Drop gstreamer and Qt support (#629138)

gstreamer:0.10 is going away due to multiple vulnerabilities. Qt4 will
also be going sooner or later. Straight to stable as nothing new was
added. I was tempted to last-rite this package but it's not become too
bothersome yet.

Package-Manager: Portage-2.3.8, Repoman-2.3.2

 .../gnu-classpath/gnu-classpath-0.98-r6.ebuild     | 116 +++++++++++++++++++++
 1 file changed, 116 insertions(+)

diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild
new file mode 100644
index 00000000000..465018f8f62
--- /dev/null
+++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils java-pkg-2 multilib
+
+MY_P=${P/gnu-/}
+DESCRIPTION="Free core class libraries for use with Java VMs and compilers"
+SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz"
+HOMEPAGE="https://www.gnu.org/software/classpath"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0.98"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="alsa debug doc dssi examples gconf +gjdoc gmp gtk xml"
+REQUIRED_USE="doc? ( gjdoc )"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+		dssi? ( >=media-libs/dssi-0.9 )
+		gconf? ( gnome-base/gconf:2= )
+		gjdoc? ( >=dev-java/antlr-2.7.7-r7:0 )
+		gmp? ( >=dev-libs/gmp-4.2.4:0= )
+		gtk? (
+				>=x11-libs/gtk+-2.8:2=
+				dev-libs/glib:2=
+				media-libs/freetype:2=
+				>=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
+		)
+		xml? ( >=dev-libs/libxml2-2.6.8:2= >=dev-libs/libxslt-1.1.11 )"
+
+DEPEND="app-arch/zip
+		gtk? (
+			x11-libs/libXrender
+			>=x11-libs/libXtst-1.1.0
+			x11-proto/xproto
+		)
+		>=virtual/jdk-1.5
+		${RDEPEND}"
+
+RDEPEND=">=virtual/jre-1.5
+	${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+java_prepare() {
+	epatch "${FILESDIR}"/${P}-freetype-2.5.3-support.patch
+}
+
+src_configure() {
+	# 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
+
+	if use doc; then
+		# Avoid a cyclic dependency on gjdoc by building gjdoc before
+		# the docs. First we need to trick configure. Hack alert!
+		echo -e "#!/bin/sh\necho gjdoc 0.8" > tools/gjdoc.build || die
+		chmod 755 tools/gjdoc.build || die
+	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 xml xmlj) \
+		$(use_enable dssi ) \
+		$(use_with doc gjdoc "${S}/tools/gjdoc.build") \
+		--enable-jni \
+		--disable-dependency-tracking \
+		--disable-plugin \
+		--host=${CHOST} \
+		--prefix="${EPREFIX}"/usr/${PN}-${SLOT} \
+		--disable-Werror \
+		${myconf} || die "configure failed"
+}
+
+src_compile() {
+	if use doc; then
+		# Build gjdoc before the docs. We need to hack the real gjdoc
+		# script to run from the build directory instead.
+		sed -r "s:^(tools_dir=).*:\1${S}/tools:" tools/gjdoc > tools/gjdoc.build || die
+		emake -C lib
+		emake -C tools
+	fi
+
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO
+	java-pkg_regjar /usr/${P}/share/classpath/glibj.zip
+
+	if use doc; then
+		# Strangely the Makefile doesn't install these.
+		insinto "/usr/${PN}-${SLOT}/share/classpath/api"
+		doins -r doc/api/html/*
+	fi
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/gnu-classpath/
@ 2017-08-29 22:00 James Le Cuirot
  0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2017-08-29 22:00 UTC (permalink / raw
  To: gentoo-commits

commit:     231473fccd5043d2ffd20e46bb6aff7d0ff86bd1
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 29 21:59:33 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Aug 29 22:00:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=231473fc

dev-java/gnu-classpath: Remove old 0.98-r5, closes bug #629138

Package-Manager: Portage-2.3.8, Repoman-2.3.2

 .../gnu-classpath/gnu-classpath-0.98-r5.ebuild     | 127 ---------------------
 dev-java/gnu-classpath/metadata.xml                |   2 -
 2 files changed, 129 deletions(-)

diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild
deleted file mode 100644
index da840a48a04..00000000000
--- a/dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-2 multilib
-
-MY_P=${P/gnu-/}
-DESCRIPTION="Free core class libraries for use with Java VMs and compilers"
-SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz"
-HOMEPAGE="https://www.gnu.org/software/classpath"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0.98"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="alsa debug doc dssi examples gconf +gjdoc gmp gtk gstreamer qt4 xml"
-REQUIRED_USE="doc? ( gjdoc )"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-		dssi? ( >=media-libs/dssi-0.9 )
-		gconf? ( gnome-base/gconf:2= )
-		gjdoc? ( >=dev-java/antlr-2.7.7-r7:0 )
-		gmp? ( >=dev-libs/gmp-4.2.4:0= )
-		gstreamer? (
-			>=media-libs/gstreamer-0.10.10:0.10=
-			>=media-libs/gst-plugins-base-0.10.10:0.10=
-			x11-libs/gtk+:2=
-		)
-		gtk? (
-				>=x11-libs/gtk+-2.8:2=
-				dev-libs/glib:2=
-				media-libs/freetype:2=
-				>=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? ( dev-qt/qtgui:4= )
-		xml? ( >=dev-libs/libxml2-2.6.8:2= >=dev-libs/libxslt-1.1.11 )"
-
-DEPEND="app-arch/zip
-		gtk? (
-			x11-libs/libXrender
-			>=x11-libs/libXtst-1.1.0
-			x11-proto/xproto
-		)
-		>=virtual/jdk-1.5
-		${RDEPEND}"
-
-RDEPEND=">=virtual/jre-1.5
-	${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-java_prepare() {
-	epatch "${FILESDIR}"/${P}-freetype-2.5.3-support.patch
-}
-
-src_configure() {
-	# 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
-
-	if use doc; then
-		# Avoid a cyclic dependency on gjdoc by building gjdoc before
-		# the docs. First we need to trick configure. Hack alert!
-		echo -e "#!/bin/sh\necho gjdoc 0.8" > tools/gjdoc.build || die
-		chmod 755 tools/gjdoc.build || die
-	fi
-
-	# Force Qt version, bug #619004.
-	export QT_SELECT=qt4
-
-	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 "${S}/tools/gjdoc.build") \
-		--enable-jni \
-		--disable-dependency-tracking \
-		--disable-plugin \
-		--host=${CHOST} \
-		--prefix="${EPREFIX}"/usr/${PN}-${SLOT} \
-		--disable-Werror \
-		${myconf} || die "configure failed"
-}
-
-src_compile() {
-	if use doc; then
-		# Build gjdoc before the docs. We need to hack the real gjdoc
-		# script to run from the build directory instead.
-		sed -r "s:^(tools_dir=).*:\1${S}/tools:" tools/gjdoc > tools/gjdoc.build || die
-		emake -C lib
-		emake -C tools
-	fi
-
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO
-	java-pkg_regjar /usr/${P}/share/classpath/glibj.zip
-
-	if use doc; then
-		# Strangely the Makefile doesn't install these.
-		insinto "/usr/${PN}-${SLOT}/share/classpath/api"
-		doins -r doc/api/html/*
-	fi
-}

diff --git a/dev-java/gnu-classpath/metadata.xml b/dev-java/gnu-classpath/metadata.xml
index 336b9ee0b43..da784f85824 100644
--- a/dev-java/gnu-classpath/metadata.xml
+++ b/dev-java/gnu-classpath/metadata.xml
@@ -12,8 +12,6 @@
 		<flag name="gmp">Build with GMP backend for java.math.BigInteger</flag>
 		<flag name="gjdoc">Build GJDoc, a documentation generator</flag>
 		<flag name="gtk">Build with Gtk+ AWT peers</flag>
-		<flag name="gstreamer">Build with GStreamer javax.sound.sampler provider</flag>
-		<flag name="qt4">Build with Qt4 AWT peers</flag>
 		<flag name="xml">Build with native XML backend</flag>
 	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2017-08-29 22:00 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-29 22:00 [gentoo-commits] repo/gentoo:master commit in: dev-java/gnu-classpath/ James Le Cuirot
  -- strict thread matches above, loose matches on Subject: below --
2017-08-29 22:00 James Le Cuirot
2017-05-30 22:42 James Le Cuirot
2016-01-14 21:44 James Le Cuirot
2016-01-14 21:44 James Le Cuirot
2016-01-10 20:50 James Le Cuirot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox