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

[Viorel Munteanu]

commit: d9d8cf759bfbb7727bcb4fb5daa9ad6c21a54a5e
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Mon Apr 15 17:32:56 2024 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Mon Apr 15 17:43:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9d8cf75

www-apps/cgit: enable py3.12

Enable python 3.12
Enable lua 5.3, 5.4
Fix VariableScope

Closes: https://bugs.gentoo.org/929871
Closes: https://bugs.gentoo.org/836118
Signed-off-by: Viorel Munteanu  gentoo.org>

 www-apps/cgit/{cgit-1.2.3-r202.ebuild => cgit-1.2.3-r203.ebuild} | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/www-apps/cgit/cgit-1.2.3-r202.ebuild 
b/www-apps/cgit/cgit-1.2.3-r203.ebuild
similarity index 93%
rename from www-apps/cgit/cgit-1.2.3-r202.ebuild
rename to www-apps/cgit/cgit-1.2.3-r203.ebuild
index dc581d8b548c..8499426633d8 100644
--- a/www-apps/cgit/cgit-1.2.3-r202.ebuild
+++ b/www-apps/cgit/cgit-1.2.3-r203.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-LUA_COMPAT=( lua5-{1..2} luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 WEBAPP_MANUAL_SLOT="yes"
 
@@ -64,7 +64,6 @@ src_configure() {
echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf || die "echo 
CGIT_SCRIPT_PATH failed"
echo "CGIT_DATA_PATH = ${MY_HTDOCSDIR}" >> cgit.conf || die "echo 
CGIT_DATA_PATH failed"
echo "CACHE_ROOT = ${CGIT_CACHEDIR}" >> cgit.conf || die "echo 
CACHE_ROOT failed"
-   echo "DESTDIR = ${D}" >> cgit.conf || die "echo DESTDIR failed"
if use lua; then
echo "LUA_PKGCONFIG = ${ELUA}" >> cgit.conf || die "echo 
LUA_PKGCONFIG failed"
else
@@ -80,7 +79,7 @@ src_compile() {
 src_install() {
webapp_src_preinst
 
-   emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" 
LDFLAGS="${LDFLAGS}" install
+   emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" 
LDFLAGS="${LDFLAGS}" DESTDIR="${D}" install
 
insinto /etc
doins "${FILESDIR}"/cgitrc

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

[Sam James]

commit: 91be320f2480e8b48c5812a9ed412688ccd6b06a
Author: Chris Mayo  gmail  com>
AuthorDate: Mon Apr 24 18:22:28 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 25 02:22:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91be320f

www-apps/cgit: Create cache directory at runtime

Closes: https://bugs.gentoo.org/516388
Signed-off-by: Chris Mayo  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30724
Signed-off-by: Sam James  gentoo.org>

 www-apps/cgit/cgit-1.2.3-r202.ebuild | 115 +++
 1 file changed, 115 insertions(+)

diff --git a/www-apps/cgit/cgit-1.2.3-r202.ebuild 
b/www-apps/cgit/cgit-1.2.3-r202.ebuild
new file mode 100644
index ..dc581d8b548c
--- /dev/null
+++ b/www-apps/cgit/cgit-1.2.3-r202.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} luajit )
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+WEBAPP_MANUAL_SLOT="yes"
+
+inherit lua-single python-single-r1 tmpfiles toolchain-funcs webapp
+
+[[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
+
+GIT_V="2.25.1"
+
+DESCRIPTION="a fast web-interface for git repositories"
+HOMEPAGE="https://git.zx2c4.com/cgit/about;
+SRC_URI="https://www.kernel.org/pub/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 ~riscv ~x86"
+IUSE="doc +highlight +lua test"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) ${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   acct-group/cgit
+   acct-user/cgit
+   dev-libs/openssl:0=
+   dev-vcs/git
+   highlight? (
+   $(python_gen_cond_dep 'dev-python/pygments[${PYTHON_USEDEP}]' )
+   )
+   lua? ( ${LUA_DEPS} )
+   sys-libs/zlib
+   virtual/httpd-cgi
+"
+# ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
+DEPEND="${RDEPEND}"
+BDEPEND="
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   >=app-text/asciidoc-8.5.1
+   )
+"
+
+pkg_setup() {
+   python_setup
+   webapp_pkg_setup
+   use lua && lua-single_pkg_setup
+}
+
+src_configure() {
+   rmdir git || die
+   mv "${WORKDIR}"/git-"${GIT_V}" git || die
+
+   echo "prefix = ${EPREFIX}/usr" >> cgit.conf || die "echo prefix failed"
+   echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf || die "echo 
libdir failed"
+   echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf || die "echo 
CGIT_SCRIPT_PATH failed"
+   echo "CGIT_DATA_PATH = ${MY_HTDOCSDIR}" >> cgit.conf || die "echo 
CGIT_DATA_PATH failed"
+   echo "CACHE_ROOT = ${CGIT_CACHEDIR}" >> cgit.conf || die "echo 
CACHE_ROOT failed"
+   echo "DESTDIR = ${D}" >> cgit.conf || die "echo DESTDIR failed"
+   if use lua; then
+   echo "LUA_PKGCONFIG = ${ELUA}" >> cgit.conf || die "echo 
LUA_PKGCONFIG failed"
+   else
+   echo "NO_LUA = 1" >> cgit.conf || die "echo NO_LUA failed"
+   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
+
+   cat > cgit.conf <<-EOT || die
+   d ${CGIT_CACHEDIR} 0700 cgit cgit -
+   EOT
+   dotmpfiles cgit.conf
+
+   python_fix_shebang .
+}
+
+src_test() {
+   emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" 
LDFLAGS="${LDFLAGS}" test
+}
+
+pkg_postinst() {
+   webapp_pkg_postinst
+   tmpfiles_process cgit.conf
+   ewarn "The cgit cache is enabled using the cache-size setting in 
cgitrc."
+   ewarn "If enabling the cache and running cgit using the web server's 
user"
+   ewarn "you should copy ${EROOT}/usr/lib/tmpfiles.d/cgit.conf"
+   ewarn "to ${EROOT}/etc/tmpfiles.d/ and edit, changing the ownership 
fields."
+   ewarn "If you use the cache-root setting in cgitrc to specify a cache 
directory"
+   ewarn "other than ${CGIT_CACHEDIR} edit the path in cgit.conf."
+}

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

[Yixun Lan]

commit: d270ab9e9b9747c62a9cb4085ad361b0716c7324
Author: Chris Su  lesscrowds  org>
AuthorDate: Mon Oct 24 15:13:59 2022 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Mon Oct 24 22:46:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d270ab9e

www-apps/cgit: Keyword 1.2.3-r201 riscv, #878167

Closes: https://github.com/gentoo/gentoo/pull/27933
Signed-off-by: Chris Su  lesscrowds.org>
Signed-off-by: Yixun Lan  gentoo.org>

 www-apps/cgit/cgit-1.2.3-r201.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/cgit/cgit-1.2.3-r201.ebuild 
b/www-apps/cgit/cgit-1.2.3-r201.ebuild
index 579c8c34abcd..e897bc2878e1 100644
--- a/www-apps/cgit/cgit-1.2.3-r201.ebuild
+++ b/www-apps/cgit/cgit-1.2.3-r201.ebuild
@@ -22,7 +22,7 @@ 
SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm ~riscv x86"
 IUSE="doc +highlight +lua test"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) ${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"

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

[Jakov Smolić]

commit: 813627f8f4b45d74429f14835d3801ed6eeb4db4
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Oct 20 10:55:08 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Oct 20 10:55:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=813627f8

www-apps/cgit: Stabilize 1.2.3-r201 x86, #877213

Signed-off-by: Jakov Smolić  gentoo.org>

 www-apps/cgit/cgit-1.2.3-r201.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/cgit/cgit-1.2.3-r201.ebuild 
b/www-apps/cgit/cgit-1.2.3-r201.ebuild
index 424fd181e387..579c8c34abcd 100644
--- a/www-apps/cgit/cgit-1.2.3-r201.ebuild
+++ b/www-apps/cgit/cgit-1.2.3-r201.ebuild
@@ -22,7 +22,7 @@ 
SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~x86"
+KEYWORDS="amd64 arm x86"
 IUSE="doc +highlight +lua test"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) ${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"

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

[Jakov Smolić]

commit: ee8f669cae16c894844c994a841b4e839c758da5
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Oct 20 10:50:43 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Oct 20 10:50:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee8f669c

www-apps/cgit: Stabilize 1.2.3-r201 amd64, #877213

Signed-off-by: Jakov Smolić  gentoo.org>

 www-apps/cgit/cgit-1.2.3-r201.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/cgit/cgit-1.2.3-r201.ebuild 
b/www-apps/cgit/cgit-1.2.3-r201.ebuild
index 9af4c76a5d8e..424fd181e387 100644
--- a/www-apps/cgit/cgit-1.2.3-r201.ebuild
+++ b/www-apps/cgit/cgit-1.2.3-r201.ebuild
@@ -22,7 +22,7 @@ 
SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 arm ~x86"
+KEYWORDS="amd64 arm ~x86"
 IUSE="doc +highlight +lua test"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) ${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"

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

[Agostino Sarubbo]

commit: 4b874fcd7cba3cf430683810e188e2329251f83e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Oct 16 08:53:58 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Oct 16 08:53:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b874fcd

www-apps/cgit: Stabilize 1.2.3-r201 arm, #877213

Signed-off-by: Agostino Sarubbo  gentoo.org>

 www-apps/cgit/cgit-1.2.3-r201.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/cgit/cgit-1.2.3-r201.ebuild 
b/www-apps/cgit/cgit-1.2.3-r201.ebuild
index f4b0c75060bc..9af4c76a5d8e 100644
--- a/www-apps/cgit/cgit-1.2.3-r201.ebuild
+++ b/www-apps/cgit/cgit-1.2.3-r201.ebuild
@@ -22,7 +22,7 @@ 
SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 arm ~x86"
 IUSE="doc +highlight +lua test"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) ${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"

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

[Sam James]

commit: b9dbbcbc857dc81e073218d901893af28819f919
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 15 15:11:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 15 15:11:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9dbbcbc

www-apps/cgit: drop 1.2.3-r200

Signed-off-by: Sam James  gentoo.org>

 www-apps/cgit/cgit-1.2.3-r200.ebuild | 107 ---
 1 file changed, 107 deletions(-)

diff --git a/www-apps/cgit/cgit-1.2.3-r200.ebuild 
b/www-apps/cgit/cgit-1.2.3-r200.ebuild
deleted file mode 100644
index 2794730845ec..
--- a/www-apps/cgit/cgit-1.2.3-r200.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} luajit )
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-WEBAPP_MANUAL_SLOT="yes"
-
-inherit lua-single python-single-r1 toolchain-funcs webapp
-
-[[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
-
-GIT_V="2.25.1"
-
-DESCRIPTION="a fast web-interface for git repositories"
-HOMEPAGE="https://git.zx2c4.com/cgit/about;
-SRC_URI="https://www.kernel.org/pub/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 test"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) ${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
-   acct-group/cgit
-   acct-user/cgit
-   dev-libs/openssl:0=
-   dev-vcs/git
-   highlight? (
-   $(python_gen_cond_dep 'dev-python/pygments[${PYTHON_USEDEP}]' )
-   )
-   lua? ( ${LUA_DEPS} )
-   sys-libs/zlib
-   virtual/httpd-cgi
-"
-# ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
-DEPEND="${RDEPEND}
-   doc? ( app-text/docbook-xsl-stylesheets
-   >=app-text/asciidoc-8.5.1 )
-"
-
-pkg_setup() {
-   webapp_pkg_setup
-   use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-   python_setup
-
-   rmdir git || die
-   mv "${WORKDIR}"/git-"${GIT_V}" git || die
-
-   echo "prefix = ${EPREFIX}/usr" >> cgit.conf || die "echo prefix failed"
-   echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf || die "echo 
libdir failed"
-   echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf || die "echo 
CGIT_SCRIPT_PATH failed"
-   echo "CGIT_DATA_PATH = ${MY_HTDOCSDIR}" >> cgit.conf || die "echo 
CGIT_DATA_PATH failed"
-   echo "CACHE_ROOT = ${CGIT_CACHEDIR}" >> cgit.conf || die "echo 
CACHE_ROOT failed"
-   echo "DESTDIR = ${D}" >> cgit.conf || die "echo DESTDIR failed"
-   if use lua; then
-   echo "LUA_PKGCONFIG = ${ELUA}" >> cgit.conf || die "echo 
LUA_PKGCONFIG failed"
-   else
-   echo "NO_LUA = 1" >> cgit.conf || die "echo NO_LUA failed"
-   fi
-
-   eapply_user
-}
-
-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}"
-   python_fix_shebang .
-}
-
-src_test() {
-   emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" 
LDFLAGS="${LDFLAGS}" test
-}
-
-pkg_postinst() {
-   webapp_pkg_postinst
-   ewarn "If you intend to run cgit using web server's user"
-   ewarn "you should change ${CGIT_CACHEDIR} permissions."
-}

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

[Matt Turner]

commit: 7a0cc3705521088ad1a00e85823c47869313ad9b
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Jul 29 18:43:58 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Jul 29 18:57:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a0cc370

www-apps/cgit: Drop unmaintained live ebuild

Signed-off-by: Matt Turner  gentoo.org>

 www-apps/cgit/cgit-.ebuild | 94 --
 1 file changed, 94 deletions(-)

diff --git a/www-apps/cgit/cgit-.ebuild b/www-apps/cgit/cgit-.ebuild
deleted file mode 100644
index 0efa5da905aa..
--- a/www-apps/cgit/cgit-.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} luajit )
-WEBAPP_MANUAL_SLOT="yes"
-
-inherit git-r3 lua-single toolchain-funcs webapp
-
-[[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
-
-DESCRIPTION="a fast web-interface for git repositories"
-HOMEPAGE="https://git.zx2c4.com/cgit/about;
-SRC_URI=""
-EGIT_REPO_URI="https://git.zx2c4.com/cgit;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc +highlight +lua test"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   acct-group/cgit
-   acct-user/cgit
-   dev-vcs/git
-   highlight? ( || ( dev-python/pygments app-text/highlight ) )
-   dev-libs/openssl:0=
-   lua? ( ${LUA_DEPS} )
-   sys-libs/zlib
-   virtual/httpd-cgi
-"
-# ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
-DEPEND="${RDEPEND}
-   doc? ( app-text/docbook-xsl-stylesheets
-   >=app-text/asciidoc-8.5.1 )
-"
-
-pkg_setup() {
-   webapp_pkg_setup
-   use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-   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
-   echo "LUA_PKGCONFIG = ${ELUA}" >> cgit.conf
-   else
-   echo "NO_LUA = 1" >> cgit.conf
-   fi
-
-   eapply_user
-}
-
-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}"
-}
-
-src_test() {
-   emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" 
LDFLAGS="${LDFLAGS}" test
-}
-
-pkg_postinst() {
-   webapp_pkg_postinst
-   ewarn "If you intend to run cgit using web server's user"
-   ewarn "you should change ${CGIT_CACHEDIR} permissions."
-}

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

