Version bump.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA5DE03AE

5 files changed, 152 insertions, 34 deletions

diff --git a/www-apps/cgit/ChangeLog b/www-apps/cgit/ChangeLog
index 2c3cdd7685df..e6c2f466afb2 100644
--- a/www-apps/cgit/ChangeLog
+++ b/www-apps/cgit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/cgit
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/ChangeLog,v 1.18 2013/10/13 10:20:55 tomwij Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/ChangeLog,v 1.19 2014/01/21 19:49:03 zx2c4 Exp $
+
+*cgit-0.10 (21 Jan 2014)
+
+  21 Jan 2014; Jason A. Donenfeld <zx2c4@gentoo.org> +cgit-0.10.ebuild,
+  cgit-9999.ebuild, metadata.xml:
+  Version bump.
 
   13 Oct 2013; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
   Updated Nikoli's e-mail address for easier automatic assignment.
diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest
index 3590ab5f4488..1addfb89aa7c 100644
--- a/www-apps/cgit/Manifest
+++ b/www-apps/cgit/Manifest
@@ -3,21 +3,29 @@ Hash: SHA256
 
 AUX cgitrc 2632 SHA256 b2870479f67b1e357283cec08e848aec5ab410514fc14883f325c0d833efe626 SHA512 e54745599d14b595d83aa179dfcaa704d883c3513c77ff2c4eeb8d98a4c7955d9dd94b595b6a60382e8f9a3eb5460886395f858a49e888a8004a535efb759281 WHIRLPOOL 01c803a9798c6435767affbce855832aecc54a8503b6a8af270d58aab1ed7ac4c3df293f9989854a9f4cfaa4d54ea33ddb918c07cb17edcbcf28a90c9f83c763
 AUX postinstall-en.txt 1844 SHA256 2bfadbe531386c9f2b9fd6b346c9542dd367f86f1ffc1be1a43d9aa182a0118b SHA512 40848a103f12cebe1572b51640abf8bb8c7cab58b6bcb95493498af61ee743abb987b59b6e5d6d9ff4eec5ba7d21cf2e5173ddbf4c51cd4210fdfa430da3aadc WHIRLPOOL d008d1fd56bd5410fe705cd38697dc66bf9e273052aea16a1ba2eaf91b0c2a400ac1d12abc9884cbce7481c5b2e0cab8a15c29489f8f97092f3655637e9b8f19
+DIST cgit-0.10.tar.xz 91664 SHA256 90c4227b7889bb268825b36e8a53cb7695895a6d63523b6ad34a670ad4e6de7a SHA512 c00c5a9443774a58a64b0133ab1a7d9771ddf9cee53e09492ff87e79a113593ec918bdb41e60b5e12e2c455575c031d83d056fb805bbdc2c2b158178ab4f3b57 WHIRLPOOL 9439a316ebf55d9be00bbd0247714ab32610145d7b75c1618b3222517cc06b0e201f61bcc499fce9abc867052a3575f7ad20f943e1adb3cba72c60cde08f32b4
 DIST cgit-0.9.2.tar.xz 82668 SHA256 08c042004a7d91b1a4b0ff88dda6f94a916b7a231498c3c45056eb93033e2760 SHA512 05a755ea1ccf5b10dae8223a25b93166b854b4522c02e05c79d6c6dbc10a181e4fab282b9c918a56732a5d0a026aaedf197e37af1636bba79ade221598c4477e WHIRLPOOL 5c382fc6344a0f9652e6f8fd54585ca75770c60bf238910b10a6a318339c349ed588fa8ce77acfc669de7111c96bd549ceea5f2acd7bad920d27a56c67f35f44
