Remove openjdk:8 from rdeps of icedtea:8 to avoid confusing dependencies during bootstrap.

This commit is contained in:
Andrius Štikonas 2021-12-11 20:30:04 +00:00
parent 1e0dce6b99
commit 197eef6681
2 changed files with 2 additions and 3 deletions

View File

@ -58,6 +58,6 @@ DIST icedtea-3.7.0.tar.xz 1487360 BLAKE2B efef75c5ac615c21310f16f50fc425c5a76076
DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 BLAKE2B 5c1faa3cbbfea62f819562a01ec389f3682cf3164d06f5404d1d16359c87b37d6ae4101f7c33cde30bad4f3d52af18f0f410e36868b2c9d1280661d2340e683b SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23
DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
EBUILD icedtea-3.21.0.ebuild 12532 BLAKE2B f686511e2164d8f51a517c59a68d6e7117e9f68edea9401f7572e4ec2f6037468096c9eef92d51a8d1700427b78f20a3828aa35587fb814a40550504c5f707b0 SHA512 f3d1e4fb83ff52669f9f276bea4ead0ee78756029c59eb0d7a25237bc614d8501d488bb1d311c5b5d6c0cfce9d619cb283ae2fddfa183aa887145dfde05253fa
EBUILD icedtea-3.21.0.ebuild 12495 BLAKE2B 9b25c66cc66aacb2e6a8a3dc92b2d1df5d6cda6247648c3a6b7b929700cdf2193c6b5660a5862c0099775129fa0b40387405359ed29b98f6c82ee01b38e0d675 SHA512 567dc63b38c805356cc80ffed52b9efab18f44496bd05cf1f77c5d344d97870a284ae2c456b7a5394f8b0b014a65447f8739bc5a094f181e8b52c9a447dc433b
EBUILD icedtea-3.7.0.ebuild 14544 BLAKE2B 644ac218fab4963db958f442d3c294818bc5aa579b0547c5a88b8cfb0553823065ae4c57f5da34422c8ad8516b2bfd25b6d86f543ac82b825590038f0544c5c8 SHA512 8c014f7bd04643abfadf1b8f4ec259acd5898111eb38f42d48f92c19b7355d4b7ac1468d2e9cace04a3060a3ab0228e921ee689dab023c131cda55b84073e655
EBUILD icedtea-7.2.6.9.ebuild 13085 BLAKE2B d5dc7405a12a86fe1030e301c7723934736c0f8c517e1f438d8ef3b1b2a79a20e2bae7fe4d4e412a0c60449c39116c31b7339185b22ea2e810098468db959e20 SHA512 70011881b40c8cd636f8933bab459c3dc4c3be3188230b27c0534070ff8436747c256d47ea359a1030ecdb632370d0905ea29afdffcb3cd5c3d9b955f57cbe5d

View File

@ -137,7 +137,6 @@ RDEPEND="${COMMON_DEP}
# Ant is no longer needed under the new build system
DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
|| (
dev-java/openjdk:${SLOT}
dev-java/icedtea:${SLOT}
dev-java/icedtea:$((SLOT-1))
)
@ -176,7 +175,7 @@ pkg_pretend() {
pkg_setup() {
icedtea_check_requirements
JAVA_PKG_WANT_BUILD_VM="openjdk-8 icedtea-8 icedtea-7"
JAVA_PKG_WANT_BUILD_VM="icedtea-8 icedtea-7"
JAVA_PKG_WANT_SOURCE="1.5"
JAVA_PKG_WANT_TARGET="1.5"