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 <[email protected]> + 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 <[email protected]> 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