-DIST git-1.7.4.tar.bz2 2703735 SHA256 8e260b9e5dfb46a35f26e3db450c2dabb4d1df254bfb2820779945a1ecbcef51 SHA512 3f7c72b019d17888d6b197c799fadf57099a42401586fb0f01a3d518608f46db25b87b88a96d0438cc770bd0232ee856aa49283a95430d391eefd737b67ead6e WHIRLPOOL 48fef9436578721e8a22948edd06137238fdbca87d191cb4d52dac7025db15e2ba52ec994323e7e996a1cffd91ccbb63cc002083a3b4bfce9017985c8a9bdcb3
 DIST git-1.8.3.tar.bz2 3617425 SHA256 690b9525a76fdda688aea50ab3884de2dc542e4fd2a34ea74aea5fdae4800e9d SHA512 fd4de22bd77f27a5391411c34d31565f7ee31f5bcf8b980209d297ce6c174193fce753aeb97eae8c1a8a73ddb21e4b6d6e5b24f6601b917bffe64148d281ddd9 WHIRLPOOL 962968d5503d0907d5c30a6d52fc7e505e1809d997816dc2715804fdd9a52e73017f5637d8e4eef4655280e9e24b6cec332d5c43f4be185a72990f19acc9cb2c
+DIST git-1.8.5.tar.bz2 3809008 SHA256 0ee7aa4e99d0bdde120c3e57b1ee8b5e8b79babe0d8a9a1b1934e06f24ea8f36 SHA512 c57e64b8ca6a2b612400f065e2d55e47b21041bbd7fb3da3f5cbc01fdbf24caff366c766fe8df99718823fa10fc8713351b0acdcefa543187ef2d7dc963a4ac6 WHIRLPOOL 39224750350d8f5fb8dd2ea637a459a469c60367bef1dc2c12a4e4e674bccd227412923a2b5a3b1a104b753b2c6b63242969e91dc0d1191e7bbc0f5dab781284
+EBUILD cgit-0.10.ebuild 2181 SHA256 45be6c7246b1e6a0ea30c91242b2d2ba6db65f0b13778d6a3a2dc1ba97852d81 SHA512 db70bd6efcb95b45bd49405ed5c0609f29440e924cb3f90c29bdcffbca348d62975e69d35daefb1a6f1319f25b4cb83077791cd63d8d7d6c9284329d469aa764 WHIRLPOOL 6bf2faf093a8c53ef95e5554bce78b94825978a6be6c60a05a388d977872e09cd8a850878020faf8eb7ee1377271f95b38131d10857de14dda4cdc44d9409b5e
 EBUILD cgit-0.9.2.ebuild 1873 SHA256 0092e900cb03ecf77d713ddf2a261070c105b7c0dd0929813ebdcc3749bcc79d SHA512 f35c6c9e14feb1e8f40316b4ddb9e85164141ff5203e81e2b20cab4e95b4b077292bf9e79e089df295106201519fcc0240cd9b1433a56d2708a97ad99326a846 WHIRLPOOL 3bbd9b5e45cae678ccd1939255f24000bcfd37810a5f35275cefb76eb942121eee5268ae70025b8ec84ff7b66dd565e90d625f5722df56ada8b4b3f887e37003
