diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-06-22 11:30:24 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-06-22 11:30:24 +0100 |
| commit | d56d144655e3785864da43c9acb6c228ef9360ae (patch) | |
| tree | b769b599a558483f82e9a057c41f1edd29626dd1 /eclass/xorg-2.eclass | |
| parent | fab849d1daed0ba7f2ac497d07985c3dbb692543 (diff) | |
gentoo resync : 22.06.2019
Diffstat (limited to 'eclass/xorg-2.eclass')
| -rw-r--r-- | eclass/xorg-2.eclass | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass index 6034da49bc32..95345042a998 100644 --- a/eclass/xorg-2.eclass +++ b/eclass/xorg-2.eclass @@ -28,13 +28,16 @@ fi # If we're a font package, but not the font.alias one FONT_ECLASS="" -if [[ ${PN} == font* \ - && ${CATEGORY} = media-fonts \ - && ${PN} != font-alias \ - && ${PN} != font-util ]]; then - # Activate font code in the rest of the eclass - FONT="yes" - FONT_ECLASS="font" +if [[ ${CATEGORY} = media-fonts ]]; then + case ${PN} in + font-alias|font-util) + ;; + font*) + # Activate font code in the rest of the eclass + FONT="yes" + FONT_ECLASS="font" + ;; + esac fi # @ECLASS-VARIABLE: XORG_MULTILIB @@ -137,10 +140,10 @@ unset EAUTORECONF_DEPEND if [[ ${FONT} == yes ]]; then RDEPEND+=" media-fonts/encodings - || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )" + >=x11-apps/mkfontscale-1.2.0" PDEPEND+=" media-fonts/font-alias" DEPEND+=" >=media-fonts/font-util-1.2.0 - || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )" + >=x11-apps/mkfontscale-1.2.0" # @ECLASS-VARIABLE: FONT_DIR # @DESCRIPTION: |