[gentoo-commits] repo/gentoo:master commit in: www-apps/cgit/

[Jason Donenfeld]

commit:     51b002cd3e3e2b5d4df96113583bf12419575936
Author:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 13 22:29:53 2018 +0000
Commit:     Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Fri Jul 13 22:30:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51b002cd

www-apps/cgit: version bump

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 www-apps/cgit/Manifest                             |  6 +-
 www-apps/cgit/cgit-0.12.ebuild                     | 93 ----------------------
 www-apps/cgit/{cgit-1.1.ebuild => cgit-1.2.ebuild} |  2 +-
 3 files changed, 3 insertions(+), 98 deletions(-)

diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest
index 8cb4e0b0c86..97b6a0da41c 100644
--- a/www-apps/cgit/Manifest
+++ b/www-apps/cgit/Manifest
@@ -1,4 +1,2 @@
-DIST cgit-0.12.tar.xz 85152 BLAKE2B 10a8432176ffe093c2615406285a9958147c1e33b9c98dc939493b5b107663dc1951d2ba7ea4464c27041f51c2f5dd874da9ed3de8b68da5316ffe1e9d9354f7 SHA512 59c9189b5713184b07a7db65c30e26987bd14d76ccb998be52fb2d1cca0ae0d1637391c4d14ab58d29c0b58b586c1294ae865e140eda2a031ca1f175d83abc34
-DIST cgit-1.1.tar.xz 86268 BLAKE2B c0fcff703378298b7075e2a55119a8c1adb34d8f86f11acaded775a6cd140fa8ab39c4f2623c317607722201f9f1aed94be4f068f72344b66b0c6ac33538f76e SHA512 8f2ec418716d7a6f0880a713b622f2ee41217dc2d5462903841d59d978a021a8bc2be667ca65c25baee2b9dcd4a76bddd0c813bda0486109cc694e7610827051
-DIST git-2.10.2.tar.xz 4106108 BLAKE2B 34edc8a28df20fd4f4df8cee09c7c543968743827f263bdfeb60cff4802812cca060f829cd382d1bdc020004e14e083573c278cd706ff16008d77bf23e956a85 SHA512 0ab09de481dbb31c3304382afaa5d3fc9f861115c9954c65b11a8a1c34b939118c7ed3ff60ac329145888596388e3e4d2b2fb677fe109d33a57206d531b5ee6a
-DIST git-2.7.0.tar.xz 3861524 BLAKE2B b5a3f42598b315db0799f3cb4f2285dd08805bb1eb8e4dcedfca2b51fcda2904cd6d46136c0091d90a0d23a80228015a33d709be787fb000713105cbe9a9ed3e SHA512 e2d51e3d547229bb1e5c3a92c71476695f23420d9c639f9cb1d953fd00579aad92f9bbaf8f3d45f966c9476da73bf4c11dabf18c06f542de6e4d26e12c43dcf3
+DIST cgit-1.2.tar.xz 88628 BLAKE2B 92d75aae276e566ca67ce84145a345df246900660210fbcb3093bb946d9bfc3505c11863fd282de4742cfbb371a48f9fcbb88b1e5a8f3536ebd1b1cb8919a841 SHA512 efcc99aa49851c4373065d1e5a01b9eb1df1f2f7cbf8bdfede2d8b76787735e94f157589a8dfe57eaf3057ad53a1b4ada2fb2f69332df2a3496a21825dac9329
+DIST git-2.18.0.tar.xz 5102264 BLAKE2B 94a8469a0e489d517136233301f1af622a3e612967316620800a771721f4e558dfb9159f158ddd07d294fce3ceb256038483f5a8c1fe6a84f661710857945dce SHA512 db19363c9c2042248322d49874a27c0614acfb912183725e5d4f0331d6b44cef66a9a7da6a49bd4a17e5d86d30c5fed6bef7527f386494184595a433c4060e46

diff --git a/www-apps/cgit/cgit-0.12.ebuild b/www-apps/cgit/cgit-0.12.ebuild
deleted file mode 100644
index 26c877f635b..00000000000
--- a/www-apps/cgit/cgit-0.12.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WEBAPP_MANUAL_SLOT="yes"
-
-inherit webapp eutils multilib user toolchain-funcs
-
-[[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
-
-GIT_V="2.7.0"
-
-DESCRIPTION="a fast web-interface for git repositories"
-HOMEPAGE="https://git.zx2c4.com/cgit/about"
-SRC_URI="mirror://kernel/software/scm/git/git-${GIT_V}.tar.xz
-	https://git.zx2c4.com/cgit/snapshot/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm 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-1.1.ebuild b/www-apps/cgit/cgit-1.2.ebuild
similarity index 99%
rename from www-apps/cgit/cgit-1.1.ebuild
rename to www-apps/cgit/cgit-1.2.ebuild
index cb25cd8aa58..cc4e2a13954 100644
--- a/www-apps/cgit/cgit-1.1.ebuild
+++ b/www-apps/cgit/cgit-1.2.ebuild
@@ -9,7 +9,7 @@ inherit webapp eutils multilib user toolchain-funcs
 
 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
 
-GIT_V="2.10.2"
+GIT_V="2.18.0"
 
 DESCRIPTION="a fast web-interface for git repositories"
 HOMEPAGE="https://git.zx2c4.com/cgit/about"