Version bump. Fixes bug #517376.

Package-Manager: portage-2.2.15/cvs/Linux x86_64

3 files changed, 105 insertions, 15 deletions

diff --git a/www-apps/cgit/ChangeLog b/www-apps/cgit/ChangeLog
index fb7d189ca17b..ee83105d3654 100644
--- a/www-apps/cgit/ChangeLog
+++ b/www-apps/cgit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/cgit
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/ChangeLog,v 1.28 2014/07/18 12:41:14 zlogene Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/ChangeLog,v 1.29 2015/01/20 16:03:47 mrueg Exp $
+
+*cgit-0.10.2 (20 Jan 2015)
+
+  20 Jan 2015; Manuel Rüger <mrueg@gentoo.org> +cgit-0.10.2.ebuild:
+  Version bump. Fixes bug #517376.
 
   18 Jul 2014; Mikle Kolyada <zlogene@gentoo.org> cgit-0.10.1.ebuild:
   x86 stable wrt bug #503004
diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest
index ba72b2b9a48d..6a98f319a960 100644
--- a/www-apps/cgit/Manifest
+++ b/www-apps/cgit/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-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.1.tar.xz 92156 SHA256 839ea3e330259b4b332a346007244f4b74d62c336352c272e4e9b8abd30d912d SHA512 3a6afe2eb47ed718b4c0661ffbd0905118b61f6f2f10723022a9fe7d2e4b2742fcc20fd2a5ecb68de6a22b55d1c9b679d4b7305f6d622d64fa4be66117a9ad02 WHIRLPOOL 0a0c79268e9788079a4dccac75e797deff37b3b562d9fcee7d82d0a7270cddfca6862852d2a3bbcdbd09444314bd7197a6833a71de564c50d08996dd1856f1b6
+DIST cgit-0.10.2.tar.xz 92216 SHA256 94598e6582752659598e8086d3e2b2a2081df89ac8397460f507b15e71264c8d SHA512 5f4a0b65a9a802f5a464224ad4773ce6c926d0e61bb53baa4270f923570d92674b2b1b0669a74eb0e25d2b5e7fc7f637b37037c2371ebd7a3437ce28d78d650f WHIRLPOOL 105a7232d26ed2f40d3920ab56233331766dcb12b42ff72b56466f03e4c81eb3a091e6474144c226c787e3736e0f8b27af1afc57ca5e05694249332eaf59e720
 DIST git-1.9.0.tar.xz 3381748 SHA256 38fd51f71acd8dfcedce2a231875a4836565c2da5567199e5f4b081dfc37f681 SHA512 06069d1c9e114823c1423398f0313b663b013362991e0da51816970ec73c34331fc4faa6d2d7ae19c855a641f08116a2632374c795198d7b95c7ffc41bc6f317 WHIRLPOOL 98ae23ca304aec206163b2bcecf7d7d529acf1d9c24765dad5b7f19f87cb59d8d41f282e907f9ba6633723beecd7e4fe8f9459bf92d8db9747f76c493a0814d9
+DIST git-2.0.1.tar.xz 3433780 SHA256 ab12a103523b430d8d3e26ac2e05e759bdb1349f10e13bba48bed98f45c6d4df SHA512 51307c395c012f65842a53850dbcb5bde90dfee8ea731eab9bc099b3b284254fdbe86df08ab6fcae7b25f82edd87e3edb1fee4e5af1d2a01f2bfdfb7306d6107 WHIRLPOOL efd26778248472a742bae5208476a101aed5aaf0d81d7c924a2e09c89e7e39dbec9fab34c77f1d35405ae9d7a30be6a4c1757d12bb7c45a1827ec2dbae9afd6d
 EBUILD cgit-0.10.1.ebuild 2349 SHA256 21b2bcf26d54eb89f25d219765981cf0bb1338d5e1fe45ed807aa74aa81fa955 SHA512 a739ddb394c18a61341fae5288ee012cc474c91714e09130afdbcdbd63aca10930dfef5cdc1b0b6b480b761a8d5054b10098bc8727c823c7ba60d4ec8ad382d8 WHIRLPOOL 775f4920d205ffce89740ab4b8428f620bc86b1ac007256e4d8122789a335cf54eb83162414f6e5a22d195525b71eb72f7b5c7c63307d6fd003049a55a1a3370