[Matt Turner]

commit: 88ccdf0614cc509047494a8ef8a7c7618a65
Author: Marcin Deranek  slonko  net>
AuthorDate: Mon Jul 25 07:45:41 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Jul 29 18:57:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88ccdf06

www-apps/cgit: Update compatible python list

Closes: https://bugs.gentoo.org/856118
Closes: https://github.com/gentoo/gentoo/pull/26585
Signed-off-by: Marcin Deranek  slonko.net>
Signed-off-by: Matt Turner  gentoo.org>

 www-apps/cgit/cgit-1.2.3-r200.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/cgit/cgit-1.2.3-r200.ebuild 
b/www-apps/cgit/cgit-1.2.3-r200.ebuild
index 3029f760db0f..2794730845ec 100644
--- a/www-apps/cgit/cgit-1.2.3-r200.ebuild
+++ b/www-apps/cgit/cgit-1.2.3-r200.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 LUA_COMPAT=( lua5-{1..2} luajit )
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 WEBAPP_MANUAL_SLOT="yes"
 

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

[Matt Turner]

commit: 55ea838a1d3ec050b680856e6788a98ae89750f9
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Jul 29 18:54:51 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Jul 29 18:57:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55ea838a

www-apps/cgit: Replace src_prepare with src_configure

After we move python_setup to pkg_setup, src_prepare just configuring
cgit.conf, which seems like an appropriate task for src_configure.

Also add Python 3.11 compatibility, switch to EAPI=8, and move
doc-generating deps to BDEPEND.

Bug: https://bugs.gentoo.org/836118
Signed-off-by: Matt Turner  gentoo.org>

 www-apps/cgit/cgit-1.2.3-r201.ebuild | 108 +++
 1 file changed, 108 insertions(+)

diff --git a/www-apps/cgit/cgit-1.2.3-r201.ebuild 
b/www-apps/cgit/cgit-1.2.3-r201.ebuild
new file mode 100644
index ..f4b0c75060bc
--- /dev/null
+++ b/www-apps/cgit/cgit-1.2.3-r201.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} luajit )
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+WEBAPP_MANUAL_SLOT="yes"
+
+inherit lua-single python-single-r1 toolchain-funcs webapp
+
+[[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
+
+GIT_V="2.25.1"
+
+DESCRIPTION="a fast web-interface for git repositories"
+HOMEPAGE="https://git.zx2c4.com/cgit/about;
+SRC_URI="https://www.kernel.org/pub/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 test"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) ${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   acct-group/cgit
+   acct-user/cgit
+   dev-libs/openssl:0=
+   dev-vcs/git
+   highlight? (
+   $(python_gen_cond_dep 'dev-python/pygments[${PYTHON_USEDEP}]' )
+   )
+   lua? ( ${LUA_DEPS} )
+   sys-libs/zlib
+   virtual/httpd-cgi
+"
+# ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
+DEPEND="${RDEPEND}"
+BDEPEND="
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   >=app-text/asciidoc-8.5.1
+   )
+"
+
+pkg_setup() {
+   python_setup
+   webapp_pkg_setup
+   use lua && lua-single_pkg_setup
+}
+
+src_configure() {
+   rmdir git || die
+   mv "${WORKDIR}"/git-"${GIT_V}" git || die
+
+   echo "prefix = ${EPREFIX}/usr" >> cgit.conf || die "echo prefix failed"
+   echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf || die "echo 
libdir failed"
+   echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf || die "echo 
CGIT_SCRIPT_PATH failed"
+   echo "CGIT_DATA_PATH = ${MY_HTDOCSDIR}" >> cgit.conf || die "echo 
CGIT_DATA_PATH failed"
+   echo "CACHE_ROOT = ${CGIT_CACHEDIR}" >> cgit.conf || die "echo 
CACHE_ROOT failed"
+   echo "DESTDIR = ${D}" >> cgit.conf || die "echo DESTDIR failed"
+   if use lua; then
+   echo "LUA_PKGCONFIG = ${ELUA}" >> cgit.conf || die "echo 
LUA_PKGCONFIG failed"
+   else
+   echo "NO_LUA = 1" >> cgit.conf || die "echo NO_LUA failed"
+   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}"
+   python_fix_shebang .
+}
+
+src_test() {
+   emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" 
LDFLAGS="${LDFLAGS}" test
+}
+
+pkg_postinst() {
+   webapp_pkg_postinst
+   ewarn "If you intend to run cgit using web server's user"
+   ewarn "you should change ${CGIT_CACHEDIR} permissions."
+}

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

[Mikle Kolyada]

commit: e4431c6fc703baf543f38942028b48be323075db
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun May  2 08:08:22 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun May  2 08:08:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4431c6f

