diff options
author | Sven Wegener <swegener@gentoo.org> | 2008-01-06 19:30:24 +0000 |
---|---|---|
committer | Sven Wegener <swegener@gentoo.org> | 2008-01-06 19:30:24 +0000 |
commit | d9b72ad49e2a1bd75cf6af9436298b8935241037 (patch) | |
tree | dea3bed0d5bef715c20f0c86159b72dd18cb4468 /eclass | |
parent | Add missing version separator line to ChangeLog. (diff) | |
download | gentoo-2-d9b72ad49e2a1bd75cf6af9436298b8935241037.tar.gz gentoo-2-d9b72ad49e2a1bd75cf6af9436298b8935241037.tar.bz2 gentoo-2-d9b72ad49e2a1bd75cf6af9436298b8935241037.zip |
whitespace
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/depend.php.eclass | 12 | ||||
-rw-r--r-- | eclass/ghc-package.eclass | 4 | ||||
-rw-r--r-- | eclass/gnat.eclass | 10 | ||||
-rw-r--r-- | eclass/gnustep-2.eclass | 6 | ||||
-rw-r--r-- | eclass/java-pkg-opt-2.eclass | 4 | ||||
-rw-r--r-- | eclass/php-ext-base.eclass | 4 | ||||
-rw-r--r-- | eclass/php-ext-pecl-r1.eclass | 8 | ||||
-rw-r--r-- | eclass/php-ext-pecl.eclass | 4 | ||||
-rw-r--r-- | eclass/php-ext-source-r1.eclass | 10 | ||||
-rw-r--r-- | eclass/php-ext-source.eclass | 6 | ||||
-rw-r--r-- | eclass/php-ext.eclass | 4 | ||||
-rw-r--r-- | eclass/php-lib-r1.eclass | 8 | ||||
-rw-r--r-- | eclass/php-lib.eclass | 4 | ||||
-rw-r--r-- | eclass/php-pear.eclass | 4 | ||||
-rw-r--r-- | eclass/php-sapi.eclass | 4 | ||||
-rw-r--r-- | eclass/php5-sapi-r1.eclass | 6 | ||||
-rw-r--r-- | eclass/php5-sapi-r2.eclass | 34 | ||||
-rw-r--r-- | eclass/php5-sapi-r3.eclass | 30 | ||||
-rw-r--r-- | eclass/php5-sapi.eclass | 6 | ||||
-rw-r--r-- | eclass/phpconfutils.eclass | 4 | ||||
-rw-r--r-- | eclass/ruby.eclass | 6 |
21 files changed, 89 insertions, 89 deletions
diff --git a/eclass/depend.php.eclass b/eclass/depend.php.eclass index eb4e7fcb10b3..925641d9ffed 100644 --- a/eclass/depend.php.eclass +++ b/eclass/depend.php.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/depend.php.eclass,v 1.22 2007/12/24 12:29:36 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.23 2008/01/06 19:30:24 swegener Exp $ # Author: Stuart Herbert <stuart@gentoo.org> # Author: Luca Longinotti <chtekk@gentoo.org> @@ -11,7 +11,7 @@ # Gentoo PHP team <php-bugs@gentoo.org> # @BLURB: Functions to allow ebuilds to depend on php[45] and check for specific features. # @DESCRIPTION: -# This eclass provides functions that allow ebuilds to depend on php[45] and check +# This eclass provides functions that allow ebuilds to depend on php[45] and check # for specific PHP features, SAPIs etc. Also provides dodoc-php wrapper to install # documentation for PHP packages to php-specific location. @@ -168,7 +168,7 @@ need_php_by_category() { # @FUNCTION: has_php # @DESCRIPTION: # Call this function from your pkg_setup, src_compile, src_install etc. if you -# need to know which PHP version is being used and where the PHP binaries/data +# need to know which PHP version is being used and where the PHP binaries/data # are installed. has_php() { # If PHP_PKG is already set, then we have remembered our PHP settings @@ -205,7 +205,7 @@ has_php() { # Unfortunately, if you want to be really sure that the required SAPI is # provided by PHP, you will have to use this function or similar ones (like # require_php_cli or require_php_cgi) in pkg_setup until we are able to -# depend on USE flags being enabled. The above described need_php[45]_cli +# depend on USE flags being enabled. The above described need_php[45]_cli # and need_php[45]_httpd functions cannot guarantee these requirements. # See Bug 2272 for details. require_php_sapi_from() { @@ -247,7 +247,7 @@ require_php_sapi_from() { # @DESCRIPTION: # You can set PHPCHECKNODIE to non-empty value in your ebuild to chain multiple # require_php_with_(any)_use checks without making the ebuild die on every failure. -# This is useful in cases when certain PHP features are only required if specific +# This is useful in cases when certain PHP features are only required if specific # USE flag(s) are enabled for that ebuild. # @CODE # Example: @@ -623,7 +623,7 @@ php_binary_extension() { # @USAGE: <list of docs> # @DESCRIPTION: # Alternative to dodoc function for use in our PHP eclasses and ebuilds. -# Stored here because depend.php gets always sourced everywhere in the PHP +# Stored here because depend.php gets always sourced everywhere in the PHP # ebuilds and eclasses. It simply is dodoc with a changed path to the docs. # NOTE: No support for docinto is provided! dodoc-php() { diff --git a/eclass/ghc-package.eclass b/eclass/ghc-package.eclass index 7be6b3bd9c53..55b798430772 100644 --- a/eclass/ghc-package.eclass +++ b/eclass/ghc-package.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/ghc-package.eclass,v 1.25 2007/12/13 04:42:48 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ghc-package.eclass,v 1.26 2008/01/06 19:30:24 swegener Exp $ # # Author: Andres Loeh <kosmikus@gentoo.org> # Maintained by: Haskell herd <haskell@gentoo.org> @@ -84,7 +84,7 @@ ghc-sanecabal() { } # checks if ghc and ghc-bin are installed in the same version -# (if they're both installed); if this is not the case, we +# (if they're both installed); if this is not the case, we # unfortunately cannot trust portage's dependency resolution ghc-saneghc() { local ghcversion diff --git a/eclass/gnat.eclass b/eclass/gnat.eclass index 95e55b440a16..2ffaa4645716 100644 --- a/eclass/gnat.eclass +++ b/eclass/gnat.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/gnat.eclass,v 1.32 2007/12/29 23:41:29 george Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gnat.eclass,v 1.33 2008/01/06 19:30:24 swegener Exp $ # # Author: George Shapovalov <george@gentoo.org> # Belongs to: ada herd <ada@gentoo.org> @@ -22,7 +22,7 @@ inherit flag-o-matic eutils # The environment is set locally in src_compile and src_install functions # by the common code sourced here and in gnat-eselect module. # This is the standard location for this code (belongs to eselect-gnat, -# since eselect should work even in the absense of portage tree and we can +# since eselect should work even in the absense of portage tree and we can # guarantee to some extent presence of gnat-eselect when anything gnat-related # gets processed. See #192505) # @@ -202,10 +202,10 @@ get_active_profile() { # get common code and settings . ${GnatCommon} || die "failed to source gnat-common lib" - local profiles=( $(get_env_list) ) + local profiles=( $(get_env_list) ) - if [[ ${profiles[@]} == "${MARKER}*" ]]; then - return + if [[ ${profiles[@]} == "${MARKER}*" ]]; then + return # returning empty string fi diff --git a/eclass/gnustep-2.eclass b/eclass/gnustep-2.eclass index 678108b5548d..473b19868ca7 100644 --- a/eclass/gnustep-2.eclass +++ b/eclass/gnustep-2.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/gnustep-2.eclass,v 1.1 2007/08/18 13:12:57 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-2.eclass,v 1.2 2008/01/06 19:30:24 swegener Exp $ inherit gnustep-base @@ -15,6 +15,6 @@ RDEPEND="${DEPEND} # The following gnustep-based EXPORT_FUNCTIONS are available: # * gnustep-base_pkg_setup -# * gnustep-base_src_compile -# * gnustep-base_src_install +# * gnustep-base_src_compile +# * gnustep-base_src_install # * gnustep-base_pkg_postinst diff --git a/eclass/java-pkg-opt-2.eclass b/eclass/java-pkg-opt-2.eclass index bb2bf28b9799..496ecd082cce 100644 --- a/eclass/java-pkg-opt-2.eclass +++ b/eclass/java-pkg-opt-2.eclass @@ -6,11 +6,11 @@ # Licensed under the GNU General Public License, v2 # # Major changes: -# 20070805: +# 20070805: # Removed phase hooks because Portage does proper env saving now. # <betelgeuse@gentoo.org> # -# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-opt-2.eclass,v 1.8 2007/11/13 19:36:50 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-opt-2.eclass,v 1.9 2008/01/06 19:30:24 swegener Exp $ inherit java-utils-2 diff --git a/eclass/php-ext-base.eclass b/eclass/php-ext-base.eclass index dc6c8b96a2e1..af3cdcc0bf7f 100644 --- a/eclass/php-ext-base.eclass +++ b/eclass/php-ext-base.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/php-ext-base.eclass,v 1.21 2007/09/02 17:49:20 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-base.eclass,v 1.22 2008/01/06 19:30:24 swegener Exp $ # # Author: Tal Peer <coredumb@gentoo.org> # Author: Stuart Herbert <stuart@gentoo.org> @@ -11,7 +11,7 @@ # Combined with php-ext-source, we have a standardised solution for supporting # PHP extensions -# DEPRECATED!!! +# DEPRECATED!!! # STOP USING THIS ECLASS, use php-ext-base-r1.eclass instead! inherit php-ext-base-r1 diff --git a/eclass/php-ext-pecl-r1.eclass b/eclass/php-ext-pecl-r1.eclass index f233138e5f9f..9ea5a9d94cf1 100644 --- a/eclass/php-ext-pecl-r1.eclass +++ b/eclass/php-ext-pecl-r1.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/php-ext-pecl-r1.eclass,v 1.10 2007/10/22 22:54:19 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-pecl-r1.eclass,v 1.11 2008/01/06 19:30:24 swegener Exp $ # # Author: Tal Peer <coredumb@gentoo.org> # Author: Luca Longinotti <chtekk@gentoo.org> @@ -18,7 +18,7 @@ # @ECLASS-VARIABLE: PHP_EXT_PECL_PKG # @DESCRIPTION: # Set in ebuild before inheriting this eclass if the tarball name -# differs from ${PN/pecl-/} so that SRC_URI and HOMEPAGE gets set +# differs from ${PN/pecl-/} so that SRC_URI and HOMEPAGE gets set # correctly by the eclass. # # Setting this variable manually also affects PHP_EXT_NAME and ${S} @@ -32,7 +32,7 @@ # the eclass. # # Unlike PHP_EXT_PECL_PKG, setting this variable does not affect -# HOMEPAGE, PHP_EXT_NAME or ${S}. +# HOMEPAGE, PHP_EXT_NAME or ${S}. [[ -z "${PHP_EXT_PECL_PKG}" ]] && PHP_EXT_PECL_PKG="${PN/pecl-/}" @@ -69,7 +69,7 @@ php-ext-pecl-r1_src_compile() { # @FUNCTION: php-ext-pecl-r1_src_install # @DESCRIPTION: # Takes care of standard install for PECL packages. -# You can also simply add examples to IUSE to automagically install +# You can also simply add examples to IUSE to automagically install # examples supplied with the package. # @VARIABLE: DOCS diff --git a/eclass/php-ext-pecl.eclass b/eclass/php-ext-pecl.eclass index 2464f9aa8c4f..18a66a5b55d6 100644 --- a/eclass/php-ext-pecl.eclass +++ b/eclass/php-ext-pecl.eclass @@ -1,13 +1,13 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-pecl.eclass,v 1.6 2007/09/02 17:49:20 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-pecl.eclass,v 1.7 2008/01/06 19:30:24 swegener Exp $ # # Author: Tal Peer <coredumb@gentoo.org> # # This eclass should be used by all dev-php/PECL-* ebuilds, as a uniform way of installing PECL extensions. # For more information about PECL, see: http://pecl.php.net -# DEPRECATED!!! +# DEPRECATED!!! # STOP USING THIS ECLASS, use php-ext-pecl-r1.eclass instead! inherit php-ext-pecl-r1 diff --git a/eclass/php-ext-source-r1.eclass b/eclass/php-ext-source-r1.eclass index 4994d02e4b93..d12f11b41d78 100644 --- a/eclass/php-ext-source-r1.eclass +++ b/eclass/php-ext-source-r1.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/php-ext-source-r1.eclass,v 1.15 2007/09/04 18:43:27 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r1.eclass,v 1.16 2008/01/06 19:30:24 swegener Exp $ # # Author: Tal Peer <coredumb@gentoo.org> # Author: Stuart Herbert <stuart@gentoo.org> @@ -12,7 +12,7 @@ # Gentoo PHP team <php-bugs@gentoo.org> # @BLURB: A unified interface for compiling and installing standalone PHP extensions from source code. # @DESCRIPTION: -# This eclass provides a unified interface for compiling and installing standalone +# This eclass provides a unified interface for compiling and installing standalone # PHP extensions (modules) from source code. @@ -107,9 +107,9 @@ php-ext-source-r1_src_install() { newins "${WORKDIR}/${PHP_EXT_NAME}-versioned.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension" fi - for doc in ${DOCS} ; do - [[ -s ${doc} ]] && dodoc-php ${doc} - done + for doc in ${DOCS} ; do + [[ -s ${doc} ]] && dodoc-php ${doc} + done php-ext-base-r1_src_install } diff --git a/eclass/php-ext-source.eclass b/eclass/php-ext-source.eclass index 21a789bb78e9..dab144c148fb 100644 --- a/eclass/php-ext-source.eclass +++ b/eclass/php-ext-source.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/php-ext-source.eclass,v 1.12 2007/09/02 19:17:44 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source.eclass,v 1.13 2008/01/06 19:30:24 swegener Exp $ # # Author: Tal Peer <coredumb@gentoo.org> # Author: Stuart Herbert <stuart@gentoo.org> @@ -8,13 +8,13 @@ # The php-ext-source eclass provides a unified interface for compiling and # installing standalone PHP extensions ('modules') from source code -# DEPRECATED!!! +# DEPRECATED!!! # STOP USING THIS ECLASS, use php-ext-source-r1.eclass instead! inherit php-ext-source-r1 deprecation_warning() { - eerror "Please upgrade ${PF} to use php-ext-source-r1.eclass!" + eerror "Please upgrade ${PF} to use php-ext-source-r1.eclass!" } diff --git a/eclass/php-ext.eclass b/eclass/php-ext.eclass index 1e72feb48a4d..7bd8462197de 100644 --- a/eclass/php-ext.eclass +++ b/eclass/php-ext.eclass @@ -1,13 +1,13 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext.eclass,v 1.12 2007/09/02 17:49:20 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext.eclass,v 1.13 2008/01/06 19:30:24 swegener Exp $ # # Author: Tal Peer <coredumb@gentoo.org> # # The php-ext eclass provides a unified interface for compiling and # installing standalone PHP extensions ('modules'). -# DEPRECATED!!! +# DEPRECATED!!! # STOP USING THIS ECLASS, use php-ext-source-r1.eclass instead! inherit php-ext-source-r1 php-ext-base-r1 diff --git a/eclass/php-lib-r1.eclass b/eclass/php-lib-r1.eclass index 91150aa625bf..b24ef1d99c4a 100644 --- a/eclass/php-lib-r1.eclass +++ b/eclass/php-lib-r1.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/php-lib-r1.eclass,v 1.8 2007/11/29 23:12:13 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-lib-r1.eclass,v 1.9 2008/01/06 19:30:24 swegener Exp $ # # Author: Stuart Herbert <stuart@gentoo.org> # Author: Luca Longinotti <chtekk@gentoo.org> @@ -59,7 +59,7 @@ php-lib-r1_src_install() { doins "${S_DIR}/${x}" done - for doc in ${DOCS} ; do - [[ -s ${doc} ]] && dodoc-php ${doc} - done + for doc in ${DOCS} ; do + [[ -s ${doc} ]] && dodoc-php ${doc} + done } diff --git a/eclass/php-lib.eclass b/eclass/php-lib.eclass index e9915c2f2185..5cbc05de7c6a 100644 --- a/eclass/php-lib.eclass +++ b/eclass/php-lib.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/php-lib.eclass,v 1.6 2007/09/02 17:49:20 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-lib.eclass,v 1.7 2008/01/06 19:30:24 swegener Exp $ # # Author: Stuart Herbert <stuart@gentoo.org> # @@ -10,7 +10,7 @@ # # This eclass doesn't do a lot (yet) -# DEPRECATED!!! +# DEPRECATED!!! # STOP USING THIS ECLASS, use php-lib-r1.eclass instead! inherit php-lib-r1 diff --git a/eclass/php-pear.eclass b/eclass/php-pear.eclass index 9b55d5b6e250..2f719e888fc5 100644 --- a/eclass/php-pear.eclass +++ b/eclass/php-pear.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/php-pear.eclass,v 1.14 2007/09/02 17:49:20 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear.eclass,v 1.15 2008/01/06 19:30:24 swegener Exp $ # # Author: Tal Peer <coredumb@gentoo.org> # @@ -10,7 +10,7 @@ # Note that this eclass doesn't handle PEAR packages' dependencies on # purpose, please use (R)DEPEND to define them. -# DEPRECATED!!! +# DEPRECATED!!! # STOP USING THIS ECLASS, use php-pear-r1.eclass instead! inherit php-pear-r1 diff --git a/eclass/php-sapi.eclass b/eclass/php-sapi.eclass index 0e38d362ea62..156ed3bedcc4 100644 --- a/eclass/php-sapi.eclass +++ b/eclass/php-sapi.eclass @@ -1,9 +1,9 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.93 2007/09/02 17:49:20 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.94 2008/01/06 19:30:24 swegener Exp $ # Author: Robin H. Johnson <robbat2@gentoo.org> -# DEPRECATED!!! +# DEPRECATED!!! # STOP USING THIS ECLASS, use one of the php?_?-sapi eclasses instead! deprecation_warning() { diff --git a/eclass/php5-sapi-r1.eclass b/eclass/php5-sapi-r1.eclass index 602269f3d6d4..19bb91d3691e 100644 --- a/eclass/php5-sapi-r1.eclass +++ b/eclass/php5-sapi-r1.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/php5-sapi-r1.eclass,v 1.25 2007/09/02 17:49:20 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r1.eclass,v 1.26 2008/01/06 19:30:24 swegener Exp $ # # eclass/php5-sapi-r1.eclass # Eclass for building different php5 SAPI instances @@ -12,13 +12,13 @@ # # ======================================================================== -# DEPRECATED!!! +# DEPRECATED!!! # STOP USING THIS ECLASS, use php5_2-sapi eclass instead! inherit php5_2-sapi deprecation_warning() { - eerror "Please upgrade ${PF} to use php5_2-sapi eclass instead!" + eerror "Please upgrade ${PF} to use php5_2-sapi eclass instead!" } php5-sapi-r1_check_awkward_uses() { diff --git a/eclass/php5-sapi-r2.eclass b/eclass/php5-sapi-r2.eclass index d5de6a61c688..c84687df1f4d 100644 --- a/eclass/php5-sapi-r2.eclass +++ b/eclass/php5-sapi-r2.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/php5-sapi-r2.eclass,v 1.44 2007/09/02 17:49:20 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r2.eclass,v 1.45 2008/01/06 19:30:24 swegener Exp $ # # eclass/php5-sapi-r2.eclass # Eclass for building different php5 SAPI instances @@ -12,41 +12,41 @@ # # ======================================================================== -# DEPRECATED!!! +# DEPRECATED!!! # STOP USING THIS ECLASS, use php5_2-sapi eclass instead! - + inherit php5_2-sapi - + deprecation_warning() { - eerror "Please upgrade ${PF} to use php5_2-sapi eclass instead!" + eerror "Please upgrade ${PF} to use php5_2-sapi eclass instead!" } php5-sapi-r2_check_awkward_uses() { - deprecation_warning - php5_2-sapi_check_use_flags + deprecation_warning + php5_2-sapi_check_use_flags } php5-sapi-r2_pkg_setup() { - deprecation_warning - php5_2-sapi_pkg_setup + deprecation_warning + php5_2-sapi_pkg_setup } php5-sapi-r2_src_unpack() { - deprecation_warning - php5_2-sapi_src_unpack + deprecation_warning + php5_2-sapi_src_unpack } php5-sapi-r2_src_compile() { - deprecation_warning - php5_2-sapi_src_compile + deprecation_warning + php5_2-sapi_src_compile } php5-sapi-r2_src_install() { - deprecation_warning - php5_2-sapi_src_install + deprecation_warning + php5_2-sapi_src_install } php5-sapi-r2_pkg_postinst() { - deprecation_warning - php5_2-sapi_pkg_postinst + deprecation_warning + php5_2-sapi_pkg_postinst } diff --git a/eclass/php5-sapi-r3.eclass b/eclass/php5-sapi-r3.eclass index d0fcd55115a2..4842001b9ebf 100644 --- a/eclass/php5-sapi-r3.eclass +++ b/eclass/php5-sapi-r3.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/php5-sapi-r3.eclass,v 1.26 2007/09/02 17:49:20 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r3.eclass,v 1.27 2008/01/06 19:30:24 swegener Exp $ # # ######################################################################## # @@ -17,41 +17,41 @@ # # ======================================================================== -# DEPRECATED!!! +# DEPRECATED!!! # STOP USING THIS ECLASS, use php5_2-sapi eclass instead! inherit php5_2-sapi deprecation_warning() { - eerror "Please upgrade ${PF} to use php5_2-sapi eclass instead!" + eerror "Please upgrade ${PF} to use php5_2-sapi eclass instead!" } php5-sapi-r3_check_awkward_uses() { - deprecation_warning - php5_2-sapi_check_use_flags + deprecation_warning + php5_2-sapi_check_use_flags } php5-sapi-r3_pkg_setup() { - deprecation_warning - php5_2-sapi_pkg_setup + deprecation_warning + php5_2-sapi_pkg_setup } php5-sapi-r3_src_unpack() { - deprecation_warning - php5_2-sapi_src_unpack + deprecation_warning + php5_2-sapi_src_unpack } php5-sapi-r3_src_compile() { - deprecation_warning - php5_2-sapi_src_compile + deprecation_warning + php5_2-sapi_src_compile } php5-sapi-r3_src_install() { - deprecation_warning - php5_2-sapi_src_install + deprecation_warning + php5_2-sapi_src_install } php5-sapi-r3_pkg_postinst() { - deprecation_warning - php5_2-sapi_pkg_postinst + deprecation_warning + php5_2-sapi_pkg_postinst } diff --git a/eclass/php5-sapi.eclass b/eclass/php5-sapi.eclass index c813b0fbd756..7661686d78a3 100644 --- a/eclass/php5-sapi.eclass +++ b/eclass/php5-sapi.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/php5-sapi.eclass,v 1.59 2007/09/02 17:49:20 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi.eclass,v 1.60 2008/01/06 19:30:24 swegener Exp $ # # eclass/php5-sapi.eclass # Eclass for building different php5 SAPI instances @@ -12,13 +12,13 @@ # # ======================================================================== -# DEPRECATED!!! +# DEPRECATED!!! # STOP USING THIS ECLASS, use php5_2-sapi eclass instead! inherit php5_2-sapi deprecation_warning() { - eerror "Please upgrade ${PF} to use php5_2-sapi eclass instead!" + eerror "Please upgrade ${PF} to use php5_2-sapi eclass instead!" } php5-sapi_check_awkward_uses() { diff --git a/eclass/phpconfutils.eclass b/eclass/phpconfutils.eclass index 17e693a1c059..e651c4426c77 100644 --- a/eclass/phpconfutils.eclass +++ b/eclass/phpconfutils.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/phpconfutils.eclass,v 1.8 2007/11/29 23:12:13 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/phpconfutils.eclass,v 1.9 2008/01/06 19:30:24 swegener Exp $ # # ######################################################################## # @@ -16,7 +16,7 @@ # @BLURB: Provides utility functions to help with configuring PHP. # @DESCRIPTION: # This eclass provides utility functions to help with configuring PHP. -# It is only used by other php eclasses currently and the functions +# It is only used by other php eclasses currently and the functions # are not generally intended for direct use in ebuilds. diff --git a/eclass/ruby.eclass b/eclass/ruby.eclass index b6a950cc8e8d..769f4faa8899 100644 --- a/eclass/ruby.eclass +++ b/eclass/ruby.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/ruby.eclass,v 1.68 2007/08/25 18:49:44 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ruby.eclass,v 1.69 2008/01/06 19:30:24 swegener Exp $ # # Author: Mamoru KOMACHI <usata@gentoo.org> # @@ -252,14 +252,14 @@ prepall() { # in case no directories found in siteruby local shopts=$- set -o noglob # so that bash doen't expand "*" - + for x in ${D}/${siteruby}/* ; do mv $x ${D}/${siteruby}/.. done if [ -d ${D}${siteruby} ] ; then rmdir --ignore-fail-on-non-empty ${D}/${siteruby} fi - + set +o noglob; set -$shopts # reset old shell opts fi fi |