-EBUILD cgit-9999.ebuild 1828 SHA256 b32c55e70be9a5277f147fc2f1d8a81f62bac5f392e9a4169873ad7355305522 SHA512 5bf578849252af80cf6c1eb353e0bfbd955ccb5937de2081ff57d801fdc64bba8104a32d94589cb6abdcd2bd54c3c0f70ac44408c5e08928e857b45d05aa55bb WHIRLPOOL 2f4e30a5344730af0508f3389340972f98ff5deff7d170da8cd930a52f68bd96fad3fc9fd33258965af6c84031d2c7544516778562b6ced5657e1fb8a417d42e
-MISC ChangeLog 3587 SHA256 9e044da49f2c54beeee2b6e2edd2e2b3ac375be196d1ae7572fe7eda131dc9a8 SHA512 5f3a8285ccf1513dbe40cfc3d7cc0396ba08a9e46dcbfe9cf65a99b506e7de1504f3e630b112893e3035f08afac73a9ea8cfe92f45883606b8a8b86f0ba1054d WHIRLPOOL b4400dbd37992e672b14158b795bf550f6715b704020bd9e9a5a316fff5655278cc45ace02c04b4a93ca6fafa6453979c5469331f132c25388fbf17fac0e7ff5
-MISC metadata.xml 549 SHA256 004b635677f4c1bc48ba2003f926d77de66570b9266f370ba819b9ff3707c9dc SHA512 288e08ecee9430259665c7d0ba894f4b3b8e60d0062b4c330aef54caf7db68aef7c678a0f7455dcbb6318bd1a32397a7063a4404e995981977e5e6653f07bbeb WHIRLPOOL 008784e837b88315b4c65e7c6af4d4754e788b3022b16f9f6db1646a4c29094c93dc74e41239ae5692616306b17d2b5f45337a390d77b935c614dfb61856dc31
+EBUILD cgit-9999.ebuild 2111 SHA256 fa9e771ae208d005087c36e9eadc63eff8c90eb281119760795679134f0111ad SHA512 c3c00ad8e9b6e813b850a365d65743af7488d214548265907f1e457a7a8f9e3e0317e7c775cb1e7df5870db131305614e1994d4ff70f6775efdde561806f47f4 WHIRLPOOL c3ebbff9df100a09d463733eb5727718b2ea206bf728bc83657ae7b6cadb167e4fadfc41e0d1c9f374d3b20263981f7e92678652473caefb1763affd65ad7daa
+MISC ChangeLog 3735 SHA256 5b13c4f635f80bb12cee305c17c6a92cc4e27072ec73b8fb73dc0b50dc43f1e0 SHA512 669a0ea1244cb5e51964c2d880bc8b26d884fb6efefad4b9c4e5c3532b552dca6e70ffaff2cea344807f15542354d244392c1b19638aed08eaf6a41e38897a87 WHIRLPOOL 2ac53940e70e696077a408c69d5e678411f5fdabdc8df8900e352ddf19aae5aba26d104bcd7454c328bc614429833bab49eba6b6897caaa1f8a6988e47a27539
+MISC metadata.xml 701 SHA256 9733783a1b6a13076d18dd4bd78e5d5c4d3ac45f13440e6f57c3deeb3f3bf603 SHA512 47c89e2c157145880745246095ccff39fbe445314c641c0c3a46cb2152220ba2785dded689da586e559f50271e60a6a4603768b0c8c6afef82432433b7222e46 WHIRLPOOL 920c0524fc4ad28d1c8c32c5098ed2b322713b9b158cf1903abcfe17b17adce5e5e65a422ede873bba0d915a9e46b88fdf60782ed543ec020d5c61412806946c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSWnQNAAoJEJWyH81tNOV9SjgH/35qf+0bUdVGqHDde30MzL/F
-mMdZo433yje5rg2KL6EsiIGkEbGqTpKsE0T2fgMPQ7q4/WFZ0gOnjR+p/T47BoVV
-QZ6EA8n5GOBj1zeX0is5by1TbIL6YcopBuI6Ls8Xm4FqvaE45rZBqOI9hVf07Bo4
-JnTOY770s9OrV5fXn+g7KmHAQ8Onx6lueo8YrFZtse+HxbpEiGRCkuxvq7/U+1jl
-UFbTUIyiutskawEF7FivfjeSYc4eUzKFa5ML7vUwOVUAOfajXeK6Jd+a1+uK4TmM
-TDLdCeKBOvFZgYOrPyyMcfWW9kzBwaE0eOz8JqlZHarEX55uG6/bts3auxGj6Z8=
-=gGg5
+iQIcBAEBCAAGBQJS3s8tAAoJEEn8cBKl3gOu9RoQAKtyKs1PN9KtjKngf4xR4uog
+DLjfWMEOGs3DaqrxiI572736IrlZdIpAf3rpwfSls2uoOU8NoxmEg+70qwaekPLZ
+suRxjMVrU9PMik+0BKYwqZtwJnMVMTE5sfORXlJd6D5h+mJw1i4cDdaeGbLYOA3d
+3tb2x6QiHPHX33HlEg9w0DjeCvJLj/gTEzSdep0esXABD0mYNjVzBy1mg6hvA5T3
+N8NYWGDo2ETWllJejcxhbs8H+sM3HZ6kDkqdn2v+iHURT3ZXvgRAnlUgUy3sXmeE
+GLdUDbwYKBWpdZsFbGWBg7rmbfUVaim7fTJzRHdvzVttVKZLDE46tq7uWkUJaW1g
+vwSF6OZ62bhOFlHJewxNBdWgs2ANGxy8sgRw4nhx4WHHAO3/YTyk1J9MYV2bXUhj
+NwavIQ7E+/CXVSsOtEmjF3/Ez7DIAFURJ/4oIaw7FMBWtgGpZ+OODk/jl1UlHN98
+Wsitsc6qs+puB+uo6RxYbZIo2+XTdaQybdTVV8vU5RiS/cn+iyyfY4OYhlDlrXGf
+bzjx1FEx37abENxE9VSFSYOgu8co6HA2PyYyqkg3WiGRIX3TQJ3ObuY2gegsUc6a
+epTSRSaoBT3heHZmo54skpmSIX3Z9ZsyIYBCP8mJ3G8t9FnMRVmtHEkyUT8zgJJC
+3D4wSCoDBEzg69TZo9xf
+=bUde
 -----END PGP SIGNATURE-----