www-apps/cgit: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 www-apps/cgit/cgit-1.2.3-r100.ebuild | 5 ++---
 www-apps/cgit/cgit-.ebuild   | 7 +++
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/www-apps/cgit/cgit-1.2.3-r100.ebuild 
b/www-apps/cgit/cgit-1.2.3-r100.ebuild
index 2f0d41e9244..628a1c29f20 100644
--- a/www-apps/cgit/cgit-1.2.3-r100.ebuild
+++ b/www-apps/cgit/cgit-1.2.3-r100.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm x86"
-IUSE="doc +highlight libressl +lua test"
+IUSE="doc +highlight +lua test"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
@@ -29,8 +29,7 @@ RDEPEND="
acct-user/cgit
dev-vcs/git
highlight? ( || ( dev-python/pygments app-text/highlight ) )
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0=
lua? ( ${LUA_DEPS} )
sys-libs/zlib
virtual/httpd-cgi

diff --git a/www-apps/cgit/cgit-.ebuild b/www-apps/cgit/cgit-.ebuild
index 8975d5eebd6..0efa5da905a 100644
--- a/www-apps/cgit/cgit-.ebuild
+++ b/www-apps/cgit/cgit-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ EGIT_REPO_URI="https://git.zx2c4.com/cgit;
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc +highlight libressl +lua test"
+IUSE="doc +highlight +lua test"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
@@ -27,8 +27,7 @@ RDEPEND="
acct-user/cgit
dev-vcs/git
highlight? ( || ( dev-python/pygments app-text/highlight ) )
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0=
lua? ( ${LUA_DEPS} )
sys-libs/zlib
virtual/httpd-cgi

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

[Aaron Bauman]

commit: ddf5e438066fd3faa2e7c867175a3206e095
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sun Feb  7 22:56:56 2021 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sun Feb  7 22:56:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddf5e438

www-apps/cgit: drop libressl; fix highlight deps; add python stuff

* This changes the highlighter explicitly to dev-python/pygments which
negates the need to patch bug #574056
* This also depends on python-single-r1 and fixes all py script shebangs
* Fix QA issues with || dies
* Drop libressl support

Closes: https://bugs.gentoo.org/574056
Closes: https://bugs.gentoo.org/656866
Signed-off-by: Aaron Bauman  gentoo.org>

 www-apps/cgit/cgit-1.2.3-r200.ebuild | 107 +++
 1 file changed, 107 insertions(+)

diff --git a/www-apps/cgit/cgit-1.2.3-r200.ebuild 
b/www-apps/cgit/cgit-1.2.3-r200.ebuild
new file mode 100644
index 000..3029f760db0
--- /dev/null
+++ b/www-apps/cgit/cgit-1.2.3-r200.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} luajit )
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+WEBAPP_MANUAL_SLOT="yes"
+
+inherit lua-single python-single-r1 toolchain-funcs webapp
+
+[[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
+
+GIT_V="2.25.1"
+
+DESCRIPTION="a fast web-interface for git repositories"
+HOMEPAGE="https://git.zx2c4.com/cgit/about;
+SRC_URI="https://www.kernel.org/pub/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 test"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) ${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${PYTHON_DEPS}
+   acct-group/cgit
+   acct-user/cgit
+   dev-libs/openssl:0=
+   dev-vcs/git
+   highlight? (
+   $(python_gen_cond_dep 'dev-python/pygments[${PYTHON_USEDEP}]' )
+   )
+   lua? ( ${LUA_DEPS} )
+   sys-libs/zlib
+   virtual/httpd-cgi
+"
+# ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
+DEPEND="${RDEPEND}
+   doc? ( app-text/docbook-xsl-stylesheets
+   >=app-text/asciidoc-8.5.1 )
+"
+
+pkg_setup() {
+   webapp_pkg_setup
+   use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+   python_setup
+
+   rmdir git || die
+   mv "${WORKDIR}"/git-"${GIT_V}" git || die
+
+   echo "prefix = ${EPREFIX}/usr" >> cgit.conf || die "echo prefix failed"
+   echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf || die "echo 
libdir failed"
+   echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf || die "echo 
CGIT_SCRIPT_PATH failed"
+   echo "CGIT_DATA_PATH = ${MY_HTDOCSDIR}" >> cgit.conf || die "echo 
CGIT_DATA_PATH failed"
+   echo "CACHE_ROOT = ${CGIT_CACHEDIR}" >> cgit.conf || die "echo 
CACHE_ROOT failed"
+   echo "DESTDIR = ${D}" >> cgit.conf || die "echo DESTDIR failed"
+   if use lua; then
+   echo "LUA_PKGCONFIG = ${ELUA}" >> cgit.conf || die "echo 
LUA_PKGCONFIG failed"
+   else
+   echo "NO_LUA = 1" >> cgit.conf || die "echo NO_LUA failed"
+   fi
+
+   eapply_user
+}
+
+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}"
+   python_fix_shebang .
+}
+
+src_test() {
+   emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" 
LDFLAGS="${LDFLAGS}" test
+}
+
+pkg_postinst() {
+   webapp_pkg_postinst
+   ewarn "If you intend to run cgit using web server's user"
+   ewarn "you should change ${CGIT_CACHEDIR} permissions."
+}

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

[Marek Szuba]

commit: 71780bb1f021322a868d193fb15da09a48d84a6e
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Jan 25 13:59:28 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Jan 25 17:37:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71780bb1

www-apps/cgit: remove old

Signed-off-by: Marek Szuba  gentoo.org>

 www-apps/cgit/Manifest |   2 -
 www-apps/cgit/cgit-1.2.1.ebuild|  95 -
 www-apps/cgit/cgit-1.2.3-r1.ebuild | 104 -
 www-apps/cgit/cgit-1.2.3.ebuild|  99 ---
 4 files changed, 300 deletions(-)

diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest
index b57cd8a0d6b..bb3450fe096 100644
--- a/www-apps/cgit/Manifest
+++ b/www-apps/cgit/Manifest
@@ -1,4 +1,2 @@
-DIST cgit-1.2.1.tar.xz 89648 BLAKE2B 
c1dc2fe9af58cc00bef9e11c5f784c5696d108671456be61c46e971659df3274874e751b26d6e124c2b3e7b407bbad2878ec5d74f26a0469146bfc66a479501c
 SHA512 
c7380df9afbc3735ef9e4f196f4f5bbd26cf52e473fa6f435e7d0c00dc295cc8de6bee6bfb1857144025c8591d41a6a74efb1af551e8610848d90ac40fcfab36
 DIST cgit-1.2.3.tar.xz 90632 BLAKE2B 
594a9b2ae0b449e0ef090f428f955cc02833f5f5b1e4d6dc8c737daa565d01ba6840933c0bdc53d4eb683b2f44e2fae885ddd020cfb2de38141a870a6eae2380
 SHA512 
58f9bb644b07be49dc51f3ef30a3d0e53699cede3c06b1d6920f3874fe846c83dd2589632aa84357b70ea2d60272448409aa1b892f405d14dd6745f5559b4504
-DIST git-2.18.0.tar.xz 5102264 BLAKE2B 
94a8469a0e489d517136233301f1af622a3e612967316620800a771721f4e558dfb9159f158ddd07d294fce3ceb256038483f5a8c1fe6a84f661710857945dce
 SHA512 
db19363c9c2042248322d49874a27c0614acfb912183725e5d4f0331d6b44cef66a9a7da6a49bd4a17e5d86d30c5fed6bef7527f386494184595a433c4060e46
 DIST git-2.25.1.tar.xz 5875548 BLAKE2B 
582da3d4ac996d7b9ce6cf505661496ab1a2cd061f058745350498121956b33d79739b567fb5fea0b4e298303261256034aa0b8da0b842feab04ae67a7d5b142
 SHA512 
15241143acfd8542d85d2709ac3c80dbd6e8d5234438f70c4f33cc71a2bdec3e32938df7f6351e2746d570b021d3bd0b70474ea4beec0c51d1fc45f9c287b344

