diff options
| -rw-r--r-- | eclass/ChangeLog | 8 | ||||
| -rw-r--r-- | eclass/apache-2.eclass | 4 | ||||
| -rw-r--r-- | eclass/haskell-cabal.eclass | 8 | ||||
| -rw-r--r-- | eclass/mercurial.eclass | 4 | ||||
| -rw-r--r-- | eclass/perl-module.eclass | 6 | ||||
| -rw-r--r-- | eclass/php-common-r1.eclass | 6 | ||||
| -rw-r--r-- | eclass/qt4-build.eclass | 4 | ||||
| -rw-r--r-- | eclass/selinux-policy-2.eclass | 4 | ||||
| -rw-r--r-- | eclass/subversion.eclass | 6 |
9 files changed, 28 insertions, 22 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index fb36ca4fc1f4..7d49a7320530 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.801 2013/04/24 01:49:40 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.802 2013/04/28 16:15:33 zmedico Exp $ + + 28 Apr 2013; Zac Medico <zmedico@gentoo.org> apache-2.eclass, + haskell-cabal.eclass, mercurial.eclass, perl-module.eclass, + php-common-r1.eclass, qt4-build.eclass, selinux-policy-2.eclass, + subversion.eclass: + Bug #467646 - Refer to /etc/portage/make.conf, not /etc/make.conf. 24 Apr 2013; Tim Harder <radhermit@gentoo.org> vim.eclass: Remove old, conditional src_configure call in src_compile. diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass index e5083afe08ae..1019693e3934 100644 --- a/eclass/apache-2.eclass +++ b/eclass/apache-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.30 2013/03/08 10:26:42 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.31 2013/04/28 16:15:33 zmedico Exp $ # @ECLASS: apache-2.eclass # @MAINTAINER: @@ -569,7 +569,7 @@ apache-2_pkg_postinst() { echo elog "Attention: cgi and cgid modules are now handled via APACHE2_MODULES flags" - elog "in /etc/make.conf. Make sure to enable those in order to compile them." + elog "in make.conf. Make sure to enable those in order to compile them." elog "In general, you should use 'cgid' with threaded MPMs and 'cgi' otherwise." echo diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass index 0db7ec192535..19306c8a89f3 100644 --- a/eclass/haskell-cabal.eclass +++ b/eclass/haskell-cabal.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.38 2013/01/06 13:06:35 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.39 2013/04/28 16:15:33 zmedico Exp $ # @ECLASS: haskell-cabal.eclass # @MAINTAINER: @@ -38,20 +38,20 @@ inherit ghc-package multilib # @ECLASS-VARIABLE: CABAL_EXTRA_CONFIGURE_FLAGS # @DESCRIPTION: # User-specified additional parameters passed to 'setup configure'. -# example: /etc/make.conf: CABAL_EXTRA_CONFIGURE_FLAGS=--enable-shared +# example: /etc/portage/make.conf: CABAL_EXTRA_CONFIGURE_FLAGS=--enable-shared : ${CABAL_EXTRA_CONFIGURE_FLAGS:=} # @ECLASS-VARIABLE: CABAL_EXTRA_BUILD_FLAGS # @DESCRIPTION: # User-specified additional parameters passed to 'setup build'. -# example: /etc/make.conf: CABAL_EXTRA_BUILD_FLAGS=-v +# example: /etc/portage/make.conf: CABAL_EXTRA_BUILD_FLAGS=-v : ${CABAL_EXTRA_BUILD_FLAGS:=} # @ECLASS-VARIABLE: GHC_BOOTSTRAP_FLAGS # @DESCRIPTION: # User-specified additional parameters for ghc when building # _only_ 'setup' binary bootstrap. -# example: /etc/make.conf: GHC_BOOTSTRAP_FLAGS=-dynamic to make +# example: /etc/portage/make.conf: GHC_BOOTSTRAP_FLAGS=-dynamic to make # linking 'setup' faster. : ${GHC_BOOTSTRAP_FLAGS:=} diff --git a/eclass/mercurial.eclass b/eclass/mercurial.eclass index 1c98be52f22d..a6afee6a47f0 100644 --- a/eclass/mercurial.eclass +++ b/eclass/mercurial.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v 1.21 2013/03/15 21:47:58 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v 1.22 2013/04/28 16:15:33 zmedico Exp $ # @ECLASS: mercurial.eclass # @MAINTAINER: @@ -36,7 +36,7 @@ DEPEND="dev-vcs/mercurial" # @ECLASS-VARIABLE: EHG_STORE_DIR # @DESCRIPTION: -# Mercurial sources store directory. Users may override this in /etc/make.conf +# Mercurial sources store directory. Users may override this in /etc/portage/make.conf [[ -z "${EHG_STORE_DIR}" ]] && EHG_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/hg-src" # @ECLASS-VARIABLE: EHG_PROJECT diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass index 82301580f396..d23ede00dc35 100644 --- a/eclass/perl-module.eclass +++ b/eclass/perl-module.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.135 2012/09/27 16:35:41 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.136 2013/04/28 16:15:33 zmedico Exp $ # @ECLASS: perl-module.eclass # @MAINTAINER: @@ -175,7 +175,7 @@ perl-module_src_compile() { # and apply them to Test::Harness. # # If you want more verbose testing, set TEST_VERBOSE=1 -# in your bashrc | /etc/make.conf | ENV +# in your bashrc | /etc/portage/make.conf | ENV # # For ebuild writers: # If you wish to enable default tests w/ 'make test' , diff --git a/eclass/php-common-r1.eclass b/eclass/php-common-r1.eclass index 81b61c9ecf5c..c26cbdc5c14d 100644 --- a/eclass/php-common-r1.eclass +++ b/eclass/php-common-r1.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.18 2011/12/27 17:55:12 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.19 2013/04/28 16:15:33 zmedico Exp $ # Based on robbat2's work on the php4 sapi eclass # Based on stuart's work on the php5 sapi eclass @@ -92,7 +92,7 @@ php_check_java() { eerror "in front of your emerge command, for example:" eerror " USE='-java-internal' emerge =dev-lang/php-4*" eerror - eerror "or edit your USE flags in /etc/make.conf." + eerror "or edit your USE flags in /etc/portage/make.conf." die "Kaffe JVM not supported" fi diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index 6f06730ad85d..8a99acbe3705 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.145 2013/04/07 21:14:46 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.146 2013/04/28 16:15:33 zmedico Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -152,7 +152,7 @@ qt4-build_src_unpack() { # @FUNCTION: qt4-build_src_prepare # @DESCRIPTION: # Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix -# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in /etc/make.conf. +# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in make.conf. qt4-build_src_prepare() { setqtenv diff --git a/eclass/selinux-policy-2.eclass b/eclass/selinux-policy-2.eclass index e83a26a3e098..8445265e0116 100644 --- a/eclass/selinux-policy-2.eclass +++ b/eclass/selinux-policy-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/selinux-policy-2.eclass,v 1.17 2013/03/09 12:07:50 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/selinux-policy-2.eclass,v 1.18 2013/04/28 16:15:33 zmedico Exp $ # Eclass for installing SELinux policy, and optionally # reloading the reference-policy based modules. @@ -52,7 +52,7 @@ # This variable informs the eclass for which SELinux policies the module should # be built. Currently, Gentoo supports targeted, strict, mcs and mls. # This variable is the same POLICY_TYPES variable that we tell SELinux -# users to set in /etc/make.conf. Therefor, it is not the module that should +# users to set in make.conf. Therefore, it is not the module that should # override it, but the user. : ${POLICY_TYPES:="targeted strict mcs mls"} diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass index 6f90ab8dfb53..43d7ce1c0b7a 100644 --- a/eclass/subversion.eclass +++ b/eclass/subversion.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.83 2012/07/29 05:54:17 hattya Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.84 2013/04/28 16:15:33 zmedico Exp $ # @ECLASS: subversion.eclass # @MAINTAINER: @@ -31,7 +31,7 @@ DEPEND+=" net-misc/rsync" # @ECLASS-VARIABLE: ESVN_STORE_DIR # @DESCRIPTION: -# subversion sources store directory. Users may override this in /etc/make.conf +# subversion sources store directory. Users may override this in /etc/portage/make.conf [[ -z ${ESVN_STORE_DIR} ]] && ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src" # @ECLASS-VARIABLE: ESVN_FETCH_CMD |