1 |
hollow 08/02/02 12:53:52 |
2 |
|
3 |
Modified: depend.apache.eclass |
4 |
Log: |
5 |
remove obsolete depend.apache features wrt #208033 |
6 |
|
7 |
Revision Changes Path |
8 |
1.36 eclass/depend.apache.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/depend.apache.eclass?rev=1.36&view=markup |
11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/depend.apache.eclass?rev=1.36&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/depend.apache.eclass?r1=1.35&r2=1.36 |
13 |
|
14 |
Index: depend.apache.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/depend.apache.eclass,v |
17 |
retrieving revision 1.35 |
18 |
retrieving revision 1.36 |
19 |
diff -u -r1.35 -r1.36 |
20 |
--- depend.apache.eclass 25 Nov 2007 14:27:52 -0000 1.35 |
21 |
+++ depend.apache.eclass 2 Feb 2008 12:53:52 -0000 1.36 |
22 |
@@ -1,6 +1,6 @@ |
23 |
# Copyright 1999-2007 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/depend.apache.eclass,v 1.35 2007/11/25 14:27:52 hollow Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.apache.eclass,v 1.36 2008/02/02 12:53:52 hollow Exp $ |
27 |
|
28 |
# @ECLASS: depend.apache.eclass |
29 |
# @MAINTAINER: apache-devs@g.o |
30 |
@@ -25,42 +25,34 @@ |
31 |
# @DESCRIPTION: |
32 |
# Stores the version of apache we are going to be ebuilding. This variable is |
33 |
# set by the need_apache functions. |
34 |
-#APACHE_VERSION="2" |
35 |
|
36 |
-# @ECLASS-VARIABLE: APXS2 |
37 |
+# @ECLASS-VARIABLE: APXS |
38 |
# @DESCRIPTION: |
39 |
# Paths to the apxs tool |
40 |
-APXS2="/usr/sbin/apxs2" |
41 |
|
42 |
-# @ECLASS-VARIABLE: APACHECTL2 |
43 |
+# @ECLASS-VARIABLE: APACHECTL |
44 |
# @DESCRIPTION: |
45 |
# Path to the apachectl tool |
46 |
-APACHECTL2="/usr/sbin/apache2ctl" |
47 |
|
48 |
-# @ECLASS-VARIABLE: APACHE2_BASEDIR |
49 |
+# @ECLASS-VARIABLE: APACHE_BASEDIR |
50 |
# @DESCRIPTION: |
51 |
# Path to the server root directory |
52 |
-APACHE2_BASEDIR="/usr/$(get_libdir)/apache2" |
53 |
|
54 |
-# @ECLASS-VARIABLE: APACHE2_CONFDIR |
55 |
+# @ECLASS-VARIABLE: APACHE_CONFDIR |
56 |
# @DESCRIPTION: |
57 |
# Path to the configuration file directory |
58 |
-APACHE2_CONFDIR="/etc/apache2" |
59 |
|
60 |
-# @ECLASS-VARIABLE: APACHE2_MODULES_CONFDIR |
61 |
+# @ECLASS-VARIABLE: APACHE_MODULES_CONFDIR |
62 |
# @DESCRIPTION: |
63 |
# Path where module configuration files are kept |
64 |
-APACHE2_MODULES_CONFDIR="${APACHE2_CONFDIR}/modules.d" |
65 |
|
66 |
-# @ECLASS-VARIABLE: APACHE2_VHOSTDIR |
67 |
+# @ECLASS-VARIABLE: APACHE_VHOSTS_CONFDIR |
68 |
# @DESCRIPTION: |
69 |
# Path where virtual host configuration files are kept |
70 |
-APACHE2_VHOSTDIR="${APACHE2_CONFDIR}/vhosts.d" |
71 |
|
72 |
-# @ECLASS-VARIABLE: APACHE2_MODULESDIR |
73 |
+# @ECLASS-VARIABLE: APACHE_MODULESDIR |
74 |
# @DESCRIPTION: |
75 |
# Path where we install modules |
76 |
-APACHE2_MODULESDIR="${APACHE2_BASEDIR}/modules" |
77 |
|
78 |
# @ECLASS-VARIABLE: APACHE2_DEPEND |
79 |
# @DESCRIPTION: |
80 |
@@ -95,14 +87,13 @@ |
81 |
# WARNING: Do not use these variables with anything that is put |
82 |
# into the dependency cache (DEPEND/RDEPEND/etc) |
83 |
APACHE_VERSION="2" |
84 |
- USE_APACHE="2" |
85 |
- APXS="${APXS2}" |
86 |
- APACHECTL="${APACHECTL2}" |
87 |
- APACHE_BASEDIR="${APACHE2_BASEDIR}" |
88 |
- APACHE_CONFDIR="${APACHE2_CONFDIR}" |
89 |
- APACHE_MODULES_CONFDIR="${APACHE2_MODULES_CONFDIR}" |
90 |
- APACHE_VHOSTSDIR="${APACHE2_VHOSTSDIR}" |
91 |
- APACHE_MODULESDIR="${APACHE2_MODULESDIR}" |
92 |
+ APXS="/usr/sbin/apxs2" |
93 |
+ APACHECTL="/usr/sbin/apache2ctl" |
94 |
+ APACHE_BASEDIR="/usr/$(get_libdir)/apache2" |
95 |
+ APACHE_CONFDIR="/etc/apache2" |
96 |
+ APACHE_MODULES_CONFDIR="${APACHE_CONFDIR}/modules.d" |
97 |
+ APACHE_VHOSTS_CONFDIR="${APACHE_CONFDIR}/vhosts.d" |
98 |
+ APACHE_MODULESDIR="${APACHE_BASEDIR}/modules" |
99 |
} |
100 |
|
101 |
# @FUNCTION: doesnt_use_apache |
102 |
@@ -181,55 +172,3 @@ |
103 |
need_apache() { |
104 |
need_apache2 |
105 |
} |
106 |
- |
107 |
-# @FUNCTION: apr_config |
108 |
-# @DESCRIPTION: |
109 |
-# Version magic to get the correct apr-config binary based on the (probably) |
110 |
-# installed version of apache. This is needed to get modules to link to the |
111 |
-# same apr/apu as apache (i.e. link 0.9 for 2.0, 1.x for 2.2) |
112 |
-apr_config() { |
113 |
- debug-print-function $FUNCNAME $* |
114 |
- |
115 |
- local default="${1:-1}" |
116 |
- if [[ "${USE_APACHE}" == "2" ]]; then |
117 |
- if has_version ${APACHE2_0_DEPEND}; then |
118 |
- echo apr-config |
119 |
- else |
120 |
- echo apr-1-config |
121 |
- fi |
122 |
- else |
123 |
- if [[ "${default}" == "0" ]]; then |
124 |
- echo apr-config |
125 |
- elif [[ "${default}" == "1" ]]; then |
126 |
- echo apr-1-config |
127 |
- else |
128 |
- die "Unknown version specifier: ${default}" |
129 |
- fi |
130 |
- fi |
131 |
-} |
132 |
- |
133 |
-# @FUNCTION: apu_config |
134 |
-# @DESCRIPTION: |
135 |
-# Version magic to get the correct apu-config binary based on the (probably) |
136 |
-# installed version of apache. This is needed to get modules to link to the |
137 |
-# same apr/apu as apache (i.e. link 0.9 for 2.0, 1.x for 2.2) |
138 |
-apu_config() { |
139 |
- debug-print-function $FUNCNAME $* |
140 |
- |
141 |
- local default="${1:-1}" |
142 |
- if [[ "${USE_APACHE}" == "2" ]]; then |
143 |
- if has_version ${APACHE2_0_DEPEND}; then |
144 |
- echo apu-config |
145 |
- else |
146 |
- echo apu-1-config |
147 |
- fi |
148 |
- else |
149 |
- if [[ "${default}" == "0" ]]; then |
150 |
- echo apu-config |
151 |
- elif [[ "${default}" == "1" ]]; then |
152 |
- echo apu-1-config |
153 |
- else |
154 |
- die "Unknown version specifier: ${default}" |
155 |
- fi |
156 |
- fi |
157 |
-} |
158 |
|
159 |
|
160 |
|
161 |
-- |
162 |
gentoo-commits@l.g.o mailing list |