diff --git a/www-apps/cgit/cgit-1.2.1.ebuild b/www-apps/cgit/cgit-1.2.1.ebuild
deleted file mode 100644
index 04dc11ed32e..000
--- a/www-apps/cgit/cgit-1.2.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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.18.0"
-
-DESCRIPTION="a fast web-interface for git repositories"
-HOMEPAGE="https://git.zx2c4.com/cgit/about;
-SRC_URI="https://www.kernel.org/pub/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 libressl +lua +jit"
-
-RDEPEND="
-   dev-vcs/git
-   sys-libs/zlib
-   virtual/httpd-cgi
-   highlight? ( || ( dev-python/pygments app-text/highlight ) )
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua:0 ) )
-"
-# ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
-DEPEND="${RDEPEND}
-   !=app-text/asciidoc-8.5.1 )
-"
-
-pkg_setup() {
-   webapp_pkg_setup
-   enewgroup ${PN}
-   enewuser ${PN} -1 -1 -1 ${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 

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

[Sam James]

commit: 2ea4fc450192ef1ac8b33d3d9f3bec9b4d7177fd
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 23 22:50:19 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 23 22:50:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ea4fc45

www-apps/cgit: Stabilize 1.2.3-r100 arm, #766528

Signed-off-by: Sam James  gentoo.org>

 www-apps/cgit/cgit-1.2.3-r100.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/cgit/cgit-1.2.3-r100.ebuild 
b/www-apps/cgit/cgit-1.2.3-r100.ebuild
index b5805b3f97e..2f0d41e9244 100644
--- a/www-apps/cgit/cgit-1.2.3-r100.ebuild
+++ b/www-apps/cgit/cgit-1.2.3-r100.ebuild
@@ -19,7 +19,7 @@ 
SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 IUSE="doc +highlight libressl +lua test"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"

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

[Sam James]

commit: 089d17e8084d0ded2a45525aabe8906b1273109f
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 23 04:19:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 23 04:19:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=089d17e8

www-apps/cgit: Stabilize 1.2.3-r100 x86, #766528

Signed-off-by: Sam James  gentoo.org>

 www-apps/cgit/cgit-1.2.3-r100.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/cgit/cgit-1.2.3-r100.ebuild 
b/www-apps/cgit/cgit-1.2.3-r100.ebuild
index ff26e32bfb0..b5805b3f97e 100644
--- a/www-apps/cgit/cgit-1.2.3-r100.ebuild
+++ b/www-apps/cgit/cgit-1.2.3-r100.ebuild
@@ -19,7 +19,7 @@ 
SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="doc +highlight libressl +lua test"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"

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

[Sam James]

commit: 41bd17f6bcb24bf018ac0c6ff9217fbbeec223d2
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 23 04:09:38 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 23 04:09:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41bd17f6

www-apps/cgit: Stabilize 1.2.3-r100 amd64, #766528

Signed-off-by: Sam James  gentoo.org>

 www-apps/cgit/cgit-1.2.3-r100.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-apps/cgit/cgit-1.2.3-r100.ebuild 
b/www-apps/cgit/cgit-1.2.3-r100.ebuild
index 08c24550c1b..ff26e32bfb0 100644
--- a/www-apps/cgit/cgit-1.2.3-r100.ebuild
+++ b/www-apps/cgit/cgit-1.2.3-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ 
SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="doc +highlight libressl +lua test"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"

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

[Aaron Bauman]

commit: 42b80550b602f566adfeb7b07ab1d466dc10af76
Author: Aaron Bauman  gentoo  org>
AuthorDate: Fri Nov 27 20:16:24 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri Nov 27 20:16:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42b80550

www-apps/cgit: update maintainer and fix RESTRICT=""

* add myself as maintainer

Signed-off-by: Aaron Bauman  gentoo.org>

 www-apps/cgit/cgit-1.2.3-r1.ebuild | 1 +
 www-apps/cgit/cgit-.ebuild | 3 ++-
 www-apps/cgit/metadata.xml | 4 
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/www-apps/cgit/cgit-1.2.3-r1.ebuild 
b/www-apps/cgit/cgit-1.2.3-r1.ebuild
index 6c5ff88b4c9..707d23f3bcc 100644
--- a/www-apps/cgit/cgit-1.2.3-r1.ebuild
+++ b/www-apps/cgit/cgit-1.2.3-r1.ebuild
@@ -20,6 +20,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="doc +highlight libressl +lua +luajit test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
acct-group/cgit

diff --git a/www-apps/cgit/cgit-.ebuild b/www-apps/cgit/cgit-.ebuild
index c6c843a12c6..4b617428b6e 100644
--- a/www-apps/cgit/cgit-.ebuild
+++ b/www-apps/cgit/cgit-.ebuild
@@ -17,7 +17,8 @@ EGIT_REPO_URI="https://git.zx2c4.com/cgit;
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc +highlight libressl +lua +luajit"
+IUSE="doc +highlight libressl +lua +luajit test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
acct-group/cgit

diff --git a/www-apps/cgit/metadata.xml b/www-apps/cgit/metadata.xml
index 647683a8f62..731100a1b49 100644
--- a/www-apps/cgit/metadata.xml
+++ b/www-apps/cgit/metadata.xml
@@ -1,6 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
+   
+   b...@gentoo.org
+   Aaron Bauman
+   

web-a...@gentoo.org
Gentoo Webapps

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

[Aaron Bauman]

commit: 0344dd9fa5e6e7c9d59bf3ab65c3c2e5592406c6
Author: Aaron Bauman  gentoo  org>
AuthorDate: Fri Nov 27 20:10:46 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri Nov 27 20:11:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0344dd9f

www-apps/cgit: port EAPI. bump. other stuff

* port to EAPI=7
* port to GLEP 81
* reorder deps
* drop unused inherits
* fix CC calls during tests

Closes: https://bugs.gentoo.org/726074
Signed-off-by: Aaron Bauman  gentoo.org>

 .../{cgit-.ebuild => cgit-1.2.3-r1.ebuild} | 36 ++
 www-apps/cgit/cgit-.ebuild | 25 +--
 www-apps/cgit/metadata.xml |  4 ---
 3 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/www-apps/cgit/cgit-.ebuild b/www-apps/cgit/cgit-1.2.3-r1.ebuild
similarity index 76%
copy from www-apps/cgit/cgit-.ebuild
copy to www-apps/cgit/cgit-1.2.3-r1.ebuild
index 6c5cb1217c4..6c5ff88b4c9 100644
--- a/www-apps/cgit/cgit-.ebuild
+++ b/www-apps/cgit/cgit-1.2.3-r1.ebuild
@@ -1,34 +1,39 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WEBAPP_MANUAL_SLOT="yes"
 
-inherit webapp eutils multilib user toolchain-funcs git-r3
+inherit toolchain-funcs webapp
 
 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
 
+GIT_V="2.25.1"
+
 DESCRIPTION="a fast web-interface for git repositories"
 HOMEPAGE="https://git.zx2c4.com/cgit/about;
-SRC_URI=""
-EGIT_REPO_URI="https://git.zx2c4.com/cgit;
+SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz
+   https://git.zx2c4.com/cgit/snapshot/${P}.tar.xz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="doc +highlight +lua +luajit"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc +highlight libressl +lua +luajit test"
 
 RDEPEND="
+   acct-group/cgit
+   acct-user/cgit
dev-vcs/git
-   sys-libs/zlib
-   dev-libs/openssl:0
-   virtual/httpd-cgi
highlight? ( || ( dev-python/pygments app-text/highlight ) )
lua? (
luajit? ( dev-lang/luajit )
!luajit? ( dev-lang/lua:0 )
)
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   sys-libs/zlib
+   virtual/httpd-cgi
 "
 # ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
 DEPEND="${RDEPEND}
@@ -38,11 +43,12 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
webapp_pkg_setup
-   enewgroup ${PN}
-   enewuser ${PN} -1 -1 -1 ${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
@@ -59,7 +65,7 @@ src_prepare() {
echo "NO_LUA = 1" >> cgit.conf
fi
 
-   epatch_user
+   eapply_user
 }
 
 src_compile() {
@@ -86,6 +92,10 @@ src_install() {
fperms 700 "${CGIT_CACHEDIR}"
 }
 
+src_test() {
+   emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" 
LDFLAGS="${LDFLAGS}" test
+}
+
 pkg_postinst() {
webapp_pkg_postinst
ewarn "If you intend to run cgit using web server's user"

diff --git a/www-apps/cgit/cgit-.ebuild b/www-apps/cgit/cgit-.ebuild
index 6c5cb1217c4..c6c843a12c6 100644
--- a/www-apps/cgit/cgit-.ebuild
+++ b/www-apps/cgit/cgit-.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WEBAPP_MANUAL_SLOT="yes"
 
-inherit webapp eutils multilib user toolchain-funcs git-r3
+inherit git-r3 toolchain-funcs webapp
 
 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
 
@@ -17,18 +17,21 @@ EGIT_REPO_URI="https://git.zx2c4.com/cgit;
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc +highlight +lua +luajit"
+IUSE="doc +highlight libressl +lua +luajit"
 
 RDEPEND="
+   acct-group/cgit
+   acct-user/cgit
dev-vcs/git
-   sys-libs/zlib
-   dev-libs/openssl:0
-   virtual/httpd-cgi
highlight? ( || ( dev-python/pygments app-text/highlight ) )
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
lua? (
luajit? ( dev-lang/luajit )
!luajit? ( dev-lang/lua:0 )
)
+   sys-libs/zlib
+   virtual/httpd-cgi
 "
 # ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
 DEPEND="${RDEPEND}
@@ -38,8 +41,6 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
webapp_pkg_setup
-   enewgroup ${PN}
-   enewuser ${PN} -1 -1 -1 ${PN}
 }
 
 src_prepare() {
@@ -59,7 +60,7 @@ src_prepare() {
echo "NO_LUA = 1" >> cgit.conf
fi
 
-   epatch_user
+   eapply_user
 }
 
 src_compile() {
@@ -86,6 +87,10 

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

[Matt Turner]

commit: 25d173ae900cb25661f28092995cee221d2f7be2
Author: Jesus P Rey (Chuso)  chuso  net>
AuthorDate: Thu Sep 24 09:21:18 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Nov  5 01:52:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25d173ae

www-apps/cgit: Add missing escape characters in postinst message.

Signed-off-by: Jesus P Rey  chuso.net>
Closes: https://bugs.gentoo.org/700402
Closes: https://github.com/gentoo/gentoo/pull/17649
Signed-off-by: Matt Turner  gentoo.org>

 www-apps/cgit/files/postinstall-en.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/www-apps/cgit/files/postinstall-en.txt 
b/www-apps/cgit/files/postinstall-en.txt
index b164123f019..f7c5c8cfae9 100644
--- a/www-apps/cgit/files/postinstall-en.txt
+++ b/www-apps/cgit/files/postinstall-en.txt
@@ -29,9 +29,9 @@ rewrite rules to your
 
 RewriteEngine On
 # Redirect all non-existant urls to cgit
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule ^.* /cgi-bin/cgit.cgi/$0 [L,PT]
+RewriteCond %%{REQUEST_FILENAME} !-f
+RewriteCond %%{REQUEST_FILENAME} !-d
+RewriteRule ^.* /cgi-bin/cgit.cgi/\$0 [L,PT]
 
 # Redirect the empty url to cgit
 RewriteRule ^$ /cgi-bin/cgit.cgi/ [L,PT]

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

[Matt Turner]

commit: aca802e0d2cd8c9b80e4f54b1d3bc61e8676ad54
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Mar 23 22:35:19 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Mar 23 22:35:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aca802e0

www-apps/cgit: Drop outdated blocker

Signed-off-by: Matt Turner  gentoo.org>

 www-apps/cgit/cgit-1.2.3.ebuild | 1 -
 www-apps/cgit/cgit-.ebuild  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/www-apps/cgit/cgit-1.2.3.ebuild b/www-apps/cgit/cgit-1.2.3.ebuild
index 957cafeb178..e01974c18b1 100644
--- a/www-apps/cgit/cgit-1.2.3.ebuild
+++ b/www-apps/cgit/cgit-1.2.3.ebuild
@@ -35,7 +35,6 @@ RDEPEND="
 "
 # ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
 DEPEND="${RDEPEND}
-   !=app-text/asciidoc-8.5.1 )
 "

diff --git a/www-apps/cgit/cgit-.ebuild b/www-apps/cgit/cgit-.ebuild
index 17526b8c448..6c5cb1217c4 100644
--- a/www-apps/cgit/cgit-.ebuild
+++ b/www-apps/cgit/cgit-.ebuild
@@ -32,7 +32,6 @@ RDEPEND="
 "
 # ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
 DEPEND="${RDEPEND}
-   !=app-text/asciidoc-8.5.1 )
 "

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

[Matt Turner]

commit: 82abf007e74167a0970b6c08276ea83bd7cad73e
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Mar 23 22:34:40 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Mar 23 22:34:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82abf007

www-apps/cgit: More s/jit/luajit/

Signed-off-by: Matt Turner  gentoo.org>

 www-apps/cgit/cgit-1.2.3.ebuild | 2 +-
 www-apps/cgit/cgit-.ebuild  | 2 +-
 www-apps/cgit/metadata.xml  | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/www-apps/cgit/cgit-1.2.3.ebuild b/www-apps/cgit/cgit-1.2.3.ebuild
index 1d99de053e8..957cafeb178 100644
--- a/www-apps/cgit/cgit-1.2.3.ebuild
+++ b/www-apps/cgit/cgit-1.2.3.ebuild
@@ -57,7 +57,7 @@ src_prepare() {
echo "CACHE_ROOT = ${CGIT_CACHEDIR}" >> cgit.conf
echo "DESTDIR = ${D}" >> cgit.conf
if use lua; then
-   if use jit; then
+   if use luajit; then
echo "LUA_PKGCONFIG = luajit" >> cgit.conf
else
echo "LUA_PKGCONFIG = lua" >> cgit.conf

diff --git a/www-apps/cgit/cgit-.ebuild b/www-apps/cgit/cgit-.ebuild
index 8873c350890..17526b8c448 100644
--- a/www-apps/cgit/cgit-.ebuild
+++ b/www-apps/cgit/cgit-.ebuild
@@ -51,7 +51,7 @@ src_prepare() {
echo "CACHE_ROOT = ${CGIT_CACHEDIR}" >> cgit.conf
echo "DESTDIR = ${D}" >> cgit.conf
if use lua; then
-   if use jit; then
+   if use luajit; then
echo "LUA_PKGCONFIG = luajit" >> cgit.conf
else
echo "LUA_PKGCONFIG = lua" >> cgit.conf

diff --git a/www-apps/cgit/metadata.xml b/www-apps/cgit/metadata.xml
index 8839288399a..7c228e38151 100644
--- a/www-apps/cgit/metadata.xml
+++ b/www-apps/cgit/metadata.xml
@@ -18,6 +18,5 @@

Enable source code highlighting
Enable support for Lua scripting
-   If the lua flag is enabled, jit uses LuaJIT 
instead of vanilla Lua

 

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

[Matt Turner]

commit: 54eb14a84888b59cb83f0a16ecf80692a0f17684
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Mar 23 22:14:47 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Mar 23 22:19:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54eb14a8

www-apps/cgit: Rename IUSE=jit to IUSE=luajit

Closes: https://bugs.gentoo.org/653306
Signed-off-by: Matt Turner  gentoo.org>

 www-apps/cgit/cgit-1.2.3.ebuild | 7 +--
 www-apps/cgit/cgit-.ebuild  | 7 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/www-apps/cgit/cgit-1.2.3.ebuild b/www-apps/cgit/cgit-1.2.3.ebuild
index 7cc6e5b77e7..36c2fa840d5 100644
--- a/www-apps/cgit/cgit-1.2.3.ebuild
+++ b/www-apps/cgit/cgit-1.2.3.ebuild
@@ -19,7 +19,7 @@ 
SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc +highlight libressl +lua +jit"
+IUSE="doc +highlight libressl +lua +luajit"
 
 RDEPEND="
dev-vcs/git
@@ -28,7 +28,10 @@ RDEPEND="
highlight? ( || ( dev-python/pygments app-text/highlight ) )
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
-   lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua:0 ) )
+   lua? (
+   luajit? ( dev-lang/luajit )
+   !luajit? ( dev-lang/lua:0 )
+   )
 "
 # ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
 DEPEND="${RDEPEND}

diff --git a/www-apps/cgit/cgit-.ebuild b/www-apps/cgit/cgit-.ebuild
index 1d737f2e39f..b7fe22f1c8b 100644
--- a/www-apps/cgit/cgit-.ebuild
+++ b/www-apps/cgit/cgit-.ebuild
@@ -17,7 +17,7 @@ EGIT_REPO_URI="https://git.zx2c4.com/cgit;
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc +highlight +lua +jit"
+IUSE="doc +highlight +lua +luajit"
 
 RDEPEND="
dev-vcs/git
@@ -25,7 +25,10 @@ RDEPEND="
dev-libs/openssl:0
virtual/httpd-cgi
highlight? ( || ( dev-python/pygments app-text/highlight ) )
-   lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua:0 ) )
+   lua? (
+   luajit? ( dev-lang/luajit )
+   !luajit? ( dev-lang/lua:0 )
+   )
 "
 # ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
 DEPEND="${RDEPEND}

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

[Matt Turner]

commit: 1fdd535b4a1161adb1eccf188aaa611ac8691240
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Mar 23 22:18:06 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Mar 23 22:19:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fdd535b

www-apps/cgit: Use epatch_user

Closes: https://bugs.gentoo.org/679700
Signed-off-by: Matt Turner  gentoo.org>

 www-apps/cgit/cgit-1.2.3.ebuild | 2 ++
 www-apps/cgit/cgit-.ebuild  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/www-apps/cgit/cgit-1.2.3.ebuild b/www-apps/cgit/cgit-1.2.3.ebuild
index 36c2fa840d5..1d99de053e8 100644
--- a/www-apps/cgit/cgit-1.2.3.ebuild
+++ b/www-apps/cgit/cgit-1.2.3.ebuild
@@ -65,6 +65,8 @@ src_prepare() {
else
echo "NO_LUA = 1" >> cgit.conf
fi
+
+   epatch_user
 }
 
 src_compile() {

diff --git a/www-apps/cgit/cgit-.ebuild b/www-apps/cgit/cgit-.ebuild
index b7fe22f1c8b..8873c350890 100644
--- a/www-apps/cgit/cgit-.ebuild
+++ b/www-apps/cgit/cgit-.ebuild
@@ -59,6 +59,8 @@ src_prepare() {
else
echo "NO_LUA = 1" >> cgit.conf
fi
+
+   epatch_user
 }
 
 src_compile() {

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

[Jason A. Donenfeld]

commit: a24613a9a134f0bc4895bc04c06e46e85b48450c
Author: Jason A. Donenfeld  gentoo  org>
AuthorDate: Sat Mar 14 01:38:35 2020 +
Commit: Jason A. Donenfeld  gentoo  org>
CommitDate: Sat Mar 14 03:25:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a24613a9

www-apps/cgit: bump to 1.2.3

Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Jason A. Donenfeld  gentoo.org>

 www-apps/cgit/Manifest | 4 ++--
 www-apps/cgit/{cgit-1.2.2.ebuild => cgit-1.2.3.ebuild} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest
index 0f5c0eaaffa..b57cd8a0d6b 100644
--- a/www-apps/cgit/Manifest
+++ b/www-apps/cgit/Manifest
@@ -1,4 +1,4 @@
 DIST cgit-1.2.1.tar.xz 89648 BLAKE2B 
c1dc2fe9af58cc00bef9e11c5f784c5696d108671456be61c46e971659df3274874e751b26d6e124c2b3e7b407bbad2878ec5d74f26a0469146bfc66a479501c
 SHA512 
c7380df9afbc3735ef9e4f196f4f5bbd26cf52e473fa6f435e7d0c00dc295cc8de6bee6bfb1857144025c8591d41a6a74efb1af551e8610848d90ac40fcfab36
-DIST cgit-1.2.2.tar.xz 90204 BLAKE2B 
de8c4c8cd96b3f12f914c5df9e5f1af408fc6f268a3cee185f5721696fe5a064340eb05243aa9b8536d096daaf794c3f74669388d029d21a12722917e0dc0903
 SHA512 
ac006db0b14ae84fc9304b4cb1b49c3445d229593071be39b2d6e2709b54d03b11efd0ac1b5daef8160278303a7611c897fb6cf1e008c66c3f2463151e650af9
+DIST cgit-1.2.3.tar.xz 90632 BLAKE2B 
594a9b2ae0b449e0ef090f428f955cc02833f5f5b1e4d6dc8c737daa565d01ba6840933c0bdc53d4eb683b2f44e2fae885ddd020cfb2de38141a870a6eae2380
 SHA512 
58f9bb644b07be49dc51f3ef30a3d0e53699cede3c06b1d6920f3874fe846c83dd2589632aa84357b70ea2d60272448409aa1b892f405d14dd6745f5559b4504
 DIST git-2.18.0.tar.xz 5102264 BLAKE2B 
94a8469a0e489d517136233301f1af622a3e612967316620800a771721f4e558dfb9159f158ddd07d294fce3ceb256038483f5a8c1fe6a84f661710857945dce
 SHA512 
db19363c9c2042248322d49874a27c0614acfb912183725e5d4f0331d6b44cef66a9a7da6a49bd4a17e5d86d30c5fed6bef7527f386494184595a433c4060e46
-DIST git-2.25.0.tar.xz 5873532 BLAKE2B 
7e9e54677ac3c4d3295e9f92ba7e3f7f5b33620d6d0fb8105d5e57d609fe3ee499d1c1bc4a6d8832927a28f4948f4466a6ca4edf996b8a324279f91d25627660
 SHA512 
8bbada0451fe0a3314e1b9a43a74135115449aa41f5b3e7f960279e4a7fe6069c36e78825fc4b60d06806e3a6fa8158f327cb8a3801686ac22a35e3704244191
+DIST git-2.25.1.tar.xz 5875548 BLAKE2B 
582da3d4ac996d7b9ce6cf505661496ab1a2cd061f058745350498121956b33d79739b567fb5fea0b4e298303261256034aa0b8da0b842feab04ae67a7d5b142
 SHA512 
15241143acfd8542d85d2709ac3c80dbd6e8d5234438f70c4f33cc71a2bdec3e32938df7f6351e2746d570b021d3bd0b70474ea4beec0c51d1fc45f9c287b344

diff --git a/www-apps/cgit/cgit-1.2.2.ebuild b/www-apps/cgit/cgit-1.2.3.ebuild
similarity index 99%
rename from www-apps/cgit/cgit-1.2.2.ebuild
rename to www-apps/cgit/cgit-1.2.3.ebuild
index a74743dfbc3..7cc6e5b77e7 100644
--- a/www-apps/cgit/cgit-1.2.2.ebuild
+++ b/www-apps/cgit/cgit-1.2.3.ebuild
@@ -9,7 +9,7 @@ inherit webapp eutils multilib user toolchain-funcs
 
 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
 
-GIT_V="2.25.0"
+GIT_V="2.25.1"
 
 DESCRIPTION="a fast web-interface for git repositories"
 HOMEPAGE="https://git.zx2c4.com/cgit/about;

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

[Jason A. Donenfeld]

commit: d9e6f0967d0d4faf89b3a0cc35c0863c64e8b9a6
Author: Jason A. Donenfeld  gentoo  org>
AuthorDate: Mon Jan 13 20:19:20 2020 +
Commit: Jason A. Donenfeld  gentoo  org>
CommitDate: Mon Jan 13 20:52:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e6f096

www-apps/cgit: version bump to 1.2.2

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jason A. Donenfeld  gentoo.org>

 www-apps/cgit/Manifest  |  2 +
 www-apps/cgit/cgit-1.2.2.ebuild | 95 +
 2 files changed, 97 insertions(+)

diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest
index adbbfd2694c..0f5c0eaaffa 100644
--- a/www-apps/cgit/Manifest
+++ b/www-apps/cgit/Manifest
@@ -1,2 +1,4 @@
 DIST cgit-1.2.1.tar.xz 89648 BLAKE2B 
c1dc2fe9af58cc00bef9e11c5f784c5696d108671456be61c46e971659df3274874e751b26d6e124c2b3e7b407bbad2878ec5d74f26a0469146bfc66a479501c
 SHA512 
c7380df9afbc3735ef9e4f196f4f5bbd26cf52e473fa6f435e7d0c00dc295cc8de6bee6bfb1857144025c8591d41a6a74efb1af551e8610848d90ac40fcfab36
+DIST cgit-1.2.2.tar.xz 90204 BLAKE2B 
de8c4c8cd96b3f12f914c5df9e5f1af408fc6f268a3cee185f5721696fe5a064340eb05243aa9b8536d096daaf794c3f74669388d029d21a12722917e0dc0903
 SHA512 
ac006db0b14ae84fc9304b4cb1b49c3445d229593071be39b2d6e2709b54d03b11efd0ac1b5daef8160278303a7611c897fb6cf1e008c66c3f2463151e650af9
 DIST git-2.18.0.tar.xz 5102264 BLAKE2B 
94a8469a0e489d517136233301f1af622a3e612967316620800a771721f4e558dfb9159f158ddd07d294fce3ceb256038483f5a8c1fe6a84f661710857945dce
 SHA512 
db19363c9c2042248322d49874a27c0614acfb912183725e5d4f0331d6b44cef66a9a7da6a49bd4a17e5d86d30c5fed6bef7527f386494184595a433c4060e46
+DIST git-2.25.0.tar.xz 5873532 BLAKE2B 
7e9e54677ac3c4d3295e9f92ba7e3f7f5b33620d6d0fb8105d5e57d609fe3ee499d1c1bc4a6d8832927a28f4948f4466a6ca4edf996b8a324279f91d25627660
 SHA512 
8bbada0451fe0a3314e1b9a43a74135115449aa41f5b3e7f960279e4a7fe6069c36e78825fc4b60d06806e3a6fa8158f327cb8a3801686ac22a35e3704244191

diff --git a/www-apps/cgit/cgit-1.2.2.ebuild b/www-apps/cgit/cgit-1.2.2.ebuild
new file mode 100644
index 000..a74743dfbc3
--- /dev/null
+++ b/www-apps/cgit/cgit-1.2.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# 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.25.0"
+
+DESCRIPTION="a fast web-interface for git repositories"
+HOMEPAGE="https://git.zx2c4.com/cgit/about;
+SRC_URI="https://www.kernel.org/pub/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 libressl +lua +jit"
+
+RDEPEND="
+   dev-vcs/git
+   sys-libs/zlib
+   virtual/httpd-cgi
+   highlight? ( || ( dev-python/pygments app-text/highlight ) )
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua:0 ) )
+"
+# ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
+DEPEND="${RDEPEND}
+   !=app-text/asciidoc-8.5.1 )
+"
+
+pkg_setup() {
+   webapp_pkg_setup
+   enewgroup ${PN}
+   enewuser ${PN} -1 -1 -1 ${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."
+}

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

[Stefan Strogin]

commit: 4033b898b72e8ac6a1c10bf085cbcea9b8fbdf57
Author: Stefan Strogin  gentoo  org>
AuthorDate: Thu Jan  2 02:59:50 2020 +
Commit: Stefan Strogin  gentoo  org>
CommitDate: Thu Jan  2 03:01:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4033b898

www-apps/cgit: add USE=libressl

Closes: https://bugs.gentoo.org/702320
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Stefan Strogin  gentoo.org>

 www-apps/cgit/cgit-1.2.1.ebuild | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/www-apps/cgit/cgit-1.2.1.ebuild b/www-apps/cgit/cgit-1.2.1.ebuild
index 825e750d423..04dc11ed32e 100644
--- a/www-apps/cgit/cgit-1.2.1.ebuild
+++ b/www-apps/cgit/cgit-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,14 +19,15 @@ 
SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm x86"
-IUSE="doc +highlight +lua +jit"
+IUSE="doc +highlight libressl +lua +jit"
 
 RDEPEND="
dev-vcs/git
sys-libs/zlib
-   dev-libs/openssl:0
virtual/httpd-cgi
highlight? ( || ( dev-python/pygments app-text/highlight ) )
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua:0 ) )
 "
 # ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken

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

