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.

Package-Manager: portage-2.2.0_alpha114/cvs/Linux x86_64

4 files changed, 115 insertions, 18 deletions

diff --git a/www-client/luakit/ChangeLog b/www-client/luakit/ChangeLog
index af797a562588..6cd54fca878e 100644
--- a/www-client/luakit/ChangeLog
+++ b/www-client/luakit/ChangeLog
@@ -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@gentoo.org> +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@gentoo.org> luakit-2010.12.25_p2.ebuild,
   luakit-2011.04.13.ebuild, luakit-2011.04.13_p1.ebuild,
diff --git a/www-client/luakit/Manifest b/www-client/luakit/Manifest
index 3802b537c2ab..9f9fd141e3e1 100644
--- a/www-client/luakit/Manifest
+++ b/www-client/luakit/Manifest
@@ -1,14 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX luakit-2010.12.25-fix-deprecated.patch 775 RMD160 4d004ee05b999ec643fd91ddadbe5d5e9663bd68 SHA1 fe06891532f738d438516c2ea12f453f4676471c SHA256 110cde6753f47584ff6886ce81716aa13a38dbeaba20bd47fcfa6e11b51fe750
 DIST luakit-2010.12.25_p2.tar.gz 111053 RMD160 a25124781da35b86e542cbb852527bf48e949bfd SHA1 b0d458b1a5d0d9af80439b046641199ff067686a SHA256 6dec13f42eb0ce9bd0d66dfa6d795b305c95e4924cc440a3b693530d46a4bf74
 DIST luakit-2011.04.13.tar.gz 132971 RMD160 88b5101d72491d2f77b53b13ffc7979910ad924b SHA1 7177c4c93426b88bb13079bcb841b6988059dc45 SHA256 ed5897dec67877c6dc2e3b00e0b1b37b860fd932e90b0686268cdfbd310a47e3
 DIST luakit-2011.04.13_p1.tar.gz 133072 RMD160 e745a61c21af2dd51eee4d80553ddb7bb4eda164 SHA1 8bbb8047b2affc79a315e248ded9256631094d10 SHA256 ad3142e2a1cfd49cefaf03a93e88795f897f20f760c574fbcadcbeef6fd625fc
 DIST luakit-2011.07.22.tar.gz 148709 RMD160 e776dcbad8d201380627ad485002e938fb7290ae SHA1 d8d58cecc61768d856a071feb9549887d45406cd SHA256 8ba45dadac8e2088b8f0b24a90c51d196166f737f7ed94dee11689cf595d25b9
 DIST luakit-2011.07.22_p1.tar.gz 148704 RMD160 806a4150084b302da8030e60f9811675fe6a9e29 SHA1 255f055825cd6bcc1298505f2d3c36a809820a06 SHA256 8a0d5ce7657de5dde270a691911b26822cb3259b8bf5a0fcf6c02f7748ad4a3d
+DIST luakit-2012.03.25.tar.gz 155220 RMD160 2da3313588ca392455bd9f92c3e197ca5f2d068a SHA1 6b1b4e1d37d95d28953cfb60b0b676b7fb08ad5d SHA256 7e3eda0c4cf64e9674da3821494cb99028483e628133fa9f48f65bd316643074
 EBUILD luakit-2010.12.25_p2.ebuild 1836 RMD160 fbbdb19606b88db1707cf9f04ef36d8b9da9a2de SHA1 8ec9dfc0dd7af123fbc71a663c98c8298a392aaf SHA256 ddcd62daec5012429a38d4067da0f32738594cf4a45eb090447bf634c235f13b
 EBUILD luakit-2011.04.13.ebuild 1864 RMD160 3699963f35c6f35498bb7827d8385a719f7a400f SHA1 bf750d0acfb69a58c6a76b74464c1d54349739d3 SHA256 c893544ab0a2e2816cdfdb4187f84dddc658ed49bc520db018be4f475316c2d0
 EBUILD luakit-2011.04.13_p1.ebuild 1867 RMD160 0b8eb14459116712e3301259f9080d7b956fd3f1 SHA1 e92bfbeb1f5848e73a08623f7f22a30513a92785 SHA256 cb4db4f3bcce6318fd1a02fe7d3f55e7986684e409937593dcca4142132cf946
 EBUILD luakit-2011.07.22.ebuild 1886 RMD160 9619d9141382ad526f30a4b666f6dcdc8c477eab SHA1 1bd065e6a00272866d38d5bbb72583cefe5ce34f SHA256 4e7f5b9e702ddffad0bfc4f72e10f975cb5d1c620d17fc6249353a0bbd1b68c7
 EBUILD luakit-2011.07.22_p1.ebuild 1889 RMD160 27be25e9f41b94ef0bea4fb79ff770014812967d SHA1 5b387c9739ec65be957c569002ffc401ab9b6ba8 SHA256 4a50090a3a36c9d47dd1b214987a4015d5ecdc5a09f2723f24b701f835fcfa57
