1 |
commit: 9985ba736486a2481a530f9f019e26ba63a36878 |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 9 13:49:44 2022 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 12 17:10:33 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9985ba73 |
7 |
|
8 |
xorg-3.eclass: Don't indent eclass documentation |
9 |
|
10 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
11 |
|
12 |
eclass/xorg-3.eclass | 24 +++++++++++++----------- |
13 |
1 file changed, 13 insertions(+), 11 deletions(-) |
14 |
|
15 |
diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass |
16 |
index c68b3041629a..378a7b8c4103 100644 |
17 |
--- a/eclass/xorg-3.eclass |
18 |
+++ b/eclass/xorg-3.eclass |
19 |
@@ -152,6 +152,14 @@ BDEPEND+=" ${EAUTORECONF_DEPENDS}" |
20 |
unset EAUTORECONF_DEPENDS |
21 |
unset EAUTORECONF_DEPEND |
22 |
|
23 |
+# @ECLASS_VARIABLE: FONT_DIR |
24 |
+# @PRE_INHERIT |
25 |
+# @DESCRIPTION: |
26 |
+# If you're creating a font package and the suffix of PN is not equal to |
27 |
+# the subdirectory of /usr/share/fonts/ it should install into, set |
28 |
+# FONT_DIR to that directory or directories. Set before inheriting this |
29 |
+# eclass. |
30 |
+ |
31 |
if [[ ${FONT} == yes ]]; then |
32 |
RDEPEND+=" media-fonts/encodings |
33 |
>=x11-apps/mkfontscale-1.2.0" |
34 |
@@ -160,13 +168,6 @@ if [[ ${FONT} == yes ]]; then |
35 |
>=x11-apps/mkfontscale-1.2.0" |
36 |
BDEPEND+=" x11-apps/bdftopcf" |
37 |
|
38 |
- # @ECLASS_VARIABLE: FONT_DIR |
39 |
- # @PRE_INHERIT |
40 |
- # @DESCRIPTION: |
41 |
- # If you're creating a font package and the suffix of PN is not equal to |
42 |
- # the subdirectory of /usr/share/fonts/ it should install into, set |
43 |
- # FONT_DIR to that directory or directories. Set before inheriting this |
44 |
- # eclass. |
45 |
[[ -z ${FONT_DIR} ]] && FONT_DIR=${PN##*-} |
46 |
|
47 |
# Fix case of font directories |
48 |
@@ -352,6 +353,11 @@ multilib_src_configure() { |
49 |
ECONF_SOURCE="${S}" econf "${econfargs[@]}" |
50 |
} |
51 |
|
52 |
+# @VARIABLE: XORG_CONFIGURE_OPTIONS |
53 |
+# @DESCRIPTION: |
54 |
+# Array of an additional options to pass to configure. |
55 |
+# @DEFAULT_UNSET |
56 |
+ |
57 |
# @FUNCTION: xorg-3_src_configure |
58 |
# @DESCRIPTION: |
59 |
# Perform any necessary pre-configuration steps, then run configure |
60 |
@@ -360,10 +366,6 @@ xorg-3_src_configure() { |
61 |
|
62 |
xorg-3_flags_setup |
63 |
|
64 |
- # @VARIABLE: XORG_CONFIGURE_OPTIONS |
65 |
- # @DESCRIPTION: |
66 |
- # Array of an additional options to pass to configure. |
67 |
- # @DEFAULT_UNSET |
68 |
local xorgconfadd=("${XORG_CONFIGURE_OPTIONS[@]}") |
69 |
|
70 |
local FONT_OPTIONS=() |