[Michał Górny]

commit: 7ef107b0d9b3dfe44823b513b12ba46d995403d4
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Dec 16 09:24:52 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Dec 16 09:39:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ef107b0

www-apps/cgit: Add slot-dep on dev-lang/lua

Signed-off-by: Michał Górny  gentoo.org>

 www-apps/cgit/cgit-1.2.1.ebuild | 2 +-
 www-apps/cgit/cgit-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-apps/cgit/cgit-1.2.1.ebuild b/www-apps/cgit/cgit-1.2.1.ebuild
index 6b78500479a..825e750d423 100644
--- a/www-apps/cgit/cgit-1.2.1.ebuild
+++ b/www-apps/cgit/cgit-1.2.1.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
dev-libs/openssl:0
virtual/httpd-cgi
highlight? ( || ( dev-python/pygments app-text/highlight ) )
-   lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua ) )
+   lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua:0 ) )
 "
 # ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
 DEPEND="${RDEPEND}

diff --git a/www-apps/cgit/cgit-.ebuild b/www-apps/cgit/cgit-.ebuild
index 3633d01125b..1d737f2e39f 100644
--- a/www-apps/cgit/cgit-.ebuild
+++ b/www-apps/cgit/cgit-.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
dev-libs/openssl:0
virtual/httpd-cgi
highlight? ( || ( dev-python/pygments app-text/highlight ) )
-   lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua ) )
+   lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua:0 ) )
 "
 # ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
 DEPEND="${RDEPEND}

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

