gentoo resync : 02.06.2018

8 files changed, 124 insertions, 149 deletions

diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index b4042b408caa..7ed740ebd3ca 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,10 +1,11 @@
+AUX app.ini 67 BLAKE2B 4ec7b8217486047b419202b3a8a7172ac21ae0e5ad9224cd4f010be730ac5cda9d05bf06dcba2d06f8809900094b3b007ef98dd4ea20a125fb7d3db279f53e4a SHA512 93f6f7cf49dd1ece56f7da711adbb58cc38a503527aeea140837d74456ee6f550a089e897d9cb94382e1eb3f5a5cbe4a61362534463eada08a91f314da0f2108
 AUX gitea.confd 74 BLAKE2B 656800d35c8f0075005e7e9e5c804292f9884663f89f653426064a20cfbcb518f736bd94947a03bce5adad670fb6150d93026999d6d5395f37a85666b6663a2f SHA512 3e05bad19cd924c4375d9ca6fc57142ba4b5ec897a1c789c3fc9710dfcfee209a199c95040eece089ad93e0357486ab98fad0c448a61e318646b7a71845e9a25
-AUX gitea.initd 681 BLAKE2B 779865d105fa7f9dc84ddfd35c9b068190617d436ae109b13997ad01c9b83a038ae1f9467fcd9e1781386d61a9aaa90c9415a756bcdb5fef9e2dd29b2c0a2c86 SHA512 4565a201f34e5beecc8b535c677e308718a3df91f78a1a7132dda70bc4131871ad9f007c76490c23a001357ce78172a0a22c3e5ff9f3deaa7032e1d8cb11e986
+AUX gitea.initd 688 BLAKE2B eb2341dee53f3fd92c49137855615d9ae7ca77efc396e2d2ed8b624ed2776c7522455a469c00172ecbbe2151ccab476baa0c779baf8a39f63348bdc7ebbd29c2 SHA512 4a6bba463c9abafcb6fc9f3854efd1a69fb3b213c2b34ff6a233f90db535c2ab0f375a0809e4c4be6651ed60d7696a54148a5ee9192567d70ca6a5203a8d3266
+AUX gitea.initd-r1 688 BLAKE2B eb2341dee53f3fd92c49137855615d9ae7ca77efc396e2d2ed8b624ed2776c7522455a469c00172ecbbe2151ccab476baa0c779baf8a39f63348bdc7ebbd29c2 SHA512 4a6bba463c9abafcb6fc9f3854efd1a69fb3b213c2b34ff6a233f90db535c2ab0f375a0809e4c4be6651ed60d7696a54148a5ee9192567d70ca6a5203a8d3266
 AUX gitea.logrotated 87 BLAKE2B 373830ddd6eed0ce2f0f7b1dab14e4a253e5a56a73f477cfadbc6deec373846d4df2d697735391581771699d5a6513acb0e14a446873de01eba10d19e3a6bd88 SHA512 798f3fc33026f19dd31ffa78b9b1ed313d7b82b19c047f509e896c1798b2925a1bb7c4998d98a6b47e728979bf7132fb1c2a80eb7fda096a763d6791631cb6d4
-DIST gitea-1.2.3.tar.gz 14336812 BLAKE2B 9c0d1aed458cb2accaf6138f949a6f49b470ae32b75dd921b88cac93cfc61c361791270541fbeae9ecc300b8266abcc1d0b677514536d0697c5a2952b74af18e SHA512 b519bb2fae20da75444a9cb971ab1db0aed04261c6522464feb2e0bad28bc5b8fff3ce8a85f8d26e9cfe79b41c29e540b3ff0aa0c3e99ce90e9e9a1ec26a165e
-DIST gitea-1.3.0.tar.gz 14780025 BLAKE2B a290bf1583a741cfee5ff69c7997114d802643dc0b213a41bbac08713201ce05192d9ad4d7b33639ae173b79d3c5dbd154b7fd753a744ec64550df4786fdc5a2 SHA512 51cfcb53a039ce8c7995748bd54ea34b88b404de35ef6c9c5742b220fee814fe81670634aa272bbd0002431e70e757b0e460d159e41b7378c93cd5aa820d45f4
+AUX gitea.service 472 BLAKE2B 4c728e2987d0c0a86e65d4b9c1a59f6193ff8a3f9b066991a06f495ad1c5586b3497c71fca1cce5b65f167af09343e7bf3215ee5e8fdefa539e384198d2d88d6 SHA512 6666fe3b4cdbb78a58db4a6bf47a15e6be9ab30b666c6eb77a9e8a002d8c0abd510fc75ef463a11ee6892ab12c98943774616072cb64fd9f2fa42ff8f676aa95
 DIST gitea-1.3.1.tar.gz 14783710 BLAKE2B 20e333719aa1a670488046406dc942fd843fcb2ea92473006e255a6a8f2f00709bf87443a425302d0c73916260a5d2e7876e00233a3e1ceb657439ac3d7a4873 SHA512 45161e089d5437b5aacc9589a50a61da3a8f4c88edb33fe3605eb49f36f67cb0a8a80f261016745a6c5131755f7963b1b61df62e47aab2bcd43a6932dceadd0f
