gentoo resync : 28.04.2019

9 files changed, 141 insertions, 104 deletions

diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 1a2150de8c85..cfcc34d48698 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,7 +1,7 @@
 AUX app.ini 67 BLAKE2B 4ec7b8217486047b419202b3a8a7172ac21ae0e5ad9224cd4f010be730ac5cda9d05bf06dcba2d06f8809900094b3b007ef98dd4ea20a125fb7d3db279f53e4a SHA512 93f6f7cf49dd1ece56f7da711adbb58cc38a503527aeea140837d74456ee6f550a089e897d9cb94382e1eb3f5a5cbe4a61362534463eada08a91f314da0f2108
-AUX gitea.confd 74 BLAKE2B 656800d35c8f0075005e7e9e5c804292f9884663f89f653426064a20cfbcb518f736bd94947a03bce5adad670fb6150d93026999d6d5395f37a85666b6663a2f SHA512 3e05bad19cd924c4375d9ca6fc57142ba4b5ec897a1c789c3fc9710dfcfee209a199c95040eece089ad93e0357486ab98fad0c448a61e318646b7a71845e9a25
-AUX gitea.initd-r1 757 BLAKE2B 7f55ec1e8a052e6789a9df92ffe5cd04b3c96bf67c35481b1364087a2f8580584a43b13838da3682decad92ee72ed403af67227469fc16adc2c0584658816c3b SHA512 c92a1853f3138882876d854293fa05d710d549af03423fe1c430fe465d005282328898860ff0f381297e10ec8ea00a782295cf47c82ba42b4424b7e453135f85
-AUX gitea.service 553 BLAKE2B d5081600bd7a9d8446029f7c40186b064ce6af29eb93e1e360e1523c460d8a8d3b409a54383434cf5b55fa77a0706b8e30f137fe734c6345ce59b996e8b2c195 SHA512 e2535cefaef4e890dc2a99ef204e6fb375f59c849df64f1be18d4dbf29abd7679c8cfc197c1124c9094f8b866d029b778f73a8d27554a0ab1870600f5d6420a5
-DIST gitea-1.7.4.tar.gz 20858340 BLAKE2B 81d896d313abe25bc1a5becd16249c2ce39ab45d9f40ccf3a565b6777847c7256d5b131f597be237df57513a207978e23480ad3c6087bbc588afe8bbcd46d5c9 SHA512 eede6d410529b1facf65061256e48fee7d459aa12d8c55346d3ad78004a45b7bf667536979fe92270a85901102fd9cddb8183490e16f912b742e799ca912e370
-EBUILD gitea-1.7.4.ebuild 2012 BLAKE2B 362f2e876cb489cef8f30bd6587f194be57c985159f53df4ea9273f9e764377b35c1173089a1f1b26dcc2eea6931b1fadb594717eda1980d93b88d5c4a2835a6 SHA512 c7ec4ba8b929327a7503ec47f95a3ee6ab4a802e04d545e6dfcfe2f56d8bcfd82bb9dc50e4c121833a97dc98b9f141243f857227e3dba8a79d80a95fe4cc8615
-MISC metadata.xml 246 BLAKE2B 291057fd61e77f8d99f9518e3f709d79ab79ac5ac5ce1387d27a26cec6272698fe6bda7cfacaeb203411413ed003c71cdaead8316cd9e5a2c1ce1056637eaee4 SHA512 9af718c7e0ca960324b9fc168e85824099a5434a322d7da78dabc90b8cd3be2201a3eb321facd0df575fa1d0865c1f80280d290589f0ff1d27bdef575297abb7
+AUX gitea.confd-r1 243 BLAKE2B 87caa8371f53f52b0a85f720342f9f358dedec9240ab78998655a03df6bf3f301fe077afabdca1b1895dbcab2fa05748735d6f38f9b3ad53534fe8ae6e72db49 SHA512 485dc9d0b86d0a7b3ba958aac9de1129aa0ffbb47219419d38811f2accca2539e49dd93cc4a24b21f1c3802b024aa8449f54e320e8a16197f201532edeca6836
+AUX gitea.initd-r2 736 BLAKE2B abb2733808783b3654b51493451950c07237c005897c630f8ce095f0bacb7f1e59c61f0f1663c5daddcab08121c54eaba4de953d6e03ce1c7b405d0e7de597b6 SHA512 42321bbfaa844ef246b825d36bc1b8227b34d4cb7a5c4ced706203c40dd345e4c163e18bfdaa4899154d6c405f8e42b9b7ea0657e048c496ede1976d958d2228
+AUX gitea.service-r1 557 BLAKE2B 0d255654da33fb9155a6bc29896ab164597667c252b680e2b945109163c09feaa88c28776277a9c7f00d6b5b66cb24bda50e99dde354a5d18ed61597fb1ce917 SHA512 cabe0a1b5a5f435f4fa5b3c20fb76ad1b248463fa681e55a4ae66b027f00574c1fcb65f1841c0bc52b7188a02c0fc05bfa9b11931d26c5efce6b988d4b7a8f57
+DIST gitea-1.8.0.tar.gz 24268907 BLAKE2B b46a17733fc7bd0f228620bdfadf0d596ea56fca6e685afab7734e794c1f87c5e004529ca3d69e907d516bcb83563565b1d8c32501f1c2c0f9295ca028d96ad0 SHA512 eebbe2f77ed2e4c3562f48a6fa647e6f2a0492c5b6ea4f13542a5ef82e94a357a8d53897aa013107b5f735d2aff9d719893b5724de44831c43998c2e9c6e78d7
+EBUILD gitea-1.8.0.ebuild 2441 BLAKE2B 017544ba40e11c49b62ac5657c59c836cacbe8c57164c0549bc34609072d3bd3aae5834c0166f600d38cfebc7805a0ad63bac57b66daa7df1dfde5c74d047f9c SHA512 32792428fe7f93f597c22134a9d946b31eed9424c065c8fc0f74896a6c6c3283df0c7d29da93e23c70f841498f6d9dc5cf1740aeae247c6c5583aedcd128150e
+MISC metadata.xml 563 BLAKE2B 00090c9965433ee21c5ebb4cd7ff83f3c16a870acd9da92842a53349a4bf38dc1239be17ec7545e5b0a44c07e2c93d3dbff599b37fcd4366a2ff41952cb513cb SHA512 fbf0fca0af8b73494e20a965f99f101e7ed08927b8b303189f69586e59b57bdc07781353b9bbd9ba904a53efa85fa91e4a76341ca2083cf9f6769448de700222
diff --git a/www-apps/gitea/files/gitea.confd b/www-apps/gitea/files/gitea.confd
deleted file mode 100644
index 8b1710b06fbc..000000000000
--- a/www-apps/gitea/files/gitea.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# arguments for gitea
-command_args="--config /var/lib/gitea/conf/app.ini"
diff --git a/www-apps/gitea/files/gitea.confd-r1 b/www-apps/gitea/files/gitea.confd-r1
new file mode 100644
index 000000000000..19018c1c645a
--- /dev/null
+++ b/www-apps/gitea/files/gitea.confd-r1
@@ -0,0 +1,14 @@
+# Gitea configuration
+GITEA_CONF="/etc/gitea/app.ini"
+
+# Gitea user
+GITEA_USER="git"
+
+# Gitea group
+GITEA_GROUP="git"
+
+# Gitea working directory
+GITEA_WORK_DIR="/var/lib/gitea"
+
+# Gitea custom directory
+GITEA_CUSTOM="${GITEA_WORK_DIR}/custom"
diff --git a/www-apps/gitea/files/gitea.initd-r1 b/www-apps/gitea/files/gitea.initd-r1
deleted file mode 100644
index 6f957d426c08..000000000000
--- a/www-apps/gitea/files/gitea.initd-r1
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2016-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-description="Gitea, a self-hosted Git service"
-pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
-user=${user:-git}
-group=${group:-git}
-
-command="/usr/bin/gitea web"
-command_args="${command_args:--config /var/lib/gitea/conf/app.ini}"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	-e GITEA_WORK_DIR=${GITEA_WORK_DIR:-/var/lib/gitea} \
-	-e GITEA_CUSTOM=${GITEA_CUSTOM:-/var/lib/gitea} \
-	--stdout /var/log/${SVCNAME}/${SVCNAME}.log \
-	--stderr /var/log/${SVCNAME}/${SVCNAME}.log"
-
-depend() {
-	need net
-	after net
-}
-
-start_pre() {
-	checkpath -d -m 0755 -o "${user}":"${group}" "${pidfile%/*}"
-}
diff --git a/www-apps/gitea/files/gitea.initd-r2 b/www-apps/gitea/files/gitea.initd-r2
new file mode 100644
index 000000000000..24cac0b41f23
--- /dev/null
+++ b/www-apps/gitea/files/gitea.initd-r2
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 2016-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Gitea, a self-hosted Git service"
+
+: ${GITEA_CONF:=/etc/gitea/app.ini}
+: ${GITEA_USER:=git}
+: ${GITEA_GROUP:=git}
+: ${GITEA_WORK_DIR:=/var/lib/gitea}
+: ${GITEA_CUSTOM:=${GITEA_WORK_DIR}/custom}
+
+command="/usr/bin/gitea web"
+command_args="--config ${GITEA_CONF}"
+command_background="true"
+command_user="${GITEA_USER}:${GITEA_GROUP}"
+error_log="/var/log/${RC_SVCNAME}/${RC_SVCNAME}.err"
+output_log="/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+pidfile="/run/${RC_SVCNAME}.pid"
+required_files="${GITEA_CONF}"
+start_stop_daemon_args="-e GITEA_WORK_DIR=${GITEA_WORK_DIR} \
+	-e GITEA_CUSTOM=${GITEA_CUSTOM}"
diff --git a/www-apps/gitea/files/gitea.service b/www-apps/gitea/files/gitea.service-r1
index 733e05ea1ed3..73f924337fd6 100644
--- a/www-apps/gitea/files/gitea.service
+++ b/www-apps/gitea/files/gitea.service-r1
@@ -16,9 +16,9 @@ After=redis.service
 User=git
 Group=git
 