[Michał Górny]

commit: 59e9aabff2a5141d55dccc2ef6c81a21d29768d1
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Dec 15 20:34:04 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Dec 15 20:34:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59e9aabf

www-apps/cgit: Switch to git-r3

Signed-off-by: Michał Górny  gentoo.org>

 www-apps/cgit/cgit-.ebuild | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/www-apps/cgit/cgit-.ebuild b/www-apps/cgit/cgit-.ebuild
index a6df9326558..3633d01125b 100644
--- a/www-apps/cgit/cgit-.ebuild
+++ b/www-apps/cgit/cgit-.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=5
 
 WEBAPP_MANUAL_SLOT="yes"
 
-inherit webapp eutils multilib user toolchain-funcs git-2
+inherit webapp eutils multilib user toolchain-funcs git-r3
 
 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
 
@@ -41,9 +41,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-   git submodule init || die
-   git submodule update || die
-
echo "prefix = ${EPREFIX}/usr" >> cgit.conf
echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf
echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf

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

[Michał Górny]

commit: 2de76ac0f758481493e977a274bb30c53f85162d
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Sep 30 06:49:28 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Oct  5 18:55:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2de76ac0

www-apps/cgit: Inline mirror://kernel

Signed-off-by: Michał Górny  gentoo.org>

 www-apps/cgit/cgit-1.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/cgit/cgit-1.2.1.ebuild b/www-apps/cgit/cgit-1.2.1.ebuild
index 4bbbeef07a1..6b78500479a 100644
--- a/www-apps/cgit/cgit-1.2.1.ebuild
+++ b/www-apps/cgit/cgit-1.2.1.ebuild
@@ -13,7 +13,7 @@ GIT_V="2.18.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
+SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz
https://git.zx2c4.com/cgit/snapshot/${P}.tar.xz;
 
 LICENSE="GPL-2"

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

