diff options
| author |   Brian Harring <ferringb@gentoo.org> | 2011-06-12 10:10:10 +0000 |
|---|---|---|
| committer | Brian Harring <ferringb@gentoo.org> | 2011-06-12 10:10:10 +0000 |
| commit | 600e4ff4a8a96431814e81e904d2aed48f30b3d7 (patch) | |
| tree | 9b580b715754a5a524937bc303ea5f872420cde5 /profiles | |
| parent | Add proper introspection deps, fixes bug 371143 (diff) | |
| download | historical-600e4ff4a8a96431814e81e904d2aed48f30b3d7.tar.gz historical-600e4ff4a8a96431814e81e904d2aed48f30b3d7.tar.bz2 historical-600e4ff4a8a96431814e81e904d2aed48f30b3d7.zip | |
back out portage specific /etc/portage/env hack; it's directly supported in portage for over a year, and alternate PMs have their own way of doing it.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/base/ChangeLog | 7 | ||||
| -rw-r--r-- | profiles/base/profile.bashrc | 15 |
2 files changed, 8 insertions, 14 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog index be135d910799..da5a686f2025 100644 --- a/profiles/base/ChangeLog +++ b/profiles/base/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for Gentoo base-profile # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.274 2011/06/11 00:05:17 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.275 2011/06/12 10:10:10 ferringb Exp $ + + 12 Jun 2011; Brian Harring <ferringb@gentoo.org> profile.bashrc: + Remove /etc/portage/env hack- it belongs in the PM, and has been in + portage since 04/10, and alt PMs have their own ways of doing the + same. 11 Jun 2011; Nirbheek Chauhan <nirbheek@gentoo.org> package.use.mask: Unmask USE=introspection for webkit-gtk diff --git a/profiles/base/profile.bashrc b/profiles/base/profile.bashrc index d560dd0f6dec..6cc7c183c718 100644 --- a/profiles/base/profile.bashrc +++ b/profiles/base/profile.bashrc @@ -1,17 +1,6 @@ -# Copyright 2006-2010 Gentoo Foundation +# Copyright 2006-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/profile.bashrc,v 1.6 2010/04/30 00:01:05 zmedico Exp $ - -# Skip this if PM_EBUILD_HOOK_DIR is set since this means that -# /etc/portage/env is supported by the package manager: -# http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ef2024a33be93a256beef28c1423ba1fb706383d -if [[ -z $PM_EBUILD_HOOK_DIR && \ - -d ${PORTAGE_CONFIGROOT}/etc/portage/env ]] ; then - for conf in ${PN} ${PN}-${PV} ${PN}-${PV}-${PR}; do - [[ -r ${PORTAGE_CONFIGROOT}/etc/portage/env/${CATEGORY}/${conf} ]] \ - && . ${PORTAGE_CONFIGROOT}/etc/portage/env/${CATEGORY}/${conf} - done -fi +# $Header: /var/cvsroot/gentoo-x86/profiles/base/profile.bashrc,v 1.7 2011/06/12 10:10:10 ferringb Exp $ if ! declare -F elog >/dev/null ; then elog() { |