-Environment="GITEA_WORK_DIR=/var/lib/gitea GITEA_CUSTOM=/var/lib/gitea"
+Environment="GITEA_WORK_DIR=/var/lib/gitea GITEA_CUSTOM=/var/lib/gitea/custom"
 WorkingDirectory=/var/lib/gitea
-ExecStart=/usr/bin/gitea web -c /var/lib/gitea/conf/app.ini
+ExecStart=/usr/bin/gitea web --config /etc/gitea/app.ini
 
 Restart=always
 PrivateTmp=true
diff --git a/www-apps/gitea/gitea-1.7.4.ebuild b/www-apps/gitea/gitea-1.7.4.ebuild
deleted file mode 100644
index 6508562a68bb..000000000000
--- a/www-apps/gitea/gitea-1.7.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit golang-build golang-vcs-snapshot systemd user
-
-EGO_PN="code.gitea.io/gitea"
-KEYWORDS="~amd64 ~arm"
-
-DESCRIPTION="A painless self-hosted Git service, written in Go"
-HOMEPAGE="https://github.com/go-gitea/gitea"
-SRC_URI="https://github.com/go-gitea/gitea/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-
-DEPEND="
-	dev-go/go-bindata
-	sys-libs/pam
-"
-RDEPEND="
-	dev-vcs/git
-	sys-libs/pam
-"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/bash /var/lib/gitea git
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/\"main.Version.*$/\"main.Version=${PV}\"/"\
-		-e "s/-ldflags '-s/-ldflags '/" src/${EGO_PN}/Makefile || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} generate
-	TAGS="bindata pam sqlite" LDFLAGS="" CGO_LDFLAGS="" GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} build
-}
-
-src_install() {
-	diropts -m0750 -o git -g git
-	keepdir /var/log/gitea /var/lib/gitea /var/lib/gitea/data
-	pushd src/${EGO_PN} >/dev/null || die
-	dobin gitea
-	insinto /var/lib/gitea/conf
-	newins custom/conf/app.ini.sample app.ini.example
-	popd >/dev/null || die
-	newinitd "${FILESDIR}"/gitea.initd-r1 gitea
-	newconfd "${FILESDIR}"/gitea.confd gitea
-	systemd_dounit "${FILESDIR}/gitea.service"
-}
-
-pkg_postinst() {
-	if [[ ! -e "${EROOT}/var/lib/gitea/conf/app.ini" ]]; then
-		elog "No app.ini found, copying initial config over"
-		cp "${FILESDIR}"/app.ini "${EROOT}"/var/lib/gitea/conf/ || die
-		chown git:git /var/lib/gitea/conf/app.ini
-		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitea)."
-	else
-		elog "app.ini found, please check example file for possible changes"
-		ewarn "Please note that environment variables have been changed:"
-		ewarn "GITEA_WORK_DIR is set to /var/lib/gitea (previous value: unset)"
-		ewarn "GITEA_CUSTOM is set to '\$GITEA_WORK_DIR/custom' (previous: /var/lib/gitea)"
-	fi
-}
diff --git a/www-apps/gitea/gitea-1.8.0.ebuild b/www-apps/gitea/gitea-1.8.0.ebuild
new file mode 100644
index 000000000000..7905bbf3153a
--- /dev/null
+++ b/www-apps/gitea/gitea-1.8.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit golang-vcs-snapshot systemd user
+
+EGO_PN="code.gitea.io/gitea"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+DESCRIPTION="A painless self-hosted Git service"
+HOMEPAGE="https://gitea.io"
+SRC_URI="https://github.com/go-gitea/gitea/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="pam sqlite"
+
+COMMON_DEPEND="pam? ( sys-libs/pam )"
+DEPEND="${COMMON_DEPEND}
+	dev-go/go-bindata"
+RDEPEND="${COMMON_DEPEND}
+	dev-vcs/git"
+
+DOCS=( custom/conf/app.ini.sample CONTRIBUTING.md README.md )
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/bash /var/lib/gitea git
+}
+
+gitea_make() {
+	local my_tags=(
+		bindata
+		$(usev pam)
+		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
+	)
+	local my_makeopt=(
+		DRONE_TAG=${PV}
+		TAGS="${my_tags[@]}"
+	)
+	GOPATH=${WORKDIR}/${P}:$(get_golibdir_gopath) emake "${my_makeopt[@]}" "$1"
+}
+
+src_compile() {
+	gitea_make generate
+	gitea_make build
+}
+
+src_test() {
+	gitea_make test
+}
+
+src_install() {
+	einstalldocs
+	dobin gitea
+	newconfd "${FILESDIR}"/gitea.confd-r1 gitea
+	newinitd "${FILESDIR}"/gitea.initd-r2 gitea
+	systemd_newunit "${FILESDIR}"/gitea.service-r1 gitea.service
+	diropts -m0750 -o git -g git
+	keepdir /etc/gitea
+	keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
+	keepdir /var/log/gitea
+}
+
+pkg_postinst() {
+	ewarn "The configuration path has been changed to ${EROOT}/etc/gitea/app.ini."
+	ewarn "Please adapt the gitea-repositories hooks and ssh authorized_keys."
+	ewarn "Depending on your configuration you should run something like:"
+	ewarn "sed -i -e 's#/var/lib/gitea/conf/app.ini#/etc/gitea/app.ini#' \\"
+	ewarn "  /var/lib/gitea/gitea-repositories/*/*/hooks/*/* \\"
+	ewarn "  /var/lib/gitea/.ssh/authorized_keys"
+
+	if [[ ! -e "${EROOT}/etc/gitea/app.ini" ]]; then
+		elog "No app.ini found, copying initial config over"
+		cp "${FILESDIR}"/app.ini "${EROOT}"/etc/gitea/ || die
+		chown git:git "${EROOT}"/etc/gitea/app.ini || die
+		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitea)."
+	else
+		elog "app.ini found, please check the sample file for possible changes"
+		ewarn "Please note that environment variables have been changed:"
+		ewarn "GITEA_WORK_DIR is set to /var/lib/gitea (previous value: unset)"
+		ewarn "GITEA_CUSTOM is set to '\$GITEA_WORK_DIR/custom' (previous: /var/lib/gitea)"
+	fi
+}
diff --git a/www-apps/gitea/metadata.xml b/www-apps/gitea/metadata.xml
index 7dc0896c7b07..df58a68c26f0 100644
--- a/www-apps/gitea/metadata.xml
+++ b/www-apps/gitea/metadata.xml
@@ -1,7 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>xdch47@posteo.de</email>
+		<name>Felix Neumärker</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>nemunaire@nemunai.re</email>
+		<name>Pierre-Olivier Mercier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">go-gitea/gitea</remote-id>
 	</upstream>