Remove old version and stabilize latest.

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

4 files changed, 22 insertions, 107 deletions

diff --git a/www-apps/cgit/ChangeLog b/www-apps/cgit/ChangeLog
index 7acb1d55670e..c3535e7c5441 100644
--- a/www-apps/cgit/ChangeLog
+++ b/www-apps/cgit/ChangeLog
@@ -1,6 +1,10 @@
 # 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.21 2014/01/22 14:43:25 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/ChangeLog,v 1.22 2014/02/05 16:32:50 zx2c4 Exp $
+
+  05 Feb 2014; Jason A. Donenfeld <zx2c4@gentoo.org> -cgit-0.9.2.ebuild,
+  cgit-0.10.ebuild:
+  Remove old version and stabilize latest.
 
   22 Jan 2014; Jason A. Donenfeld <zx2c4@gentoo.org> cgit-9999.ebuild:
   Update new build options for latest git head.
diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest
index 32e368e554fc..70854e6c7aa2 100644
--- a/www-apps/cgit/Manifest
+++ b/www-apps/cgit/Manifest
@@ -4,28 +4,25 @@ 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.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-0.10.ebuild 2179 SHA256 41ff4ac56b41969468b884861a95de072752a86179f1dbfe56f883635daebf14 SHA512 32ec7e17769cc5cb6a7973096fbd12e8009e9f55b9f4797c0df12b8c59b26bd6a218f52d40d52d4394854674d7236867f46ca2af40b883b27fcbc0169a47f1d1 WHIRLPOOL 4dedcdc04128bc6c792ac17f2c1a01e7cdbac271c41853a7f21ebc7238fad6e4f53f49140ec99ceca81e6cf40a116525efaf151986330d9adc55dadea94ac7e1
 EBUILD cgit-9999.ebuild 2085 SHA256 9bd46bcf1e8db284b8e27e2e683f1acef53554f6715d34922721fab373512c4b SHA512 5484b2f0d17a2358485c2a21ffc39f52d6ef9bd444b5ca73d4bbe36da56c9c21d7065d7b1b14d59c23958914b598941b14224ecf138f54379591a4c32f9e8f41 WHIRLPOOL fedfb2e735b39d02d85259b228392a311b73bbc83bf5fa6d2296341e067494ec56a5098f0e3d5314d5c319cd49888c9d99bec97b326ef5935e67d5698f2e0b36
-MISC ChangeLog 3976 SHA256 d6585de88e1a523d2e96555f73488595c35dae047e67f77366f849806ada9e01 SHA512 5294d06a19ef68104300cbd8569a33b49581a13a6e73a8d211b24fe752ce1db94aee8e6cc933f6f3d5fdcd85bf5c8c3c27b1f7407a9e06a58257700dcbd96484 WHIRLPOOL 2104cfe071113f07fb9eb179ab50b1b732123dc45b44c29e3cc1197ab678f5432b320f495c082a9640d4a4af8d3108fd47af69412f659a747b29e0f869d24835
+MISC ChangeLog 4113 SHA256 f4efd9c8bd3c0ab1654f9d712c5524b10b06487f92fd7842f4c575b745f27f01 SHA512 8d487b7b74867679cb48182d2c0984c652cc7f0df7dfd37709acf36956ed5b3c3ce9fb93dbb1c6e535778e2adfccff5d8856b4cad3e379be1e2b4a78c5331903 WHIRLPOOL c4c3f6944cc09bf3025e9dfda7f2123385c0b0e9fea4f3c8153ed5f4d48a378ae1aacce6f0e68f5e7fa8881abe55bc516c002473bcf9dfdf5a395b1393be0544
 MISC metadata.xml 701 SHA256 9733783a1b6a13076d18dd4bd78e5d5c4d3ac45f13440e6f57c3deeb3f3bf603 SHA512 47c89e2c157145880745246095ccff39fbe445314c641c0c3a46cb2152220ba2785dded689da586e559f50271e60a6a4603768b0c8c6afef82432433b7222e46 WHIRLPOOL 920c0524fc4ad28d1c8c32c5098ed2b322713b9b158cf1903abcfe17b17adce5e5e65a422ede873bba0d915a9e46b88fdf60782ed543ec020d5c61412806946c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS39kJAAoJEEn8cBKl3gOuJtQP/06kV9f7Zy59yiAFnBhhjMD4
