From a71865ad64c0e272c3b3df2d75d9854716d0121d Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Mon, 1 Jan 2007 22:27:01 +0000 Subject: [PATCH] Apply whitespace checks from repoman to eclasses. --- eclass/depend.apache.eclass | 14 +++++++------- eclass/games-mods.eclass | 6 +++--- eclass/gnome2-utils.eclass | 4 ++-- eclass/gnome2.eclass | 4 ++-- eclass/linux-mod.eclass | 6 +++--- eclass/mysql.eclass | 8 ++++---- eclass/mysql_fx.eclass | 22 +++++++++++----------- eclass/portability.eclass | 6 +++--- eclass/toolchain-binutils.eclass | 4 ++-- eclass/zproduct.eclass | 10 +++++----- 10 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass index 57db2a0c9fa9..7ce0b8e3eb45 100644 --- a/eclass/depend.apache.eclass +++ b/eclass/depend.apache.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/depend.apache.eclass,v 1.28 2006/11/26 21:25:28 vericgar Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/depend.apache.eclass,v 1.29 2007/01/01 22:27:01 swegener Exp $ inherit multilib @@ -101,7 +101,7 @@ APACHE2_2_DEPEND="=net-www/apache-2.2*" ## NEED_APACHE_DEPEND ## ## Dependency magic based on useflags to use the right DEPEND -## If you change this, please check the DEPENDS in need_apache() +## If you change this, please check the DEPENDS in need_apache() #### NEED_APACHE_DEPEND="apache2? ( ${APACHE2_DEPEND} ) !apache2? ( ${APACHE1_DEPEND} )" @@ -257,12 +257,12 @@ need_apache() { if [[ "${supports20}" == "yes" && "${supports22}" == "yes" ]]; then supports2x=yes; fi - + debug-print "supports13: ${supports13}" debug-print "supports20: ${supports20}" debug-print "supports22: ${supports22}" debug-print "supports2x: ${supports2x}" - + if [ "${supports13}" != "yes" ]; then if [ "${supports2x}" == "yes" ]; then need_apache2 @@ -272,7 +272,7 @@ need_apache() { need_apache2_2 fi elif [ "${supports13}" == "yes" ]; then - if [[ "${supports2x}" == "yes" || + if [[ "${supports2x}" == "yes" || "${supports20}" == "yes" || "${supports22}" == "yes" ]]; then @@ -288,10 +288,10 @@ need_apache() { NEED_APACHE_DEPEND="apache2? ( ${APACHE2_2_DEPEND} ) !apache2? ( ${APACHE1_DEPEND} )" fi fi - + DEPEND="${DEPEND} ${NEED_APACHE_DEPEND}" RDEPEND="${RDEPEND} ${NEED_APACHE_DEPEND}" - + if useq apache2; then uses_apache2 else diff --git a/eclass/games-mods.eclass b/eclass/games-mods.eclass index 03e4f12f7b12..4d55b4e0ffc2 100644 --- a/eclass/games-mods.eclass +++ b/eclass/games-mods.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/games-mods.eclass,v 1.13 2006/12/16 14:30:33 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/games-mods.eclass,v 1.14 2007/01/01 22:27:01 swegener Exp $ # Variables to specify in an ebuild which uses this eclass: # GAME - (doom3, quake4 or ut2004, etc), unless ${PN} starts with e.g. "doom3-" @@ -492,9 +492,9 @@ games-mods_make_conf.d() { fi cat <<-EOF > "${T}"/${GAME_EXE}-${MOD_DIR}-ded.conf.d $(<${PORTDIR}/header.txt) - + # Any extra options you want to pass to the dedicated server # ${GAME_EXE}_${MOD_DIR}_OPTS="+set com_hunkmegs 64 +set com_zonemegs 32" - + EOF } diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass index 375aefb6750f..ce4a17f41d1d 100644 --- a/eclass/gnome2-utils.eclass +++ b/eclass/gnome2-utils.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/gnome2-utils.eclass,v 1.1 2006/12/13 02:25:02 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.2 2007/01/01 22:27:01 swegener Exp $ # # gnome2-utils.eclass @@ -29,7 +29,7 @@ DEPEND=">=sys-apps/sed-4" # Applies any schema files installed by the current ebuild to Gconf's database -# using gconftool-2 +# using gconftool-2 gnome2_gconf_install() { if [[ ! -x ${GCONFTOOL_BIN} ]]; then return diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index 32e134d5f8a0..4199b8f19de9 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.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/gnome2.eclass,v 1.78 2006/12/13 02:27:48 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.79 2007/01/01 22:27:01 swegener Exp $ # # gnome2.eclass @@ -111,7 +111,7 @@ gnome2_pkg_postinst() { fdo-mime_desktop_database_update fdo-mime_mime_database_update gnome2_icon_cache_update - + if [[ "${SCROLLKEEPER_UPDATE}" = "1" ]]; then gnome2_scrollkeeper_update fi diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass index e19a0e3c02b1..8c6f6e44a4b1 100644 --- a/eclass/linux-mod.eclass +++ b/eclass/linux-mod.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/linux-mod.eclass,v 1.69 2006/11/25 10:16:04 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.70 2007/01/01 22:27:01 swegener Exp $ # Description: This eclass is used to interface with linux-info in such a way # to provide the functionality required and initial functions @@ -255,7 +255,7 @@ get-KERNEL_CC() { if [ -n "${KERNEL_ABI}" ]; then # In future, an arch might want to define CC_$ABI #kernel_cc="$(get_abi_CC)" - #[ -z "${kernel_cc}" ] && + #[ -z "${kernel_cc}" ] && kernel_cc="$(tc-getCC $(ABI=${KERNEL_ABI} get_abi_CHOST))" else kernel_cc=$(tc-getCC) @@ -561,6 +561,6 @@ linux-mod_pkg_postinst() { } linux-mod_pkg_postrm() { - debug-print-function ${FUNCNAME} $* + debug-print-function ${FUNCNAME} $* remove_moduledb; } diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass index 9b1924692d35..aa9b180cad76 100644 --- a/eclass/mysql.eclass +++ b/eclass/mysql.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/mysql.eclass,v 1.52 2006/12/29 20:49:14 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.53 2007/01/01 22:27:01 swegener Exp $ # Author: Francesco Riosa # Maintainer: Luca Longinotti @@ -152,7 +152,7 @@ bitkeeper_fetch() { einfo " working copy: ${wc_path}" cd "${wc_path}" rsync -rlpgo --exclude="BK/" . "${S}" || die "BK: can't export to ${S}." - + echo popd @@ -432,7 +432,7 @@ pbxt_src_install() { mysql_pkg_setup() { enewgroup mysql 60 || die "problem adding 'mysql' group" enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" - + # Check for USE flag problems in pkg_setup if useq "static" && useq "ssl" ; then eerror "MySQL does not support being built statically with SSL support enabled!" @@ -502,7 +502,7 @@ mysql_src_unpack() { if mysql_version_is_at_least "5.1.12" ; then rebuilddirlist="." - # TODO IMPO! Check this with a cmake expert + # TODO IMPO! Check this with a cmake expert useq "innodb" \ && cmake \ -DCMAKE_C_COMPILER=$(which $(tc-getCC)) \ diff --git a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass index d90a80ef46fa..0657c6936bcf 100644 --- a/eclass/mysql_fx.eclass +++ b/eclass/mysql_fx.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/mysql_fx.eclass,v 1.14 2006/12/29 20:34:02 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql_fx.eclass,v 1.15 2007/01/01 22:27:01 swegener Exp $ # Author: Francesco Riosa # Maintainer: Francesco Riosa @@ -81,17 +81,17 @@ mysql_version_is_at_least() { # THERE IS A COPY OF THIS ONE IN ESELECT-MYSQL, keep the two synced # crappy sorting file list per version mysql_make_file_list() { - local base="${1}-" - local n=( ) - echo $( for i in $( ls -d ${1}-[[:digit:]]_[[:digit:]]{,[[:digit:]]}_[[:digit:]]{,[[:digit:]]} 2>/dev/null ) - do - n=${i#${base}} - n=( ${n//_/ } ) - # prepend the file name with its numeric version number to make - # it sortable - echo "$(( 100000 + ${n[0]} * 10000 + ${n[1]} * 100 + ${n[2]} ))$i" + local base="${1}-" + local n=( ) + echo $( for i in $( ls -d ${1}-[[:digit:]]_[[:digit:]]{,[[:digit:]]}_[[:digit:]]{,[[:digit:]]} 2>/dev/null ) + do + n=${i#${base}} + n=( ${n//_/ } ) + # prepend the file name with its numeric version number to make + # it sortable + echo "$(( 100000 + ${n[0]} * 10000 + ${n[1]} * 100 + ${n[2]} ))$i" # sort and cut the numeric version we added in the previous line - done | sort | cut -c 7- ) + done | sort | cut -c 7- ) } # THERE IS A COPY OF THIS ONE IN ESELECT-MYSQL, keep the two synced diff --git a/eclass/portability.eclass b/eclass/portability.eclass index c198218083ee..2fb4271c307b 100644 --- a/eclass/portability.eclass +++ b/eclass/portability.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/portability.eclass,v 1.10 2006/11/10 15:56:59 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/portability.eclass,v 1.11 2007/01/01 22:27:01 swegener Exp $ # # Author: Diego Pettenò # @@ -139,9 +139,9 @@ get_mounts() { # Linux has /proc/mounts which should always exist if [[ $(uname -s) == "Linux" ]] ; then while read node point fs opts foo ; do - echo "${point} ${node} ${fs} ${opts}" + echo "${point} ${node} ${fs} ${opts}" done < /proc/mounts - return + return fi # OK, pray we have a -p option that outputs mounts in fstab format diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass index 52630da88525..a467e8544308 100644 --- a/eclass/toolchain-binutils.eclass +++ b/eclass/toolchain-binutils.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/toolchain-binutils.eclass,v 1.68 2007/01/01 14:14:47 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.69 2007/01/01 22:27:01 swegener Exp $ # We install binutils into CTARGET-VERSION specific directories. This lets # us easily merge multiple versions for multiple targets (if we wish) and @@ -178,7 +178,7 @@ toolchain-binutils_src_compile() { [[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}" is_cross && myconf="${myconf} --with-sysroot=/usr/${CTARGET}" # glibc-2.3.6 lacks support for this ... -# --enable-secureplt +# --enable-secureplt myconf="--prefix=/usr \ --host=${CHOST} \ --target=${CTARGET} \ diff --git a/eclass/zproduct.eclass b/eclass/zproduct.eclass index fc379b4ad40b..199dc701b90b 100644 --- a/eclass/zproduct.eclass +++ b/eclass/zproduct.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/zproduct.eclass,v 1.25 2006/12/29 00:54:57 radek Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/zproduct.eclass,v 1.26 2007/01/01 22:27:01 swegener Exp $ # Author: Jason Shoemaker # This eclass is designed to streamline the construction of @@ -99,12 +99,12 @@ zproduct_pkg_postinst() { einfo "Attention: ${PF} was not installed in any instance! Use 'zprod-manager add'" #disabled by radek@20061228 - contact me in case of any question! - #${ROOT}/usr/sbin/zprod-manager add ${ZP_DIR}/${PF} + #${ROOT}/usr/sbin/zprod-manager add ${ZP_DIR}/${PF} } zproduct_pkg_prerm() { # checks how many times product is installed and informs about it - # it does not remove it (change in behaviour done by radek@20061228) + # it does not remove it (change in behaviour done by radek@20061228) debug-print-function ${FUNCNAME} ${*} ZINST_LST=$(ls /var/lib/zope/) if [ "${ZINST_LST}" ] ; then @@ -129,8 +129,8 @@ zproduct_pkg_prerm() { if [ $ARE_INSTALLED -gt 0 ] then ewarn "Detected at least $ARE_INSTALLED copies of product being unmerged." - ewarn "Please manually remove it from instances using 'zprod-manager del'" - ewarn "Product is removed from ${ZP_DIR} but not from instances!" + ewarn "Please manually remove it from instances using 'zprod-manager del'" + ewarn "Product is removed from ${ZP_DIR} but not from instances!" fi fi } -- 2.26.2