version bump. pkgconfig/sqlite in depend. disabled development path support

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

6 files changed, 125 insertions, 24 deletions

diff --git a/www-client/luakit/ChangeLog b/www-client/luakit/ChangeLog
index 8466bc047890..81512dad360a 100644
--- a/www-client/luakit/ChangeLog
+++ b/www-client/luakit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/luakit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/ChangeLog,v 1.15 2011/02/14 07:49:34 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/ChangeLog,v 1.16 2011/02/25 09:23:01 wired Exp $
+
+*luakit-2010.12.25_p2 (25 Feb 2011)
+
+  25 Feb 2011; Alex Alexander <wired@gentoo.org> luakit-2010.09.24.ebuild,
+  luakit-2010.12.25-r1.ebuild, +luakit-2010.12.25_p2.ebuild,
+  luakit-9999.ebuild:
+  version bump. pkgconfig/sqlite in depend. disabled development path support
 
 *luakit-2010.12.25-r1 (14 Feb 2011)
 
diff --git a/www-client/luakit/Manifest b/www-client/luakit/Manifest
index 0cd45cf90297..c5a5700541ae 100644
--- a/www-client/luakit/Manifest
+++ b/www-client/luakit/Manifest
@@ -4,25 +4,27 @@ Hash: SHA256
 AUX luakit-2010.12.25-fix-deprecated.patch 775 RMD160 4d004ee05b999ec643fd91ddadbe5d5e9663bd68 SHA1 fe06891532f738d438516c2ea12f453f4676471c SHA256 110cde6753f47584ff6886ce81716aa13a38dbeaba20bd47fcfa6e11b51fe750
 DIST luakit-2010.09.24.tar.gz 86210 RMD160 125d2fadad194d1a2164e4f3548b9d82bdc68b0e SHA1 0220f03d7581875bf107efb210793bff04d6bcfd SHA256 21629e4de89893759852f16807172a56dc550d1e1654d4e106cf9378b387cd41
 DIST luakit-2010.12.25.tar.gz 111115 RMD160 981b86b72f8772685851017c13180c0e2076e27d SHA1 cc7621c1334084bd89009f1cc128963bc4d8514f SHA256 c5426cd6256940a23f79a0685ae53bb75eaf7232b08a07d91aa56a6596287e2a
