www-apps/cgit: security bump, remove old

5 files changed, 2 insertions, 290 deletions

diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest
index ddbee2b197be..6cb869cfd0ee 100644
--- a/www-apps/cgit/Manifest
+++ b/www-apps/cgit/Manifest
@@ -1,8 +1,2 @@
-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 cgit-0.11.1.tar.xz 92788 SHA256 8cc83ee60a8dd7364dd00db06a5dce3dec607bbc316161faa660af2d56cb377c SHA512 109433cff6779e641cdccb9b64c1a6449d3daecc3b8371068f7fe609f68ea2148d0e6651aaea9c223f858d278e7e4deef7709f721190fc1b4133e346d0bdf81d WHIRLPOOL 1dcd8df5fe5afbe035b6ce42c59ee32e9ebc8f7e35b0c57afa6404f782baa5f7ab6ea4062e24d7a27fb90a624affff310cd8f5053dcdcb504c1c2deb877e24df
-DIST cgit-0.11.2.tar.xz 93556 SHA256 2e126e770693d7296c7eb5eb83b809410aef29870bfe8f54da072a3f4d813e3b SHA512 a29bce6e02c61bb2683ce96f867c3050c03dc9e45b5154507e92a30f9e436f61517eeff0c5b9023727e54a9212bf9bf6692a33e791e7883976a5349ae58c0c72 WHIRLPOOL 175d8f2bba90d52a6b88239973973b3bb14e7e3c1eb2be0e9be0edff910c8055cd6c3e3a020e4f55d00dd21e7b642f0453de809209c43fabac2d574d4daae07f
-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
-DIST git-2.3.1.tar.xz 3609908 SHA256 1acc4b051576143eb41d80f5675476629588c7c5fb4e6a1dc2c4590f47c498b7 SHA512 f113a9e8c7f9879088de6fa6bfbe9363f25eac279d5eb218ea1f5186cd1c45609760f498a5c066196b3a6e15dd931960e94dcdc14685e8ef1c5c72524113c0cf WHIRLPOOL f1c15ded4f4785d244a5242c823fcf8d63d1c3408c1a1696c99926fdbcab76e23e40d3ee8225925e786ce8eae7597a73a7f9f6cd8e5f1ef7d599ac8b254f9951
+DIST cgit-0.12.tar.xz 85152 SHA256 2ee233849335a64529a01cf2b6165ed492e20268e6e2526d7a7529ef1e24a5b7 SHA512 59c9189b5713184b07a7db65c30e26987bd14d76ccb998be52fb2d1cca0ae0d1637391c4d14ab58d29c0b58b586c1294ae865e140eda2a031ca1f175d83abc34 WHIRLPOOL f240e353545786cb90a328d2f3533070ff775cc192a915dd4e6cd9f9d1fa1be304a1412a2a63d45ed036f93ddc310d35c3884b1dfea40ad202a4bc5d69661e64
 DIST git-2.3.2.tar.xz 3613920 SHA256 18eb8462026a55ab34a657282e894bdaad331ea59bfebeba5eb45b27b58cf825 SHA512 57589edcfabb7b852c56808c3ed5a01746af7a8fd53af4f0a4c37ad23da42dd6a8d0d4c54ef8f944870b1fffd16aa1c76392eeb8a0b3ab2f881b58396395e765 WHIRLPOOL e73f4d051c96601e93ea0f66ce6085e42da9c7f315ff5c2e4a5ac28115372a154c865d7b56e964943e0d52a4c6d681a3b93446ee516b6e0af6c27c8c38e3b40e
diff --git a/www-apps/cgit/cgit-0.10.1.ebuild b/www-apps/cgit/cgit-0.10.1.ebuild
deleted file mode 100644
index d343254b598e..000000000000
--- a/www-apps/cgit/cgit-0.10.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-inherit webapp eutils multilib user toolchain-funcs
-
-[[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
-
-GIT_V="1.9.0"
-
-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."
-}
diff --git a/www-apps/cgit/cgit-0.10.2.ebuild b/www-apps/cgit/cgit-0.10.2.ebuild
deleted file mode 100644
index d5bd0e581baa..000000000000
--- a/www-apps/cgit/cgit-0.10.2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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."
-}
diff --git a/www-apps/cgit/cgit-0.11.1-r1.ebuild b/www-apps/cgit/cgit-0.11.1-r1.ebuild
deleted file mode 100644
index 69ff8b226fd9..000000000000
--- a/www-apps/cgit/cgit-0.11.1-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WEBAPP_MANUAL_SLOT="yes"
-
-inherit webapp eutils multilib user toolchain-funcs
-
-[[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
-
-GIT_V="2.3.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."
-}
diff --git a/www-apps/cgit/cgit-0.11.2.ebuild b/www-apps/cgit/cgit-0.12.ebuild
index 2fcf4a7f3a6c..1d65eff565c1 100644
--- a/www-apps/cgit/cgit-0.11.2.ebuild
+++ b/www-apps/cgit/cgit-0.12.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://kernel/software/scm/git/git-${GIT_V}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc +highlight +lua +jit"
 
 RDEPEND="