From: Sven Wegener Date: Mon, 23 Apr 2007 19:35:05 +0000 (+0000) Subject: Apply whitespace checks from repoman to eclasses. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=92cf9b29f3fac49b6cf420fb1307818c926b8409;p=gentoo.git Apply whitespace checks from repoman to eclasses. --- diff --git a/eclass/emul-libs.eclass b/eclass/emul-libs.eclass index df964d6ae160..ced3b337b1ec 100644 --- a/eclass/emul-libs.eclass +++ b/eclass/emul-libs.eclass @@ -1,10 +1,10 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/emul-libs.eclass,v 1.5 2007/03/03 15:08:38 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/emul-libs.eclass,v 1.6 2007/04/23 19:35:05 swegener Exp $ # # Original Author: Simon Stelling -# Purpose: Providing a template for the app-emulation/emul-linux-* packages +# Purpose: Providing a template for the app-emulation/emul-linux-* packages # EXPORT_FUNCTIONS src_unpack src_install @@ -24,10 +24,10 @@ RDEPEND="" emul-libs_src_unpack() { einfo "Note: You can safely ignore the 'trailing garbage after EOF'" einfo " warnings below" - + unpack ${A} cd "${S}" - + ALLOWED=${ALLOWED:-^${S}/etc/env.d} find "${S}" ! -type d ! -name '*.so*' | egrep -v "${ALLOWED}" | xargs -d $'\n' rm -f || die 'failed to remove everything but *.so*' } diff --git a/eclass/gkrellm-plugin.eclass b/eclass/gkrellm-plugin.eclass index 85cc6a679568..03f689220465 100644 --- a/eclass/gkrellm-plugin.eclass +++ b/eclass/gkrellm-plugin.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gkrellm-plugin.eclass,v 1.2 2007/03/12 17:39:01 lack Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gkrellm-plugin.eclass,v 1.3 2007/04/23 19:35:05 swegener Exp $ # # Original Author: Jim Ramsay @@ -52,7 +52,7 @@ gkrellm-plugin_server_dir() { } gkrellm-plugin_pkg_setup() { - if [[ -z "${PLUGIN_SERVER_SO}" ]] && + if [[ -z "${PLUGIN_SERVER_SO}" ]] && ! built_with_use app-admin/gkrellm X; then eerror "This plugin requires the X frontend of gkrellm." eerror "Please re-emerge app-admin/gkrellm with USE=\"X\"" diff --git a/eclass/gnatbuild.eclass b/eclass/gnatbuild.eclass index 483b96efa8ed..58738ec50034 100644 --- a/eclass/gnatbuild.eclass +++ b/eclass/gnatbuild.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.24 2007/02/16 14:59:23 george Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.25 2007/04/23 19:35:05 swegener Exp $ # # Author: George Shapovalov # Belongs to: ada herd @@ -322,7 +322,7 @@ gnatbuild_pkg_postinst() { gnatbuild_pkg_postrm() { elog "Automatic cleanup requires a somewhat big rewamp of eclasses to not" - elog "breack updates. For now, if you are removing this issue of gnat compiler" + elog "breack updates. For now, if you are removing this issue of gnat compiler" elog "(if this is the last version of gnat-gcc or gnat-gpl that is being " elog "removed), please manually run:" elog " rm /etc/env.d/55gnat-*" diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass index f35fab8bff03..61ad43f7e380 100644 --- a/eclass/kde-functions.eclass +++ b/eclass/kde-functions.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.150 2007/04/22 15:59:26 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.151 2007/04/23 19:35:05 swegener Exp $ # # Author Dan Armak # @@ -915,7 +915,7 @@ postprocess_desktop_entries() { if [[ -z ${KDEBASE} ]] ; then local desktop_entries="$(find "${D}${PREFIX}/share/applnk" -name '*.desktop' \ -not -path '*.hidden*' 2>/dev/null)" - + if [[ -n ${desktop_entries} ]]; then for entry in ${desktop_entries} ; do dodir ${PREFIX}/share/applications/kde diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass index 60a5a121b22a..7acb891bccf1 100644 --- a/eclass/mysql.eclass +++ b/eclass/mysql.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.73 2007/04/15 13:00:51 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.74 2007/04/23 19:35:05 swegener Exp $ # Author: Francesco Riosa (Retired) # Maintainer: Luca Longinotti @@ -524,7 +524,7 @@ mysql_src_unpack() { if mysql_version_is_at_least "5.1.12" ; then rebuilddirlist="." - # TODO: check this with a cmake expert + # TODO: check this with a cmake expert use innodb \ && cmake \ -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \ diff --git a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass index 9e9014b55b49..1ee719a4e351 100644 --- a/eclass/mysql_fx.eclass +++ b/eclass/mysql_fx.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql_fx.eclass,v 1.19 2007/04/15 12:18:49 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql_fx.eclass,v 1.20 2007/04/23 19:35:05 swegener Exp $ # Author: Francesco Riosa (Retired) # Maintainer: Luca Longinotti @@ -58,7 +58,7 @@ mysql_check_version_range() { _mysql_test_patch_ver_pn() { local allelements=", version, package name" # So that it fails the directory test if none of them exist - local filesdir="/dev/null" + local filesdir="/dev/null" for d in "${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" \ "${WORKDIR}/mysql-extras" ; do if [ -d "${d}" ]; then @@ -77,10 +77,10 @@ _mysql_test_patch_ver_pn() { [[ $(( $flags & $(( 2 + 4 )) )) -gt 0 ]] \ && allelements="${allelements//", version"}" - + [[ $(( $flags & $(( 8 + 16 )) )) -gt 0 ]] \ && allelements="${allelements//", package name"}" - + [[ -n "${allelements}" ]] && [[ "${flags}" -gt 0 ]] \ && ewarn "QA notice: ${allelements} missing in ${pname} patch" diff --git a/eclass/savedconfig.eclass b/eclass/savedconfig.eclass index 4de1bc9b15b4..c2dd91cbb087 100644 --- a/eclass/savedconfig.eclass +++ b/eclass/savedconfig.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/savedconfig.eclass,v 1.4 2007/02/21 20:49:45 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/savedconfig.eclass,v 1.5 2007/04/23 19:35:05 swegener Exp $ # Original Author: Daniel Black # @@ -80,8 +80,8 @@ restore_config() { local base=${PORTAGE_CONFIGROOT}/etc/portage/savedconfig for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do configfile=${base}/${CTARGET}/${check} - [[ -r ${configfile} ]] || configfile=${base}/${CHOST}/${check} - [[ -r ${configfile} ]] || configfile=${base}/${check} + [[ -r ${configfile} ]] || configfile=${base}/${CHOST}/${check} + [[ -r ${configfile} ]] || configfile=${base}/${check} einfo "Checking existence of ${configfile} ..." if [[ -r "${configfile}" ]]; then einfo "found ${configfile}" @@ -101,7 +101,7 @@ restore_config() { treecopy . "${dest}" \ || die "Failed to restore ${found} to $1" popd - elif [[ -a {found} ]]; then + elif [[ -a {found} ]]; then die "do not know how to handle non-file/directory ${found}" else eerror "No saved config to restore - please remove USE=saveconfig or" diff --git a/eclass/tla.eclass b/eclass/tla.eclass index 9f994de7da0f..f50378743712 100644 --- a/eclass/tla.eclass +++ b/eclass/tla.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/tla.eclass,v 1.9 2007/01/22 17:48:18 antarus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/tla.eclass,v 1.10 2007/04/23 19:35:05 swegener Exp $ # # Original Author: Jeffrey Yasskin # @@ -182,7 +182,7 @@ tla_src_unpack() { local OLD_SHOPTS=$(shopt -p) shopt -s dotglob # get any dotfiles too. cp -Rf "$ETLA_TOP_DIR/$ETLA_CACHE_DIR"/* "${WORKDIR}/${P}" - eval "$OLD_SHOPTS" + eval "$OLD_SHOPTS" # implement some of base_src_unpack's functionality; # note however that base.eclass may not have been inherited! diff --git a/eclass/versionator.eclass b/eclass/versionator.eclass index f3a875332a6b..6640ca391e74 100644 --- a/eclass/versionator.eclass +++ b/eclass/versionator.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v 1.12 2007/01/10 05:49:10 antarus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v 1.13 2007/04/23 19:35:05 swegener Exp $ # # Original Author: Ciaran McCreesh # @@ -152,7 +152,7 @@ get_major_version() { # 1-2 1.2.3 -> 1.2 # 2- 1.2.3 -> 2.3 get_version_component_range() { - __versionator_shopt_toggle on + __versionator_shopt_toggle on local c v="${2:-${PV}}" range="${1}" range_start range_end i=-1 j=0 c=( $(get_all_version_components ${v} ) ) range_start="${range%-*}" ; range_start="${range_start:-1}"