From 6b44fcda9a2895e8c242949bcc0fcc9096d69353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Tue, 10 Dec 2019 13:48:44 +0100 Subject: [PATCH] [www-apps/gitea] sync from gentoo pr again --- www-apps/gitea/gitea-1.10.1.ebuild | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/www-apps/gitea/gitea-1.10.1.ebuild b/www-apps/gitea/gitea-1.10.1.ebuild index bbca677..1063264 100644 --- a/www-apps/gitea/gitea-1.10.1.ebuild +++ b/www-apps/gitea/gitea-1.10.1.ebuild @@ -46,17 +46,24 @@ S="${WORKDIR}/${P}/src/${EGO_PN}" PATCHES=( "${FILESDIR}/gitea-logflags.patch" ) gitea_make() { - local my_tags=( + local gitea_tags=( bindata $(usev pam) $(usex sqlite 'sqlite sqlite_unlock_notify' '') ) - local my_makeopt=( - TAGS="${my_tags[@]}" - LDFLAGS="-extldflags \"${LDFLAGS}\"" + local gitea_settings=( + "-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/etc/app.ini" + "-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/var/lib/gitea/custom" + "-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea" ) - [[ ${PV} != 9999* ]] && my_makeopt+=("DRONE_TAG=${MY_PV}") - env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" "${my_makeopt[@]}" emake "$@" + local makeenv=( + TAGS="${gitea_tags[@]}" + LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_vars[@]}" + GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" + ) + [[ ${PV} != 9999* ]] && makeenv+=("DRONE_TAG=${PV}") + + env "${makeenv[@]}" emake "$@" } src_prepare() {