mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-30 18:12:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

x-modular.eclass: sync with latest upstream version

Browse Source 
This is just style/cleanup changes.  Shouldn't be any real impact.

BUG=chromium-os:21330
TEST=`cbuildbot {amd64,arm,x86}-generic-full` worked

Change-Id: Id529f43dbe2f28430f3605bda2a81212abe51f09
Reviewed-on: https://gerrit.chromium.org/gerrit/30288
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
This commit is contained in:
Mike Frysinger 2012-08-14 16:19:44 -04:00 committed by Gerrit
parent c95615982a
commit b0708901c1
1 changed files with 11 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
sdk_container/src/third_party/portage-stable/eclass/x-modular.eclass vendored
View File

@ -1,10 +1,15 @@
# Copyright 1999-2005 Gentoo Foundation # Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.118 2009/12/09 10:21:49 vapier Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.125 2012/05/02 18:31:45 jdhore Exp $
#
# @DEPRECATED
# This eclass has been superseded by xorg-2
# Please modify your ebuilds to use that instead
# #
# @ECLASS: x-modular.eclass # @ECLASS: x-modular.eclass
# @MAINTAINER: # @MAINTAINER:
# Donnie Berkholz <dberkholz@gentoo.org>, x11@gentoo.org # Donnie Berkholz <dberkholz@gentoo.org>
# x11@gentoo.org
# @BLURB: Reduces code duplication in the modularized X11 ebuilds. # @BLURB: Reduces code duplication in the modularized X11 ebuilds.
# @DESCRIPTION: # @DESCRIPTION:
# This eclass makes trivial X ebuilds possible for apps, fonts, drivers, # This eclass makes trivial X ebuilds possible for apps, fonts, drivers,
@ -174,12 +179,11 @@ if [[ -z "${FONT}" ]] \
fi fi
DEPEND="${DEPEND} DEPEND="${DEPEND}
>=dev-util/pkgconfig-0.18" virtual/pkgconfig"
if [[ "${PN/util-macros}" = "${PN}" ]]; then if [[ "${PN/util-macros}" = "${PN}" ]]; then
DEPEND="${DEPEND} DEPEND="${DEPEND}
>=x11-misc/util-macros-1.3.0 >=x11-misc/util-macros-1.3.0"
sys-devel/binutils"
fi fi
RDEPEND="${RDEPEND} RDEPEND="${RDEPEND}
@ -498,50 +502,10 @@ x-modular_pkg_postinst() {
# task right now is some cleanup for font packages. # task right now is some cleanup for font packages.
x-modular_pkg_postrm() { x-modular_pkg_postrm() {
if [[ -n "${FONT}" ]]; then if [[ -n "${FONT}" ]]; then
cleanup_fonts
font_pkg_postrm font_pkg_postrm
fi fi
} }
# @FUNCTION: cleanup_fonts
# @USAGE:
# @DESCRIPTION:
# Get rid of font directories that only contain generated files
cleanup_fonts() {
local ALLOWED_FILES="encodings.dir fonts.alias fonts.cache-1 fonts.dir fonts.scale"
for DIR in ${FONT_DIR}; do
unset KEEP_FONTDIR
REAL_DIR=${ROOT}usr/share/fonts/${DIR}
ebegin "Checking ${REAL_DIR} for useless files"
pushd ${REAL_DIR} &> /dev/null
for FILE in *; do
unset MATCH
for ALLOWED_FILE in ${ALLOWED_FILES}; do
if [[ ${FILE} = ${ALLOWED_FILE} ]]; then
# If it's allowed, then move on to the next file
MATCH="yes"
break
fi
done
# If we found a match in allowed files, move on to the next file
if [[ -n ${MATCH} ]]; then
continue
fi
# If we get this far, there wasn't a match in the allowed files
KEEP_FONTDIR="yes"
# We don't need to check more files if we're already keeping it
break
done
popd &> /dev/null
# If there are no files worth keeping, then get rid of the dir
if [[ -z "${KEEP_FONTDIR}" ]]; then
rm -rf ${REAL_DIR}
fi
eend 0
done
}
# @FUNCTION: setup_fonts # @FUNCTION: setup_fonts
# @USAGE: # @USAGE:
# @DESCRIPTION: # @DESCRIPTION: