From e7591aee8b710c2ca633adfa456f98f479fa8aa8 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 25 Jan 2012 10:14:11 -0500 Subject: [PATCH] Update be to git-2 and EAPI 4 (+ style fixes). --- ChangeLog | 7 ++++++- Manifest | 4 ++-- be-9999.ebuild | 18 +++++++++--------- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 62158b4..6df1ded 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,12 @@ # ChangeLog for dev-util/be -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*be-9999 (25 Jan 2012) + 25 Jan 2012; W. Trevor King be-9999. + Update to `git-2` eclass and EAPI 4, and make a couple of stylistic + cleanups. + *be-9999 (25 May 2011) 25 May 2011; W. Trevor King be-9999.ebuild : - Add bash-completion USE flag. diff --git a/Manifest b/Manifest index 7226ad4..2c8d430 100644 --- a/Manifest +++ b/Manifest @@ -1,3 +1,3 @@ -EBUILD be-9999.ebuild 1339 RMD160 97c98e08f7c001550b91c3a765b5edf9ff890076 SHA1 36ac7166327c0865555a46c48f6be607f1d9fcc5 SHA256 0cd5a4d01b2b760e4ab1f0c6e86950f798effd5e55ee2da9fad0bf9e3281c449 -MISC ChangeLog 2634 RMD160 0c8ef29e69fb152385b17e6748fb2139c22eb9b0 SHA1 48a3544aca3f41a6586155ab8a67207af261fae7 SHA256 61d0ec92ce89db22f6cf687b90d91bfc77a1d2456a084b0495ec3cd6ed4f2f70 +EBUILD be-9999.ebuild 1350 RMD160 d6784fe9b5d301f68317b9b25e32a4bf2c80498f SHA1 d8236c51f47f827c9d808fe36401b036087f9756 SHA256 15f14e89d6cc5a937dcdd115be08aad22f27705c59a3adbf97236a8f3781502a +MISC ChangeLog 2798 RMD160 27fd740239c06a9eec96ed3bd278dd97471a6937 SHA1 1da3d92d05bb33bc071f658a657e59da77e894bf SHA256 45a8e2547f7b428d35ee02feefc32263be1c41a12a4ea3a42833642669670260 MISC metadata.xml 321 RMD160 f1c228ca9454d018e84c7fa458cd8a1ddb4a22a0 SHA1 a21e5950c45f5bb268ab86c06f2d52c7a95d15fa SHA256 217043d3419af1b60adbd5e4028a57f1b1de1eebbe44afa9befe33faac60db37 diff --git a/be-9999.ebuild b/be-9999.ebuild index 628c8c0..312ee5f 100644 --- a/be-9999.ebuild +++ b/be-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="3" +EAPI="4" PYTHON_DEPEND="2:2.5" PYTHON_MODNAME="libbe" SUPPORT_PYTHON_ABIS="1" @@ -10,8 +10,8 @@ RESTRICT_PYTHON_ABIS="2.4 3.*" inherit eutils distutils -if [[ ${PV} == "9999" ]] ; then - inherit git +if [[ "${PV}" == "9999" ]] ; then + inherit git-2 EGIT_BRANCH="master" EGIT_REPO_URI="git://gitorious.org/be/be.git" SRC_URI="" @@ -28,17 +28,17 @@ KEYWORDS="~amd64 ~x86" IUSE="bash-completion" RDEPEND="dev-lang/python - dev-python/jinja + dev-python/jinja dev-python/pyyaml" DEPEND="${RDEPEND} dev-vcs/git dev-python/docutils" src_unpack() { - if [[ ${PV} == "9999" ]] ; then - git_src_unpack + if [[ "${PV}" == "9999" ]] ; then + git-2_src_unpack else - unpack ${A} + unpack "${A}" fi cd "${S}" } @@ -57,7 +57,7 @@ src_compile() { src_install() { distutils_src_install dodoc AUTHORS NEWS README || die "dodoc failed" - if [[ ${PV} != "9999" ]] ; then + if [[ "${PV}" != "9999" ]] ; then dodoc ChangeLog || die "dodoc failed" fi if use bash-completion ; then -- 2.26.2