[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 7fa7b2bd70988dd01444eafbf784a0cce915050d
Author: Michał Górny gentoo org>
AuthorDate: Wed Dec 20 15:47:02 2023 +
Commit: Michał Górny gentoo org>
CommitDate: Wed Dec 20 15:47:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fa7b2bd
dev-java/java-config: Stabilize 2.3.3-r1 x86, #920368
Signed-off-by: Michał Górny gentoo.org>
dev-java/java-config/java-config-2.3.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/java-config/java-config-2.3.3-r1.ebuild
b/dev-java/java-config/java-config-2.3.3-r1.ebuild
index 94ad732bf6e0..ab1cb1b890e9 100644
--- a/dev-java/java-config/java-config-2.3.3-r1.ebuild
+++ b/dev-java/java-config/java-config-2.3.3-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = ]]; then
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git;
else
SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz;
- KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux
~ppc-macos ~x64-macos ~x64-solaris"
fi
DESCRIPTION="Java environment configuration query tool"
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 2c6c5d8d93e2f3468ad51badb63426bbfdf2d50f
Author: Sam James gentoo org>
AuthorDate: Wed Dec 20 10:35:52 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Dec 20 10:35:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c6c5d8d
dev-java/java-config: Stabilize 2.3.3-r1 amd64, #920368
Signed-off-by: Sam James gentoo.org>
dev-java/java-config/java-config-2.3.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/java-config/java-config-2.3.3-r1.ebuild
b/dev-java/java-config/java-config-2.3.3-r1.ebuild
index b63dbff8d490..af88afc8095d 100644
--- a/dev-java/java-config/java-config-2.3.3-r1.ebuild
+++ b/dev-java/java-config/java-config-2.3.3-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = ]]; then
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git;
else
SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz;
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
~ppc-macos ~x64-macos ~x64-solaris"
fi
DESCRIPTION="Java environment configuration query tool"
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: a8f4d946d1b26bda70c169b9cbc1049bd93ca5b0
Author: Sam James gentoo org>
AuthorDate: Wed Dec 20 10:35:53 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Dec 20 10:35:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8f4d946
dev-java/java-config: Stabilize 2.3.3-r1 ppc64, #920368
Signed-off-by: Sam James gentoo.org>
dev-java/java-config/java-config-2.3.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/java-config/java-config-2.3.3-r1.ebuild
b/dev-java/java-config/java-config-2.3.3-r1.ebuild
index af88afc8095d..c0e85b2b8f76 100644
--- a/dev-java/java-config/java-config-2.3.3-r1.ebuild
+++ b/dev-java/java-config/java-config-2.3.3-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = ]]; then
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git;
else
SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz;
- KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
~ppc-macos ~x64-macos ~x64-solaris"
fi
DESCRIPTION="Java environment configuration query tool"
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 90ca1e13c402a1fd3ecaf6a25d2a32d9cb2402c4
Author: Sam James gentoo org>
AuthorDate: Wed Dec 20 10:35:54 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Dec 20 10:35:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90ca1e13
dev-java/java-config: Stabilize 2.3.3-r1 arm64, #920368
Signed-off-by: Sam James gentoo.org>
dev-java/java-config/java-config-2.3.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/java-config/java-config-2.3.3-r1.ebuild
b/dev-java/java-config/java-config-2.3.3-r1.ebuild
index c0e85b2b8f76..94ad732bf6e0 100644
--- a/dev-java/java-config/java-config-2.3.3-r1.ebuild
+++ b/dev-java/java-config/java-config-2.3.3-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = ]]; then
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git;
else
SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz;
- KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
~ppc-macos ~x64-macos ~x64-solaris"
fi
DESCRIPTION="Java environment configuration query tool"
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: c50e2a9894174a216632f2aba67b07dc5dc55853
Author: Florian Schmaus gentoo org>
AuthorDate: Fri Nov 17 08:24:30 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Fri Nov 17 08:25:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c50e2a98
dev-java/java-config: update live, add USE=compat
Signed-off-by: Florian Schmaus gentoo.org>
dev-java/java-config/java-config-.ebuild | 8 +---
dev-java/java-config/metadata.xml| 3 +++
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/dev-java/java-config/java-config-.ebuild
b/dev-java/java-config/java-config-.ebuild
index b63dbff8d490..1b124ce70a3a 100644
--- a/dev-java/java-config/java-config-.ebuild
+++ b/dev-java/java-config/java-config-.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}"
@@ -64,8 +64,10 @@ src_install() {
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
+ 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.
+
+ Install bin/java-config-2 symlink pointing
to java-config
+
proj/java-config
gentoo/java-config
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/, profiles/
commit: 39ba239bd06a34be6ff5975204866f6b4d724fce
Author: Florian Schmaus gentoo org>
AuthorDate: Fri Nov 17 07:40:11 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Fri Nov 17 07:42:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39ba239b
dev-java/java-config: add java-config→java-config-2 compatibility symlink
Closes: https://bugs.gentoo.org/917458
Signed-off-by: Florian Schmaus gentoo.org>
.../{java-config-2.3.3.ebuild => java-config-2.3.3-r1.ebuild}| 3 +++
dev-java/java-config/java-config-.ebuild | 3 +++
profiles/package.mask| 5 -
3 files changed, 6 insertions(+), 5 deletions(-)
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
similarity index 94%
rename from dev-java/java-config/java-config-2.3.3.ebuild
rename to 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-.ebuild
b/dev-java/java-config/java-config-.ebuild
index a4dc516e9ab8..b63dbff8d490 100644
--- a/dev-java/java-config/java-config-.ebuild
+++ b/dev-java/java-config/java-config-.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/profiles/package.mask b/profiles/package.mask
index 75869b8856b7..13795b317928 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,11 +33,6 @@
#--- END OF EXAMPLES ---
-# Sam James (2023-11-17)
-# Missing 'java-config' symlink to 'java-config-2', breaking Java eclasses
-# at least. See bug #917458.
-=dev-java/java-config-2.3.3
-
# Arthur Zamarin (2023-11-10)
# No reverse dependencies, no tests, no upstream activity. All ebuild
# maintenance on this package was done randomly by @python project members,
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 6978c5a64afc8a18bf6567e558f9807f66211bda
Author: Florian Schmaus gentoo org>
AuthorDate: Thu Nov 16 20:28:47 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Thu Nov 16 20:30:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6978c5a6
dev-java/java-config: add 2.3.3
Closes: https://bugs.gentoo.org/830860
Closes: https://bugs.gentoo.org/909905
Closes: https://bugs.gentoo.org/917326
Signed-off-by: Florian Schmaus gentoo.org>
dev-java/java-config/Manifest | 1 +
dev-java/java-config/java-config-2.3.3.ebuild | 75 +++
2 files changed, 76 insertions(+)
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index b59307d6fd5c..cf19fbf41cb0 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,2 +1,3 @@
DIST java-config-2.3.1.tar.gz 26165 BLAKE2B
948506663513db369d0ed8ffdfaa54c643989431430ea03440551a6a4b6725d8eec38f5cb4fde3b64e8936c0f43de0e65a7368469032c646c7b6b3bb7ec3ed13
SHA512
62db555b2d8a37a03b6a03aa133010848d54be33ba6e3c43807abefe665a9d8ff2790baf1af79b98d4a7bd3e9ba6bc64382a24c3fcf7038338123dabd146b7b4
DIST java-config-2.3.2.tar.gz 26297 BLAKE2B
02b3cf34abb48d67189b40478095564b6ca11fceca9fef0a3258c246d451ba793b6f050b3f9435b39c16b9d75802cbd387c8f663301176cac108e35a7bab3f4b
SHA512
f00b73a33ccfc824dbc5facd75cd581389c2568e22bad92ed9a088917a3b42058198b547a8cdc6ce40fe3a109eec7c8405131775ad7fcb2eda0dd85d4637c527
+DIST java-config-2.3.3.tar.gz 33837 BLAKE2B
dc522a61775272e520521a06c80ac33cbe40010a40051857df8abdbda72cc064969cb00dbf8f7d06efabd352d9cf2c711808205579c7cef73ce4bb7fe2845c8d
SHA512
f999ccbdd47f2552913467d3b0c6704fc6511f2bc9d0a6f62d38a9c2e9899f11b239f2039b025f7fdee5e0713d2aaf13c1a9a9baf4f1551bb97d85b12d3f28e9
diff --git a/dev-java/java-config/java-config-2.3.3.ebuild
b/dev-java/java-config/java-config-2.3.3.ebuild
new file mode 100644
index ..a4dc516e9ab8
--- /dev/null
+++ b/dev-java/java-config/java-config-2.3.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit meson python-r1
+
+if [[ ${PV} = ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git;
+else
+ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz;
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+DESCRIPTION="Java environment configuration query tool"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java;
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+
+# baselayout-java is added as a dep till it can be added to eclass.
+RDEPEND="
+ ${PYTHON_DEPS}
+ sys-apps/baselayout-java
+ sys-apps/portage[${PYTHON_USEDEP}]
+"
+
+src_configure() {
+ local python_only=false
+ python_foreach_impl my_src_configure
+}
+
+my_src_configure() {
+ local emesonargs=(
+ -Darch="${ARCH}"
+ -Dpython-only="${python_only}"
+ -Deprefix="${EPREFIX}"
+ )
+
+ meson_src_configure
+ python_only=true
+}
+
+src_compile() {
+ python_foreach_impl meson_src_compile
+}
+
+src_test() {
+ python_foreach_impl meson_src_test --no-rebuild --verbose
+}
+
+src_install() {
+ python_foreach_impl my_src_install
+
+ local scripts
+ mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}'
"${ED}"/usr/bin/* || die)
+ python_replicate_script "${scripts[@]}"
+}
+
+my_src_install() {
+ meson_src_install
+
+ local pydirs=(
+ "${D}$(python_get_sitedir)"
+ )
+ python_optimize "${pydirs[@]}"
+}
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: f9edecf8b9d748a4849c58313c0066cfe3d525cc
Author: Florian Schmaus gentoo org>
AuthorDate: Thu Nov 16 15:54:38 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Thu Nov 16 15:55:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9edecf8
dev-java/java-config: update for new Meson-based build
Signed-off-by: Florian Schmaus gentoo.org>
dev-java/java-config/java-config-.ebuild | 51 +---
1 file changed, 38 insertions(+), 13 deletions(-)
diff --git a/dev-java/java-config/java-config-.ebuild
b/dev-java/java-config/java-config-.ebuild
index 852afb28806a..a4dc516e9ab8 100644
--- a/dev-java/java-config/java-config-.ebuild
+++ b/dev-java/java-config/java-config-.ebuild
@@ -3,13 +3,11 @@
EAPI=8
-# jython depends on java-config, so don't add it or things will break
PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 prefix
+inherit meson python-r1
-if [[ ${PV} = * ]]; then
+if [[ ${PV} = ]]; then
inherit git-r3
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git;
else
@@ -24,27 +22,54 @@ LICENSE="GPL-2"
SLOT="2"
IUSE="test"
RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
# baselayout-java is added as a dep till it can be added to eclass.
RDEPEND="
+ ${PYTHON_DEPS}
sys-apps/baselayout-java
sys-apps/portage[${PYTHON_USEDEP}]
"
-python_configure_all() {
- # setup.py fails to update this file
- eprefixify src/launcher.bash
+src_configure() {
+ local python_only=false
+ python_foreach_impl my_src_configure
}
-python_install_all() {
- distutils-r1_python_install_all
+my_src_configure() {
+ local emesonargs=(
+ -Darch="${ARCH}"
+ -Dpython-only="${python_only}"
+ -Deprefix="${EPREFIX}"
+ )
- # This replaces the file installed by java-config-wrapper.
- dosym java-config-2 /usr/bin/java-config
+ meson_src_configure
+ python_only=true
}
-python_test() {
- esetup.py test
+src_compile() {
+ python_foreach_impl meson_src_compile
+}
+
+src_test() {
+ python_foreach_impl meson_src_test --no-rebuild --verbose
+}
+
+src_install() {
+ python_foreach_impl my_src_install
+
+ local scripts
+ mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}'
"${ED}"/usr/bin/* || die)
+ python_replicate_script "${scripts[@]}"
+}
+
+my_src_install() {
+ meson_src_install
+
+ local pydirs=(
+ "${D}$(python_get_sitedir)"
+ )
+ python_optimize "${pydirs[@]}"
}
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/, dev-java/java-config/files/
commit: 7748663ef13c9363c7f25b486fe48c865b4373d1
Author: Holger Hoffstätte applied-asynchrony com>
AuthorDate: Tue Nov 14 16:59:58 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Tue Nov 14 20:15:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7748663e
dev-java/java-config: update PYTHON_COMPAT: remove 3.9, add 3.12
Also add a fix for deprecated test methods which would fail with 3.12.
Signed-off-by: Holger Hoffstätte applied-asynchrony.com>
Closes: https://github.com/gentoo/gentoo/pull/33823
Signed-off-by: Florian Schmaus gentoo.org>
.../files/2.3.2-fix-deprecated-test-methods.patch | 82 ++
dev-java/java-config/java-config-2.3.2.ebuild | 4 +-
dev-java/java-config/java-config-.ebuild | 2 +-
3 files changed, 86 insertions(+), 2 deletions(-)
diff --git a/dev-java/java-config/files/2.3.2-fix-deprecated-test-methods.patch
b/dev-java/java-config/files/2.3.2-fix-deprecated-test-methods.patch
new file mode 100644
index ..4bc4eb04fbc1
--- /dev/null
+++ b/dev-java/java-config/files/2.3.2-fix-deprecated-test-methods.patch
@@ -0,0 +1,82 @@
+From bc36c65ae319bd36b51ecbb7fd2ff3271ba08b05 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?=
+Date: Tue, 14 Nov 2023 18:27:18 +0100
+Subject: [PATCH] update deprecated test methods for python-3.12 compatibility
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Holger Hoffstätte
+--- a/tests/testsuite/EnvironmentManager.py
b/tests/testsuite/EnvironmentManager.py
+@@ -11,7 +11,7 @@ def setUp(self):
+ def test_load_packages(self):
+ self.em.packages = {}
+ self.em.load_packages()
+-self.assertEquals(len(self.em.get_packages()), 11)
++self.assertEqual(len(self.em.get_packages()), 11)
+
+ def test_get_package(self):
+ self.em.get_package('ant-cores')
+--- a/tests/testsuite/VersionManager.py
b/tests/testsuite/VersionManager.py
+@@ -38,28 +38,28 @@ def test_get_vm(self):
+
+ def test_filter_depend_vanilla(self):
+ os.environ["USE"] = ""
+-
self.assertEquals(self.verman.filter_depend(self.example_dep_vanilla),
self.example_dep_vanilla)
++self.assertEqual(self.verman.filter_depend(self.example_dep_vanilla),
self.example_dep_vanilla)
+
+ def test_filter_depend_or(self):
+ # Oh you only realise how ugly things are once you write unittests.
+ os.environ["USE"] = ""
+ rmatch = "|| =virtual/jdk-1.5 =virtual/jdk-1.4 dev-java/ant-core
java-virtuals/jaf"
+-self.assertEquals(self.verman.filter_depend(self.example_dep_or),
rmatch)
++self.assertEqual(self.verman.filter_depend(self.example_dep_or),
rmatch)
+
+ def test_filter_depend_use_enabled(self):
+ os.environ["USE"] = "java"
+ rmatch = ">=virtual/jdk-1.5* dev-java/ant-core java-virtuals/jaf"
+-self.assertEquals(self.verman.filter_depend(self.example_dep_use),
rmatch)
++self.assertEqual(self.verman.filter_depend(self.example_dep_use),
rmatch)
+
+ def test_filter_depend_use_disabled(self):
+ os.environ["USE"] = ""
+ rmatch = "dev-java/ant-core java-virtuals/jaf"
+-self.assertEquals(self.verman.filter_depend(self.example_dep_use),
rmatch)
++self.assertEqual(self.verman.filter_depend(self.example_dep_use),
rmatch)
+
+ def test_filter_depend_use_unset(self):
+ del os.environ["USE"]
+ rmatch = self.example_dep_use
+-self.assertEquals(self.verman.filter_depend(self.example_dep_use),
rmatch)
++self.assertEqual(self.verman.filter_depend(self.example_dep_use),
rmatch)
+
+ def test_version_satisfies(self):
+ vm = self.em.get_vm('sun-jdk-1.6')
+@@ -88,13 +88,13 @@ def test_version_satisfies(self):
+
+ def test_get_lowest(self):
+ target = self.verman.get_lowest(">=virtual/jdk-1.4")
+-self.assertEquals(target, '1.4')
++self.assertEqual(target, '1.4')
+
+ target = self.verman.get_lowest(self.example_dep_vanilla)
+-self.assertEquals(target, '1.5')
++self.assertEqual(target, '1.5')
+
+ target = self.verman.get_lowest(self.example_dep_or)
+-self.assertEquals(target, '1.4')
++self.assertEqual(target, '1.4')
+
+ def test_get_lowest_with_package_dep(self):
+ pass
+@@ -108,7 +108,7 @@ def test_get_lowest_with_package_dep(self):
+ #def test_matches(self):
+
+ def test_version_cmp(self):
+-self.assertEquals(self.verman.version_cmp('1.5.2', '1.5.2'), 0)
++self.assertEqual(self.verman.version_cmp('1.5.2', '1.5.2'), 0)
+ self.assertTrue(self.verman.version_cmp('1.5', '1.5.1') < 0)
+ self.assertTrue(self.verman.version_cmp('1.5.1', '1.5') > 0)
+
diff --git a/dev-java/java-config/java-config-2.3.2.ebuild
b/dev-java/java-config/java-config-2.3.2.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 419d2874d8d3fca40d5a63bcf4ab837f214b3959
Author: Florian Schmaus gentoo org>
AuthorDate: Tue Nov 14 14:12:33 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Tue Nov 14 14:12:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=419d2874
dev-java/java-config: destabilize 2.3.2 for ~amd64, ~arm64, ~ppc64, ~x86
Signed-off-by: Florian Schmaus gentoo.org>
dev-java/java-config/java-config-2.3.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/java-config/java-config-2.3.2.ebuild
b/dev-java/java-config/java-config-2.3.2.ebuild
index 6208189a8905..adc444cdbd70 100644
--- a/dev-java/java-config/java-config-2.3.2.ebuild
+++ b/dev-java/java-config/java-config-2.3.2.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz;
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
~ppc-macos ~x64-macos ~x64-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 46fe9f0724881c761e0158b31a1284a04de8ddeb
Author: Florian Schmaus gentoo org>
AuthorDate: Tue Nov 14 13:57:47 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Tue Nov 14 14:11:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46fe9f07
dev-java/java-config: add 2.3.2
Signed-off-by: Florian Schmaus gentoo.org>
dev-java/java-config/Manifest | 1 +
dev-java/java-config/java-config-2.3.2.ebuild | 44 +++
2 files changed, 45 insertions(+)
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 9cc9cc4e6e3a..b59307d6fd5c 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1 +1,2 @@
DIST java-config-2.3.1.tar.gz 26165 BLAKE2B
948506663513db369d0ed8ffdfaa54c643989431430ea03440551a6a4b6725d8eec38f5cb4fde3b64e8936c0f43de0e65a7368469032c646c7b6b3bb7ec3ed13
SHA512
62db555b2d8a37a03b6a03aa133010848d54be33ba6e3c43807abefe665a9d8ff2790baf1af79b98d4a7bd3e9ba6bc64382a24c3fcf7038338123dabd146b7b4
+DIST java-config-2.3.2.tar.gz 26297 BLAKE2B
02b3cf34abb48d67189b40478095564b6ca11fceca9fef0a3258c246d451ba793b6f050b3f9435b39c16b9d75802cbd387c8f663301176cac108e35a7bab3f4b
SHA512
f00b73a33ccfc824dbc5facd75cd581389c2568e22bad92ed9a088917a3b42058198b547a8cdc6ce40fe3a109eec7c8405131775ad7fcb2eda0dd85d4637c527
diff --git a/dev-java/java-config/java-config-2.3.2.ebuild
b/dev-java/java-config/java-config-2.3.2.ebuild
new file mode 100644
index ..6208189a8905
--- /dev/null
+++ b/dev-java/java-config/java-config-2.3.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# jython depends on java-config, so don't add it or things will break
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 prefix
+
+DESCRIPTION="Java environment configuration query tool"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java;
+SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+
+# baselayout-java is added as a dep till it can be added to eclass.
+RDEPEND="
+ sys-apps/baselayout-java
+ sys-apps/portage[${PYTHON_USEDEP}]
+"
+
+python_configure_all() {
+ # setup.py fails to update this file
+ eprefixify src/launcher.bash
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ # This replaces the file installed by java-config-wrapper.
+ dosym java-config-2 /usr/bin/java-config
+}
+
+python_test() {
+ esetup.py test
+}
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: e47978a0bfbaad030a3dd0cf5a745c58e3527b4e
Author: Florian Schmaus gentoo org>
AuthorDate: Tue Nov 14 14:10:26 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Tue Nov 14 14:11:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e47978a0
dev-java/java-config: sync live
Signed-off-by: Florian Schmaus gentoo.org>
dev-java/java-config/java-config-.ebuild | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dev-java/java-config/java-config-.ebuild
b/dev-java/java-config/java-config-.ebuild
index ee9dad46c7c3..95a5c2abb069 100644
--- a/dev-java/java-config/java-config-.ebuild
+++ b/dev-java/java-config/java-config-.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# jython depends on java-config, so don't add it or things will break
PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1 prefix
@@ -30,7 +30,8 @@ DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
# baselayout-java is added as a dep till it can be added to eclass.
RDEPEND="
sys-apps/baselayout-java
- sys-apps/portage[${PYTHON_USEDEP}]"
+ sys-apps/portage[${PYTHON_USEDEP}]
+"
python_configure_all() {
# setup.py fails to update this file
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 2fd64a5a211fa5a2845566bd5552b60e82fed87c Author: Sam James gentoo org> AuthorDate: Thu Oct 12 09:41:31 2023 + Commit: Sam James gentoo org> CommitDate: Thu Oct 12 09:44:24 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fd64a5a dev-java/java-config: add gentoo upstream metadata Signed-off-by: Sam James gentoo.org> dev-java/java-config/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-java/java-config/metadata.xml b/dev-java/java-config/metadata.xml index ecee904e9d84..97c51385f0c1 100644 --- a/dev-java/java-config/metadata.xml +++ b/dev-java/java-config/metadata.xml @@ -12,6 +12,7 @@ packages and be used to query for the path to various JDK tools. + proj/java-config gentoo/java-config
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: d571741515a8cffac9307046d063078ebf42e2ae Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Sun Sep 17 07:43:49 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Sep 17 14:29:52 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5717415 dev-java/java-config: add github upstream metadata Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Arthur Zamarin gentoo.org> dev-java/java-config/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-java/java-config/metadata.xml b/dev-java/java-config/metadata.xml index bec9235101d9..ecee904e9d84 100644 --- a/dev-java/java-config/metadata.xml +++ b/dev-java/java-config/metadata.xml @@ -11,4 +11,7 @@ per-user default JVMs, construct classpath env vars from installed java packages and be used to query for the path to various JDK tools. + + gentoo/java-config +
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 2b106da22dbce2245ff14d4a6f72ab762afea55a
Author: Mike Gilbert gentoo org>
AuthorDate: Tue May 30 17:58:55 2023 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue May 30 17:58:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b106da2
dev-java/java-config: replace @GENTOO_PORTAGE_EPREFIX in launcher.bash
Closes: https://bugs.gentoo.org/544836
Signed-off-by: Mike Gilbert gentoo.org>
.../{java-config-2.3.1.ebuild => java-config-2.3.1-r1.ebuild} | 7 ++-
dev-java/java-config/java-config-.ebuild | 7 ++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/dev-java/java-config/java-config-2.3.1.ebuild
b/dev-java/java-config/java-config-2.3.1-r1.ebuild
similarity index 88%
rename from dev-java/java-config/java-config-2.3.1.ebuild
rename to dev-java/java-config/java-config-2.3.1-r1.ebuild
index dd3b743d548d..13f2ded5c0e8 100644
--- a/dev-java/java-config/java-config-2.3.1.ebuild
+++ b/dev-java/java-config/java-config-2.3.1-r1.ebuild
@@ -7,7 +7,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{9..11} )
DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
+inherit distutils-r1 prefix
DESCRIPTION="Java environment configuration query tool"
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java;
@@ -26,6 +26,11 @@ RDEPEND="
sys-apps/baselayout-java
sys-apps/portage[${PYTHON_USEDEP}]"
+python_configure_all() {
+ # setup.py fails to update this file
+ eprefixify src/launcher.bash
+}
+
python_install_all() {
distutils-r1_python_install_all
diff --git a/dev-java/java-config/java-config-.ebuild
b/dev-java/java-config/java-config-.ebuild
index ce28aa1533a0..ee9dad46c7c3 100644
--- a/dev-java/java-config/java-config-.ebuild
+++ b/dev-java/java-config/java-config-.ebuild
@@ -7,7 +7,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{9..11} )
DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
+inherit distutils-r1 prefix
if [[ ${PV} = * ]]; then
inherit git-r3
@@ -32,6 +32,11 @@ RDEPEND="
sys-apps/baselayout-java
sys-apps/portage[${PYTHON_USEDEP}]"
+python_configure_all() {
+ # setup.py fails to update this file
+ eprefixify src/launcher.bash
+}
+
python_install_all() {
distutils-r1_python_install_all
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: ede3c9e3284bfcc0f5f7e4769f91acf3198f76ef
Author: Joe Kappus wt gd>
AuthorDate: Tue Jan 3 08:23:45 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Tue Jan 3 13:01:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ede3c9e3
dev-java/java-config: enable py3.11
Signed-off-by: Joe Kappus wt.gd>
Closes: https://github.com/gentoo/gentoo/pull/28946
Signed-off-by: Florian Schmaus gentoo.org>
dev-java/java-config/java-config-2.3.1.ebuild | 2 +-
dev-java/java-config/java-config-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/java-config/java-config-2.3.1.ebuild
b/dev-java/java-config/java-config-2.3.1.ebuild
index bc0266c8e44b..224bc1adb2b7 100644
--- a/dev-java/java-config/java-config-2.3.1.ebuild
+++ b/dev-java/java-config/java-config-2.3.1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
# jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{7..11} )
DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1
diff --git a/dev-java/java-config/java-config-.ebuild
b/dev-java/java-config/java-config-.ebuild
index 395572d16010..9df965ccbae1 100644
--- a/dev-java/java-config/java-config-.ebuild
+++ b/dev-java/java-config/java-config-.ebuild
@@ -4,7 +4,7 @@
EAPI=7
# jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{7..11} )
DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 59ee8ae863f0d1ac59e11c02c8a84a0d85671870
Author: Han Gao gmail com>
AuthorDate: Sat Apr 30 14:00:59 2022 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Sun May 1 20:46:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59ee8ae8
dev-java/java-config: keyword 2.3.1 for ~riscv
Signed-off-by: Han Gao gmail.com>
Signed-off-by: Arthur Zamarin gentoo.org>
Signed-off-by: Georgy Yakovlev gentoo.org>
dev-java/java-config/java-config-2.3.1.ebuild | 4 ++--
dev-java/java-config/java-config-.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-java/java-config/java-config-2.3.1.ebuild
b/dev-java/java-config/java-config-2.3.1.ebuild
index 45feed60cc35..bc0266c8e44b 100644
--- a/dev-java/java-config/java-config-2.3.1.ebuild
+++ b/dev-java/java-config/java-config-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@
SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz;
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-java/java-config/java-config-.ebuild
b/dev-java/java-config/java-config-.ebuild
index 00d8aaa41b61..395572d16010 100644
--- a/dev-java/java-config/java-config-.ebuild
+++ b/dev-java/java-config/java-config-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ if [[ ${PV} = * ]]; then
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git;
else
SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz;
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Java environment configuration query tool"
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: a83fd4c5aa2420be4f70fcd7cbb0d4dec2308e2f
Author: Georgy Yakovlev gentoo org>
AuthorDate: Sat Dec 25 10:11:05 2021 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Sat Dec 25 10:11:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a83fd4c5
dev-java/java-config: enable py3.10
Signed-off-by: Georgy Yakovlev gentoo.org>
dev-java/java-config/java-config-2.3.1.ebuild | 2 +-
dev-java/java-config/java-config-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/java-config/java-config-2.3.1.ebuild
b/dev-java/java-config/java-config-2.3.1.ebuild
index 69ba112dacfd..45feed60cc35 100644
--- a/dev-java/java-config/java-config-2.3.1.ebuild
+++ b/dev-java/java-config/java-config-2.3.1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
# jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1
diff --git a/dev-java/java-config/java-config-.ebuild
b/dev-java/java-config/java-config-.ebuild
index b0bfd8b90715..00d8aaa41b61 100644
--- a/dev-java/java-config/java-config-.ebuild
+++ b/dev-java/java-config/java-config-.ebuild
@@ -4,7 +4,7 @@
EAPI=7
# jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 2ed566503ef4c46d2f1c7d398182aaeb4eae3fcb
Author: Miroslav Šulc gentoo org>
AuthorDate: Sun May 23 09:10:10 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun May 23 09:10:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ed56650
dev-java/java-config: update py
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/java-config/java-config-2.3.1.ebuild | 2 +-
dev-java/java-config/java-config-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/java-config/java-config-2.3.1.ebuild
b/dev-java/java-config/java-config-2.3.1.ebuild
index 8d307fba6c8..69ba112dacf 100644
--- a/dev-java/java-config/java-config-2.3.1.ebuild
+++ b/dev-java/java-config/java-config-2.3.1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
# jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..9} )
DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1
diff --git a/dev-java/java-config/java-config-.ebuild
b/dev-java/java-config/java-config-.ebuild
index 6c4f02b0d04..b0bfd8b9071 100644
--- a/dev-java/java-config/java-config-.ebuild
+++ b/dev-java/java-config/java-config-.ebuild
@@ -4,7 +4,7 @@
EAPI=7
# jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python3_{7,9} )
+PYTHON_COMPAT=( python3_{7..9} )
DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: d9a5218f058ea51e3cbf7b8af2cc7a2785a6c14d
Author: Miroslav Šulc gentoo org>
AuthorDate: Sun May 23 09:08:05 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun May 23 09:08:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9a5218f
dev-java/java-config: dropped outdated blocker
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/java-config/java-config-2.3.1.ebuild | 1 -
dev-java/java-config/java-config-.ebuild | 1 -
2 files changed, 2 deletions(-)
diff --git a/dev-java/java-config/java-config-2.3.1.ebuild
b/dev-java/java-config/java-config-2.3.1.ebuild
index 3c577e74154..8d307fba6c8 100644
--- a/dev-java/java-config/java-config-2.3.1.ebuild
+++ b/dev-java/java-config/java-config-2.3.1.ebuild
@@ -23,7 +23,6 @@ DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
# baselayout-java is added as a dep till it can be added to eclass.
RDEPEND="
- !dev-java/java-config-wrapper
sys-apps/baselayout-java
sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/dev-java/java-config/java-config-.ebuild
b/dev-java/java-config/java-config-.ebuild
index 9a077f8db5a..6c4f02b0d04 100644
--- a/dev-java/java-config/java-config-.ebuild
+++ b/dev-java/java-config/java-config-.ebuild
@@ -29,7 +29,6 @@ DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
# baselayout-java is added as a dep till it can be added to eclass.
RDEPEND="
- !dev-java/java-config-wrapper
sys-apps/baselayout-java
sys-apps/portage[${PYTHON_USEDEP}]"
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 9de4825ab4ae9e9ea32658e03f237088420aa835
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sun May 23 08:39:51 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun May 23 09:04:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9de4825a
dev-java/java-config: py39
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20944
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/java-config/java-config-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/java-config/java-config-.ebuild
b/dev-java/java-config/java-config-.ebuild
index 44dee61b0d8..9a077f8db5a 100644
--- a/dev-java/java-config/java-config-.ebuild
+++ b/dev-java/java-config/java-config-.ebuild
@@ -4,7 +4,7 @@
EAPI=7
# jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,9} )
DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 87454ced7e3eb11175f0fb27e0a7dcea134c037d
Author: Fabian Groffen gentoo org>
AuthorDate: Tue Dec 15 19:32:51 2020 +
Commit: Fabian Groffen gentoo org>
CommitDate: Tue Dec 15 19:32:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87454ced
dev-java/java-config: add Prefix keywords
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen gentoo.org>
dev-java/java-config/java-config-2.3.1.ebuild | 2 +-
dev-java/java-config/java-config-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/java-config/java-config-2.3.1.ebuild
b/dev-java/java-config/java-config-2.3.1.ebuild
index 51075d6fd15..dc9ffcad70c 100644
--- a/dev-java/java-config/java-config-2.3.1.ebuild
+++ b/dev-java/java-config/java-config-2.3.1.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz;
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-java/java-config/java-config-.ebuild
b/dev-java/java-config/java-config-.ebuild
index e60c556878b..5d6a98ef977 100644
--- a/dev-java/java-config/java-config-.ebuild
+++ b/dev-java/java-config/java-config-.ebuild
@@ -14,7 +14,7 @@ if [[ $PV = * ]]; then
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git;
else
SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz;
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
~x86-solaris"
fi
DESCRIPTION="Java environment configuration query tool"
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 5b75eebb6592cbb4b8b2e64d80cbc7ee47f9a3a3
Author: Patrice Clement gentoo org>
AuthorDate: Thu Nov 5 22:41:34 2020 +
Commit: Patrice Clement gentoo org>
CommitDate: Thu Nov 5 22:41:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b75eebb
dev-java/java-config: add python3_9 to PYTHON_COMPAT.
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Patrice Clement gentoo.org>
dev-java/java-config/java-config-2.3.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/java-config/java-config-2.3.1.ebuild
b/dev-java/java-config/java-config-2.3.1.ebuild
index 87732bf9ecf..51075d6fd15 100644
--- a/dev-java/java-config/java-config-2.3.1.ebuild
+++ b/dev-java/java-config/java-config-2.3.1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
# jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/, dev-java/java-config/files/
commit: 01881f349f8420f045a164bdd7762fac0f7142c2
Author: Patrice Clement gentoo org>
AuthorDate: Mon Jul 20 19:45:05 2020 +
Commit: Patrice Clement gentoo org>
CommitDate: Mon Jul 20 19:45:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01881f34
dev-java/java-config: clean up old.
Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Patrice Clement gentoo.org>
dev-java/java-config/Manifest | 1 -
.../files/java-config-2.2.0-prefix.patch | 15 ---
.../java-config/files/java-config-2.2.0-py38.patch | 52 --
dev-java/java-config/java-config-2.2.0-r4.ebuild | 44 --
4 files changed, 112 deletions(-)
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index f75ce7c90ed..9cc9cc4e6e3 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,2 +1 @@
-DIST java-config-2.2.0.tar.bz2 51851 BLAKE2B
7b7c15dc988d2f5f54ebacba224f57193577e24f99a798657b40d83d723280562e314ba71319958a83be44defc6a48ac1114cce37eaeddea025ea31f26cf331a
SHA512
a491cfe86bde8afadfc5b875740d79f9077526d8650ffb034fdad67a7ffa1b02646f67b1ef0eab7b0fe3ae57b5d767fa6a0d5593fe07416993d60588a8ed595a
DIST java-config-2.3.1.tar.gz 26165 BLAKE2B
948506663513db369d0ed8ffdfaa54c643989431430ea03440551a6a4b6725d8eec38f5cb4fde3b64e8936c0f43de0e65a7368469032c646c7b6b3bb7ec3ed13
SHA512
62db555b2d8a37a03b6a03aa133010848d54be33ba6e3c43807abefe665a9d8ff2790baf1af79b98d4a7bd3e9ba6bc64382a24c3fcf7038338123dabd146b7b4
diff --git a/dev-java/java-config/files/java-config-2.2.0-prefix.patch
b/dev-java/java-config/files/java-config-2.2.0-prefix.patch
deleted file mode 100644
index 068538a69f9..000
--- a/dev-java/java-config/files/java-config-2.2.0-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Wait for the java team to upstream this patch.
-Bug: 591156
/setup.py 2013-02-15 07:12:09.0 +0900
-+++ /setup.py.new 2016-08-13 16:38:22.0 +0900
-@@ -87,8 +87,8 @@
- elif arch in ['hpux']:
- defaults = '*= hp-jdk-bin'
-
-- os.mkdir(self.root + '/usr/share/java-config-2/config/')
-- with open(self.root +
'/usr/share/java-config-2/config/jdk-defaults.conf', 'w') as f:
-+ os.mkdir(self.root + eprefix +
'/usr/share/java-config-2/config/')
-+ with open(self.root + eprefix +
'/usr/share/java-config-2/config/jdk-defaults.conf', 'w') as f:
- f.write("# This files contain the default support
jdk's\n")
- f.write(defaults + "\n")
-
diff --git a/dev-java/java-config/files/java-config-2.2.0-py38.patch
b/dev-java/java-config/files/java-config-2.2.0-py38.patch
deleted file mode 100644
index cb59e1f36be..000
--- a/dev-java/java-config/files/java-config-2.2.0-py38.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 5e7cc49184e657bd446998f4b08e9106e5215ce5 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev
-Date: Thu, 7 May 2020 02:45:57 -0700
-Subject: [PATCH] replace is with ==
-
- src/java-config-2 | 8
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/java-config-2 b/src/java-config-2
-index 8ad2539..84ecd30 100755
a/src/java-config-2
-+++ b/src/java-config-2
-@@ -199,7 +199,7 @@ def set_user_vm(option, opt, value, parser):
- if not vm:
- fatalError("Could not find a vm matching: %s" % value)
- else:
--if os.getuid() is 0:
-+if os.getuid() == 0:
- fatalError("The user 'root' should always use the System VM")
- else:
- try:
-@@ -227,7 +227,7 @@ def user_classpath_target():
- # Deprecated
- def set_system_classpath(option, opt, value, parser):
- deprecation_notice()
--if os.getuid() is 0:
-+if os.getuid() == 0:
- pkgs = value.split(',')
- manager.set_classpath(system_classpath_target(), pkgs)
-
-@@ -252,7 +252,7 @@ def set_user_classpath(option, opt, value, parser):
- # Deprecated
- def append_system_classpath(option, opt, value, parser):
- deprecation_notice()
--if os.getuid() is 0:
-+if os.getuid() == 0:
- pkgs = value.split(',')
- manager.append_classpath(system_classpath_target(), pkgs)
-
-@@ -277,7 +277,7 @@ def append_user_classpath(option, opt, value, parser):
- # Deprecated
- def clean_system_classpath(option, opt, value, parser):
- deprecation_notice()
--if os.getuid() is 0:
-+if os.getuid() == 0:
- manager.clean_classpath(system_classpath_target())
- update_env()
- else:
---
-2.26.2
-
diff --git a/dev-java/java-config/java-config-2.2.0-r4.ebuild
b/dev-java/java-config/java-config-2.2.0-r4.ebuild
deleted file mode 100644
index 8f03a425121..000
--- a/dev-java/java-config/java-config-2.2.0-r4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 94086c17c648d687cda296585e5d970eef68f69c
Author: Patrice Clement gentoo org>
AuthorDate: Thu Jul 16 21:10:20 2020 +
Commit: Patrice Clement gentoo org>
CommitDate: Thu Jul 16 21:10:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94086c17
dev-java/java-config: add version.
Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Patrice Clement gentoo.org>
dev-java/java-config/java-config-.ebuild | 45
1 file changed, 45 insertions(+)
diff --git a/dev-java/java-config/java-config-.ebuild
b/dev-java/java-config/java-config-.ebuild
new file mode 100644
index 000..e60c556878b
--- /dev/null
+++ b/dev-java/java-config/java-config-.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# jython depends on java-config, so don't add it or things will break
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+if [[ $PV = * ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git;
+else
+ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz;
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Java environment configuration query tool"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java;
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+
+# baselayout-java is added as a dep till it can be added to eclass.
+RDEPEND="
+ !dev-java/java-config-wrapper
+ sys-apps/baselayout-java
+ sys-apps/portage[${PYTHON_USEDEP}]"
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ # This replaces the file installed by java-config-wrapper.
+ dosym java-config-2 /usr/bin/java-config
+}
+
+python_test() {
+ esetup.py test
+}
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 1a1abbd49d794ec5ec72c44693cfd4503c734061
Author: Sam James gentoo org>
AuthorDate: Thu Jul 9 11:52:31 2020 +
Commit: Sam James gentoo org>
CommitDate: Thu Jul 9 11:52:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a1abbd4
dev-java/java-config: arm64 stable (bug #730530)
Package-Manager: Portage-2.3.103, Repoman-2.3.22
Signed-off-by: Sam James gentoo.org>
dev-java/java-config/java-config-2.3.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/java-config/java-config-2.3.1.ebuild
b/dev-java/java-config/java-config-2.3.1.ebuild
index 8f719c63474..87732bf9ecf 100644
--- a/dev-java/java-config/java-config-2.3.1.ebuild
+++ b/dev-java/java-config/java-config-2.3.1.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz;
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 9d281095178474f7ac0d6d58fe93ef073dbfb529
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sun Jul 5 13:44:32 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sun Jul 5 13:44:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d281095
dev-java/java-config: x86 stable wrt bug #730530
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-java/java-config/java-config-2.3.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/java-config/java-config-2.3.1.ebuild
b/dev-java/java-config/java-config-2.3.1.ebuild
index db303f8e41d..8f719c63474 100644
--- a/dev-java/java-config/java-config-2.3.1.ebuild
+++ b/dev-java/java-config/java-config-2.3.1.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz;
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: b7066f76bb1215cc4bed4d73e4b27bc84462d070
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sun Jul 5 13:35:41 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sun Jul 5 13:35:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7066f76
dev-java/java-config: amd64 stable wrt bug #730530
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-java/java-config/java-config-2.3.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/java-config/java-config-2.3.1.ebuild
b/dev-java/java-config/java-config-2.3.1.ebuild
index 2e884bd58d4..db303f8e41d 100644
--- a/dev-java/java-config/java-config-2.3.1.ebuild
+++ b/dev-java/java-config/java-config-2.3.1.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz;
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 5fd44a26d3233377e8d551c41b6b2a475cfc2c56
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sun Jul 5 08:49:39 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Jul 5 08:49:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fd44a26
dev-java/java-config: stable 2.3.1 for ppc64
stable wrt bug #730530
Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-java/java-config/java-config-2.3.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/java-config/java-config-2.3.1.ebuild
b/dev-java/java-config/java-config-2.3.1.ebuild
index 8a71761b218..2e884bd58d4 100644
--- a/dev-java/java-config/java-config-2.3.1.ebuild
+++ b/dev-java/java-config/java-config-2.3.1.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz;
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 65751b9c6d33cd8a9b8ea90fbf2b1800590c496d
Author: Patrice Clement gentoo org>
AuthorDate: Tue Jun 23 13:28:34 2020 +
Commit: Patrice Clement gentoo org>
CommitDate: Tue Jun 23 13:29:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65751b9c
dev-java/java-config: version bump.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Patrice Clement gentoo.org>
dev-java/java-config/Manifest | 1 +
dev-java/java-config/java-config-2.3.1.ebuild | 39 +++
2 files changed, 40 insertions(+)
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 2dcb20753e5..7b68a8f8369 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,2 +1,3 @@
DIST java-config-2.2.0.tar.bz2 51851 BLAKE2B
7b7c15dc988d2f5f54ebacba224f57193577e24f99a798657b40d83d723280562e314ba71319958a83be44defc6a48ac1114cce37eaeddea025ea31f26cf331a
SHA512
a491cfe86bde8afadfc5b875740d79f9077526d8650ffb034fdad67a7ffa1b02646f67b1ef0eab7b0fe3ae57b5d767fa6a0d5593fe07416993d60588a8ed595a
+DIST java-config-2.3.1.tar.gz 26165 BLAKE2B
948506663513db369d0ed8ffdfaa54c643989431430ea03440551a6a4b6725d8eec38f5cb4fde3b64e8936c0f43de0e65a7368469032c646c7b6b3bb7ec3ed13
SHA512
62db555b2d8a37a03b6a03aa133010848d54be33ba6e3c43807abefe665a9d8ff2790baf1af79b98d4a7bd3e9ba6bc64382a24c3fcf7038338123dabd146b7b4
DIST java-config-2.3.tar.gz 26586 BLAKE2B
00fbc9bd606cb87bfde9f72837a062de540465a0299393016fc34543b89cf381a85b68ec5a884c0f76fe6b3188aa27498ed93e858187f2e51f6a23a2dcea7b67
SHA512
06e7c1ffe3fa0b903c5444ddcb9f72052773870c6543122440089a24bf0d8ec6c475e5f72a7ee9c3790432fdfeb786976af28e8aa7d18484168af16f5bb1b2ea
diff --git a/dev-java/java-config/java-config-2.3.1.ebuild
b/dev-java/java-config/java-config-2.3.1.ebuild
new file mode 100644
index 000..8a71761b218
--- /dev/null
+++ b/dev-java/java-config/java-config-2.3.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# jython depends on java-config, so don't add it or things will break
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="Java environment configuration query tool"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java;
+SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+
+# baselayout-java is added as a dep till it can be added to eclass.
+RDEPEND="
+ !dev-java/java-config-wrapper
+ sys-apps/baselayout-java
+ sys-apps/portage[${PYTHON_USEDEP}]"
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ # This replaces the file installed by java-config-wrapper.
+ dosym java-config-2 /usr/bin/java-config
+}
+
+python_test() {
+ esetup.py test
+}
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 8137cdabbe9fa5efc08a7fc6dc9a3cbeb3fb6112
Author: Patrice Clement gentoo org>
AuthorDate: Tue Jun 23 13:29:04 2020 +
Commit: Patrice Clement gentoo org>
CommitDate: Tue Jun 23 13:29:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8137cdab
dev-java/java-config: clean up bogus version for eprefix folks.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Patrice Clement gentoo.org>
dev-java/java-config/Manifest | 1 -
dev-java/java-config/java-config-2.3.ebuild | 39 -
2 files changed, 40 deletions(-)
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 7b68a8f8369..f75ce7c90ed 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,3 +1,2 @@
DIST java-config-2.2.0.tar.bz2 51851 BLAKE2B
7b7c15dc988d2f5f54ebacba224f57193577e24f99a798657b40d83d723280562e314ba71319958a83be44defc6a48ac1114cce37eaeddea025ea31f26cf331a
SHA512
a491cfe86bde8afadfc5b875740d79f9077526d8650ffb034fdad67a7ffa1b02646f67b1ef0eab7b0fe3ae57b5d767fa6a0d5593fe07416993d60588a8ed595a
DIST java-config-2.3.1.tar.gz 26165 BLAKE2B
948506663513db369d0ed8ffdfaa54c643989431430ea03440551a6a4b6725d8eec38f5cb4fde3b64e8936c0f43de0e65a7368469032c646c7b6b3bb7ec3ed13
SHA512
62db555b2d8a37a03b6a03aa133010848d54be33ba6e3c43807abefe665a9d8ff2790baf1af79b98d4a7bd3e9ba6bc64382a24c3fcf7038338123dabd146b7b4
-DIST java-config-2.3.tar.gz 26586 BLAKE2B
00fbc9bd606cb87bfde9f72837a062de540465a0299393016fc34543b89cf381a85b68ec5a884c0f76fe6b3188aa27498ed93e858187f2e51f6a23a2dcea7b67
SHA512
06e7c1ffe3fa0b903c5444ddcb9f72052773870c6543122440089a24bf0d8ec6c475e5f72a7ee9c3790432fdfeb786976af28e8aa7d18484168af16f5bb1b2ea
diff --git a/dev-java/java-config/java-config-2.3.ebuild
b/dev-java/java-config/java-config-2.3.ebuild
deleted file mode 100644
index 3c47fcea497..000
--- a/dev-java/java-config/java-config-2.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Java environment configuration query tool"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java;
-SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
-
-# baselayout-java is added as a dep till it can be added to eclass.
-RDEPEND="
- !dev-java/java-config-wrapper
- sys-apps/baselayout-java
- sys-apps/portage[${PYTHON_USEDEP}]"
-
-python_install_all() {
- distutils-r1_python_install_all
-
- # This replaces the file installed by java-config-wrapper.
- dosym java-config-2 /usr/bin/java-config
-}
-
-python_test() {
- esetup.py test
-}
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: c1216edb9628c004899b09dabc671191fb60d967
Author: Patrice Clement gentoo org>
AuthorDate: Thu Jun 18 07:36:06 2020 +
Commit: Patrice Clement gentoo org>
CommitDate: Thu Jun 18 07:36:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1216edb
dev-java/java-config: update SRC_URI.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Patrice Clement gentoo.org>
dev-java/java-config/java-config-2.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/java-config/java-config-2.3.ebuild
b/dev-java/java-config/java-config-2.3.ebuild
index 32efc01d1cb..3c47fcea497 100644
--- a/dev-java/java-config/java-config-2.3.ebuild
+++ b/dev-java/java-config/java-config-2.3.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
DESCRIPTION="Java environment configuration query tool"
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java;
-SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz;
+SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz;
LICENSE="GPL-2"
SLOT="2"
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 0fcbab15b63ae09d4d47f8b8392c88db4104bf01
Author: Patrice Clement gentoo org>
AuthorDate: Wed Jun 17 21:03:36 2020 +
Commit: Patrice Clement gentoo org>
CommitDate: Wed Jun 17 21:04:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fcbab15
dev-java/java-config: version bump.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Patrice Clement gentoo.org>
dev-java/java-config/Manifest | 1 +
dev-java/java-config/java-config-2.3.ebuild | 39 +
2 files changed, 40 insertions(+)
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 09e1dd3cde6..2dcb20753e5 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1 +1,2 @@
DIST java-config-2.2.0.tar.bz2 51851 BLAKE2B
7b7c15dc988d2f5f54ebacba224f57193577e24f99a798657b40d83d723280562e314ba71319958a83be44defc6a48ac1114cce37eaeddea025ea31f26cf331a
SHA512
a491cfe86bde8afadfc5b875740d79f9077526d8650ffb034fdad67a7ffa1b02646f67b1ef0eab7b0fe3ae57b5d767fa6a0d5593fe07416993d60588a8ed595a
+DIST java-config-2.3.tar.gz 26586 BLAKE2B
00fbc9bd606cb87bfde9f72837a062de540465a0299393016fc34543b89cf381a85b68ec5a884c0f76fe6b3188aa27498ed93e858187f2e51f6a23a2dcea7b67
SHA512
06e7c1ffe3fa0b903c5444ddcb9f72052773870c6543122440089a24bf0d8ec6c475e5f72a7ee9c3790432fdfeb786976af28e8aa7d18484168af16f5bb1b2ea
diff --git a/dev-java/java-config/java-config-2.3.ebuild
b/dev-java/java-config/java-config-2.3.ebuild
new file mode 100644
index 000..32efc01d1cb
--- /dev/null
+++ b/dev-java/java-config/java-config-2.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# jython depends on java-config, so don't add it or things will break
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="Java environment configuration query tool"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java;
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+
+# baselayout-java is added as a dep till it can be added to eclass.
+RDEPEND="
+ !dev-java/java-config-wrapper
+ sys-apps/baselayout-java
+ sys-apps/portage[${PYTHON_USEDEP}]"
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ # This replaces the file installed by java-config-wrapper.
+ dosym java-config-2 /usr/bin/java-config
+}
+
+python_test() {
+ esetup.py test
+}
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/files/, dev-java/java-config/
commit: 943a0212ff7b44ada2bcd53a6c73bcd7605a3286
Author: Georgy Yakovlev gentoo org>
AuthorDate: Thu May 7 09:49:43 2020 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Thu May 7 09:52:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=943a0212
dev-java/java-config: add python3_8 compat
Bug: https://bugs.gentoo.org/719204
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Georgy Yakovlev gentoo.org>
.../java-config/files/java-config-2.2.0-py38.patch | 52 ++
dev-java/java-config/java-config-2.2.0-r4.ebuild | 7 ++-
2 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/dev-java/java-config/files/java-config-2.2.0-py38.patch
b/dev-java/java-config/files/java-config-2.2.0-py38.patch
new file mode 100644
index 000..cb59e1f36be
--- /dev/null
+++ b/dev-java/java-config/files/java-config-2.2.0-py38.patch
@@ -0,0 +1,52 @@
+From 5e7cc49184e657bd446998f4b08e9106e5215ce5 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev
+Date: Thu, 7 May 2020 02:45:57 -0700
+Subject: [PATCH] replace is with ==
+
+---
+ src/java-config-2 | 8
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/java-config-2 b/src/java-config-2
+index 8ad2539..84ecd30 100755
+--- a/src/java-config-2
b/src/java-config-2
+@@ -199,7 +199,7 @@ def set_user_vm(option, opt, value, parser):
+ if not vm:
+ fatalError("Could not find a vm matching: %s" % value)
+ else:
+-if os.getuid() is 0:
++if os.getuid() == 0:
+ fatalError("The user 'root' should always use the System VM")
+ else:
+ try:
+@@ -227,7 +227,7 @@ def user_classpath_target():
+ # Deprecated
+ def set_system_classpath(option, opt, value, parser):
+ deprecation_notice()
+-if os.getuid() is 0:
++if os.getuid() == 0:
+ pkgs = value.split(',')
+ manager.set_classpath(system_classpath_target(), pkgs)
+
+@@ -252,7 +252,7 @@ def set_user_classpath(option, opt, value, parser):
+ # Deprecated
+ def append_system_classpath(option, opt, value, parser):
+ deprecation_notice()
+-if os.getuid() is 0:
++if os.getuid() == 0:
+ pkgs = value.split(',')
+ manager.append_classpath(system_classpath_target(), pkgs)
+
+@@ -277,7 +277,7 @@ def append_user_classpath(option, opt, value, parser):
+ # Deprecated
+ def clean_system_classpath(option, opt, value, parser):
+ deprecation_notice()
+-if os.getuid() is 0:
++if os.getuid() == 0:
+ manager.clean_classpath(system_classpath_target())
+ update_env()
+ else:
+--
+2.26.2
+
diff --git a/dev-java/java-config/java-config-2.2.0-r4.ebuild
b/dev-java/java-config/java-config-2.2.0-r4.ebuild
index 2913a8f7f68..8f03a425121 100644
--- a/dev-java/java-config/java-config-2.2.0-r4.ebuild
+++ b/dev-java/java-config/java-config-2.2.0-r4.ebuild
@@ -4,7 +4,7 @@
EAPI=6
# jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1
@@ -27,7 +27,10 @@ RDEPEND="
sys-apps/baselayout-java
sys-apps/portage[${PYTHON_USEDEP}]"
-PATCHES=( "${FILESDIR}"/${PN}-2.2.0-prefix.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.2.0-prefix.patch
+ "${FILESDIR}"/${PN}-2.2.0-py38.patch
+)
python_install_all() {
distutils-r1_python_install_all
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: adc7ec8ea7b65cf85514eefe8a8ef5172e337005
Author: Thomas Deutschmann gentoo org>
AuthorDate: Wed Apr 29 18:30:38 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Wed Apr 29 18:31:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adc7ec8e
Revert "dev-java/java-config: Python 3.8 compatibility"
This reverts commit 5d50d82c6407fe431c069494b8e4b788e5013c88.
Bug: https://bugs.gentoo.org/719204
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-java/java-config/java-config-2.2.0-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/java-config/java-config-2.2.0-r4.ebuild
b/dev-java/java-config/java-config-2.2.0-r4.ebuild
index 725ac6dc0e5..2913a8f7f68 100644
--- a/dev-java/java-config/java-config-2.2.0-r4.ebuild
+++ b/dev-java/java-config/java-config-2.2.0-r4.ebuild
@@ -4,7 +4,7 @@
EAPI=6
# jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7} )
DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 5d50d82c6407fe431c069494b8e4b788e5013c88
Author: Craig Andrews gentoo org>
AuthorDate: Sat Apr 18 02:51:50 2020 +
Commit: Craig Andrews gentoo org>
CommitDate: Sat Apr 18 02:51:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d50d82c
dev-java/java-config: Python 3.8 compatibility
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Craig Andrews gentoo.org>
dev-java/java-config/java-config-2.2.0-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/java-config/java-config-2.2.0-r4.ebuild
b/dev-java/java-config/java-config-2.2.0-r4.ebuild
index 2913a8f7f68..725ac6dc0e5 100644
--- a/dev-java/java-config/java-config-2.2.0-r4.ebuild
+++ b/dev-java/java-config/java-config-2.2.0-r4.ebuild
@@ -4,7 +4,7 @@
EAPI=6
# jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 614dc74469e8bd31621e449cde05f637117fd449
Author: Mike Gilbert gentoo org>
AuthorDate: Wed Apr 15 05:46:21 2020 +
Commit: Mike Gilbert gentoo org>
CommitDate: Wed Apr 15 05:48:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=614dc744
dev-java/java-config: DISTUTILS_USE_SETUPTOOLS=no
Signed-off-by: Mike Gilbert gentoo.org>
dev-java/java-config/java-config-2.2.0-r4.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-java/java-config/java-config-2.2.0-r4.ebuild
b/dev-java/java-config/java-config-2.2.0-r4.ebuild
index 8f0cddb82b4..2913a8f7f68 100644
--- a/dev-java/java-config/java-config-2.2.0-r4.ebuild
+++ b/dev-java/java-config/java-config-2.2.0-r4.ebuild
@@ -5,6 +5,7 @@ EAPI=6
# jython depends on java-config, so don't add it or things will break
PYTHON_COMPAT=( python{3_6,3_7} )
+DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 8900bbbdef664700b0548c292432c2a5a0cbbfd6
Author: Michał Górny gentoo org>
AuthorDate: Sat May 18 08:56:19 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Sat May 18 10:02:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8900bbbd
dev-java/java-config: Prune dep on portage-mgorny
Signed-off-by: Michał Górny gentoo.org>
dev-java/java-config/java-config-2.2.0-r4.ebuild | 12 ++--
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/dev-java/java-config/java-config-2.2.0-r4.ebuild
b/dev-java/java-config/java-config-2.2.0-r4.ebuild
index 4b8d2d3b729..5ab370d8899 100644
--- a/dev-java/java-config/java-config-2.2.0-r4.ebuild
+++ b/dev-java/java-config/java-config-2.2.0-r4.ebuild
@@ -17,21 +17,13 @@ SLOT="2"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
IUSE="test"
-DEPEND="test? (
- || (
- sys-apps/portage[${PYTHON_USEDEP}]
- sys-apps/portage-mgorny[${PYTHON_USEDEP}]
- )
- )"
+DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
# baselayout-java is added as a dep till it can be added to eclass.
RDEPEND="
!dev-java/java-config-wrapper
sys-apps/baselayout-java
- || (
- sys-apps/portage[${PYTHON_USEDEP}]
- sys-apps/portage-mgorny[${PYTHON_USEDEP}]
- )"
+ sys-apps/portage[${PYTHON_USEDEP}]"
PATCHES=( "${FILESDIR}"/${PN}-2.2.0-prefix.patch )
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 280549c2bff3aa09eb9c8d90bf61f72cf03df936
Author: Georgy Yakovlev gentoo org>
AuthorDate: Sat Jan 5 23:15:21 2019 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Sat Jan 5 23:15:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=280549c2
dev-java/java-config: move distfile to my devspace
It was unfetcheable without mirrors.
Closes: https://bugs.gentoo.org/674604
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Georgy Yakovlev gentoo.org>
dev-java/java-config/java-config-2.2.0-r4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/java-config/java-config-2.2.0-r4.ebuild
b/dev-java/java-config/java-config-2.2.0-r4.ebuild
index 6cec0799a1c..f74fb67ff8f 100644
--- a/dev-java/java-config/java-config-2.2.0-r4.ebuild
+++ b/dev-java/java-config/java-config-2.2.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="Java environment configuration query tool"
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java;
-SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2;
+SRC_URI="https://dev.gentoo.org/~gyakovlev/distfiles/${P}.tar.bz2;
LICENSE="GPL-2"
SLOT="2"
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 0383aa101e153248587ba97c7871d1fd7fe511b8
Author: Philipp Ammann posteo de>
AuthorDate: Sat Oct 20 10:44:10 2018 +
Commit: Patrice Clement gentoo org>
CommitDate: Fri Nov 2 21:37:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0383aa10
dev-java/java-config: PYTHON_COMPAT+="python3_7".
Signed-off-by: Philipp Ammann posteo.de>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Closes: https://github.com/gentoo/gentoo/pull/10184
Signed-off-by: Patrice Clement gentoo.org>
dev-java/java-config/java-config-2.2.0-r4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/java-config/java-config-2.2.0-r4.ebuild
b/dev-java/java-config/java-config-2.2.0-r4.ebuild
index 2d0a0865806..6cec0799a1c 100644
--- a/dev-java/java-config/java-config-2.2.0-r4.ebuild
+++ b/dev-java/java-config/java-config-2.2.0-r4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
# jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
inherit distutils-r1
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: d6f9a14791765373a4deddf75565c8d693dc1a2f
Author: Manuel Rüger gentoo org>
AuthorDate: Fri May 5 15:28:17 2017 +
Commit: Manuel Rüger gentoo org>
CommitDate: Fri May 5 15:28:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6f9a147
dev-java/java-config: Add python3_6
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-java/java-config/java-config-2.2.0-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/java-config/java-config-2.2.0-r3.ebuild
b/dev-java/java-config/java-config-2.2.0-r3.ebuild
index 26e42c7326c..983ce2cb9f3 100644
--- a/dev-java/java-config/java-config-2.2.0-r3.ebuild
+++ b/dev-java/java-config/java-config-2.2.0-r3.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=6
# jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 5d43fe0c94f6e1df10f4fa8ecb2f9cd8a06d07f4
Author: Roy Bamford gentoo org>
AuthorDate: Tue Jan 24 17:59:34 2017 +
Commit: James Le Cuirot gentoo org>
CommitDate: Tue Jan 24 20:20:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d43fe0c
dev-java/java-config: added ~arm64 keyword Used by oracle-jdk-bin, which is
already keyworded
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3632
dev-java/java-config/java-config-2.2.0-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/java-config/java-config-2.2.0-r3.ebuild
b/dev-java/java-config/java-config-2.2.0-r3.ebuild
index 5e3bd67..184ff95 100644
--- a/dev-java/java-config/java-config-2.2.0-r3.ebuild
+++ b/dev-java/java-config/java-config-2.2.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2;
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-fbsd ~x86-fbsd"
IUSE="test"
DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/files/, dev-java/java-config/
commit: bcac37d4fa122fd21148d66dca71c56cdc1222f1
Author: Benda Xu gentoo org>
AuthorDate: Fri Sep 23 01:35:22 2016 +
Commit: Benda XU gentoo org>
CommitDate: Fri Sep 23 01:35:48 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcac37d4
dev-java/java-config: Prefix support.
Bug: 591156
Package-Manager: portage-2.3.0
dev-java/java-config/files/java-config-2.2.0-prefix.patch | 15 +++
dev-java/java-config/java-config-2.2.0-r3.ebuild | 2 ++
2 files changed, 17 insertions(+)
diff --git a/dev-java/java-config/files/java-config-2.2.0-prefix.patch
b/dev-java/java-config/files/java-config-2.2.0-prefix.patch
new file mode 100644
index ..068538a
--- /dev/null
+++ b/dev-java/java-config/files/java-config-2.2.0-prefix.patch
@@ -0,0 +1,15 @@
+Wait for the java team to upstream this patch.
+Bug: 591156
+--- /setup.py 2013-02-15 07:12:09.0 +0900
/setup.py.new 2016-08-13 16:38:22.0 +0900
+@@ -87,8 +87,8 @@
+ elif arch in ['hpux']:
+ defaults = '*= hp-jdk-bin'
+
+- os.mkdir(self.root + '/usr/share/java-config-2/config/')
+- with open(self.root +
'/usr/share/java-config-2/config/jdk-defaults.conf', 'w') as f:
++ os.mkdir(self.root + eprefix +
'/usr/share/java-config-2/config/')
++ with open(self.root + eprefix +
'/usr/share/java-config-2/config/jdk-defaults.conf', 'w') as f:
+ f.write("# This files contain the default support
jdk's\n")
+ f.write(defaults + "\n")
+
diff --git a/dev-java/java-config/java-config-2.2.0-r3.ebuild
b/dev-java/java-config/java-config-2.2.0-r3.ebuild
index 6d97d04..4fa2962 100644
--- a/dev-java/java-config/java-config-2.2.0-r3.ebuild
+++ b/dev-java/java-config/java-config-2.2.0-r3.ebuild
@@ -26,6 +26,8 @@ RDEPEND="
sys-apps/baselayout-java
sys-apps/portage[${PYTHON_USEDEP}]"
+PATCHES=( "${FILESDIR}"/${PN}-2.2.0-prefix.patch )
+
python_install_all() {
distutils-r1_python_install_all
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config-wrapper/
commit: 0a822e472735d4da27dc8d3dd29a01299e89dc08
Author: James Le Cuirot gentoo org>
AuthorDate: Mon May 2 20:39:37 2016 +
Commit: James Le Cuirot gentoo org>
CommitDate: Mon May 2 20:39:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a822e47
dev-java/java-config-wrapper: Remove legacy migration package
dev-java/java-config-wrapper/Manifest | 1 -
.../java-config-wrapper-0.16-r1.ebuild | 22 --
.../java-config-wrapper-0.16.ebuild| 20
dev-java/java-config-wrapper/metadata.xml | 8
4 files changed, 51 deletions(-)
diff --git a/dev-java/java-config-wrapper/Manifest
b/dev-java/java-config-wrapper/Manifest
deleted file mode 100644
index 822f3c0..000
--- a/dev-java/java-config-wrapper/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST java-config-wrapper-0.16.tar.bz2 7421 SHA256
26a9bddd2c4123bbe32cb52a248cfc8657ab9d414d4c330a10ec2bee3c3aa300 SHA512
24dc96d18b71e59129f0e5a376b7ca412941ec7337d7f3cbd67f40c211318955234b480031047fc367875cfaf8613a0f4aca67d479d424de9b48592d5dcb3fbf
WHIRLPOOL
f7e2e4fdedf7c51529a90d69e6ed34a15b98c062005476e01d2e5aaeea2d113c40e3d879fdc0a825512460545333bd55caf3f6779421fd101a09d70f3edd9d06
diff --git a/dev-java/java-config-wrapper/java-config-wrapper-0.16-r1.ebuild
b/dev-java/java-config-wrapper/java-config-wrapper-0.16-r1.ebuild
deleted file mode 100644
index 993c431..000
--- a/dev-java/java-config-wrapper/java-config-wrapper-0.16-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Wrapper for java-config"
-HOMEPAGE="https://www.gentoo.org/proj/en/java;
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="!https://www.gentoo.org/proj/en/java;
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="!
-http://www.gentoo.org/dtd/metadata.dtd;>
-
-
- j...@gentoo.org
- Java
-
-
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 3bec6f36c118cd36ff5713cb42aa9a2da381bf5a
Author: James Le Cuirot gentoo org>
AuthorDate: Sun Apr 3 22:04:52 2016 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sun Apr 3 22:34:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bec6f36
dev-java/java-config: Remove old 2.2.0
Package-Manager: portage-2.2.28
dev-java/java-config/java-config-2.2.0.ebuild | 29 ---
1 file changed, 29 deletions(-)
diff --git a/dev-java/java-config/java-config-2.2.0.ebuild
b/dev-java/java-config/java-config-2.2.0.ebuild
deleted file mode 100644
index 082aac1..000
--- a/dev-java/java-config/java-config-2.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Java environment configuration query tool"
-HOMEPAGE="https://www.gentoo.org/proj/en/java/;
-SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-# baselayout-java is added as a dep till it can be added to eclass.
-RDEPEND="
- >=dev-java/java-config-wrapper-0.15
- sys-apps/baselayout-java
- sys-apps/portage"
-
-python_test() {
- esetup.py test
-}
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 504fa827c15d63e61e145067ee6195af0fa0a5f4
Author: James Le Cuirot gentoo org>
AuthorDate: Sun Apr 3 22:03:50 2016 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sun Apr 3 22:34:24 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=504fa827
dev-java/java-config: 2.2.0-r3 stable using ALLARCHES
Package-Manager: portage-2.2.28
dev-java/java-config/java-config-2.2.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/java-config/java-config-2.2.0-r3.ebuild
b/dev-java/java-config/java-config-2.2.0-r3.ebuild
index 464984e..6d97d04 100644
--- a/dev-java/java-config/java-config-2.2.0-r3.ebuild
+++ b/dev-java/java-config/java-config-2.2.0-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2;
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd"
IUSE="test"
DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 260df94b4a03fc4ed314deafac6424bede1a2703
Author: James Le Cuirot gentoo org>
AuthorDate: Sun Feb 21 11:55:20 2016 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sun Feb 21 11:55:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=260df94b
dev-java/java-config: Add Python 3.5, fix Python deps wrt bug #539802
Package-Manager: portage-2.2.27
.../{java-config-2.2.0-r2.ebuild => java-config-2.2.0-r3.ebuild} | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/dev-java/java-config/java-config-2.2.0-r2.ebuild
b/dev-java/java-config/java-config-2.2.0-r3.ebuild
similarity index 84%
rename from dev-java/java-config/java-config-2.2.0-r2.ebuild
rename to dev-java/java-config/java-config-2.2.0-r3.ebuild
index 75780b7..464984e 100644
--- a/dev-java/java-config/java-config-2.2.0-r2.ebuild
+++ b/dev-java/java-config/java-config-2.2.0-r3.ebuild
@@ -5,7 +5,7 @@
EAPI="6"
# jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit distutils-r1
@@ -16,13 +16,15 @@
SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2;
LICENSE="GPL-2"
SLOT="2"
KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
+IUSE="test"
+
+DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
# baselayout-java is added as a dep till it can be added to eclass.
RDEPEND="
!dev-java/java-config-wrapper
sys-apps/baselayout-java
- sys-apps/portage"
+ sys-apps/portage[${PYTHON_USEDEP}]"
python_install_all() {
distutils-r1_python_install_all
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 1a6ccc8cf7cea82ab69307af3966184380113e6c
Author: James Le Cuirot gentoo org>
AuthorDate: Thu Feb 18 19:12:38 2016 +
Commit: James Le Cuirot gentoo org>
CommitDate: Thu Feb 18 19:13:13 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a6ccc8c
dev-java/java-config: Deal with java-config-wrapper the right way
I'm a dumbass. 'nuff said.
Package-Manager: portage-2.2.27
.../{java-config-2.2.0-r1.ebuild => java-config-2.2.0-r2.ebuild}| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/java-config/java-config-2.2.0-r1.ebuild
b/dev-java/java-config/java-config-2.2.0-r2.ebuild
similarity index 93%
rename from dev-java/java-config/java-config-2.2.0-r1.ebuild
rename to dev-java/java-config/java-config-2.2.0-r2.ebuild
index 171c3ed..75780b7 100644
--- a/dev-java/java-config/java-config-2.2.0-r1.ebuild
+++ b/dev-java/java-config/java-config-2.2.0-r2.ebuild
@@ -28,7 +28,7 @@ python_install_all() {
distutils-r1_python_install_all
# This replaces the file installed by java-config-wrapper.
- cp -a "${ED}/usr/bin/${PN}-2" "${ED}/usr/bin/${PN}" || die
+ dosym java-config-2 /usr/bin/java-config
}
python_test() {
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 22d6ca90de8cf83894715a2b42cd678f10ee37cb
Author: James Le Cuirot gentoo org>
AuthorDate: Thu Feb 18 17:03:48 2016 +
Commit: James Le Cuirot gentoo org>
CommitDate: Thu Feb 18 17:03:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22d6ca90
dev-java/java-config: Remove java-config-wrapper dependency, EAPI bump
java-config-wrapper is very obsolete but we have relied on it because
it installs the java-config symlink. We don't have time to do a
java-config bump yet but we can easily install the symlink
here. Addresses bug #504124.
Package-Manager: portage-2.2.27
dev-java/java-config/java-config-2.2.0-r1.ebuild | 36
1 file changed, 36 insertions(+)
diff --git a/dev-java/java-config/java-config-2.2.0-r1.ebuild
b/dev-java/java-config/java-config-2.2.0-r1.ebuild
new file mode 100644
index 000..171c3ed
--- /dev/null
+++ b/dev-java/java-config/java-config-2.2.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+# jython depends on java-config, so don't add it or things will break
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Java environment configuration query tool"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java;
+SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2;
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+# baselayout-java is added as a dep till it can be added to eclass.
+RDEPEND="
+ !dev-java/java-config-wrapper
+ sys-apps/baselayout-java
+ sys-apps/portage"
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ # This replaces the file installed by java-config-wrapper.
+ cp -a "${ED}/usr/bin/${PN}-2" "${ED}/usr/bin/${PN}" || die
+}
+
+python_test() {
+ esetup.py test
+}
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config-wrapper/
commit: 7e6f900f8eedba0b0c8149e144cb856a8a7f8988
Author: Patrice Clement gentoo org>
AuthorDate: Mon Dec 7 07:59:28 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Mon Dec 7 10:10:45 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e6f900f
dev-java/java-config-wrapper: EAPI 5 bump.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement gentoo.org>
.../java-config-wrapper-0.16-r1.ebuild | 22 ++
1 file changed, 22 insertions(+)
diff --git a/dev-java/java-config-wrapper/java-config-wrapper-0.16-r1.ebuild
b/dev-java/java-config-wrapper/java-config-wrapper-0.16-r1.ebuild
new file mode 100644
index 000..5da8d1a
--- /dev/null
+++ b/dev-java/java-config-wrapper/java-config-wrapper-0.16-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Wrapper for java-config"
+HOMEPAGE="https://www.gentoo.org/proj/en/java;
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
~x86-fbsd"
+IUSE=""
+
+DEPEND="!
[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
commit: 662c979bd3d14f882bfabd0eabf12f43ec2e2d17
Author: Justin Lecher gentoo org>
AuthorDate: Fri Sep 11 06:57:29 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Fri Sep 11 07:53:13 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=662c979b
dev-java/java-config: Drop unnecessary die
Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher gentoo.org>
dev-java/java-config/java-config-2.2.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/java-config/java-config-2.2.0.ebuild
b/dev-java/java-config/java-config-2.2.0.ebuild
index 79a3407..0635431 100644
--- a/dev-java/java-config/java-config-2.2.0.ebuild
+++ b/dev-java/java-config/java-config-2.2.0.ebuild
@@ -25,5 +25,5 @@ RDEPEND="
sys-apps/portage"
python_test() {
- esetup.py test || die
+ esetup.py test
}
