Remove old version and stabilize latest.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key A5DE03AE)

3 files changed, 7 insertions, 89 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/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."
-}