-EBUILD luakit-2010.09.24.ebuild 1673 RMD160 9a28ea2b3f2cdc6551bbeb6070a7e755e7756e82 SHA1 22a036aa7551b968f80647388b71c5c025b6b1d3 SHA256 ef5a466569ce94ac152455614d0cc73433958ff9aa726d3ee964b0b5e30a6396
-EBUILD luakit-2010.12.25-r1.ebuild 1774 RMD160 2e1821c94a040386f1b79cfe752e09a9059089cc SHA1 d301e10b59853fb00a101b17c38cc4e41ed84aad SHA256 7ebbf988ef726220293c7a9b7dbe338a7571af359b65bba1b891029835c630af
-EBUILD luakit-9999.ebuild 1698 RMD160 50cce7f1d0ec9d638e31c4bfb7c82de3e42c6c86 SHA1 fd8322a278afa15c600567c031b79b3cf320174f SHA256 12ebd302db605deaa905b541da37119a2b7362fa73ed8e9492220ab1214c988f
-MISC ChangeLog 2575 RMD160 cb5b822047b3ff78a4861f7ad1847f46c19549d6 SHA1 7cd7bd211eced7537bc052ebcf21b515f755c897 SHA256 b77068f1c3aa2a17df029fe04d13822e4bef7d602e75c6b6c0a894abeebc8e2c
+DIST luakit-2010.12.25_p2.tar.gz 111053 RMD160 a25124781da35b86e542cbb852527bf48e949bfd SHA1 b0d458b1a5d0d9af80439b046641199ff067686a SHA256 6dec13f42eb0ce9bd0d66dfa6d795b305c95e4924cc440a3b693530d46a4bf74
+EBUILD luakit-2010.09.24.ebuild 1693 RMD160 90795bbe05ea3a700bad8452c9a90fd45870269f SHA1 3fab7372731636ba9ba57e4632e1859c077ec6dc SHA256 78e9e4c61829379082a7e424ef2523c2da5fee11773efafc77f0ad6d56b31d41
+EBUILD luakit-2010.12.25-r1.ebuild 1794 RMD160 68375005e420e7846fed6b2fef7eac5a1df4dfac SHA1 fd009d0d5bba67a919ce8dec523ef26543aab517 SHA256 e391e362e51260ad4c88801316ec813412fc9fdb5fd81ec7f2c69a5a2aa3d87d
+EBUILD luakit-2010.12.25_p2.ebuild 1830 RMD160 bfa82fe482bb98c6d5120f110b25c65a22e2da82 SHA1 4610683b52864b642bd1461fe54ab92862ea1089 SHA256 5a49504d8f9f7150498f8d21611c71ba297fd3da98c7d400bcbed80b7145cdc0
+EBUILD luakit-9999.ebuild 1799 RMD160 0da39ba450b92b60924f39b79c0e8175f93dfded SHA1 1f1697af760933f37c275052f30fb324e4bccb6d SHA256 8cc7c1bf0e9c1d2e7bca17cf54f20ad022d28e5982260d8d20f221d392d246fb
+MISC ChangeLog 2849 RMD160 b78fc46f0f5bd465d8df384598bf9075db53115e SHA1 3ab0b2dc0c9207f1ef78d63649a9cc2888d3821f SHA256 5b6755084b301add910b9c462e2c4058851ad5279cffbe52aba3abde58a2d8d0
 MISC metadata.xml 329 RMD160 32acff947c3157c720f95f6556cc710c26705b3c SHA1 d7b53f9aab454480fb13e5c823450064c5783d2d SHA256 7319fac82e2fc5a298c91cd09b1254a2a33c1a730218378901be748a50dccf23
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNWN7FAAoJEDZF8K7rm0r6Qe0P/1qIf318jNQcGutyJaqWYq2z
-EvwnsUWDzJT0+O8RmWvU/FPpkw5IfHzBgIodrRk/sQhochLvrAXL0LdGX740DZpK
-++AfLML51wxSpB4Pcm+eONbSzXCVkdF5MT+wDiBGX8Nazx2wg/APmdPhKAp21EdT
-NWv9J+pAdVoN9bRaVVAMvykGWxUk//Ho9bsMaGiQckN7/GkUea7oj1a0GqOEl3PM
-GRS6l/KzPU0+qvJ//Hcq4wQc7pCF1TgZTPGFiFP2P9nXjZ5gS6OHnHZq+a4co1L9
-hl1CM+2wxRFtTugltYqSSsflgsjjfanjoKHQpeC06gZ+3HD6ZXH30wu8/osH33Fb
-xgJosFc3szkz1fMU+9CcG7HJc2OI934qWegL4lMzKVM6MC+3+8i8809++0ggoGv0
-QnP9fxFkJiXbIT11h0SZHgg1qyGhb363jIrTBMXUfpnc/rT6QzQgzoJHcq5jFY+i
-mYWhVXJHpVeXfPda966txBfStIXN55q92TbKncabwr++dpUjsYEEYoo+FMwW4lIr
-P1b7hdZMwH9AkdUFLYlW0AHkvxOpAP0iCuPBBj/sVuaFtquvjL7qbSKaeNvbX4Ck
-XYM83Yny9iEYmrWJKDJCGPevtZH/bw9SYchVj41zYi59XhRq58RsgFslSRHvMkZT
-uuJi2ylLTsVNYPaUFLqm
-=LdUU
+iQIcBAEBCAAGBQJNZ3UFAAoJEDZF8K7rm0r69VcP/3EHPnRJ/Op8zYURVaupoDFo
+Xu75vckPvFjmAXAT4MkeRJPULV99K4JtG9G2+npWGEBNtg2AgUY69ldKu2FDRIjD
+jSvBg5FOF1f5EIZf38BLeGRQlePO6ukF5kSvK9SW8eY/YBDVbac7kFAzUJLUN+oZ
+jEO4ahtFIR3IuEPTlNm6j1TtaZjkoqFyUHvXWhchxmbC3pThv7P++Kb5MEaSgJ0/
+2XZxB5PZzVfFMYOSMJAmj3TUvHwYLY4m0hio9WEki8nMtAbUcESLuhHK5PE4Yg+l
+S/NvtjjjGSHQ3dnnB3QZW+Wnij89a1KuAuOYAYFR3QZxB1gBnOV2J2ph/CiT4mzD
+nPYnP6FBlCf9UUX0nAjurdgWAxscdGbpfS/+LL6hsZDikX0SwSZn6a68qwdbzgiS
+QkdC9aimgygCa3wlpzCbK5Jh/QqM0VE12Mp5gItQYkvcb33qFJnm5xn99AlEzlwp
+03ImDzFgh3eUOnJHrKzn4Xl5RAK7FXywk3wwxAEGEewtG65mdMRVpTwRwY5yLv/h
+70RbddI4ePfhEHf8EgyayIJgkFm8izVAYdMz6Yh7MSmBgV7dSP7pRTR0mGdt5uXt
+0yKSpqkzjzGOWicPiBAnN9bHR4I/x069fjU1mOM1I5bH/PhuFI2bis+2KwJ+9A2g
+IxuAA4M6LpmlRkboydQo
+=bxKh
 -----END PGP SIGNATURE-----
