virtual/dist-kernel: drop 6.6.29, 6.8.8

Signed-off-by: Alfred Wingate <parona@protonmail.com>

.editorconfig

@@ -0,0 +1,40 @@
+# This file is part of src_prepare-overlay.
+
+# src_prepare-overlay is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# src_prepare-overlay is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with src_prepare-overlay.  If not, see <https://www.gnu.org/licenses/>.
+
+# Original author: Maciej Barć <xgqt@riseup.net>
+# Copyright (c) 2021, src_prepare group
+# Licensed under the GNU GPL v2 License
+
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[{*.xml,*.yml}]
+indent_style = space
+indent_size = 2
+tab_width = 2
+
+[*.ebuild]
+indent_style = tab
+indent_size = 4
+tab_width = 4
+
+[.gitmodules]
+indent_style = tab

.gitignore

@@ -1,4 +1,42 @@
+# -*- conf -*-
+
+
+# This file is part of src_prepare-overlay.
+
+# src_prepare-overlay is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# src_prepare-overlay is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with src_prepare-overlay.  If not, see <https://www.gnu.org/licenses/>.
+
+# Original author: Maciej Barć <xgqt@riseup.net>
+# Copyright (c) 2021, src_prepare group
+# Licensed under the GNU GPL v2 License
+
+
+# General
+*.log
 *.swp
+*~
+,*
 .idea/
+.vs/
 .vscode/