-EBUILD gitea-1.2.3.ebuild 2450 BLAKE2B 4fde7a51dca944783b98971a453b3cb664ff34038330ecc7fee1768ad93f1fde6979e75b7f148b01aaacd1d6ebb75b124ac51cf8e0c445e532a8b15280f36f75 SHA512 f873a3a5f85ff38331e21eb14efe3e2db57bc68ef4d831d214a8aecfe48b101629909408db916614d80d72ea54afe4e93774db7d83b3d2d8baeaef485656cb7f
-EBUILD gitea-1.3.0.ebuild 2450 BLAKE2B 65d8e7866da5a03dd4e7c019817eb9409fa1d7b208aa0a4b1b592542e7520c73e690a3677d00e7a2033201fe1bbdf04b8a662d0263c0aa69eaef479ac298d98c SHA512 1641fa072b20af22bfe215baa7fc4b2dcad0c4bcb29f18a5a9e09396ab6c0a28323aed6a1f39658f045f32a3ae4d0b0da0ab54a4c39a4a463d26d297374eb0c2
+DIST gitea-1.4.1.tar.gz 14978598 BLAKE2B 8fde79291b745750e79c944e7fcf938d2476ddaa386c1277f54bf315831eeb749507e270ca0a8a8351dd8fa60656bb98eb7c478a5c99f2ac20d350b6054339d5 SHA512 3b812bd61215230035ec9241e953f239981d04580d931f379aa550e11d2f7facd56bf70ac9e2d866224d341570a238bcc5c2fa71fd1432cfb95b8c8b703784e6
 EBUILD gitea-1.3.1.ebuild 2450 BLAKE2B 8137193f6d6c6495d0829a82841a82c0d079cab03e440176932db89f720938888e2294c8cedc3562e7bfd41ae67aa8f24e1dffe07cec2b203d58b5daf466f64b SHA512 edc7382e856957dcd2e4c5c9a86c0b3fa01f576f1c014b31900496f852aa942281b293ad27595f440434fb6b46470197c97d63c78defd7daf51d77f937c5505a
+EBUILD gitea-1.4.1.ebuild 1892 BLAKE2B 09a05d287962d04ac368be5a9a20f65d1310231a55e90e10fb3dc9d2da79aaf94a16bf24a1f4d6be7cc27be4130a7e2edcf91fc05cad6c20077a98c09123e3b7 SHA512 aa22f9c026cb5741679c1fa8783ac9aceb1ff413d96e4a422e7f21ae5fd4ab12872b330fd58b790a9cfcf121a519a73a44016270a6919b1cd076a6ca70693998
 MISC metadata.xml 324 BLAKE2B 66e4bf11fea6a0b4a0ca353849e1a4aaf32c0a1680c36f1e74fe155705806a822c277487f551e82ad0a3740b4faf9f1f8b2b2ce24781774da6c9f21a3f094f57 SHA512 7b0e56ffe4652157a5126ae7cb7cc6b557ec8367dac02c28f69243181147855dc0e96fe09dd7ff507052a7f5382445deb98090175e06d030fe635990812820ee
