gentoo resync : 28.11.2020

7 files changed, 125 insertions, 39 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index da25682e8bdc..da8698279386 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest
index c961b6830173..edd206d98b86 100644
--- a/www-apps/cgit/Manifest
+++ b/www-apps/cgit/Manifest
@@ -5,6 +5,7 @@ DIST cgit-1.2.3.tar.xz 90632 BLAKE2B 594a9b2ae0b449e0ef090f428f955cc02833f5f5b1e
 DIST git-2.18.0.tar.xz 5102264 BLAKE2B 94a8469a0e489d517136233301f1af622a3e612967316620800a771721f4e558dfb9159f158ddd07d294fce3ceb256038483f5a8c1fe6a84f661710857945dce SHA512 db19363c9c2042248322d49874a27c0614acfb912183725e5d4f0331d6b44cef66a9a7da6a49bd4a17e5d86d30c5fed6bef7527f386494184595a433c4060e46
 DIST git-2.25.1.tar.xz 5875548 BLAKE2B 582da3d4ac996d7b9ce6cf505661496ab1a2cd061f058745350498121956b33d79739b567fb5fea0b4e298303261256034aa0b8da0b842feab04ae67a7d5b142 SHA512 15241143acfd8542d85d2709ac3c80dbd6e8d5234438f70c4f33cc71a2bdec3e32938df7f6351e2746d570b021d3bd0b70474ea4beec0c51d1fc45f9c287b344
 EBUILD cgit-1.2.1.ebuild 2347 BLAKE2B d9df9cbae9d4e6110e8cc4ef185993617f09838aae5df53b0e275cbe4fb0eac0729f4be643b19e219ec21d92cab236092bdc63e2293eefcee3fd23dfd764bd65 SHA512 1aceb24cc626f4d3c8a4ce7219d276979647b6f177ae8cb25ad2586397420bf3942bd2bd4c543355b208fe8c2eb48224943dee8614a6e568ff3f573a112d047b
+EBUILD cgit-1.2.3-r1.ebuild 2458 BLAKE2B 297231fdfc91bec9c6f2dbf697063f2483d5cff69da6ded09ddb302d6a4d5faae34cdab07d003044fe41d389de629373d51513994cdea52e5c7ed3afa251f8d0 SHA512 b1c1a66a19b940340e74f42d7a68b2ceb22668adfb93449c0a67d80a0ad9df644c61ec775e7db5dbf78a11f3ac05de4f46a0219dcf906bf65bfeae0c020482a6
 EBUILD cgit-1.2.3.ebuild 2356 BLAKE2B 5e39bfa383449891743deabbcb039e587b9c3d28a15a9d687b14cec9a73638a5611d3caa1431ea65bf9e918e5d32a2a73e7b2276dd6b568aa8868828247ff041 SHA512 5b9392924214fc0d2a64028108f7bf9674c2ec0b07695b0ef511876b2d3a7e585e3bc213068561c802f647fb7371b886e783ca4a835b6cefeddc3d9af68dcd88
-EBUILD cgit-9999.ebuild 2139 BLAKE2B f732529b2b3da6ea011d110843b56dafacc4e7faea92d4f2d5d9757de1e92190c81445ae0bf94c750249b87364252620e8357bf23c3a0237de947094bf3865ce SHA512 d29655eb8d1219aade639eac70ef8bbcb125bd922ce0f5865135c06444a1aee08313dbdc40c915716965abaa5aae62b578e59b9abcc34b6b332f977fe60255bb
-MISC metadata.xml 692 BLAKE2B 686d1d71de3f247f8ed3609dc304f70e555dc5234a3a715974ef590251591b7188bd563c30c6895ef89b162d94941e9c23db15591375f58ce2523e1780a58ef2 SHA512 eec0e54b7308526767247245f719685f122e97fa7fea524e645dd3604f13cc220e9e381d2f87b452adf195e893e5bccabab70b0d9d7feaead4d60c59b5e27240
+EBUILD cgit-9999.ebuild 2302 BLAKE2B d10aea4b88887ae0d643dd3cf2c0e94749a3e8ce6f4bc1f9b815759635aa9b72d35d17f2276805dbd2695e77491bac0526bfc8200a3319992cd127818fc095e0 SHA512 0618de0855f371b636d72de20edc200f215108bdbbbaa0778318aa0af37f8209882ce987c7b807ece47d2f87e103b3f007cae94d66c4a4e4b0c6ce274b08cb47
+MISC metadata.xml 685 BLAKE2B 2793077bfed6ffb365ca0bcff6b58c0973f3dd832829e0f93a69a81833e0b9a2d8d9aa7b4338591b6d52037f4da1b6fd6f0faf69c712997325b0c610c241a08e SHA512 a81af07e4c6da49fb9a2c921fe3d610715ae9833bfa58e38fbbfcbfa67c071c15d48ebcc8726872017bfd901f6b4f67990a3c45c4ba6891900a8fb5245f2ddc3
diff --git a/www-apps/cgit/cgit-1.2.3-r1.ebuild b/www-apps/cgit/cgit-1.2.3-r1.ebuild
new file mode 100644
index 000000000000..707d23f3bcc5
--- /dev/null
+++ b/www-apps/cgit/cgit-1.2.3-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WEBAPP_MANUAL_SLOT="yes"
+
+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="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 +luajit test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-group/cgit
+	acct-user/cgit
+	dev-vcs/git
+	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}
+	doc? ( app-text/docbook-xsl-stylesheets
+		>=app-text/asciidoc-8.5.1 )
+"
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+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 luajit; then
+			echo "LUA_PKGCONFIG = luajit" >> cgit.conf
+		else
+			echo "LUA_PKGCONFIG = lua" >> cgit.conf
+		fi
+	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."
+}
diff --git a/www-apps/cgit/cgit-9999.ebuild b/www-apps/cgit/cgit-9999.ebuild
index 6c5cb1217c44..4b617428b6e8 100644
--- a/www-apps/cgit/cgit-9999.ebuild
+++ b/www-apps/cgit/cgit-9999.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,22 @@ 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 test"
+RESTRICT="!test? ( 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 ) )
+	!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 +42,6 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	webapp_pkg_setup
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
 }
 
 src_prepare() {
@@ -59,7 +61,7 @@ src_prepare() {
 		echo "NO_LUA = 1" >> cgit.conf
 	fi
 
-	epatch_user
+	eapply_user
 }
 
 src_compile() {
@@ -86,6 +88,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/metadata.xml b/www-apps/cgit/metadata.xml
index 7c228e381512..731100a1b49a 100644
--- a/www-apps/cgit/metadata.xml
+++ b/www-apps/cgit/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>zx2c4@gentoo.org</email>
-		<name>Jason A. Donenfeld</name>
+		<email>bman@gentoo.org</email>
+		<name>Aaron Bauman</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>web-apps@gentoo.org</email>
diff --git a/www-apps/jekyll-sitemap/Manifest b/www-apps/jekyll-sitemap/Manifest
index 64d923106b94..14f7e0dfc148 100644
--- a/www-apps/jekyll-sitemap/Manifest
+++ b/www-apps/jekyll-sitemap/Manifest
@@ -1,5 +1,3 @@
-DIST jekyll-sitemap-0.13.0.tar.gz 65036 BLAKE2B 88477a9c1ee57975927e9b2a6044322d2c838eb3beded1263158ce4574fbc524453763c55026f88039746e77cbb7ff169dc2601fd0cb65f67d60a4a4252ec040 SHA512 97966c37c7126ac8d9d51069c8d5c448523fa06a7b2136baa1742495e21c76d0264a145e72896b4843111f519a9ddb4d7eab35bc1ea0130a3a77c3ff59066364
 DIST jekyll-sitemap-1.4.0.tar.gz 68362 BLAKE2B df3b55198b5f5f7f26f76c0f164ecbfb11a5d0dd8c5f8fd191cdf2fa090585b7f5c072460b1f78fc0e4cf058366a05a249975f2c72424f2fb8cb5c94ec1e72c4 SHA512 1c2f1bfb72576b45a26be657b39ac18c13da33fbdf69dbf0dbb58cae96c826a838ea5145f2f664796b15cfe098ac7f2ddc21d8145ee105b2dd17a14af076151b
-EBUILD jekyll-sitemap-0.13.0.ebuild 629 BLAKE2B 7ceea2492dfcbbc151202631bab09230cdd750f6e81f02497d7ceeda073b46b97fca3ca0b0688d900b7122326f78eceddba7c982feee19dc3be8fff8c7563579 SHA512 be66e44c9aedce9b6296b3c51ac075e614c449857ca41d62f6df892a26fbfbcce3834ca5d7e445fbb3dc911ce28993f19f3d5036489f3daf8ec7df6e5a27b062
 EBUILD jekyll-sitemap-1.4.0.ebuild 694 BLAKE2B 4f9a3d988a9bec0fe22db09e9090e679d770eb95cbdcd11bdd5cb1fc3af70959704ebbcbe45d5aa2ee50cef3b185c0cf3e20a90547a29274d909116a3192abd6 SHA512 db9e84b7ed82af8382df71ad68bd5f6dc64d2d52abfcc55e8e415d6059d8cb1c547d2c8c3cc98b77c4cc5167549e22fb47b1a2f71f35e26bc7cab508524df4d1
 MISC metadata.xml 253 BLAKE2B 04790d797238d114af848d448e7edfc2a4e14c62b472a24e1097cf831989b0042e4c6770e8a63d7285f4245dfce2787887f2db04d175923037a064c28b192490 SHA512 03899ba135dd5ebedf0c0157aeb74d2facdedbc4ea842a1f9133c0f20b8c49596dacc8f376810fe133ed8571adc0acee4dfd854bcf5f33b3f5c2a1d116250712
diff --git a/www-apps/jekyll-sitemap/jekyll-sitemap-0.13.0.ebuild b/www-apps/jekyll-sitemap/jekyll-sitemap-0.13.0.ebuild
deleted file mode 100644
index fefc68f4e8b2..000000000000
--- a/www-apps/jekyll-sitemap/jekyll-sitemap-0.13.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Automatically generate a sitemap.xml for your Jekyll site"
-HOMEPAGE="https://github.com/jekyll/jekyll-sitemap"
-SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
-ruby_add_rdepend ">=dev-ruby/addressable-2.4.0"