properly toggle luajit usage, bug #471704. removed old versions.

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0xEB9B4AFA

11 files changed, 43 insertions, 543 deletions

diff --git a/www-client/luakit/ChangeLog b/www-client/luakit/ChangeLog
index f7a8534bf469..fcee5debac85 100644
--- a/www-client/luakit/ChangeLog
+++ b/www-client/luakit/ChangeLog
@@ -1,6 +1,15 @@
 # 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.32 2012/12/04 11:33:43 wired Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/ChangeLog,v 1.33 2013/07/15 18:22:05 wired Exp $
+
+*luakit-2012.09.13_p1-r1 (15 Jul 2013)
+
+  15 Jul 2013; Alex Alexander <wired@gentoo.org> -luakit-2010.12.25_p2.ebuild,
+  -luakit-2011.04.13.ebuild, -luakit-2011.04.13_p1.ebuild,
+  -luakit-2011.07.22.ebuild, -luakit-2011.07.22_p1.ebuild,
+  -luakit-2012.03.25.ebuild, -luakit-2012.09.13_p1.ebuild,
+  +luakit-2012.09.13_p1-r1.ebuild, luakit-9999.ebuild:
+  properly toggle luajit usage, bug #471704. removed old versions.
 
   04 Dec 2012; Alex Alexander <wired@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 e1364e5e56b2..f8f0f0c3e734 100644
--- a/www-client/luakit/Manifest
+++ b/www-client/luakit/Manifest
@@ -2,37 +2,25 @@
 Hash: SHA256
 
 AUX luakit-2010.12.25-fix-deprecated.patch 775 SHA256 110cde6753f47584ff6886ce81716aa13a38dbeaba20bd47fcfa6e11b51fe750 SHA512 5e30640a5d3ce041a4641e198721217e1d441be841091c6d562d7251934e16f9fbf8ac8d2ff97286c332907a12628152a979ba6a0402af7a63ca5f33d6551e8b WHIRLPOOL 1083db7ea3bb2d3b103d2d4051957fda74117efcaa8817a411218f1340236d166360075f0e96b9476c75043da86414c8c68a257cfe3a2f4ed4b05c914090ab50
-DIST luakit-2010.12.25_p2.tar.gz 111053 SHA256 6dec13f42eb0ce9bd0d66dfa6d795b305c95e4924cc440a3b693530d46a4bf74 SHA512 445d3cbd58fe5b7b33d3591f82a4719e96c3f19e68f7af8129153e8ccc0a31e591fdf6f7db4b8b098da3eefb0781e6c79cc76f93bcf1a56bd3c56dea113c2638 WHIRLPOOL f589b6d0e95121b1ccbc6eb3683e47fbb8d04b8f2b2ad6f73daddaf67bd4ecd86450190fb79a931220eaf22b868adeaf1eccb35481572b9e17b826a1112ba4d3
-DIST luakit-2011.04.13.tar.gz 132971 SHA256 ed5897dec67877c6dc2e3b00e0b1b37b860fd932e90b0686268cdfbd310a47e3 SHA512 79334b2b242a46f146bf6b96d9968df5e0bde09be9f24f59428f3c869f58974e2ee6b11318d8544e3e84aebadae949e56e139f953a09126f6a560b3991335ff4 WHIRLPOOL dd3fa9d2e4e66046c5777f88b7966dfeed03f218da5ec9e0dd1d78be07c455fe704815f301bf72db79b66143a46de249c467cbb5786b138f5c5d5dfe93ee5d13
-DIST luakit-2011.04.13_p1.tar.gz 133072 SHA256 ad3142e2a1cfd49cefaf03a93e88795f897f20f760c574fbcadcbeef6fd625fc SHA512 e51aafe34520bd63684317d3869e5464025ecb4482f4e15f222cc4ca6d22a990414047f016b70c52e2e2307ecc949a8ded448bfc26bd333969658d49bab3c91a WHIRLPOOL cf9b85469a8bfba57d46d58e806605a0467abbd0fcb8ce5ab5f5e8f2e2069f660986bfe3a828dc679e123f0474528c753d088273b89e8ddb37093fb5cf3ef9da
-DIST luakit-2011.07.22.tar.gz 148709 SHA256 8ba45dadac8e2088b8f0b24a90c51d196166f737f7ed94dee11689cf595d25b9 SHA512 d81544dc00a5c6a1a78d8cf8fa062a4befc58ab4e9f76f03ee39cbb1913901e5796af910fabdb9b67f0d82395b9f124cf93aed1de8e787292c96d6484bd2b54f WHIRLPOOL abb7d0fa821c31288fbaf9588c6a0223c90d70d8e33404620c6c18f765cf7d13d9b7952dd35596bf3022b7e5742e7ae97c4e9e2ea65d89a26ba54469bcb249b3
-DIST luakit-2011.07.22_p1.tar.gz 148704 SHA256 8a0d5ce7657de5dde270a691911b26822cb3259b8bf5a0fcf6c02f7748ad4a3d SHA512 fceeeaeb6a637a214bb69ff4369eec1156a7a02501720ea246c2e9dbf52a130b7d8260ae643988f7ff4e5c20d003d56878b9be7e701991f06bfcada54fb6e0e3 WHIRLPOOL c62cb9e24b4a33ad24a3e1c23c17bd837fd1a402fae36cda009f97109d360059de18cc7b9671b016bf071556f9060e7cbb425d4413550f7c5ccf3477155f7bbb
-DIST luakit-2012.03.25.tar.gz 155220 SHA256 7e3eda0c4cf64e9674da3821494cb99028483e628133fa9f48f65bd316643074 SHA512 69f0105d4838eb87b581325d7a232372d1b452265e924ab59c660309d91580d3671ac98ffc1372e8d976901140302152bb71d1aa887236ee1de219d66b31ffe4 WHIRLPOOL dec8e2a766d0be3f62fbc22582531ace1cc10aa35d2546ab1e273b7bf45ab4c6b445a4a92a1879e4d40415feec976f3e5bf320b22000ef3693e21e373d18f4da
 DIST luakit-2012.09.13_p1.tar.gz 215431 SHA256 688950fda11f032976998b52ba6505fc1bf5bba40552293f9ddc748b00f76132 SHA512 429f2911e6c0e28966579721925d3f9bf492461b3f43cecb07df5f2a7ee5e791d30885c50039da6849ec8d16e8b042286482966c036089e87c568fb394aade09 WHIRLPOOL de90607402cc13eab7a84a3f9f75edaca976f444aabccd1391f7c7f20fe0211d78d8d4c3d3685bcabb84622556617411c9778eaf6abb23ca826992c4914f0064
