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

[Tim Harder (radhermit)]

radhermit    12/06/30 13:05:47

  Modified:             ChangeLog luakit-9999.ebuild
  Added:                luakit-2012.03.25.ebuild
  Log:
  Version bump (bug #410729) and update live ebuild. Update to EAPI 4, respect CFLAGS, respect CC, and use vcs-snapshot eclass to unpack release tarballs.
  
  (Portage version: 2.2.0_alpha114/cvs/Linux x86_64)

Revision  Changes    Path
1.29                 www-client/luakit/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/luakit/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ChangeLog	3 May 2012 06:01:02 -0000	1.28
+++ ChangeLog	30 Jun 2012 13:05:47 -0000	1.29
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/luakit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/ChangeLog,v 1.28 2012/05/03 06:01:02 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/ChangeLog,v 1.29 2012/06/30 13:05:47 radhermit Exp $
+
+*luakit-2012.03.25 (30 Jun 2012)
+
+  30 Jun 2012; Tim Harder <radhermit@g.o> +luakit-2012.03.25.ebuild,
+  luakit-9999.ebuild:
+  Version bump (bug #410729) and update live ebuild. Update to EAPI 4, respect
+  CFLAGS, respect CC, and use vcs-snapshot eclass to unpack release tarballs.
 
   03 May 2012; Jeff Horelick <jdhore@g.o> luakit-2010.12.25_p2.ebuild,
   luakit-2011.04.13.ebuild, luakit-2011.04.13_p1.ebuild,



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

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

Index: luakit-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-9999.ebuild,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- luakit-9999.ebuild	3 May 2012 06:01:02 -0000	1.19
+++ luakit-9999.ebuild	30 Jun 2012 13:05:47 -0000	1.20
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 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.19 2012/05/03 06:01:02 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-9999.ebuild,v 1.20 2012/06/30 13:05:47 radhermit Exp $
 
-EAPI=3
+EAPI=4
 
+inherit toolchain-funcs
 IUSE="luajit vim-syntax"
 
 if [[ ${PV} == *9999* ]]; then
@@ -14,7 +15,7 @@
 	KEYWORDS=""
 	SRC_URI=""
 else
-	inherit base
+	inherit vcs-snapshot
 	MY_PV="${PV/_p/-r}"
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/mason-larobina/${PN}/tarball/${MY_PV} -> ${P}.tar.gz"
@@ -49,13 +50,8 @@
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 "
 
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-2_src_unpack
-	else
-		base_src_unpack
-		mv mason-larobina-luakit-* "${S}"
-	fi
+src_prepare() {
+	sed -i -e "/^CFLAGS/s/-ggdb//" config.mk || die
 }
 
 src_compile() {
@@ -66,19 +62,18 @@
 		myconf+=" VERSION=${PV}"
 	fi
 
-	emake ${myconf} || die "emake failed"
+	tc-export CC
+	emake ${myconf}
 }
 
 src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" DOCDIR="${D}/usr/share/doc/${PF}" install ||
-		die "Installation failed"
+	emake PREFIX="/usr" DESTDIR="${D}" DOCDIR="${D}/usr/share/doc/${PF}" install
 
 	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"
+			doins "${S}"/extras/vim/"${t}"/luakit.vim
 		done
 	fi
 }



1.1                  www-client/luakit/luakit-2012.03.25.ebuild

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

Index: luakit-2012.03.25.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-2012.03.25.ebuild,v 1.1 2012/06/30 13:05:47 radhermit Exp $

EAPI=4

inherit toolchain-funcs
IUSE="luajit vim-syntax"

if [[ ${PV} == *9999* ]]; then
	inherit git-2
	EGIT_REPO_URI="git://github.com/mason-larobina/${PN}.git
		https://github.com/mason-larobina/${PN}.git"
	EGIT_BRANCH="develop"
	KEYWORDS=""
	SRC_URI=""
else
	inherit vcs-snapshot
	MY_PV="${PV/_p/-r}"
	KEYWORDS="~amd64 ~x86"
	SRC_URI="https://github.com/mason-larobina/${PN}/tarball/${MY_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="
	luajit? ( dev-lang/luajit:2 )
	!luajit? ( >=dev-lang/lua-5.1 )
	dev-db/sqlite:3
	dev-libs/glib:2
	dev-libs/libunique:1
	net-libs/libsoup:2.4
	net-libs/webkit-gtk:2
	x11-libs/gtk+:2
"

DEPEND="
	virtual/pkgconfig
	sys-apps/help2man
	${COMMON_DEPEND}
"

RDEPEND="
	${COMMON_DEPEND}
	dev-lua/luafilesystem
	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
"

src_prepare() {
	sed -i -e "/^CFLAGS/s/-ggdb//" config.mk || die
}

src_compile() {
	myconf="PREFIX=/usr DEVELOPMENT_PATHS=0"
	use luajit && myconf+=" USE_LUAJIT=1"

	if [[ ${PV} != *9999* ]]; then
		myconf+=" VERSION=${PV}"
	fi

	tc-export CC
	emake ${myconf}
}

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

	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
		done
	fi
}