diff --git a/www-apps/cgit/cgit-0.10.ebuild b/www-apps/cgit/cgit-0.10.ebuild
new file mode 100644
index 000000000000..81f38d94d10b
--- /dev/null
+++ b/www-apps/cgit/cgit-0.10.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/cgit-0.10.ebuild,v 1.1 2014/01/21 19:49:03 zx2c4 Exp $
+
+EAPI="4"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+inherit webapp eutils multilib user
+
+[[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
+
+GIT_V="1.8.5"
+
+DESCRIPTION="a fast web-interface for git repositories"
+HOMEPAGE="http://git.zx2c4.com/cgit/about"
+SRC_URI="mirror://kernel/software/scm/git/git-${GIT_V}.tar.bz2
+	http://git.zx2c4.com/cgit/snapshot/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +highlight +lua +jit"
+
+RDEPEND="
+	dev-vcs/git
+	sys-libs/zlib
+	dev-libs/openssl
+	virtual/httpd-cgi
+	highlight? ( || ( dev-python/pygments app-text/highlight ) )
+	lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua ) )
+"
+# ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
+DEPEND="${RDEPEND}
+	!<www-apps/cgit-0.8.3.3
+	doc? ( app-text/docbook-xsl-stylesheets
+		>=app-text/asciidoc-8.5.1 )
+"
+
+pkg_setup() {
+	webapp_pkg_setup
+	enewuser "${PN}"
+}
+
+src_prepare() {
+	rmdir git || die
+	mv "${WORKDIR}"/git-"${GIT_V}" git || die
+
+	echo "prefix = ${EPREFIX}/usr" >> cgit.conf
+	echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf
+	echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf
+	echo "CGIT_DATA_PATH = ${MY_HTDOCSDIR}" >> cgit.conf
+	echo "CACHE_ROOT = ${CGIT_CACHEDIR}" >> cgit.conf
+	echo "DESTDIR = ${D}" >> cgit.conf
+	if use lua; then
+		if use jit; then
+			echo "LUA_IMPLEMENTATION = JIT" >> cgit.conf
+		else
+			echo "LUA_IMPLEMENTATION = VANILLA" >> cgit.conf
+		fi
+	else
+		echo "NO_LUA = 1" >> cgit.conf
+	fi
+}
+
+src_compile() {
+	emake
+	use doc && emake doc-man
+}
+
+src_install() {
+	webapp_src_preinst
+
+	emake install
+
+	insinto /etc
+	doins "${FILESDIR}"/cgitrc
+
+	dodoc README
+	use doc && doman cgitrc.5
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+
+	keepdir "${CGIT_CACHEDIR}"
+	fowners ${PN}:${PN} "${CGIT_CACHEDIR}"
+	fperms 700 "${CGIT_CACHEDIR}"
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	ewarn "If you intend to run cgit using web server's user"
+	ewarn "you should change ${CGIT_CACHEDIR} permissions."
+}
diff --git a/www-apps/cgit/cgit-9999.ebuild b/www-apps/cgit/cgit-9999.ebuild
index cb29340e3ca7..5e2ca3bff908 100644
--- a/www-apps/cgit/cgit-9999.ebuild
+++ b/www-apps/cgit/cgit-9999.ebuild
@@ -1,33 +1,34 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/cgit-9999.ebuild,v 1.6 2012/11/15 01:14:11 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/cgit-9999.ebuild,v 1.7 2014/01/21 19:49:03 zx2c4 Exp $
 
 EAPI="4"
 
 WEBAPP_MANUAL_SLOT="yes"
 
