[gentoo-commits] gentoo-x86 commit in www-client/luakit: ChangeLog luakit-2010.08.30-r1.ebuild luakit-9999.ebuild luakit-2010.08.30.ebuild

[Alex Alexander (wired)]

wired       10/08/31 06:31:01

  Modified:             ChangeLog luakit-9999.ebuild
  Added:                luakit-2010.08.30-r1.ebuild
  Removed:              luakit-2010.08.30.ebuild
  Log:
  added missing dmenu dependency. pass VERSION to emake if <9999.
  
  (Portage version: 2.2_rc71_p3/cvs/Linux x86_64)

Revision  Changes    Path
1.8                  www-client/luakit/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/luakit/ChangeLog?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/luakit/ChangeLog?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/luakit/ChangeLog?r1=1.7&r2=1.8

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/luakit/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ChangeLog	30 Aug 2010 13:37:23 -0000	1.7
+++ ChangeLog	31 Aug 2010 06:31:01 -0000	1.8
@@ -1,6 +1,12 @@
 # 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.7 2010/08/30 13:37:23 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/ChangeLog,v 1.8 2010/08/31 06:31:01 wired Exp $
+
+*luakit-2010.08.30-r1 (31 Aug 2010)
+
+  31 Aug 2010; Alex Alexander <wired@g.o> -luakit-2010.08.30.ebuild,
+  +luakit-2010.08.30-r1.ebuild, luakit-9999.ebuild:
+  added missing dmenu dependency. pass VERSION to emake if <9999.
 
 *luakit-2010.08.30 (30 Aug 2010)
 



1.7                  www-client/luakit/luakit-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/luakit/luakit-9999.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/luakit/luakit-9999.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/luakit/luakit-9999.ebuild?r1=1.6&r2=1.7

Index: luakit-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-9999.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- luakit-9999.ebuild	28 Aug 2010 10:24:37 -0000	1.6
+++ luakit-9999.ebuild	31 Aug 2010 06:31:01 -0000	1.7
@@ -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.6 2010/08/28 10:24:37 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-9999.ebuild,v 1.7 2010/08/31 06:31:01 wired Exp $
 
 EAPI=3
 
@@ -41,6 +41,7 @@
 
 RDEPEND="
 	${COMMON_DEPEND}
+	x11-misc/dmenu
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 "
 
@@ -54,7 +55,11 @@
 }
 
 src_compile() {
-	emake PREFIX="/usr"
+	if [[ ${PV} == *9999* ]]; then
+		emake PREFIX="/usr"
+	else
+		emake PREFIX="/usr" VERSION="${PV}"
+	fi
 }
 
 src_install() {



1.1                  www-client/luakit/luakit-2010.08.30-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/luakit/luakit-2010.08.30-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/luakit/luakit-2010.08.30-r1.ebuild?rev=1.1&content-type=text/plain

Index: luakit-2010.08.30-r1.ebuild
===================================================================
# 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-2010.08.30-r1.ebuild,v 1.1 2010/08/31 06:31:01 wired Exp $

EAPI=3

IUSE="vim-syntax"

if [[ ${PV} == *9999* ]]; then
	inherit git
	EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/mason-larobina/luakit.git"}
	[[ ${EGIT_BRANCH} == "master" ]] && EGIT_BRANCH="develop"
	[[ ${EGIT_COMMIT} == "master" ]] && EGIT_COMMIT=${EGIT_BRANCH}
	KEYWORDS=""
	SRC_URI=""
else
	inherit base
	KEYWORDS="~amd64 ~x86"
	SRC_URI="http://github.com/mason-larobina/${PN}/tarball/${PV} -> ${P}.tar.gz"
fi

DESCRIPTION="fast, small, webkit-gtk based micro-browser extensible by lua"
HOMEPAGE="http://www.luakit.org"

LICENSE="GPL-3"
SLOT="0"

COMMON_DEPEND="
	>=dev-lang/lua-5.1
	dev-libs/glib:2
	net-libs/libsoup
	net-libs/webkit-gtk
	x11-libs/gtk+:2
"

DEPEND="
	dev-util/gperf
	sys-apps/help2man
	${COMMON_DEPEND}
"

RDEPEND="
	${COMMON_DEPEND}
	x11-misc/dmenu
	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
"

src_prepare() {
	if [[ ${PV} == *9999* ]]; then
		git_src_prepare
	else
		cd "${WORKDIR}"/mason-larobina-luakit-*
		S=$(pwd)
	fi
}

src_compile() {
	if [[ ${PV} == *9999* ]]; then
		emake PREFIX="/usr"
	else
		emake PREFIX="/usr" VERSION="${PV}"
	fi
}

src_install() {
	emake PREFIX="/usr" DESTDIR="${D}" DOCDIR="${D}/usr/share/doc/${PF}" install ||
		die "Installation failed"

	if use vim-syntax; then
		local t
		for t in $(ls "${S}"/extras/vim/); do
			insinto /usr/share/vim/vimfiles/"${t}"
			doins "${S}"/extras/vim/"${t}"/luakit.vim ||
				die "vim-${t} doins failed"
		done
	fi
}