diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-11-17 10:58:21 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-11-17 10:58:21 +0000 |
| commit | 27cf8f197a427c1c71255f86149344e3bf1be47d (patch) | |
| tree | 9e2b0e686362a4d009c515b9ecda0c33a4ecad30 /dev-java | |
| parent | 04a96556dc0036655ac429edf598cc48febe294b (diff) | |
gentoo auto-resync : 17:11:2023 - 10:58:21
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/Manifest.gz | bin | 58140 -> 58140 bytes | |||
| -rw-r--r-- | dev-java/java-config/Manifest | 6 | ||||
| -rw-r--r-- | dev-java/java-config/java-config-2.3.3-r1.ebuild (renamed from dev-java/java-config/java-config-2.3.3.ebuild) | 3 | ||||
| -rw-r--r-- | dev-java/java-config/java-config-9999.ebuild | 7 | ||||
| -rw-r--r-- | dev-java/java-config/metadata.xml | 3 |
5 files changed, 15 insertions, 4 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz Binary files differindex da76698400ab..4d65fe1517cc 100644 --- a/dev-java/Manifest.gz +++ b/dev-java/Manifest.gz diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest index e6d19ab02285..621cbb3dcc33 100644 --- a/dev-java/java-config/Manifest +++ b/dev-java/java-config/Manifest @@ -1,6 +1,6 @@ DIST java-config-2.3.1.tar.gz 26165 BLAKE2B 948506663513db369d0ed8ffdfaa54c643989431430ea03440551a6a4b6725d8eec38f5cb4fde3b64e8936c0f43de0e65a7368469032c646c7b6b3bb7ec3ed13 SHA512 62db555b2d8a37a03b6a03aa133010848d54be33ba6e3c43807abefe665a9d8ff2790baf1af79b98d4a7bd3e9ba6bc64382a24c3fcf7038338123dabd146b7b4 DIST java-config-2.3.3.tar.gz 33837 BLAKE2B dc522a61775272e520521a06c80ac33cbe40010a40051857df8abdbda72cc064969cb00dbf8f7d06efabd352d9cf2c711808205579c7cef73ce4bb7fe2845c8d SHA512 f999ccbdd47f2552913467d3b0c6704fc6511f2bc9d0a6f62d38a9c2e9899f11b239f2039b025f7fdee5e0713d2aaf13c1a9a9baf4f1551bb97d85b12d3f28e9 EBUILD java-config-2.3.1-r1.ebuild 1115 BLAKE2B 56a55948eb49929d4f9852662fcaaa17432abfba9c43367186d017bbc5854fe6a66aafe7313f3000db280500573badbc422dc5ee9f0e82ff15cf48ac4149d4b3 SHA512 8d13961648a6ff645dc1b6bffbc0389cb2b73455e798ab71f87f1d03c540efdef30dd276d70e7c5b6a181a8aa0916c91194a77a7b505b86ffd941a9ea0d69fd6 -EBUILD java-config-2.3.3.ebuild 1618 BLAKE2B 4aef07c625dc1c49843b238c3a8cad5a2e31bbbaa81e21a8912fd7712190ff8092231c148f1e692e94f2fb9f95bb766dad2c22521fd3b4e8b5bcc7f6db830ee2 SHA512 b927f57001e1552cfde37828e81d3d3d15877060013a70141ade8b997ccecd388984913e7bacc5dc53c4d5f29a0026fb3ce6faac7492af54e540d9407ddcc220 -EBUILD java-config-9999.ebuild 1618 BLAKE2B 4aef07c625dc1c49843b238c3a8cad5a2e31bbbaa81e21a8912fd7712190ff8092231c148f1e692e94f2fb9f95bb766dad2c22521fd3b4e8b5bcc7f6db830ee2 SHA512 b927f57001e1552cfde37828e81d3d3d15877060013a70141ade8b997ccecd388984913e7bacc5dc53c4d5f29a0026fb3ce6faac7492af54e540d9407ddcc220 -MISC metadata.xml 700 BLAKE2B 68549e234091289be40cb10d939856b6fb8a498b94b0e8611b20211476bcaf200e4713f0ffe112f3822180fc4908e51ac343ce70df0a70156b23ccd14f33ad23 SHA512 9566655dd9cdc8c1db17d236a21c4c131894c4aee492b64a8e32a6eda80d0190ffe6964392438d8cbc18ab08a2bcfe8afe80a956d4b08b342b7a7549e1429535 +EBUILD java-config-2.3.3-r1.ebuild 1721 BLAKE2B 730e85033768d8b2506c7501300038a4519e92249c3a545f9cceafdd41d15034e23796de1661ec6d7637a37ca9317a142b5b13838adb646a6ed6c2ef66b624f9 SHA512 d12865957354af73eadf7d92fa79df64287cb38ad4d25dbde7659edcc47e51d412ff6beb80a16b869867e795648657cf9682b38a8de4bd3639282c2b4c4bde34 +EBUILD java-config-9999.ebuild 1745 BLAKE2B 27d584230b5fcf22c3e73a2437789e48caac5ad4deab8676914d5d55aef8b2a5a80dbfab45c3078cff7100b8719dc0ca518527ea894a9d6ca24ed5a363ff5a63 SHA512 ffbb3ecde7a588675111ad1908d56016fff4ec72297037fe9a3708abf244515a4fc427385d0448270d4799ad946574524a74be3496053e91d19f98e0fc6622c7 +MISC metadata.xml 802 BLAKE2B 300762f5d21abce3b3c37d88e678125c0c760813acb3b3171c1d151da89bd404d6914874d93b52580ca245d14d1fbdfd5801ab7e0204ece3bee7ec084180de1a SHA512 76efa4ab5aaeecce7d952d2a48b0d63027d5dc7d0fed45c947817c4e599e0dd2b8ea664d951a2f4b2fa2885a2a46a9750b5687f328691701d72d93d8ead494d3 diff --git a/dev-java/java-config/java-config-2.3.3.ebuild b/dev-java/java-config/java-config-2.3.3-r1.ebuild index a4dc516e9ab8..b63dbff8d490 100644 --- a/dev-java/java-config/java-config-2.3.3.ebuild +++ b/dev-java/java-config/java-config-2.3.3-r1.ebuild @@ -63,6 +63,9 @@ src_install() { local scripts mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/bin/* || die) python_replicate_script "${scripts[@]}" + + # This replaces the file installed by java-config-wrapper. + dosym java-config-2 /usr/bin/java-config } my_src_install() { diff --git a/dev-java/java-config/java-config-9999.ebuild b/dev-java/java-config/java-config-9999.ebuild index a4dc516e9ab8..1b124ce70a3a 100644 --- a/dev-java/java-config/java-config-9999.ebuild +++ b/dev-java/java-config/java-config-9999.ebuild @@ -20,7 +20,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java" LICENSE="GPL-2" SLOT="2" -IUSE="test" +IUSE="+compat test" RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -63,6 +63,11 @@ src_install() { local scripts mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/bin/* || die) python_replicate_script "${scripts[@]}" + + if use compat; then + # Symlink java-config-2 to java-config for now. + dosym java-config /usr/bin/java-config-2 + fi } my_src_install() { diff --git a/dev-java/java-config/metadata.xml b/dev-java/java-config/metadata.xml index 97c51385f0c1..faeac11b5e48 100644 --- a/dev-java/java-config/metadata.xml +++ b/dev-java/java-config/metadata.xml @@ -11,6 +11,9 @@ per-user default JVMs, construct classpath env vars from installed java packages and be used to query for the path to various JDK tools. </longdescription> + <use> + <flag name="compat">Install bin/java-config-2 symlink pointing to java-config</flag> + </use> <upstream> <remote-id type="gentoo">proj/java-config</remote-id> <remote-id type="github">gentoo/java-config</remote-id> |