diff --git a/acct-group/jackett/jackett-0.ebuild b/acct-group/jackett/jackett-0.ebuild
deleted file mode 100644
index 166db73d6..000000000
--- a/acct-group/jackett/jackett-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for www-apps/jackett-bin"
-ACCT_GROUP_ID=-1
diff --git a/acct-group/jackett/metadata.xml b/acct-group/jackett/metadata.xml
deleted file mode 100644
index baf6ee9b0..000000000
--- a/acct-group/jackett/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
- support@calculate.ru
- Mir Calculate
- Calculate Overlay
-
-
diff --git a/acct-group/opentracker/metadata.xml b/acct-group/opentracker/metadata.xml
deleted file mode 100644
index baf6ee9b0..000000000
--- a/acct-group/opentracker/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
- support@calculate.ru
- Mir Calculate
- Calculate Overlay
-
-
diff --git a/acct-group/opentracker/opentracker-0.ebuild b/acct-group/opentracker/opentracker-0.ebuild
deleted file mode 100644
index cb3a77da0..000000000
--- a/acct-group/opentracker/opentracker-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for net-p2p/opentracker"
-ACCT_GROUP_ID=-1
diff --git a/acct-user/jackett/jackett-0.ebuild b/acct-user/jackett/jackett-0.ebuild
deleted file mode 100644
index 3e9959b0c..000000000
--- a/acct-user/jackett/jackett-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for www-apps/jackett-bin"
-ACCT_USER_ID=-1
-ACCT_USER_GROUPS=( jackett )
-ACCT_USER_HOME="/var/lib/jackett"
-
-acct-user_add_deps
diff --git a/acct-user/jackett/metadata.xml b/acct-user/jackett/metadata.xml
deleted file mode 100644
index baf6ee9b0..000000000
--- a/acct-user/jackett/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
- support@calculate.ru
- Mir Calculate
- Calculate Overlay
-
-
diff --git a/acct-user/opentracker/metadata.xml b/acct-user/opentracker/metadata.xml
deleted file mode 100644
index baf6ee9b0..000000000
--- a/acct-user/opentracker/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
- support@calculate.ru
- Mir Calculate
- Calculate Overlay
-
-
diff --git a/acct-user/opentracker/opentracker-0.ebuild b/acct-user/opentracker/opentracker-0.ebuild
deleted file mode 100644
index 3990174ff..000000000
--- a/acct-user/opentracker/opentracker-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for net-p2p/opentracker"
-ACCT_USER_ID=-1
-ACCT_USER_GROUPS=( opentracker )
-ACCT_USER_HOME="/var/lib/opentracker"
-
-acct-user_add_deps
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
deleted file mode 100644
index 3b2e5a268..000000000
--- a/app-portage/gentoolkit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gentoolkit-0.6.1.tar.gz 3195781 BLAKE2B 27e370de77586b375dc70caa1abba4c2bc4207e8f08e0a7ea2953097135506949db71ff9102a0ead198e4dea425440c57b94ac7a811ca2d5e0016fc7e234bb0d SHA512 1ffc466b69a9c53f1bbd40f6f4d1eb33d5f0f4287bb65ba1a7b1b2675ad61ecffa55ed9fda7c1ae8148744f0a77e224315eb1903dfd61a2a3dab1600fc672d2d
diff --git a/app-portage/gentoolkit/files/gentoolkit-0.6.1-data_files.patch b/app-portage/gentoolkit/files/gentoolkit-0.6.1-data_files.patch
deleted file mode 100644
index 8039864d6..000000000
--- a/app-portage/gentoolkit/files/gentoolkit-0.6.1-data_files.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 5b52ee6c6efab68111d128d45f386ac21eaf84f6 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec
-Date: Sun, 10 Jul 2022 13:41:36 -0700
-Subject: [PATCH] Revert "setup.py: migrate to setuptools"
-
-This reverts commit bbbde97b5e625a49a1a66e307931548cb33f260b.
-setuptools only installs data files to the python pkg directory
----
- setup.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 36995de..23e9b36 100755
---- a/setup.py
-+++ b/setup.py
-@@ -3,8 +3,8 @@
- import re
- import sys
- import subprocess
--
--from setuptools import setup, Command
-+from distutils import core
-+from distutils.cmd import Command
- from glob import glob
-
- import os
-@@ -67,7 +67,7 @@ manpages = [
- ]
-
-
--class set_version(Command):
-+class set_version(core.Command):
- """Set python __version__ and bash VERSION to our __version__."""
-
- description = "hardcode scripts' version using VERSION from environment"
-@@ -130,7 +130,7 @@ test_data = {
- ]
- }
-
--setup(
-+core.setup(
- name="gentoolkit",
- version=__version__,
- description="Set of tools that work with and enhance portage.",
---
-libgit2 1.4.3
-
diff --git a/app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch b/app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch
deleted file mode 100644
index 193eacc2d..000000000
--- a/app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From bf3eb16e451fd1bdee8ef03a0d22e0040e033f19 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec
-Date: Sun, 10 Jul 2022 23:41:33 -0700
-Subject: [PATCH] eclean/pkgindex.py: Fix typo in function call
-
- File "/usr/lib/python3.10/site-packages/gentoolkit/eclean/pkgindex.py", line
-60, in clean_pkgs_index
- if self.get_emaint_binhost():
-AttributeError: 'PkgIndex' object has no attribute 'get_emaint_binhost'. Did
-you mean: '_get_emaint_binhost'?
-
-Also fix too many parameters in line 68 for the self.controller() call
-
-Bug: https://bugs.gentoo.org/857555
-
-Signed-off-by: Brian Dolbec
----
- pym/gentoolkit/eclean/pkgindex.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pym/gentoolkit/eclean/pkgindex.py b/pym/gentoolkit/eclean/pkgindex.py
-index d0878a1..7d6fade 100644
---- a/pym/gentoolkit/eclean/pkgindex.py
-+++ b/pym/gentoolkit/eclean/pkgindex.py
-@@ -57,15 +57,15 @@ class PkgIndex:
- statinfo = os.stat(file_)
- size1 = statinfo.st_size
- show_progress = not quiet
-- if self.get_emaint_binhost():
-+ if self._get_emaint_binhost():
- self.taskmaster = TaskHandler(show_progress_bar=show_progress)
- tasks = [self.binhost]
- self.taskmaster.run_tasks(tasks)
- else:
- self.call_emaint()
- statinfo = os.stat(file_)
- clean_size = size1 - statinfo.st_size
-- self.controller("\n", clean_size, "Packages Index", file_, "Index")
-+ self.controller(clean_size, "Packages Index", file_, "Index")
- return clean_size
-
- def call_emaint(self):
---
-libgit2 1.4.3
-
diff --git a/app-portage/gentoolkit/gentoolkit-0.6.1-r4.ebuild b/app-portage/gentoolkit/gentoolkit-0.6.1-r4.ebuild
deleted file mode 100644
index 7cd0e3303..000000000
--- a/app-portage/gentoolkit/gentoolkit-0.6.1-r4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE="xml(+),threads(+)"
-
-inherit distutils-r1 tmpfiles
-
-if [[ ${PV} = 9999* ]]; then
- EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git"
- inherit git-r3
-else
- SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-# Need newer Portage for XML fix, bug #857537
-DEPEND="
- >=sys-apps/portage-3.0.32[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
- app-alternatives/awk
- sys-apps/gentoo-functions"
-
-PATCHES=(
- "${FILESDIR}/gentoolkit-0.6.1-data_files.patch"
- "${FILESDIR}/gentoolkit-0.6.1-pkgindex.patch"
-)
-
-distutils_enable_tests setup.py
-
-python_prepare_all() {
- python_setup
- echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
- VERSION="${PVR}" "${PYTHON}" setup.py set_version
- distutils-r1_python_prepare_all
-
- if use prefix-guest ; then
- # use correct repo name, bug #632223
- sed -i \
- -e "/load_profile_data/s/repo='gentoo'/repo='gentoo_prefix'/" \
- pym/gentoolkit/profile.py || die
- fi
-}
-
-pkg_postinst() {
- tmpfiles_process revdep-rebuild.conf
-
- # Only show the elog information on a new install
- if [[ ! ${REPLACING_VERSIONS} ]]; then
- elog
- elog "For further information on gentoolkit, please read the gentoolkit"
- elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
- elog
- elog "Another alternative to equery is app-portage/portage-utils"
- elog
- elog "Additional tools that may be of interest:"
- elog
- elog " app-admin/eclean-kernel"
- elog " app-portage/diffmask"
- elog " app-portage/flaggie"
- elog " app-portage/portpeek"
- elog " app-portage/smart-live-rebuild"
- fi
-}
diff --git a/app-portage/gentoolkit/metadata.xml b/app-portage/gentoolkit/metadata.xml
deleted file mode 100644
index 030cf9c14..000000000
--- a/app-portage/gentoolkit/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
- tools-portage@gentoo.org
- Gentoo Portage tools team
-
-
-
- Gentoolkit is a collection of useful adminstration scripts particular to
- the Gentoo Linux distribution. It contains rough drafts and
- implementations of features that may in time make it into Portage, or
- into full-fledged tools in their own right.
-
-
- proj/gentoolkit
- gentoo/gentoolkit
-
-
diff --git a/net-p2p/opentracker/files/opentracker-Makefile.patch b/net-p2p/opentracker/files/opentracker-Makefile.patch
deleted file mode 100644
index 5ba397bbe..000000000
--- a/net-p2p/opentracker/files/opentracker-Makefile.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 949e63e..a4beaf5 100644
---- a/Makefile
-+++ b/Makefile
-@@ -13,44 +13,43 @@ CC?=gcc
- # LIBOWFAT_LIBRARY=$(PREFIX)/lib
-
- # Debug flavour
--PREFIX?=..
--LIBOWFAT_HEADERS=$(PREFIX)/libowfat
-+PREFIX?=/usr
-+LIBOWFAT_HEADERS=$(PREFIX)/include/libowfat
- LIBOWFAT_LIBRARY=$(PREFIX)/libowfat
-
- BINDIR?=$(PREFIX)/bin
--STRIP?=strip
--
--#FEATURES+=-DWANT_V6
--
--#FEATURES+=-DWANT_ACCESSLIST_BLACK
--#FEATURES+=-DWANT_ACCESSLIST_WHITE
--
--#FEATURES+=-DWANT_SYNC_LIVE
--#FEATURES+=-DWANT_IP_FROM_QUERY_STRING
--#FEATURES+=-DWANT_COMPRESSION_GZIP
--#FEATURES+=-DWANT_COMPRESSION_GZIP_ALWAYS
--#FEATURES+=-DWANT_LOG_NETWORKS
--#FEATURES+=-DWANT_RESTRICT_STATS
--#FEATURES+=-DWANT_IP_FROM_PROXY
--#FEATURES+=-DWANT_FULLLOG_NETWORKS
--#FEATURES+=-DWANT_LOG_NUMWANT
--#FEATURES+=-DWANT_MODEST_FULLSCRAPES
--#FEATURES+=-DWANT_SPOT_WOODPECKER
--#FEATURES+=-DWANT_SYSLOGS
--#FEATURES+=-DWANT_DEV_RANDOM
--FEATURES+=-DWANT_FULLSCRAPE
-+
-+#BUILD_FEATURES+=-DWANT_V6
-+
-+#BUILD_FEATURES+=-DWANT_ACCESSLIST_BLACK
-+#BUILD_FEATURES+=-DWANT_ACCESSLIST_WHITE
-+
-+#BUILD_FEATURES+=-DWANT_SYNC_LIVE
-+#BUILD_FEATURES+=-DWANT_IP_FROM_QUERY_STRING
-+#BUILD_FEATURES+=-DWANT_COMPRESSION_GZIP
-+#BUILD_FEATURES+=-DWANT_COMPRESSION_GZIP_ALWAYS
-+#BUILD_FEATURES+=-DWANT_LOG_NETWORKS
-+#BUILD_FEATURES+=-DWANT_RESTRICT_STATS
-+#BUILD_FEATURES+=-DWANT_IP_FROM_PROXY
-+#BUILD_FEATURES+=-DWANT_FULLLOG_NETWORKS
-+#BUILD_FEATURES+=-DWANT_LOG_NUMWANT
-+#BUILD_FEATURES+=-DWANT_MODEST_FULLSCRAPES
-+#BUILD_FEATURES+=-DWANT_SPOT_WOODPECKER
-+#BUILD_FEATURES+=-DWANT_SYSLOGS
-+#BUILD_FEATURES+=-DWANT_DEV_RANDOM
-+BUILD_FEATURES+=-DWANT_FULLSCRAPE
-
- # Is enabled on BSD systems by default in trackerlogic.h
- # on Linux systems you will need -lbds
--#FEATURES+=-DWANT_ARC4RANDOM
-+#BUILD_FEATURES+=-DWANT_ARC4RANDOM
-
--#FEATURES+=-D_DEBUG_HTTPERROR
-+#BUILD_FEATURES+=-D_DEBUG_HTTPERROR
-
- OPTS_debug=-D_DEBUG -g -ggdb # -pg -fprofile-arcs -ftest-coverage
--OPTS_production=-O3
-+OPTS_production=
-
- CFLAGS+=-I$(LIBOWFAT_HEADERS) -Wall -pipe -Wextra #-ansi -pedantic
--LDFLAGS+=-L$(LIBOWFAT_LIBRARY) -lowfat -pthread -lpthread -lz
-+LDFLAGS+=-L$(LIBOWFAT_LIBRARY) -lowfat -lpthread -lz
- #LDFLAGS+=-lbsd
-
- BINARY =opentracker
-@@ -59,31 +58,21 @@ SOURCES=opentracker.c trackerlogic.c scan_urlencoded_query.c ot_mutex.c ot_stats
- SOURCES_proxy=proxy.c ot_vector.c ot_mutex.c
-
- OBJECTS = $(SOURCES:%.c=%.o)
--OBJECTS_debug = $(SOURCES:%.c=%.debug.o)
- OBJECTS_proxy = $(SOURCES_proxy:%.c=%.o)
--OBJECTS_proxy_debug = $(SOURCES_proxy:%.c=%.debug.o)
-
--.SUFFIXES: .debug.o .o .c
-+.SUFFIXES: .o .c
-
--all: $(BINARY) $(BINARY).debug
-+all: $(BINARY)
-
--CFLAGS_production = $(CFLAGS) $(OPTS_production) $(FEATURES)
--CFLAGS_debug = $(CFLAGS) $(OPTS_debug) $(FEATURES)
-+CFLAGS_production = $(CFLAGS) $(OPTS_production) $(BUILD_FEATURES)
-+#CFLAGS_production += $(OPTS_debug)
-
- $(BINARY): $(OBJECTS) $(HEADERS)
- $(CC) -o $@ $(OBJECTS) $(LDFLAGS)
-- $(STRIP) $@
--$(BINARY).debug: $(OBJECTS_debug) $(HEADERS)
-- $(CC) -o $@ $(OBJECTS_debug) $(LDFLAGS)
- proxy: $(OBJECTS_proxy) $(HEADERS)
- $(CC) -o $@ $(OBJECTS_proxy) $(CFLAGS_production) $(LDFLAGS)
--proxy.debug: $(OBJECTS_proxy_debug) $(HEADERS)
-- $(CC) -o $@ $(OBJECTS_proxy_debug) $(LDFLAGS)
--
--.c.debug.o : $(HEADERS)
-- $(CC) -c -o $@ $(CFLAGS_debug) $(<:.debug.o=.c)
-
--.c.o : $(HEADERS)
-+.c.o :
- $(CC) -c -o $@ $(CFLAGS_production) $<
-
- clean:
diff --git a/net-p2p/opentracker/files/opentracker-conf.patch b/net-p2p/opentracker/files/opentracker-conf.patch
deleted file mode 100644
index 79935255e..000000000
--- a/net-p2p/opentracker/files/opentracker-conf.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/opentracker.conf.sample b/opentracker.conf.sample
-index db45122..f847080 100644
---- a/opentracker.conf.sample
-+++ b/opentracker.conf.sample
-@@ -34,11 +34,11 @@
- # II) If opentracker runs in a non-open mode, point it to files containing
- # all torrent hashes that it will serve (shell option -w)
- #
--# access.whitelist /path/to/whitelist
-+# access.whitelist /var/lib/opentracker/access.whitelist
- #
- # or, if opentracker was compiled to allow blacklisting (shell option -b)
- #
--# access.blacklist ./blacklist
-+# access.blacklist /var/lib/opentracker/access.blacklist
- #
- # It is pointless and hence not possible to compile black AND white
- # listing, so choose one of those options at compile time. File format
-@@ -93,11 +93,11 @@
- # list files must be put in that directory (shell option -d).
- #
- #
--# tracker.rootdir /usr/local/etc/opentracker
-+# tracker.rootdir /var/lib/opentracker
- #
- # Tell opentracker which user to setuid to.
- #
--# tracker.user nobody
-+# tracker.user opentracker
- #
-
- # VI) opentracker can be told to answer to a "GET / HTTP"-request with a
diff --git a/net-p2p/opentracker/files/opentracker.init.d b/net-p2p/opentracker/files/opentracker.init.d
deleted file mode 100644
index 9fc7d9ff2..000000000
--- a/net-p2p/opentracker/files/opentracker.init.d
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-
-description="Bittorrent tracker"
-command="/usr/bin/opentracker"
-command_args="-f /etc/opentracker.conf"
-pidfile="/var/run/opentracker.pid"
-start_stop_daemon_args="-w 1 -b -m --pidfile ${pidfile}"
-
-depend() {
- use net
-}
-
diff --git a/net-p2p/opentracker/metadata.xml b/net-p2p/opentracker/metadata.xml
deleted file mode 100644
index 5efde860a..000000000
--- a/net-p2p/opentracker/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
- support@calculate.ru
- Mir Calculate
- Calculate Overlay
-
-
-
- Opentracker is a open and free bittorrent tracker. It aims for minimal resource usage and is capable to serve
- multiple thousands of requests.
-
-
- mailto:erdgeist@erdgeist.org
- https://erdgeist.org/arts/software/opentracker/
-
-
diff --git a/net-p2p/opentracker/opentracker-20210823.ebuild b/net-p2p/opentracker/opentracker-20210823.ebuild
deleted file mode 100644
index 39613d6f7..000000000
--- a/net-p2p/opentracker/opentracker-20210823.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit git-r3
-
-DESCRIPTION="An open and free bittorrent tracker"
-HOMEPAGE="https://erdgeist.org/arts/software/opentracker/"
-
-EGIT_REPO_URI="git://erdgeist.org/opentracker"
-EGIT_COMMIT="110868ec4ebe60521d5a4ced63feca6a1cf0aa2a"
-
-LICENSE="BEER-WARE"
-SLOT="0"
-#KEYWORDS="~amd64 ~x86"
-IUSE="+blacklist debug gzip-always ip-from-query ip-from-proxy ipv6 fullscrapes-modest live-sync
- live-sync-unicast log-networks-full log-numwant persistence restrict-stats spot-woodpeckers syslog whitelist"
-REQUIRED_USE="^^ ( blacklist whitelist )
- live-sync-unicast? ( live-sync )
- persistence? ( !ipv6 )"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="acct-user/opentracker
- dev-libs/libowfat
- ${DEPEND}"
-
-PATCHES="${FILESDIR}/${PN}-Makefile.patch ${FILESDIR}/${PN}-conf.patch"
-
-src_prepare() {
- default
-
- local MYFEATURES="BUILD_FEATURES+=-DWANT_COMPRESSION_GZIP -DWANT_FULLSCRAPE"
- use blacklist && MYFEATURES+=" -DWANT_ACCESSLIST_BLACK"
- use gzip-always && MYFEATURES+=" -DWANT_COMPRESSION_GZIP_ALWAYS"
- use ip-from-query && MYFEATURES+=" -DWANT_IP_FROM_QUERY_STRING"
- use ip-from-proxy && MYFEATURES+=" -DWANT_IP_FROM_PROXY"
- use ipv6 && MYFEATURES+=" -DWANT_V6"
- use fullscrapes-modest && MYFEATURES+=" -DWANT_MODEST_FULLSCRAPES"
- use live-sync && MYFEATURES+=" -DWANT_SYNC_LIVE"
- use live-sync-unicast && MYFEATURES+=" -DSYNC_LIVE_UNICAST"
- use log-networks-full && MYFEATURES+=" -DWANT_FULLLOG_NETWORKS"
- use log-numwant && MYFEATURES+=" -DWANT_LOG_NUMWANT"
- use persistence && MYFEATURES+=" -DWANT_PERSISTENCE"
- use spot-woodpeckers && MYFEATURES+=" -DWANT_SPOT_WOODPECKER"
- use syslog && MYFEATURES+=" -DWANT_SYSLOGS"
- use restrict-stats && MYFEATURES+=" -DWANT_RESTRICT_STATS"
- use whitelist && MYFEATURES+=" -DWANT_ACCESSLIST_WHITE"
-
- if use debug; then
- MYFEATURES+=" -D_DEBUG_HTTPERROR"
- sed -i -e "/^#CFLAGS_production.*OPTS_debug/s/^#//" Makefile || die "sed DEBUG CFLAGS enable failed in Makefile"
- fi
- sed -i "/^BUILD_FEATURES/s/^.*/${MYFEATURES}/" Makefile || die "sed BUILD_FEATURES failed in Makefile"
-}
-
-src_install() {
- dodoc README*
- insinto /etc
- newins opentracker.conf.sample opentracker.conf
-
- cp "${FILESDIR}"/opentracker.init.d "${T}"/opentracker || die
- doinitd "${T}"/opentracker
-
- dodir /usr/bin
- emake install DESTDIR="${D}"
-
- if use debug && ! has nostrip ${FEATURES}; then
- ewarn "
- ********************************************************************************
- Please emerge with FEATURES=nostrip to get debug really effective
- ********************************************************************************
- "
- fi
-}
diff --git a/net-wireless/rtl8821cu/Manifest b/net-wireless/rtl8821cu/Manifest
index 1002a47ab..f975452c6 100644
--- a/net-wireless/rtl8821cu/Manifest
+++ b/net-wireless/rtl8821cu/Manifest
@@ -1,3 +1,3 @@
-DIST rtl8821cu-20210506.tar.gz 3645635 BLAKE2B 72792c9db722190de7c1f728f32e87b00010cd0593a68cc635011f0cc556d16cd6dbd5396d4da5eaba8da10fa579e19c1611d23b0924c82f48f17f693639cf36 SHA512 5d98f8cbc39935674fb5a58daf20c88b31d75becf25ba3603397eac79569d44d472a7135e99a95aacc8989d61e526b107f1c2dbf47d2c207107f62572db20642
DIST rtl8821cu-20230427.tar.gz 13821386 BLAKE2B f71e979f9d783486809343e777fa008058c61ead739a64ef11149d4a6da24d628c61d56c7c03f0c32c90d5474b2c179e106702b0cc695ca0261ce8f1f457de8f SHA512 2ff4503bc5a80a28611c293381d4b08deb9512042b1ffcb2e379dba65ae833250210abd25255d6066f28ecdd551d45bcf0dcc3db4a75e0605a3414ed29189efd
DIST rtl8821cu-20230910.tar.gz 13821543 BLAKE2B cd96fd25187aa43219ed983a75de48afa0067551402ba7b40764773022b5a9ea19bfa495e81bd278c03be7f91e5b724125476544a1cafc391553ac164ad2436e SHA512 b41e4bfee81fc38257f42928cad73bc858d8a99d722b001e8f6a7a1b1f2987696cdaa2909cef651bbc25e622a2799fcb8d93859dd5e6847b6817f33c3bce6fff
+DIST rtl8821cu-20240121.tar.gz 13821880 BLAKE2B 1863c5d12e12bbf9661039cae299cbc211014c0384f9df9ad958bfe712fc3c1ceb1e83c6b44e6a25e6cfaa786e626291d77ec81be28a19730fd7b579bd97696e SHA512 bc3ef3e7f671fce371bd0e8cf74eb7c3561c827a47101e48f88e6ea8849bb70b0b0a275923e52f59e6d0d4dec19ee5d69ea5c3ea00aaa1afd15045ea3e0212e0
diff --git a/net-wireless/rtl8821cu/rtl8821cu-20210506.ebuild b/net-wireless/rtl8821cu/rtl8821cu-20210506.ebuild
deleted file mode 100644
index fd0e725f0..000000000
--- a/net-wireless/rtl8821cu/rtl8821cu-20210506.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit linux-mod
-
-COMMIT="c2472712fe4c2639183b9a0a6a930248fcff8bf0"
-
-DESCRIPTION="Realtek 8821(*U)/8811CU/8812A/8192E/8814A/8822B/8723(*U)/8188E(**) module for Linux kernel"
-HOMEPAGE="https://github.com/eltonlika/rtl8821CU"
-SRC_URI="https://github.com/eltonlika/rtl8821CU/archive/${COMMIT}.tar.gz -> rtl8821cu-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64"
-
-DEPEND="virtual/linux-sources"
-
-S="${WORKDIR}/rtl8821CU-${COMMIT}"
-
-MODULE_NAMES="8821cu(net/wireless)"
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-
-pkg_setup() {
- linux-mod_pkg_setup
- BUILD_PARAMS="KERN_DIR=${KV_DIR} ARCH=x86_64 KSRC=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
-}
-
-src_compile(){
- linux-mod_src_compile
-}
-
-src_install() {
- linux-mod_src_install
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-}
diff --git a/net-wireless/rtl8821cu/rtl8821cu-20240121.ebuild b/net-wireless/rtl8821cu/rtl8821cu-20240121.ebuild
new file mode 100644
index 000000000..59e71e765
--- /dev/null
+++ b/net-wireless/rtl8821cu/rtl8821cu-20240121.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit linux-mod-r1
+
+COMMIT="5b39398e2de146edeb76716420f3288f508bea61"
+
+DESCRIPTION="Realtek USB WiFi Adapters based on 8811CU/8821CU/8821CUH/8731AU Chipsets"
+HOMEPAGE="https://github.com/morrownr/8821cu-20210916"
+SRC_URI="https://github.com/morrownr/8821cu-20210916/archive/${COMMIT}.tar.gz -> rtl8821cu-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64"
+SLOT="0"
+
+DEPEND="virtual/linux-sources"
+
+S="${WORKDIR}/8821cu-20210916-${COMMIT}"
+
+src_compile() {
+ local modlist=( 8821cu=net/wireless )
+ local modargs=( KSRC="${KV_OUT_DIR}" )
+
+ linux-mod-r1_src_compile
+}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
deleted file mode 100644
index ad390fa6e..000000000
--- a/sys-apps/portage/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST portage-3.0.51.tar.bz2 1155503 BLAKE2B 1095ab616993951da8f4d43cef4cf815672c67cb48ea2fe5aeb6b7c629058bfab1557d2b9508f2e3e9f38676733b5d60ec6a3686bc57840065c428508769cb1c SHA512 bf237819173bed9df3b63ada067a2a99700618d88fd4b528146c56bdd592f2452003db6cc6da4a445b647eb4d8bb591260ea0d2a5627ad540526a2e802025836
diff --git a/sys-apps/portage/files/README.RESCUE b/sys-apps/portage/files/README.RESCUE
deleted file mode 100644
index e8f3932ac..000000000
--- a/sys-apps/portage/files/README.RESCUE
+++ /dev/null
@@ -1,2 +0,0 @@
-Please see https://wiki.gentoo.org/wiki/Project:Portage/Fixing_broken_portage
-for a recovery guide for a broken portage installation.
diff --git a/sys-apps/portage/files/depgraph.py-fix-no-ebuilds-binpkgs-message.patch b/sys-apps/portage/files/depgraph.py-fix-no-ebuilds-binpkgs-message.patch
deleted file mode 100644
index 97cff72cd..000000000
--- a/sys-apps/portage/files/depgraph.py-fix-no-ebuilds-binpkgs-message.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From b199d0307b47f9fb06dbe533d7e24926a561c238 Mon Sep 17 00:00:00 2001
-From: Oskari Pirhonen
-Date: Sun, 9 Jul 2023 00:08:27 -0500
-Subject: [PATCH] depgraph.py: fix "no ebuilds/binpkgs" message
-
-The "there are no binary packages to satisfy" was being unconditionally
-output for packages that could not be found. Fix the logic for choosing
-between the "binary packages" and "ebuilds" form of the message.
-
-This is a temporary stopgap as alluded to by me in the bug, but the
-tl;dr is that some entries in the `myopts` dict have "y"/"n" values
-whereas some are True/unset, and this discrepancy should be sorted out.
-
-[sam: Add NEWS and Fixes, although the change in that commit _shouldn't_
-have been wrong, it is because of a quirk for now...]
-
-[oskari: remove NEWS for backport]
-
-Bug: https://bugs.gentoo.org/909853
-Signed-off-by: Oskari Pirhonen
-Closes: https://github.com/gentoo/portage/pull/1065
-Fixes: 0b21a5a392bd84c07b94373991f59108fbe98516
-Signed-off-by: Sam James
----
- lib/_emerge/depgraph.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py
-index a36ab6351..1aeae6257 100644
---- a/lib/_emerge/depgraph.py
-+++ b/lib/_emerge/depgraph.py
-@@ -6456,7 +6456,7 @@ class depgraph:
- cp_exists = True
- break
-
-- if self._frozen_config.myopts.get("--usepkgonly", "y"):
-+ if self._frozen_config.myopts.get("--usepkgonly", False):
- writemsg(
- f"\nemerge: there are no binary packages to satisfy {green(xinfo)}.\n",
- noiselevel=-1,
---
-2.41.0
-
diff --git a/sys-apps/portage/files/portage-3.0.49-prefixify-init-script-shebangs.patch b/sys-apps/portage/files/portage-3.0.49-prefixify-init-script-shebangs.patch
deleted file mode 100644
index d4d050c17..000000000
--- a/sys-apps/portage/files/portage-3.0.49-prefixify-init-script-shebangs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://gitweb.gentoo.org/proj/portage.git/commit/?id=6066bb766f43ca06a5b0f08baa5946ff678f0c29
-
-From 6066bb766f43ca06a5b0f08baa5946ff678f0c29 Mon Sep 17 00:00:00 2001
-From: Benda Xu
-Date: Sun, 25 Jun 2023 17:03:00 +0800
-Subject: bin/install-qa-check.d/05prefix: prefixify init-script shebangs.
-
-Init scripts in /etc/init.d have OpenRC shebangs "#!/sbin/openrc-run".
-They should be prefixified like a executable script in a Prefix.
-
-Signed-off-by: Benda Xu
-Bug: https://bugs.gentoo.org/640658
-Closes: https://github.com/gentoo/portage/pull/1061
-Signed-off-by: Sam James
---- a/bin/install-qa-check.d/05prefix
-+++ b/bin/install-qa-check.d/05prefix
-@@ -76,8 +76,8 @@ install_qa_check_prefix() {
- fi
- continue
- fi
-- # unprefixed shebang, is the script directly in ${PATH}?
-- if [[ ":${PATH}:" == *":${fp}:"* ]] ; then
-+ # unprefixed shebang, is the script directly in ${PATH} or an init script?
-+ if [[ ":${PATH}:${EPREFIX}/etc/init.d:" == *":${fp}:"* ]] ; then
- if [[ -e ${EROOT}${line[0]} || -e ${ED}${line[0]} ]] ; then
- # is it unprefixed, but we can just fix it because a
- # prefixed variant exists
---
-cgit v1.2.3-18-g5258
diff --git a/sys-apps/portage/files/portage-ccache.conf b/sys-apps/portage/files/portage-ccache.conf
deleted file mode 100644
index 37857fde3..000000000
--- a/sys-apps/portage/files/portage-ccache.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Prevent ccache files from being cleaned
-x /var/tmp/ccache
diff --git a/sys-apps/portage/files/portage-tmpdir.conf b/sys-apps/portage/files/portage-tmpdir.conf
deleted file mode 100644
index 4f6e20ccb..000000000
--- a/sys-apps/portage/files/portage-tmpdir.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-d /var/tmp/portage 0775 portage portage
-d /tmp/portage 0775 portage portage
diff --git a/sys-apps/portage/portage-3.0.51.ebuild b/sys-apps/portage/portage-3.0.51.ebuild
deleted file mode 100644
index be41e637b..000000000
--- a/sys-apps/portage/portage-3.0.51.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit meson linux-info multiprocessing python-r1 tmpfiles
-
-DESCRIPTION="The package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-if [[ ${PV} == 9999 ]] ; then
- EGIT_REPO_URI="
- https://anongit.gentoo.org/git/proj/portage.git
- https://github.com/gentoo/portage.git
- "
- inherit git-r3
-else
- SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-# setuptools is still needed as a workaround for Python 3.12+ for now.
-# https://github.com/mesonbuild/meson/issues/7702
-#
-# >=meson-1.2.1-r1 for bug #912051
-BDEPEND="
- ${PYTHON_DEPS}
- >=dev-util/meson-1.2.1-r1
- $(python_gen_cond_dep '
- dev-python/setuptools[${PYTHON_USEDEP}]
- ' python3_12)
- test? (
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- dev-vcs/git
- )
-"
-DEPEND="
- ${PYTHON_DEPS}
- >=app-arch/tar-1.27
- dev-lang/python-exec:2
- >=sys-apps/sed-4.0.5
- sys-devel/patch
- !build? ( $(python_gen_impl_dep 'ssl(+)') )
- apidoc? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinx-epytext[${PYTHON_USEDEP}]
- )
- doc? (
- ~app-text/docbook-xml-dtd-4.4
- app-text/xmlto
- )
-"
-# Require sandbox-2.2 for bug #288863.
-# For whirlpool hash, require python[ssl] (bug #425046).
-RDEPEND="
- ${PYTHON_DEPS}
- acct-user/portage
- >=app-arch/tar-1.27
- app-arch/zstd
- >=app-misc/pax-utils-0.1.17
- dev-lang/python-exec:2
- >=sys-apps/baselayout-2.9
- >=sys-apps/findutils-4.9
- !build? (
- >=app-admin/eselect-1.2
- >=app-shells/bash-5.0:0
- >=sec-keys/openpgp-keys-gentoo-release-20230329
- >=sys-apps/sed-4.0.5
- rsync-verify? (
- >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
- >=app-portage/gemato-14.5[${PYTHON_USEDEP}]
- )
- )
- elibc_glibc? ( >=sys-apps/sandbox-2.2 )
- elibc_musl? ( >=sys-apps/sandbox-2.2 )
- kernel_linux? ( sys-apps/util-linux )
- selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
- xattr? ( kernel_linux? (
- >=sys-apps/install-xattr-0.3
- ) )
- !=net-misc/rsync-2.6.4
- >=sys-apps/coreutils-6.4
- >=sys-apps/file-5.44-r3
- )
-"
-
-pkg_pretend() {
- local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
- check_extra_config
-}
-
-src_prepare() {
- default
-
- if use prefix-guest; then
- sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
- -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
- -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
- -i cnf/repos.conf || die "sed failed"
- fi
-}
-
-src_configure() {
- local code_only=false
- python_foreach_impl my_src_configure
-}
-
-my_src_configure() {
- local emesonargs=(
- -Dcode-only=${code_only}
- -Deprefix="${EPREFIX}"
- -Dportage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}"
- -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
- $(meson_use doc)
- $(meson_use apidoc)
- $(meson_use gentoo-dev)
- $(meson_use ipc)
- $(meson_use xattr)
- )
-
- if use native-extensions && [[ "${EPYTHON}" != "pypy3" ]] ; then
- emesonargs+=( -Dnative-extensions=true )
- else
- emesonargs+=( -Dnative-extensions=false )
- fi
-
- if use build; then
- emesonargs+=( -Drsync-verify=false )
- else
- emesonargs+=( $(meson_use rsync-verify) )
- fi
-
- meson_src_configure
- code_only=true
-}
-
-src_compile() {
- python_foreach_impl meson_src_compile
-}
-
-src_test() {
- local -x PYTEST_ADDOPTS="-vv -ra -l -o console_output_style=count -n $(makeopts_jobs) --dist=worksteal"
-
- python_foreach_impl meson_src_test --no-rebuild --verbose
-}
-
-src_install() {
- python_foreach_impl my_src_install
- dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf
-
- local scripts
- mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/{bin,sbin}/* || die)
- python_replicate_script "${scripts[@]}"
-}
-
-my_src_install() {
- local pydirs=(
- "${D}$(python_get_sitedir)"
- "${ED}/usr/lib/portage/${EPYTHON}"
- )
-
- meson_src_install
- python_optimize "${pydirs[@]}"
- python_fix_shebang "${pydirs[@]}"
-}
-
-pkg_preinst() {
- if ! use build && [[ -z ${ROOT} ]]; then
- python_setup
- local sitedir=$(python_get_sitedir)
- [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
- env -u DISTDIR \
- -u PORTAGE_OVERRIDE_EPREFIX \
- -u PORTAGE_REPOSITORIES \
- -u PORTDIR \
- -u PORTDIR_OVERLAY \
- PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
- "${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
- env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
- PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
- "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
- env -u FEATURES -u PORTAGE_REPOSITORIES \
- PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
- "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
- fi
-
- # elog dir must exist to avoid logrotate error for bug #415911.
- # This code runs in preinst in order to bypass the mapping of
- # portage:portage to root:root which happens after src_install.
- keepdir /var/log/portage/elog
- # This is allowed to fail if the user/group are invalid for prefix users.
- if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
- chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
- fi
-
- if has_version "<${CATEGORY}/${PN}-2.3.77"; then
- elog "The emerge --autounmask option is now disabled by default, except for"
- elog "portions of behavior which are controlled by the --autounmask-use and"
- elog "--autounmask-license options. For backward compatibility, previous"
- elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
- elog "Users can get the old behavior simply by adding --autounmask to the"
- elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
- elog "change, see https://bugs.gentoo.org/658648."
- fi
-}
-
-pkg_postinst() {
- # Warn about obsolete "enotice" script, bug #867010
- local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
- if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
- eerror "Obsolete 'enotice' script detected!"
- eerror "Please remove this from ${bashrc} to avoid problems."
- eerror "See bug 867010 for more details."
- fi
-}