From b5fe56f50b1809fbfcaa4192618914025a38013e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Tue, 15 Mar 2022 21:33:50 +0100 Subject: [PATCH] [www-apps/gitea] remove ancient --- www-apps/gitea/Manifest | 1 - www-apps/gitea/files/1.12-fix-vendoring.patch | 13 -- www-apps/gitea/files/gitea-logflags.patch | 139 ------------------ www-apps/gitea/files/gitea.confd-r1 | 14 -- www-apps/gitea/files/gitea.initd-r3 | 22 --- www-apps/gitea/files/gitea.service-r2 | 34 ----- www-apps/gitea/gitea-1.12.1.ebuild | 126 ---------------- www-apps/gitea/metadata.xml | 12 -- 8 files changed, 361 deletions(-) delete mode 100644 www-apps/gitea/Manifest delete mode 100644 www-apps/gitea/files/1.12-fix-vendoring.patch delete mode 100644 www-apps/gitea/files/gitea-logflags.patch delete mode 100644 www-apps/gitea/files/gitea.confd-r1 delete mode 100644 www-apps/gitea/files/gitea.initd-r3 delete mode 100644 www-apps/gitea/files/gitea.service-r2 delete mode 100644 www-apps/gitea/gitea-1.12.1.ebuild delete mode 100644 www-apps/gitea/metadata.xml diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest deleted file mode 100644 index aa1130e..0000000 --- a/www-apps/gitea/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gitea-1.12.1.tar.gz 135104234 BLAKE2B 36510e25e8c2cc1c718702a7cd0be74bbf5448beb33a90732599a4830b0899b37dfc9a58e3a8ffdb5037e93f185ba3b09a0ac7b8acd629c46b1982d6aeab1ec1 SHA512 6ba8a703272e611aac4c214cd818490a9615a9ab9b64ec22ec2c6331e865226324896f600218fb3b39cea7b6649456db7ff18e1857ece6964ab5d3c6d99c3aec diff --git a/www-apps/gitea/files/1.12-fix-vendoring.patch b/www-apps/gitea/files/1.12-fix-vendoring.patch deleted file mode 100644 index 9baff97..0000000 --- a/www-apps/gitea/files/1.12-fix-vendoring.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/vendor/modules.txt b/vendor/modules.txt -index efbc866..1c34104 100644 ---- a/vendor/modules.txt -+++ b/vendor/modules.txt -@@ -845,6 +845,8 @@ gopkg.in/yaml.v2 - # mvdan.cc/xurls/v2 v2.1.0 - ## explicit - mvdan.cc/xurls/v2 -+# src.techknowlogick.com/xgo v0.0.0-20200602060627-a09175ea9056 -+## explicit - # strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251 - ## explicit - strk.kbt.io/projects/go/libravatar diff --git a/www-apps/gitea/files/gitea-logflags.patch b/www-apps/gitea/files/gitea-logflags.patch deleted file mode 100644 index bbe6e55..0000000 --- a/www-apps/gitea/files/gitea-logflags.patch +++ /dev/null @@ -1,139 +0,0 @@ - -#Patch to make gitea logging less verbose. - -diff --git a/modules/log/flags.go b/modules/log/flags.go -index 992fc62dd..5578a1b6b 100644 ---- a/modules/log/flags.go -+++ b/modules/log/flags.go -@@ -31,7 +31,7 @@ const ( - Lmedfile = Lshortfile | Llongfile - - // LstdFlags is the initial value for the standard logger -- LstdFlags = Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial -+ LstdFlags = Ldate | Ltime | Llevelinitial - ) - - var flagFromString = map[string]int{ - - -#Just patching the tests to keep working with the patch above (avoid using LstdFlags) - -diff --git a/modules/log/conn_test.go b/modules/log/conn_test.go -index cc3d758fa..295bee37f 100644 ---- a/modules/log/conn_test.go -+++ b/modules/log/conn_test.go -@@ -40,7 +40,7 @@ func TestConnLogger(t *testing.T) { - - prefix := "TestPrefix " - level := INFO -- flags := LstdFlags | LUTC | Lfuncname -+ flags := Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname - - logger := NewConn() - connLogger := logger.(*ConnLogger) -@@ -112,7 +112,7 @@ func TestConnLoggerCloseBeforeSend(t *testing.T) { - - prefix := "TestPrefix " - level := INFO -- flags := LstdFlags | LUTC | Lfuncname -+ flags := Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname - - logger := NewConn() - -@@ -126,7 +126,7 @@ func TestConnLoggerFailConnect(t *testing.T) { - - prefix := "TestPrefix " - level := INFO -- flags := LstdFlags | LUTC | Lfuncname -+ flags := Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname - - logger := NewConn() - -@@ -169,7 +169,7 @@ func TestConnLoggerClose(t *testing.T) { - - prefix := "TestPrefix " - level := INFO -- flags := LstdFlags | LUTC | Lfuncname -+ flags := Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname - - logger := NewConn() - connLogger := logger.(*ConnLogger) -diff --git a/modules/log/console_test.go b/modules/log/console_test.go -index a028b5b87..e4fec760a 100644 ---- a/modules/log/console_test.go -+++ b/modules/log/console_test.go -@@ -33,7 +33,7 @@ func TestConsoleLoggerMinimalConfig(t *testing.T) { - }, - } - prefix := "" -- flags := LstdFlags -+ flags := LstdFlags - - cw := NewConsoleLogger() - realCW := cw.(*ConsoleLogger) -@@ -64,7 +64,7 @@ func TestConsoleLogger(t *testing.T) { - } - prefix := "TestPrefix " - level := INFO -- flags := LstdFlags | LUTC | Lfuncname -+ flags := Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname - - cw := NewConsoleLogger() - realCW := cw.(*ConsoleLogger) -diff --git a/modules/log/file_test.go b/modules/log/file_test.go -index 38279315a..dc8d291ed 100644 ---- a/modules/log/file_test.go -+++ b/modules/log/file_test.go -@@ -24,7 +24,7 @@ func TestFileLoggerFails(t *testing.T) { - - prefix := "TestPrefix " - level := INFO -- flags := LstdFlags | LUTC | Lfuncname -+ flags := Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname - //filename := filepath.Join(tmpDir, "test.log") - - fileLogger := NewFileLogger() -@@ -52,7 +52,7 @@ func TestFileLogger(t *testing.T) { - - prefix := "TestPrefix " - level := INFO -- flags := LstdFlags | LUTC | Lfuncname -+ flags := Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname - filename := filepath.Join(tmpDir, "test.log") - - fileLogger := NewFileLogger() -@@ -155,7 +155,7 @@ func TestCompressFileLogger(t *testing.T) { - - prefix := "TestPrefix " - level := INFO -- flags := LstdFlags | LUTC | Lfuncname -+ flags := Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname - filename := filepath.Join(tmpDir, "test.log") - - fileLogger := NewFileLogger() -diff --git a/modules/log/smtp_test.go b/modules/log/smtp_test.go -index 216d55521..15075dd41 100644 ---- a/modules/log/smtp_test.go -+++ b/modules/log/smtp_test.go -@@ -17,7 +17,7 @@ import ( - func TestSMTPLogger(t *testing.T) { - prefix := "TestPrefix " - level := INFO -- flags := LstdFlags | LUTC | Lfuncname -+ flags := Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname - username := "testuser" - password := "testpassword" - host := "testhost" -diff --git a/modules/log/writer_test.go b/modules/log/writer_test.go -index 886dd58fb..df2f6e698 100644 ---- a/modules/log/writer_test.go -+++ b/modules/log/writer_test.go -@@ -41,7 +41,7 @@ func TestBaseLogger(t *testing.T) { - b := WriterLogger{ - out: c, - Level: INFO, -- Flags: LstdFlags | LUTC, -+ Flags: Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC, - Prefix: prefix, - } - location, _ := time.LoadLocation("EST") diff --git a/www-apps/gitea/files/gitea.confd-r1 b/www-apps/gitea/files/gitea.confd-r1 deleted file mode 100644 index 19018c1..0000000 --- a/www-apps/gitea/files/gitea.confd-r1 +++ /dev/null @@ -1,14 +0,0 @@ -# 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-r3 b/www-apps/gitea/files/gitea.initd-r3 deleted file mode 100644 index 680ae83..0000000 --- a/www-apps/gitea/files/gitea.initd-r3 +++ /dev/null @@ -1,22 +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" - -: ${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" -pidfile="/run/${RC_SVCNAME}.pid" -required_files="${GITEA_CONF}" -start_stop_daemon_args="-d ${GITEA_WORK_DIR}" -start_stop_daemon_args="${start_stop_daemon_args} -e GITEA_WORK_DIR=${GITEA_WORK_DIR}" -start_stop_daemon_args="${start_stop_daemon_args} -e GITEA_CUSTOM=${GITEA_CUSTOM}" diff --git a/www-apps/gitea/files/gitea.service-r2 b/www-apps/gitea/files/gitea.service-r2 deleted file mode 100644 index 1931b46..0000000 --- a/www-apps/gitea/files/gitea.service-r2 +++ /dev/null @@ -1,34 +0,0 @@ -[Unit] -Description=Gitea service -Documentation=https://docs.gitea.io/ - -AssertPathIsDirectory=/var/lib/gitea -AssertPathIsReadWrite=/var/lib/gitea - -After=network.target -Requires=network.target -After=mysqld.service -After=postgresql-9.3.service -After=postgresql-9.4.service -After=postgresql-9.5.service -After=postgresql-9.6.service -After=postgresql-10.service -After=postgresql-11.service -After=postgresql-12.service -After=memcached.service -After=redis.service - -[Service] -User=git -Group=git - -Environment="GITEA_WORK_DIR=/var/lib/gitea" "GITEA_CUSTOM=/var/lib/gitea/custom" -WorkingDirectory=/var/lib/gitea -ExecStart=/usr/bin/gitea web --config /etc/gitea/app.ini - -Restart=always -PrivateTmp=true -Nice=5 - -[Install] -WantedBy=multi-user.target diff --git a/www-apps/gitea/gitea-1.12.1.ebuild b/www-apps/gitea/gitea-1.12.1.ebuild deleted file mode 100644 index 18b851d..0000000 --- a/www-apps/gitea/gitea-1.12.1.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit fcaps go-module tmpfiles systemd -MY_PV="${PV/_rc/-rc}" - -DESCRIPTION="A painless self-hosted Git service" -HOMEPAGE="https://gitea.io" - -if [[ ${PV} != 9999* ]] ; then - SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${MY_PV}/gitea-src-${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64" - S="${WORKDIR}" -else - EGIT_REPO_URI="https://github.com/go-gitea/gitea" - inherit git-r3 - S="${WORKDIR}/${P}" -fi - -LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0" -SLOT="0" -IUSE="+acct build-client pam sqlite" - -BDEPEND="build-client? ( >=net-libs/nodejs-10[npm] )" -COMMON_DEPEND=" - acct? ( - acct-group/git - acct-user/git[gitea] ) - pam? ( sys-libs/pam )" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND} - dev-vcs/git" - -DOCS=( - custom/conf/app.ini.sample CONTRIBUTING.md README.md -) -FILECAPS=( - cap_net_bind_service+ep usr/bin/gitea -) -PATCHES=( - "${FILESDIR}/1.12-fix-vendoring.patch" -) - -src_prepare() { - default - - local sedcmds=( - -e "s#^RUN_MODE = dev#RUN_MODE = prod#" - -e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#" - -e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#" - -e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#" - -e "s#^HTTP_ADDR = 0.0.0.0#HTTP_ADDR = 127.0.0.1#" - -e "s#^MODE = console#MODE = file#" - -e "s#^LEVEL = Trace#LEVEL = Info#" - -e "s#^LOG_SQL = true#LOG_SQL = false#" - -e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#" - -e "s#^APP_ID =#;APP_ID =#" - -e "s#^TRUSTED_FACETS =#;TRUSTED_FACETS =#" - ) - - sed -i "${sedcmds[@]}" custom/conf/app.ini.sample || die - if use sqlite ; then - sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.ini.sample || die - fi - - einfo "Remove tests which are known to fail with network-sandbox enabled." - rm ./modules/migrations/github_test.go || die - - einfo "Remove tests which depend on gitea git-repo." - rm ./modules/git/blob_test.go || die - rm ./modules/git/repo_test.go || die - - # Remove already build assets (like frontend part) - use build-client && emake clean-all -} - -src_compile() { - local gitea_tags=( - bindata - $(usev pam) - $(usex sqlite 'sqlite sqlite_unlock_notify' '') - ) - local gitea_settings=( - "-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini" - "-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom" - "-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea" - ) - local makeenv=( - TAGS="${gitea_tags[@]}" - LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[@]}" - ) - [[ ${PV} != 9999* ]] && makeenv+=("DRONE_TAG=${MY_PV}") - - if use build-client; then - # -j1 as Makefile doesn't handle dependancy correctly, and is not - # useful as golang compiler don't use this info. - env "${makeenv[@]}" emake -j1 build - else - env "${makeenv[@]}" emake backend - fi -} - -src_install() { - dobin gitea - - einstalldocs - - newconfd "${FILESDIR}/gitea.confd-r1" gitea - newinitd "${FILESDIR}/gitea.initd-r3" gitea - newtmpfiles - gitea.conf <<-EOF - d /run/gitea 0755 git git - EOF - systemd_newunit "${FILESDIR}"/gitea.service-r2 gitea.service - - insinto /etc/gitea - newins custom/conf/app.ini.sample app.ini - if use acct ; then - fowners root:git /etc/gitea/{,app.ini} - fperms g+w,o-rwx /etc/gitea/{,app.ini} - - diropts -m0750 -o git -g git - keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data - keepdir /var/log/gitea - fi -} diff --git a/www-apps/gitea/metadata.xml b/www-apps/gitea/metadata.xml deleted file mode 100644 index a1543b4..0000000 --- a/www-apps/gitea/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - go-gitea/gitea - - - User and group management via acct-*/git packages - Build the client code, instead of using a precompiled one - -