+EBUILD cgit-0.10.2.ebuild 2347 SHA256 8f9906618d408763648a97d0fb5f7671a1461165f2c30e695eadac0f126f329a SHA512 dba2ea931f635fce9e2535403ebf05f7c6926a4b67d048effdee8e4da556736e797c52ee7e3d30f0e9abc145a6af7e5edfb1f81db8e0fce26bcb73588ce18cf7 WHIRLPOOL e1e69d37333891359c7b78c44b74a9f457b78d01a8bd17f119405061866c641a72a20b6b5b79046a1216478e2f49fd8be9473b7dccf4e716f77ac689525ef244
 EBUILD cgit-9999.ebuild 2267 SHA256 f2da6f01b3b890a336f3df479fd817afb0d9329faa51ef3cb412784ed09a11c8 SHA512 aef0619b7c81f654027296b33074625751bfe79a5d60a58e61569ae873cae810139d41d9dc2f13fe28c33c313f76fce2c95e8774f9809eda3e14a4113687d00e WHIRLPOOL 8bfefc5bde3dd14c14ccaabaf0e6b707b8b3ab08d4024eca9870586ff7e4d33f657ea510bce1b42851f6cd3bc47172f5c9d694578b819f57151b0698434a3c14
-MISC ChangeLog 4884 SHA256 8d2dd74be0511b66e177eef270e89ecdaf3fc940fd0ff9daed87a4df8e0b1a75 SHA512 ea9f2d6fa091cbff2e12dc46bed4902e6153bcce0877695e03e888af16ebdddcf902bca71fbd66d0b7cfc33f957fce7f9d0324235853637ffd87a3e5a28b40e8 WHIRLPOOL a80689be479aa0ca737b10192d836b4b9ed04214c7ee33440f33975d78128c0298f69e6c7b08cd3b85a233865fb98844bf5ff74dea04f7973a66f9181f45f056
+MISC ChangeLog 5015 SHA256 ce9beba8dce1bb0a498225e4359adcf0d3fb6f0411f025bdaff8449e5dbbfe36 SHA512 50bd31393b177e9c8fb2f4c9971a364db7f136b9fcdf545ca0eacef77ee20a3fd450717878665b66f9602954fd4119e49222881c20fb837b3956e93b77ba2214 WHIRLPOOL 92b84311348a0746c13b309a74670c62526092c8c763e68b87aed017804b5e6e154d138ed4394e33d5a74bbf39d60bba59fc6813753c287600f94e5f1ba83d13
 MISC metadata.xml 701 SHA256 9733783a1b6a13076d18dd4bd78e5d5c4d3ac45f13440e6f57c3deeb3f3bf603 SHA512 47c89e2c157145880745246095ccff39fbe445314c641c0c3a46cb2152220ba2785dded689da586e559f50271e60a6a4603768b0c8c6afef82432433b7222e46 WHIRLPOOL 920c0524fc4ad28d1c8c32c5098ed2b322713b9b158cf1903abcfe17b17adce5e5e65a422ede873bba0d915a9e46b88fdf60782ed543ec020d5c61412806946c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iJwEAQEIAAYFAlPJFygACgkQG9wOWsQutdYJGQP/Z1N2+mg4Kahg7cqloEyXwVz/
-ATphyqR4vI0NbT1/A+jEZ8DUEto4BlnsZTlasvi3ivvnjxiH6b/KC1XXa33F1gN7
-5CEy3CGDL2j5MpVr8x0rE/0cVGYuMKSylLKlJbxr5Dq9CXajSq2QjXX5oMJ2MnGQ
-Vc5c7yfM5ukxsIM+GGY=
-=IlZx
------END PGP SIGNATURE-----
diff --git a/www-apps/cgit/cgit-0.10.2.ebuild b/www-apps/cgit/cgit-0.10.2.ebuild
new file mode 100644
index 000000000000..1d49e10c70a7
--- /dev/null
+++ b/www-apps/cgit/cgit-0.10.2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/cgit-0.10.2.ebuild,v 1.1 2015/01/20 16:03:47 mrueg Exp $
+
+EAPI=5
+
+WEBAPP_MANUAL_SLOT="yes"
+
+inherit webapp eutils multilib user toolchain-funcs
+
+[[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
+
+GIT_V="2.0.1"
+
+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.xz
+	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:0
+	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_PKGCONFIG = luajit" >> cgit.conf
+		else
+			echo "LUA_PKGCONFIG = lua" >> cgit.conf
+		fi
+	else
+		echo "NO_LUA = 1" >> cgit.conf
+	fi
+}
+
+src_compile() {
+	emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+	use doc && emake V=1 doc-man
+}
+
+src_install() {
+	webapp_src_preinst
+
+	emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" 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."
+}