| 1 |
ali_bush 09/06/02 07:02:01 |
| 2 |
|
| 3 |
Modified: java-utils-2.eclass |
| 4 |
Log: |
| 5 |
Remove obsolete JAVA_PKG_VNEED support. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.128 eclass/java-utils-2.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.128&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.128&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.127&r2=1.128 |
| 13 |
|
| 14 |
Index: java-utils-2.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v |
| 17 |
retrieving revision 1.127 |
| 18 |
retrieving revision 1.128 |
| 19 |
diff -u -r1.127 -r1.128 |
| 20 |
--- java-utils-2.eclass 19 May 2009 21:23:32 -0000 1.127 |
| 21 |
+++ java-utils-2.eclass 2 Jun 2009 07:02:01 -0000 1.128 |
| 22 |
@@ -6,7 +6,7 @@ |
| 23 |
# |
| 24 |
# Licensed under the GNU General Public License, v2 |
| 25 |
# |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.127 2009/05/19 21:23:32 caster Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.128 2009/06/02 07:02:01 ali_bush Exp $ |
| 28 |
|
| 29 |
# ----------------------------------------------------------------------------- |
| 30 |
# @eclass-begin |
| 31 |
@@ -1310,83 +1310,6 @@ |
| 32 |
# ------------------------------------------------------------------------------ |
| 33 |
|
| 34 |
# ------------------------------------------------------------------------------ |
| 35 |
-# @ebuild-function java-pkg_need |
| 36 |
-# |
| 37 |
-# Adds virtual dependencies, which can optionally be controlled by a USE flag. |
| 38 |
-# Currently supported virtuals are: |
| 39 |
-# javamail |
| 40 |
-# jdbc-stdext |
| 41 |
-# jaf |
| 42 |
-# jdbc-rowset |
| 43 |
-# jms |
| 44 |
-# |
| 45 |
-# @param $1 - Optionally indicate that the dependencies are controlled by |
| 46 |
-# a use flag by specifying '--use' Requires $2. |
| 47 |
-# @param $2 - USE flag which will enable the dependencies. |
| 48 |
-# @param $@ - virtual packages to add depenedencies for |
| 49 |
-# ------------------------------------------------------------------------------ |
| 50 |
-# TODO rewrite to parse a line based declaration file instead -- karltk |
| 51 |
-#java-pkg_need() { |
| 52 |
-# debug-print-function ${FUNCNAME} $* |
| 53 |
-# local useflag |
| 54 |
-# if [[ ${1} == "--use" ]]; then |
| 55 |
-# useflag="${2}" |
| 56 |
-# shift 2 |
| 57 |
-# fi |
| 58 |
-# |
| 59 |
-# if [[ -z ${1} ]]; then |
| 60 |
-# die "Must specify at least one virtual package." |
| 61 |
-# fi |
| 62 |
-# |
| 63 |
-# local depstr newdepstr |
| 64 |
-# |
| 65 |
-# for virtual in ${@}; do |
| 66 |
-# if has ${virtual} ${JAVA_PKG_VNEED}; then |
| 67 |
-# debug-print "Already registered virtual ${virtual}" |
| 68 |
-# continue |
| 69 |
-# fi |
| 70 |
-# case ${virtual} in |
| 71 |
-# javamail) |
| 72 |
-# debug-print "java-pkg_need: adding javamail dependencies" |
| 73 |
-# newdepstr="|| ( dev-java/gnu-javamail dev-java/sun-javamail-bin )" |
| 74 |
-# ;; |
| 75 |
-# jdbc-stdext) |
| 76 |
-# debug-print "java-pkg_need: adding jdbc-stdext dependencies" |
| 77 |
-# newdepstr="|| ( >=virtual/jdk-1.4 dev-java/jdbc2-stdext )" |
| 78 |
-# ;; |
| 79 |
-# jaf) |
| 80 |
-# debug-print "java-pkg_need: adding jaf dependencies" |
| 81 |
-# newdepstr="|| ( dev-java/gnu-jaf dev-java/sun-jaf-bin )" |
| 82 |
-# ;; |
| 83 |
-# jdbc-rowset) |
| 84 |
-# debug-print "java-pkg_need: adding jdbc-rowset dependencies" |
| 85 |
-# newdepstr="|| ( >=virtual/jdk-1.5 dev-java/sun-jdbc-rowset )" |
| 86 |
-# ;; |
| 87 |
-# jms) |
| 88 |
-# debug-print "java-pkg_need: adding jms dependencies" |
| 89 |
-# newdepstr="|| ( dev-java/sun-jms dev-java/openjms )" |
| 90 |
-# ;; |
| 91 |
-# *) |
| 92 |
-# die "Invalid virtual: ${virtual}" |
| 93 |
-# esac |
| 94 |
-# |
| 95 |
-# export JAVA_PKG_VNEED="${JAVA_PKG_VNEED} ${virtual}" |
| 96 |
-# |
| 97 |
-# if [[ -n ${useflag} ]]; then |
| 98 |
-# depstr="${depstr} ${useflag}? ( ${newdepstr} )" |
| 99 |
-# else |
| 100 |
-# depstr="${depstr} ${newdepstr}" |
| 101 |
-# fi |
| 102 |
-# done |
| 103 |
-# |
| 104 |
-# [[ -z ${JAVA_PKG_NV_DEPEND} ]] && export JAVA_PKG_NV_DEPEND="${DEPEND}" |
| 105 |
-# [[ -z ${JAVA_PKG_NV_RDEPEND} ]] && export JAVA_PKG_NV_RDEPEND="${RDEPEND}" |
| 106 |
-# |
| 107 |
-# export DEPEND="${DEPEND} ${depstr}" |
| 108 |
-# export RDEPEND="${RDEPEND} ${depstr}" |
| 109 |
-#} |
| 110 |
- |
| 111 |
-# ------------------------------------------------------------------------------ |
| 112 |
# @ebuild-function java-pkg_find-normal-jars |
| 113 |
# |
| 114 |
# Find the files with suffix .jar file in the given directory or $WORKDIR |
| 115 |
@@ -2541,16 +2464,11 @@ |
| 116 |
export GENTOO_VM="${JAVA_PKG_FORCE_VM}" |
| 117 |
# if we're allowed to switch the vm... |
| 118 |
elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then |
| 119 |
- debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}" |
| 120 |
- if [[ -n ${JAVA_PKG_VNEED} ]]; then |
| 121 |
- GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" |
| 122 |
- else |
| 123 |
- GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" |
| 124 |
- fi |
| 125 |
+ debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}" |
| 126 |
+ GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" |
| 127 |
if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then |
| 128 |
eerror "Unable to determine VM for building from dependencies:" |
| 129 |
echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}" |
| 130 |
- echo "VNEED: ${JAVA_PKG_VNEED}" |
| 131 |
die "Failed to determine VM for building." |
| 132 |
else |
| 133 |
export GENTOO_VM |
Archives