summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2014-07-06 21:24:10 +0000
committerWilliam Hubbs <williamh@gentoo.org>2014-07-06 21:24:10 +0000
commit767388d9eb9d70d3e75ec7bd062456b01ca5c21d (patch)
treedb1162dce418965e548e7680cb6dd4a754ca9343 /sys-apps/gentoo-functions
parentversion bump (diff)
downloadgentoo-2-767388d9eb9d70d3e75ec7bd062456b01ca5c21d.tar.gz
gentoo-2-767388d9eb9d70d3e75ec7bd062456b01ca5c21d.tar.bz2
gentoo-2-767388d9eb9d70d3e75ec7bd062456b01ca5c21d.zip
reinstate the separate inherit call for git-r3.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x30C46538)
Diffstat (limited to 'sys-apps/gentoo-functions')
-rw-r--r--sys-apps/gentoo-functions/ChangeLog5
-rw-r--r--sys-apps/gentoo-functions/gentoo-functions-9999.ebuild6
2 files changed, 7 insertions, 4 deletions
diff --git a/sys-apps/gentoo-functions/ChangeLog b/sys-apps/gentoo-functions/ChangeLog
index 65746a20bee5..7a624e08aa3f 100644
--- a/sys-apps/gentoo-functions/ChangeLog
+++ b/sys-apps/gentoo-functions/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/gentoo-functions
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-functions/ChangeLog,v 1.15 2014/07/06 20:40:27 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-functions/ChangeLog,v 1.16 2014/07/06 21:24:10 williamh Exp $
+
+ 06 Jul 2014; William Hubbs <williamh@gentoo.org> gentoo-functions-9999.ebuild:
+ reinstate the separate inherit call for git-r3.
06 Jul 2014; William Hubbs <williamh@gentoo.org> metadata.xml:
convert metadata indentations back to tabs as shown in skel.metadata.xml.
diff --git a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
index 0e426d0eee31..f75276851bb4 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
@@ -1,18 +1,18 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild,v 1.3 2014/05/10 17:20:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild,v 1.4 2014/07/06 21:24:10 williamh Exp $
EAPI=5
if [[ ${PV} = 9999* ]]; then
- vcs=git-r3
+ inherit git-r3
EGIT_REPO_URI="git://github.com/gentoo/${PN}.git"
else
SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
fi
-inherit ${vcs} toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="base functions required by all gentoo systems"
HOMEPAGE="http://www.gentoo.org"