-EBUILD luakit-2010.12.25_p2.ebuild 1854 SHA256 925193a76c198a2d71f69cc770292ddb074b0e890745224f4b23400af33d276b SHA512 59babd470df1ece130ceb56e3510149172d987700ad5176754524637fc5bb589a9fb3950bc3753e53c43887606eafc6b1fe960cefc9dccb277fb722c8b51e93a WHIRLPOOL 29031aba8aa2e7965c1985ed92251b13cb89459f7bde349efb917f0286d1bb45eff328639ec1cf43e55b5b62e0c971f07aee6d0e64ef05b68f6dbaee4e17be03
-EBUILD luakit-2011.04.13.ebuild 1882 SHA256 1d50282775514fc020343210f2911516333b77021b9b7879742d24d0939c8bba SHA512 bd106736144228a5295cbf81c02c5b714e2f4d79682a3b11ec37aa8d0dfbf647a03325bae0e03c8d27b5473ffa5b34432af81e060dd52d20f7083d40686786aa WHIRLPOOL 8ce68613dc072fe8ac08260ebfc6635ae34a81804ef9c6d973fcb0659098a8bb4df205f49263ba35cec3259a08022ca5549a7221d57c3072cc3d375c49fb77ff
-EBUILD luakit-2011.04.13_p1.ebuild 1885 SHA256 af56cded244a2c800cc412da0562193e8db900bd366a25acdc9af3a3db4fe748 SHA512 c98eef4c93fb35b76530790405119bf481adb95c4ee00512ddde4fafc31d8d87683e93ba5ce2673bbbc6901eaa3f201b7ae01fac1cee5a025b82696fe722d412 WHIRLPOOL 4fa60cc86e43ff52eface614ee4822f2b9c3806b5e5e09908147527ed19efd54ab2521d67b2d87a1332307c28764a0373683ffa3d01843780826171b07a1f83e
-EBUILD luakit-2011.07.22.ebuild 1904 SHA256 ef2bd2689ba5e804470069011a3986052e1a6f7dc25037fef4868e2e27b6e70c SHA512 00f74d258db67667f36c64d0f315890c02f97a90204c90c82bed260dbc5c639e807800e29028189afdcf9a1f2583a8a50ed0864750aaf3ccc4c617b6aaeb5a78 WHIRLPOOL ad95a88d54fef2747da211d35db3752503859c398cc64afc4b83c33b58bcd01a9cebb63fa12cc02a7656016bb0173b6c044e91094473e1b5bfef390b5d335ae9
-EBUILD luakit-2011.07.22_p1.ebuild 1907 SHA256 cadc75156555600a549af320138de183969bf47d9793298d8c6f8b7d7d37cc33 SHA512 3bae3e3b906f1ba92cab6036d2351dce44a44b5b21a6bb550a7564dcce54b2a40ca9074c79a8a3ca0af3b5fca060c1ccc53b5982a3435060410f03b90f511441 WHIRLPOOL 66789ecbb7f452c14ddffb5884daba2895d43ec04254efc07c54f66e3723c885432d8b6272c040cdcec2364e9e0c9e58d1816c6dd989d34202ef7a637926b3ee
-EBUILD luakit-2012.03.25.ebuild 1709 SHA256 81d33988fdf70c95b44e09cf0e6ac460f2f556ea9e45587a0c607319d19c4eb2 SHA512 aced0f91ca25248cf982d6d9522cf1609ac742add0ea34b7617589258622cfaa5f54a18c6926cf7bad3905390721efa0d9d7d6742a21aaf77497feb85379339b WHIRLPOOL ea88343844b0896881bd72573e8f280f643797e54e2dd4af96de88e8ed4d40c069d9f907a34d5c9a41cd26f08c353352a61e7f9a2ab6c18629bec31c1b02acdc
-EBUILD luakit-2012.09.13_p1.ebuild 1712 SHA256 f22b2fb7270c6cac8045df42f63f336d89bd88fbaf74193b4748f192775391d4 SHA512 602371b9201646d670aea2d0c84aa45b1137a8d61b32e52729a95d70b359c0eee09a001d4c7d42b590340e4257bf025b919185ad4984b1eab9421ab46ed97113 WHIRLPOOL 96659dc806ac4a747c557e038a889071226bb608f01bd437bb02682328c47dd1c77534acd03aa3c592c824f27439f6e6d395196efe571ec2b64665dafca7dcc0
-EBUILD luakit-9999.ebuild 1837 SHA256 e1dad09519e77b6cae0a4515715643b019f38904a55818661c431f32b37471dd SHA512 d86dbc9a7e89a56d6413fb689b86d7610362336e4de9977558835416eae5715379601b5e4a69f84bd1fd605153e67a92b623c3489ecc29f2ae97bd470da6d400 WHIRLPOOL 81d281faba1fb7514fcc6f5ab1f4f365bbcc1cb3a964c19e55de3cb7585435411282baa8d01cc7ec94d94b1854b2b9dbcc1c962ee967498b43360d99c0f965f3
-MISC ChangeLog 5417 SHA256 8639d6520de082ef7a877ce4441958a5ceb34c371513c80e02983d1cd20e3782 SHA512 91ee6fc26988ae6c35bbc566d4a8fad2a9bdf5e93753e1cd90f13599572cb5d007b4e449e2cc3a4a6355a3f2653f0e6aff583c1d9bd8f14772cc90ee1d2d9c18 WHIRLPOOL 113d15e8da7ac0d0ac4424fee7e5a76069cfb76cc6b81a8b1dd64f5478d40b41befa84e01c76e48514d8402b71a5da1a59b9022c4f0086c74340cdc766e30f34
-MISC metadata.xml 470 SHA256 45b2e4ffe7283973d6f9e8bb0b4575478510b8aaaa6a8102b21ca92ec89aaef5 SHA512 69cb289060685123200b2c63b264ab5a1a1293dc85c3077c2375be0734d77973e66ed5768e52a2f0b6f3e0f674441440650f6ac9e027e621d59a65040552e1ca WHIRLPOOL 58ec2921c82a549974cd26e7b46b699162ef28add580c96593c16d16286bde75362f7d2f41251bf2b7a49f09b15485a322ac861d037d5f65477c3a304c955ba3
+EBUILD luakit-2012.09.13_p1-r1.ebuild 1759 SHA256 19ef384d7571fd0f404b2440f120e976d7676cc4f9105ae4dba5fe9bcb5994b5 SHA512 2564d89ed6e5e20ab27c158c316bb4b2f8806d8fcdbd35a9e8117a0b1619dd979cab7a7bc6cda0e475de6f28f7cb005fd44770017a389ef038821bd6b3c1cb3c WHIRLPOOL a3a186d72b75dba2e3eb2432237d2d22db3444c02eb5aa39bb67bd9d2e5fe65ffc80250b72aa2c22dde90d68917897a0fe5314873a7bc51910a558de9186c3d5
+EBUILD luakit-9999.ebuild 1881 SHA256 c585327dbf4580b3e0e372f5503a800cb55ff2cb616ce735db53d4171ba51994 SHA512 059af7bfda49e29cf0da79ac402d34cffc123988e44073a4cb64c9c29e138cbf82462151efc634fc20006b95c67a47dc255cf2dac65c9452e4626c7a671f986e WHIRLPOOL 7a9ca3ea3862ba99c95021f3febb3418f9d180fc1de6eac36f77afa94cf8a809380515f68f7610f8018b5f3e6dccb525eef5921ca8cee23f55c06bed9966873c
+MISC ChangeLog 5836 SHA256 3485b57062362c61c83a094b6879d821870ee4e934980f599038257fa0e204f5 SHA512 6d3b440cb35909b69a7216ba1e775edb000d23cb46dbbee953fa7f7c06ce8c5e7168d9b0536f2a1735f1ec76891de78366567c36ae5191f664c13844eb2b3fdb WHIRLPOOL ec1dad65d7fd3222d4656460ebed124cd1b18b913da64976e911ea2941beffe13c2fdc1b23d720d634201b9ae1c17daebcd2391302d25f59b3d3cf42ac9a1fcd
+MISC metadata.xml 410 SHA256 10bfc97b678435a1d621ba8edcd341493851c5cf9232e9c98d98f3b96c0e9466 SHA512 e8db45e6f4f2c1f0174730fc0b79d334b2ae636837be3518d81f7bba3fd4b449fc02b21c7084644bb8144977e482748d0c85d65eb50dabe4f91113f88fe2d016 WHIRLPOOL 656e167e94c0947c9799f6dda2fddb8144460e38d80b4808ed3361f061de6082d5469316543a3b8b0feb98a62a6c8f67491742a6efaedb620cf91222c0df5d7a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQveBOAAoJEDZF8K7rm0r6qWQQAKY5i4l81e7lHstM36swtsQv
-xxbsB9JvPnn7ytwhEY4ERN0nOOTGHMsHfgXJ+XplSxZgNWNliv0vqS9oYJ8JSEKH
-hjCcuqD03V0fVEG75S5/D0BWDcuQ6ENxcJDiKCHKbY2O45H5qnv01LqFtLeZX1QN
-Kp6CNmKvQR6my6pQl2tVtGGWumVZYs2Wfs4aMFDWTeJlZUgdrtaN/6WeVXY1qNuM
-07gB9axFdIVl3083itkwZf0dWuTsrlImbuN9Et7DKbvpeEl+wMi2dxecqPtDLi5j
-0Qlr/4G5oE62axbmAk3d5dMO5bgw29FWHS3yP7IqKy7cx0ufPwZpIx4meGFUFNHo
-aRdRpFEUmEPgEwAIv5sFHtoog/SGXRhBLo8/fs3zmCVPMvXQbwWcOzhshqu1w0DO
-dmzyXzTyyqrWqb0gzBMqlGOFr02bHBUhXh8F1YL5fSTvN8p4tY1xFAQprtX5QEzz
-l2wVKUiP+Uez4RBTHxclxdymlc/JjMG/adyKf083vE4hDAalHy+neNv8K2RDAAfl
-NExD7FTtZUutHsIqHnW6XGQBsNeIyD9PSZTsq3gqLPbBh3OPeKREBOSU721X+W5U
-eECULeXBTHsVWflDdrsFHrhhJuMIdVOSSqaRsPsFSxHNWTr1HykfUVEOCKHpPwmv
-zuX3zIcGwMjULo36GC6i
-=jaEx
+iQIcBAEBCAAGBQJR5D3vAAoJEDZF8K7rm0r6vZwQAJmkfDMOuKLL+1hQGXKl+Pcq
+6AzvXS/mMzrsbjLwE8TvOAiULjOCrgklRyFRn9nKX5gzcd8t3G4rU8A/K+dTaq+9
+FqAtuCMaQZQCpwJnTbNgGdMbfvFMtwOoTd/oZWJqOUh5V7d0Vo68Rlj8Yk1c3Ro8
+xidPn/J9hxIpJtqXMbD1QCmmy0iaDKBRWySXfgO6dyJHL8hGYGOzA20RHNonSJo/
+39muW18U7RBo5jUpfeAG77xYzzdaH8drG/PmIhwWV3THBbmQdg/9lm9Mbm4proyC
+zzEk/PbYOjEbc6IFnGE7XMPW4JNL4PRnTKen8bG6W+/pFX7MPO34YX40iwfcmtAB
+aMq2JRMNJ7lOPLFYz55ADUKD+gc17DJYBMUZYq+yCFiSaL/iMQW2opYqgJO4B8uO
+zbuAfT51yRddcvpIKZjIbw/wBfaiks9yqdgY3XVwKckOdY67oUdXjMDuxHB3PlT0
+8P9fE0q4iUujfh1Ahj/YVRgm3kuqjGfyd/VAdoe7QoU+7XTTMLXnoB30q772UWGm
+v3YGtPZZmMfqVmk7btber5nQueaXT9NxCIZssHAa8AAENeYIeq0OgrdRKXr3VqoA
+yyJTmIRAbI+1fox4ZZ2Z8+NmYtUrCslOxM8kdLwBg/Sn4MZR6sdIOc5AFpXwvz5m
+XB2xUIPsq2g6hrzrqr4n
+=RTkw
 -----END PGP SIGNATURE-----
