diff options
-rw-r--r-- | eclass/font.eclass | 4 | ||||
-rw-r--r-- | eclass/games-mods.eclass | 4 | ||||
-rw-r--r-- | eclass/git.eclass | 8 | ||||
-rw-r--r-- | eclass/gst-plugins-bad.eclass | 4 | ||||
-rw-r--r-- | eclass/java-vm-2.eclass | 4 | ||||
-rw-r--r-- | eclass/kernel-2.eclass | 4 | ||||
-rw-r--r-- | eclass/linux-info.eclass | 8 | ||||
-rw-r--r-- | eclass/mysql.eclass | 6 | ||||
-rw-r--r-- | eclass/vdr-plugin.eclass | 4 | ||||
-rw-r--r-- | eclass/vim.eclass | 4 |
10 files changed, 25 insertions, 25 deletions
diff --git a/eclass/font.eclass b/eclass/font.eclass index 928fd1b10f5c..ac874c9b85f1 100644 --- a/eclass/font.eclass +++ b/eclass/font.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/font.eclass,v 1.46 2009/09/13 04:47:34 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/font.eclass,v 1.47 2009/10/11 11:44:42 maekke Exp $ # @ECLASS: font.eclass # @MAINTAINER: @@ -169,7 +169,7 @@ font_pkg_postinst() { echo fi fi - + if has_version '>=media-libs/fontconfig-2.4'; then if [[ ${ROOT} == "/" ]]; then ebegin "Updating global fontcache" diff --git a/eclass/games-mods.eclass b/eclass/games-mods.eclass index 6a30a4f647d6..577280cd1396 100644 --- a/eclass/games-mods.eclass +++ b/eclass/games-mods.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/games-mods.eclass,v 1.40 2009/10/11 00:29:23 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/games-mods.eclass,v 1.41 2009/10/11 11:50:21 maekke Exp $ # Variables to specify in an ebuild which uses this eclass: # GAME - (doom3, quake4 or ut2004, etc), unless ${PN} starts with e.g. "doom3-" @@ -234,7 +234,7 @@ games-mods_src_install() { fi games_make_wrapper \ ${GAME_EXE}-${PN/${GAME}-}-ded \ - "${DED_EXE} ${SELECT_MOD}${MOD_DIR} ${DED_OPTIONS}" + "${DED_EXE} ${SELECT_MOD}${MOD_DIR} ${DED_OPTIONS}" games-mods_make_initd games-mods_make_confd fi diff --git a/eclass/git.eclass b/eclass/git.eclass index 45e66edcf9a3..9f6772704063 100644 --- a/eclass/git.eclass +++ b/eclass/git.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/git.eclass,v 1.29 2009/09/04 08:00:23 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/git.eclass,v 1.30 2009/10/11 11:40:53 maekke Exp $ # @ECLASS: git.eclass # @MAINTAINER: @@ -263,7 +263,7 @@ git_fetch() { git gc $(${EGIT_PRUNE} && echo '--prune') eend $? fi - + # export the git version export EGIT_VERSION="${cursha1}" @@ -275,7 +275,7 @@ git_fetch() { unset GIT_DIR debug-print "git clone -l -s -n \"${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}\" \"${S}\"" git clone -l -s -n "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" "${S}" - + # set correct branch and the tree ebuild specified pushd "${S}" > /dev/null local branchname=branch-${EGIT_BRANCH} src=origin/${EGIT_BRANCH} @@ -373,7 +373,7 @@ git_src_unpack() { # src_prepare function for git stuff. Patches, bootstrap... git_src_prepare() { debug-print-function ${FUNCNAME} "$@" - + git_apply_patches git_bootstrap } diff --git a/eclass/gst-plugins-bad.eclass b/eclass/gst-plugins-bad.eclass index 92084ba53f22..e2bb7c8f722e 100644 --- a/eclass/gst-plugins-bad.eclass +++ b/eclass/gst-plugins-bad.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/gst-plugins-bad.eclass,v 1.20 2009/09/07 04:58:22 tester Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-bad.eclass,v 1.21 2009/10/11 11:46:01 maekke Exp $ # # Original Author: Saleem Abdulrasool <compnerd@gentoo.org> @@ -58,7 +58,7 @@ gst-plugins-bad_src_unpack() { -e "s:\$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor:${ROOT}/usr/$(get_libdir)/libgstsignalprocessor:" \ -e "s:\$(top_builddir)/gst-libs/gst/video/libgstbasevideo:${ROOT}/usr/$(get_libdir)/libgstbasevideo:" \ -i Makefile.in - + # cd ${S} # Remove generation of any other Makefiles except the plugin's Makefile diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass index 503973c2f335..c7374b49a39a 100644 --- a/eclass/java-vm-2.eclass +++ b/eclass/java-vm-2.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-vm-2.eclass,v 1.28 2009/08/27 21:49:04 ali_bush Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.29 2009/10/11 11:46:59 maekke Exp $ # ----------------------------------------------------------------------------- # @eclass-begin @@ -137,7 +137,7 @@ set_java_env() { ( echo "VMHANDLE=\"${VMHANDLE}\"" - echo "BUILD_ONLY=\"${JAVA_VM_BUILD_ONLY}\"" + echo "BUILD_ONLY=\"${JAVA_VM_BUILD_ONLY}\"" ) >> ${env_file} [[ -n ${JAVA_PROVIDE} ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" >> ${env_file} diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index f92acc540052..0d75c876cc5e 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.219 2009/08/28 16:28:13 mpagano Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.220 2009/10/11 11:43:56 maekke Exp $ # Description: kernel.eclass rewrite for a clean base regarding the 2.6 # series of kernel with back-compatibility for 2.4 @@ -821,7 +821,7 @@ unipatch() { # do not apply fbcondecor patch to sparc/sparc64 as it breaks boot # bug #272676 - if [[ "$(tc-arch)" = "sparc" || "$(tc-arch)" = "sparc64" ]]; then + if [[ "$(tc-arch)" = "sparc" || "$(tc-arch)" = "sparc64" ]]; then if [[ ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} > 2.6.28 ]]; then UNIPATCH_DROP="${UNIPATCH_DROP} *_fbcondecor-0.9.6.patch" echo diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass index 020178e426d9..75105356ca0d 100644 --- a/eclass/linux-info.eclass +++ b/eclass/linux-info.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/linux-info.eclass,v 1.72 2009/09/13 20:44:11 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.73 2009/10/11 11:48:33 maekke Exp $ # # Original author: John Mylchreest <johnm@gentoo.org> # Maintainer: kernel-misc@gentoo.org @@ -382,7 +382,7 @@ kernel_is() { *) die "Error in kernel-2_kernel_is(): Too many parameters.";; esac done - + [ ${test} ${operator} ${value} ] && return 0 || return 1 } @@ -566,10 +566,10 @@ get_running_version() { # This attempts to find the version of the sources, and otherwise falls back to # the version of the running kernel. linux-info_get_any_version() { - get_version + get_version if [[ $? -ne 0 ]]; then ewarn "Unable to calculate Linux Kernel version for build, attempting to use running version" - get_running_version + get_running_version fi } diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass index 3b0d746e53ff..7a9c60c7ec29 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.115 2009/09/08 05:28:03 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.116 2009/10/11 11:42:07 maekke Exp $ # Author: Francesco Riosa (Retired) <vivo@gentoo.org> # Maintainer: MySQL Team <mysql-bugs@gentoo.org> @@ -510,7 +510,7 @@ mysql_src_unpack() { unpack ${A} # Grab the patches [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack - + mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}" # Be backwards compatible for now @@ -851,7 +851,7 @@ mysql_pkg_config() { else eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist" die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}" - fi + fi fi fi diff --git a/eclass/vdr-plugin.eclass b/eclass/vdr-plugin.eclass index 342cdcb0217c..e00c9559eee8 100644 --- a/eclass/vdr-plugin.eclass +++ b/eclass/vdr-plugin.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/vdr-plugin.eclass,v 1.70 2009/10/08 08:12:50 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.71 2009/10/11 11:49:05 maekke Exp $ # # Author: # Matthias Schwarzott <zzam@gentoo.org> @@ -410,7 +410,7 @@ vdr-plugin_pkg_setup() { fi return fi - + VDRVERSION=$(awk -F'"' '/define VDRVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h) APIVERSION=$(awk -F'"' '/define APIVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h) [[ -z ${APIVERSION} ]] && APIVERSION="${VDRVERSION}" diff --git a/eclass/vim.eclass b/eclass/vim.eclass index 074a95a125fb..82e1e2779576 100644 --- a/eclass/vim.eclass +++ b/eclass/vim.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/vim.eclass,v 1.174 2009/05/18 17:02:32 lack Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.175 2009/10/11 11:49:42 maekke Exp $ # Authors: # Ryan Phillips <rphillips@gentoo.org> @@ -172,7 +172,7 @@ apply_vim_patches() { einfo "Filtering vim patches ..." p=${WORKDIR}/${VIM_ORG_PATCHES%.tar*}.patch ls "${WORKDIR}"/vimpatches | sort | \ - while read f; do + while read f; do local fpath="${WORKDIR}"/vimpatches/${f} case $f in *.gz) |