1 |
lack 07/12/04 02:37:30 |
2 |
|
3 |
Modified: rox.eclass |
4 |
Log: |
5 |
A few small readability/sanity fixes |
6 |
|
7 |
Revision Changes Path |
8 |
1.25 eclass/rox.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/rox.eclass?rev=1.25&view=markup |
11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/rox.eclass?rev=1.25&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/rox.eclass?r1=1.24&r2=1.25 |
13 |
|
14 |
Index: rox.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/rox.eclass,v |
17 |
retrieving revision 1.24 |
18 |
retrieving revision 1.25 |
19 |
diff -u -r1.24 -r1.25 |
20 |
--- rox.eclass 28 Nov 2007 17:20:03 -0000 1.24 |
21 |
+++ rox.eclass 4 Dec 2007 02:37:29 -0000 1.25 |
22 |
@@ -1,6 +1,6 @@ |
23 |
# Copyright 1999-2004 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/rox.eclass,v 1.24 2007/11/28 17:20:03 lack Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/rox.eclass,v 1.25 2007/12/04 02:37:29 lack Exp $ |
27 |
|
28 |
# ROX eclass Version 3 |
29 |
|
30 |
@@ -53,21 +53,20 @@ |
31 |
# need autotools to run autoreconf, if required |
32 |
inherit python autotools eutils multilib |
33 |
|
34 |
-if [[ -z "${ROX_VER}" ]]; then |
35 |
- ROX_VER="2.1.0" |
36 |
-fi |
37 |
+ROX_VER=${ROX_VER:-"2.1.0"} |
38 |
|
39 |
RDEPEND=">=rox-base/rox-${ROX_VER}" |
40 |
|
41 |
-if [[ -n "${ROX_LIB_VER}" ]]; then |
42 |
+if [[ ${ROX_LIB_VER} ]]; then |
43 |
RDEPEND="${RDEPEND} |
44 |
>=rox-base/rox-lib-${ROX_LIB_VER}" |
45 |
fi |
46 |
|
47 |
-if [[ -n "${ROX_CLIB_VER}" ]]; then |
48 |
+if [[ ${ROX_CLIB_VER} ]]; then |
49 |
RDEPEND="${RDEPEND} |
50 |
>=rox-base/rox-clib-${ROX_CLIB_VER}" |
51 |
- DEPEND="${RDEPEND} |
52 |
+ DEPEND="${DEPEND} |
53 |
+ >=rox-base/rox-clib-${ROX_CLIB_VER} |
54 |
>=dev-util/pkgconfig-0.20" |
55 |
fi |
56 |
|
57 |
@@ -81,8 +80,8 @@ |
58 |
unset _a _b |
59 |
|
60 |
# This is the location where all applications are installed |
61 |
-APPDIR="/usr/$(get_libdir)/rox" |
62 |
LIBDIR="/usr/$(get_libdir)" |
63 |
+APPDIR="${LIBDIR}/rox" |
64 |
|
65 |
# External Functions |
66 |
|
67 |
@@ -90,8 +89,8 @@ |
68 |
# WARNING: Cannot be used in global scope. |
69 |
# Set this in src_install just before you call rox_src_install |
70 |
usemime() { |
71 |
- local myuse=$1; shift |
72 |
- use $myuse && echo "$@" |
73 |
+ local myuse="$1"; shift |
74 |
+ use "${myuse}" && echo "$@" |
75 |
} |
76 |
|
77 |
# Utility Functions |
78 |
@@ -279,7 +278,7 @@ |
79 |
done |
80 |
fi |
81 |
|
82 |
- insinto ${APPDIR} |
83 |
+ insinto "${APPDIR}" |
84 |
|
85 |
# Use 'cp -pPR' and not 'doins -r' here so we don't have to do a flurry of |
86 |
# 'chmod' calls on the executables in the appdir - Just be sure that all the |
87 |
|
88 |
|
89 |
|
90 |
-- |
91 |
gentoo-commits@g.o mailing list |