summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2012-02-26 16:13:38 +0000
committerPacho Ramos <pacho@gentoo.org>2012-02-26 16:13:38 +0000
commitb99492f48a067f97f1698dfbb04ec79091dfd3dc (patch)
treee1af8a8e65da867bd71697d07883172d36ab7a60
parentremoving obsolete mask on dev-lang/open64 that was removed from tree (diff)
downloadgentoo-2-b99492f48a067f97f1698dfbb04ec79091dfd3dc.tar.gz
gentoo-2-b99492f48a067f97f1698dfbb04ec79091dfd3dc.tar.bz2
gentoo-2-b99492f48a067f97f1698dfbb04ec79091dfd3dc.zip
Convert to eshopts_{push,pop}, bug 328871 by Spanky.
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/tla.eclass10
2 files changed, 9 insertions, 6 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index a5be8149e537..f3a8161c1cd5 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.144 2012/02/26 13:20:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.145 2012/02/26 16:13:38 pacho Exp $
+
+ 26 Feb 2012; Pacho Ramos <pacho@gentoo.org> tla.eclass:
+ Convert to eshopts_{push,pop}, bug 328871 by Spanky.
26 Feb 2012; Pacho Ramos <pacho@gentoo.org> eutils.eclass:
Use correct menu categories for app-* as discussed in gentoo-dev.
diff --git a/eclass/tla.eclass b/eclass/tla.eclass
index 551087ff9a3e..e6cee2f977db 100644
--- a/eclass/tla.eclass
+++ b/eclass/tla.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tla.eclass,v 1.11 2011/12/27 17:55:12 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/tla.eclass,v 1.12 2012/02/26 16:13:38 pacho Exp $
#
# Original Author: Jeffrey Yasskin <jyasskin@mail.utexas.edu>
#
@@ -17,6 +17,7 @@
# TODO:
# Make it support particular revisions.
+inherit eutils
# Don't download anything other than the tla archive
SRC_URI=""
@@ -179,10 +180,9 @@ tla_src_unpack() {
# Use ${WORKDIR}/${P} rather than ${S} so user can point ${S} to something inside.
mkdir -p "${WORKDIR}/${P}"
- local OLD_SHOPTS=$(shopt -p)
- shopt -s dotglob # get any dotfiles too.
+ eshopts_push -s dotglob # get any dotfiles too.
cp -Rf "$ETLA_TOP_DIR/$ETLA_CACHE_DIR"/* "${WORKDIR}/${P}"
- eval "$OLD_SHOPTS"
+ eshopts_pop
# implement some of base_src_unpack's functionality;
# note however that base.eclass may not have been inherited!