[Ben Kohler]

commit: 23d65596bf6ed47cf5a8fd1d163ddbf3f8fb2ce9
Author: Ben Kohler  gentoo  org>
AuthorDate: Sun Sep 29 20:55:55 2019 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Sun Sep 29 20:57:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23d65596

www-apps/cgit: fix missing group on installation

After a recent change in user.eclass, this package no longer creates
the required group that's used later in src_install.  I've adjusted the
ebuilds to restore the original behavior as intended before this eclass
change.

https://gitweb.gentoo.org/repo/gentoo.git/commit/eclass/user.eclass?id=3afc0d7b8b5e90c50d66c5a845b96c33e521e6e8
Closes: https://bugs.gentoo.org/688890
Package-Manager: Portage-2.3.76, Repoman-2.3.17
RepoMan-Options: --force
Signed-off-by: Ben Kohler  gentoo.org>

 www-apps/cgit/cgit-1.2.1.ebuild | 5 +++--
 www-apps/cgit/cgit-.ebuild  | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/www-apps/cgit/cgit-1.2.1.ebuild b/www-apps/cgit/cgit-1.2.1.ebuild
index 82174c82295..4bbbeef07a1 100644
--- a/www-apps/cgit/cgit-1.2.1.ebuild
+++ b/www-apps/cgit/cgit-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -38,7 +38,8 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
webapp_pkg_setup
-   enewuser "${PN}"
+   enewgroup ${PN}
+   enewuser ${PN} -1 -1 -1 ${PN}
 }
 
 src_prepare() {

diff --git a/www-apps/cgit/cgit-.ebuild b/www-apps/cgit/cgit-.ebuild
index 28d3a792277..a6df9326558 100644
--- a/www-apps/cgit/cgit-.ebuild
+++ b/www-apps/cgit/cgit-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -36,7 +36,8 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
webapp_pkg_setup
-   enewuser "${PN}"
+   enewgroup ${PN}
+   enewuser ${PN} -1 -1 -1 ${PN}
 }
 
 src_prepare() {

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

[Mart Raudsepp]

commit: 18f5895a6a36355857f2dbf4a3cff6f040f5b810
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Tue Aug  7 19:13:15 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Tue Aug  7 23:01:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18f5895a

www-apps/cgit: remove randomly and very wrongly added arm64 keyword

cgit didn't even have ~arm64 keywords, yet was stabled out of the blue,
leading to a broken deptree QA issues.

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 www-apps/cgit/cgit-1.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/cgit/cgit-1.2.1.ebuild b/www-apps/cgit/cgit-1.2.1.ebuild
index 47dca91a09f..82174c82295 100644
--- a/www-apps/cgit/cgit-1.2.1.ebuild
+++ b/www-apps/cgit/cgit-1.2.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://kernel/software/scm/git/git-${GIT_V}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
+KEYWORDS="amd64 arm x86"
 IUSE="doc +highlight +lua +jit"
 
 RDEPEND="

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

[Jason Donenfeld]

commit: 3de14b2b9ded28a9b78b9bc2ff7386a15f449544
Author: Jason A. Donenfeld  gentoo  org>
AuthorDate: Sat Aug  4 14:53:07 2018 +
Commit: Jason Donenfeld  gentoo  org>
CommitDate: Sat Aug  4 14:53:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3de14b2b

www-apps/cgit: stable

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 www-apps/cgit/cgit-1.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/cgit/cgit-1.2.1.ebuild b/www-apps/cgit/cgit-1.2.1.ebuild
index cc4e2a13954..47dca91a09f 100644
--- a/www-apps/cgit/cgit-1.2.1.ebuild
+++ b/www-apps/cgit/cgit-1.2.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://kernel/software/scm/git/git-${GIT_V}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="doc +highlight +lua +jit"
 
 RDEPEND="

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

[Jason Donenfeld]

commit: b20b0b8096573157de7bf1c3891c14de0d186813
Author: Jason A. Donenfeld  gentoo  org>
AuthorDate: Fri Aug  3 15:14:02 2018 +
Commit: Jason Donenfeld  gentoo  org>
CommitDate: Fri Aug  3 15:14:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b20b0b80

www-apps/cgit: bump

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 www-apps/cgit/Manifest   | 2 +-
 www-apps/cgit/{cgit-1.2.ebuild => cgit-1.2.1.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest
index 97b6a0da41c..adbbfd2694c 100644
--- a/www-apps/cgit/Manifest
+++ b/www-apps/cgit/Manifest
@@ -1,2 +1,2 @@
-DIST cgit-1.2.tar.xz 88628 BLAKE2B 
92d75aae276e566ca67ce84145a345df246900660210fbcb3093bb946d9bfc3505c11863fd282de4742cfbb371a48f9fcbb88b1e5a8f3536ebd1b1cb8919a841
 SHA512 
efcc99aa49851c4373065d1e5a01b9eb1df1f2f7cbf8bdfede2d8b76787735e94f157589a8dfe57eaf3057ad53a1b4ada2fb2f69332df2a3496a21825dac9329
+DIST cgit-1.2.1.tar.xz 89648 BLAKE2B 
c1dc2fe9af58cc00bef9e11c5f784c5696d108671456be61c46e971659df3274874e751b26d6e124c2b3e7b407bbad2878ec5d74f26a0469146bfc66a479501c
 SHA512 
c7380df9afbc3735ef9e4f196f4f5bbd26cf52e473fa6f435e7d0c00dc295cc8de6bee6bfb1857144025c8591d41a6a74efb1af551e8610848d90ac40fcfab36
 DIST git-2.18.0.tar.xz 5102264 BLAKE2B 
94a8469a0e489d517136233301f1af622a3e612967316620800a771721f4e558dfb9159f158ddd07d294fce3ceb256038483f5a8c1fe6a84f661710857945dce
 SHA512 
db19363c9c2042248322d49874a27c0614acfb912183725e5d4f0331d6b44cef66a9a7da6a49bd4a17e5d86d30c5fed6bef7527f386494184595a433c4060e46

diff --git a/www-apps/cgit/cgit-1.2.ebuild b/www-apps/cgit/cgit-1.2.1.ebuild
similarity index 100%
rename from www-apps/cgit/cgit-1.2.ebuild
rename to www-apps/cgit/cgit-1.2.1.ebuild

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

[Jason Donenfeld]

commit: 51b002cd3e3e2b5d4df96113583bf12419575936
Author: Jason A. Donenfeld  gentoo  org>
AuthorDate: Fri Jul 13 22:29:53 2018 +
Commit: Jason Donenfeld  gentoo  org>
CommitDate: Fri Jul 13 22:30:23 2018 +
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..000
--- 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}
-   !=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
-

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

[Aaron Bauman]

commit: 03d06639098e8c70b2d69c762da6dbd6a14eb4e7
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Thu May 17 08:06:43 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri May 18 12:32:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03d06639

www-apps/cgit: use HTTPS

 www-apps/cgit/cgit-0.12.ebuild | 6 +++---
 www-apps/cgit/cgit-1.1.ebuild  | 6 +++---
 www-apps/cgit/cgit-.ebuild | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/www-apps/cgit/cgit-0.12.ebuild b/www-apps/cgit/cgit-0.12.ebuild
index 443d7f856dc..26c877f635b 100644
--- a/www-apps/cgit/cgit-0.12.ebuild
+++ b/www-apps/cgit/cgit-0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,9 +12,9 @@ inherit webapp eutils multilib user toolchain-funcs
 GIT_V="2.7.0"
 
 DESCRIPTION="a fast web-interface for git repositories"
-HOMEPAGE="http://git.zx2c4.com/cgit/about;
+HOMEPAGE="https://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;
+   https://git.zx2c4.com/cgit/snapshot/${P}.tar.xz;
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/www-apps/cgit/cgit-1.1.ebuild b/www-apps/cgit/cgit-1.1.ebuild
index cd69e657df2..cb25cd8aa58 100644
--- a/www-apps/cgit/cgit-1.1.ebuild
+++ b/www-apps/cgit/cgit-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,9 +12,9 @@ inherit webapp eutils multilib user toolchain-funcs
 GIT_V="2.10.2"
 
 DESCRIPTION="a fast web-interface for git repositories"
-HOMEPAGE="http://git.zx2c4.com/cgit/about;
+HOMEPAGE="https://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;
+   https://git.zx2c4.com/cgit/snapshot/${P}.tar.xz;
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/www-apps/cgit/cgit-.ebuild b/www-apps/cgit/cgit-.ebuild
index 528f1032f17..28d3a792277 100644
--- a/www-apps/cgit/cgit-.ebuild
+++ b/www-apps/cgit/cgit-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -10,7 +10,7 @@ inherit webapp eutils multilib user toolchain-funcs git-2
 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
 
 DESCRIPTION="a fast web-interface for git repositories"
-HOMEPAGE="http://git.zx2c4.com/cgit/about;
+HOMEPAGE="https://git.zx2c4.com/cgit/about;
 SRC_URI=""
 EGIT_REPO_URI="https://git.zx2c4.com/cgit;
 

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

[Michael Weber]

commit: a53d38b664404279e6c93cac4f854e0771187611
Author: Michael Weber  gentoo  org>
AuthorDate: Wed Apr  5 13:44:49 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Wed Apr  5 13:44:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a53d38b6

www-apps/cgit: add ~arm keyword (bug 604324)

Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --include-arches="amd64 arm arm64 ppc ppc64"

 www-apps/cgit/cgit-0.12.ebuild | 4 ++--
 www-apps/cgit/cgit-1.1.ebuild  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/www-apps/cgit/cgit-0.12.ebuild b/www-apps/cgit/cgit-0.12.ebuild
index a44fa6ef06e..443d7f856dc 100644
--- a/www-apps/cgit/cgit-0.12.ebuild
+++ b/www-apps/cgit/cgit-0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ SRC_URI="mirror://kernel/software/scm/git/git-${GIT_V}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="doc +highlight +lua +jit"
 
 RDEPEND="

diff --git a/www-apps/cgit/cgit-1.1.ebuild b/www-apps/cgit/cgit-1.1.ebuild
index d399333eb3a..cd69e657df2 100644
--- a/www-apps/cgit/cgit-1.1.ebuild
+++ b/www-apps/cgit/cgit-1.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://kernel/software/scm/git/git-${GIT_V}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="doc +highlight +lua +jit"
 
 RDEPEND="

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

[Robin H. Johnson]

commit: e30e94fa267abffb60b0f223521fd590bf1bfb99
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Feb 12 17:36:19 2017 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun Feb 12 17:37:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e30e94fa

www-apps/cgit: bump.

Package-Manager: portage-2.3.2

 www-apps/cgit/Manifest|  2 +
 www-apps/cgit/cgit-1.1.ebuild | 94 +++
 2 files changed, 96 insertions(+)

diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest
index aa31344ba6..fddfdc6d81 100644
--- a/www-apps/cgit/Manifest
+++ b/www-apps/cgit/Manifest
@@ -1,2 +1,4 @@
 DIST cgit-0.12.tar.xz 85152 SHA256 
2ee233849335a64529a01cf2b6165ed492e20268e6e2526d7a7529ef1e24a5b7 SHA512 
59c9189b5713184b07a7db65c30e26987bd14d76ccb998be52fb2d1cca0ae0d1637391c4d14ab58d29c0b58b586c1294ae865e140eda2a031ca1f175d83abc34
 WHIRLPOOL 
f240e353545786cb90a328d2f3533070ff775cc192a915dd4e6cd9f9d1fa1be304a1412a2a63d45ed036f93ddc310d35c3884b1dfea40ad202a4bc5d69661e64
+DIST cgit-1.1.tar.xz 86268 SHA256 
0889af29be15fc981481caa09579f982b9740fe9fd2860ab87dff286f4635890 SHA512 
8f2ec418716d7a6f0880a713b622f2ee41217dc2d5462903841d59d978a021a8bc2be667ca65c25baee2b9dcd4a76bddd0c813bda0486109cc694e7610827051
 WHIRLPOOL 
b1df953aa1bf43f4fb0900e03ecf23c0dcddc743955efc6b3428cf7fe20a2babe8c5a2676e13e3bce37fed13fcf60c70afb2fe54049a17b4c74f2e8cc7fe621b
+DIST git-2.10.2.tar.xz 4106108 SHA256 
94802903dd707d85ca3b9a2be35e936a54ce86375f52c6a789efe7ce7e238671 SHA512 
0ab09de481dbb31c3304382afaa5d3fc9f861115c9954c65b11a8a1c34b939118c7ed3ff60ac329145888596388e3e4d2b2fb677fe109d33a57206d531b5ee6a
 WHIRLPOOL 
808404fa13f908d149028f64aaf5b73400448fff6393dabfaa874d750065e86ff5dae4903724cbca4e59fb74b3ff30b8b8f0a0f1435a0a90c18267c7a0550de6
 DIST git-2.7.0.tar.xz 3861524 SHA256 
fa9fb34efce9c80527152a40fbae138e83bd04a15ef9111726252259345a7b0d SHA512 
e2d51e3d547229bb1e5c3a92c71476695f23420d9c639f9cb1d953fd00579aad92f9bbaf8f3d45f966c9476da73bf4c11dabf18c06f542de6e4d26e12c43dcf3
 WHIRLPOOL 
e0dc8071ebc4e0558a2f2b9d8b32d840f4278e893777367029e84a57bf52d1d00eadb778a3e6df70c93de8cb754b94ff985ae6025ff98d6276629d7d3318aa19

diff --git a/www-apps/cgit/cgit-1.1.ebuild b/www-apps/cgit/cgit-1.1.ebuild
new file mode 100644
index 00..1146254596
--- /dev/null
+++ b/www-apps/cgit/cgit-1.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 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.10.2"
+
+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}
+   !=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."
+}

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