-xYSgPP9Y7uq/PR2ill1eF2ZwoeoKFlw7GY9CU+vc5dwXpMDwgVWSg/TDhDr0HxJl
-SR4tQf0aoYT94f9xPJHpN1+Fgi1UghHVtC2jckK3c3rWwzzFqWBInHsRFf2rzdP9
-lUSi3F7d2vQhCkNNYZu15UcDFq4tvN7jsHwgg7XqMFJaVonnC7H5hQo3ZNMtOp8R
-p4zEqi6pwbg6ZCpG1GwM+RpU/wOvvvxeEPWWj7t60Hs8+ZEAu8stAhDG126q1MWM
-JHQCllI3q/mnnXBNK+pCoc4h/68KctOyiR45Lbzx0jej8vzi5HX9RP0DVBm2w9EK
-YYd903+7mi2Hu7Ksu/HxLVf1Q4Q4EOMBXBzMePAtEB2EQ0SjSOPgB+v5Jatn8NZw
-Tx02wbf+RzI2DjXifwq7iHAIGVSBjJOeLSe8GW1uZIN9hh8ipFZxqoBlDpI3mfLB
-5JZiAOz9RhQIIwpSVLimRFxrCaVop2AuU3D57+a1U7Kx0sJbqy3jdyXhP2uG019t
-E3QVY5w7R3Cop1OklDEUEXDcYPWWJtZYW3LIVAid4KTh9Mdm9jnIdmAZIEY9ENXs
-cZLogskY/z8eFIXsrKveerUrlcvPwrXXFOS4yF3LTD5Y+TeLbcau+yO0CGlfGq3K
-6zn9VJX3Jsfy0x3Ixyh/
-=0P0J
+iQIcBAEBCAAGBQJS8me3AAoJEEn8cBKl3gOuHQUQALj7tTOCUWe+jtl8sCvf6t5V
+RiGzlB8zarrgoiv9xWCJ+gnvQPguauiMCyhBHkvu//sPEY/QJC615lRRGM1jFimi
+WNSpTjyOUTmd4DA9qZfh1o9omeLqJfdNXr8sksSAyGPL6k1NEF8g3rV0+vfwvo2g
+FZJ5pNAVk6A3OdpZo3QockgkjYkLZm+I/ANVSb5Coz19ZYhmwCjFwjZhLoiXlic0
+tTUU1nhYK6e0VPQwRLfK+JdXBF6OnTAw9ESA1/RqOqt+saSQsnaWqtHkAeCFxOIV
+WDssczMNwBnmoe/zkvZd3lOL7ZQGM1KRGhvmUlTK4GyVgyxM9ynmIbrfcWK2yDSF
+dnwsTEmfETwyaFtByDTAmSK8vrt9WQZNjnpaK5OGu5nrb+4Vz2JqcTBR/HcTqGsj
+xWpW3eLXO2uFq8NNCf0Phe0YyH5w4EXtu8p4zIK/6IuwNREMAuf0e20hngw+DIr3
+neynv07UdvAFSXbh9C+rgWUJKMRy6rSrlreb3YLr3km9B7kh5ZcD7D3zOlDXQByl
+8AEx3mzfX9l+qY45/WJndP8/5mt7M7S2uJxOu1I9W6i/vMpxVBnaJS9bTfO4bK7w
+WxwlZ2F8MpD0vazpYsoa7VFsiBxMarz236UqLJB/j1Jfcuar8k1WweIqVRPlRG4B
+XV/GUvcZowCtfo1CXB+A
+=R3Q1
 -----END PGP SIGNATURE-----
diff --git a/www-apps/cgit/cgit-0.10.ebuild b/www-apps/cgit/cgit-0.10.ebuild
index 81f38d94d10b..a5d80e9cfcb7 100644
--- a/www-apps/cgit/cgit-0.10.ebuild
+++ b/www-apps/cgit/cgit-0.10.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/cgit-0.10.ebuild,v 1.2 2014/02/05 16:32:50 zx2c4 Exp $
 
 EAPI="4"
 
@@ -19,7 +19,7 @@ SRC_URI="mirror://kernel/software/scm/git/git-${GIT_V}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc +highlight +lua +jit"
 
 RDEPEND="
diff --git a/www-apps/cgit/cgit-0.9.2.ebuild b/www-apps/cgit/cgit-0.9.2.ebuild
deleted file mode 100644
index c43335d48b51..000000000000
--- a/www-apps/cgit/cgit-0.9.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/cgit-0.9.2.ebuild,v 1.2 2013/05/30 20:37:30 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.3"
-
-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"
-
-RDEPEND="
-	dev-vcs/git
-	sys-libs/zlib
-	dev-libs/openssl
-	virtual/httpd-cgi
-	highlight? ( || ( dev-python/pygments app-text/highlight ) )
-"
-# 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
-
-	sed -i \
-		-e "/^CACHE_ROOT =/s:/var/cache/cgit:${CGIT_CACHEDIR}:" \
-		Makefile || die
-}
-
-src_compile() {
-	emake
-	use doc && emake doc-man
-}
-
-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
-
-	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."
-}