summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Alexander <wired@gentoo.org>2010-08-27 12:00:23 +0000
committerAlex Alexander <wired@gentoo.org>2010-08-27 12:00:23 +0000
commit9de1c5e94e829ccb2f19fb2a865baf6d1f5b4718 (patch)
treef324d3ef9b65903b667d274cac3ff9d6a96eed87 /www-client
parentSpecify also S. (diff)
downloadgentoo-2-9de1c5e94e829ccb2f19fb2a865baf6d1f5b4718.tar.gz
gentoo-2-9de1c5e94e829ccb2f19fb2a865baf6d1f5b4718.tar.bz2
gentoo-2-9de1c5e94e829ccb2f19fb2a865baf6d1f5b4718.zip
respect user-defined branch and/or commit. keep the develop branch as default since master tracks releases.
(Portage version: 2.2_rc69_p23/cvs/Linux x86_64)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/luakit/ChangeLog6
-rw-r--r--www-client/luakit/luakit-9999.ebuild6
2 files changed, 8 insertions, 4 deletions
diff --git a/www-client/luakit/ChangeLog b/www-client/luakit/ChangeLog
index 9eb0a4b9fffb..e71bad50480d 100644
--- a/www-client/luakit/ChangeLog
+++ b/www-client/luakit/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-client/luakit
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/ChangeLog,v 1.4 2010/08/27 10:09:16 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/ChangeLog,v 1.5 2010/08/27 12:00:23 wired Exp $
+
+ 27 Aug 2010; Alex Alexander <wired@gentoo.org> luakit-9999.ebuild:
+ respect user-defined branch and/or commit. keep the develop branch as
+ default since master tracks releases.
27 Aug 2010; Alex Alexander <wired@gentoo.org> luakit-9999.ebuild:
new help2man dependency
diff --git a/www-client/luakit/luakit-9999.ebuild b/www-client/luakit/luakit-9999.ebuild
index 3493352c8091..f7f96ff123df 100644
--- a/www-client/luakit/luakit-9999.ebuild
+++ b/www-client/luakit/luakit-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-9999.ebuild,v 1.4 2010/08/27 10:09:16 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-9999.ebuild,v 1.5 2010/08/27 12:00:23 wired Exp $
EAPI=3
@@ -9,8 +9,8 @@ IUSE=""
if [[ ${PV} == *9999* ]]; then
inherit git
EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/mason-larobina/luakit.git"}
- EGIT_BRANCH="develop"
- EGIT_COMMIT="develop"
+ [[ ${EGIT_BRANCH} == "master" ]] && EGIT_BRANCH="develop"
+ [[ ${EGIT_COMMIT} == "master" ]] && EGIT_COMMIT=${EGIT_BRANCH}
KEYWORDS=""
SRC_URI=""
else