[Jason Donenfeld]

commit: 224762a0ac6be1a8ac124194840b425788cc45d2
Author: Jason A. Donenfeld  gentoo  org>
AuthorDate: Mon Feb 22 18:20:25 2016 +
Commit: Jason Donenfeld  gentoo  org>
CommitDate: Mon Feb 22 18:20:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=224762a0

www-apps/cgit: upstream cloning uses https now

Package-Manager: portage-2.2.27

 www-apps/cgit/cgit-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/cgit/cgit-.ebuild b/www-apps/cgit/cgit-.ebuild
index a339c03..112a8dc 100644
--- a/www-apps/cgit/cgit-.ebuild
+++ b/www-apps/cgit/cgit-.ebuild
@@ -13,7 +13,7 @@ inherit webapp eutils multilib user toolchain-funcs git-2
 DESCRIPTION="a fast web-interface for git repositories"
 HOMEPAGE="http://git.zx2c4.com/cgit/about;
 SRC_URI=""
-EGIT_REPO_URI="git://git.zx2c4.com/cgit"
+EGIT_REPO_URI="https://git.zx2c4.com/cgit;
 
 LICENSE="GPL-2"
 SLOT="0"

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

[Jason Donenfeld]

commit: e4ee47211f5a936562db3d84b97f9663b5a3a6f4
Author: Jason A. Donenfeld  gentoo  org>
AuthorDate: Fri Feb 12 03:38:32 2016 +
Commit: Jason Donenfeld  gentoo  org>
CommitDate: Fri Feb 12 03:39:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4ee4721

www-apps/cgit: I'm the real slim shady

Package-Manager: portage-2.2.27

 www-apps/cgit/metadata.xml | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/www-apps/cgit/metadata.xml b/www-apps/cgit/metadata.xml
index 69f3e67..8839288 100644
--- a/www-apps/cgit/metadata.xml
+++ b/www-apps/cgit/metadata.xml
@@ -2,17 +2,13 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 

-   nik...@gmx.us
-   Nikoli
+   zx...@gentoo.org
+   Jason A. Donenfeld


web-a...@gentoo.org
Gentoo Webapps

-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
-   

cgit - cgi for git
 

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

[Jason Donenfeld]

commit: d30ebfe8abd4bf3ef4fd31ddd2292c46c73b03cc
Author: Jason A. Donenfeld  gentoo  org>
AuthorDate: Thu Jan 14 14:51:40 2016 +
Commit: Jason Donenfeld  gentoo  org>
CommitDate: Thu Jan 14 14:51:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d30ebfe8

www-apps/cgit: security bump, remove old

 www-apps/cgit/Manifest |  8 +-
 www-apps/cgit/cgit-0.10.1.ebuild   | 94 --
 www-apps/cgit/cgit-0.10.2.ebuild   | 94 --
 www-apps/cgit/cgit-0.11.1-r1.ebuild| 94 --
 .../cgit/{cgit-0.11.2.ebuild => cgit-0.12.ebuild}  |  2 +-
 5 files changed, 2 insertions(+), 290 deletions(-)

diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest
index ddbee2b..6cb869c 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 
105a7232d26ed2f40d3920ab5621766dcb12b42ff72b56466f03e4c81eb3a091e6474144c226c787e3736e0f8b27af1afc57ca5e05694249332eaf59e720
-DIST cgit-0.11.1.tar.xz 92788 SHA256 
8cc83ee60a8dd7364dd00db06a5dce3dec607bbc316161faa660af2d56cb377c SHA512 
109433cff6779e641cdccb9b64c1a6449d3daecc3b8371068f7fe609f68ea2148d0e6651aaea9c223f858d278e7e4deef7709f721190fc1b4133e346d0bdf81d
 WHIRLPOOL 
1dcd8df5fe5afbe035b6ce42c59ee32e9ebc8f7e35b0c57afa6404f782baa5f7ab6ea4062e24d7a27fb90a624a310cd8f5053dcdcb504c1c2deb877e24df
-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 d343254..000
--- 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;

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

[Jason Donenfeld]

commit: 097dfa8f8481e073815db9061bb532f47ae424b1
Author: Jason A. Donenfeld  gentoo  org>
AuthorDate: Thu Jan 14 14:53:32 2016 +
Commit: Jason Donenfeld  gentoo  org>
CommitDate: Thu Jan 14 14:53:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=097dfa8f

www-apps/cgit: update git version

 www-apps/cgit/Manifest | 2 +-
 www-apps/cgit/cgit-0.12.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest
index 6cb869c..aa31344 100644
--- a/www-apps/cgit/Manifest
+++ b/www-apps/cgit/Manifest
@@ -1,2 +1,2 @@
 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
+DIST git-2.7.0.tar.xz 3861524 SHA256 
fa9fb34efce9c80527152a40fbae138e83bd04a15ef9111726252259345a7b0d SHA512 
e2d51e3d547229bb1e5c3a92c71476695f23420d9c639f9cb1d953fd00579aad92f9bbaf8f3d45f966c9476da73bf4c11dabf18c06f542de6e4d26e12c43dcf3
 WHIRLPOOL 
e0dc8071ebc4e0558a2f2b9d8b32d840f4278e893777367029e84a57bf52d1d00eadb778a3e6df70c93de8cb754b94ff985ae6025ff98d6276629d7d3318aa19

diff --git a/www-apps/cgit/cgit-0.12.ebuild b/www-apps/cgit/cgit-0.12.ebuild
index 1d65eff..d0337bd 100644
--- a/www-apps/cgit/cgit-0.12.ebuild
+++ b/www-apps/cgit/cgit-0.12.ebuild
@@ -10,7 +10,7 @@ inherit webapp eutils multilib user toolchain-funcs
 
 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
 
-GIT_V="2.3.2"
+GIT_V="2.7.0"
 
 DESCRIPTION="a fast web-interface for git repositories"
 HOMEPAGE="http://git.zx2c4.com/cgit/about;