diff --git a/www-client/luakit/luakit-2010.09.24.ebuild b/www-client/luakit/luakit-2010.09.24.ebuild
index 91853dbc41a4..cc0df2368812 100644
--- a/www-client/luakit/luakit-2010.09.24.ebuild
+++ b/www-client/luakit/luakit-2010.09.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-2010.09.24.ebuild,v 1.2 2011/02/14 07:49:34 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-2010.09.24.ebuild,v 1.3 2011/02/25 09:23:01 wired Exp $
 
 EAPI=3
 
@@ -34,6 +34,7 @@ COMMON_DEPEND="
 "
 
 DEPEND="
+	dev-util/pkgconfig
 	sys-apps/help2man
 	${COMMON_DEPEND}
 "
diff --git a/www-client/luakit/luakit-2010.12.25-r1.ebuild b/www-client/luakit/luakit-2010.12.25-r1.ebuild
index e22c552a2103..baf418dca58b 100644
--- a/www-client/luakit/luakit-2010.12.25-r1.ebuild
+++ b/www-client/luakit/luakit-2010.12.25-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-2010.12.25-r1.ebuild,v 1.1 2011/02/14 07:49:34 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-2010.12.25-r1.ebuild,v 1.2 2011/02/25 09:23:01 wired Exp $
 
 EAPI=3
 
@@ -34,6 +34,7 @@ COMMON_DEPEND="
 "
 
 DEPEND="
+	dev-util/pkgconfig
 	sys-apps/help2man
 	${COMMON_DEPEND}
 "
diff --git a/www-client/luakit/luakit-2010.12.25_p2.ebuild b/www-client/luakit/luakit-2010.12.25_p2.ebuild
new file mode 100644
index 000000000000..1d986fb0d0ef
--- /dev/null
+++ b/www-client/luakit/luakit-2010.12.25_p2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-2010.12.25_p2.ebuild,v 1.1 2011/02/25 09:23:01 wired Exp $
+
+EAPI=3
+
+IUSE="helpers 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
+	MY_PV="${PV/_p/-r}"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="http://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="
+	>=dev-lang/lua-5.1
+	dev-libs/glib:2
+	net-libs/libsoup
+	net-libs/webkit-gtk
+	x11-libs/gtk+:2
+"
+
+DEPEND="
+	dev-util/pkgconfig
+	sys-apps/help2man
+	${COMMON_DEPEND}
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-lua/luafilesystem
+	helpers? (
+		x11-misc/dmenu
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+PATCHES=(
+	# bug 354355
+	"${FILESDIR}/${PN}-2010.12.25-fix-deprecated.patch"
+)
+
+src_prepare() {
+	if [[ ${PV} == *9999* ]]; then
+		git_src_prepare
+	else
+		cd "${WORKDIR}"/mason-larobina-luakit-*
+		S=$(pwd)
+		base_src_prepare
+	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
+}
diff --git a/www-client/luakit/luakit-9999.ebuild b/www-client/luakit/luakit-9999.ebuild
index 6215b2efa0d7..6e6350d624a8 100644
--- a/www-client/luakit/luakit-9999.ebuild
+++ b/www-client/luakit/luakit-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.12 2011/02/14 07:49:34 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-9999.ebuild,v 1.13 2011/02/25 09:23:01 wired Exp $
 
 EAPI=3
 
@@ -15,8 +15,9 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	inherit base
+	MY_PV="${PV/_p/-r}"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="http://github.com/mason-larobina/${PN}/tarball/${PV} -> ${P}.tar.gz"
+	SRC_URI="http://github.com/mason-larobina/${PN}/tarball/${MY_PV} -> ${P}.tar.gz"
 fi
 
 DESCRIPTION="fast, small, webkit-gtk based micro-browser extensible by lua"
@@ -26,6 +27,7 @@ LICENSE="GPL-3"
 SLOT="0"
 
 COMMON_DEPEND="
+	dev-db/sqlite:3
 	>=dev-lang/lua-5.1
 	dev-libs/glib:2
 	net-libs/libsoup
@@ -34,6 +36,7 @@ COMMON_DEPEND="
 "
 
 DEPEND="
+	dev-util/pkgconfig
 	sys-apps/help2man
 	${COMMON_DEPEND}
 "
@@ -59,9 +62,9 @@ src_prepare() {
 
 src_compile() {
 	if [[ ${PV} == *9999* ]]; then
-		emake PREFIX="/usr"
+		emake PREFIX="/usr" DEVELOPMENT_PATHS=0
 	else
-		emake PREFIX="/usr" VERSION="${PV}"
+		emake PREFIX="/usr" VERSION="${PV}" DEVELOPMENT_PATHS=0
 	fi
 }