From: "Andrew John Hughes" <gnu_andrew@member.fsf.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/java:master commit in: dev-java/gnu-classpath/
Date: Fri, 2 Nov 2018 01:17:17 +0000 (UTC) [thread overview]
Message-ID: <1540170498.d065627314afc5273382ecff4d14fa37e982073e.gnu_andrew@gentoo> (raw)
commit: d065627314afc5273382ecff4d14fa37e982073e
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Mon Oct 22 01:08:18 2018 +0000
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Mon Oct 22 01:08:18 2018 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=d0656273
dev-java/gnu-classpath: Remove references to dead packages
Package-Manager: Portage-2.3.50, Repoman-2.3.10
dev-java/gnu-classpath/ChangeLog | 6 ++-
dev-java/gnu-classpath/Manifest | 2 +-
.../gnu-classpath/gnu-classpath-0.99-r1.ebuild | 44 ++++++++--------------
dev-java/gnu-classpath/gnu-classpath-9999.ebuild | 44 ++++++++--------------
4 files changed, 38 insertions(+), 58 deletions(-)
diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog
index 74ab0e3a..a8e7a4b1 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-2015 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2018 Gentoo Foundation; 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 $
+ 22 Oct 2018; Andrew John Hughes <gnu_andrew@member.fsf.org>
+ gnu-classpath-0.99-r1.ebuild, gnu-classpath-9999.ebuild:
+ dev-java/gnu-classpath: Remove references to dead packages
+
24 Jun 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
gnu-classpath-0.99-r1.ebuild, gnu-classpath-9999.ebuild:
Install Classpath binaries to /usr/libexec subdirectory. Use any slot for GMP.
diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest
index 9cd615e2..fb9c0395 100644
--- a/dev-java/gnu-classpath/Manifest
+++ b/dev-java/gnu-classpath/Manifest
@@ -1 +1 @@
-DIST classpath-0.99.tar.gz 11078232 SHA256 f929297f8ae9b613a1a167e231566861893260651d913ad9b6c11933895fecc8 SHA512 d8f38677ecc6a0f4b26197ab16e9888c51043364141675ad69684828e2d0ecb93122249672e2e7997aea817cc4aac68c17ccf59bf8913afe81e9536bee6b73ac WHIRLPOOL 259d0ac0649472ac58fe79ef2886407f2e455da39d43f425c1380f885ba755bd627a4138c051da8f70e3bb50a3c97abd0be3a01731869d2ff90c5b0fd5aca0af
+DIST classpath-0.99.tar.gz 11078232 BLAKE2B cb62cc58b9ce75df98809298a6c6a588704a98a133e8a0378c372e6cc0e6b07c8f05d7bd23c52f2697e6a3b4bfc1f0cdfc7aa108f2f681af154e6fd8c59d9460 SHA512 d8f38677ecc6a0f4b26197ab16e9888c51043364141675ad69684828e2d0ecb93122249672e2e7997aea817cc4aac68c17ccf59bf8913afe81e9536bee6b73ac
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.99-r1.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.99-r1.ebuild
index 15137b8c..da6c27ac 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.99-r1.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.99-r1.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
-inherit eutils java-pkg-2 base multilib
+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 VMs and compilers for the Java language"
SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/classpath"
+HOMEPAGE="https://www.gnu.org/software/classpath"
LICENSE="GPL-2-with-linking-exception"
SLOT="0"
@@ -18,21 +17,21 @@ KEYWORDS="~amd64"
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 >=dev-java/gnu-classpath-0.98:* ) )
+ doc? ( >=dev-java/gnu-classpath-0.98:* )
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:* )
+ 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.0
- media-libs/freetype
- >=x11-libs/cairo-1.1.9
+ >=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
@@ -41,19 +40,16 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
x11-libs/libXtst
x11-libs/pango
)
- qt4? ( dev-qt/qtgui:4 )
- xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
+ xml? ( >=dev-libs/libxml2-2.6.8:2= >=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/ecj-gcj )
+ dev-java/eclipse-ecj
>=dev-java/java-config-2.1.11
- gjdoc? ( !!dev-util/pccts )
gtk? (
+ x11-base/xorg-proto
x11-libs/libXrender
>=x11-libs/libXtst-1.1.0
- x11-proto/xproto
)
>=virtual/jdk-1.5
${RDEPEND}"
@@ -74,7 +70,7 @@ src_prepare() {
}
src_configure() {
- local ecj_pkg=""
+ local ecj_pkg="eclipse-ecj"
# We require ecj anyway, so force it to avoid problems with bad versions of javac
export JAVAC="${EPREFIX}/usr/bin/ecj"
@@ -91,13 +87,6 @@ src_configure() {
myconf="--with-antlr-jar=${antlr}"
fi
- # fallback on ecj-gcj if eclipse-ecj is not available
- if java-config --classpath=eclipse-ecj &> /dev/null ; then
- ecj_pkg="eclipse_ecj"
- else
- ecj_pkg="ecj-gcj"
- fi
-
ANTLR= econf \
$(use_enable alsa) \
$(use_enable debug ) \
@@ -107,7 +96,6 @@ src_configure() {
$(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) \
diff --git a/dev-java/gnu-classpath/gnu-classpath-9999.ebuild b/dev-java/gnu-classpath/gnu-classpath-9999.ebuild
index 15ded7cb..9d5c601f 100644
--- a/dev-java/gnu-classpath/gnu-classpath-9999.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-9999.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
-inherit eutils git-2 java-pkg-2 base multilib
+inherit eutils git-2 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 VMs and compilers for the Java language"
EGIT_REPO_URI="git://git.savannah.gnu.org/classpath.git"
-HOMEPAGE="http://www.gnu.org/software/classpath"
+HOMEPAGE="https://www.gnu.org/software/classpath"
LICENSE="GPL-2-with-linking-exception"
SLOT="0"
@@ -18,21 +17,21 @@ KEYWORDS=""
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 >=dev-java/gnu-classpath-0.98:* ) )
+ doc? ( >=dev-java/gnu-classpath-0.98:* )
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:* )
+ 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.0
- media-libs/freetype
- >=x11-libs/cairo-1.1.9
+ >=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
@@ -41,19 +40,16 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
x11-libs/libXtst
x11-libs/pango
)
- qt4? ( dev-qt/qtgui:4 )
- xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
+ xml? ( >=dev-libs/libxml2-2.6.8:2= >=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/ecj-gcj )
+ dev-java/eclipse-ecj
>=dev-java/java-config-2.1.11
- gjdoc? ( !!dev-util/pccts )
gtk? (
+ x11-base/xorg-proto
x11-libs/libXrender
>=x11-libs/libXtst-1.1.0
- x11-proto/xproto
)
>=virtual/jdk-1.5
${RDEPEND}"
@@ -72,7 +68,7 @@ src_prepare() {
}
src_configure() {
- local ecj_pkg=""
+ local ecj_pkg="eclipse-ecj"
# We require ecj anyway, so force it to avoid problems with bad versions of javac
export JAVAC="${EPREFIX}/usr/bin/ecj"
@@ -89,13 +85,6 @@ src_configure() {
myconf="--with-antlr-jar=${antlr}"
fi
- # fallback on ecj-gcj if eclipse-ecj is not available
- if java-config --classpath=eclipse-ecj &> /dev/null ; then
- ecj_pkg="eclipse_ecj"
- else
- ecj_pkg="ecj-gcj"
- fi
-
ANTLR= econf \
$(use_enable alsa) \
$(use_enable debug ) \
@@ -105,7 +94,6 @@ src_configure() {
$(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) \
next reply other threads:[~2018-11-02 1:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-02 1:17 Andrew John Hughes [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-02-24 3:35 [gentoo-commits] proj/java:master commit in: dev-java/gnu-classpath/ Andrew John Hughes
2018-11-02 1:17 Andrew John Hughes
2015-06-24 16:37 Andrew John Hughes
2015-06-23 4:11 Andrew John Hughes
2015-06-23 4:11 Andrew John Hughes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1540170498.d065627314afc5273382ecff4d14fa37e982073e.gnu_andrew@gentoo \
--to=gnu_andrew@member.fsf.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox