version bump

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

3 files changed, 94 insertions, 22 deletions

diff --git a/www-client/luakit/ChangeLog b/www-client/luakit/ChangeLog
index 087f36d1b5b4..c91166534e34 100644
--- a/www-client/luakit/ChangeLog
+++ b/www-client/luakit/ChangeLog
@@ -1,6 +1,11 @@
 # 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.24 2011/06/30 17:07:49 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/ChangeLog,v 1.25 2011/07/22 14:13:08 wired Exp $
+
+*luakit-2011.07.22 (22 Jul 2011)
+
+  22 Jul 2011; Alex Alexander <wired@gentoo.org> +luakit-2011.07.22.ebuild:
+  version bump
 
   30 Jun 2011; Alex Alexander <wired@gentoo.org> luakit-9999.ebuild:
   added new dependency, libunique. bug #372221
diff --git a/www-client/luakit/Manifest b/www-client/luakit/Manifest
index dc5916f02a9d..cec8c2b94233 100644
--- a/www-client/luakit/Manifest
+++ b/www-client/luakit/Manifest
@@ -1,30 +1,12 @@
------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
 EBUILD luakit-2010.12.25_p2.ebuild 1839 RMD160 3588edcdc277dd0459869e981978ff346c4759e2 SHA1 baa1ed66a575bf827e65e647be49d45ba4902c1b SHA256 4df693f42bc094b19ec14c673091948a324bf248372b5316bb46fef301fc3e93
 EBUILD luakit-2011.04.13.ebuild 1864 RMD160 3ec7a66f4465379e888108561ae4af0973b4f715 SHA1 adddfa35bc362759287135a683228055c4e39e89 SHA256 4149e6aab7a15aa4a176fdfa6ad9996926faa3bc090c551d4da5ef7d6bdd6b75
 EBUILD luakit-2011.04.13_p1.ebuild 1867 RMD160 0f4efdd0474fee76bd54afe2e265656e5fe61bdc SHA1 c6d01472ff77ac574ecf88d9ac6308f257377e5c SHA256 0e0803759a507b03155198fe5f74d71c199965383061fc3c2b8a31efa03b59eb
+EBUILD luakit-2011.07.22.ebuild 1886 RMD160 4de93f99b52858cd0320a0f47cb3fdcb51e75edb SHA1 b1123a3c20e0c6fbc054f3b157bb3c227f66709a SHA256 433686d452599e5d079730f5afb7d073f3e8d9e5fc10d2ee8fc0c79560b53aaf
 EBUILD luakit-9999.ebuild 1881 RMD160 ef3e571e78f7ff0e5ab3388f0ad2be7b6c76d834 SHA1 25cc50baf9ec807f70e3b1af69a68636ccea6761 SHA256 c4eabd89d5fd3cfa83864b599d8906248be02cd21e177eb434f03fdb3e187594
-MISC ChangeLog 3960 RMD160 3798df5b721e4ee4cdc4a7faa1cd075c8d86eb4b SHA1 0eb17694ae743c2e5d4f42aa585761a1705bea0a SHA256 c0b78e0fd7f70b47017b7a511fdccef41d2517c7700bcef134083ea538afe8ad
+MISC ChangeLog 4086 RMD160 49708d0a74126b8185584f2ce50f11c94089879d SHA1 50a7d9b85bea9ca5c5c5185103a04853cdd0f377 SHA256 b3a21bd48eff911752b08e1c12179fbaf95d0b1b28dd766e37128839268b1e43
 MISC metadata.xml 492 RMD160 88e19f4dabc626fe77d9011f96f5bec0cbf29b43 SHA1 7a7f338de61d3e54565f26551550d5d9c9741113 SHA256 643674d91acf37c1b89c1fd2425e722e808ca626bf9f392708830a3433b5a487
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJODK1wAAoJEDZF8K7rm0r6EbQP/1b7k/pDtk513luzLrQPF5yk
-rUDn7Pj3o1t747DlV/rCRw8qLXp2xlQ17NrJAsH0Zunou3SRvYi8sSCHg0/oipMt
-gDvYHN6ieIV5MKsi2EuFvGv9+J/2M/a0KZX3M6PM9wrBFZVRaHiivD+FXbxftnNX
-UtquDhLPc9bRqsIkawH0HDvTt38uFvhh9mQJ2MMdjVpSps6+sl4zJAIt+jiSM4df
-+7EbRhQFy+Zqcte8F7Fs2vvtOzn4zztWYb/XVPM9UL7DPbeFADjGC84OVgzWiuoK
-4mXkasDvdAHFnw910NdWhx+Q2DfI3iBKhzX0Qjzj6qCyr0npY/Zva5SaJVm9trdB
-sJZw7SX80wD3yA3lF0T+9FTtCuYHMOtBh2eDrKlJFZbVhFq9/NfOaY7ReFmxgtIS
-FMSuSbkNbVUbqdANSONKAPrLPRmrWeBB9+cSvXIyTgPDgvL73CkvhnIa0xouqaEY
-CbDStmqmK+0CA90k5TkREIOxwGHfUyFsCjzVZcwv4oatRNADvlbwfEtbQ+kisC+P
-e0ZIKVd8GkRPs0oZOUtPKxawFvWYLXqSt6Frv+Usc9zRp3ejyWURB+K2jw1zMJig
-lEXluTrS68pDThNXijrsy9HF806YbFlNJ4jEKpK2cNinLxkEo5GGexWRyTg5YrWK
-aCnnNwHDn5Sm9JXVPc7L
-=dqNA
------END PGP SIGNATURE-----
diff --git a/www-client/luakit/luakit-2011.07.22.ebuild b/www-client/luakit/luakit-2011.07.22.ebuild
new file mode 100644
index 000000000000..10eac448b60b
--- /dev/null
+++ b/www-client/luakit/luakit-2011.07.22.ebuild
@@ -0,0 +1,85 @@
+# 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-2011.07.22.ebuild,v 1.1 2011/07/22 14:13:08 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://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="
+	dev-util/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
+}