* [gentoo-commits] proj/java:master commit in: dev-java/gnu-classpath/
@ 2015-06-23 4:11 Andrew John Hughes
0 siblings, 0 replies; 6+ messages in thread
From: Andrew John Hughes @ 2015-06-23 4:11 UTC (permalink / raw
To: gentoo-commits
commit: fb4ade924f91765a291b372cde59273ccd8f3aad
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Tue Jun 23 03:54:28 2015 +0000
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Tue Jun 23 03:54:28 2015 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=fb4ade92
Sync GNU Classpath 0.99 ebuild changes to live ebuild.
Package-Manager: portage-2.2.17
Manifest-Sign-Key: 35964222
dev-java/gnu-classpath/ChangeLog | 4 ++++
dev-java/gnu-classpath/Manifest | 10 +++++-----
dev-java/gnu-classpath/gnu-classpath-9999.ebuild | 15 ++++++---------
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog
index 26b7da7..d1dd318 100644
--- a/dev-java/gnu-classpath/ChangeLog
+++ b/dev-java/gnu-classpath/ChangeLog
@@ -3,6 +3,10 @@
# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.109 2010/04/29 19:50:01 caster Exp $
23 Jun 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
+ gnu-classpath-9999.ebuild:
+ Sync GNU Classpath 0.99 ebuild changes to live ebuild.
+
+ 23 Jun 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
gnu-classpath-0.99-r1.ebuild, gnu-classpath-9999.ebuild:
Fix slotting of dependencies and remove dead dependency
<x11-proto/xextproto-7.1.
diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest
index cf514e2..7199940 100644
--- a/dev-java/gnu-classpath/Manifest
+++ b/dev-java/gnu-classpath/Manifest
@@ -6,13 +6,13 @@ AUX gjdoc_support.patch 384 SHA256 556d8372fefd8dcec1ab0cf497fa29f106341dbf94d55
AUX pr55182.patch 3343 SHA256 b36a90086ba70402848339f9d0cdaa9c173d45b8bf9abae39e33ad8bede3b718 SHA512 b38a1e8618afea1243f604acc479a13a4d8abe5c3c6bdab651480fddcabbcaa3a5684a8e66a4f7c7b1d1bafb2637bd1b7a6675d2c17842970c8642b0167188ed WHIRLPOOL 96c98aa4c01740bb10593157206d1e3126a6cb02efd2a61e7639bc266b53791ba30e442f27e277130881df381347f6626ad522a8e504ad2aa3e56a746f52f436
DIST classpath-0.99.tar.gz 11078232 SHA256 f929297f8ae9b613a1a167e231566861893260651d913ad9b6c11933895fecc8 SHA512 d8f38677ecc6a0f4b26197ab16e9888c51043364141675ad69684828e2d0ecb93122249672e2e7997aea817cc4aac68c17ccf59bf8913afe81e9536bee6b73ac WHIRLPOOL 259d0ac0649472ac58fe79ef2886407f2e455da39d43f425c1380f885ba755bd627a4138c051da8f70e3bb50a3c97abd0be3a01731869d2ff90c5b0fd5aca0af
EBUILD gnu-classpath-0.99-r1.ebuild 3704 SHA256 98ec0f4f4f317b799daf317dfcb622ecde7ae820c15c98d5852d8a3126ff4ecb SHA512 45f8dfdfc55be59f7ff446faf1e92e01017be0e972e937227f0f1fad5ab90c48214a3ceefa578d3cd751c1b76aacf6a657154da85c70d463b2a7f55614c3d836 WHIRLPOOL 959e7584c01904bcc944df27021c038a129c32e762a69ede5a9a8ceeb3d74535f4533caf4606f49aa48ec2711d8953a7399b5c096d955c76f0948ea0ef2a8d7f
-EBUILD gnu-classpath-9999.ebuild 3562 SHA256 ef96261b34bc95c66a02566856a51d5ae60883910c60167f29e69c224cf247e6 SHA512 73e64794663c4970979ce2da458888059adb3b9ba8f4bd799f9041be37f340bb33aff8af8f6528960f9b6a5e0d680a4a9787629d0a62053b81dc9f79096bc49e WHIRLPOOL e8cd31eb92c01a87891cbfaad9ce71313e69611dc52c1a48befabaf688e6de37928bbb3a007e24ff4283ddc3cc897a5bee23b65ada28b924a45608c94cfff32b
-MISC ChangeLog 18762 SHA256 0fc648fc9d21c98d06ab2426ddd78c277c3ac70fab795286c3575dfe38572a04 SHA512 f6b8cc3c757857834e27a267e3f5368f8a7b166b9d5b709ea5b24d824e73a525c508a2c6af3a318af97e3b28dcd59c9f9012aa57d41837f92fae979b3b3cfc32 WHIRLPOOL b520e2bff170af8e71f09e3c1e3f0afee0a853ac5bcad9fcbb744c983c06216bcd0498c13ae3d9143e7ec051f67526e5a86dcb35aef4719f8d7a873b59cb68e8
+EBUILD gnu-classpath-9999.ebuild 3440 SHA256 b9d808a3d68606fd43da5f79331d67a644d6c818af07d5ff5f1431819a518841 SHA512 1bf0d24e8e1b9c8071a5ec9d00ed2127e1f8f86d11846cbd77f4fe97d2accd28871aa7aec2ad305f8f5c115db0284094c6c8b63c8131e5a993a7b5bdca3d7891 WHIRLPOOL 07dc4dfa6def952ca086dacf531c8b093f1b2eec35d5d2eb098cbcb73328efb0adc85a9ce8121ff019323b76b3d1e8e04aa8f1f33ad93497d809521c9129a7d6
+MISC ChangeLog 18911 SHA256 fb5741fdee383954e8ef04a667a0cd00137adfe0857fab7b72f1180f13eca5e3 SHA512 6be3303ac449b46baac1353914eac27f9f55a7e7740f7078fa0efeb19652cfa206fac86f51a54b65f5ab7c23087c9162f339b9ca00e2795690b59818b46b4788 WHIRLPOOL f2211433fd6908baab853ebea335755dad40ca56e09db03621318d3baa149c43f56aaa5389f76bf0c904dc242f11a9c2ee1106f112778026a2e71d6bb8846596
MISC metadata.xml 759 SHA256 24e294a08d57473d495a67acdcc44c0f32747187531feeb72dfa678731cd51d2 SHA512 6539bdca43514371ed19072b06cb70fc097a8178f4066e832037836b3d5c4b778d23365b52dd53534503fcef8a4a9680d98f898c43382e6050d766ad958d2d16 WHIRLPOOL 59e6761a2c2c354cf81bc9d93a356f028402a0273e52b449e8df06d371c20518051c0c0c4a3c9b6ad7586ddaec0ab510d47e5b714d69126b59fb256c8b05d67d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iF4EARYIAAYFAlWI19YACgkQz9oPmzWWQiI5zwEAnY1H0P4qFL/EWpyxyqoMsHMc
-a233pKjFi+Gbc5AyN9IA/1tuvd4PFFDrWKBncYFyO8ZuNx6W2lB00z6vvG4ZUM8P
-=hKrJ
+iF4EARYIAAYFAlWI2HQACgkQz9oPmzWWQiIoQgEA8rHC1YG1vTbzH05e1rIM5MQm
+mJ4sbROAdptYoTBUD0IBAPCVAR0PWo0BFt1qRpGIwVAWnuTi55PZddDKlPci7zwA
+=2Xo4
-----END PGP SIGNATURE-----
diff --git a/dev-java/gnu-classpath/gnu-classpath-9999.ebuild b/dev-java/gnu-classpath/gnu-classpath-9999.ebuild
index d70e356..325125e 100644
--- a/dev-java/gnu-classpath/gnu-classpath-9999.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-9999.ebuild
@@ -12,10 +12,10 @@ EGIT_REPO_URI="git://git.savannah.gnu.org/classpath.git"
HOMEPAGE="http://www.gnu.org/software/classpath"
LICENSE="GPL-2-with-linking-exception"
-SLOT="0.99"
+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 gstreamer qt4 xml"
RDEPEND="alsa? ( media-libs/alsa-lib )
doc? ( || ( >=dev-java/gjdoc-0.7.9-r2 >=dev-java/gnu-classpath-0.98:* ) )
@@ -83,8 +83,6 @@ src_configure() {
# 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)
@@ -98,7 +96,7 @@ src_configure() {
ecj_pkg="ecj-gcj"
fi
- ANTLR= ./configure \
+ ANTLR= econf \
$(use_enable alsa) \
$(use_enable debug ) \
$(use_enable examples) \
@@ -114,15 +112,14 @@ src_configure() {
--enable-jni \
--disable-dependency-tracking \
--disable-plugin \
- --host=${CHOST} \
- --prefix="${EPREFIX}"/usr/${PN}-${SLOT} \
+ --includedir="${EPREFIX}"/usr/include/classpath \
--with-ecj-jar=$(java-pkg_getjar --build-only ${ecj_pkg}-* ecj.jar) \
- --disable-Werror \
${myconf}
}
src_install() {
emake DESTDIR="${D}" install
dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO
- java-pkg_regjar /usr/${PN}-${SLOT}/share/classpath/glibj.zip
+ java-pkg_regjar /usr/share/classpath/glibj.zip
+ java-pkg_regjar /usr/share/classpath/tools.zip
}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/java:master commit in: dev-java/gnu-classpath/
@ 2015-06-23 4:11 Andrew John Hughes
0 siblings, 0 replies; 6+ messages in thread
From: Andrew John Hughes @ 2015-06-23 4:11 UTC (permalink / raw
To: gentoo-commits
commit: 4a9bb5a77235b9b25a6d203c8f6a35651741cb44
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Tue Jun 23 03:51:50 2015 +0000
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Tue Jun 23 03:51:50 2015 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=4a9bb5a7
Fix slotting of dependencies and remove dead dependency <x11-proto/xextproto-7.1.
Package-Manager: portage-2.2.17
Manifest-Sign-Key: 35964222
dev-java/gnu-classpath/ChangeLog | 5 +++++
dev-java/gnu-classpath/Manifest | 12 ++++++------
dev-java/gnu-classpath/gnu-classpath-0.99-r1.ebuild | 6 +++---
dev-java/gnu-classpath/gnu-classpath-9999.ebuild | 8 ++++----
4 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog
index 24bd3a8..26b7da7 100644
--- a/dev-java/gnu-classpath/ChangeLog
+++ b/dev-java/gnu-classpath/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2015 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 $
+ 23 Jun 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
+ gnu-classpath-0.99-r1.ebuild, gnu-classpath-9999.ebuild:
+ Fix slotting of dependencies and remove dead dependency
+ <x11-proto/xextproto-7.1.
+
*gnu-classpath-0.99-r1 (23 Jun 2015)
23 Jun 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest
index 1362f67..cf514e2 100644
--- a/dev-java/gnu-classpath/Manifest
+++ b/dev-java/gnu-classpath/Manifest
@@ -5,14 +5,14 @@ AUX freetype.patch 2283 SHA256 fbd80c40b7568788cec3154550b203dfb08cc753c09e23e8e
AUX gjdoc_support.patch 384 SHA256 556d8372fefd8dcec1ab0cf497fa29f106341dbf94d5550633a1344baf462fd1 SHA512 cc0758018e5925cd4ef0897acd26db50f4cca35cb70619fe778f63db70be3e2e2b1e03de5f36d5f7f36474aefb07c0804b5e90c57d98882f195d82968fc0e38b WHIRLPOOL 144b11cca9b1e29d13feb45e7f37a7eae93103274c429e1626f1d03b1d87e67001fce81813c3a4521c9fc116ac2687c81d683d32b254e9e3a808ecc8a35d104b
AUX pr55182.patch 3343 SHA256 b36a90086ba70402848339f9d0cdaa9c173d45b8bf9abae39e33ad8bede3b718 SHA512 b38a1e8618afea1243f604acc479a13a4d8abe5c3c6bdab651480fddcabbcaa3a5684a8e66a4f7c7b1d1bafb2637bd1b7a6675d2c17842970c8642b0167188ed WHIRLPOOL 96c98aa4c01740bb10593157206d1e3126a6cb02efd2a61e7639bc266b53791ba30e442f27e277130881df381347f6626ad522a8e504ad2aa3e56a746f52f436
DIST classpath-0.99.tar.gz 11078232 SHA256 f929297f8ae9b613a1a167e231566861893260651d913ad9b6c11933895fecc8 SHA512 d8f38677ecc6a0f4b26197ab16e9888c51043364141675ad69684828e2d0ecb93122249672e2e7997aea817cc4aac68c17ccf59bf8913afe81e9536bee6b73ac WHIRLPOOL 259d0ac0649472ac58fe79ef2886407f2e455da39d43f425c1380f885ba755bd627a4138c051da8f70e3bb50a3c97abd0be3a01731869d2ff90c5b0fd5aca0af
-EBUILD gnu-classpath-0.99-r1.ebuild 3732 SHA256 4b75ed035188182853a8b2a2e1cb4689cda3e4d29da88d8c0a7c1d4578b0d2d9 SHA512 116d4e769a207b94cdfe2f2766779bad72c47cccb3dcefa459f61aa47d3f9caa4e72bff129eeeffe6a4d7df27ed873e19b8af6db0c3b61dbd9833729287e2c71 WHIRLPOOL efcf6c7574f8d6c1e20e817e55a377aa0251a9fce2e0e95e5ab23b493f5b4b08645945ec363192fb18252180d0d2f97e691f618b3db31855caefe1fb08928608
-EBUILD gnu-classpath-9999.ebuild 3590 SHA256 2a97612fde4944767d4bdb42350aabcb8bdb60b2610c0942a3aee2f02cef928b SHA512 d6ee0bb21f6f1d112a8b9fbbaf846c2820ddf7d21f7eb85ea2d03119381cb037c2c0eccd4c1d66bcadc904c28bb97ca28feefc6933a560356cd8dc9511e26b6f WHIRLPOOL 055d3709017ef1636d91d5d8b9339dcda85c9696d4076ab05f23702bde4022d88b633c400a210886fcac079dbdc5e8885530e91b51846ca176f7c0e08259d142
-MISC ChangeLog 18554 SHA256 f27029504b95bea6b64dc92c423954213c98d370bc8581138b6f49c046d278c0 SHA512 84cd885715d0add3d013366461655878795a80470c8992a33313fddbc41256b4b8b74896485ea23b1445689e39d69f31fb89346ccdbfb49aad60b0e3fa273dda WHIRLPOOL 76597b0fee6235624ab52f9d6451b68d9d1bfbc4a1c4318af347dbd016ee02e3fa4a27a262d2a7823e9a5ec03773f2a0a61228245b61e743efd78ffd91da486d
+EBUILD gnu-classpath-0.99-r1.ebuild 3704 SHA256 98ec0f4f4f317b799daf317dfcb622ecde7ae820c15c98d5852d8a3126ff4ecb SHA512 45f8dfdfc55be59f7ff446faf1e92e01017be0e972e937227f0f1fad5ab90c48214a3ceefa578d3cd751c1b76aacf6a657154da85c70d463b2a7f55614c3d836 WHIRLPOOL 959e7584c01904bcc944df27021c038a129c32e762a69ede5a9a8ceeb3d74535f4533caf4606f49aa48ec2711d8953a7399b5c096d955c76f0948ea0ef2a8d7f
+EBUILD gnu-classpath-9999.ebuild 3562 SHA256 ef96261b34bc95c66a02566856a51d5ae60883910c60167f29e69c224cf247e6 SHA512 73e64794663c4970979ce2da458888059adb3b9ba8f4bd799f9041be37f340bb33aff8af8f6528960f9b6a5e0d680a4a9787629d0a62053b81dc9f79096bc49e WHIRLPOOL e8cd31eb92c01a87891cbfaad9ce71313e69611dc52c1a48befabaf688e6de37928bbb3a007e24ff4283ddc3cc897a5bee23b65ada28b924a45608c94cfff32b
+MISC ChangeLog 18762 SHA256 0fc648fc9d21c98d06ab2426ddd78c277c3ac70fab795286c3575dfe38572a04 SHA512 f6b8cc3c757857834e27a267e3f5368f8a7b166b9d5b709ea5b24d824e73a525c508a2c6af3a318af97e3b28dcd59c9f9012aa57d41837f92fae979b3b3cfc32 WHIRLPOOL b520e2bff170af8e71f09e3c1e3f0afee0a853ac5bcad9fcbb744c983c06216bcd0498c13ae3d9143e7ec051f67526e5a86dcb35aef4719f8d7a873b59cb68e8
MISC metadata.xml 759 SHA256 24e294a08d57473d495a67acdcc44c0f32747187531feeb72dfa678731cd51d2 SHA512 6539bdca43514371ed19072b06cb70fc097a8178f4066e832037836b3d5c4b778d23365b52dd53534503fcef8a4a9680d98f898c43382e6050d766ad958d2d16 WHIRLPOOL 59e6761a2c2c354cf81bc9d93a356f028402a0273e52b449e8df06d371c20518051c0c0c4a3c9b6ad7586ddaec0ab510d47e5b714d69126b59fb256c8b05d67d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iF4EARYIAAYFAlWI1r8ACgkQz9oPmzWWQiLaqgEA1ygX/tw91aY99iwHZX9kr29X
-G/ysJQ3slwFTjbvf7z0A/AiA9RFX/AEjXnZZzqtSCTEnkKCaxXMhQhbHl6xaLc4D
-=4xq6
+iF4EARYIAAYFAlWI19YACgkQz9oPmzWWQiI5zwEAnY1H0P4qFL/EWpyxyqoMsHMc
+a233pKjFi+Gbc5AyN9IA/1tuvd4PFFDrWKBncYFyO8ZuNx6W2lB00z6vvG4ZUM8P
+=hKrJ
-----END PGP SIGNATURE-----
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 06d852d..3786e34 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.99-r1.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.99-r1.ebuild
@@ -18,11 +18,11 @@ 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/gjdoc-0.7.9-r2 >=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 )
+ gmp? ( >=dev-libs/gmp-4.2.4:3 )
gstreamer? (
>=media-libs/gstreamer-0.10.10:0.10
>=media-libs/gst-plugins-base-0.10.10:0.10
@@ -52,7 +52,7 @@ DEPEND="app-arch/zip
gjdoc? ( !!dev-util/pccts )
gtk? (
x11-libs/libXrender
- || ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1 )
+ >=x11-libs/libXtst-1.1.0
x11-proto/xproto
)
>=virtual/jdk-1.5
diff --git a/dev-java/gnu-classpath/gnu-classpath-9999.ebuild b/dev-java/gnu-classpath/gnu-classpath-9999.ebuild
index 26d94fd..d70e356 100644
--- a/dev-java/gnu-classpath/gnu-classpath-9999.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 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-r3.ebuild,v 1.6 2011/03/29 09:13:40 caster Exp $
@@ -18,11 +18,11 @@ 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/gjdoc-0.7.9-r2 >=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 )
+ gmp? ( >=dev-libs/gmp-4.2.4:3 )
gstreamer? (
>=media-libs/gstreamer-0.10.10:0.10
>=media-libs/gst-plugins-base-0.10.10:0.10
@@ -52,7 +52,7 @@ DEPEND="app-arch/zip
gjdoc? ( !!dev-util/pccts )
gtk? (
x11-libs/libXrender
- || ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1 )
+ >=x11-libs/libXtst-1.1.0
x11-proto/xproto
)
>=virtual/jdk-1.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/java:master commit in: dev-java/gnu-classpath/
@ 2015-06-24 16:37 Andrew John Hughes
0 siblings, 0 replies; 6+ messages in thread
From: Andrew John Hughes @ 2015-06-24 16:37 UTC (permalink / raw
To: gentoo-commits
commit: 24dfd457b131aa7e7da5007edb3dbd0dff500eb6
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Wed Jun 24 16:36:05 2015 +0000
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Wed Jun 24 16:36:05 2015 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=24dfd457
Install Classpath binaries to /usr/libexec subdirectory. Use any slot for GMP.
Package-Manager: portage-2.2.17
Manifest-Sign-Key: 35964222
dev-java/gnu-classpath/ChangeLog | 4 ++++
dev-java/gnu-classpath/Manifest | 12 ++++++------
dev-java/gnu-classpath/gnu-classpath-0.99-r1.ebuild | 3 ++-
dev-java/gnu-classpath/gnu-classpath-9999.ebuild | 3 ++-
4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog
index d1dd318..74ab0e3 100644
--- a/dev-java/gnu-classpath/ChangeLog
+++ b/dev-java/gnu-classpath/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2015 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 $
+ 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.
+
23 Jun 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
gnu-classpath-9999.ebuild:
Sync GNU Classpath 0.99 ebuild changes to live ebuild.
diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest
index 7199940..08b6425 100644
--- a/dev-java/gnu-classpath/Manifest
+++ b/dev-java/gnu-classpath/Manifest
@@ -5,14 +5,14 @@ AUX freetype.patch 2283 SHA256 fbd80c40b7568788cec3154550b203dfb08cc753c09e23e8e
AUX gjdoc_support.patch 384 SHA256 556d8372fefd8dcec1ab0cf497fa29f106341dbf94d5550633a1344baf462fd1 SHA512 cc0758018e5925cd4ef0897acd26db50f4cca35cb70619fe778f63db70be3e2e2b1e03de5f36d5f7f36474aefb07c0804b5e90c57d98882f195d82968fc0e38b WHIRLPOOL 144b11cca9b1e29d13feb45e7f37a7eae93103274c429e1626f1d03b1d87e67001fce81813c3a4521c9fc116ac2687c81d683d32b254e9e3a808ecc8a35d104b
AUX pr55182.patch 3343 SHA256 b36a90086ba70402848339f9d0cdaa9c173d45b8bf9abae39e33ad8bede3b718 SHA512 b38a1e8618afea1243f604acc479a13a4d8abe5c3c6bdab651480fddcabbcaa3a5684a8e66a4f7c7b1d1bafb2637bd1b7a6675d2c17842970c8642b0167188ed WHIRLPOOL 96c98aa4c01740bb10593157206d1e3126a6cb02efd2a61e7639bc266b53791ba30e442f27e277130881df381347f6626ad522a8e504ad2aa3e56a746f52f436
DIST classpath-0.99.tar.gz 11078232 SHA256 f929297f8ae9b613a1a167e231566861893260651d913ad9b6c11933895fecc8 SHA512 d8f38677ecc6a0f4b26197ab16e9888c51043364141675ad69684828e2d0ecb93122249672e2e7997aea817cc4aac68c17ccf59bf8913afe81e9536bee6b73ac WHIRLPOOL 259d0ac0649472ac58fe79ef2886407f2e455da39d43f425c1380f885ba755bd627a4138c051da8f70e3bb50a3c97abd0be3a01731869d2ff90c5b0fd5aca0af
-EBUILD gnu-classpath-0.99-r1.ebuild 3704 SHA256 98ec0f4f4f317b799daf317dfcb622ecde7ae820c15c98d5852d8a3126ff4ecb SHA512 45f8dfdfc55be59f7ff446faf1e92e01017be0e972e937227f0f1fad5ab90c48214a3ceefa578d3cd751c1b76aacf6a657154da85c70d463b2a7f55614c3d836 WHIRLPOOL 959e7584c01904bcc944df27021c038a129c32e762a69ede5a9a8ceeb3d74535f4533caf4606f49aa48ec2711d8953a7399b5c096d955c76f0948ea0ef2a8d7f
-EBUILD gnu-classpath-9999.ebuild 3440 SHA256 b9d808a3d68606fd43da5f79331d67a644d6c818af07d5ff5f1431819a518841 SHA512 1bf0d24e8e1b9c8071a5ec9d00ed2127e1f8f86d11846cbd77f4fe97d2accd28871aa7aec2ad305f8f5c115db0284094c6c8b63c8131e5a993a7b5bdca3d7891 WHIRLPOOL 07dc4dfa6def952ca086dacf531c8b093f1b2eec35d5d2eb098cbcb73328efb0adc85a9ce8121ff019323b76b3d1e8e04aa8f1f33ad93497d809521c9129a7d6
-MISC ChangeLog 18911 SHA256 fb5741fdee383954e8ef04a667a0cd00137adfe0857fab7b72f1180f13eca5e3 SHA512 6be3303ac449b46baac1353914eac27f9f55a7e7740f7078fa0efeb19652cfa206fac86f51a54b65f5ab7c23087c9162f339b9ca00e2795690b59818b46b4788 WHIRLPOOL f2211433fd6908baab853ebea335755dad40ca56e09db03621318d3baa149c43f56aaa5389f76bf0c904dc242f11a9c2ee1106f112778026a2e71d6bb8846596
+EBUILD gnu-classpath-0.99-r1.ebuild 3748 SHA256 e14511ddb57f772f2e478931f535021c1f87b9c957d49e2f2dd396b49942f842 SHA512 e14297da087e4af22ca1c725d9fefb43da4a0de682c1b22b5927f40c1a90279aff2199743826dd0ca9cd18b7ac398a6cd8af196ad742c800dd04044fddd25862 WHIRLPOOL 1cea69140599c9b389f3ecc6d065605be2cc1227570202e76650aec8260adf164d689c4e5f678bb99b869fbb0b418c52ff069d1f095caa575832863f08de9434
+EBUILD gnu-classpath-9999.ebuild 3484 SHA256 197ad992c299d739d0fa1f402b81e9bf0172615194d59426315de58d3c1fa3dc SHA512 b3bfa6cc9aeea0010ca8933487f6caf835d1e7be412384e6a1a0480b2c14631c845c1e4c95c99f41cccdd5d9e972c0fe71c911af969f360a6fa5c9da9a6cd2bb WHIRLPOOL 6906793c7325e53f215f910bfff58b36f761d6af5cc6724b10aca6a87cda5255ffd59e82ee208906442ccbb623f654d5d1786d69ed0ecab6253bba9b94512cff
+MISC ChangeLog 19114 SHA256 c4192d1545c0d37c46ecce88284d4f30eb459a66d22657e560dbb7ca73f7793d SHA512 1dc1b4cd3e662f02771b33b2764f88ae36cadd21492c8a0dafbfe3f9a3317f65c8d51b0b82d1cac540c430c45dcf9e2576bffd814b929bab1f1a860ceffb7ce4 WHIRLPOOL 6a525ee0871a6d63a4365d94d2a87ab3566ec69d9683797a19a7b10c9091974f50b0a0d90b308b34004cc92b90afb0d751f302230ab8c0bfb10efad2c8a5279c
MISC metadata.xml 759 SHA256 24e294a08d57473d495a67acdcc44c0f32747187531feeb72dfa678731cd51d2 SHA512 6539bdca43514371ed19072b06cb70fc097a8178f4066e832037836b3d5c4b778d23365b52dd53534503fcef8a4a9680d98f898c43382e6050d766ad958d2d16 WHIRLPOOL 59e6761a2c2c354cf81bc9d93a356f028402a0273e52b449e8df06d371c20518051c0c0c4a3c9b6ad7586ddaec0ab510d47e5b714d69126b59fb256c8b05d67d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iF4EARYIAAYFAlWI2HQACgkQz9oPmzWWQiIoQgEA8rHC1YG1vTbzH05e1rIM5MQm
-mJ4sbROAdptYoTBUD0IBAPCVAR0PWo0BFt1qRpGIwVAWnuTi55PZddDKlPci7zwA
-=2Xo4
+iF4EARYIAAYFAlWK3G8ACgkQz9oPmzWWQiK5hwEAx27q7zxrw4ZURu5HzzWrralD
+81z8kqeLvcvR8POmF54BALewn1tIAXFr2GM4r5fTfQyihuCnBNW72ppNGc/591UG
+=t6w9
-----END PGP SIGNATURE-----
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 3786e34..2de09bb 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.99-r1.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.99-r1.ebuild
@@ -22,7 +22,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
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:3 )
+ 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
@@ -114,6 +114,7 @@ src_configure() {
--enable-jni \
--disable-dependency-tracking \
--disable-plugin \
+ --bindir="${EPREFIX}"/usr/libexec/${PN} \
--includedir="${EPREFIX}"/usr/include/classpath \
--with-ecj-jar=$(java-pkg_getjar --build-only ${ecj_pkg}-* ecj.jar) \
${myconf}
diff --git a/dev-java/gnu-classpath/gnu-classpath-9999.ebuild b/dev-java/gnu-classpath/gnu-classpath-9999.ebuild
index 325125e..761384d 100644
--- a/dev-java/gnu-classpath/gnu-classpath-9999.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-9999.ebuild
@@ -22,7 +22,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
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:3 )
+ 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
@@ -112,6 +112,7 @@ src_configure() {
--enable-jni \
--disable-dependency-tracking \
--disable-plugin \
+ --bindir="${EPREFIX}"/usr/libexec/${PN} \
--includedir="${EPREFIX}"/usr/include/classpath \
--with-ecj-jar=$(java-pkg_getjar --build-only ${ecj_pkg}-* ecj.jar) \
${myconf}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/java:master commit in: dev-java/gnu-classpath/
@ 2018-11-02 1:17 Andrew John Hughes
0 siblings, 0 replies; 6+ messages in thread
From: Andrew John Hughes @ 2018-11-02 1:17 UTC (permalink / raw
To: gentoo-commits
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) \
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/java:master commit in: dev-java/gnu-classpath/
@ 2018-11-02 1:17 Andrew John Hughes
0 siblings, 0 replies; 6+ messages in thread
From: Andrew John Hughes @ 2018-11-02 1:17 UTC (permalink / raw
To: gentoo-commits
commit: 22b1d35cc4be3dc33bbb6592c5989a15e5d8c4b2
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Fri Nov 2 01:16:42 2018 +0000
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Fri Nov 2 01:16:42 2018 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=22b1d35c
dev-java/gnu-classpath: Merge gjdoc changes from main tree.
Package-Manager: Portage-2.3.50, Repoman-2.3.10
dev-java/gnu-classpath/ChangeLog | 7 ++++++
...0.99-r1.ebuild => gnu-classpath-0.99-r2.ebuild} | 29 ++++++++++++++++++++--
dev-java/gnu-classpath/gnu-classpath-9999.ebuild | 29 ++++++++++++++++++++--
3 files changed, 61 insertions(+), 4 deletions(-)
diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog
index a8e7a4b1..deb35d54 100644
--- a/dev-java/gnu-classpath/ChangeLog
+++ b/dev-java/gnu-classpath/ChangeLog
@@ -2,6 +2,13 @@
# 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 $
+*gnu-classpath-0.99-r2 (02 Nov 2018)
+
+ 02 Nov 2018; Andrew John Hughes <gnu_andrew@member.fsf.org>
+ +gnu-classpath-0.99-r2.ebuild, -gnu-classpath-0.99-r1.ebuild,
+ gnu-classpath-9999.ebuild:
+ dev-java/gnu-classpath: Merge gjdoc changes from main tree.
+
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
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.99-r1.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.99-r2.ebuild
similarity index 80%
rename from dev-java/gnu-classpath/gnu-classpath-0.99-r1.ebuild
rename to dev-java/gnu-classpath/gnu-classpath-0.99-r2.ebuild
index da6c27ac..c0043d66 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.99-r1.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.99-r2.ebuild
@@ -15,9 +15,9 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE="alsa debug doc dssi examples gconf +gjdoc +gmp +gtk gstreamer qt4 xml"
+REQUIRED_USE="doc? ( gjdoc )"
RDEPEND="alsa? ( media-libs/alsa-lib )
- doc? ( >=dev-java/gnu-classpath-0.98:* )
dssi? ( >=media-libs/dssi-0.9 )
gconf? ( gnome-base/gconf:2= )
gjdoc? ( >=dev-java/antlr-2.7.7-r7:0 )
@@ -87,6 +87,13 @@ src_configure() {
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= econf \
$(use_enable alsa) \
$(use_enable debug ) \
@@ -98,7 +105,7 @@ src_configure() {
$(use_enable gstreamer gstreamer-peer) \
$(use_enable xml xmlj) \
$(use_enable dssi ) \
- $(use_with doc gjdoc) \
+ $(use_with doc gjdoc "${S}/tools/gjdoc.build") \
--enable-jni \
--disable-dependency-tracking \
--disable-plugin \
@@ -108,9 +115,27 @@ src_configure() {
${myconf}
}
+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/share/classpath/glibj.zip
java-pkg_regjar /usr/share/classpath/tools.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/gnu-classpath-9999.ebuild b/dev-java/gnu-classpath/gnu-classpath-9999.ebuild
index 9d5c601f..4a2a905a 100644
--- a/dev-java/gnu-classpath/gnu-classpath-9999.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-9999.ebuild
@@ -15,9 +15,9 @@ SLOT="0"
KEYWORDS=""
IUSE="alsa debug doc dssi examples gconf +gjdoc +gmp +gtk gstreamer qt4 xml"
+REQUIRED_USE="doc? ( gjdoc )"
RDEPEND="alsa? ( media-libs/alsa-lib )
- doc? ( >=dev-java/gnu-classpath-0.98:* )
dssi? ( >=media-libs/dssi-0.9 )
gconf? ( gnome-base/gconf:2= )
gjdoc? ( >=dev-java/antlr-2.7.7-r7:0 )
@@ -85,6 +85,13 @@ src_configure() {
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= econf \
$(use_enable alsa) \
$(use_enable debug ) \
@@ -96,7 +103,7 @@ src_configure() {
$(use_enable gstreamer gstreamer-peer) \
$(use_enable xml xmlj) \
$(use_enable dssi ) \
- $(use_with doc gjdoc) \
+ $(use_with doc gjdoc "${S}/tools/gjdoc.build") \
--enable-jni \
--disable-dependency-tracking \
--disable-plugin \
@@ -106,9 +113,27 @@ src_configure() {
${myconf}
}
+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/share/classpath/glibj.zip
java-pkg_regjar /usr/share/classpath/tools.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] proj/java:master commit in: dev-java/gnu-classpath/
@ 2020-02-24 3:35 Andrew John Hughes
0 siblings, 0 replies; 6+ messages in thread
From: Andrew John Hughes @ 2020-02-24 3:35 UTC (permalink / raw
To: gentoo-commits
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 <gnu_andrew@member.fsf.org>
+ 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 <gnu_andrew@member.fsf.org>
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>
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-02-24 3:35 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-23 4:11 [gentoo-commits] proj/java:master commit in: dev-java/gnu-classpath/ Andrew John Hughes
-- strict thread matches above, loose matches on Subject: below --
2015-06-23 4:11 Andrew John Hughes
2015-06-24 16:37 Andrew John Hughes
2018-11-02 1:17 Andrew John Hughes
2018-11-02 1:17 Andrew John Hughes
2020-02-24 3:35 Andrew John Hughes
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox