From: Sven Wegener Date: Fri, 17 Feb 2006 22:18:20 +0000 (+0000) Subject: Apply whitespace checks from repoman to eclasses. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=12e2c249c3b7f08d8f3ee38ba8b8cdbf77106b7c;p=gentoo.git Apply whitespace checks from repoman to eclasses. --- diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index 800564ad67a0..843347eea0d8 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.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/eutils.eclass,v 1.223 2006/02/15 23:40:16 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.224 2006/02/17 22:18:19 swegener Exp $ # # Author: Martin Schlemmer # @@ -388,7 +388,7 @@ emktemp() { if [[ ${exe} == "touch" ]] ; then [[ ${USERLAND} == "GNU" ]] \ && exe="-p" \ - || exe="-t" + || exe="-t" else [[ ${USERLAND} == "GNU" ]] \ && exe="-d" \ diff --git a/eclass/font-ebdftopcf.eclass b/eclass/font-ebdftopcf.eclass index 8eb9fdd14261..ac363f811ec2 100644 --- a/eclass/font-ebdftopcf.eclass +++ b/eclass/font-ebdftopcf.eclass @@ -1,10 +1,10 @@ # Copyright 2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/font-ebdftopcf.eclass,v 1.2 2006/01/12 03:44:33 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/font-ebdftopcf.eclass,v 1.3 2006/02/17 22:18:20 swegener Exp $ # Author: Robin H. Johnson -# font-ebdftopcf.eclass +# font-ebdftopcf.eclass # Eclass to make PCF font generator from BDF uniform and optimal # The manpage for this eclass is in media-gfx/ebdftopcf. diff --git a/eclass/gdesklets.eclass b/eclass/gdesklets.eclass index b2a73a385a1e..1eac941b7473 100644 --- a/eclass/gdesklets.eclass +++ b/eclass/gdesklets.eclass @@ -1,6 +1,6 @@ # Copyright 2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/eclass/gdesklets.eclass,v 1.11 2006/01/16 18:14:47 nixphoeni Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gdesklets.eclass,v 1.12 2006/02/17 22:18:20 swegener Exp $ # # Authors: Joe Sapp # Mike Gardiner @@ -140,9 +140,9 @@ gdesklets_src_install() { fi debug-print-section control_install - + CONTROL_INSDIR="" - + # Make sure that it only finds Controls and not Sensors # If it uses a Sensor, it shouldn't use a Control (since # Sensors are deprecated). diff --git a/eclass/gnatbuild.eclass b/eclass/gnatbuild.eclass index 3e5a2fb1787d..7ed8c24470b3 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.4 2006/01/23 23:03:08 george Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.5 2006/02/17 22:18:20 swegener Exp $ # ATTN! # set HOMEPAGE and LICENSE in appropriate ebuild, as we have @@ -82,7 +82,7 @@ is_crosscompile() { PREFIX=${GNATBUILD_PREFIX:-/usr} # not sure we need this hook, but may be.. LIBPATH=${PREFIX}/lib/${PN}/${CTARGET}/${SLOT} LIBEXECPATH=${PREFIX}/libexec/${PN}/${CTARGET}/${SLOT} -INCLUDEPATH=${LIBPATH}/include +INCLUDEPATH=${LIBPATH}/include BINPATH=${PREFIX}/${CTARGET}/${PN}-bin/${SLOT} DATAPATH=${PREFIX}/share/${PN}-data/${CTARGET}/${SLOT} @@ -253,12 +253,12 @@ gnatbuild_pkg_prerm() { # files for eselect module are left behind, so we need to cleanup. if [ ! -f /usr/share/eselect/modules/gnat.eselect ] ; then eerror "eselect-gnat was prematurely unmerged!" - eerror "You will have to manually remove unnecessary files" + eerror "You will have to manually remove unnecessary files" eerror "under /etc/eselect/gnat and /etc/env.d/55gnat-xxx" exit # should *not* die, as this will stop unmerge! fi - # this copying/modifying and then sourcing of a gnat.eselect is a hack, + # this copying/modifying and then sourcing of a gnat.eselect is a hack, # but having a duplicate functionality is really bad - gnat.eselect module # might change.. cat /usr/share/eselect/modules/gnat.eselect | \ @@ -319,7 +319,7 @@ gnatbuild_src_unpack() { # it would be nice to split configure and make steps # but both need to operate inside specially tuned evironment # so just do sections for now (as in eclass section of handbook) -# sections are: configure, make-tools, bootstrap, +# sections are: configure, make-tools, bootstrap, # gnatlib_and_tools, gnatlib-shared gnatbuild_src_compile() { debug-print-function ${FUNCNAME} $@ @@ -327,7 +327,7 @@ gnatbuild_src_compile() { gnatbuild_src_compile all return $? fi - + if [ "all" == "$1" ] then # specialcasing "all" to avoid scanning sources unnecessarily gnatbuild_src_compile configure make-tools \ @@ -341,9 +341,9 @@ gnatbuild_src_compile() { else GNATLIB="${GNATBOOT}/lib/gnatgcc/${CTARGET}/${SLOT}" fi - + export CC="${GNATBOOT}/bin/gnatgcc" - + export ADA_OBJECTS_PATH="${GNATLIB}/adalib" export ADA_INCLUDE_PATH="${GNATLIB}/adainclude" export LDFLAGS="-L${GNATLIB}" @@ -360,28 +360,28 @@ gnatbuild_src_compile() { debug-print-section configure # Configure gcc local confgcc - + # some cross-compile logic from toolchain confgcc="${confgcc} --host=${CHOST}" if is_crosscompile || tc-is-cross-compiler ; then confgcc="${confgcc} --target=${CTARGET}" fi [[ -n ${CBUILD} ]] && confgcc="${confgcc} --build=${CBUILD}" - + # Native Language Support if use nls ; then confgcc="${confgcc} --enable-nls --without-included-gettext" else confgcc="${confgcc} --disable-nls" fi - + # reasonably sane globals (from toolchain) confgcc="${confgcc} \ --with-system-zlib \ --disable-checking \ --disable-werror \ --disable-libunwind-exceptions" - + cd "${GNATBUILD}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" "${S}"/configure \ --prefix=${PREFIX} \ @@ -402,7 +402,7 @@ gnatbuild_src_compile() { --disable-nls \ ${confgcc} || die "configure failed" ;; - + make-tools) debug-print-section make-tools # Compile helper tools @@ -416,29 +416,29 @@ gnatbuild_src_compile() { gnatmake xeinfo && \ gnatmake xnmake || die "building helper tools" ;; - + bootstrap) debug-print-section bootstrap # and, finally, the build itself cd "${GNATBUILD}" emake bootstrap || die "bootstrap failed" ;; - + gnatlib_and_tools) debug-print-section gnatlib_and_tools einfo "building gnatlib_and_tools" cd "${GNATBUILD}" - emake -j1 -C gcc gnatlib_and_tools || + emake -j1 -C gcc gnatlib_and_tools || \ die "gnatlib_and_tools failed" ;; - + gnatlib-shared) debug-print-section gnatlib-shared einfo "building shared lib" cd "${GNATBUILD}" rm -f gcc/ada/rts/*.{o,ali} || die #otherwise make tries to reuse already compiled (without -fPIC) objs.. - emake -j1 -C gcc gnatlib-shared LIBRARY_VERSION="${GCCBRANCH}" || + emake -j1 -C gcc gnatlib-shared LIBRARY_VERSION="${GCCBRANCH}" || \ die "gnatlib-shared failed" ;; esac @@ -450,7 +450,7 @@ gnatbuild_src_compile() { gnatbuild_src_install() { debug-print-function ${FUNCNAME} $@ - + if [[ -z "$1" ]] ; then gnatbuild_src_install all return $? @@ -474,7 +474,7 @@ gnatbuild_src_install() { && rm -f "${x}" done - + # Install gnatgcc, tools and native threads library cd "${GNATBUILD}" if [ "${PN_GnatGpl}-3.4.5.1" != "${P}" ]; then # this one is strange @@ -494,7 +494,7 @@ gnatbuild_src_install() { mv "${D}${LIBPATH}"/../lib/libgcc_s* "${D}${LIBPATH}"/32/ fi mv "${D}${LIBEXECPATH}/gcc/${CTARGET}/${GCCRELEASE}"/* "${D}${LIBEXECPATH}" - + # set the rts libs cd "${D}${LIBPATH}" mkdir rts-native @@ -528,7 +528,7 @@ EOF rm -rf "${D}${LIBEXECPATH}/gcc" rm -f "${D}${LIBPATH}"/libiberty.a # this one comes with binutils rmdir "${D}${LIBPATH}"/include/ # should be empty - + rm -rf "${D}${LIBEXECPATH}"/install-tools/ # this one is installed by gcc and is a duplicate even here anyway diff --git a/eclass/java.eclass b/eclass/java.eclass index 9f2c4371962e..2ae31967ae4b 100644 --- a/eclass/java.eclass +++ b/eclass/java.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/java.eclass,v 1.28 2006/01/20 00:08:39 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java.eclass,v 1.29 2006/02/17 22:18:20 swegener Exp $ # # Author: Karl Trygve Kalleberg @@ -116,7 +116,7 @@ java_remove-libjsoundalsa() { fi } -# Symlinks i386 to i?86. Updates env file to then use i?86 +# Symlinks i386 to i?86. Updates env file to then use i?86 # for LD_LIBRARY_PATH. See bug #23579. # # Takes an argument, which is a directory living in ${D} @@ -128,12 +128,12 @@ fix-i386-dir() { if use x86; then local host=${CTARGET:-${CHOST}} host=${host%%-*} - + if [[ ${host} != i386 ]]; then local orig_dir="${libdir}/i386" local new_dir="${libdir}/${host}" dosym i386 ${new_dir} || die "Failed to dosym" - + sed -i -e "s/i386/${host}/g" \ ${D}/etc/env.d/java/20${VMHANDLE} || die "Failed to sed" diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass index 5fb0008494d6..e7a114eedf06 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.132 2006/02/09 02:44:53 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.133 2006/02/17 22:18:20 swegener Exp $ # # Author Dan Armak # @@ -696,7 +696,7 @@ need-kde() { RDEPEND="${x_DEPEND} $(deprange ${KM_DEPRANGE} kde-base/kdelibs)" else DEPEND="${DEPEND} ~kde-base/kdelibs-$PV" - RDEPEND="${x_DEPEND} ~kde-base/kdelibs-${PV}" + RDEPEND="${x_DEPEND} ~kde-base/kdelibs-${PV}" fi else # Things outside kde-base only need a minimum version diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index acb5e89d9f9f..a6114e2c5012 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.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/kernel-2.eclass,v 1.158 2006/01/29 16:54:44 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.159 2006/02/17 22:18:20 swegener Exp $ # Description: kernel.eclass rewrite for a clean base regarding the 2.6 # series of kernel with back-compatibility for 2.4 @@ -472,7 +472,7 @@ install_headers() { dodir ${ddir}/asm-ppc cp -ax "${S}"/include/asm-ppc/* ${D}/${ddir}/asm-ppc fi - ;; + ;; *) dodir ${ddir}/asm cp -ax "${S}"/include/asm/* ${D}/${ddir}/asm diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass index e1897aca78c9..5b16e61c4a81 100644 --- a/eclass/toolchain-funcs.eclass +++ b/eclass/toolchain-funcs.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-funcs.eclass,v 1.55 2006/01/24 22:35:10 dostrow Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.56 2006/02/17 22:18:20 swegener Exp $ # # Author: Toolchain Ninjas # @@ -116,7 +116,7 @@ ninj() { [[ ${type} == "kern" ]] && echo $1 || echo $2 ; } echo powerpc else echo ppc - fi + fi elif [[ ${host} == powerpc64* ]] ; then echo ppc64 elif [[ ${PROFILE_ARCH} == "ppc64" ]] ; then