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