diff --git a/www-client/luakit/luakit-2010.12.25_p2.ebuild b/www-client/luakit/luakit-2010.12.25_p2.ebuild
deleted file mode 100644
index 070c0cca4301..000000000000
--- a/www-client/luakit/luakit-2010.12.25_p2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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-2010.12.25_p2.ebuild,v 1.4 2012/12/04 11:33:43 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://mason-larobina.github.com/luakit/"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-COMMON_DEPEND="
-	>=dev-lang/lua-5.1
-	dev-libs/glib:2
-	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
-	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-2011.04.13.ebuild b/www-client/luakit/luakit-2011.04.13.ebuild
deleted file mode 100644
index 2931ccb98e82..000000000000
--- a/www-client/luakit/luakit-2011.04.13.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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-2011.04.13.ebuild,v 1.3 2012/12/04 11:33:43 wired Exp $
-
-EAPI=3
-
-IUSE="luajit 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://mason-larobina.github.com/luakit/"
-
-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
-	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() {
-	if [[ ${PV} == *9999* ]]; then
-		git_src_prepare
-	else
-		cd "${WORKDIR}"/mason-larobina-luakit-*
-		S=$(pwd)
-		base_src_prepare
-	fi
-}
-
-src_compile() {
-	myconf="PREFIX=/usr DEVELOPMENT_PATHS=0"
-	use luajit && myconf+=" USE_LUAJIT=1"
-
-	if [[ ${PV} != *9999* ]]; then
-		myconf+=" VERSION=${PV}"
-	fi
-
-	emake ${myconf} || die "emake failed"
-}
-
-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-2011.04.13_p1.ebuild b/www-client/luakit/luakit-2011.04.13_p1.ebuild
deleted file mode 100644
index f0ccc1b3d0a9..000000000000
--- a/www-client/luakit/luakit-2011.04.13_p1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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-2011.04.13_p1.ebuild,v 1.3 2012/12/04 11:33:43 wired Exp $
-
-EAPI=3
-
-IUSE="luajit 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://mason-larobina.github.com/luakit/"
-
-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
-	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() {
-	if [[ ${PV} == *9999* ]]; then
-		git_src_prepare
-	else
-		cd "${WORKDIR}"/mason-larobina-luakit-*
-		S=$(pwd)
-		base_src_prepare
-	fi
-}
-
-src_compile() {
-	myconf="PREFIX=/usr DEVELOPMENT_PATHS=0"
-	use luajit && myconf+=" USE_LUAJIT=1"
-
-	if [[ ${PV} != *9999* ]]; then
-		myconf+=" VERSION=${PV}"
-	fi
-
-	emake ${myconf} || die "emake failed"
-}
-
-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-2011.07.22.ebuild b/www-client/luakit/luakit-2011.07.22.ebuild
deleted file mode 100644
index 99915b5a3ade..000000000000
--- a/www-client/luakit/luakit-2011.07.22.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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-2011.07.22.ebuild,v 1.3 2012/12/04 11:33:43 wired Exp $
-
-EAPI=3
-
-IUSE="luajit 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://mason-larobina.github.com/luakit/"
-
-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() {
-	if [[ ${PV} == *9999* ]]; then
-		git_src_prepare
-	else
-		cd "${WORKDIR}"/mason-larobina-luakit-*
-		S=$(pwd)
-		base_src_prepare
-	fi
-}
-
-src_compile() {
-	myconf="PREFIX=/usr DEVELOPMENT_PATHS=0"
-	use luajit && myconf+=" USE_LUAJIT=1"
-
-	if [[ ${PV} != *9999* ]]; then
-		myconf+=" VERSION=${PV}"
-	fi
-
-	emake ${myconf} || die "emake failed"
-}
-
-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-2011.07.22_p1.ebuild b/www-client/luakit/luakit-2011.07.22_p1.ebuild
deleted file mode 100644
index 3eef000e2e44..000000000000
--- a/www-client/luakit/luakit-2011.07.22_p1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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-2011.07.22_p1.ebuild,v 1.3 2012/12/04 11:33:43 wired Exp $
-
-EAPI=3
-
-IUSE="luajit 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://mason-larobina.github.com/luakit/"
-
-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() {
-	if [[ ${PV} == *9999* ]]; then
-		git_src_prepare
-	else
-		cd "${WORKDIR}"/mason-larobina-luakit-*
-		S=$(pwd)
-		base_src_prepare
-	fi
-}
-
-src_compile() {
-	myconf="PREFIX=/usr DEVELOPMENT_PATHS=0"
-	use luajit && myconf+=" USE_LUAJIT=1"
-
-	if [[ ${PV} != *9999* ]]; then
-		myconf+=" VERSION=${PV}"
-	fi
-
-	emake ${myconf} || die "emake failed"
-}
-
-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-2012.03.25.ebuild b/www-client/luakit/luakit-2012.03.25.ebuild
deleted file mode 100644
index cab8cae9f216..000000000000
--- a/www-client/luakit/luakit-2012.03.25.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.2 2012/12/04 11:33:43 wired 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://mason-larobina.github.com/luakit/"
-
-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-2012.09.13_p1.ebuild b/www-client/luakit/luakit-2012.09.13_p1-r1.ebuild
index c06f03f2f67c..600cb65f794b 100644
--- a/www-client/luakit/luakit-2012.09.13_p1.ebuild
+++ b/www-client/luakit/luakit-2012.09.13_p1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-2012.09.13_p1.ebuild,v 1.2 2012/12/04 11:33:43 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-2012.09.13_p1-r1.ebuild,v 1.1 2013/07/15 18:22:05 wired Exp $
 
 EAPI=4
 
