* [gentoo-dev] [PATCH 1/2] java-ant-2.eclass: Drop sys-apps/portage build dependency
@ 2018-03-22 21:22 James Le Cuirot
2018-03-22 21:22 ` [gentoo-dev] [PATCH 2/2] java-utils-2.eclass: " James Le Cuirot
0 siblings, 1 reply; 3+ messages in thread
From: James Le Cuirot @ 2018-03-22 21:22 UTC (permalink / raw
To: gentoo-dev; +Cc: James Le Cuirot
This comes via java-utils-2.eclass. It originates from 2006 and should
arguably have never been added.
---
eclass/java-ant-2.eclass | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass
index 8da5971844a0..1fd4feb39134 100644
--- a/eclass/java-ant-2.eclass
+++ b/eclass/java-ant-2.eclass
@@ -56,12 +56,10 @@ if [[ $? != 0 ]]; then
die "java-pkg_ant-tasks-depend() failed"
fi
-# We need some tools from javatoolkit. We also need portage 2.1 for phase hooks
-# and ant dependencies constructed above. Python is there for
-# java-ant_remove-taskdefs
+# We need some tools from javatoolkit. We also need ant dependencies
+# constructed above.
JAVA_ANT_E_DEPEND="${JAVA_ANT_E_DEPEND}
${ANT_TASKS_DEPEND}
- ${JAVA_PKG_PORTAGE_DEP}
>=dev-java/javatoolkit-0.3.0-r2"
# this eclass must be inherited after java-pkg-2 or java-pkg-opt-2
--
2.16.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-dev] [PATCH 2/2] java-utils-2.eclass: Drop sys-apps/portage build dependency
2018-03-22 21:22 [gentoo-dev] [PATCH 1/2] java-ant-2.eclass: Drop sys-apps/portage build dependency James Le Cuirot
@ 2018-03-22 21:22 ` James Le Cuirot
2018-03-22 21:45 ` Zac Medico
0 siblings, 1 reply; 3+ messages in thread
From: James Le Cuirot @ 2018-03-22 21:22 UTC (permalink / raw
To: gentoo-dev; +Cc: James Le Cuirot
It originates from 2006 and should arguably have never been added.
---
eclass/java-utils-2.eclass | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 25e35c33dd21..967050925245 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -1,4 +1,4 @@
-# Copyright 2004-2017 Gentoo Foundation
+# Copyright 2004-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: java-utils-2.eclass
@@ -25,21 +25,13 @@ export WANT_JAVA_CONFIG="2"
# Prefix variables are only available for EAPI>=3
has "${EAPI:-0}" 0 1 2 && ED="${D}" EPREFIX= EROOT="${ROOT}"
-# @VARIABLE: JAVA_PKG_PORTAGE_DEP
-# @INTERNAL
-# @DESCRIPTION:
-# The version of portage we need to function properly. Previously it was
-# portage with phase hooks support but now we use a version with proper env
-# saving. For EAPI 2 we have new enough stuff so let's have cleaner deps.
-has "${EAPI}" 0 1 && JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7"
-
# @VARIABLE: JAVA_PKG_E_DEPEND
# @INTERNAL
# @DESCRIPTION:
# This is a convience variable to be used from the other java eclasses. This is
# the version of java-config we want to use. Usually the latest stable version
# so that ebuilds can use new features without depending on specific versions.
-JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.2.0-r3 ${JAVA_PKG_PORTAGE_DEP}"
+JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.2.0-r3"
has source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source? ( app-arch/zip )"
# @ECLASS-VARIABLE: JAVA_PKG_WANT_BOOTCLASSPATH
--
2.16.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [gentoo-dev] [PATCH 2/2] java-utils-2.eclass: Drop sys-apps/portage build dependency
2018-03-22 21:22 ` [gentoo-dev] [PATCH 2/2] java-utils-2.eclass: " James Le Cuirot
@ 2018-03-22 21:45 ` Zac Medico
0 siblings, 0 replies; 3+ messages in thread
From: Zac Medico @ 2018-03-22 21:45 UTC (permalink / raw
To: gentoo-dev, James Le Cuirot
[-- Attachment #1.1: Type: text/plain, Size: 523 bytes --]
On 03/22/2018 02:22 PM, James Le Cuirot wrote:
> It originates from 2006 and should arguably have never been added.
> ---
> eclass/java-utils-2.eclass | 12 ++----------
> 1 file changed, 2 insertions(+), 10 deletions(-)
These dependencies seem were only to pull in a version of portage
supporting phase hooks, since the java eclasses used those as a
workaround for lack of environment loading support in portage back then.
None of the eclasses are using pre_/post_ phase hooks these days.
--
Thanks,
Zac
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 224 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-03-22 21:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-22 21:22 [gentoo-dev] [PATCH 1/2] java-ant-2.eclass: Drop sys-apps/portage build dependency James Le Cuirot
2018-03-22 21:22 ` [gentoo-dev] [PATCH 2/2] java-utils-2.eclass: " James Le Cuirot
2018-03-22 21:45 ` Zac Medico
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox