commit: 0dff546f439d384f18876eda836e57e2086109ea Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> AuthorDate: Mon Feb 24 03:34:21 2020 +0000 Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> CommitDate: Mon Feb 24 03:35:28 2020 +0000 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=0dff546f
dev-java/gnu-classpath: Update to git-r3 & HTTPS URL. Drop GStreamer:0.10 Package-Manager: Portage-2.3.87, Repoman-2.3.12 Signed-off-by: Andrew John Hughes <gnu_andrew <AT> member.fsf.org> dev-java/gnu-classpath/ChangeLog | 6 +++++- .../gnu-classpath/gnu-classpath-0.99-r2.ebuild | 12 ++++------- dev-java/gnu-classpath/gnu-classpath-9999.ebuild | 23 ++++++---------------- dev-java/gnu-classpath/metadata.xml | 2 +- 4 files changed, 16 insertions(+), 27 deletions(-) diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog index deb35d54..fcea4e56 100644 --- a/dev-java/gnu-classpath/ChangeLog +++ b/dev-java/gnu-classpath/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for dev-java/gnu-classpath -# Copyright 1999-2018 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2020 Gentoo Authors; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.109 2010/04/29 19:50:01 caster Exp $ + 24 Feb 2020; Andrew John Hughes <[email protected]> + gnu-classpath-0.99-r2.ebuild, gnu-classpath-9999.ebuild, metadata.xml: + dev-java/gnu-classpath: Update to git-r3 & HTTPS URL. Drop GStreamer:0.10 + *gnu-classpath-0.99-r2 (02 Nov 2018) 02 Nov 2018; Andrew John Hughes <[email protected]> diff --git a/dev-java/gnu-classpath/gnu-classpath-0.99-r2.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.99-r2.ebuild index c0043d66..5dacf8cb 100644 --- a/dev-java/gnu-classpath/gnu-classpath-0.99-r2.ebuild +++ b/dev-java/gnu-classpath/gnu-classpath-0.99-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -14,7 +14,7 @@ LICENSE="GPL-2-with-linking-exception" SLOT="0" KEYWORDS="~amd64" -IUSE="alsa debug doc dssi examples gconf +gjdoc +gmp +gtk gstreamer qt4 xml" +IUSE="alsa debug doc dssi examples gconf +gjdoc +gmp +gtk qt4 xml" REQUIRED_USE="doc? ( gjdoc )" RDEPEND="alsa? ( media-libs/alsa-lib ) @@ -22,11 +22,6 @@ RDEPEND="alsa? ( media-libs/alsa-lib ) 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= @@ -94,6 +89,7 @@ src_configure() { chmod 755 tools/gjdoc.build || die fi + # gstreamer-peer disabled as still requires 0.10 API ANTLR= econf \ $(use_enable alsa) \ $(use_enable debug ) \ @@ -102,13 +98,13 @@ src_configure() { $(use_enable gjdoc) \ $(use_enable gmp) \ $(use_enable gtk gtk-peer) \ - $(use_enable gstreamer gstreamer-peer) \ $(use_enable xml xmlj) \ $(use_enable dssi ) \ $(use_with doc gjdoc "${S}/tools/gjdoc.build") \ --enable-jni \ --disable-dependency-tracking \ --disable-plugin \ + --disable-gstreamer-peer \ --bindir="${EPREFIX}"/usr/libexec/${PN} \ --includedir="${EPREFIX}"/usr/include/classpath \ --with-ecj-jar=$(java-pkg_getjar --build-only ${ecj_pkg}-* ecj.jar) \ diff --git a/dev-java/gnu-classpath/gnu-classpath-9999.ebuild b/dev-java/gnu-classpath/gnu-classpath-9999.ebuild index 4a2a905a..e4a8f250 100644 --- a/dev-java/gnu-classpath/gnu-classpath-9999.ebuild +++ b/dev-java/gnu-classpath/gnu-classpath-9999.ebuild @@ -1,20 +1,19 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils git-2 java-pkg-2 multilib +inherit eutils git-r3 java-pkg-2 multilib -MY_P=${P/gnu-/} DESCRIPTION="Free core class libraries for use with VMs and compilers for the Java language" -EGIT_REPO_URI="git://git.savannah.gnu.org/classpath.git" +EGIT_REPO_URI="https://git.savannah.gnu.org/git/classpath.git"; HOMEPAGE="https://www.gnu.org/software/classpath"; LICENSE="GPL-2-with-linking-exception" SLOT="0" KEYWORDS="" -IUSE="alsa debug doc dssi examples gconf +gjdoc +gmp +gtk gstreamer qt4 xml" +IUSE="alsa debug doc dssi examples gconf +gjdoc +gmp +gtk qt4 xml" REQUIRED_USE="doc? ( gjdoc )" RDEPEND="alsa? ( media-libs/alsa-lib ) @@ -22,11 +21,6 @@ RDEPEND="alsa? ( media-libs/alsa-lib ) 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= @@ -57,12 +51,6 @@ DEPEND="app-arch/zip RDEPEND=">=virtual/jre-1.5 ${RDEPEND}" -S=${WORKDIR}/${MY_P} - -src_unpack() { - git-2_src_unpack -} - src_prepare() { ./autogen.sh } @@ -92,6 +80,7 @@ src_configure() { chmod 755 tools/gjdoc.build || die fi + # gstreamer-peer disabled as still requires 0.10 API ANTLR= econf \ $(use_enable alsa) \ $(use_enable debug ) \ @@ -100,13 +89,13 @@ src_configure() { $(use_enable gjdoc) \ $(use_enable gmp) \ $(use_enable gtk gtk-peer) \ - $(use_enable gstreamer gstreamer-peer) \ $(use_enable xml xmlj) \ $(use_enable dssi ) \ $(use_with doc gjdoc "${S}/tools/gjdoc.build") \ --enable-jni \ --disable-dependency-tracking \ --disable-plugin \ + --disable-gstreamer-peer \ --bindir="${EPREFIX}"/usr/libexec/${PN} \ --includedir="${EPREFIX}"/usr/include/classpath \ --with-ecj-jar=$(java-pkg_getjar --build-only ${ecj_pkg}-* ecj.jar) \ diff --git a/dev-java/gnu-classpath/metadata.xml b/dev-java/gnu-classpath/metadata.xml index 336b9ee0..6009e11f 100644 --- a/dev-java/gnu-classpath/metadata.xml +++ b/dev-java/gnu-classpath/metadata.xml @@ -12,7 +12,7 @@ <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="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>
