diff options
Diffstat (limited to 'dev-java/java-config')
| -rw-r--r-- | dev-java/java-config/Manifest | 3 | ||||
| -rw-r--r-- | dev-java/java-config/files/java-config-2.2.0-py38.patch | 52 | ||||
| -rw-r--r-- | dev-java/java-config/java-config-2.2.0-r4.ebuild | 7 |
3 files changed, 59 insertions, 3 deletions
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest index d85622ecb444..02ea3ae42011 100644 --- a/dev-java/java-config/Manifest +++ b/dev-java/java-config/Manifest @@ -1,4 +1,5 @@ AUX java-config-2.2.0-prefix.patch 653 BLAKE2B 837f741e45b8228944e6287a57b05e933d85db00375ea68690e32b101da45b8150bcc6665d1d03ed6836724bbe43c4bfe1e89fb9449723fb4532dca4f4dcf01a SHA512 591591828ddadf76b5ed65811f7ed9e1e60583c5575926edf175ebc7ed1d76562ec980ec3bb530dedc7626f841dc7d143383bad25303399eac2ad49328d63dc0 +AUX java-config-2.2.0-py38.patch 1685 BLAKE2B 3fe59a1839a9fe1f954e6c96bdf42bd28f795881601b0e53353864ee4cdec57d891a5c1fee7e7f7060aba521da23934be8b5ea2717339e16f291671937df1af7 SHA512 9fa254fd108ec05d69d39260841fb8f946d6405b3fa37223af3b53117383bad94243c7a20f3f53de1a5d0609f433a14deb50fb7b9f857c56b41d1f3e8d5c4ef0 DIST java-config-2.2.0.tar.bz2 51851 BLAKE2B 7b7c15dc988d2f5f54ebacba224f57193577e24f99a798657b40d83d723280562e314ba71319958a83be44defc6a48ac1114cce37eaeddea025ea31f26cf331a SHA512 a491cfe86bde8afadfc5b875740d79f9077526d8650ffb034fdad67a7ffa1b02646f67b1ef0eab7b0fe3ae57b5d767fa6a0d5593fe07416993d60588a8ed595a -EBUILD java-config-2.2.0-r4.ebuild 1028 BLAKE2B 99e452ca184464030da20dd27963826bf71e6bc01794dbe57f32efbf72e44c803d107989da0a8378b8a087c4e64f1d71ca301247a3f60f4e9803f6a32828c7e5 SHA512 f467ac490be55e4dcd51bda7d339a8988e65d0d2b82f2a6c5a7db01de48ca1d96291bd7c0bacb9eea4fdb048a021646102bdc50553a9c8152a4fa837c92bb9b6 +EBUILD java-config-2.2.0-r4.ebuild 1063 BLAKE2B ad07cf002078f3adba19c4c59d00f084640349d64a728758bfe968eedd372e3a6e47ef0ef9b45751ec9a51c17851c764e6edd5a1d6ccf063fbc2beae25165f52 SHA512 e2976feaf12b9e208f39b33457e72a410bc74844e1ac283efefb989d0028083c6c663f96b5eb1ac15c2b13214dfe18b44c1f8621bf2ed6b82ec1ac58713825b2 MISC metadata.xml 560 BLAKE2B a2cc44cb88cb8e0b80ef1fb56ed610fc10257a0858725fc01f793ae9275fc5ef6e37708c377ccf56425c08eacceea6e52a84eee35a7b2c239484080b6203c4d7 SHA512 9bd085048548f98faa638b23333ee0cf83b870c962b1aba62fa2df897393ce37c2b2e60736c988230252f29fc42e9dbe58ab8e720f7ec05a3e0b3d4c999e2c8a 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 000000000000..cb59e1f36be1 --- /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 <gyakovlev@gentoo.org> +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 725ac6dc0e56..8f03a425121d 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=( 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 |