-EBUILD luakit-9999.ebuild 1793 RMD160 0d84b8c33eba1f1c408f95e64a37522a23c26f73 SHA1 168dc4c002e24a3a888941936e2ef2b99da015f9 SHA256 73141007578d900371c53b45a4783e2e067b5fa2d309ff4646dd254bdb6ab425
-MISC ChangeLog 4603 RMD160 2ff5f57caa019b2f9699ac29ae714d3ac57cc1e5 SHA1 b150ddf4ca66a28cb5b26fd78a44c2d32e8661b5 SHA256 cec109e56ffc09071782e9844576803424f9fae48b7bbb6ae11d9d25401fcfd3
+EBUILD luakit-2012.03.25.ebuild 1694 RMD160 7af46bd1eb2da3ec9439b80453e953db5ad9e3bc SHA1 ebf46a2bdafdeb25e4503a49f698aae47af977e0 SHA256 4fd6ecbf72e8d5571a7684540b82534c9cb462302bf93118210753b2c0dcf419
+EBUILD luakit-9999.ebuild 1689 RMD160 8f1ae5f233ff7e49488f677594bbdca9a55877a3 SHA1 40c8941cc0e6cdafcc8b3e132dda66b14fcf2cf5 SHA256 8bb59692e78853876efd0d5a881df285c3216e694ab5c2daf10fb2ea3fdc9ee4
+MISC ChangeLog 4896 RMD160 4e52bdeb8993dbd9903fc83d77012a0a96acaa7a SHA1 9ba222643f94989ef56b11ac7c4e05b63712764b SHA256 828b4ac2ef77845b419209f66e667ea9acd0d15537ed7423fcde18813f0ef7d6
 MISC metadata.xml 470 RMD160 6d0339a035f678710865434032c180be3f88de44 SHA1 19c8b06f9798581e185ea18a819b89c7f06d2255 SHA256 45b2e4ffe7283973d6f9e8bb0b4575478510b8aaaa6a8102b21ca92ec89aaef5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCgAGBQJP7vmyAAoJEEqz6FtPBkyjFr8H/1O5k07Re03chkzaDcCpfCMS
+QXgna3jm8T/pOvE65rfTSPCtXwikr9SCfzJIvourjsOEovOfy6ThdCI6XrvYS46E
+iQtomZuFDE8ZEd1cvYPbN6pQOyv8QKdWU91vPJqYUKuAVOOcJz01vG4vBZIeaXv0
+9RD6I8LYIQ7RcKQUQ18DT7Q4ynPmXqggKFzCcYEZxzpQ7UeiPadTVFiEa0h9RCdD
+LaWVj3wVt54Yfm+QVwr1ZP+1GhTHQ2VY1EWQIWW0DJFTIUVJg5QSv+KCFBSBYgXD
++1HBpgRxrerS7uvlnGKqwFVdKl2NJ6NOKxZ/1++dsfFb7yhBELo7uJNYWAzcCNs=
+=1uPN
+-----END PGP SIGNATURE-----
diff --git a/www-client/luakit/luakit-2012.03.25.ebuild b/www-client/luakit/luakit-2012.03.25.ebuild
new file mode 100644
index 000000000000..ef7e56e44101
--- /dev/null
+++ b/www-client/luakit/luakit-2012.03.25.ebuild
@@ -0,0 +1,79 @@
+# 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
+}
diff --git a/www-client/luakit/luakit-9999.ebuild b/www-client/luakit/luakit-9999.ebuild
index d839cfc882c7..d8be17368ec6 100644
--- a/www-client/luakit/luakit-9999.ebuild
+++ b/www-client/luakit/luakit-9999.ebuild
@@ -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 @@ if [[ ${PV} == *9999* ]]; then
 	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 @@ RDEPEND="
 	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 @@ src_compile() {
 		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
 }