diff --git a/www-apps/gitea/files/app.ini b/www-apps/gitea/files/app.ini
new file mode 100644
index 000000000000..5dd998f60ee2
--- /dev/null
+++ b/www-apps/gitea/files/app.ini
@@ -0,0 +1,4 @@
+[log]
+MODE      = file
+LEVEL     = Info
+ROOT_PATH = /var/log/gitea
diff --git a/www-apps/gitea/files/gitea.initd b/www-apps/gitea/files/gitea.initd
index ea618140c580..837164aa0140 100644
--- a/www-apps/gitea/files/gitea.initd
+++ b/www-apps/gitea/files/gitea.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 2016 Gentoo Foundation
+# Copyright 2016-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 description="Gitea, a self-hosted Git service"
@@ -11,7 +11,7 @@ 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_CUSTOM=/var/lib/gitea
+	-e GITEA_WORK_DIR=/var/lib/gitea
 	--stdout /var/log/${SVCNAME}/${SVCNAME}.log \
 	--stderr /var/log/${SVCNAME}/${SVCNAME}.log"
 
diff --git a/www-apps/gitea/files/gitea.initd-r1 b/www-apps/gitea/files/gitea.initd-r1
new file mode 100644
index 000000000000..837164aa0140
--- /dev/null
+++ b/www-apps/gitea/files/gitea.initd-r1
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+# Copyright 2016-2018 Gentoo Foundation
+# 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=/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.service b/www-apps/gitea/files/gitea.service
new file mode 100644
index 000000000000..3fdbc1fd0c3d
--- /dev/null
+++ b/www-apps/gitea/files/gitea.service
@@ -0,0 +1,26 @@
+[Unit]
+Description=Gitea service
+Documentation=https://gitea.io
+
+AssertPathIsDirectory=/var/lib/gitea
+AssertPathIsReadWrite=/var/lib/gitea
+
+After=network.target
+Requires=network.target
+After=mysqld.service
+Requires=mysqld.service
+
+[Service]
+User=git
+Group=git
+
+Environment="GITEA_CUSTOM=/var/lib/gitea"
+WorkingDirectory=/var/lib/gitea
+ExecStart=/usr/bin/gitea web -c /var/lib/gitea/conf/app.ini
+
+Restart=always
+PrivateTmp=true
+Nice=5
+
+[Install]
+WantedBy=multi-user.target
diff --git a/www-apps/gitea/gitea-1.2.3.ebuild b/www-apps/gitea/gitea-1.2.3.ebuild
deleted file mode 100644
index 7aa9e07d1af9..000000000000
--- a/www-apps/gitea/gitea-1.2.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="code.gitea.io/gitea"
-GIT_COMMIT="09bd057"
-ARCHIVE_URI="https://github.com/go-gitea/gitea/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm"
-
-DESCRIPTION="A painless self-hosted Git service, written in Go"
-HOMEPAGE="https://github.com/go-gitea/gitea"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-go/go-bindata"
-RDEPEND="dev-vcs/git"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/bash /var/lib/gitea git
-}
-
-src_prepare() {
-	default
-	local GITEA_PREFIX=${EPREFIX}/var/lib/gitea
-	sed -i -e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT}/"\
-		-e "s/\"main.Version.*$/\"main.Version=${PV}\"/"\
-		-e "s/-ldflags '-s/-ldflags '/" src/${EGO_PN}/Makefile || die
-	sed -i -e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${GITEA_PREFIX}/data#"\
-		-e "s#^PATH = data/gitea.db#PATH = ${GITEA_PREFIX}/data/gitea.db#"\
-		-e "s#^PROVIDER_CONFIG = data/sessions#PROVIDER_CONFIG = ${GITEA_PREFIX}/data/sessions#"\
-		-e "s#^AVATAR_UPLOAD_PATH = data/avatars#AVATAR_UPLOAD_PATH = ${GITEA_PREFIX}/data/avatars#"\
-		-e "s#^TEMP_PATH = data/tmp/uploads#TEMP_PATH = ${GITEA_PREFIX}/data/tmp/uploads#"\
-		-e "s#^PATH = data/attachments#PATH = ${GITEA_PREFIX}/data/attachments#"\
-		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"\
-		-e "s#^ISSUE_INDEXER_PATH =#ISSUE_INDEXER_PATH = ${GITEA_PREFIX}/indexers/issues.bleve#"\
-		src/${EGO_PN}/conf/app.ini || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} generate
-	TAGS="bindata pam sqlite" LDFLAGS="" CGO_LDFLAGS="-fno-PIC" GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} build
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin gitea
-	insinto /var/lib/gitea/conf
-	newins conf/app.ini app.ini.example
-	popd || die
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/gitea.logrotated gitea
-	newinitd "${FILESDIR}"/gitea.initd gitea
-	newconfd "${FILESDIR}"/gitea.confd gitea
-	keepdir /var/log/gitea /var/lib/gitea/data
-	fowners -R git:git /var/log/gitea /var/lib/gitea/
-}
-
-pkg_postinst() {
-	if [[ ! -e ${EROOT}/var/lib/gitea/conf/app.ini ]]; then
-		elog "No app.ini found, copying the example over"
-		cp "${EROOT}"/var/lib/gitea/conf/app.ini{.example,} || die
-	else
-		elog "app.ini found, please check example file for possible changes"
-	fi
-}
diff --git a/www-apps/gitea/gitea-1.3.0.ebuild b/www-apps/gitea/gitea-1.3.0.ebuild
deleted file mode 100644
index e58ca758c83f..000000000000
--- a/www-apps/gitea/gitea-1.3.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="code.gitea.io/gitea"
-GIT_COMMIT="974cffe"
-ARCHIVE_URI="https://github.com/go-gitea/gitea/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm"
-
-DESCRIPTION="A painless self-hosted Git service, written in Go"
-HOMEPAGE="https://github.com/go-gitea/gitea"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-go/go-bindata"
-RDEPEND="dev-vcs/git"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/bash /var/lib/gitea git
-}
-
-src_prepare() {
-	default
-	local GITEA_PREFIX=${EPREFIX}/var/lib/gitea
-	sed -i -e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT}/"\
-		-e "s/\"main.Version.*$/\"main.Version=${PV}\"/"\
-		-e "s/-ldflags '-s/-ldflags '/" src/${EGO_PN}/Makefile || die
-	sed -i -e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${GITEA_PREFIX}/data#"\
-		-e "s#^PATH = data/gitea.db#PATH = ${GITEA_PREFIX}/data/gitea.db#"\
-		-e "s#^PROVIDER_CONFIG = data/sessions#PROVIDER_CONFIG = ${GITEA_PREFIX}/data/sessions#"\
-		-e "s#^AVATAR_UPLOAD_PATH = data/avatars#AVATAR_UPLOAD_PATH = ${GITEA_PREFIX}/data/avatars#"\
-		-e "s#^TEMP_PATH = data/tmp/uploads#TEMP_PATH = ${GITEA_PREFIX}/data/tmp/uploads#"\
-		-e "s#^PATH = data/attachments#PATH = ${GITEA_PREFIX}/data/attachments#"\
-		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"\
-		-e "s#^ISSUE_INDEXER_PATH =#ISSUE_INDEXER_PATH = ${GITEA_PREFIX}/indexers/issues.bleve#"\
-		src/${EGO_PN}/conf/app.ini || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} generate
-	TAGS="bindata pam sqlite" LDFLAGS="" CGO_LDFLAGS="-fno-PIC" GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} build
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin gitea
-	insinto /var/lib/gitea/conf
-	newins conf/app.ini app.ini.example
-	popd || die
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/gitea.logrotated gitea
-	newinitd "${FILESDIR}"/gitea.initd gitea
-	newconfd "${FILESDIR}"/gitea.confd gitea
-	keepdir /var/log/gitea /var/lib/gitea/data
-	fowners -R git:git /var/log/gitea /var/lib/gitea/
-}
-
-pkg_postinst() {
-	if [[ ! -e ${EROOT}/var/lib/gitea/conf/app.ini ]]; then
-		elog "No app.ini found, copying the example over"
-		cp "${EROOT}"/var/lib/gitea/conf/app.ini{.example,} || die
-	else
-		elog "app.ini found, please check example file for possible changes"
-	fi
-}
diff --git a/www-apps/gitea/gitea-1.4.1.ebuild b/www-apps/gitea/gitea-1.4.1.ebuild
new file mode 100644
index 000000000000..41abc1c912b1
--- /dev/null
+++ b/www-apps/gitea/gitea-1.4.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user systemd golang-build golang-vcs-snapshot
+
+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"
+IUSE=""
+
+DEPEND="dev-go/go-bindata"
+RDEPEND="dev-vcs/git"
+
+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="-fno-PIC" GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} build
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin gitea
+	insinto /var/lib/gitea/conf
+	newins custom/conf/app.ini.sample app.ini.example
+	popd || die
+	newinitd "${FILESDIR}"/gitea.initd-r1 gitea
+	newconfd "${FILESDIR}"/gitea.confd gitea
+	keepdir /var/log/gitea /var/lib/gitea/data
+	fowners -R git:git /var/log/gitea /var/lib/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
+	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
+}