-inherit webapp multilib user git-2
+inherit webapp eutils multilib user git-2
 
 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
 
-GIT_V="1.7.4"
+GIT_V="1.8.5"
 
 DESCRIPTION="a fast web-interface for git repositories"
-HOMEPAGE="http://git.zx2c4.com/cgit/about/"
-SRC_URI="mirror://kernel/software/scm/git/git-${GIT_V}.tar.bz2"
-EGIT_REPO_URI="http://git.zx2c4.com/cgit"
+HOMEPAGE="http://git.zx2c4.com/cgit/about"
+SRC_URI=""
+EGIT_REPO_URI="git://git.zx2c4.com/cgit"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc highlight"
+IUSE="doc +highlight +lua +jit"
 
 RDEPEND="
 	dev-vcs/git
 	sys-libs/zlib
 	dev-libs/openssl
 	virtual/httpd-cgi
-	highlight? ( app-text/highlight )
+	highlight? ( || ( dev-python/pygments app-text/highlight ) )
+	lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua ) )
 "
 # ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
 DEPEND="${RDEPEND}
@@ -42,12 +43,24 @@ pkg_setup() {
 }
 
 src_prepare() {
-	rmdir git || die
-	mv "${WORKDIR}"/git-"${GIT_V}" git || die
-
-	sed -i \
-		-e "/^CACHE_ROOT =/s:/var/cache/cgit:${CGIT_CACHEDIR}:" \
-		Makefile || die
+	git submodule init || die
+	git submodule update || die
+
+	echo "prefix = ${EPREFIX}/usr" >> cgit.conf
+	echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf
+	echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf
+	echo "CGIT_DATA_PATH = ${MY_HTDOCSDIR}" >> cgit.conf
+	echo "CACHE_ROOT = ${CGIT_CACHEDIR}" >> cgit.conf
+	echo "DESTDIR = ${D}" >> cgit.conf
+	if use lua; then
+		if use jit; then
+			echo "LUA_IMPLEMENTATION = JIT" >> cgit.conf
+		else
+			echo "LUA_IMPLEMENTATION = VANILLA" >> cgit.conf
+		fi
+	else
+		echo "NO_LUA = 1" >> cgit.conf
+	fi
 }
 
 src_compile() {
@@ -58,12 +71,7 @@ src_compile() {
 src_install() {
 	webapp_src_preinst
 
-	emake \
-		prefix="${EPREFIX}"/usr \
-		libdir="${EPREFIX}"/usr/$(get_libdir) \
-		CGIT_SCRIPT_PATH="${MY_CGIBINDIR}" \
-		CGIT_DATA_PATH="${MY_HTDOCSDIR}" \
-		DESTDIR="${D}" install
+	emake install
 
 	insinto /etc
 	doins "${FILESDIR}"/cgitrc
diff --git a/www-apps/cgit/metadata.xml b/www-apps/cgit/metadata.xml
index 82ae1fb6196a..28667272885c 100644
--- a/www-apps/cgit/metadata.xml
+++ b/www-apps/cgit/metadata.xml
@@ -15,6 +15,8 @@
 	</longdescription>
 	<use>
 		<flag name="highlight">Enable source code highlighting</flag>
+		<flag name="lua">Enable support for Lua scripting</flag>
+		<flag name="jit">If the lua flag is enabled, jit uses LuaJIT instead of vanilla Lua</flag>
 	</use>
 </pkgmetadata>