-metadata/md5-cache/
+.~lock.*
+
+# Portage
+/.ebuild.x
+/distfiles/
+/eclass/*.5
+/local/
+/metadata/md5-cache
+/metadata/pkg_desc_index
+/packages/
+/profiles/use.local.desc

.gitlab-ci.yml

@@ -1,22 +1,58 @@
-image: gentoo/stage3-amd64:latest
+---
+
+
+# This file is part of src_prepare-overlay.
+
+# src_prepare-overlay is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# src_prepare-overlay is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with src_prepare-overlay.  If not, see <https://www.gnu.org/licenses/>.
+
+# Original author: Maciej Barć <xgqt@riseup.net>
+# Copyright (c) 2020-2021, src_prepare group
+# Licensed under the GNU GPL v2 License
+
+
+image: registry.gitlab.com/src_prepare/gentoo-repoman-container:latest
+
 
 variables:
-  FEATURES: "getbinpkg"
   GIT_SUBMODULE_STRATEGY: recursive
-  MAKEOPTS: "--jobs=10"
-  PORTAGE_BINHOST: "https://xgqt.gitlab.io/gentoo-mini-mirror/binpkgs"
-  USE: "-perl"
+  common_pkgcheck_args: '--color 1'
 
-stages:
-  - test
-
-before_script:
-  - mkdir -p /var/cache/distfiles
-  - mkdir -p /var/db/repos/gentoo
-  - emerge-webrsync
-  - emerge -1nq --jobs=10 app-portage/repoman dev-vcs/git net-misc/wget
-
-test:
-  stage: test
+pkgcheck_full_scan:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+      when: never
+    - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
+      when: manual
+    - allow_failure: true
   script:
-    - bash scripts/repomanci
+    # disable checks that aren't a big deal to have less noise.
+    - pkgcheck ci -k ,-RedundantVersion,-NonexistentDeps,-NonexistentBlocker $common_pkgcheck_args
+
+pkgcheck_strict_scan:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'push'
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+      when: never
+    - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
+      when: manual
+  script:
+    # temporarily disable BadDefaultUseFlags
+    - pkgcheck ci -k error,-BadDefaultUseFlags $common_pkgcheck_args
+
+pkgcheck_merge:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+  script:
+    - pkgcheck scan $common_pkgcheck_args --commits $CI_MERGE_REQUEST_DIFF_BASE_SHA..$CI_COMMIT_SHA
+

3rd_party/eclass-to-manpage

@@ -1 +1 @@
-Subproject commit 37e670876eef755aab8eeaeeaa89a01fe1732153
+Subproject commit 50d153fa1d5b8b0f846fbf0f79c8fea6c4a457e3

3rd_party/scripts

@@ -1 +1 @@
-Subproject commit f8e53b113bb87f4f9f54ec382cf753448aa6b758
+Subproject commit 56bdfe5c352c9b99f4b46ae58af81f7cf5a8b866

CONTRIBUTING.md

@@ -1,4 +1,4 @@
-# Contributing
+# Contributing
 
 ## How to contribute
 

README.md

@@ -1,22 +1,28 @@
+# src_prepare Gentoo overlay
+
 <p align="center">
     <a href="https://gitlab.com/src_prepare/src_prepare-overlay/pipelines">
         <img src="https://gitlab.com/src_prepare/src_prepare-overlay/badges/master/pipeline.svg">
     </a>
+    <a href="https://gitlab.com/src_prepare/src_prepare-overlay/">
+        <img src="https://gitlab.com/src_prepare/badge/-/raw/master/hosted_on-gitlab-orange.svg">
+    </a>
     <a href="https://gentoo.org/">
         <img src="https://gitlab.com/src_prepare/badge/-/raw/master/powered-by-gentoo-linux-tyrian.svg">
     </a>
     <a href="./LICENSE">
-        <img src="https://img.shields.io/badge/license-GPLv2-blue.svg">
+        <img src="https://gitlab.com/src_prepare/badge/-/raw/master/license-gplv2-blue.svg">
     </a>
     <a href="https://app.element.io/#/room/#src_prepare:matrix.org">
-        <img src="https://gitlab.com/src_prepare/badge/-/raw/master/chat-matrix-blue.svg">
+        <img src="https://gitlab.com/src_prepare/badge/-/raw/master/chat-matrix-green.svg">
     </a>
     <a href="https://gitlab.com/src_prepare/src_prepare-overlay/commits/master.atom">
         <img src="https://gitlab.com/src_prepare/badge/-/raw/master/feed-atom-orange.svg">
     </a>
 </p>
 
-# src_prepare Gentoo overlay
+
+# About
 
 This is the overlay of our Matrix group where we talk about topics related to Gentoo (development, maintainance, support, communities and more).
 
@@ -45,14 +51,6 @@ The src_prepare project doesn't want to overtake or compete with the GURU projec
 
 ### Official list
 
-#### Layman
-
-If you are using [Layman](https://wiki.gentoo.org/wiki/Layman), execute:
-
-``` sh
-layman -a src_prepare-overlay
-```
-
 #### eselect-repository
 
 If you are using [eselect-repository](https://wiki.gentoo.org/wiki/Eselect/Repository), execute:
@@ -61,18 +59,19 @@ If you are using [eselect-repository](https://wiki.gentoo.org/wiki/Eselect/Repos
 eselect repository enable src_prepare-overlay
 ```
 
-#### Manual
+### Manual
 
-If you want to manually add the overlay, see [examples/repos.conf/src_prepare-overlay.conf](https://gitlab.com/src_prepare/src_prepare-overlay/blob/master/examples/repos.conf/src_prepare-overlay.conf).
+If you want to manually add the overlay, see [examples/repos.conf/src_prepare-overlay.conf](examples/repos.conf/src_prepare-overlay.conf).
 
-##### Layman
+#### eselect-repository
 
-If you are using [Layman](https://wiki.gentoo.org/wiki/Layman), execute:
+If you are using [eselect-repository](https://wiki.gentoo.org/wiki/Eselect/Repository), execute:
 
 ``` sh
-layman -o 'https://gitlab.com/src_prepare/src_prepare-overlay/raw/master/repositories.xml' -f -a src_prepare-overlay
+eselect repository add src_prepare-overlay git https://gitlab.com/src_prepare/src_prepare-overlay
 ```
 
+
 ## How do I sync this?
 
 Execute:
@@ -83,8 +82,16 @@ emaint sync -r src_prepare-overlay
 
 ## It says the ebuild is masked, what do I do?
 
-See [examples/package.accept_keywords/src_prepare-overlay](https://gitlab.com/src_prepare/src_prepare-overlay/blob/master/examples/package.accept_keywords/src_prepare-overlay).
+See [examples/package.accept_keywords/src_prepare-overlay.conf](examples/package.accept_keywords/src_prepare-overlay.conf).
 
-## Contributing
+
+# Submitting an Issue
+
+### Ebuild error
+
+[Our issue tracker is located in our **GitLab** repository.](https://gitlab.com/src_prepare/src_prepare-overlay/-/issues) If an ebuild appears to produce an error, please report it in our GitLab repository.
+
+
+# Contributing
 
 We appreciate and encourage for contribution. If you want a specific package or want to create a package for us to maintain, see [CONTRIBUTING.md](/CONTRIBUTING.md).

TODO.md

@@ -4,9 +4,4 @@
 ## Fix those:
 
 * sys-boot/multibootusb (writable and executable sections)
-* solve how www-client/waterfox should be named (classic vs current)
-
-
-## Community:
-
-* propose a shorter name
+* figure out the best way to install python programs that use meson (or nag upstream to use setup.py)

acct-group/jellyfin/jellyfin-0.ebuild

@@ -1,14 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-KEYWORDS="~amd64 ~arm64"
-
-DESCRIPTION="Jelyfin program group"
-
-ACCT_GROUP_ID=-1
-
-SLOT="0"

acct-group/miniflux/metadata.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>me@concord.sh</email>
-		<name>0xC0ncord</name>
-	</maintainer>
-</pkgmetadata>
-

acct-group/miniflux/miniflux-0.ebuild

@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=-1

acct-user/jellyfin/jellyfin-0.ebuild

@@ -1,16 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-KEYWORDS="~amd64 ~arm64"
-
-DESCRIPTION="Jellyfin user"
-
-ACCT_USER_ID=-1
-ACCT_USER_GROUPS=( jellyfin )
-acct-user_add_deps
-
-SLOT="0"

acct-user/jellyfin/metadata.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>

acct-user/miniflux/Manifest

@@ -1 +0,0 @@
-EBUILD miniflux-0.ebuild 261 BLAKE2B 4760996434119a69af4cbd770a8a3f27896db52f8c23e8f93fd6835e7bcde84235c1305bca1a2606bfb377dcf98009bd9035d5ce25ef7072cd22564321396ebf SHA512 c4800cdb0a62ddb28433bc3bb4621829dbd0acbe1ab8b5f94ddb8ef7605ab64a47a9e6a62eabaa8845d2cfdda56da7b08b6dcc622a5282319012d96862421ef2

acct-user/miniflux/metadata.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>me@concord.sh</email>
-		<name>0xC0ncord</name>
-	</maintainer>
-</pkgmetadata>
-

acct-user/miniflux/miniflux-0.ebuild

@@ -1,13 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for www-apps/miniflux"
-ACCT_USER_ID=-1
-ACCT_USER_HOME="/dev/null"
-ACCT_USER_GROUPS=( miniflux )
-
-acct-user_add_deps

app-admin/cgls/Manifest

@@ -0,0 +1 @@
+DIST systemd-247.tar.gz 9887080 BLAKE2B b3b9399b0e0258453e1ea0bee1212bca7998d0c762fc2da1a3ee6f239bcdde5aa33cb6b7bab377f5dfcb029205b31b733589dbac463ec75cf0b6d371edc9c20f SHA512 dd11cf46e5d9cbf44beb2d383262e9b13eb80fbb3403d86d011b4c2f9e0a4778c7c9779c856960f5654177581c20d7336c00ce687d35fe35ce069c56924604c2

app-admin/cgls/cgls-247.ebuild

@@ -0,0 +1,166 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Based on:
+# - https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
+# - https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-boot/systemd-boot/systemd-boot-245.ebuild
+# Difference: Is is possible to install this on a system running systemd.
+
+EAPI=7
+
+MINKV="3.11"
+
+inherit meson
+
+DESCRIPTION="cgls from systemd"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+else
+	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+# No tests for this one (if I mised them let me know)
+RESTRICT="mirror test"
+LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+IUSE="selinux"
+
+BDEPEND="
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	sys-devel/m4
+	virtual/pkgconfig
+"
+DEPEND="
+	>=sys-apps/util-linux-2.30:0=
+	>=sys-kernel/linux-headers-${MINKV}
+	sys-apps/acl:0=
+	sys-libs/libcap:0=
+	selinux? ( sys-libs/libselinux:0= )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/systemd-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/246-${PN}-libshared-static.patch"
+)
+
+src_configure() {
+	local systemd_disable_options=(
+		adm-group
+		analyze
+		apparmor
+		audit
+		backlight
+		binfmt
+		blkid
+		bzip2
+		coredump
+		dbus
+		efi
+		elfutils
+		environment-d
+		fdisk
+		firstboot
+		gcrypt
+		glib
+		gnutls
+		gshadow
+		hibernate
+		hostnamed
+		hwdb
+		idn
+		ima
+		initrd
+		kernel-install
+		kmod
+		ldconfig
+		libcryptsetup
+		libcurl
+		libfido2
+		libidn
+		libidn2
+		libiptc
+		link-networkd-shared
+		link-systemctl-shared
+		link-timesyncd-shared
+		link-udev-shared
+		localed
+		logind
+		lz4
+		machined
+		microhttpd
+		networkd
+		nss-myhostname
+		nss-resolve
+		nss-systemd
+		openssl
+		p11kit
+		pam
+		pcre2
+		polkit
+		portabled
+		pstore
+		pwquality
+		qrencode
+		quotacheck
+		randomseed
+		resolve
+		rfkill
+		seccomp
+		smack
+		sysusers
+		timedated
+		timesyncd
+		tmpfiles
+		tpm
+		userdb
+		utmp
+		vconsole
+		wheel-group
+		xdg-autostart
+		xkbcommon
+		xz
+		zlib
+		zstd
+	)
+	# prepend -D and append =false, e.g. zstd becomes -Dzstd=false
+	systemd_disable_options=( ${systemd_disable_options[@]/#/-D} )
+	systemd_disable_options=( ${systemd_disable_options[@]/%/=false} )
+
+	local emesonargs=(
+		-Dacl=true
+		-Dstandalone-binaries=true
+		-Dstatic-libsystemd=true
+		-Dsysvinit-path=''
+		${systemd_disable_options[@]}
+		$(meson_use selinux)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	local mytargets=(
+		systemd-cgls
+		man/systemd-cgls.1
+	)
+	meson_src_compile "${mytargets[@]}"
+}
+
+src_install() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+
+	newbin systemd-cgls cgls
+	newman man/systemd-cgls.1 cgls.1
+
+	popd >/dev/null || die
+}

app-admin/cgls/files/246-cgls-libshared-static.patch

@@ -0,0 +1,13 @@
+index dbbddb6..3f9b144 100644
+--- a/meson.build
++++ b/meson.build
+@@ -2886,8 +2886,7 @@ public_programs += executable(
+         'systemd-cgls',
+         'src/cgls/cgls.c',
+         include_directories : includes,
+-        link_with : [libshared],
+-        install_rpath : rootlibexecdir,
++        link_with : [libshared_static, libsystemd_static],
+         install : true)
+ 
+ public_programs += executable(

app-admin/cgls/metadata.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>xgqt@protonmail.com</email>
+        <name>Maciej Barć</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">systemd/systemd</remote-id>
+    </upstream>
+    <longdescription>
+        systemd-cgls recursively shows the contents of the selected Linux
+        control group hierarchy in a tree. If arguments are specified,
+        shows all member processes of the specified control groups plus
+        all their subgroups and their members. The control groups may either
+        be specified by their full file paths or are assumed in the systemd
+        control group hierarchy. If no argument is specified and the current
+        working directory is beneath the control group mount point
+        /sys/fs/cgroup/, shows the contents of the control group the working
+        directory refers to. Otherwise, the full systemd control group
+        hierarchy is shown.
+    </longdescription>
+</pkgmetadata>

app-admin/cgtop/Manifest

@@ -0,0 +1 @@
+DIST systemd-247.tar.gz 9887080 BLAKE2B b3b9399b0e0258453e1ea0bee1212bca7998d0c762fc2da1a3ee6f239bcdde5aa33cb6b7bab377f5dfcb029205b31b733589dbac463ec75cf0b6d371edc9c20f SHA512 dd11cf46e5d9cbf44beb2d383262e9b13eb80fbb3403d86d011b4c2f9e0a4778c7c9779c856960f5654177581c20d7336c00ce687d35fe35ce069c56924604c2

app-admin/cgtop/cgtop-247.ebuild

@@ -0,0 +1,166 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Based on:
+# - https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
+# - https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-boot/systemd-boot/systemd-boot-245.ebuild
+# Difference: Is is possible to install this on a system running systemd.
+
+EAPI=7
+
+MINKV="3.11"
+
+inherit meson
+
+DESCRIPTION="cgtop from systemd"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+else
+	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+# No tests for this one (if I mised them let me know)
+RESTRICT="mirror test"
+LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+IUSE="selinux"
+
+BDEPEND="
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	sys-devel/m4
+	virtual/pkgconfig
+"
+DEPEND="
+	>=sys-apps/util-linux-2.30:0=
+	>=sys-kernel/linux-headers-${MINKV}
+	sys-apps/acl:0=
+	sys-libs/libcap:0=
+	selinux? ( sys-libs/libselinux:0= )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/systemd-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/246-${PN}-libshared-static.patch"
+)
+
+src_configure() {
+	local systemd_disable_options=(
+		adm-group
+		analyze
+		apparmor
+		audit
+		backlight
+		binfmt
+		blkid
+		bzip2
+		coredump
+		dbus
+		efi
+		elfutils
+		environment-d
+		fdisk
+		firstboot
+		gcrypt
+		glib
+		gnutls
+		gshadow
+		hibernate
+		hostnamed
+		hwdb
+		idn
+		ima
+		initrd
+		kernel-install
+		kmod
+		ldconfig
+		libcryptsetup
+		libcurl
+		libfido2
+		libidn
+		libidn2
+		libiptc
+		link-networkd-shared
+		link-systemctl-shared
+		link-timesyncd-shared
+		link-udev-shared
+		localed
+		logind
+		lz4
+		machined
+		microhttpd
+		networkd
+		nss-myhostname
+		nss-resolve
+		nss-systemd
+		openssl
+		p11kit
+		pam
+		pcre2
+		polkit
+		portabled
+		pstore
+		pwquality
+		qrencode
+		quotacheck
+		randomseed
+		resolve
+		rfkill
+		seccomp
+		smack
+		sysusers
+		timedated
+		timesyncd
+		tmpfiles
+		tpm
+		userdb
+		utmp
+		vconsole
+		wheel-group
+		xdg-autostart
+		xkbcommon
+		xz
+		zlib
+		zstd
+	)
+	# prepend -D and append =false, e.g. zstd becomes -Dzstd=false
+	systemd_disable_options=( ${systemd_disable_options[@]/#/-D} )
+	systemd_disable_options=( ${systemd_disable_options[@]/%/=false} )
+
+	local emesonargs=(
+		-Dacl=true
+		-Dstandalone-binaries=true
+		-Dstatic-libsystemd=true
+		-Dsysvinit-path=''
+		${systemd_disable_options[@]}
+		$(meson_use selinux)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	local mytargets=(
+		systemd-cgtop
+		man/systemd-cgtop.1
+	)
+	meson_src_compile "${mytargets[@]}"
+}
+
+src_install() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+
+	newbin systemd-cgtop cgtop
+	newman man/systemd-cgtop.1 cgtop.1
+
+	popd >/dev/null || die
+}

app-admin/cgtop/files/246-cgtop-libshared-static.patch

@@ -0,0 +1,13 @@
+index dbbddb6..3976888 100644
+--- a/meson.build
++++ b/meson.build
+@@ -2894,8 +2894,7 @@ public_programs += executable(
+         'systemd-cgtop',
+         'src/cgtop/cgtop.c',
+         include_directories : includes,
+-        link_with : [libshared],
+-        install_rpath : rootlibexecdir,
++        link_with : [libshared_static, libsystemd_static],
+         install : true)
+ 
+ executable(

app-admin/cgtop/metadata.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>xgqt@protonmail.com</email>
+        <name>Maciej Barć</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">systemd/systemd</remote-id>
+    </upstream>
+    <longdescription>
+        systemd-cgtop shows the top control groups of the local Linux
+        control group hierarchy, ordered by their CPU, memory,
+        or disk I/O load. The display is refreshed in regular intervals
+        (by default every 1s), similar in style to top(1). If a control
+        group path is specified, shows only the services of the specified
+        control group.
+    </longdescription>
+</pkgmetadata>

app-admin/grub-customizer/Manifest

@@ -1 +0,0 @@
-DIST grub-customizer_5.1.0.tar.gz 578046 BLAKE2B 3d32db2523e70968786bd2d6b620ee3a42a312d0b892e38121b8869a155c23aa5ead9219e56e0a84109c0bcf84a4c1f00130a3565c8d28c77b1e23bbf669a2c4 SHA512 d79c7996afd8486483d4460432207dc19315d7377dcfd2fd6a4594e64c6750bbae36f96c395c4a9748d0ff43c6095399d822fc6a23beedbc8769802818dfa11f

app-admin/grub-customizer/grub-customizer-5.1.0.ebuild

@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake
-
-DESCRIPTION="A graphical grub2 settings manager"
-HOMEPAGE="https://launchpad.net/grub-customizer"
-
-if [[ "${PV}" == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.launchpad.net/${PN}"
-else
-	PB="$(ver_cut 1-2)"
-	SRC_URI="https://launchpad.net/${PN}/${PB}/${PV}/+download/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-RESTRICT="mirror"
-LICENSE="GPL-3"
-SLOT="0"
-
-DEPEND="
-	dev-cpp/gtkmm:3.0
-	x11-themes/hicolor-icon-theme
-	sys-boot/grub:2
-	app-arch/libarchive
-"
-RDEPEND="
-	${DEPEND}
-"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}

app-admin/grub-customizer/grub-customizer-9999.ebuild

@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake
-
-DESCRIPTION="A graphical grub2 settings manager"
-HOMEPAGE="https://launchpad.net/grub-customizer"
-
-if [[ "${PV}" == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.launchpad.net/${PN}"
-else
-	PB="$(ver_cut 1-2)"
-	SRC_URI="https://launchpad.net/${PN}/${PB}/${PV}/+download/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-RESTRICT="mirror"
-LICENSE="GPL-3"
-SLOT="0"
-
-DEPEND="
-	dev-cpp/gtkmm:3.0
-	x11-themes/hicolor-icon-theme
-	sys-boot/grub:2
-	app-arch/libarchive
-"
-RDEPEND="
-	${DEPEND}
-"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}

app-backup/restic-browser-bin/Manifest

@@ -0,0 +1,2 @@
+DIST restic-browser-bin-0.3.0.zip 3751854 BLAKE2B 80e8aaec9e0b37b59af61d2bb52eeae3c61d099741d3122fd1bf2fe16ece2ea8814d4c516efb95a79a66bbb18be9c661cbacaae576758e705e9d789276b20ef5 SHA512 fc0fad191014ad2bf5e50fb5aecb94adca89c6ffa1a74e22d40dc661e4d5615047d128b59a104291a1a801f23ebc4cbc817151828cac068ad5a1a8bbf737eb91
+DIST restic-browser-bin_icon_39cb5d785a56395f083ff468beaeba4290e7f800.png 103029 BLAKE2B 17b832d77332883d110b47b9fb5f109e3bfc16310053d6544a9e2d90d60309389b3ef630ac0012a82c45cf0d50add063a18b7552cc19c23261dccda09d42c1db SHA512 edf1039abf8b765661aa828f9519be94236b92adae54b3fd894bbadf94704ef933e7958f97486771bc4137f60ac987838316ff9141fac9f91d67e4224e45c3c7

app-backup/restic-browser-bin/metadata.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sighunter@gmx.de</email>
+		<name>SigHunter</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">emuell/restic-browser</remote-id>
+	</upstream>
+</pkgmetadata>

app-backup/restic-browser-bin/restic-browser-bin-0.3.0-r1.ebuild

@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg
+
+MY_PN="${PN/-bin/}"
+COMMIT="39cb5d785a56395f083ff468beaeba4290e7f800"
+ICON="${PN}_icon_${COMMIT}.png"
+
+DESCRIPTION="A GUI to browse and restore restic backup repositories"
+HOMEPAGE="https://github.com/emuell/restic-browser"
+SRC_URI="
+	https://github.com/emuell/${MY_PN}/releases/download/v${PV}/${MY_PN}-v${PV}-linux.zip ->  ${P}.zip
+	https://raw.githubusercontent.com/emuell/${MY_PN}/${COMMIT}/src-tauri/icons/icon.png -> ${ICON}
+"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	app-backup/restic
+	net-libs/webkit-gtk:4
+"
+BDEPEND="app-arch/unzip"
+
+QA_PREBUILT="*"
+
+src_unpack() {
+	unpack "${P}.zip"
+	unpack "${WORKDIR}/${MY_PN}.tar"
+}
+
+src_install() {
+	dobin "${MY_PN}"
+	newicon "${DISTDIR}/${ICON}" "${MY_PN}.png"
+	make_desktop_entry "${MY_PN}" Restic-Browser "${MY_PN}"
+}

app-crypt/gtkhash/Manifest

@@ -1,2 +0,0 @@
-DIST gtkhash-1.2.tar.gz 168259 BLAKE2B 6519be0fb02234c6a4c5185ec4e23286c087b16a18f881dc35f35bd5d55f70eb9778258f8ecea2ca2014511e0c0b32868bc0678820fdf00acaf29b7b284e5f43 SHA512 cc0ca7319fb60100f8ed94c943cb21760b861a74e2fef81ce0efe7983a8bc429d403b61d32e0b4d70e9cf605ae27f8192c2e28586f06f906016a19c92da69bec
-DIST gtkhash-1.4.tar.gz 386470 BLAKE2B 7e445c7dcc7c1341c0880e310de2d3ff10d50868f7f50e28940bdfffa7aabefaef7a6cf506461fdd72f5555b2b9cf38f1308b0b1220237156b8604a63edeee8d SHA512 bca3b7bfa53474ce5344f67bb788aaa890c58d9e527bcdc1b54ee34d83c37bcbe0aa5088674a55dc2715859a5188a03e3c6bd1982a88c759a3901cdf7f04d6df

app-crypt/gtkhash/gtkhash-1.2.ebuild

@@ -1,161 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools gnome2-utils linux-info xdg-utils
-
-DESCRIPTION="A cross-platform desktop utility for computing message digests or checksums"
-HOMEPAGE="https://github.com/tristanheaven/gtkhash"
-
-if [[ "${PV}" == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tristanheaven/${PN}.git"
-else
-	SRC_URI="https://github.com/tristanheaven/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-RESTRICT="mirror"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="
-	+blake2
-	caja
-	debug
-	-gtk2
-	+gtk3
-	+gcrypt
-	+linux-crypto
-	libressl
-	mbedtls
-	nautilus
-	nettle
-	nls
-	+openssl
-	thunar
-	+zlib
-"
-REQUIRED_USE="
-	gtk3? ( !gtk2 )
-	|| ( gtk3 gtk2 )
-	openssl? ( !libressl )
-	|| ( openssl libressl )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	app-crypt/mhash
-	dev-libs/glib:2
-	blake2? (
-		app-crypt/libb2
-	)
-	caja? (
-		mate-base/caja
-		mate-extra/caja-extensions
-	)
-	!gtk3? (
-		gtk2? (
-			x11-libs/gtk+:2
-		)
-	)
-	gtk3? (
-		x11-libs/gtk+:3
-	)
-	gcrypt? (
-		dev-libs/libgcrypt
-	)
-	mbedtls? (
-		net-libs/mbedtls
-	)
-	nautilus? (
-		gnome-base/nautilus
-	)
-	nettle? (
-		dev-libs/nettle
-	)
-	!libressl? (
-		openssl? (
-			>=dev-libs/openssl-1.1.1d
-		)
-	)
-	libressl? (
-		dev-libs/libressl
-	)
-	thunar? (
-		>=xfce-base/thunar-1.8.12
-	)
-	zlib? (
-		sys-libs/zlib
-	)
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/intltool
-	gnome-base/librsvg
-	nls? (
-		 sys-devel/gettext
-	)
-"
-
-pkg_setup() {
-	if use linux-crypto; then
-		local CONFIG_CHECK="~CRYPTO_USER_API_HASH"
-		local WARNING_CRYPTO_USER_API_HASH="CONFIG_CRYPTO_USER_API_HASH is required for hash algorithm interface"
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	eautoreconf
-	default
-}
-
-src_configure() {
-	local econfargs=(
-		$(use_enable blake2)
-		$(use_enable caja)
-		$(use_enable debug)
-		$(use_enable gcrypt)
-		$(use_enable libressl libcrypto)
-		$(use_enable linux-crypto)
-		$(use_enable mbedtls)
-		$(use_enable nautilus)
-		$(use_enable nettle)
-		$(use_enable nls)
-		$(use_enable openssl libcrypto)
-		$(use_enable thunar)
-		$(use_enable zlib)
-		--enable-appstream
-		--enable-glib-checksums
-		--enable-gtkhash
-		--enable-internal-md6
-	)
-
-	if use gtk3; then
-		econfargs+=( $(use_with gtk3 gtk 3.0) )
-	elif use gtk2; then
-		econfargs+=( $(use_with gtk2 gtk 2.0) )
-	fi
-
-	econf "${econfargs[@]}"
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}

app-crypt/gtkhash/gtkhash-1.4.ebuild

@@ -1,161 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools gnome2-utils linux-info xdg-utils
-
-DESCRIPTION="A cross-platform desktop utility for computing message digests or checksums"
-HOMEPAGE="https://github.com/tristanheaven/gtkhash"
-
-if [[ "${PV}" == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tristanheaven/${PN}.git"
-else
-	SRC_URI="https://github.com/tristanheaven/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-RESTRICT="mirror"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="
-	+blake2
-	caja
-	debug
-	-gtk2
-	+gtk3
-	+gcrypt
-	+linux-crypto
-	libressl
-	mbedtls
-	nautilus
-	nettle
-	nls
-	+openssl
-	thunar
-	+zlib
-"
-REQUIRED_USE="
-	gtk3? ( !gtk2 )
-	|| ( gtk3 gtk2 )
-	openssl? ( !libressl )
-	|| ( openssl libressl )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	app-crypt/mhash
-	dev-libs/glib:2
-	blake2? (
-		app-crypt/libb2
-	)
-	caja? (
-		mate-base/caja
-		mate-extra/caja-extensions
-	)
-	!gtk3? (
-		gtk2? (
-			x11-libs/gtk+:2
-		)
-	)
-	gtk3? (
-		x11-libs/gtk+:3
-	)
-	gcrypt? (
-		dev-libs/libgcrypt
-	)
-	mbedtls? (
-		net-libs/mbedtls
-	)
-	nautilus? (
-		gnome-base/nautilus
-	)
-	nettle? (
-		dev-libs/nettle
-	)
-	!libressl? (
-		openssl? (
-			>=dev-libs/openssl-1.1.1d
-		)
-	)
-	libressl? (
-		dev-libs/libressl
-	)
-	thunar? (
-		>=xfce-base/thunar-1.8.12
-	)
-	zlib? (
-		sys-libs/zlib
-	)
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/intltool
-	gnome-base/librsvg
-	nls? (
-		 sys-devel/gettext
-	)
-"
-
-pkg_setup() {
-	if use linux-crypto; then
-		local CONFIG_CHECK="~CRYPTO_USER_API_HASH"
-		local WARNING_CRYPTO_USER_API_HASH="CONFIG_CRYPTO_USER_API_HASH is required for hash algorithm interface"
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	eautoreconf
-	default
-}
-
-src_configure() {
-	local econfargs=(
-		$(use_enable blake2)
-		$(use_enable caja)
-		$(use_enable debug)
-		$(use_enable gcrypt)
-		$(use_enable libressl libcrypto)
-		$(use_enable linux-crypto)
-		$(use_enable mbedtls)
-		$(use_enable nautilus)
-		$(use_enable nettle)
-		$(use_enable nls)
-		$(use_enable openssl libcrypto)
-		$(use_enable thunar)
-		$(use_enable zlib)
-		--enable-appstream
-		--enable-glib-checksums
-		--enable-gtkhash
-		--enable-internal-md6
-	)
-
-	if use gtk3; then
-		econfargs+=( $(use_with gtk3 gtk 3.0) )
-	elif use gtk2; then
-		econfargs+=( $(use_with gtk2 gtk 2.0) )
-	fi
-
-	econf "${econfargs[@]}"
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}

app-crypt/gtkhash/gtkhash-9999.ebuild

@@ -1,161 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools gnome2-utils linux-info xdg-utils
-
-DESCRIPTION="A cross-platform desktop utility for computing message digests or checksums"
-HOMEPAGE="https://github.com/tristanheaven/gtkhash"
-
-if [[ "${PV}" == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tristanheaven/${PN}.git"
-else
-	SRC_URI="https://github.com/tristanheaven/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-RESTRICT="mirror"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="
-	+blake2
-	caja
-	debug
-	-gtk2
-	+gtk3
-	+gcrypt
-	+linux-crypto
-	libressl
-	mbedtls
-	nautilus
-	nettle
-	nls
-	+openssl
-	thunar
-	+zlib
-"
-REQUIRED_USE="
-	gtk3? ( !gtk2 )
-	|| ( gtk3 gtk2 )
-	openssl? ( !libressl )
-	|| ( openssl libressl )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	app-crypt/mhash
-	dev-libs/glib:2
-	blake2? (
-		app-crypt/libb2
-	)
-	caja? (
-		mate-base/caja
-		mate-extra/caja-extensions
-	)
-	!gtk3? (
-		gtk2? (
-			x11-libs/gtk+:2
-		)
-	)
-	gtk3? (
-		x11-libs/gtk+:3
-	)
-	gcrypt? (
-		dev-libs/libgcrypt
-	)
-	mbedtls? (
-		net-libs/mbedtls
-	)
-	nautilus? (
-		gnome-base/nautilus
-	)
-	nettle? (
-		dev-libs/nettle
-	)
-	!libressl? (
-		openssl? (
-			>=dev-libs/openssl-1.1.1d
-		)
-	)
-	libressl? (
-		dev-libs/libressl
-	)
-	thunar? (
-		>=xfce-base/thunar-1.8.12
-	)
-	zlib? (
-		sys-libs/zlib
-	)
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/intltool
-	gnome-base/librsvg
-	nls? (
-		 sys-devel/gettext
-	)
-"
-
-pkg_setup() {
-	if use linux-crypto; then
-		local CONFIG_CHECK="~CRYPTO_USER_API_HASH"
-		local WARNING_CRYPTO_USER_API_HASH="CONFIG_CRYPTO_USER_API_HASH is required for hash algorithm interface"
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	eautoreconf
-	default
-}
-
-src_configure() {
-	local econfargs=(
-		$(use_enable blake2)
-		$(use_enable caja)
-		$(use_enable debug)
-		$(use_enable gcrypt)
-		$(use_enable libressl libcrypto)
-		$(use_enable linux-crypto)
-		$(use_enable mbedtls)
-		$(use_enable nautilus)
-		$(use_enable nettle)
-		$(use_enable nls)
-		$(use_enable openssl libcrypto)
-		$(use_enable thunar)
-		$(use_enable zlib)
-		--enable-appstream
-		--enable-glib-checksums
-		--enable-gtkhash
-		--enable-internal-md6
-	)
-
-	if use gtk3; then
-		econfargs+=( $(use_with gtk3 gtk 3.0) )
-	elif use gtk2; then
-		econfargs+=( $(use_with gtk2 gtk 2.0) )
-	fi
-
-	econf "${econfargs[@]}"
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}

app-crypt/gtkhash/metadata.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-    <maintainer type="person">
-        <email>xgqt@protonmail.com</email>
-        <name>Maciej Barć</name>
-    </maintainer>
-    <use>
-        <flag name="blake2">
-            Enable Blake2 hash support via app-crypt/libb2
-        </flag>
-        <flag name="caja">
-            Build extension for mate-base/caja
-        </flag>
-        <flag name="gcrypt">
-            Use dev-libs/libgcrypt library
-        </flag>
-        <flag name="gtk2">
-            Support GTK+ 2.x instead of GTK+ 3.x
-        </flag>
-        <flag name="gtk3">
-            Support GTK+ 3.x instead of GTK+ 2.x
-        </flag>
-        <flag name="linux-crypto">
-            Use the Linux kernel hash algorithm interface (CONFIG_CRYPTO_USER_API_HASH)
-        </flag>
-        <flag name="mbedtls">
-            Use mbed TLS instead of OpenSSL
-        </flag>
-        <flag name="nautilus">
-            Build extension for gnome-base/nautilus
-        </flag>
-        <flag name="nettle">
-            Use the Nettle cryptographic library
-        </flag>
-        <flag name="openssl">
-            Enable the libcrypto (dev-libs/openssl library)
-        </flag>
-        <flag name="thunar">
-            Build extension for xfce-base/thunar
-        </flag>
-        <flag name="zlib">
-            Add support for zlib (de)compression
-        </flag>
-    </use>
-    <upstream>
-        <remote-id type="github">
-            app-crypt/gtkhash
-        </remote-id>
-    </upstream>
-</pkgmetadata>

app-editors/howl/howl-0.6.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

app-editors/howl/howl-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

app-editors/lite/lite-1.11-r1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

app-editors/lite/lite-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

app-editors/notepadnext/Manifest

@@ -0,0 +1,6 @@
+DIST QSimpleUpdater-518b873c97688134c2e535e05db6b4b7cebcccdd.tar.gz 298774 BLAKE2B ab2b79a2e7acbfede83407befba74c3c599cd9ef7fbfc773174928a1b932385720a6fad477c1f6f45e4031221549b64885918961aded52b5c2789e2ee2bb282d SHA512 3fd8ab9c1ff18382510c3b5ce4b838228d4577a98c12015ee30f5369d5aedb5b06bf6cff844d393df26ffb481035d54b7eef608be9086615c4f97439723a76c8
+DIST Qt-Advanced-Docking-System-8da0713bf0d964f0c5b62e87a8aa61bcae3fa212.tar.gz 21522017 BLAKE2B a366f66031b379e1c7d4e2fb42ad400c13b72ae902614b54ee811a159b6daeac23b7eda28d161073c2466f6f9114d112bc81105c444ee8bce9e025af5e45cdd6 SHA512 f6d7e411af68821d3fec16be945b700d52a7320c0b9c4d4dad973de343e66d31b8bed0dd6667f27ce1658e6950a928c824286d82d5825b992063a8b459f15c82
+DIST SingleApplication-494772e98cef0aa88124f154feb575cc60b08b38.tar.gz 23324 BLAKE2B eccf28a712e058f2ad997cd0ccd8f2117eec06e34846f87c1d6e51b0ca04ef1da0169fdd20f8f8de80a81ffa280c4045db7a1321691a5cfac8de3e5f60260f5d SHA512 98178e86fa85fcaa3e2f0030ce4e26c70489f364448c79b3e0cae304ad8fe698a4d29c0030810cef0edd32c17ebdaafc2223e32506381ade6705dcf831537221
+DIST editorconfig-core-qt-ee967262db4fdbd735f9971cc0c90cf4f3100d3a.tar.gz 7309 BLAKE2B 09f384d1d2392f64d847793f27ce9fb6ced30b028958182d32453c9367f778e3d1891fb4a6b3759294c9d383091acc8b590e7972214eb0d790347d49d00dafec SHA512 7b965f8528572e9c3b491e4d31599787574394dc7da8e086f61f5a7fb01cff8bfa2405d30acd7d43e628c5d4b9f00da4f0d45dc0e9a4513254c56d2713fd37a9
+DIST notepadnext-0.7_p20240317.tar.gz 5235205 BLAKE2B 66debbe46ecbb60e9c0d7e3a62080673b28c5dd3aca49a43f853a2a9e49ed38a9c393b958f8c5b0c544806e9e643f0c59fe0219fd1864421017de4012fc62785 SHA512 ae91e2c79c9c0dda23546990e017114f218e271cf28da82610c23b18153597b4f50ccda55110fb31c0de867053b634d51d91a2eff8cecf6825bee79e907d030b
+DIST uchardet-edae8e81cfb8092496f94da1a306c4c9f0ce32bb.tar.gz 463130 BLAKE2B 1007657b22439187e40bbbd524818ffdcf4468ae0cbf7ec2708311bf3f9c7daa596bec03f812b2c37fa134df70b024505ce41918d8612154835e4dbe1daea2f7 SHA512 003c5155bbfd6cb1f657338970033e25a97a54aabe30a991696e6e4fc7536e1c2715fcc768a2a8ae3ed3fc9feae523723ea7a3b38dec5efc07b72d86733f1742

app-editors/notepadnext/metadata.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sighunter@gmx.de</email>
+		<name>SigHunter</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">dail8859/NotepadNext</remote-id>
+	</upstream>
+</pkgmetadata>

app-editors/notepadnext/notepadnext-0.7_p20240317.ebuild

@@ -0,0 +1,78 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils xdg
+
+MY_PN="NotepadNext"
+COMMIT_NOTEPADNEXT="b6b0ccc0c380efb13663eb00d5bb8bd140b0553d"
+COMMIT_SINGLEAPPLICATION="494772e98cef0aa88124f154feb575cc60b08b38"
+COMMIT_UCHARDET="edae8e81cfb8092496f94da1a306c4c9f0ce32bb"
+COMMIT_EDITORCONFIG="ee967262db4fdbd735f9971cc0c90cf4f3100d3a"
+COMMIT_QADS="8da0713bf0d964f0c5b62e87a8aa61bcae3fa212"
+COMMIT_QSIMPLEUPDATER="518b873c97688134c2e535e05db6b4b7cebcccdd"
+
+DESCRIPTION="A cross-platform reimplementation of Notepad++ based on Qt"
+HOMEPAGE="https://github.com/dail8859/NotepadNext"
+SRC_URI="
+	https://github.com/dail8859/${MY_PN}/archive/${COMMIT_NOTEPADNEXT}.tar.gz
+		-> ${P}.tar.gz
+	https://github.com/itay-grudev/SingleApplication/archive/${COMMIT_SINGLEAPPLICATION}.tar.gz
+		-> SingleApplication-${COMMIT_SINGLEAPPLICATION}.tar.gz
+	https://gitlab.freedesktop.org/uchardet/uchardet/-/archive/${COMMIT_UCHARDET}.tar.gz
+		-> uchardet-${COMMIT_UCHARDET}.tar.gz
+	https://github.com/editorconfig/editorconfig-core-qt/archive/${COMMIT_EDITORCONFIG}.tar.gz
+		-> editorconfig-core-qt-${COMMIT_EDITORCONFIG}.tar.gz
+	https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/archive/${COMMIT_QADS}.tar.gz
+		-> Qt-Advanced-Docking-System-${COMMIT_QADS}.tar.gz
+	https://github.com/alex-spataru/QSimpleUpdater/archive/${COMMIT_QSIMPLEUPDATER}.tar.gz
+		-> QSimpleUpdater-${COMMIT_QSIMPLEUPDATER}.tar.gz
+"
+S="${WORKDIR}/${MY_PN}-${COMMIT_NOTEPADNEXT}"
+
+LICENSE="GPL-3"
+# submodule licenses
+LICENSE+=" MIT LGPL-2.1 MIT-no-machine-learning || ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="qt6"
+
+RDEPEND="
+	x11-libs/libxcb:=
+	!qt6? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+	)
+	qt6? (
+		dev-qt/qtbase:6[gui,network,widgets]
+		dev-qt/qt5compat:6
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	mv -T "${WORKDIR}"/QSimpleUpdater-"${COMMIT_QSIMPLEUPDATER}" "${S}"/src/QSimpleUpdater || die
+	mv -T "${WORKDIR}"/Qt-Advanced-Docking-System-"${COMMIT_QADS}" "${S}"/src/ads || die
+	mv -T "${WORKDIR}"/editorconfig-core-qt-"${COMMIT_EDITORCONFIG}" "${S}"/src/editorconfig-core-qt || die
+	mv -T "${WORKDIR}"/SingleApplication-"${COMMIT_SINGLEAPPLICATION}" "${S}"/src/singleapplication || die
+	mv -T "${WORKDIR}"/uchardet-"${COMMIT_UCHARDET}" "${S}"/src/uchardet || die
+}
+
+src_configure() {
+	if use qt6; then
+		eqmake6 src/NotepadNext.pro
+	else
+		eqmake5 src/NotepadNext.pro
+	fi
+}
+
+src_install() {
+	einstalldocs
+	emake INSTALL_ROOT="${ED}" install
+}

app-editors/rehex/Manifest

@@ -1 +0,0 @@
-DIST rehex-0.3.0.tar.gz 2658263 BLAKE2B cd46ca89ed2c8c5c47e0e88f8342749634d172a4a8d1ce45f7f94049601f53f9a95d0724c6da6e9e05718daf8ca17ff859f396ff67d922bbcb1a5618d8c63b49 SHA512 f3f580b32e23280a4033c49ac5ba5d09ebcc7de305af4553a745dd53c015e92601d7018f9e07127298051f3435f1e90c21bdf3ba23809a2f90c4995e0a6d0fab

app-editors/rehex/rehex-0.3.0.ebuild

@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit wxwidgets xdg
-
-DESCRIPTION="Reverse Engineers' Hex Editor"
-HOMEPAGE="https://github.com/solemnwarning/rehex"
-
-if [[ "${PV}" == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/solemnwarning/${PN}.git"
-else
-	SRC_URI="https://github.com/solemnwarning/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-RESTRICT="
-	mirror
-	!test? ( test )
-"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	dev-libs/capstone
-	dev-libs/jansson
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-cpp/gtest
-	)
-"
-
-src_configure() {
-	setup-wxwidgets
-}
-
-src_install() {
-	emake prefix="${D}"/usr install
-}

app-editors/rehex/rehex-9999.ebuild

@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit wxwidgets xdg
-
-DESCRIPTION="Reverse Engineers' Hex Editor"
-HOMEPAGE="https://github.com/solemnwarning/rehex"
-
-if [[ "${PV}" == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/solemnwarning/${PN}.git"
-else
-	SRC_URI="https://github.com/solemnwarning/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-RESTRICT="
-	mirror
-	!test? ( test )
-"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	dev-libs/capstone
-	dev-libs/jansson
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-cpp/gtest
-	)
-"
-
-src_configure() {
-	setup-wxwidgets
-}
-
-src_install() {
-	emake prefix="${D}"/usr install
-}

app-editors/vscodium-bin/Manifest

@@ -1,4 +0,0 @@
-DIST vscodium-bin-1.44.1.tar.gz 90736532 BLAKE2B ac0ce5d0e1ec8adce9fb665ca9782a623bb0a90ff302439612a3f09a96f86bdea4b85e4eaae60a3d432a37b9e0717925e2e6768a747108b2c788effa94ee29b9 SHA512 692b5e00cf2ec29f24e0da6cbdf1def11051299a460611cd8fd46f85be55e9a5cf45b70617b5cc8b037bd3c158984a609b107360ed2055957869c68ba9787e47
-DIST vscodium-bin-1.44.2.tar.gz 90734547 BLAKE2B 7800f11dfb0bdd9ce1b85ad17960902be363efa816b8ff9f923f3ff31b557c3e61ad8dbb3eab28ac0e8deb9e892719ac17dc33bbe34b1add2b920e11a6f70388 SHA512 aa681bf4fa5f571349d50be85d1c4b75c57d369a14c4c1a9827d90d36e189f2aee72f02a6b0a4aba0973cb9937c02d66a34398c820f4bd13b8b41c653badf9f9
-DIST vscodium-bin-1.49.0.tar.gz 97489317 BLAKE2B 0ccc3b703688166420646453d77409e188197c0b52ac8df0be5ccc6a894607502927a34664ce0fb86f1159f7607a45bb8056056e0cd1045f5d8ecbaf34cb7f31 SHA512 93d66adb0e0adbd95d06ac0f0f3356522d95bfce96db9e253b474e5665f4b9228dc719504e8e0ab811b9c1b6a3d8b3a1732181bcb3b2acfe9ed9693c6c0ae3f1
-DIST vscodium-bin-1.50.0.tar.gz 97501359 BLAKE2B d018ccc6f74bcb641070332934b32796c4b82b56c9865f5d56772ea7dfa71d3ff99697bde7e2a3c2d3bb2243c26c881abd20a9ab28ddd0b250b2112cee929cf3 SHA512 63281fe8c3d3fb4a816162a6483552b289e3f8738dc00e979e50baa9e8fba28ed84909adbad228cd3f249f3c7b295ec13da5c64ff8beb69f3a630e78ffca14de

app-editors/vscodium-bin/metadata.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <use>
-    <flag name="libsecret">Enable libsecret support</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">VSCodium/vscodium</remote-id>
-  </upstream>
-</pkgmetadata>

app-editors/vscodium-bin/vscodium-bin-1.44.1-r1.ebuild

@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils xdg
-
-DESCRIPTION="Open Source Software Binaries of VSCode"
-HOMEPAGE="https://github.com/VSCodium/vscodium"
-SRC_URI="https://github.com/VSCodium/vscodium/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz -> ${P}.tar.gz"
-
-RESTRICT="mirror strip bindist"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="libsecret"
-
-DEPEND="
-	>=media-libs/libpng-1.2.46:0
-	>=x11-libs/gtk+-3.0:3
-	x11-libs/cairo
-	x11-libs/libXtst
-"
-RDEPEND="
-	${DEPEND}
-	>=net-print/cups-2.0.0
-	dev-libs/nss
-	x11-libs/libXScrnSaver
-	x11-libs/libnotify
-	libsecret? (
-		app-crypt/libsecret[crypt]
-	)
-"
-
-QA_PRESTRIPPED="
-	opt/${PN}/code
-"
-
-S="${WORKDIR}"
-
-src_install() {
-	pax-mark m code
-	insinto "/opt/${PN}"
-	doins -r *
-	dosym "../../opt/${PN}/bin/codium" "/usr/bin/codium-bin"
-	dosym "../../opt/${PN}/bin/codium" "/usr/bin/vscodium-bin"
-	make_desktop_entry "codium-bin" "Codium-bin" "codium-bin" "Development;IDE"
-	newicon "resources/app/resources/linux/code.png" codium-bin.png
-	fperms +x "/opt/${PN}/codium"
-	fperms +x "/opt/${PN}/bin/codium"
-	fperms +x "/opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg"
-	insinto "/usr/share/licenses/${PN}"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}

app-editors/vscodium-bin/vscodium-bin-1.44.2-r1.ebuild

@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils xdg
-
-DESCRIPTION="Open Source Software Binaries of VSCode"
-HOMEPAGE="https://github.com/VSCodium/vscodium"
-SRC_URI="https://github.com/VSCodium/vscodium/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz -> ${P}.tar.gz"
-
-RESTRICT="mirror strip bindist"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="libsecret"
-
-DEPEND="
-	>=media-libs/libpng-1.2.46:0
-	>=x11-libs/gtk+-3.0:3
-	x11-libs/cairo
-	x11-libs/libXtst
-"
-RDEPEND="
-	${DEPEND}
-	>=net-print/cups-2.0.0
-	dev-libs/nss
-	x11-libs/libXScrnSaver
-	x11-libs/libnotify
-	libsecret? (
-		app-crypt/libsecret[crypt]
-	)
-"
-
-QA_PRESTRIPPED="
-	opt/${PN}/code
-"
-
-S="${WORKDIR}"
-
-src_install() {
-	pax-mark m code
-	insinto "/opt/${PN}"
-	doins -r *
-	dosym "../../opt/${PN}/bin/codium" "/usr/bin/codium-bin"
-	dosym "../../opt/${PN}/bin/codium" "/usr/bin/vscodium-bin"
-	make_desktop_entry "codium-bin" "Codium-bin" "codium-bin" "Development;IDE"
-	newicon "resources/app/resources/linux/code.png" codium-bin.png
-	fperms +x "/opt/${PN}/codium"
-	fperms +x "/opt/${PN}/bin/codium"
-	fperms +x "/opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg"
-	insinto "/usr/share/licenses/${PN}"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}

app-editors/vscodium-bin/vscodium-bin-1.49.0.ebuild

@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils xdg
-
-DESCRIPTION="Open Source Software Binaries of VSCode"
-HOMEPAGE="https://github.com/VSCodium/vscodium"
-SRC_URI="https://github.com/VSCodium/vscodium/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz -> ${P}.tar.gz"
-
-RESTRICT="mirror strip bindist"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="libsecret"
-
-DEPEND="
-	>=media-libs/libpng-1.2.46:0
-	>=x11-libs/gtk+-3.0:3
-	x11-libs/cairo
-	x11-libs/libXtst
-"
-RDEPEND="
-	${DEPEND}
-	>=net-print/cups-2.0.0
-	dev-libs/nss
-	x11-libs/libXScrnSaver
-	x11-libs/libnotify
-	libsecret? (
-		app-crypt/libsecret[crypt]
-	)
-"
-
-QA_PRESTRIPPED="
-	opt/${PN}/code
-"
-
-S="${WORKDIR}"
-
-src_install() {
-	pax-mark m code
-	insinto "/opt/${PN}"
-	doins -r *
-	dosym "../../opt/${PN}/bin/codium" "/usr/bin/codium-bin"
-	dosym "../../opt/${PN}/bin/codium" "/usr/bin/vscodium-bin"
-	make_desktop_entry "codium-bin" "Codium-bin" "codium-bin" "Development;IDE"
-	newicon "resources/app/resources/linux/code.png" codium-bin.png
-	fperms +x "/opt/${PN}/codium"
-	fperms +x "/opt/${PN}/bin/codium"
-	fperms +x "/opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg"
-	insinto "/usr/share/licenses/${PN}"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}

app-editors/vscodium-bin/vscodium-bin-1.50.0.ebuild

@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils xdg
-
-DESCRIPTION="Open Source Software Binaries of VSCode"
-HOMEPAGE="https://github.com/VSCodium/vscodium"
-SRC_URI="https://github.com/VSCodium/vscodium/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz -> ${P}.tar.gz"
-
-RESTRICT="mirror strip bindist"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="libsecret"
-
-DEPEND="
-	>=media-libs/libpng-1.2.46:0
-	>=x11-libs/gtk+-3.0:3
-	x11-libs/cairo
-	x11-libs/libXtst
-"
-RDEPEND="
-	${DEPEND}
-	>=net-print/cups-2.0.0
-	dev-libs/nss
-	x11-libs/libXScrnSaver
-	x11-libs/libnotify
-	libsecret? (
-		app-crypt/libsecret[crypt]
-	)
-"
-
-QA_PRESTRIPPED="
-	opt/${PN}/code
-"
-
-S="${WORKDIR}"
-
-src_install() {
-	pax-mark m code
-	insinto "/opt/${PN}"
-	doins -r *
-	dosym "../../opt/${PN}/bin/codium" "/usr/bin/codium-bin"
-	dosym "../../opt/${PN}/bin/codium" "/usr/bin/vscodium-bin"
-	make_desktop_entry "codium-bin" "Codium-bin" "codium-bin" "Development;IDE"
-	newicon "resources/app/resources/linux/code.png" codium-bin.png
-	fperms +x "/opt/${PN}/codium"
-	fperms +x "/opt/${PN}/bin/codium"
-	fperms +x "/opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg"
-	insinto "/usr/share/licenses/${PN}"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}

app-emacs/defmacro-gensym/defmacro-gensym-99999999.ebuild

@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS="24.1"
+
+inherit elisp-common git-r3
+
+DESCRIPTION="Convenient gensyms for defmacro (Emacs Lisp)"
+HOMEPAGE="https://gitlab.com/akater/defmacro-gensym/-/blob/master/defmacro-gensym.org"
+EGIT_REPO_URI="https://gitlab.com/akater/defmacro-gensym.git"
+EGIT_BRANCH="master"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64"
+DOCS="" # README.org is a relative symlink
+
+export ORG_IMMUTABLE_SOURCES_DIRECTORY="${SITEETC}/${PN}"
+
+pkg_postinst() {
+	elisp-site-regen
+	if declare -f readme.gentoo_print_elog >/dev/null; then
+		readme.gentoo_print_elog
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+}

app-emacs/defmacro-gensym/metadata.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>nuclearspace@gmail.com</email>
+    <name>Dima Akater</name>
+  </maintainer>
+  <longdescription>An extension of defmacro that provides more convenient
+declaration/initialization of gensyms, covering both with-gensyms
+and once-only functionality.
+  </longdescription>
+  <upstream>
+    <remote-id type="gitlab">akater/defmacro-gensym</remote-id>
+  </upstream>
+</pkgmetadata>

app-emacs/ement-extras/ement-extras-99999999.ebuild

@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS="24.1"
+
+MY_PN="emacs-${PN}"
+inherit elisp-common git-r3
+
+DESCRIPTION="Extra features for Ement, Matrix client for GNU Emacs"
+HOMEPAGE="https://gitlab.com/akater/emacs-ement-extras/-/blob/master/emacs-ement-extras.org"
+EGIT_REPO_URI="https://gitlab.com/akater/${MY_PN}.git"
+EGIT_BRANCH="release"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+DOCS="" # README.org is a relative symlink
+
+BDEPEND="
+	app-emacs/defmacro-gensym
+	app-emacs/ement
+	app-emacs/plz
+"
+
+RDEPEND="
+	app-emacs/ement
+"
+
+export ORG_IMMUTABLE_SOURCES_DIRECTORY="${SITEETC}/${PN}"
+
+pkg_postinst() {
+	elisp-site-regen
+	if declare -f readme.gentoo_print_elog >/dev/null; then
+		readme.gentoo_print_elog
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+}

app-emacs/ement-extras/metadata.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>nuclearspace@gmail.com</email>
+    <name>Dima Akater</name>
+  </maintainer>
+  <longdescription>Additional features for Ement.el: - password search with auth-source - convenience functions to run pantalaimon daemon from within Emacs, including a single-command zero-config entry point to run ement via pantalaimon, and a config generator.
+  </longdescription>
+  <upstream>
+    <remote-id type="gitlab">akater/emacs-ement-extras</remote-id>
+  </upstream>
+</pkgmetadata>

app-emacs/ement/Manifest

@@ -0,0 +1,2 @@
+DIST ement-0.14.tar.gz 1091980 BLAKE2B 3d8969968acc47d2141a09894b46b2b1c7b5ac93c8883cff9e56c54e9061e3769d4eded25bf8fb3791d77699b1145d902b14361a4965f636d489ac605b2da515 SHA512 e966c0836e315f60e669775b1eb479cc45151a53ca7142b5a1887606f4e15652fbb9427f98ab1a8b6362f85d87eacb0e40353f6b9e2acc4023799574fe9e776e
+DIST ement-0.15.tar.gz 1109539 BLAKE2B e4566f6b09c0b14369c339d01b184300cd0a76eb62bba8731a720d309e61cb36fcb69a64385138a8d66c18063a89abaeadec39c67ddba56d2d6f5e93a1a6a1ed SHA512 69191ae523cccc5b3fa04105c5340f9368cc3733473cfa4336000aaef0e26a536a479d45a4a7463c30941f3102addf83113998d18ae654e99bbb347298c83ba2

app-emacs/ement/ement-0.14.ebuild

@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="27.1"
+
+inherit elisp
+
+DESCRIPTION="Matrix client for GNU Emacs"
+HOMEPAGE="https://github.com/alphapapa/ement.el"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alphapapa/ement.el.git"
+else
+	SRC_URI="https://github.com/alphapapa/ement.el/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ement.el-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="
+	>=app-emacs/transient-0.3.7
+	>=app-emacs/persist-0.5
+	>=app-emacs/plz-0.6
+	>=app-emacs/taxy-0.10
+	>=app-emacs/taxy-magit-section-0.13
+	>=app-emacs/svg-lib-0.2.5
+	>=app-emacs/transient-0.3.7
+"
+
+DOCS="README.org"
+
+SITEFILE="50${PN}-gentoo.el"
+
+elisp-enable-tests ert "${S}/tests" -l tests/ement-tests.el

app-emacs/ement/ement-0.15.ebuild

@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="27.1"
+
+inherit elisp
+
+DESCRIPTION="Matrix client for GNU Emacs"
+HOMEPAGE="https://github.com/alphapapa/ement.el"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alphapapa/ement.el.git"
+else
+	SRC_URI="https://github.com/alphapapa/ement.el/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ement.el-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="
+	>=app-emacs/transient-0.3.7
+	>=app-emacs/persist-0.5
+	>=app-emacs/plz-0.6
+	>=app-emacs/taxy-0.10
+	>=app-emacs/taxy-magit-section-0.13
+	>=app-emacs/svg-lib-0.2.5
+	>=app-emacs/transient-0.3.7
+"
+
+DOCS="README.org"
+
+SITEFILE="50${PN}-gentoo.el"
+
+elisp-enable-tests ert "${S}/tests" -l tests/ement-tests.el

app-emacs/ement/ement-9999.ebuild

@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="27.1"
+
+inherit elisp
+
+DESCRIPTION="Matrix client for GNU Emacs"
+HOMEPAGE="https://github.com/alphapapa/ement.el"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alphapapa/ement.el.git"
+else
+	SRC_URI="https://elpa.gnu.org/packages/${P}.tar"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="e2e"
+
+RESTRICT="test"
+
+DEPEND="
+	>=app-emacs/transient-0.3.7
+	>=app-emacs/persist-0.5
+	>=app-emacs/plz-0.6
+	>=app-emacs/taxy-0.10
+	>=app-emacs/taxy-magit-section-0.12.1
+	>=app-emacs/svg-lib-0.2.5
+	>=app-emacs/transient-0.3.7
+"
+
+DOCS="README.org"
+
+SITEFILE="50${PN}-gentoo.el"

app-emacs/ement/files/50ement-gentoo.el

@@ -0,0 +1,90 @@
+;;; ement site-lisp configuration
+
+(add-to-list 'load-path "/usr/share/emacs/site-lisp/ement")
+
+
+;;; begin: forms written by `autoload-generate-file-autoloads'
+
+
+;;;### (autoloads nil "ement" "ement.el" (0 0 0 0))
+;;; Generated autoloads from ement.el
+
+(autoload 'ement-connect "ement" "\
+Connect to Matrix with USER-ID and PASSWORD, or using SESSION.
+Interactively, with prefix, ignore a saved session and log in
+again; otherwise, use a saved session if `ement-save-session' is
+enabled and a saved session is available, or prompt to log in if
+not enabled or available.
+
+If URI-PREFIX is specified, it should be the prefix of the
+server's API URI, including protocol, hostname, and optionally
+the port, e.g.
+
+  \"https://matrix-client.matrix.org\"
+  \"http://localhost:8080\"
+
+\(fn &key USER-ID PASSWORD URI-PREFIX SESSION)" t nil)
+
+(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ement" '("ement-")))
+
+;;;***
+
+
+;;;### (autoloads nil "ement-room-list" "ement-room-list.el" (0 0
+;;;;;;  0 0))
+;;; Generated autoloads from ement-room-list.el
+
+(autoload 'ement-room-list "ement-room-list" "\
+Show buffer listing joined rooms.
+Calls `pop-to-buffer-same-window'.  Interactively, with prefix,
+call `pop-to-buffer'.
+
+\(fn &rest IGNORE)" t nil)
+
+(defalias 'ement-list-rooms 'ement-room-list)
+
+(autoload 'ement-room-list-auto-update "ement-room-list" "\
+Automatically update the room list buffer.
+Does so when variable `ement-room-list-auto-update' is non-nil.
+To be called in `ement-sync-callback-hook'.
+
+\(fn SESSION)" nil nil)
+
+(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ement-room-list" '("ement-room-list-")))
+
+;;;***
+
+
+;;;### (autoloads nil "ement-room" "ement-room.el" (0 0 0 0))
+;;; Generated autoloads from ement-room.el
+
+(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ement-room" '("ement-")))
+
+;;;***
+
+
+;;;### (autoloads nil "ement-notify" "ement-notify.el" (0 0 0 0))
+;;; Generated autoloads from ement-notify.el
+
+(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ement-notify" '("ement-notify")))
+
+;;;***
+
+
+;;;### (autoloads nil "ement-api" "ement-api.el" (0 0 0 0))
+;;; Generated autoloads from ement-api.el
+
+(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ement-api" '("ement-api-error")))
+
+;;;***
+
+
+;;;### (autoloads nil "ement-macros" "ement-macros.el" (0 0 0 0))
+;;; Generated autoloads from ement-macros.el
+
+(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ement-macros" '("ement-")))
+
+;;;***
+
+
+;;; end: forms written by `autoload-generate-file-autoloads'

app-emacs/ement/files/ement-annotate-conf.el

@@ -0,0 +1,106 @@
+;; -*- lexical-binding: t -*-
+
+(require 'rx)
+
+(defvar ement--pantalaimon-conf-verbose (member "--verbose" command-line-args))
+
+(defun ement--pantalaimon-conf-message (format-string &rest args)
+  (when ement--pantalaimon-conf-verbose
+    (apply #'message format-string args)))
+
+(defmacro with-no-messages (&rest body)
+  (declare (indent 0))
+  `(progn
+     (advice-add 'message :around #'ignore)
+     (unwind-protect (progn ,@body)
+       (advice-remove 'message #'ignore))))
+
+(defun ement--pantalaimon-latest-doc-dir ()
+  (car
+   (last
+    (directory-files "/usr/share/doc/" t (rx string-start "pantalaimon")))))
+
+(defun ement--pantalaimon-annotate (pantalaimon-conf-file)
+  (let ((count 0)
+        (pantalaimon-options-help
+         (ignore-errors
+           (with-no-messages
+             (find-file-noselect
+              (nth 0 (directory-files (ement--pantalaimon-latest-doc-dir)
+                                      t (rx string-start "pantalaimon.5.md")
+                                      t)))))))
+    (if (not pantalaimon-options-help) (message "Can't find pantalaimon doc file to annotate pantalaimon config")
+      (ement--pantalaimon-conf-message
+       "Annotating file %s..." pantalaimon-conf-file)
+      (let ((annotations (get-buffer-create " *annotations*")))
+        (with-current-buffer annotations (buffer-disable-undo))
+        ;; annotations need to be reformatted in their own buffer
+        ;; because md syntax is different from conf syntax
+        (defun ement--pantalaimon-conf-insert-annotation (key &optional buffer)
+          (setq buffer (or buffer (current-buffer)))
+          (with-current-buffer pantalaimon-options-help
+            (save-excursion
+              (goto-char (point-min))
+              (if (not (re-search-forward (rx line-start "**" (literal key) "**"
+                                              line-end)
+                                          nil t))
+                  (progn
+                    (ement--pantalaimon-conf-message
+                     "Can't find annotation for key %s" key)
+                    nil)
+                (re-search-forward (rx (zero-or-more whitespace)) nil t)
+                (if (not (looking-at-p (rx ?\>)))
+                    (progn (ement--pantalaimon-conf-message
+                            "Unexpected annotation format for key %s" key)
+                           nil)
+                  (let ((start (point))
+                        (end (re-search-forward
+                              (rx line-start
+                                  (zero-or-more whitespace) line-end)
+                              nil t)))
+                    (with-current-buffer annotations
+                      (erase-buffer)
+                      (insert-buffer-substring-no-properties
+                       pantalaimon-options-help start end)
+                      (goto-char (point-min))
+                      (while (re-search-forward (rx line-start ?\>) nil t)
+                        (delete-backward-char 1)
+                        (insert ?\#))))
+                  (with-current-buffer buffer
+                    (insert-buffer-substring-no-properties annotations))
+                  t)))))
+        (with-current-buffer (find-file-noselect pantalaimon-conf-file)
+          (goto-char (point-min))
+          (let ((maybe-fail-ungracefully
+                 (let ((count 0))
+                   (lambda ()
+                     (when (>= (setq count (1+ count)) 10000)
+                       (error "Annotating config failed ungracefully"))))))
+            (while (not (= (point-max) (point)))
+              ;; These loops are not very safe
+              ;; todo: maybe rewrite with save-restriction
+              (funcall maybe-fail-ungracefully)
+              (when (looking-at (rx line-start
+                                    (group (one-or-more alphabetic))
+                                    (zero-or-one ?\s) ?\=))
+                (let ((key (match-string-no-properties 1)))
+                  (when ement--pantalaimon-conf-verbose
+                    "Annotating option %s..." key)
+                  (beginning-of-line)
+                  (open-line 1)
+                  (when (ement--pantalaimon-conf-insert-annotation key)
+                    (ement--pantalaimon-conf-message "Done")))
+                (while (looking-at-p (rx (or whitespace line-end)))
+                  (funcall maybe-fail-ungracefully)
+                  (delete-char 1)))
+              (next-logical-line)
+              (while (looking-at-p (rx line-start ?\#))
+                (funcall maybe-fail-ungracefully)
+                (next-logical-line))
+              (open-line 1)
+              (next-logical-line)))
+          (save-buffer))
+        (kill-buffer annotations)))))
+
+(ement--pantalaimon-annotate (expand-file-name "pantalaimon.conf"
+                                               (getenv "S")))

app-emacs/ement/files/ement-gentoo-pantalaimon.org

@@ -0,0 +1,21 @@
+#+title: Quick start with E2E encryption in Ement.el
+
+* User config
+
+You may
+#+begin_src sh
+ln -s /etc/ement/pantalaimon.conf ~/.config/pantalaimon/pantalaimon.conf
+#+end_src
+
+or do something equivalent.  See [[/etc/ement/pantalaimon.conf][the config]], it's annotated.
+
+* Starting the server
+
+Start the server with e.g.
+#+begin_src sh
+pantalaimon --config ~/.config/pantalaimon/pantalaimon.conf
+#+end_src
+
+* Starting Ement with Pantalaimon
+
+Follow [[file:README.org.bz2::*Encrypted room support through Pantalaimon][Ement's instructions]].

app-emacs/ement/files/pantalaimon.conf

@@ -0,0 +1,21 @@
+# This is an example config that should work with ement.el out of the box
+# You may symlink ~/.config/pantalaimon/pantalaimon.conf to this file
+
+[Default]
+LogLevel=Debug
+SSL=True
+Notifications=Off
+DebugEncryption=True
+
+[local-matrix]
+Homeserver=https://matrix.org
+ListenAddress=127.0.0.1
+ListenPort=8009
+IgnoreVerification=False
+UseKeyring=False
+# UseKeyring=True does not work for me on pantalaimon restarts
+# UseKeyring=No not tested
+# UseKeyring=Yes not tested
+DropOldKeys=False
+# DropOldKeys=No not tested
+# DropOldKeys=Yes not tested

app-emacs/ement/metadata.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>nuclearspace@gmail.com</email>
+    <name>Dima Akater</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">alphapapa/ement.el</remote-id>
+  </upstream>
+  <use>
+    <flag name="e2e">Enable end to end encryption support via pantalaimon</flag>
+  </use>
+</pkgmetadata>

app-emacs/taxy-magit-section/Manifest

@@ -0,0 +1 @@
+DIST taxy-magit-section-0.13.tar 81920 BLAKE2B 286fde7e9dc9dffe9985020ffc8739e47ecc4c1cfeb3a8816b6cb4f3eb6c143aeba76942080f9cdbaee55f9f1f3398b04a4a69ebc9cd3eec591aa708e79267a3 SHA512 f01178a5dc26f56eecafd1d366456a3815b890315369763c10f1203ba415e701b81b53714a5b43f297bf5dfdfd365e1fad763f88914a3f5e779db8dbd108a2c5

app-emacs/taxy-magit-section/files/50taxy-magit-section-gentoo.el

@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")

app-emacs/taxy-magit-section/metadata.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <remote-id type="github">alphapapa/taxy.el</remote-id>
+  </upstream>
+</pkgmetadata>

app-emacs/taxy-magit-section/taxy-magit-section-0.13.ebuild

@@ -0,0 +1,38 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="26.3"
+
+inherit elisp
+
+DESCRIPTION="Programmable taxonomical hierarchies for arbitrary objects"
+HOMEPAGE="https://github.com/alphapapa/taxy.el"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alphapapa/taxy.el"
+	EGIT_BRANCH="package/${PN}"
+else
+	SRC_URI="https://elpa.gnu.org/packages/${P}.tar"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RESTRICT="test"
+
+DEPEND="
+	>=app-emacs/magit-3.2.1
+	>=app-emacs/taxy-0.10
+"
+RDEPEND="${DEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+	elisp_src_install
+	doinfo ${PN}.info
+}

app-emacs/taxy-magit-section/taxy-magit-section-9999.ebuild

@@ -0,0 +1,38 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="26.3"
+
+inherit elisp
+
+DESCRIPTION="Programmable taxonomical hierarchies for arbitrary objects"
+HOMEPAGE="https://github.com/alphapapa/taxy.el"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alphapapa/taxy.el"
+	EGIT_BRANCH="package/${PN}"
+else
+	SRC_URI="https://elpa.gnu.org/packages/${P}.tar"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RESTRICT="test"
+
+DEPEND="
+	>=app-emacs/magit-3.2.1
+	>=app-emacs/taxy-0.10
+"
+RDEPEND="${DEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+	elisp_src_install
+	doinfo ${PN}.info
+}

app-emacs/taxy/Manifest

@@ -0,0 +1 @@
+DIST taxy-0.10.1.tar 245760 BLAKE2B 9fabcc2ac7cb727ef8f6bb98d936f8c3f85d0b74fa5535cce748389ac6908bf426b418f57f646ab6c3957412a2565ca49ff32c38ca2e3380ae709325d974e2d7 SHA512 ee2b66ca5d3ae871db19aa0ee65a798fdac6113b048a50d8ca843eb66d966d9432912a178b5322678b5ba504597ad31b41ec839f8dbcb674645b32cee12a4a26

app-emacs/taxy/files/50taxy-gentoo.el

@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")

app-emacs/taxy/metadata.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <remote-id type="github">alphapapa/taxy.el</remote-id>
+  </upstream>
+</pkgmetadata>

app-emacs/taxy/taxy-0.10.1.ebuild

@@ -0,0 +1,31 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="26.3"
+
+inherit elisp
+
+DESCRIPTION="Programmable taxonomical hierarchies for arbitrary objects"
+HOMEPAGE="https://github.com/alphapapa/taxy.el"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alphapapa/taxy.el"
+else
+	SRC_URI="https://elpa.gnu.org/packages/${P}.tar"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RESTRICT="test"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+	elisp_src_install
+	doinfo ${PN}.info
+}

app-emacs/taxy/taxy-9999.ebuild

@@ -0,0 +1,31 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="26.3"
+
+inherit elisp
+
+DESCRIPTION="Programmable taxonomical hierarchies for arbitrary objects"
+HOMEPAGE="https://github.com/alphapapa/taxy.el"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alphapapa/taxy.el"
+else
+	SRC_URI="https://elpa.gnu.org/packages/${P}.tar"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RESTRICT="test"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+	elisp_src_install
+	doinfo ${PN}.info
+}

app-emacs/ts/Manifest

@@ -0,0 +1 @@
+DIST ts-0.2.2.tar.gz 41296 BLAKE2B 4238662cb4c726347ab3eb33064363ca1c846c9f99283a82a9724d358547a8651a37f5d72ebb2aeb93447aa07ec1f7c8c329a1be9da7767a5aa34d18493ae4cd SHA512 231d631011cf1d51e62c2f8ce53b3e7141eb0d1127dd8911f6a82feaa074afee2147454479d19901f867548520a988129e0c16be8326386e9de926662dcb535b

app-emacs/ts/files/50ts-gentoo.el

@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")

app-emacs/ts/metadata.xml

@@ -2,10 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>xgqt@protonmail.com</email>
-    <name>Maciej Barć</name>
+    <email>nuclearspace@gmail.com</email>
+    <name>Dima Akater</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">jgm/pandoc</remote-id>
+    <remote-id type="github">alphapapa/ts.el</remote-id>
   </upstream>
 </pkgmetadata>

app-emacs/ts/ts-0.2.2.ebuild

@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="26.1"
+
+inherit elisp
+
+DESCRIPTION="Timestamp and date/time library"
+HOMEPAGE="https://github.com/alphapapa/ts.el"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alphapapa/ts.el.git"
+else
+	MY_PN="${PN}.el"
+	SRC_URI="https://github.com/alphapapa/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+
+	KEYWORDS="~amd64"
+	RESTRICT="test"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+SITEFILE="50${PN}-gentoo.el"
+
+DEPEND="
+	>=app-emacs/dash-2.14.1
+	>=app-emacs/s-1.12.0
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	emake test
+}

app-emacs/ts/ts-9999.ebuild

@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="26.1"
+
+inherit elisp
+
+DESCRIPTION="Timestamp and date/time library"
+HOMEPAGE="https://github.com/alphapapa/ts.el"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alphapapa/ts.el.git"
+else
+	MY_PN="${PN}.el"
+	SRC_URI="https://github.com/alphapapa/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+
+	KEYWORDS="~amd64"
+	RESTRICT="test"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+SITEFILE="50${PN}-gentoo.el"
+
+DEPEND="
+	>=app-emacs/dash-2.14.1
+	>=app-emacs/s-1.12.0
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	emake test
+}

app-emulation/bottles/Manifest

@@ -0,0 +1 @@
+DIST bottles-51.11.tar.gz 2268391 BLAKE2B 1c97bf73307f6f6325346b73afeaae009b7942527d0bf0cc2ac8de51933ad6021821f63c984130ee37c215acb13e5d929d25078a1574316fdfea1d8f4b4074f1 SHA512 42c503a4910a8e6c408caecd723edf1405aa034558d61313937a69c7d5ffb20ba4675fc9022775491cbbe6ba4a35ffac508b4721f9c971c57cbcb888345d546b

app-emulation/bottles/bottles-51.11.ebuild

@@ -0,0 +1,151 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit gnome2-utils python-single-r1 meson xdg optfeature
+
+DESCRIPTION="Run Windows software and games on Linux"
+HOMEPAGE="https://usebottles.com/"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bottlesdevs/Bottles/"
+else
+	SRC_URI="https://github.com/bottlesdevs/Bottles/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Bottles-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# Very annoying to figure out the deps
+# Script for getting python modules:
+#   https://gitlab.com/Parona/my-scripts/-/blob/master/scripts/python_deps.sh
+# Runtime programs needed can be quickly found with:
+#   grep -r "shutil.which"
+# But look at context to gauge if they are optional or not
+#
+# BDPEPEND dependencies can be thankfully gathered from the meson.build files
+# DEPEND are instrospection files which can be found as such
+#   find . -name "*.blp" -exec grep -Eh "^using " {} + | sed 's/using \([A-Za-z]*\) \([0-9.]*\);/\1-\2.typelib/'
+# And in similar vein find runtime required introspection files, similar deal with getting typelib file as above
+#   grep -r "gi.require_version
+
+# vkbasalt could be optional but vkbasalt-cli isnt
+# It could work without wine but(!) it still requires all the runtime dependencies for wine
+# so easier to depend on wine to get it for free
+
+DEPEND="
+	gui-libs/gtk:4[introspection]
+	gui-libs/libadwaita[introspection]
+"
+RDEPEND="
+	${PYTHON_DEPS}
+	${DEPEND}
+	app-arch/cabextract
+	app-arch/p7zip
+	gui-libs/gtksourceview[introspection]
+	media-gfx/imagemagick
+	>=sys-libs/glibc-2.32
+	x11-apps/xdpyinfo
+	|| (
+		app-emulation/wine-vanilla[X]
+		app-emulation/wine-staging[X]
+		app-emulation/wine-proton[X(+)]
+	)
+	$(python_gen_cond_dep '
+		app-arch/patool[${PYTHON_USEDEP}]
+		dev-python/certifi[${PYTHON_USEDEP}]
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/charset-normalizer[${PYTHON_USEDEP}]
+		dev-python/FVS[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/icoextract[${PYTHON_USEDEP}]
+		dev-python/markdown[${PYTHON_USEDEP}]
+		dev-python/orjson[${PYTHON_USEDEP}]
+		dev-python/pathvalidate[${PYTHON_USEDEP}]
+		dev-python/pefile[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pycurl[${PYTHON_USEDEP}]
+		dev-python/pygobject[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+		dev-python/vkbasalt-cli[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/blueprint-compiler
+	dev-libs/glib:2
+	sys-devel/gettext
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+EPYTEST_DESELECT=(
+	# tests that check execution time are flaky in the right circumstances
+	# (like compiling llvm at the same time type circumstance)
+	"bottles/tests/backend/state/test_events.py::test_set_reset"
+	"bottles/tests/backend/state/test_events.py::test_simple_event"
+	"bottles/tests/backend/state/test_events.py::test_wait_after_done_event"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	if [[ "${PV}" == "9999" ]]; then
+		local emesonargs=(
+			-Ddevel=true
+		)
+	fi
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize "${D}/usr/share/bottles/"
+	python_fix_shebang "${D}/usr/"
+}
+
+src_test() {
+	epytest
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	optfeature "gamemode support" games-util/gamemode
+	optfeature "gamescope support" games-util/gamescope
+	optfeature "vmtouch support" dev-utils/vmtouch
+	#optfeature "MangoHub support" games-util/mangohub
+	#optfeature "obs-vkcapture support" media-video/obs-vkcapture
+
+	if has_version app-emulation/wine-vanilla[llvm-libunwind] || \
+		has_version app-emulation/wine-staging[llvm-libunwind] || \
+		has_version app-emulation/wine-proton[llvm-libunwind]; then
+		ewarn "With llvm-libunwind all the runners downloaded from bottles are most likely broken"
+		ewarn "So when using llvm-libunwind system wide it is recommended to stick to runners compiled by your system"
+		ewarn "More information:"
+		ewarn "https://gitlab.com/src_prepare/src_prepare-overlay/-/issues/49"
+		ewarn "https://gitlab.com/src_prepare/src_prepare-overlay/-/merge_requests/394#note_1735168806"
+	fi
+}

app-emulation/bottles/bottles-9999.ebuild

@@ -0,0 +1,146 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit gnome2-utils python-single-r1 meson xdg optfeature
+
+DESCRIPTION="Run Windows software and games on Linux"
+HOMEPAGE="https://usebottles.com/"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bottlesdevs/Bottles/"
+else
+	SRC_URI="https://github.com/bottlesdevs/Bottles/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Bottles-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE="test llvm-libunwind"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# Very annoying to figure out the deps
+# Script for getting python modules:
+#   https://gitlab.com/Parona/my-scripts/-/blob/master/scripts/python_deps.sh
+# Runtime programs needed can be quickly found with:
+#   grep -r "shutil.which"
+# But look at context to gauge if they are optional or not
+#
+# BDPEPEND dependencies can be thankfully gathered from the meson.build files
+# DEPEND are instrospection files which can be found as such
+#   find . -name "*.blp" -exec grep -Eh "^using " {} + | sed 's/using \([A-Za-z]*\) \([0-9.]*\);/\1-\2.typelib/'
+# And in similar vein find runtime required introspection files, similar deal with getting typelib file as above
+#   grep -r "gi.require_version
+
+# vkbasalt could be optional but vkbasalt-cli isnt
+# It could work without wine but(!) it still requires all the runtime dependencies for wine
+# so easier to depend on wine to get it for free
+
+DEPEND="
+	gui-libs/gtk:4[introspection]
+	gui-libs/libadwaita[introspection]
+"
+RDEPEND="
+	${PYTHON_DEPS}
+	${DEPEND}
+	app-arch/cabextract
+	app-arch/p7zip
+	gui-libs/gtksourceview[introspection]
+	media-gfx/imagemagick
+	>=sys-libs/glibc-2.32
+	x11-apps/xdpyinfo
+	|| (
+		app-emulation/wine-vanilla[X,llvm-libunwind=]
+		app-emulation/wine-staging[X,llvm-libunwind=]
+		app-emulation/wine-proton[X(+),llvm-libunwind=]
+	)
+	$(python_gen_cond_dep '
+		app-arch/patool[${PYTHON_USEDEP}]
+		dev-python/certifi[${PYTHON_USEDEP}]
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/charset-normalizer[${PYTHON_USEDEP}]
+		dev-python/FVS[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/icoextract[${PYTHON_USEDEP}]
+		dev-python/markdown[${PYTHON_USEDEP}]
+		dev-python/orjson[${PYTHON_USEDEP}]
+		dev-python/pathvalidate[${PYTHON_USEDEP}]
+		dev-python/pefile[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pycurl[${PYTHON_USEDEP}]
+		dev-python/pygobject[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+		dev-python/vkbasalt-cli[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/blueprint-compiler
+	dev-libs/glib:2
+	sys-devel/gettext
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+EPYTEST_DESELECT=(
+	# tests that check execution time are flaky in the right circumstances
+	# (like compiling llvm at the same time type circumstance)
+	"bottles/tests/backend/state/test_events.py::test_set_reset"
+	"bottles/tests/backend/state/test_events.py::test_simple_event"
+	"bottles/tests/backend/state/test_events.py::test_wait_after_done_event"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	if [[ "${PV}" == "9999" ]]; then
+		local emesonargs=(
+			-Ddevel=true
+		)
+	fi
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize "${D}/usr/share/bottles/"
+	python_fix_shebang "${D}/usr/"
+}
+
+src_test() {
+	epytest
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	optfeature "gamemode support" games-util/gamemode
+	optfeature "gamescope support" games-util/gamescope
+	optfeature "vmtouch support" dev-utils/vmtouch
+	#optfeature "MangoHub support" games-util/mangohub
+	#optfeature "obs-vkcapture support" media-video/obs-vkcapture
+	if use llvm-libunwind; then
+		ewarn "When using llvm-libunwind useflag all the runners downloaded from bottles should be broken"
+		ewarn "So when using llvm-libunwind system wide is recommended to stick only to runners compiled by your system"
+		ewarn "Note: Using LLVM Profile Steam Proton works, so you can try bottles runners"
+	fi
+}

app-emulation/bottles/metadata.xml

@@ -6,6 +6,6 @@
         <name>Maciej Barć</name>
     </maintainer>
     <upstream>
-        <remote-id type="gitlab">src_prepare/scripts</remote-id>
+        <remote-id type="github">bottlesdevs/Bottles</remote-id>
     </upstream>
 </pkgmetadata>

app-emulation/dos32a/dos32a-9.1.2.ebuild

@@ -1,36 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Free replacement for DOS4GW."
-HOMEPAGE="https://dos32a.narechk.net/content/main.html"
-
+HOMEPAGE="https://web.archive.org/web/20210726190857/https://dos32a.narechk.net/index_en.html"
+SRC_URI="
+	https://github.com/grepwood/${PN}/releases/download/${P//.}/${P//.}-bin.zip
+"
+S=${WORKDIR}
 LICENSE="Apache-1.1-sans-Apache"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-
-#SRC_URI="http://download.narechk.net/dos32a-912-bin.zip http://download.narechk.net/dos32a-912-src.zip"
-SRC_URI="http://download.narechk.net/dos32a-912-bin.zip"
-
-IUSE="+binary"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 BDEPEND="
 	app-arch/unzip
 "
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}
-
 src_unpack() {
-	if ! use binary; then
-		die "Building DOS32A from source is not yet supported. Come back when we have an adequate DOS toolchain."
-	else
-		unzip -jd . "${DISTDIR}"/dos32a-912-bin.zip binw/*
-	fi
+	unzip -jd . "${DISTDIR}"/dos32a-912-bin.zip binw/*
 }
 
 src_install() {

app-emulation/dos32a/metadata.xml

@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <use>
-    <flag name="binary">
-      Fetch binary release instead of compiling the package from source.
-    </flag>
-  </use>
+	<upstream>
+		<remote-id type="github">grepwood/dos32a</remote-id>
+	</upstream>
 </pkgmetadata>

app-emulation/windows95/Manifest

@@ -0,0 +1,3 @@
+DIST windows95_3.1.1_amd64.deb 256272160 BLAKE2B b80af926afd7a38f21f83bd1e9f2ba811c39037ea47ec4f3ed44b067ba22ff11ecf8be29a4f0148cde141aa7c335bde21fa163bf4574f63387daaba77759cbc9 SHA512 a2d9c8392cf35df117874998393e2dc824566bbc89b05819893ce7bc1a1f29f13c8e9c47e60dbf508bd919cc652da654108d7e4ad2ffc6bc67a94295c5b12edc
+DIST windows95_3.1.1_arm64.deb 250797112 BLAKE2B 878e07f4edde735c4f757b52de52ef4a2cc6bdf4c338ec4d06a8648bd1d21014783ef7be5374881d1a924ae50a34c3e75501adaef3f632391f6b53f8fcaca021 SHA512 eeecfb449d996dab7f0062cecdce0e5df9ede6b54869b08a4ac2f7e8b86930162cb775174cc383a383272cbaf260307011447e1aa98dbfa8cfa09b8078cdf0a6
+DIST windows95_3.1.1_armhf.deb 248658660 BLAKE2B 439fbef10c70cf79ad58055cd1ce95f6451dd51810936f1237ac5c6b4db073b180a5377fb601d8af10b62f75df3eda4827402245396d7d7eece3a5b36626230c SHA512 0dd862bfe5d26c54df13b95da3f6d74a1882cb5869e05ab0560bdb59332bcb142f6ac535bc6f1208c1eec6d2e8256503e329b8201160cf9b634d1872d9f8b8f7

app-emulation/windows95/metadata.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
 <pkgmetadata>
   <upstream>
-    <remote-id type="launchpad">grub-customizer</remote-id>
+    <bugs-to>https://github.com/felixrieseberg/windows95</bugs-to>
+    <remote-id type="github">felixrieseberg/windows95</remote-id>
   </upstream>
 </pkgmetadata>

app-emulation/windows95/windows95-3.1.1.ebuild

@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_LANGS="
+	af am ar bg bn ca cs da de el en-GB es-419 es et fa fi fil fr gu he hi hr hu id it ja kn ko lt
+	lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv sw ta te th tr uk ur vi zh-CN zh-TW
+"
+
+inherit bintron-r1 unpacker
+
+DESCRIPTION="Windows 95, running in an Electron app"
+HOMEPAGE="https://github.com/felixrieseberg/windows95"
+SRC_URI="
+	amd64? (
+		https://github.com/felixrieseberg/${PN}/releases/download/v${PV}/${PN}_${PV}_amd64.deb
+	)
+	arm64? (
+		https://github.com/felixrieseberg/${PN}/releases/download/v${PV}/${PN}_${PV}_arm64.deb
+	)
+	arm? (
+		https://github.com/felixrieseberg/${PN}/releases/download/v${PV}/${PN}_${PV}_armhf.deb
+	)
+"
+
+S="${WORKDIR}/usr/lib/${PN}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RDEPEND="
+	dev-libs/wayland
+"

app-misc/cli-visualizer/Manifest

@@ -1 +1 @@
-DIST cli-visualizer-1.8.tar.gz 55083 BLAKE2B 0179ef2f0f1a4f928b5e1030eda499c706ee9207918b5ead0054472c1ba3bf293418b1a622868855496f483967754a88dd7a0c545e41b045c55466134157a90c SHA512 e64b729818f870896cc1fdbdccb80ee141d00118df4f50696919ff04d90503c913953fa76082bd09db1fca16a047d1255908852e3cfc6b3b5ac5fbb841833415
+DIST cli-visualizer-1.8_p20220323.tar.gz 58820 BLAKE2B 3369693ed1357ab69b3e591b1e4971484b5d5af76fea22efd3c656052577af3e0f7ec9f98382ab22968726fba854209b44d0aa0332d370b92b29c9cc7a3cc8b8 SHA512 13e0c2699c52d03233cef7f42dccef98945b645d452ac4e897d8a9edcb214e35359969a4b0def513f83a930eeeafdbdffd5a27e24b7bf4e4fa1ac85a99c41634

app-misc/cli-visualizer/cli-visualizer-1.8.ebuild

@@ -1,23 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="CLI based audio visualizer"
-HOMEPAGE="https://github.com/dpayne/cli-visualizer"
-SRC_URI="https://github.com/dpayne/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RESTRICT="mirror"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}
-	sci-libs/fftw
-	dev-util/cmake"
-BDEPEND=""
-
-src_install(){
-	emake DESTDIR="${D}" install
-}

app-misc/cli-visualizer/cli-visualizer-1.8_p20220323.ebuild

@@ -0,0 +1,55 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="CLI based audio visualizer"
+HOMEPAGE="https://github.com/dpayne/cli-visualizer"
+COMMIT="b98068ffbe55210ab4828556d243e13e79ba889d"
+SRC_URI="https://github.com/dpayne/cli-visualizer/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	media-libs/libpulse
+	media-libs/portaudio
+	sci-libs/fftw:3.0=
+	sys-libs/ncurses:=[tinfo]
+	test? (
+		dev-cpp/gtest
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Handle automagic, upstream uses find_program and find_library instead find_package forcing this approach
+	sed -i \
+		-e '/find_program(CCACHE_FOUND ccache)/d' \
+		-e '/find_library(JEMALLOC_FOUND NAMES jemalloc)/d' \
+		-e '/ExternalProject_Add(googletest/,/)$/d' \
+		-e '/if(VIS_WITH_TESTS)/afind_package(GTest REQUIRED)' \
+		-e '/set(GTEST_INCLUDE_DIRS ${EXTERNAL_PROJECTS_INCLUDE_DIR})/,/add_dependencies(${GMOCK_MAIN_LIBRARY} ${GTEST_LIBRARY})/d' \
+		-e 's/target_link_libraries(${PROJECT_TEST_NAME} gtest gmock pthread)/target_link_libraries(${PROJECT_TEST_NAME} GTest::gtest GTest::gmock pthread)/' \
+		CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DVIS_WITH_TESTS=$(usex test)
+		-DVIS_WITH_PERF_TESTS=OFF # possible false positive when under heavy load
+		-DVIS_RUN_CLANG_FORMAT=OFF
+		-DVIS_RUN_CLANG_TIDY=OFF
+	)
+
+	cmake_src_configure
+}

app-misc/spicetify-cli/Manifest

@@ -1,20 +1,4 @@
-DIST github.com%2Fgo-ini%2Fini%2F@v%2Fv1.55.0.mod 29 BLAKE2B ec6988d536e1cfabecc7e1ee6070c6429c88de9bd970b3ecb35bf8e42ac3d2dfa08beefbd3741ef7a039020e6d41332039c6bc0e13d5e79bca84cf669e4f552f SHA512 67077f6e3f3c2571d6df326aa1d6351c3f7950337a23c548ff69e73df265db516eee559ee4afff17868068f2754c7ef272e46bc3dd5ac324ed002b749116794f
-DIST github.com%2Fgo-ini%2Fini%2F@v%2Fv1.55.0.zip 63623 BLAKE2B 30fae1c651777a636d22383323433b28741d82756bca394b3fff40a4ae87f9ff62812ccb70762c6d57126bdeaf3ffc2b90f537411c8a65788cfaf462e06ac6ca SHA512 3d301c0b9861bdb4c226893e84102abdbaadf487e0c332527ee6b0d4274729cdae63b324c0452777aa07dff8a397620caacfc800e0d37e8c53d9580166eb2744
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip 13586 BLAKE2B 8f8bc0b542920d0effcd6939a66e34609401f564af0c1f6330bff2925abc664add3c36534bdf8602ac176e74ed85ec8c8597f748a7ec82db9e9f86207c563fee SHA512 bd6adb6aaf44c6c59bda2407a05e192d3336154cec35d0a6b6244cc5b93dc5e53509abded7c5999af166821749dd2e55333a8813ce64c310ba5db2df597bc171
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.zip 1500722 BLAKE2B 969e10c1df8afd475b39fa2d399c592266794b591f0ee8870b82f5f7942b42ec342dfc552c2d6fca93f9bce062f20c82e962db4211df64dc41015860517c276e SHA512 cde3ca000a27644d022eee1bc0600e28e8cafa7e5df4f7e4cb3a865b163eae0c5fcc6e9ca2786b8ffca7867cf69e046dc6712a0040c30e8ee1b03bb7869d09b1
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.zip 1584596 BLAKE2B 2d891f4ee749bbf528b0a44acc8cc71a56432961fc47864ec9dd47543a8a1a97d55399dbb95a0654b0588ca2dc95289ae31746ada83afd9a667662c371b6747d SHA512 8431fd78425186e55e07be9cfdb81d294b517d1695f99da3612477b8275d9a64038b60097658a02f399ed99d2f399197e572f3c307f70fa075b4995943caddb8
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.zip 1913147 BLAKE2B b29c9c32f5141a45284bb17e0236b0650a8bc60da0326e47e153563ba2259b5e30d043db1d1aa5bf98cb80b28f5481483a3b2c33776e8c40ccc6e2955b440dbd SHA512 26e655cb67ad0630e05c176a342135ec67c08eaa396000095f568f0c112810a262c204d7973e16a16539c69b7f543062ba29b6b1c9bc934f7b0783b79dd33b7a
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip 1918660 BLAKE2B 015e9ad74f145cdd7cdeb55d7b2d8949d6e7baedaae36089fa53cb257b4fb49830aeb299ea3a1f782b2f033443a18d009cafcf0211d1709d4d37b4b97d5f3d08 SHA512 24a653028d079c52ba8128d9f43452d2ecabd374c8eba36d44704c3f70cac50761597c7b7bb6524ba50fcde696fbcded57c29f04f35e42c62e23a9790852bb56
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip 1470272 BLAKE2B 9a8bbb988370bedc24428e6c78f42a9ba44dbb852ce91c3d7fc54e83678b72b9177e67c955c49dc8ef7a1e2e214475a2e55c53254469e3426ec271e90ec9e2d5 SHA512 e46ef76fe4a1628def4c6a291003b64cf11185c0214427af9c49b9ff3af99f258488d49e887206a9c8652784228d822665c5841ce87d6ff993e95ea3d0494129
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
-DIST spicetify-cli-1.1.0.tar.gz 628682 BLAKE2B 64a9e9611c0d73b882137d83ef130288f93795847e96dc65a155cc2f34a453155a39751cd828dbf14ce9f165928e8cdec05b94274bb7cc4abff218949cf00ad5 SHA512 ab385a5974ab5b92108fbf9014aa153023ab6879910cb8ba172d4ec330e2af2256ffc1872a8eecdea04b37e3ec47fcabcd93df9a38403a0538e29728f5daa678
+DIST spicetify-cli-2.36.10-deps.tar.xz 5223544 BLAKE2B 8e3f700d6f0228936bce557e46ffaf8fae76d3e3345c6d836e6b0ab06f349038c86ab0ba4d844112237278c4574c31521aaa8485e1e5235498e8c1f1662cd5a0 SHA512 39e1e3d4d1e33e732c175fe68e363731dc3f44c406dc8f0a1f44ad810d8a9043d2bb24a1dae9e8959602df3ad0e65941e89fad083175e9a149dfa1a23e1d299c
+DIST spicetify-cli-2.36.10.tar.gz 2018364 BLAKE2B 7e19088599bfef2acd990e3f34900f3c2cbc079dfeec984b171dad76af8352cae676860f80397ec8c940536fd00bbad241eb8502bf13062934922411eeb9b7c0 SHA512 1751dba60a9ca054bc0bc1dc712d2cef28342ebdce4cee1be3697c393915b4999c19eacbc4ab4c401e1056b91c37f4734dd59a1fd22d077e0d915e40b0846324
+DIST spicetify-cli-2.36.11-deps.tar.xz 5223520 BLAKE2B baca6229ff613537375da05f7d7c25e6c44301f3e2dd7b30d31f11bc77d5c89c9f8b5e8be5201127ad5d8a2f3356b3e701b837b555dfbe52145cfeb4ef7ea0e3 SHA512 167cc92e9f6fe249ac025185e587fd75d0a61b670b65d5496b19a1cc9826c9509858e6b947d7b06d1ed016bc1121ba0b1680e4cc8e6472624dff92dc35891a99
+DIST spicetify-cli-2.36.11.tar.gz 2018637 BLAKE2B 0822e88c915f33bf3cdfb743ff133e3fff94c7ab4c5cbfe5033492601998ad5edf0940e2ec18005d1ca6140616ef40d33e50281ff00ca8499db14c059614ffe5 SHA512 88e8b07be6207a3d2781dbd1a29b504ab424356c22171de4617e4c1fcf1d19c7f68b17289f85f8342fec026d87d86009bb9e8ef2323db6617d89e64ba0058a0b

app-misc/spicetify-cli/metadata.xml

@@ -6,7 +6,7 @@
 		<name>Alfred Wingate</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">khanhas/spicetify-cli</remote-id>
-		<doc>https://github.com/khanhas/spicetify-cli/wiki</doc>
+		<remote-id type="github">spicetify/spicetify-cli</remote-id>
+		<doc>https://spicetify.app/docs/getting-started/</doc>
 	</upstream>
 </pkgmetadata>

app-misc/spicetify-cli/spicetify-cli-1.1.0.ebuild

@@ -1,67 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module
-
-EGO_SUM=(
-	"github.com/go-ini/ini v1.55.0"
-	"github.com/go-ini/ini v1.55.0/go.mod"
-	"github.com/mattn/go-colorable v0.1.6"
-	"github.com/mattn/go-colorable v0.1.6/go.mod"
-	"github.com/mattn/go-isatty v0.0.12"
-	"github.com/mattn/go-isatty v0.0.12/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/net v0.0.0-20200506145744-7e3656a0809f"
-	"golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42"
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-	"golang.org/x/text v0.3.0"
-	"golang.org/x/text v0.3.0/go.mod"
-)
-
-go-module_set_globals
-
-DESCRIPTION="Commandline tool to customize Spotify client."
-HOMEPAGE="https://github.com/khanhas/spicetify-cli"
-SRC_URI="
-	https://github.com/khanhas/spicetify-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}
-"
-
-LICENSE="Apache-2.0 BSD GPL-3 MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-INSTALLDIR="/opt/${PN}"
-
-src_unpack() {
-	unpack "${DISTDIR}"/golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip
-	go-module_src_unpack
-	default
-}
-
-src_prepare() {
-	# Have to do this as eclass has issues with this for reasons unknown to me
-	mkdir -p "${HOME}"/go/pkg/mod/golang.org/x/
-	cp -r "${WORKDIR}"/golang.org/x/sys\@v0.0.0-20200323222414-85ca7c5b95cd/ "${HOME}"/go/pkg/mod/golang.org/x/sys\@v0.0.0-20200323222414-85ca7c5b95cd
-	default
-}
-
-src_compile() {
-	go build
-}
-
-src_install() {
-	insinto "${INSTALLDIR}"
-	doins -r {CustomApps,Extensions,Themes,jsHelper,spicetify-cli}
-	dobin "${FILESDIR}/spicetify"
-	fperms +x "${INSTALLDIR}/spicetify-cli"
-}

app-misc/spicetify-cli/spicetify-cli-2.36.10.ebuild

@@ -0,0 +1,99 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+WHITELIST_VERSIONS=(
+	"<> 1.2.8 1.2.36"
+)
+
+whitelist_versions() {
+	local version_spec version1 version2
+	local -a deps
+
+	SPOTIFY_VERSIONS=
+
+	# Iterate in reverse for elog
+	for ((index = $(( ${#WHITELIST_VERSIONS[@]} - 1 )); index >= 0; index--)); do
+		read -r version_spec version1 version2 <<< "${WHITELIST_VERSIONS[${index}]}"
+
+		case ${version_spec} in
+			"<>")
+				deps[$index]="( <=media-sound/spotify-${version2} >=media-sound/spotify-${version1} )"
+				SPOTIFY_VERSIONS+="${version1} -> ${version2}"
+				;;
+			"~")
+				deps[$index]="~media-sound/spotify-${version1}"
+				SPOTIFY_VERSIONS+="${version1}"
+				;;
+			*)
+				die "Invalid version specifier in WHITELIST_VERSIONS"
+				;;
+		esac
+
+		if [[ ${index} == 0 ]]; then
+			SPOTIFY_VERSIONS+=". "
+		elif [[ ${index} == 1 ]]; then
+			SPOTIFY_VERSIONS+=" and "
+		else
+			SPOTIFY_VERSIONS+=", "
+		fi
+	done
+
+	RDEPEND=" || ( ${deps[@]} )"
+}
+whitelist_versions
+
+DESCRIPTION="Commandline tool to customize Spotify client."
+HOMEPAGE="https://spicetify.app/"
+SRC_URI="
+	https://github.com/spicetify/spicetify-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://gitlab.com/api/v4/projects/37881342/packages/generic/${PN}/${PV}/${P}-deps.tar.xz
+"
+
+LICENSE="Apache-2.0 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# no tests
+RESTRICT="test"
+
+INSTALLDIR="/opt/${PN}"
+
+src_compile() {
+	ego build -ldflags "-X main.version=${PV}"
+}
+
+src_install() {
+	insinto "${INSTALLDIR}"
+	doins -r {CustomApps,Extensions,Themes,jsHelper,spicetify-cli}
+	dobin "${FILESDIR}/spicetify"
+	fperms +x "${INSTALLDIR}/spicetify-cli"
+}
+
+pkg_postinst() {
+	elog "Spicetify requires a Spotify install that it can modify."
+	elog "To give read and write permissions to everyone on the system to run the following commands as root."
+	elog "# chmod a+wr /opt/spotify/spotify-client"
+	elog "# chmod a+wr /opt/spotify/spotify-client/Apps -R"
+	elog ""
+	elog "WARNING: Do not run spicetify as root please"
+	elog ""
+	elog "Spicetify compatibility is limited to the following Spotify versions:"
+	elog " ${SPOTIFY_VERSIONS}"
+	elog ""
+	elog "Otherwise you can install spotify to a user modifiable location like as a flatpak:"
+	elog " https://spicetify.app/docs/advanced-usage/installation#spotify-installed-from-flatpak"
+	elog ""
+	elog "To install themes see:"
+	elog " https://spicetify.app/docs/advanced-usage/themes"
+
+	if $(has_version -r ">=media-sound/spotify-1.2.25"); then
+		elog ""
+		elog "The New Releases custom app no longer works with Spotify 1.2.25 and higher. As an alternative,"
+		elog "please use What's New which was created by Spotify and can be enabled via Experimental Features"
+		elog "if it isn't already enabled."
+	fi
+}

app-misc/spicetify-cli/spicetify-cli-2.36.11.ebuild

@@ -0,0 +1,99 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+WHITELIST_VERSIONS=(
+	"<> 1.2.8 1.2.37"
+)
+
+whitelist_versions() {
+	local version_spec version1 version2
+	local -a deps
+
+	SPOTIFY_VERSIONS=
+
+	# Iterate in reverse for elog
+	for ((index = $(( ${#WHITELIST_VERSIONS[@]} - 1 )); index >= 0; index--)); do
+		read -r version_spec version1 version2 <<< "${WHITELIST_VERSIONS[${index}]}"
+
+		case ${version_spec} in
+			"<>")
+				deps[$index]="( <=media-sound/spotify-${version2} >=media-sound/spotify-${version1} )"
+				SPOTIFY_VERSIONS+="${version1} -> ${version2}"
+				;;
+			"~")
+				deps[$index]="~media-sound/spotify-${version1}"
+				SPOTIFY_VERSIONS+="${version1}"
+				;;
+			*)
+				die "Invalid version specifier in WHITELIST_VERSIONS"
+				;;
+		esac
+
+		if [[ ${index} == 0 ]]; then
+			SPOTIFY_VERSIONS+=". "
+		elif [[ ${index} == 1 ]]; then
+			SPOTIFY_VERSIONS+=" and "
+		else
+			SPOTIFY_VERSIONS+=", "
+		fi
+	done
+
+	RDEPEND=" || ( ${deps[@]} )"
+}
+whitelist_versions
+
+DESCRIPTION="Commandline tool to customize Spotify client."
+HOMEPAGE="https://spicetify.app/"
+SRC_URI="
+	https://github.com/spicetify/spicetify-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://gitlab.com/api/v4/projects/37881342/packages/generic/${PN}/${PV}/${P}-deps.tar.xz
+"
+
+LICENSE="Apache-2.0 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# no tests
+RESTRICT="test"
+
+INSTALLDIR="/opt/${PN}"
+
+src_compile() {
+	ego build -ldflags "-X main.version=${PV}"
+}
+
+src_install() {
+	insinto "${INSTALLDIR}"
+	doins -r {CustomApps,Extensions,Themes,jsHelper,spicetify-cli}
+	dobin "${FILESDIR}/spicetify"
+	fperms +x "${INSTALLDIR}/spicetify-cli"
+}
+
+pkg_postinst() {
+	elog "Spicetify requires a Spotify install that it can modify."
+	elog "To give read and write permissions to everyone on the system to run the following commands as root."
+	elog "# chmod a+wr /opt/spotify/spotify-client"
+	elog "# chmod a+wr /opt/spotify/spotify-client/Apps -R"
+	elog ""
+	elog "WARNING: Do not run spicetify as root please"
+	elog ""
+	elog "Spicetify compatibility is limited to the following Spotify versions:"
+	elog " ${SPOTIFY_VERSIONS}"
+	elog ""
+	elog "Otherwise you can install spotify to a user modifiable location like as a flatpak:"
+	elog " https://spicetify.app/docs/advanced-usage/installation#spotify-installed-from-flatpak"
+	elog ""
+	elog "To install themes see:"
+	elog " https://spicetify.app/docs/advanced-usage/themes"
+
+	if $(has_version -r ">=media-sound/spotify-1.2.25"); then
+		elog ""
+		elog "The New Releases custom app no longer works with Spotify 1.2.25 and higher. As an alternative,"
+		elog "please use What's New which was created by Spotify and can be enabled via Experimental Features"
+		elog "if it isn't already enabled."
+	fi
+}

app-office/onlyoffice-bin/Manifest

@@ -1,2 +0,0 @@
-DIST onlyoffice-bin-6.0.0_amd64.deb 200973674 BLAKE2B 95c8dd8878778190b0e8221d6196027090a43ad722807f0c1f25979ca2d1cf88baafb7d3f8685a7aa6a0b60da6f45a3d2bf4207ff8b52c95a9c86e5418119add SHA512 59dcd4046dfb303b90ca1ef79fe71a3013a529db8a716a8d22a90b71596c1eef51358f7a309559a00fade100b13e4a7b104328593effeac09ce104358279e8c0
-DIST onlyoffice-bin-6.0.1_amd64.deb 199113182 BLAKE2B fae4bc8e828ef497f8b91a4f73d2ae6c1e834301c1b5f69acb5f6a77f4d991fa18ea97666005ceda2311928eb1cd3ba60ace837b9235c70a8ac92c8ed3dee341 SHA512 4ee535b0f69cc83b5a4fb2fb42b247d034d50ec13c1b94b4de346f9f8c830dc0c85a4faa172ab17bf21b043e8f47d1b89d3dbb4bb8e2bfd3a21d687ac4c6e9c1

app-office/onlyoffice-bin/files/fixshellsyntax.patch

@@ -1,13 +0,0 @@
-diff --git a/usr/bin/onlyoffice-desktopeditors b/usr/bin/onlyoffice-desktopeditors
-index 6fa731f..16e7b41 100755
---- a/usr/bin/onlyoffice-desktopeditors
-+++ b/usr/bin/onlyoffice-desktopeditors
-@@ -68,7 +68,7 @@ set_names_ru() {
- }
- 
- check_templates() {
--  if [ $1 != "--new-document-templates" ]; then
-+  if [ "$1" != "--new-document-templates" ]; then
-     return 0
-   fi
- 

app-office/onlyoffice-bin/metadata.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>

app-office/onlyoffice-bin/onlyoffice-bin-6.0.0-r1.ebuild

@@ -1,177 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop gnome2-utils unpacker multilib xdg
-
-MY_P="ONLYOFFICE-DesktopEditors-"${PV}""
-
-DESCRIPTION="Onlyoffice is an office productivity suite (binary version)"
-HOMEPAGE="https://www.onlyoffice.com/"
-SRC_URI="
-	amd64? (
-		https://github.com/ONLYOFFICE/DesktopEditors/releases/download/ONLYOFFICE-DesktopEditors-"${PV}"/onlyoffice-desktopeditors_amd64.deb -> "${P}"_amd64.deb
-	)
-"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="mirror strip"
-
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	app-arch/bzip2
-	!app-office/onlyoffice
-	dev-lang/orc
-	dev-libs/atk
-	dev-libs/double-conversion
-	dev-libs/expat
-	dev-libs/fribidi
-	dev-libs/glib
-	dev-libs/gmp
-	dev-libs/nspr
-	dev-libs/nss
-	dev-libs/libbsd
-	dev-libs/libffi
-	dev-libs/libpcre
-	dev-libs/libpcre2
-	dev-libs/libtasn1
-	dev-libs/libunistring
-	dev-libs/nettle
-	dev-qt/qtdeclarative:5
-	media-gfx/graphite2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/gst-plugins-base
-	media-libs/gstreamer
-	media-libs/harfbuzz
-	media-libs/libepoxy
-	media-libs/libpng
-	net-dns/libidn2
-	net-libs/gnutls
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/zlib
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libxkbcommon
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	x11-libs/pango
-	x11-libs/pixman
-	x11-libs/xcb-util-image
-"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="
-	opt/onlyoffice/desktopeditors/DesktopEditors
-	opt/onlyoffice/desktopeditors/editors_helper
-	opt/onlyoffice/desktopeditors/HtmlFileInternal
-	opt/onlyoffice/desktopeditors/libascdocumentscore.so
-	opt/onlyoffice/desktopeditors/libcef.so
-	opt/onlyoffice/desktopeditors/libEGL.so
-	opt/onlyoffice/desktopeditors/libGLESv2.so
-	opt/onlyoffice/desktopeditors/libhunspell.so
-	opt/onlyoffice/desktopeditors/libicudata.so
-	opt/onlyoffice/desktopeditors/libicudata.so.52
-	opt/onlyoffice/desktopeditors/libicudata.so.52.1
-	opt/onlyoffice/desktopeditors/libicui18n.so
-	opt/onlyoffice/desktopeditors/libicui18n.so.52
-	opt/onlyoffice/desktopeditors/libicui18n.so.52.1
-	opt/onlyoffice/desktopeditors/libicuuc.so
-	opt/onlyoffice/desktopeditors/libicuuc.so.52
-	opt/onlyoffice/desktopeditors/libicuuc.so.52.1
-	opt/onlyoffice/desktopeditors/libooxmlsignature.so
-	opt/onlyoffice/desktopeditors/libqgsttools_p.so
-	opt/onlyoffice/desktopeditors/libqgsttools_p.so.1
-	opt/onlyoffice/desktopeditors/libqgsttools_p.so.1.0
-	opt/onlyoffice/desktopeditors/libqgsttools_p.so.1.0.0
-	opt/onlyoffice/desktopeditors/libQt5Core.so.5
-	opt/onlyoffice/desktopeditors/libQt5DBus.so.5
-	opt/onlyoffice/desktopeditors/libQt5Gui.so.5
-	opt/onlyoffice/desktopeditors/libQt5Multimedia.so.5
-	opt/onlyoffice/desktopeditors/libQt5MultimediaWidgets.so.5
-	opt/onlyoffice/desktopeditors/libQt5Network.so.5
-	opt/onlyoffice/desktopeditors/libQt5OpenGL.so.5
-	opt/onlyoffice/desktopeditors/libQt5PrintSupport.so.5
-	opt/onlyoffice/desktopeditors/libQt5Svg.so.5
-	opt/onlyoffice/desktopeditors/libQt5Widgets.so.5
-	opt/onlyoffice/desktopeditors/libQt5X11Extras.so.5
-	opt/onlyoffice/desktopeditors/libQt5XcbQpa.so.5
-	opt/onlyoffice/desktopeditors/libqtascdocumentscore.so
-	opt/onlyoffice/desktopeditors/libvideoplayer.so
-	opt/onlyoffice/desktopeditors/bearer/libqconnmanbearer.so
-	opt/onlyoffice/desktopeditors/bearer/libqgenericbearer.so
-	opt/onlyoffice/desktopeditors/bearer/libqnmbearer.so
-	opt/onlyoffice/desktopeditors/converter/libDjVuFile.so
-	opt/onlyoffice/desktopeditors/converter/libdoctrenderer.so
-	opt/onlyoffice/desktopeditors/converter/libgraphics.so
-	opt/onlyoffice/desktopeditors/converter/libHtmlFile.so
-	opt/onlyoffice/desktopeditors/converter/libHtmlRenderer.so
-	opt/onlyoffice/desktopeditors/converter/libicudata.so.58
-	opt/onlyoffice/desktopeditors/converter/libicuuc.so.58
-	opt/onlyoffice/desktopeditors/converter/libkernel.so
-	opt/onlyoffice/desktopeditors/converter/libPdfReader.so
-	opt/onlyoffice/desktopeditors/converter/libPdfWriter.so
-	opt/onlyoffice/desktopeditors/converter/libUnicodeConverter.so
-	opt/onlyoffice/desktopeditors/converter/libXpsFile.so
-	opt/onlyoffice/desktopeditors/converter/x2t
-	opt/onlyoffice/desktopeditors/iconengines/libqsvgicon.so
-	opt/onlyoffice/desktopeditors/imageformats/libqsvg.so
-	opt/onlyoffice/desktopeditors/imageformats/libqico.so
-	opt/onlyoffice/desktopeditors/imageformats/libqicns.so
-	opt/onlyoffice/desktopeditors/imageformats/libqwbmp.so
-	opt/onlyoffice/desktopeditors/imageformats/libqjpeg.so
-	opt/onlyoffice/desktopeditors/imageformats/libqtiff.so
-	opt/onlyoffice/desktopeditors/imageformats/libqtga.so
-	opt/onlyoffice/desktopeditors/imageformats/libqwebp.so
-	opt/onlyoffice/desktopeditors/imageformats/libqgif.so
-	opt/onlyoffice/desktopeditors/mediaservice/libgstcamerabin.so
-	opt/onlyoffice/desktopeditors/mediaservice/libgstaudiodecoder.so
-	opt/onlyoffice/desktopeditors/mediaservice/libgstmediacapture.so
-	opt/onlyoffice/desktopeditors/mediaservice/libgstmediaplayer.so
-	opt/onlyoffice/desktopeditors/platforminputcontexts/libibusplatforminputcontextplugin.so
-	opt/onlyoffice/desktopeditors/platforminputcontexts/libqtvirtualkeyboardplugin.so
-	opt/onlyoffice/desktopeditors/platforminputcontexts/libcomposeplatforminputcontextplugin.so
-	opt/onlyoffice/desktopeditors/platforms/libqoffscreen.so
-	opt/onlyoffice/desktopeditors/platforms/libqlinuxfb.so
-	opt/onlyoffice/desktopeditors/platforms/libqvnc.so
-	opt/onlyoffice/desktopeditors/platforms/libqxcb.so
-	opt/onlyoffice/desktopeditors/platforms/libqminimal.so
-	opt/onlyoffice/desktopeditors/platformthemes/libqgtk3.so
-	opt/onlyoffice/desktopeditors/playlistformats/libqtmultimedia_m3u.so
-	opt/onlyoffice/desktopeditors/printsupport/libcupsprintersupport.so
-	opt/onlyoffice/desktopeditors/swiftshader/libEGL.so
-	opt/onlyoffice/desktopeditors/swiftshader/libGLESv2.so
-	opt/onlyoffice/desktopeditors/xcbglintegrations/libqxcb-glx-integration.so
-"
-
-src_install() {
-	domenu usr/share/applications/onlyoffice-desktopeditors.desktop
-	dobin usr/bin/desktopeditors usr/bin/onlyoffice-desktopeditors
-	doins -r opt
-	fperms +x /opt/onlyoffice/desktopeditors/{DesktopEditors,editors_helper,HtmlFileInternal,converter/x2t}
-}