@@ -56,7 +56,11 @@ src_prepare() {
 
 src_compile() {
 	myconf="PREFIX=/usr DEVELOPMENT_PATHS=0"
-	use luajit && myconf+=" USE_LUAJIT=1"
+	if use luajit; then
+		myconf+=" USE_LUAJIT=1"
+	else
+		myconf+=" USE_LUAJIT=0"
+	fi
 
 	if [[ ${PV} != *9999* ]]; then
 		myconf+=" VERSION=${PV}"
diff --git a/www-client/luakit/luakit-9999.ebuild b/www-client/luakit/luakit-9999.ebuild
index 03af87769594..95560ee9c0ce 100644
--- a/www-client/luakit/luakit-9999.ebuild
+++ b/www-client/luakit/luakit-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.22 2012/12/04 11:33:43 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-9999.ebuild,v 1.23 2013/07/15 18:22:05 wired Exp $
 
 EAPI=4
 
@@ -59,7 +59,11 @@ src_prepare() {
 
 src_compile() {
 	myconf="PREFIX=/usr DEVELOPMENT_PATHS=0"
-	use luajit && myconf+=" USE_LUAJIT=1"
+	if use luajit; then
+		myconf+=" USE_LUAJIT=1"
+	else
+		myconf+=" USE_LUAJIT=0"
+	fi
 
 	if [[ ${PV} != *9999* ]]; then
 		myconf+=" VERSION=${PV}"
diff --git a/www-client/luakit/metadata.xml b/www-client/luakit/metadata.xml
index e182755d4d2b..92f5b9cf5151 100644
--- a/www-client/luakit/metadata.xml
+++ b/www-client/luakit/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Alex Alexander</name>
 	</maintainer>
 	<use>
-		<flag name="helpers">Optional tools used by luakit</flag>
 		<flag name="luajit">Use the lua just-in-time compiler
 		<pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg>, which
 		should make luakit faster.</flag>