diff --git a/TODO.md b/TODO.md
index 78b2f9e36a..b2262ee591 100644
--- a/TODO.md
+++ b/TODO.md
@@ -70,7 +70,7 @@ mixed
* [tides](https://sourceforge.net/projects/tidesodes/)
* [ipyleaflet](https://github.com/jupyter-widgets/ipyleaflet)
* [deadbeef](https://github.com/DeaDBeeF-Player/deadbeef)
-* [gridatudio](https://github.com/ricklamers/gridstudio)
+* [gridstudio](https://github.com/ricklamers/gridstudio)
ML
* [google-drive-ocamlfuse](https://github.com/astrada/google-drive-ocamlfuse)
diff --git a/app-accessibility/rhvoice/Manifest b/app-accessibility/rhvoice/Manifest
index 19a7e754ee..3a3eadbd13 100644
--- a/app-accessibility/rhvoice/Manifest
+++ b/app-accessibility/rhvoice/Manifest
@@ -1,4 +1,7 @@
-DIST rhvoice-1.2.4.tar.gz 187812264 BLAKE2B 0756e22758f530a4a4f969425ed07e9bdab9e9ce9a6bcf13b435992f4854d204febf88799153c3041134adbddbba2b29823740b65de6c8d2aea1d4d33b94d59a SHA512 747985a8a0fe27fd1dc15e434dc41bbdca169747ae5cb3695df89ceced9131fc9d196916af08f3caacd21c34cfc022989e3753e21dbc2c0095ba7e991dc58bb8
+DIST rhvoice-1.4.2.tar.gz 192825025 BLAKE2B 104beee30f335a2770f64b42994a604294690491ca703bf8937ce4ac0646f6cbd003f3cf83a99b8fdff015447882c8719ec9a2f7f0f981b66fb6ef00ad90b96f SHA512 bcd7cc6aadba1a619cd83e2dbd06836e985fbc4fce886a19c2272a2f6fff0792d15d4ff0b685b43705b68689ade932858e9d3b9173e6f829292d21d69a85c61a
+DIST rhvoice-aleksandr-hq-4.0.tar.gz 7315219 BLAKE2B 011a37696f3c30af1e7d63d62dcea640c1a0329b116fdf8d12152e5f22e1928a9ad2484e0ce01c9821c1eb668f7d9fb096a1406e66fbe6e88fd856cfa6465c2d SHA512 2519eb5b8c1e39bfe557258d1f54c7d02ff4159ccc513de903b48e7ef136f2f875b5f4405a1064bd9b706baa6394f7c67373a4593edf369222597223ccc341e9
DIST rhvoice-evgeniy-eng-4.0.tar.gz 7338125 BLAKE2B 58eaf04e77bde46e5013e3959815e2ea0234b8c33f7737df0b00e4b32fb49d169f651f6341ede876c331c40b1d17afffd25c4e2741871aea02ee4bdd8d7c2246 SHA512 1096b2d898292739f86333414a32b97b99112a57cf2c98c5ea31d1b92974f3adc4119e0ee031e6961810365432b77eb96229f7a45c55d8b9337a22aa3848dcc8
DIST rhvoice-evgeniy-rus-4.0.tar.gz 9962477 BLAKE2B d3fffbd54813d80734b59b6ac0ed96c0e07ce4266594a918acc01fe2bdd649d854ffe7306b57c3cb3718cdc1a090f6f7f28712005c708a39a486867760162cf9 SHA512 4053185fd5cff60a8cf3355fad69ab63348fc5047a7e5d2328a639a5c65cecfaadc92d63599b0b8bc7ca804753593c78c837621cdd153c6ce247100141b96500
DIST rhvoice-victoria-4.0.tar.gz 7425747 BLAKE2B 221805cef8b21cee24dcd34cde06450a7f9a2a588820265ae51729ddc73604caf2e089fb97ee96bf7503018f4fa967aa416fe0f0cfaf597e4d0dea4e0c72de54 SHA512 03b95f76bbd0b213fac867705acd3229f2d62448cdb863968b6ff02cc06f162d07a6154418e3ceee63d8d5352a00c1fed57b635d59424234b6cae3b1914da1cb
+DIST rhvoice-volodymyr-4.0.tar.gz 10794551 BLAKE2B a0e1f78652ecc8f89bfa404fcab6d3400e0f45282da53317a4af340c9acaffb545460f3a4bbf309b9a2525bd3695a4ff47edd00cb6692651377d44d717949375 SHA512 8f0f15229d451bbcf6db3b0f267e82635603b582f2af18d14421f3e108cdd14e4164e74e3c4723226e37b8ee7287ffa5d4083f9d2defd8b5c1b559eba547e849
+DIST rhvoice-yuriy.tar.gz 12734672 BLAKE2B 7e49c0825bfc148e8e7144d578c95ad159e2c935256174134f0682318f78b5162205b3781d365cc333c61123c1b118b464e28d63046bc497a75afcd6f8fbbc85 SHA512 07c9e65277c1774cf0185ba60107ff8f0dda5fa18eeadbfcb0cbdf5258e3fd2a364bb91c796473c9294a61e5c9366080d4d6ee115aace37f533ea1e6f167690b
diff --git a/app-accessibility/rhvoice/rhvoice-1.2.4.ebuild b/app-accessibility/rhvoice/rhvoice-1.4.2.ebuild
similarity index 69%
rename from app-accessibility/rhvoice/rhvoice-1.2.4.ebuild
rename to app-accessibility/rhvoice/rhvoice-1.4.2.ebuild
index a550f7b13c..363d121367 100644
--- a/app-accessibility/rhvoice/rhvoice-1.2.4.ebuild
+++ b/app-accessibility/rhvoice/rhvoice-1.4.2.ebuild
@@ -1,33 +1,35 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake multilib
-MY_PN="RHVoice"
DESCRIPTION="TTS engine with extended languages support (including Russian)"
HOMEPAGE="https://rhvoice.su https://github.com/RHVoice/RHVoice"
SRC_URI="
- https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
- l10n_en? ( https://github.com/${MY_PN}/evgeniy-eng/archive/refs/tags/4.0.tar.gz -> rhvoice-evgeniy-eng-4.0.tar.gz )
+ https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+ l10n_en? ( https://github.com/${PN}/evgeniy-eng/archive/refs/tags/4.0.tar.gz -> rhvoice-evgeniy-eng-4.0.tar.gz )
l10n_ru? (
- https://github.com/${MY_PN}/evgeniy-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-evgeniy-rus-4.0.tar.gz
- https://github.com/${MY_PN}/victoria-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-victoria-4.0.tar.gz
+ https://github.com/${PN}/aleksandr-hq-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-aleksandr-hq-4.0.tar.gz
+ https://github.com/${PN}/evgeniy-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-evgeniy-rus-4.0.tar.gz
+ https://github.com/${PN}/victoria-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-victoria-4.0.tar.gz
+ https://github.com/${PN}/yuriy-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-yuriy.tar.gz
)
+ l10n_uk? ( https://github.com/${PN}/volodymyr-ukr/archive/refs/tags/4.0.tar.gz -> rhvoice-volodymyr-4.0.tar.gz )
"
-S="${WORKDIR}/${MY_PN}-${PV}"
+S="${WORKDIR}/RHVoice-${PV}"
CMAKE_REMOVE_MODULES_LIST="Hardening VersionFromGit"
-LICENSE="l10n_pt-BR? ( CC-BY-SA-4.0 ) BSD GPL-2 GPL-3+ LGPL-2.1+"
+LICENSE="l10n_pt-BR? ( CC-BY-SA-4.0 ) l10n_mk? ( AGPL-3 ) BSD GPL-2 GPL-3+ LGPL-2.1+"
KEYWORDS="~amd64 ~x86"
SLOT="0"
-IUSE="ao bindist cli client portaudio +pulseaudio +server +speech-dispatcher utils"
+IUSE="ao cli client portaudio +pulseaudio +server +speech-dispatcher utils"
REQUIRED_USE="|| ( ao portaudio pulseaudio )"
CC_NC_LANGS=( en eo ky ru uk )
NC_LANGS=( ka tt )
-LANGS=" ${CC_NC_LANGS[@]} ${NC_LANGS[@]} pt-BR"
+LANGS=" ${CC_NC_LANGS[@]} ${NC_LANGS[@]} mk pt-BR"
IUSE+="${LANGS// / l10n_}"
for lang in "${CC_NC_LANGS[@]}" ; do
@@ -42,15 +44,15 @@ done
RDEPEND="
!dev-libs/hts_engine
- media-libs/sonic
ao? ( media-libs/libao )
+ client? ( sys-apps/dbus )
portaudio? ( media-libs/portaudio )
pulseaudio? ( media-sound/pulseaudio )
- speech-dispatcher? ( app-accessibility/speech-dispatcher )
server? (
dev-libs/glib[dbus]
>=dev-cpp/glibmm-2.66.1:2
)
+ speech-dispatcher? ( app-accessibility/speech-dispatcher )
"
BDEPEND="${DEPEND}
dev-cpp/cli11
@@ -59,7 +61,7 @@ BDEPEND="${DEPEND}
"
REQUIRED_USE="|| ( ao portaudio pulseaudio )"
-DOCS=( README.md NEWS doc config/dicts )
+DOCS=( README.md doc config/dicts )
delete_voices() {
for voice in "$@"; do
@@ -71,16 +73,22 @@ src_unpack() {
default
# git submodules, which are not present in the snapshot
- rmdir "${S}"/data/voices/{victoria,evgeniy-rus,evgeniy-eng} || die
+ rmdir "${S}"/data/voices/{aleksandr-hq,evgeniy-rus,evgeniy-eng,victoria,volodymyr,yuriy} || die
if use l10n_ru ; then
- mv "${WORKDIR}"/victoria-rus-4.0 "${S}"/data/voices/victoria || die
+ mv "${WORKDIR}"/aleksandr-hq-rus-4.0 "${S}"/data/voices/aleksandr-hq || die
mv "${WORKDIR}"/evgeniy-rus-4.0 "${S}"/data/voices/evgeniy-rus || die
+ mv "${WORKDIR}"/victoria-rus-4.0 "${S}"/data/voices/victoria || die
+ mv "${WORKDIR}"/yuriy-rus-4.0 "${S}"/data/voices/yuriy || die
fi
if use l10n_en ; then
mv "${WORKDIR}"/evgeniy-eng-4.0 "${S}"/data/voices/evgeniy-eng || die
fi
+
+ if use l10n_uk ; then
+ mv "${WORKDIR}"/volodymyr-ukr-4.0 "${S}"/data/voices/volodymyr || die
+ fi
}
src_prepare() {
@@ -92,8 +100,7 @@ src_prepare() {
sed 's|/systemd/system||' \
-i src/service/CMakeLists.txt || die
- sed -e "/sonic/d" \
- -e "/set(RAPIDXML_INCLUDE_DIR/d" \
+ sed -e "/set(RAPIDXML_INCLUDE_DIR/d" \
-i src/third-party/CMakeLists.txt || die
sed "/set(UTF8_INCLUDE_DIR/d" -i src/CMakeLists.txt || die
@@ -111,13 +118,14 @@ src_prepare() {
-i src/*/CMakeLists.txt \
-i src/third-party/*/CMakeLists.txt || die
- use l10n_ru || delete_voices aleksandr anna arina artemiy elena irina pavel
use l10n_en || delete_voices alan bdl clb slt
- use l10n_uk || delete_voices anatol natalia
use l10n_eo || delete_voices spomenka
use l10n_ka || delete_voices natia
use l10n_ky || delete_voices azamat nazgul
+ use l10n_mk || delete_voices kiko
+ use l10n_ru || delete_voices aleksandr anna arina artemiy elena irina pavel
use l10n_tt || delete_voices talgat
+ use l10n_uk || delete_voices anatol natalia
use l10n_pt-BR || delete_voices Leticia-F123
}
diff --git a/app-dicts/dictd-meta/dictd-meta-1.ebuild b/app-dicts/dictd-meta/dictd-meta-1.ebuild
new file mode 100644
index 0000000000..8f13a6d20a
--- /dev/null
+++ b/app-dicts/dictd-meta/dictd-meta-1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="dictd english dictionaries metapackage"
+
+SLOT="0"
+LICENSE="GPL-2"
+HOMEPAGE="http://www.dict.org"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ app-dicts/dictd-devils
+ app-dicts/dictd-elements
+ app-dicts/dictd-foldoc
+ app-dicts/dictd-gazetteer
+ app-dicts/dictd-jargon
+ app-dicts/dictd-misc
+ app-dicts/dictd-vera
+ app-dicts/dictd-wn
+
+ || ( app-dicts/dictd-gcide app-dicts/dictd-web1913 )
+"
diff --git a/app-dicts/dictd-meta/metadata.xml b/app-dicts/dictd-meta/metadata.xml
new file mode 100644
index 0000000000..d2b2c8ce9f
--- /dev/null
+++ b/app-dicts/dictd-meta/metadata.xml
@@ -0,0 +1,9 @@
+
+
+
+
+ co-maintainers welcome
+ lssndrbarbieri@gmail.com
+ Alessandro Barbieri
+
+
diff --git a/app-dicts/dictd-misc/Manifest b/app-dicts/dictd-misc/Manifest
new file mode 100644
index 0000000000..013b78b4be
--- /dev/null
+++ b/app-dicts/dictd-misc/Manifest
@@ -0,0 +1,2 @@
+DIST dict-misc_1.5A-2.diff.gz 4765 BLAKE2B 79df500281d1b354480457beb540c061b92c99a8dccc693169159440f2b1b5cb1b4bb184c374bc55a2d1e49ad1713c3ceb66fd2871e64d50ae79e1c7b625680f SHA512 56df697c138cf5f2002df30911b8811e94a6d389610c8961f9371de95c6425bbeb5c8abec42d79efde87643df2e59d43c0bf0fb0a5ec06f4564e9c25c62d0637
+DIST dict-misc_1.5A.orig.tar.gz 1097766 BLAKE2B ee29fcfb42b689d6818128f8cfc0dc1c74cc8522808e9bae14888c1fb9a95aee69504f2900e58cbdf21d9437961a0b91a8ff9f7bcf693ecc11180697c71caf47 SHA512 96c8a94cc28be40ee0cd1d102d2a77de0636995765e95cacb9a16d451cb4983e0c0b970f4964fef7c8ebd2cb4d96a44a3e97112f66646995b3ff64f0ad6d07f3
diff --git a/app-dicts/dictd-misc/dictd-misc-1.5_alpha2.ebuild b/app-dicts/dictd-misc/dictd-misc-1.5_alpha2.ebuild
new file mode 100644
index 0000000000..8285ac7600
--- /dev/null
+++ b/app-dicts/dictd-misc/dictd-misc-1.5_alpha2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MYPV="${PV/_alpha/A-}"
+MYPV2="$(ver_cut 1-3 ${MYPV} )"
+
+DESCRIPTION="Hitchcock's and Easton's Bible Dictionaries"
+HOMEPAGE="http://www.dict.org"
+SRC_URI="
+ https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/dict-misc/${MYPV}/dict-misc_${MYPV2}.orig.tar.gz
+ https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/dict-misc/${MYPV}/dict-misc_${MYPV}.diff.gz
+"
+S="${WORKDIR}/dict-misc-${MYPV2}"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND=">=app-text/dictd-1.13.0-r3"
+RDEPEND="${BDEPEND}"
+
+PATCHES=( "${WORKDIR}/dict-misc_${MYPV}.diff" )
+
+src_compile() {
+ cat easton/easton-info.txt easton/T*.html \
+ | sed 's,]*>\([^<]*\).*,{\1},g' \
+ | sed 's,\([A-Z][A-Z]*\) .T000[0-9]*,{\1},g' \
+ | dictfmt -e \
+ -u ftp://ccel.wheaton.edu/ebooks/HTML/e/easton/ebd/ \
+ -s "Easton's 1897 Bible Dictionary" easton || die
+
+ dictzip -v easton.dict || die
+
+ dictfmt -h \
+ -u ftp://ccel.wheaton.edu/ebooks/HTML/bible_names/bible_names.txt \
+ -s "Hitchcock's Bible Names Dictionary (late 1800's)" \
+ hitchcock < bible_names.txt || die
+
+ dictzip -v hitchcock.dict || die
+}
+
+src_install() {
+ insinto "/usr/share/dict"
+ doins hitchcock.{index,dict.dz}
+ doins easton.{index,dict.dz}
+ dodoc "easton/easton-info.txt"
+}
diff --git a/app-dicts/dictd-misc/metadata.xml b/app-dicts/dictd-misc/metadata.xml
new file mode 100644
index 0000000000..d2b2c8ce9f
--- /dev/null
+++ b/app-dicts/dictd-misc/metadata.xml
@@ -0,0 +1,9 @@
+
+
+
+
+ co-maintainers welcome
+ lssndrbarbieri@gmail.com
+ Alessandro Barbieri
+
+
diff --git a/app-editors/atom-bin/atom-bin-1.57.0-r1.ebuild b/app-editors/atom-bin/atom-bin-1.57.0-r2.ebuild
similarity index 85%
rename from app-editors/atom-bin/atom-bin-1.57.0-r1.ebuild
rename to app-editors/atom-bin/atom-bin-1.57.0-r2.ebuild
index bbd1b653d8..600a25b346 100644
--- a/app-editors/atom-bin/atom-bin-1.57.0-r1.ebuild
+++ b/app-editors/atom-bin/atom-bin-1.57.0-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit desktop optfeature xdg
+inherit desktop xdg
DESCRIPTION="A hackable text editor for the 21st Century"
HOMEPAGE="https://atom.io/"
@@ -84,9 +84,4 @@ src_install(){
pkg_postinst(){
xdg_desktop_database_update
- optfeature_header "If you want to use atom-beautify please install following packages:"
- optfeature "python code beautifier" dev-python/autopep8
- optfeature "python code beautifier" dev-python/black
- optfeature "shell code beautifier" dev-util/beautysh
- optfeature "C, C++, Java code beautifier" dev-util/uncrustify
}
diff --git a/app-editors/atom-bin/metadata.xml b/app-editors/atom-bin/metadata.xml
index a0b29038e0..203024baca 100644
--- a/app-editors/atom-bin/metadata.xml
+++ b/app-editors/atom-bin/metadata.xml
@@ -1,10 +1,7 @@
-
- marco@scardovi.com
- Marco Scardovi
-
+
atom/atom
diff --git a/app-misc/apidb/apidb-5.11.0_beta.ebuild b/app-misc/apidb/apidb-5.11.0_beta.ebuild
index cdde018ed0..0f7dc87bf0 100644
--- a/app-misc/apidb/apidb-5.11.0_beta.ebuild
+++ b/app-misc/apidb/apidb-5.11.0_beta.ebuild
@@ -26,7 +26,6 @@ fi
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64"
IUSE="+mariadb postgresql commands gtk +corelibs"
diff --git a/app-misc/ssmtool/Manifest b/app-misc/ssmtool/Manifest
new file mode 100644
index 0000000000..8fed13c8c9
--- /dev/null
+++ b/app-misc/ssmtool/Manifest
@@ -0,0 +1 @@
+DIST ssmtool-0.1.11.tar.gz 49000 BLAKE2B f43066e01c95a4619b73d18f391f53881feaa9209051bb832298ed876af941fac248a5cdbe9fc1b35467b145f341c74bee52e64f1a783d226190833543f35ecd SHA512 72f4f33f3f85e0d7ddf5b75ebf4d823ba0e9db4a3196edbc438470f7e6b2a9c56663b1ac78e43496714ebd6f397516f6a651d1f9346be35440812d4436a11101
diff --git a/app-misc/ssmtool/metadata.xml b/app-misc/ssmtool/metadata.xml
new file mode 100644
index 0000000000..193304d6ff
--- /dev/null
+++ b/app-misc/ssmtool/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ shaoyu0209@tuta.io
+ Shaoyu Tseng
+
+
+ ssmtool
+ FreeLanguageTools/ssmtool
+
+
diff --git a/app-misc/ssmtool/ssmtool-0.1.11.ebuild b/app-misc/ssmtool/ssmtool-0.1.11.ebuild
new file mode 100644
index 0000000000..00ea5715c0
--- /dev/null
+++ b/app-misc/ssmtool/ssmtool-0.1.11.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1 desktop
+
+DESCRIPTION="A simple sentence mining tool written in PyQt5"
+HOMEPAGE="https://github.com/FreeLanguageTools/ssmtool/ https://pypi.org/project/ssmtool/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+DEPEND="
+ dev-python/pymorphy2[${PYTHON_USEDEP}]
+ dev-python/pymorphy2-dicts-ru[${PYTHON_USEDEP}]
+ dev-python/PyQt5[${PYTHON_USEDEP}]
+ dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+python_install() {
+ newicon icon.png ssmtool.png
+ domenu ssmtool.desktop
+ distutils-r1_python_install
+}
diff --git a/app-mobilephone/flashlight/metadata.xml b/app-mobilephone/flashlight/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/app-mobilephone/flashlight/metadata.xml
+++ b/app-mobilephone/flashlight/metadata.xml
@@ -1,8 +1,5 @@
-
- marco@scardovi.com
- Marco Scardovi
-
+
diff --git a/app-mobilephone/mobile-config-firefox/metadata.xml b/app-mobilephone/mobile-config-firefox/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/app-mobilephone/mobile-config-firefox/metadata.xml
+++ b/app-mobilephone/mobile-config-firefox/metadata.xml
@@ -1,8 +1,5 @@
-
- marco@scardovi.com
- Marco Scardovi
-
+
diff --git a/app-mobilephone/pinephone-meta/metadata.xml b/app-mobilephone/pinephone-meta/metadata.xml
index 26d4a22e25..9cb2e15690 100644
--- a/app-mobilephone/pinephone-meta/metadata.xml
+++ b/app-mobilephone/pinephone-meta/metadata.xml
@@ -1,10 +1,7 @@
-
- marco@scardovi.com
- Marco Scardovi
-
+
diff --git a/app-mobilephone/pinephone-modem-scripts/metadata.xml b/app-mobilephone/pinephone-modem-scripts/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/app-mobilephone/pinephone-modem-scripts/metadata.xml
+++ b/app-mobilephone/pinephone-modem-scripts/metadata.xml
@@ -1,8 +1,5 @@
-
- marco@scardovi.com
- Marco Scardovi
-
+
diff --git a/app-mobilephone/usb-tethering/metadata.xml b/app-mobilephone/usb-tethering/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/app-mobilephone/usb-tethering/metadata.xml
+++ b/app-mobilephone/usb-tethering/metadata.xml
@@ -1,8 +1,5 @@
-
- marco@scardovi.com
- Marco Scardovi
-
+
diff --git a/app-shells/powerline-go/Manifest b/app-shells/powerline-go/Manifest
index 107c8fcab1..96d9603557 100644
--- a/app-shells/powerline-go/Manifest
+++ b/app-shells/powerline-go/Manifest
@@ -25,5 +25,3 @@ DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip 39844 BLA
DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod 95 BLAKE2B 888532a43aa7569fc03a62d78507081f30342eb4be40c01252683b16cd3658dd7b30d5f8a071dffe2c05f57bbee3afbc1ee4324c471788c633a878d498ff7d57 SHA512 2790882fbfa812468b9b3443630b1f1ee67a968eb20da8e4a1bfd410e4b516a8a7e77c07414b64f17e11e2151161b85d019e172cc833a45b19e66d4c70f89f82
DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip 81183 BLAKE2B 0e3222d715fe7e9e8e9a10abad817f75bdd095f9af250d6bdf1ee2881930c739111de8b526175c9204995c48e0ade9852541a7f22b0ce1261f473986a2739182 SHA512 d6f4ac547609c943adfc6b518ff03ac09da566ba2b29466abe8f6db3d5a41ae7e5c187068dce4e77271905b1aa88497ca49a43bb9bbf9c94011b7ccf1b4b2f42
DIST powerline-go-1.21.0.tar.gz 145144 BLAKE2B f9194f8eb68d26f481c4a333b99dc4ba7b296fd5ab943d46da684f17c9765e08bb2cb67c3e97d2979da07af0a57291a33db97167be72a7fdee7b69f294c22112 SHA512 dbb816abcc26c1fef154a3cf408164641a3c7c3e2ef7f457a0b5c1832f20f5e2a1a1e845b7bf0f24016a93e48f61e2dc4f668fb22423aec6c79c1e99799bef79
-EBUILD powerline-go-1.21.0.ebuild 2060 BLAKE2B 4bf5a34ee16cbc3fa7a87d010c1c20c5f492947c32ca94a72789b32fd7c1cd7f2a6424f65ec119ae38995b74ad595a0a25c38175fcfcb40c2d1b3b72d41ee1ba SHA512 9445b29235b88263387dc2a2c4bc936b95897f89fb9e17cdbbb4c2f64e30d275f50f1e5fac50bf84b2a670ad21d2da8b11e36be9070f78f173b265fbe0ba7706
-MISC metadata.xml 335 BLAKE2B 8de30da2b7e87945fdfebb4a84107674a99df546fab8e44dd0a90ec8e477918b2654874204f5e1f1b117bd71e08ca78a31ee816a78e137a9a7b2604875e89beb SHA512 b488663699a00dbc8fd85aad87785c4377ff55b600199de0fc9fe726c5532d8b52879f6629d6560331e6d0fc7f2c19da93ccc02bdf7bae5d8c0460fbafa9784a
diff --git a/app-shells/powerline-go/metadata.xml b/app-shells/powerline-go/metadata.xml
index 965f86913b..cf79941683 100644
--- a/app-shells/powerline-go/metadata.xml
+++ b/app-shells/powerline-go/metadata.xml
@@ -5,7 +5,4 @@
egorr.berd@gmail.com
Yahor Berdnikau
-
- Powerline like shell written in Golang.
-
diff --git a/app-vim/openbsd-style/Manifest b/app-vim/openbsd-style/Manifest
new file mode 100644
index 0000000000..f83d3f6902
--- /dev/null
+++ b/app-vim/openbsd-style/Manifest
@@ -0,0 +1 @@
+DIST openbsd-style-1.1.vim 2669 BLAKE2B 5b2bcca3024c1a743ed0be42510f47340b4f57f7c5866933b01adc1399e40210676c7b8b4631fbdf59231cb9af9c2443af2915b982eb3fa5fc5a03c2b207ee81 SHA512 55f3fd84ae2f3d86b84756165da02d56f221baa81eb42e1df8e7a0e3f243b498e95d343c9ed04fc21db89bc676fa671eeaf424587a77aeef421a62db0e0ed41a
diff --git a/media-libs/sonic/metadata.xml b/app-vim/openbsd-style/metadata.xml
similarity index 62%
rename from media-libs/sonic/metadata.xml
rename to app-vim/openbsd-style/metadata.xml
index 22900dd414..46ff3593dd 100644
--- a/media-libs/sonic/metadata.xml
+++ b/app-vim/openbsd-style/metadata.xml
@@ -1,11 +1,8 @@
-
- waywardgeek/sonic
-
- cyber+gentoo@sysrq.in
+ cyber@sysrq.in
Anna
diff --git a/app-vim/openbsd-style/openbsd-style-1.1.ebuild b/app-vim/openbsd-style/openbsd-style-1.1.ebuild
new file mode 100644
index 0000000000..925c5c6367
--- /dev/null
+++ b/app-vim/openbsd-style/openbsd-style-1.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VIM_PLUGIN_VIM_VERSION="7.1"
+inherit vim-plugin
+
+MY_PN=${PN%-style}
+DESCRIPTION="vim plugin: indent code according to the OpenBSD and FreeBSD style(9)"
+HOMEPAGE="https://wiki.freebsd.org/DevTools"
+SRC_URI="https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/editors/vim/files/${MY_PN}.vim?rev=${PV} -> ${P}.vim"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin registers OpenBSD_Style() macro for changing a buffer's
+indentation rules but does not change the indentation of existing code.
+
+To activate it, simply type \\f in normal mode."
+
+src_unpack() {
+ mkdir -p "${S}"/syntax || die
+ cp "${DISTDIR}"/${P}.vim "${S}"/syntax/${MY_PN}.vim || die
+}
diff --git a/dev-lang/fennel/fennel-0.9.1.ebuild b/dev-lang/fennel/fennel-0.9.1.ebuild
index 62871fa600..7dfbc0c479 100644
--- a/dev-lang/fennel/fennel-0.9.1.ebuild
+++ b/dev-lang/fennel/fennel-0.9.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-LUA_COMPAT=( lua5-{1..4} luajit )
+LUA_COMPAT=( lua5-{3..4} luajit )
inherit lua-single
diff --git a/dev-lang/fennel/fennel-0.9.2.ebuild b/dev-lang/fennel/fennel-0.9.2.ebuild
index 9783d1033f..7dfbc0c479 100644
--- a/dev-lang/fennel/fennel-0.9.2.ebuild
+++ b/dev-lang/fennel/fennel-0.9.2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-LUA_COMPAT=( lua5-{2..4} luajit )
+LUA_COMPAT=( lua5-{3..4} luajit )
inherit lua-single
diff --git a/dev-lang/fennel/fennel-9999.ebuild b/dev-lang/fennel/fennel-9999.ebuild
index 9783d1033f..7dfbc0c479 100644
--- a/dev-lang/fennel/fennel-9999.ebuild
+++ b/dev-lang/fennel/fennel-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-LUA_COMPAT=( lua5-{2..4} luajit )
+LUA_COMPAT=( lua5-{3..4} luajit )
inherit lua-single
diff --git a/dev-libs/boinc-zip/Manifest b/dev-libs/boinc-zip/Manifest
index 5238eec52f..0e53bce6e1 100644
--- a/dev-libs/boinc-zip/Manifest
+++ b/dev-libs/boinc-zip/Manifest
@@ -1 +1 @@
-DIST boinc-7.16.16.tar.gz 49599131 BLAKE2B 819ab85c19a684144711f77e669b892aa73c006b81c1d7ef7adbd9d580e1e8473ae27b52dc17953ee677c70fc78ed15df936afd740e629715f30f2b81d84ea6f SHA512 dd7042e176d6506c70de7866556ae73b2f45734df92038086d5b0414751f3da08dc571c49f0c26d747d3fb2577674d3ff8cdec7d3563861eaaaa5af9c1db0a0e
+DIST boinc-7.18.0.tar.gz 50848912 BLAKE2B 1088b734a5111dac1b42110cc5059e7114ef2bb2a7e786d20e681ac96543869fbf170c566c6c7ea93ac97f54f347e388d33d7d39c19d59cbe7bf3066d8c69fde SHA512 4bccd576bc786cf5d7b01a1ff379545b4d9ddb818c8561d3dccb836b6490668c73a0c10884609980dfc6e8250173ead71a5f6044cabe69a0c93316e03515a0d9
diff --git a/dev-libs/boinc-zip/boinc-zip-7.16.16.ebuild b/dev-libs/boinc-zip/boinc-zip-7.16.16.ebuild
deleted file mode 100644
index 31e7072d1e..0000000000
--- a/dev-libs/boinc-zip/boinc-zip-7.16.16.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_PV=$(ver_cut 1-2)
-
-DESCRIPTION="Wrapper for the zip/unzip functions to expose to BOINC clients"
-HOMEPAGE="https://boinc.berkeley.edu/trac/wiki/FileCompression"
-
-SRC_URI="https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> boinc-${PV}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-S="${WORKDIR}/boinc-client_release-${MY_PV}-${PV}/zip"
-
-LICENSE="Info-ZIP LGPL-3+"
-SLOT="0"
-
-src_prepare() {
- default
- sed '/$(LN) .libs\/$(LIBBOINC_ZIP_STATIC)/d' -i Makefile.am || die
-
- cd .. || die
- eautoreconf
-}
-
-src_configure() {
- cd .. || die
- econf --enable-pkg-devel --disable-static
-}
-
-src_install() {
- default
- rm "${ED}"/usr/*/libboinc_zip.la || die
-}
diff --git a/dev-libs/boinc-zip/boinc-zip-7.18.ebuild b/dev-libs/boinc-zip/boinc-zip-7.18.ebuild
new file mode 100644
index 0000000000..e800b45e2c
--- /dev/null
+++ b/dev-libs/boinc-zip/boinc-zip-7.18.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_PN=${PN%%-*}
+MY_PV="${PV}.0"
+DESCRIPTION="Wrapper for the zip/unzip functions to expose to BOINC clients"
+HOMEPAGE="https://boinc.berkeley.edu/trac/wiki/FileCompression"
+
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/client_release/${PV}/${MY_PV}.tar.gz -> ${MY_PN}-${MY_PV}.tar.gz"
+KEYWORDS="~amd64 ~arm64 ~x86"
+S="${WORKDIR}/${MY_PN}-client_release-${PV}-${MY_PV}"
+
+LICENSE="Info-ZIP LGPL-3+"
+SLOT="0"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf --enable-pkg-devel
+}
+
+src_compile() {
+ emake -C zip lib${PN//-/_}.la
+}
+
+src_install() {
+ emake -C zip install-{libLTLIBRARIES,pkgincludeHEADERS} DESTDIR="${D}"
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/feedbackd/metadata.xml b/dev-libs/feedbackd/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/dev-libs/feedbackd/metadata.xml
+++ b/dev-libs/feedbackd/metadata.xml
@@ -1,8 +1,5 @@
-
- marco@scardovi.com
- Marco Scardovi
-
+
diff --git a/dev-libs/libansilove/Manifest b/dev-libs/libansilove/Manifest
new file mode 100644
index 0000000000..277f9b6f7e
--- /dev/null
+++ b/dev-libs/libansilove/Manifest
@@ -0,0 +1 @@
+DIST libansilove-1.2.8.tar.gz 59695 BLAKE2B 4be4fb1f7277cc53bdc31399b429fc142cd3b87933da4c87604fe290b8697dd4c3d03a4c77bbac62648b0b8b0da509b5f7b17d2867e2e9e56eaf00674219fff3 SHA512 99df7fa0e5f2eb26a95b5073587e957378163fcab9ca828f7d6eca79dcb92463b1788285813c4fed6bfc9ee753c425fd34968e5e08999bc63fe6c4ba5939198f
diff --git a/dev-libs/libansilove/libansilove-1.2.8.ebuild b/dev-libs/libansilove/libansilove-1.2.8.ebuild
new file mode 100644
index 0000000000..e6e135b4bc
--- /dev/null
+++ b/dev-libs/libansilove/libansilove-1.2.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="library to convert ANSi and artscene related file formats into PNG images"
+HOMEPAGE="https://github.com/ansilove/libansilove"
+
+if [[ "${PV}" == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ansilove/${PN}.git"
+else
+ SRC_URI="https://github.com/ansilove/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+
+RDEPEND="media-libs/gd[png]"
+DEPEND="${RDEPEND}"
diff --git a/dev-libs/libansilove/libansilove-9999.ebuild b/dev-libs/libansilove/libansilove-9999.ebuild
new file mode 100644
index 0000000000..e6e135b4bc
--- /dev/null
+++ b/dev-libs/libansilove/libansilove-9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="library to convert ANSi and artscene related file formats into PNG images"
+HOMEPAGE="https://github.com/ansilove/libansilove"
+
+if [[ "${PV}" == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ansilove/${PN}.git"
+else
+ SRC_URI="https://github.com/ansilove/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+
+RDEPEND="media-libs/gd[png]"
+DEPEND="${RDEPEND}"
diff --git a/dev-libs/libansilove/metadata.xml b/dev-libs/libansilove/metadata.xml
new file mode 100644
index 0000000000..a09c1bb731
--- /dev/null
+++ b/dev-libs/libansilove/metadata.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+ xgqt@riseup.net
+ Maciej Barć
+
+
+
+ https://github.com/ansilove/libansilove/blob/master/ChangeLog
+
+ https://github.com/ansilove/libansilove
+ ansilove/libansilove
+
+
diff --git a/dev-libs/olm/metadata.xml b/dev-libs/olm/metadata.xml
index 4db77a8b93..001398bcde 100644
--- a/dev-libs/olm/metadata.xml
+++ b/dev-libs/olm/metadata.xml
@@ -5,10 +5,6 @@
gentoo@tastytea.de
Ronny (tastytea) Gutbrod
-
- marco@scardovi.com
- Marco Scardovi
-
An implementation of the Double Ratchet cryptographic ratchet written in
C and C++11 and exposed as a C API.
diff --git a/dev-python/DAWG-Python/DAWG-Python-0.7.2.ebuild b/dev-python/DAWG-Python/DAWG-Python-0.7.2.ebuild
new file mode 100644
index 0000000000..dae9acae04
--- /dev/null
+++ b/dev-python/DAWG-Python/DAWG-Python-0.7.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="Pure-python reader for DAWGs (DAFSAs) created by dawgdic C++ library."
+HOMEPAGE="https://pypi.org/project/DAWG-Python/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
diff --git a/dev-python/DAWG-Python/Manifest b/dev-python/DAWG-Python/Manifest
new file mode 100644
index 0000000000..cde3d55801
--- /dev/null
+++ b/dev-python/DAWG-Python/Manifest
@@ -0,0 +1 @@
+DIST DAWG-Python-0.7.2.tar.gz 9007 BLAKE2B 44e52df192d602da965ff45cd25ee58991063f6454900f75df0eaf6c0806cea060e1ad48ccfd2a9e2314533924458f440720c6079c78c8fb1ab492557bd9bec8 SHA512 402d94ea48cca66b12368781d6f015c9356845be1ad9e24c0a08ea9be0d04be8ae376b31cd8c6e7553e49f104ce7a1d66338b8ad84b372609c831524fbb0f6b8
diff --git a/dev-python/DAWG-Python/metadata.xml b/dev-python/DAWG-Python/metadata.xml
new file mode 100644
index 0000000000..c861e547f3
--- /dev/null
+++ b/dev-python/DAWG-Python/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ shaoyu0209@tuta.io
+ Shaoyu Tseng
+
+
+ DAWG-Python
+ pytries/DAWG-Python
+
+
diff --git a/dev-python/cx-oracle/Manifest b/dev-python/cx-oracle/Manifest
index 3904e8d005..6c7e35094d 100644
--- a/dev-python/cx-oracle/Manifest
+++ b/dev-python/cx-oracle/Manifest
@@ -1 +1 @@
-DIST cx_Oracle-8.1.0.tar.gz 343864 BLAKE2B 77d5adfe6fcc599416ba9971ae88fe7b2318440a92beb976639dfcfe4d86b1cf4c97190dccfb5d23445fce82073b276aa77c4c73d52815842f8b5aaa8c88fc62 SHA512 21dbaec1facfa38c82cd8bba788953ada098bfcdfddd29c4c6278d3c757b5b64b547a2e8e39fc998eec826f8447f07d6d48649c8dc8edc7c7244e9113d4345cc
+DIST cx_Oracle-8.2.1.tar.gz 359269 BLAKE2B ad972b6607a7e77794b5642bce49f494715e32e989fd7c12c3a64ea556e6967bda02f0d937e42e1dd2dae931f75c33e63fa8c13a9dcd439e85b751720773c3d1 SHA512 879f25323ea037499c773be860d7c9a4f9bc675f7107a79a1ac027db45f6a4d71b47579b656fba267b85dacb76316f012de238ffda66ea33395ce5989b982116
diff --git a/dev-python/cx-oracle/cx-oracle-8.1.0.ebuild b/dev-python/cx-oracle/cx-oracle-8.2.1.ebuild
similarity index 72%
rename from dev-python/cx-oracle/cx-oracle-8.1.0.ebuild
rename to dev-python/cx-oracle/cx-oracle-8.2.1.ebuild
index c173334274..26471d8873 100644
--- a/dev-python/cx-oracle/cx-oracle-8.1.0.ebuild
+++ b/dev-python/cx-oracle/cx-oracle-8.2.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI="8"
PYTHON_COMPAT=( python3_{7,8,9} )
@@ -23,11 +23,21 @@ KEYWORDS="~amd64"
IUSE="examples"
+# Tests require local instance of Oracle DB
+RESTRICT="test"
+
DEPEND="dev-db/oracle-instantclient"
RDEPEND="${DEPEND}"
S=${WORKDIR}/${MY_P}
+python_prepare_all() {
+ # do not install LICENSE and README to /usr/
+ sed -i -e '/data_files/d' setup.py || die
+
+ distutils-r1_python_prepare_all
+}
+
pkg_postinst() {
return
# no python_mod_optimize
diff --git a/dev-python/fchroot/metadata.xml b/dev-python/fchroot/metadata.xml
index 6756bd5d70..5dd7771521 100644
--- a/dev-python/fchroot/metadata.xml
+++ b/dev-python/fchroot/metadata.xml
@@ -1,10 +1,7 @@
-
- marco@scardovi.com
- Marco Scardovi
-
+
fchroot
diff --git a/dev-python/pymorphy2-dicts-ru/Manifest b/dev-python/pymorphy2-dicts-ru/Manifest
new file mode 100644
index 0000000000..478485ab04
--- /dev/null
+++ b/dev-python/pymorphy2-dicts-ru/Manifest
@@ -0,0 +1 @@
+DIST pymorphy2-dicts-ru-2.4.417127.4579844.tar.gz 8180941 BLAKE2B acdd6aaafd7fcd8ba8e8720db81133f9f1148507a7018e370dae288753c15b2abc5c314a987ab8e6fb9239a3fca372acee00b5cf3116e80f9ff7e92b039d9f91 SHA512 1ed5a8e8fddec8ef3d890d1a1e921ffc3bafcf057853e6e09a6854d3d100aca9972b845bdc379057756d30a9a08d917eb439ee42920ddb80059df5bf2b357c3f
diff --git a/dev-python/pymorphy2-dicts-ru/metadata.xml b/dev-python/pymorphy2-dicts-ru/metadata.xml
new file mode 100644
index 0000000000..23c3d784fe
--- /dev/null
+++ b/dev-python/pymorphy2-dicts-ru/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ shaoyu0209@tuta.io
+ Shaoyu Tseng
+
+
+ pymorphy2-dicts-ru
+
+
diff --git a/dev-python/pymorphy2-dicts-ru/pymorphy2-dicts-ru-2.4.417127.4579844.ebuild b/dev-python/pymorphy2-dicts-ru/pymorphy2-dicts-ru-2.4.417127.4579844.ebuild
new file mode 100644
index 0000000000..3aa1d5d944
--- /dev/null
+++ b/dev-python/pymorphy2-dicts-ru/pymorphy2-dicts-ru-2.4.417127.4579844.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="Russian dictionary for PyMorphy2"
+HOMEPAGE="https://pypi.org/project/pymorphy2-dicts-ru/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
diff --git a/dev-python/pymorphy2/Manifest b/dev-python/pymorphy2/Manifest
new file mode 100644
index 0000000000..515196a0d4
--- /dev/null
+++ b/dev-python/pymorphy2/Manifest
@@ -0,0 +1 @@
+DIST pymorphy2-0.9.1.tar.gz 84929 BLAKE2B 42609efe8bd618e223940b8334738ebc9ffb8017f154885300a84e76c64d54b95d620e3035397a5634155b2e47cc5b3676d7f2c0976dfa36645406b4a7e986b1 SHA512 923108f866fb0022d831efb48b9836cda5aa56df4da55798255122544e8a28c087e2561189959ce6be8d6319a3ed791df50eda36258e8730748df5bf9468a593
diff --git a/dev-python/pymorphy2/metadata.xml b/dev-python/pymorphy2/metadata.xml
new file mode 100644
index 0000000000..11eb928ff4
--- /dev/null
+++ b/dev-python/pymorphy2/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ shaoyu0209@tuta.io
+ Shaoyu Tseng
+
+
+ pymorphy2
+ kmike/pymorphy2
+
+
diff --git a/dev-python/pymorphy2/pymorphy2-0.9.1.ebuild b/dev-python/pymorphy2/pymorphy2-0.9.1.ebuild
new file mode 100644
index 0000000000..b5c331d0c4
--- /dev/null
+++ b/dev-python/pymorphy2/pymorphy2-0.9.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="Morphological analyzer (POS tagger + inflection engine) for Russian language."
+HOMEPAGE="https://github.com/kmike/pymorphy2 https://pypi.org/project/pymorphy2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+DEPEND="
+ dev-python/docopt[${PYTHON_USEDEP}]
+ dev-python/pymorphy2-dicts-ru[${PYTHON_USEDEP}]
+ dev-python/DAWG-Python[${PYTHON_USEDEP}]
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
diff --git a/dev-python/sphinxcontrib-katex/Manifest b/dev-python/sphinxcontrib-katex/Manifest
index a3d8e32c5d..c5713e14f4 100644
--- a/dev-python/sphinxcontrib-katex/Manifest
+++ b/dev-python/sphinxcontrib-katex/Manifest
@@ -1 +1 @@
-DIST sphinxcontrib-katex-0.7.1.tar.gz 13171 BLAKE2B f6febea4b6543309f1af38efdedadbe388bf94b890b92a9fbe069b8a2dcccb5790dafcd4c7eb1afeef5fa5701886320d73e568c7edb248683c55580a7940c208 SHA512 f995f962d3fe18be8acbd57d1de8079471240d513b4dfb068b7701d2a14dd93c0547056118261046ddde2fafdfd4d07c75c75b1c2f5b7fe1adcbea17db8ab65a
+DIST sphinxcontrib-katex-0.8.6.tar.gz 17410 BLAKE2B 8e4c72dd40ef6e8f6110a54183c098a67ee08cb043e031437dfe9210376e388e8695ff8766a3b5cac62edafa5138798b09353cf9faa94bab2df5b033b11fefbd SHA512 d7285a8397fb88e5f964096e5108c61e1b97fe0b7b98628459eb0562bb526275a1d3562dbf03c4daeedfe4f34e770db4e3e5620c8279d3b5d8d42371787ce38b
diff --git a/dev-python/sphinxcontrib-katex/sphinxcontrib-katex-0.7.1.ebuild b/dev-python/sphinxcontrib-katex/sphinxcontrib-katex-0.8.6.ebuild
similarity index 84%
rename from dev-python/sphinxcontrib-katex/sphinxcontrib-katex-0.7.1.ebuild
rename to dev-python/sphinxcontrib-katex/sphinxcontrib-katex-0.8.6.ebuild
index 5fc27017ea..db8061ad10 100644
--- a/dev-python/sphinxcontrib-katex/sphinxcontrib-katex-0.7.1.ebuild
+++ b/dev-python/sphinxcontrib-katex/sphinxcontrib-katex-0.8.6.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
inherit distutils-r1
@@ -14,7 +14,7 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-RDEPEND=">=dev-python/sphinx-2.4.4[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/sphinx-3.5.4[${PYTHON_USEDEP}]"
DOCS=()
diff --git a/dev-util/beautysh/Manifest b/dev-util/beautysh/Manifest
deleted file mode 100644
index 4f025c6229..0000000000
--- a/dev-util/beautysh/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST beautysh-6.0.1.tar.gz 14634 BLAKE2B ee81d9eca73676ad485f3b21eaf14d9aa8bdf294ede0951f850f30b005c30dede5265cba414df449d2ab55f238e82d841ee1f7b85d1407b973fc8c8da59b5650 SHA512 71ecdb10d73750966c0ebea44702e74e82828ba863d99274d6427b314cd3981ab04895e206e08ee68cc719d1e67cc6c3ff6ffc7f11e0978c69ffcbab21fe60e4
-DIST beautysh-6.1.0.tar.gz 30192 BLAKE2B 78c469b2729204b2db86f71729d93649508ca4443917f9da020a96d95c04ed05291955797a4849a36f2b6da6ccc8268f0b29311d09e059590016039dadc22c36 SHA512 482956e615e69beefb4e0e13abd6ffcd8e89f538cd9cc3218feceb0adf5d73ce029f980894de02f45aabd05dde6088c3ba1e9fd23ff8e9a5133ecde28f8c83da
diff --git a/dev-util/beautysh/beautysh-6.0.1.ebuild b/dev-util/beautysh/beautysh-6.0.1.ebuild
deleted file mode 100644
index 87782cefd6..0000000000
--- a/dev-util/beautysh/beautysh-6.0.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="This program takes upon itself the hard task of beautifying Bash scripts"
-HOMEPAGE="http://uncrustify.sourceforge.net/"
-SRC_URI="https://github.com/lovesegfault/beautysh/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-
-LICENSE="GPL-2"
-SLOT="0"
diff --git a/dev-util/beautysh/beautysh-6.1.0.ebuild b/dev-util/beautysh/beautysh-6.1.0.ebuild
deleted file mode 100644
index a3c364d452..0000000000
--- a/dev-util/beautysh/beautysh-6.1.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS="pyproject.toml"
-
-inherit distutils-r1
-
-DESCRIPTION="Bash beautifier for the masses"
-HOMEPAGE="https://github.com/lovesegfault/beautysh https://pypi.python.org/pypi/beautysh"
-SRC_URI="https://github.com/lovesegfault/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-distutils_enable_tests pytest
diff --git a/dev-util/beautysh/metadata.xml b/dev-util/beautysh/metadata.xml
deleted file mode 100644
index 92c8553530..0000000000
--- a/dev-util/beautysh/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- marco@scardovi.com
- Marco Scardovi
-
-
- beautysh
- lovesegfault/beautysh
-
-
diff --git a/dev-vcs/gitqlient/Manifest b/dev-vcs/gitqlient/Manifest
index 0a85c7a069..de7e302823 100644
--- a/dev-vcs/gitqlient/Manifest
+++ b/dev-vcs/gitqlient/Manifest
@@ -1 +1,2 @@
DIST gitqlient-1.3.2.tar.gz 4360445 BLAKE2B 81764b64b5cc6868377795d170c766e4693350602482a3c223defaf43b96c4e10cef3c812ab5b5ad11e91df44896225fb7fe7c31299ffdbf2a3c59888bc8e4b4 SHA512 239c89bbde1d5adbb5b5a74420a1bc42f88f1a7db4030e5dceba3ebff9d269009dfc0e1450a32e1c042fa2ac5285dac882a29350ff22791dc9db11a6275bfde0
+DIST gitqlient-1.4.0.tar.gz 4370922 BLAKE2B f317e523c43d846b88974bb391ae4dbbac4f846f9b848b51ac73e34dd321ffb5bad1dfe31292fedcae21e0ed6b754950fb3b364fd7cc8c74a9ab79ba57d12873 SHA512 64588449201a51ee0c35589056bbe5e1bb36c5dead99a8e697b1c9ead7883be8339b8a9aec6210154e3d9ad365497cce002fbfbc48f786288e315d2cafea2ed4
diff --git a/dev-vcs/gitqlient/gitqlient-1.4.0.ebuild b/dev-vcs/gitqlient/gitqlient-1.4.0.ebuild
new file mode 100644
index 0000000000..2caf1d9659
--- /dev/null
+++ b/dev-vcs/gitqlient/gitqlient-1.4.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils xdg
+
+MY_PN="GitQlient"
+MY_PV=$(ver_rs 3 -)
+
+DESCRIPTION="Multi-platform Git client written with Qt"
+HOMEPAGE="https://github.com/francescmm/GitQlient"
+
+SRC_URI="https://github.com/francescmm/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwebchannel:5
+ dev-qt/qtwebengine:5[widgets]
+ dev-qt/qtwidgets:5
+"
+
+RDEPEND="
+ ${DEPEND}
+ dev-vcs/git
+"
+
+src_prepare() {
+ default
+ sed -i -e "/QMAKE_CXXFLAGS/s:-Werror::" -e "/^GQ_SHA/d" "${MY_PN}".pro || die
+
+ sed -i -e "s:Office:Development:" "${S}/src/resources/${PN}.desktop" || die
+}
+
+src_configure() {
+ eqmake5 PREFIX=/usr "${MY_PN}".pro
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+}
diff --git a/dev-vcs/lazygit/Manifest b/dev-vcs/lazygit/Manifest
index 6b9a33143d..2c9b309ce9 100644
--- a/dev-vcs/lazygit/Manifest
+++ b/dev-vcs/lazygit/Manifest
@@ -1,2 +1,3 @@
DIST lazygit-0.27.4.tar.gz 3214405 BLAKE2B 123c2b7ca1bb63fa7d7a40b4c8a56b3f39b651c214ad55179dd07cd81588341589419759207263bbf809da89218e35d2c6185c79bcfd9ee59480ed66d67506dc SHA512 a053d4d3e3458ad33c415a7e9d4286a52b23429babae715afacc61a91185a309d78951cc617ad182cdb59aa53ce48dae9ce38f65c38c8364eaac88d92e478c9d
DIST lazygit-0.28.1.tar.gz 3222346 BLAKE2B 8cfb3cd59c991cefb3de652c49ef8bb0f94f7f1da6af9fa62e4288383ae14e64644a82fb8ca4d2037fa6b39a54b6b716b9851d42e023ea0a81e2b9d865f6df69 SHA512 8e477216f2f93b3e1d9a5d2c771d05a180e5f193a84afb6d8f93b6fa1d91a7efac89e6e43c5c1c0034c19a19f7e6dada6eed69402cabf5ca2860284fb2c6e232
+DIST lazygit-0.28.2.tar.gz 3223174 BLAKE2B 678a44f4109446e7490cc75b4bb2f0195357a8f6dc2539251de7b829b11ef0a7b8d125bb518f7d6822df62bf9922026ba2948d4d6318ca9e18dafcca7ff9792d SHA512 e7002089194c572fffe8329bd245d4db64fb71cb73c63f07b950da845ecdc85c70c8bea682d2b4aa1c9b38f8cf5270cd24d3bb41eff8a26d31be58eddcdf41ce
diff --git a/dev-vcs/lazygit/lazygit-0.28.2.ebuild b/dev-vcs/lazygit/lazygit-0.28.2.ebuild
new file mode 100644
index 0000000000..233a104b0c
--- /dev/null
+++ b/dev-vcs/lazygit/lazygit-0.28.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/jesseduffield/lazygit"
+
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="Lazygit, a simple terminal UI for git commands"
+HOMEPAGE="https://github.com/jesseduffield/lazygit"
+SRC_URI="https://github.com/jesseduffield/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+DEPEND=( sys-libs/glibc )
+RDEPEND=(
+ ${DEPEND}
+ dev-vcs/git
+)
+
+DOCS=( src/${EGO_PN}/{CONTRIBUTING,README}.md )
+
+src_compile() {
+ GOPATH="${S}" go build -v -o bin/lazygit src/${EGO_PN}/main.go || die
+}
+
+src_install() {
+ dobin bin/lazygit
+
+ use doc && dodoc -r "src/${EGO_PN}/docs/."
+ einstalldocs
+}
diff --git a/games-misc/Fallout3Terminal/Fallout3Terminal-0_pre20191105.ebuild b/games-misc/Fallout3Terminal/Fallout3Terminal-0_pre20191105.ebuild
index b652b74097..da03099ddb 100644
--- a/games-misc/Fallout3Terminal/Fallout3Terminal-0_pre20191105.ebuild
+++ b/games-misc/Fallout3Terminal/Fallout3Terminal-0_pre20191105.ebuild
@@ -5,7 +5,7 @@ EAPI=7
COMMIT="04cad950ca949d1a437a5718b40d3d0b9e33ee0d"
-DESCRIPTION=" A recreation of the Fallout 3 terminal via a linux bash script!"
+DESCRIPTION="A recreation of the Fallout 3 terminal via a linux bash script!"
HOMEPAGE="https://github.com/fohtla/Fallout3Terminal"
SRC_URI="https://github.com/fohtla/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
diff --git a/games-misc/bonsai/Manifest b/games-misc/bonsai/Manifest
new file mode 100644
index 0000000000..384a49e327
--- /dev/null
+++ b/games-misc/bonsai/Manifest
@@ -0,0 +1 @@
+DIST bonsai.sh-5e6e6aa7f44e1a770d9c56687ad1b660c409de00.tar.bz2 18558 BLAKE2B 83bba21792bf5d2a7e41d5a2685e8fcadc6c7f5a6f3e989a71e98d038102f84244468ce2552d4bdd7e4deb459796331377ca36eab31875f405292d1ddb789a56 SHA512 31b334e6990d2a123468ad0b359af564bccea274f040054403d0e6a3f05fac7a7cd55bde9a5c620757c51e5d9eeafecd50e032e4c8227ea957dac227faa79215
diff --git a/games-misc/bonsai/bonsai-0_pre20210201.ebuild b/games-misc/bonsai/bonsai-0_pre20210201.ebuild
new file mode 100644
index 0000000000..5f640ce11d
--- /dev/null
+++ b/games-misc/bonsai/bonsai-0_pre20210201.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT="5e6e6aa7f44e1a770d9c56687ad1b660c409de00"
+
+DESCRIPTION="bonsai tree generator written in bash"
+HOMEPAGE="https://gitlab.com/jallbrit/bonsai.sh"
+SRC_URI="https://gitlab.com/jallbrit/bonsai.sh/-/archive/${COMMIT}/bonsai.sh-${COMMIT}.tar.bz2"
+S="${WORKDIR}/${PN}.sh-${COMMIT}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_install() {
+ newbin bonsai.sh bonsai
+ dodoc README.md
+}
diff --git a/games-misc/bonsai/metadata.xml b/games-misc/bonsai/metadata.xml
new file mode 100644
index 0000000000..6e3f29bfda
--- /dev/null
+++ b/games-misc/bonsai/metadata.xml
@@ -0,0 +1,18 @@
+
+
+
+
+ lssndrbarbieri@gmail.com
+ Alessandro Barbieri
+
+
+bonsai.sh is a bonsai tree generator for the terminal, written entirely in bash. It
+intelligently creates, colors, and positions the tree, and is entirely configurable via
+CLI options- see usage.
+There are currently four supported modes: static (the default), live, infinite, and neofetch, with more on the way! See Modes for documentation, and TODO for full list of goals.
+
+
+ https://gitlab.com/jallbrit/bonsai.sh/-/issues
+ jallbrit/bonsai.sh
+
+
diff --git a/games-misc/cbonsai/Manifest b/games-misc/cbonsai/Manifest
new file mode 100644
index 0000000000..14ee1341c2
--- /dev/null
+++ b/games-misc/cbonsai/Manifest
@@ -0,0 +1 @@
+DIST cbonsai-1.2.1.tar.bz2 20897 BLAKE2B c69c7b0d64b30d10decf08df4bedd4e125450faf6cdf9e36d0c8fd202e67443901832a7e191cf1af3498988fd16a8e06dd54b71b8e2639bdd2e2583fc6724a91 SHA512 daf9d023687ddd8d337636365e599bd546c187cd99773eebcc830c89460558890ba8e6e895977e619b267894908480aea59c6cbbeafff06730743ac6ba42afa6
diff --git a/games-misc/cbonsai/cbonsai-1.2.1.ebuild b/games-misc/cbonsai/cbonsai-1.2.1.ebuild
new file mode 100644
index 0000000000..3b74405dec
--- /dev/null
+++ b/games-misc/cbonsai/cbonsai-1.2.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="grow bonsai trees in your terminal"
+HOMEPAGE="https://gitlab.com/jallbrit/cbonsai"
+SRC_URI="https://gitlab.com/jallbrit/cbonsai/-/archive/v${PV}/cbonsai-v${PV}.tar.bz2 -> ${P}.tar.bz2"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PATCHES=( "${FILESDIR}/${PN}-respect-variables.patch" )
diff --git a/games-misc/cbonsai/files/cbonsai-respect-variables.patch b/games-misc/cbonsai/files/cbonsai-respect-variables.patch
new file mode 100644
index 0000000000..3187e28470
--- /dev/null
+++ b/games-misc/cbonsai/files/cbonsai-respect-variables.patch
@@ -0,0 +1,13 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,9 +1,7 @@
+ .POSIX:
+-CC = cc
+ PKG_CONFIG ?= pkg-config
+ CFLAGS += -Wall -Wextra -Wshadow -Wpointer-arith -Wcast-qual -pedantic $(shell $(PKG_CONFIG) --cflags ncursesw panelw)
+-LDLIBS = $(shell $(PKG_CONFIG) --libs ncursesw panelw || echo "-lncursesw -ltinfo -lpanelw")
+-PREFIX = /usr/local
++LDLIBS = $(shell $(PKG_CONFIG) --libs ncursesw panelw || echo "-lncursesw -ltinfo -lpanelw") ${LDFLAGS}
+
+ cbonsai: cbonsai.c
+
diff --git a/games-misc/cbonsai/metadata.xml b/games-misc/cbonsai/metadata.xml
new file mode 100644
index 0000000000..5c0d6a88f8
--- /dev/null
+++ b/games-misc/cbonsai/metadata.xml
@@ -0,0 +1,15 @@
+
+
+
+
+ lssndrbarbieri@gmail.com
+ Alessandro Barbieri
+
+
+cbonsai is a bonsai tree generator, written in C using ncurses. It intelligently creates, colors, and positions a bonsai tree, and is entirely configurable via CLI options-- see usage. There are 2 modes of operation: static (see finished bonsai tree), and live (see growth step-by-step).
+
+
+ https://gitlab.com/jallbrit/cbonsai/-/issues
+ jallbrit/cbonsai
+
+
diff --git a/gnome-extra/iio-sensor-proxy/metadata.xml b/gnome-extra/iio-sensor-proxy/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/gnome-extra/iio-sensor-proxy/metadata.xml
+++ b/gnome-extra/iio-sensor-proxy/metadata.xml
@@ -1,8 +1,5 @@
-
- marco@scardovi.com
- Marco Scardovi
-
+
diff --git a/gnome-extra/portfolio/metadata.xml b/gnome-extra/portfolio/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/gnome-extra/portfolio/metadata.xml
+++ b/gnome-extra/portfolio/metadata.xml
@@ -1,8 +1,5 @@
-
- marco@scardovi.com
- Marco Scardovi
-
+
diff --git a/gui-wm/phosh-meta/metadata.xml b/gui-wm/phosh-meta/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/gui-wm/phosh-meta/metadata.xml
+++ b/gui-wm/phosh-meta/metadata.xml
@@ -1,8 +1,5 @@
-
- marco@scardovi.com
- Marco Scardovi
-
+
diff --git a/gui-wm/phosh/metadata.xml b/gui-wm/phosh/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/gui-wm/phosh/metadata.xml
+++ b/gui-wm/phosh/metadata.xml
@@ -1,8 +1,5 @@
-
- marco@scardovi.com
- Marco Scardovi
-
+
diff --git a/kde-misc/plasma-applet-thermal-monitor/plasma-applet-thermal-monitor-1.3.0.ebuild b/kde-misc/plasma-applet-thermal-monitor/plasma-applet-thermal-monitor-1.3.0.ebuild
index 3ea3f05b5d..2090272e08 100644
--- a/kde-misc/plasma-applet-thermal-monitor/plasma-applet-thermal-monitor-1.3.0.ebuild
+++ b/kde-misc/plasma-applet-thermal-monitor/plasma-applet-thermal-monitor-1.3.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit ecm
+inherit ecm optfeature
DESCRIPTION="Plasma 5 applet for monitoring CPU, GPU and other available temperature sensors"
HOMEPAGE="https://store.kde.org/p/998915/
@@ -19,9 +19,12 @@ fi
LICENSE="GPL-2+"
SLOT="5"
-# block against slot 0 of self, to prevent file collision
-DEPEND="
- !kde-misc/plasma-applet-thermal-monitor:0
- >=kde-frameworks/plasma-5.60.0:5
+DEPEND="kde-frameworks/plasma:5"
+RDEPEND="${DEPEND}
+ kde-plasma/ksysguard:5[lm-sensors]
"
-RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+ ecm_pkg_postinst
+ optfeature "monitor temperature of NVMe drives" sys-apps/nvme-cli
+}
diff --git a/media-gfx/ansilove/Manifest b/media-gfx/ansilove/Manifest
new file mode 100644
index 0000000000..a37ef74384
--- /dev/null
+++ b/media-gfx/ansilove/Manifest
@@ -0,0 +1 @@
+DIST ansilove-4.1.5.tar.gz 41325 BLAKE2B fa0943406b5a905f30fd114ed9760a37da1bcb7bd8bb7575272d1cffadaf0302650c65af64e97f911cff7b9eb4283bedd6fc0fc13c9aa5be88c582c44925c30b SHA512 a84253b07d82b4d0598cf6936115476933636a978805fe243a671bbdbe15d0e589b45f9e4d7b6137e5f7ab22559b9d1a84a0508db5226ccc17e20687e190e553
diff --git a/media-gfx/ansilove/ansilove-4.1.5.ebuild b/media-gfx/ansilove/ansilove-4.1.5.ebuild
new file mode 100644
index 0000000000..95b232dfc2
--- /dev/null
+++ b/media-gfx/ansilove/ansilove-4.1.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="ANSI and ASCII art to PNG converter (using libansilove)"
+HOMEPAGE="https://github.com/ansilove/ansilove/"
+
+if [[ "${PV}" == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ansilove/${PN}.git"
+else
+ SRC_URI="https://github.com/ansilove/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+
+RDEPEND="dev-libs/libansilove"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_SECCOMP=NO
+ )
+ cmake_src_configure
+}
diff --git a/media-gfx/ansilove/ansilove-9999.ebuild b/media-gfx/ansilove/ansilove-9999.ebuild
new file mode 100644
index 0000000000..95b232dfc2
--- /dev/null
+++ b/media-gfx/ansilove/ansilove-9999.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="ANSI and ASCII art to PNG converter (using libansilove)"
+HOMEPAGE="https://github.com/ansilove/ansilove/"
+
+if [[ "${PV}" == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ansilove/${PN}.git"
+else
+ SRC_URI="https://github.com/ansilove/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+
+RDEPEND="dev-libs/libansilove"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_SECCOMP=NO
+ )
+ cmake_src_configure
+}
diff --git a/media-gfx/ansilove/metadata.xml b/media-gfx/ansilove/metadata.xml
new file mode 100644
index 0000000000..b4f7aaa2d5
--- /dev/null
+++ b/media-gfx/ansilove/metadata.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+ xgqt@riseup.net
+ Maciej Barć
+
+
+ AnsiLove is an ANSI and ASCII art to PNG converter, allowing to convert
+ ANSI and artscene-related file formats into PNG images, supporting ANSI
+ (.ANS), PCBoard (.PCB), Binary (.BIN), Artworx (.ADF), iCE Draw (.IDF),
+ Tundra (.TND) and XBin (.XB) formats.
+ It creates size optimized 4-bit PNG files and supports SAUCE (Standard
+ Architecture for Universal Comment Extensions), 80x25 and 80x50 PC fonts
+ (including all the 14 MS-DOS charsets), Amiga fonts, and iCE colors.
+ This is a complete rewrite of AnsiLove/PHP in the C programming language.
+
+
+
+ https://github.com/ansilove/ansilove/blob/master/ChangeLog
+
+ https://github.com/ansilove/ansilove
+ ansilove/ansilove
+
+
diff --git a/media-gfx/azpainter/Manifest b/media-gfx/azpainter/Manifest
index f92cc51716..c259b815e0 100644
--- a/media-gfx/azpainter/Manifest
+++ b/media-gfx/azpainter/Manifest
@@ -1 +1 @@
-DIST azpainter-v3.0.1.tar.gz 1235950 BLAKE2B acad0b8b21152e7304b19319df2f4cc1b2fd76d053f79d3704fba573702ce498a48974e8a1a539b34572a3de561c88116c83c6d0c1ae48d51763e5722c639d36 SHA512 8464c2514d492ff0042b9788d4132fe0cb202133c31f83da412b3bfe0dea75d5aaadf319b87f81991308a127460044ff358ae555a24d9583a0c29a3367940b35
+DIST azpainter-v3.0.3.tar.gz 1260272 BLAKE2B b0d7e21f4a24ef27e6d4cbc639624dcc333d19f477dbf436bf72929473e07318246009d3291e56296d8f8a46d1f10d2dc1b8224f99c94dc46672f9c91827ce9f SHA512 7c363127d1bb3ad9c212ec3a226b047edff0452e46d0d8de52fefaf2399d72a4e3211b2b32ea57a43a9d705ad06729543c4ab401dba672a909568b7935b67801
diff --git a/media-gfx/azpainter/azpainter-3.0.1.ebuild b/media-gfx/azpainter/azpainter-3.0.3.ebuild
similarity index 100%
rename from media-gfx/azpainter/azpainter-3.0.1.ebuild
rename to media-gfx/azpainter/azpainter-3.0.3.ebuild
diff --git a/media-libs/alsa-ucm-pinephone/metadata.xml b/media-libs/alsa-ucm-pinephone/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/media-libs/alsa-ucm-pinephone/metadata.xml
+++ b/media-libs/alsa-ucm-pinephone/metadata.xml
@@ -1,8 +1,5 @@
-
- marco@scardovi.com
- Marco Scardovi
-
+
diff --git a/media-libs/sonic/Manifest b/media-libs/sonic/Manifest
deleted file mode 100644
index ea341be6e0..0000000000
--- a/media-libs/sonic/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sonic-0.3.0_pre20210316.tar.gz 5350614 BLAKE2B 95084bd43794e36259b0048b603d23d32fa8fff3531796965ccb8548a23c4e392eaf242e138885c638d08ef44c87537d0cd74f9de2b352ba55a9f2613c6c89a8 SHA512 a44246b1955cef87466162e02e29ea6595f7b4bdab51e90ee0904bf7f68e697a0d006162b367fed51ab8409bce7aee38d155dee0d95c5ac5f29ee8d390c0d488
diff --git a/media-libs/sonic/sonic-0.3.0_pre20210316.ebuild b/media-libs/sonic/sonic-0.3.0_pre20210316.ebuild
deleted file mode 100644
index c8c89d5638..0000000000
--- a/media-libs/sonic/sonic-0.3.0_pre20210316.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs
-
-COMMIT="ba331411f17702e01f6c2d7016eefebaa695871f"
-DESCRIPTION="Simple library to speed up or slow down speech"
-HOMEPAGE="https://github.com/waywardgeek/sonic"
-SRC_URI="https://github.com/waywardgeek/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="sci-libs/fftw"
-DEPEND="${RDEPEND}"
-
-DOCS=( README doc/index.md )
-
-src_prepare() {
- default
- sed "s|/lib|/$(get_libdir)|" -i Makefile || die
- sed "/install libsonic.a/d" -i Makefile || die
- sed "s/CC=gcc/CC=$(tc-getCC)/" -i Makefile || die
- export AR="$(tc-getAR)"
-}
-
-src_install() {
- default
- doman sonic.1
-}
diff --git a/media-sound/callaudiod/metadata.xml b/media-sound/callaudiod/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/media-sound/callaudiod/metadata.xml
+++ b/media-sound/callaudiod/metadata.xml
@@ -1,8 +1,5 @@
-
- marco@scardovi.com
- Marco Scardovi
-
+
diff --git a/media-sound/nuclear-bin/metadata.xml b/media-sound/nuclear-bin/metadata.xml
index 944430426b..03259e0cb8 100644
--- a/media-sound/nuclear-bin/metadata.xml
+++ b/media-sound/nuclear-bin/metadata.xml
@@ -1,10 +1,7 @@
-
- marco@scardovi.com
- Marco Scardovi
-
+
nukeop/nuclear
diff --git a/metadata/pkgcheck.conf b/metadata/pkgcheck.conf
new file mode 100644
index 0000000000..8a2418f84e
--- /dev/null
+++ b/metadata/pkgcheck.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+checks = -UnstableOnlyCheck,-RedundantVersionCheck
diff --git a/net-dialup/atinout/metadata.xml b/net-dialup/atinout/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/net-dialup/atinout/metadata.xml
+++ b/net-dialup/atinout/metadata.xml
@@ -1,8 +1,5 @@
-
- marco@scardovi.com
- Marco Scardovi
-
+
diff --git a/net-im/whatsapp-for-linux/metadata.xml b/net-im/whatsapp-for-linux/metadata.xml
index 96d8fceed5..ad6f3aa383 100644
--- a/net-im/whatsapp-for-linux/metadata.xml
+++ b/net-im/whatsapp-for-linux/metadata.xml
@@ -1,10 +1,7 @@
-
- marco@scardovi.com
- Marco Scardovi
-
+
eneshecan/whatsapp-for-linux
https://github.com/eneshecan/whatsapp-for-linux/issues
diff --git a/net-misc/eg25-manager/metadata.xml b/net-misc/eg25-manager/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/net-misc/eg25-manager/metadata.xml
+++ b/net-misc/eg25-manager/metadata.xml
@@ -1,8 +1,5 @@
-
- marco@scardovi.com
- Marco Scardovi
-
+
diff --git a/net-misc/lyrics-in-terminal/lyrics-in-terminal-1.4.2.ebuild b/net-misc/lyrics-in-terminal/lyrics-in-terminal-1.4.2.ebuild
index 02334080e5..4b727096eb 100644
--- a/net-misc/lyrics-in-terminal/lyrics-in-terminal-1.4.2.ebuild
+++ b/net-misc/lyrics-in-terminal/lyrics-in-terminal-1.4.2.ebuild
@@ -3,20 +3,18 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
DESCRIPTION="Command Line Lyrics fetcher for MPRIS media players"
HOMEPAGE="https://github.com/Jugran/lyrics-in-terminal"
-SRC_URI="https://github.com/Jugran/lyrics-in-terminal/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Jugran/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
-RDEPEND="
- dev-python/dbus-python[${PYTHON_USEDEP}]
- sys-libs/ncurses
-"
+RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]"
+PYTHON_REQ_USE="ncurses"
diff --git a/net-voip/calls/metadata.xml b/net-voip/calls/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/net-voip/calls/metadata.xml
+++ b/net-voip/calls/metadata.xml
@@ -1,8 +1,5 @@
-
- marco@scardovi.com
- Marco Scardovi
-
+
diff --git a/net-wireless/iwdgui/Manifest b/net-wireless/iwdgui/Manifest
new file mode 100644
index 0000000000..0b373090c4
--- /dev/null
+++ b/net-wireless/iwdgui/Manifest
@@ -0,0 +1 @@
+DIST iwdgui-0.1.0.tar.gz 171453 BLAKE2B 0d5e7e88b66d5d0b53c254ee152c441a58800d2f528cb27e206cdeb99f7cc12e4f94b5efb33bf1d0731a660b7d0813f90d20f1eec9481aaafe38b7dc2c84345a SHA512 ca208424f09647fa2c9e35f7d4c945638f3e94407fdcd8594c03a49be0beb554a0ab5563771bc6e8106e3f71f6df9bbd991a5d79d4b156cc3c64c89878c9fa42
diff --git a/net-wireless/iwdgui/iwdgui-0.1.0.ebuild b/net-wireless/iwdgui/iwdgui-0.1.0.ebuild
new file mode 100644
index 0000000000..6fede9edd1
--- /dev/null
+++ b/net-wireless/iwdgui/iwdgui-0.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1 xdg
+
+DESCRIPTION="A graphical frontend for IWD, Intel's iNet Wireless Daemon"
+HOMEPAGE="https://gitlab.com/hfernh/iwdgui https://pypi.org/project/iwdgui"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+REQUIRED_USE=""
+
+# Upstream does not provide any test suite.
+RESTRICT="test"
+
+RDEPEND="
+ dev-libs/glib
+ dev-libs/gobject-introspection
+ dev-python/dbus-python
+ x11-libs/gtk+:3
+ dev-python/netifaces
+ net-wireless/iwd"
+
+BDEPEND="${RDEPEND}"
+DEPEND="${BDEPEND}"
diff --git a/net-wireless/iwdgui/metadata.xml b/net-wireless/iwdgui/metadata.xml
new file mode 100644
index 0000000000..18afe912a8
--- /dev/null
+++ b/net-wireless/iwdgui/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ hfern@fernhout.info
+ Johannes Willem (Hans) Fernhout
+
+
+ iwdgui
+ hfernh/iwdgui
+
+
diff --git a/sci-misc/boinc-wrapper/Manifest b/sci-misc/boinc-wrapper/Manifest
index 5238eec52f..909891f1be 100644
--- a/sci-misc/boinc-wrapper/Manifest
+++ b/sci-misc/boinc-wrapper/Manifest
@@ -1 +1,2 @@
DIST boinc-7.16.16.tar.gz 49599131 BLAKE2B 819ab85c19a684144711f77e669b892aa73c006b81c1d7ef7adbd9d580e1e8473ae27b52dc17953ee677c70fc78ed15df936afd740e629715f30f2b81d84ea6f SHA512 dd7042e176d6506c70de7866556ae73b2f45734df92038086d5b0414751f3da08dc571c49f0c26d747d3fb2577674d3ff8cdec7d3563861eaaaa5af9c1db0a0e
+DIST boinc-7.16.17.tar.gz 49628624 BLAKE2B 87e266a29506ecaa41fd18a2521b08c291548a4e31f7748001e5214e6f1fada1ded8bb8b559635d4f9c7c256cd7829dcf9132c02448c559d5ceb13524ca42e0f SHA512 e9882f37ad5c83ed020155c8192228322932f83b88ed00d025dcda63bff2dca109ecdcbaf98b48c4522b841f545f32352e5c158ae0a41de0a1f2941ac8135221
diff --git a/sci-misc/boinc-wrapper/boinc-wrapper-7.16.16.ebuild b/sci-misc/boinc-wrapper/boinc-wrapper-7.16.16.ebuild
index becebc0ab2..e282280fdf 100644
--- a/sci-misc/boinc-wrapper/boinc-wrapper-7.16.16.ebuild
+++ b/sci-misc/boinc-wrapper/boinc-wrapper-7.16.16.ebuild
@@ -1,50 +1,55 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit autotools toolchain-funcs
+inherit toolchain-funcs
+MY_PN=${PN%%-*}
MY_PV=$(ver_cut 1-2)
-
-DESCRIPTION="use non-BOINC apps with BOINC"
+DESCRIPTION="Wrapper to use non-BOINC apps with BOINC"
HOMEPAGE="https://boinc.berkeley.edu/trac/wiki/WrapperApp"
-SRC_URI="https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> boinc-${PV}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-S="${WORKDIR}/boinc-client_release-${MY_PV}-${PV}/samples/wrapper"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz"
+KEYWORDS="~amd64 ~arm64 ~x86"
+S="${WORKDIR}/${MY_PN}-client_release-${MY_PV}-${PV}/samples/${PN#*-}"
LICENSE="LGPL-3+ regexp-UofT"
SLOT="0"
+# sci-misc/boinc doesn't have all necessary headers, so
+# we have to include from build root. All that said,
+# versions must not mismatch.
RDEPEND="
~sci-misc/boinc-${PV}
- ~dev-libs/boinc-zip-${PV}
+ >=dev-libs/boinc-zip-${PV}
"
DEPEND="${RDEPEND}"
PATCHES=( "${FILESDIR}"/${PN}-$(ver_cut 1-2)-makefile.patch )
-DOCS=( ReadMe.txt job.xml )
-
-src_prepare() {
- default
-
- cd ../.. || die
- eautoreconf
- bash ./generate_svn_version.sh || die
-}
+DOCS=( job.xml )
src_configure() {
cd ../.. || die
- econf --enable-pkg-devel --disable-static --disable-fcgi --without-x
-}
-src_compile() {
+ bash ./generate_svn_version.sh || die
+
+ # autotools would take an eternity to configure
+ cat <<-EOF > "config.h"
+ #ifndef BOINC_CONFIG_H
+ #define BOINC_CONFIG_H
+
+ #define HAVE_SYS_RESOURCE_H 1
+ #define HAVE_SYS_TIME_H 1
+ #define HAVE_SYS_WAIT_H 1
+
+ #endif
+ EOF
+
tc-export CC CXX
- default
}
src_install() {
- default
+ einstalldocs
newbin wrapper boinc-wrapper
}
diff --git a/sci-misc/boinc-wrapper/boinc-wrapper-7.16.17.ebuild b/sci-misc/boinc-wrapper/boinc-wrapper-7.16.17.ebuild
new file mode 100644
index 0000000000..e282280fdf
--- /dev/null
+++ b/sci-misc/boinc-wrapper/boinc-wrapper-7.16.17.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PN=${PN%%-*}
+MY_PV=$(ver_cut 1-2)
+DESCRIPTION="Wrapper to use non-BOINC apps with BOINC"
+HOMEPAGE="https://boinc.berkeley.edu/trac/wiki/WrapperApp"
+
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz"
+KEYWORDS="~amd64 ~arm64 ~x86"
+S="${WORKDIR}/${MY_PN}-client_release-${MY_PV}-${PV}/samples/${PN#*-}"
+
+LICENSE="LGPL-3+ regexp-UofT"
+SLOT="0"
+
+# sci-misc/boinc doesn't have all necessary headers, so
+# we have to include from build root. All that said,
+# versions must not mismatch.
+RDEPEND="
+ ~sci-misc/boinc-${PV}
+ >=dev-libs/boinc-zip-${PV}
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-$(ver_cut 1-2)-makefile.patch )
+DOCS=( job.xml )
+
+src_configure() {
+ cd ../.. || die
+
+ bash ./generate_svn_version.sh || die
+
+ # autotools would take an eternity to configure
+ cat <<-EOF > "config.h"
+ #ifndef BOINC_CONFIG_H
+ #define BOINC_CONFIG_H
+
+ #define HAVE_SYS_RESOURCE_H 1
+ #define HAVE_SYS_TIME_H 1
+ #define HAVE_SYS_WAIT_H 1
+
+ #endif
+ EOF
+
+ tc-export CC CXX
+}
+
+src_install() {
+ einstalldocs
+ newbin wrapper boinc-wrapper
+}
diff --git a/sci-misc/boinc-wrapper/metadata.xml b/sci-misc/boinc-wrapper/metadata.xml
index a07d56d790..ce271dd130 100644
--- a/sci-misc/boinc-wrapper/metadata.xml
+++ b/sci-misc/boinc-wrapper/metadata.xml
@@ -1,7 +1,7 @@
-
+
cyber+gentoo@sysrq.in
Anna
diff --git a/sys-boot/bmaptools/metadata.xml b/sys-boot/bmaptools/metadata.xml
index 47af8f7db9..7a38bb9009 100644
--- a/sys-boot/bmaptools/metadata.xml
+++ b/sys-boot/bmaptools/metadata.xml
@@ -1,8 +1,5 @@
-
- marco@scardovi.com
- Marco Scardovi
-
+
diff --git a/sys-cluster/clusteringsuite/Manifest b/sys-cluster/clusteringsuite/Manifest
index fa6804d476..4430bcae47 100644
--- a/sys-cluster/clusteringsuite/Manifest
+++ b/sys-cluster/clusteringsuite/Manifest
@@ -1 +1 @@
-DIST clusteringsuite-2.6.9-src.tar.bz2 8081023 BLAKE2B d53e08a51e0a5a2d487bc4413c19d802804b7ae79b5f1e7c466ba2c37e36d90864a4629f51a98ca5caa83f4cc0a3ca8c74f5652c044c08591c65f3b50acf13d2 SHA512 80903e3d2c018e8ed23874715f7ffc1706ac5d9dcd0826c75bb07c973c28fa9755d4c130021abd6e969e983fbe23463be7361bb29b6d1ab04596ba4f987b1b6a
+DIST clusteringsuite-2.6.9.tar.gz 6964570 BLAKE2B bb4823d9918bc12707ae09d0c1220552b2621bfe39ab67dd67e03fba91036f2c8ed294f54a2bdd659b8bd58925aca02db85eb93986fe69e999e5b2bef915b564 SHA512 9df9ca57fc68b9cd7d17f13c1b915e3422a07c71f060ff2e7a38a31cf6e1aa234b869402bda6b7502c4844e25593156a1bb50714c2d272bafd10cd7690fc17eb
diff --git a/sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r2.ebuild b/sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r3.ebuild
similarity index 62%
rename from sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r2.ebuild
rename to sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r3.ebuild
index 7da3d3563f..efb4a40901 100644
--- a/sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r2.ebuild
+++ b/sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r3.ebuild
@@ -1,41 +1,47 @@
# Copyright 2019-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=8
+EAPI=7
PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit python-any-r1
+inherit autotools python-any-r1
DESCRIPTION="Expose the main performance trends in applications computation structure"
HOMEPAGE="
https://tools.bsc.es/cluster-analysis
https://github.com/bsc-performance-tools/clustering-suite
"
-SRC_URI="https://ftp.tools.bsc.es/clusteringsuite/clusteringsuite-${PV}-src.tar.bz2"
+SRC_URI="https://codeload.github.com/bsc-performance-tools/clustering-suite/tar.gz/refs/tags/${PV} -> ${P}.tar.gz"
+S="${WORKDIR}/clustering-suite-${PV}"
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="doc mpi muster"
-#TODO: treedbscan
+IUSE="doc mpi muster" # treedbscan
-PATCHES=( "${FILESDIR}/${P}-unbundle-libANN.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-unbundle-libANN.patch"
+ "${FILESDIR}/${P}-do-not-add-boost-thread-ldpath.patch"
+)
RDEPEND="
+ app-arch/bzip2
dev-libs/boost:=
sci-libs/ann
sys-cluster/libbsctools
mpi? ( virtual/mpi )
muster? ( sys-cluster/muster )
"
+# https://github.com/bsc-performance-tools/clustering-suite/issues/8
# treedbscan? (
-# dev-libs/boost[threads]:=
+# dev-libs/boost:=[threads]
# dev-libs/gmp
# dev-libs/mpfr
-# sci-mathematics/cgal
+# sci-mathematics/cgal[shared]
# sys-cluster/synapse
-#)
+# )
+#"
DEPEND="
${RDEPEND}
@@ -44,9 +50,21 @@ DEPEND="
BDEPEND="doc? ( app-doc/doxygen )"
src_prepare() {
+ use muster && PATCHES+=( "${FILESDIR}/${P}-force-muster-discovery.patch" )
rm -r src/libANN || die
# rm -r pcfparser_svn3942 || die
default
+ sed -e "s|iterate/lib|iterate/$(get_libdir)|g" -i config/gmp_mpfr.m4 || die
+ sed -e "s|dir/lib|dir/$(get_libdir)|g" -i config/ax_muster.m4 || die
+
+ #from bootstrap
+ echo "#*********************************************************************" >> configure.ac || die
+ echo "#'configure.ac.' automatically generated by 'autogen.sh' do not modify" >> configure.ac || die
+ echo "#*********************************************************************" >> configure.ac || die
+ echo "" >> configure.ac || die
+ sed s/@@VERSION_NUMBER@@/${PV}/ < configure.ac.template >> configure.ac || die
+
+ AT_M4DIR="config" eautoreconf
}
src_configure() {
diff --git a/sys-cluster/clusteringsuite/clusteringsuite-2.6.9.ebuild b/sys-cluster/clusteringsuite/clusteringsuite-2.6.9.ebuild
deleted file mode 100644
index 51a9d25b0b..0000000000
--- a/sys-cluster/clusteringsuite/clusteringsuite-2.6.9.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-inherit python-any-r1
-
-DESCRIPTION="Expose the main performance trends in applications computation structure"
-HOMEPAGE="
- https://tools.bsc.es/cluster-analysis
- https://github.com/bsc-performance-tools/clustering-suite
-"
-SRC_URI="https://ftp.tools.bsc.es/clusteringsuite/clusteringsuite-${PV}-src.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc mpi old-pcfparser"
-#TODO: muster treedbscan
-#TODO: unbundle ANN
-
-#PATCHES=( "${FILESDIR}/respect-flags.patch" )
-
-RDEPEND="
- dev-libs/boost:=
- sci-libs/ann
- mpi? ( virtual/mpi )
-"
-# treedbscan? (
-# dev-libs/boost[threads]:=
-# dev-libs/gmp
-# dev-libs/mpfr
-# sci-mathematics/cgal
-# sys-cluster/synapse
-#)
-
-DEPEND="
- ${RDEPEND}
- ${PYTHON_DEPS}
-"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-src_configure() {
-
- local myconf=(
- --disable-static
- --disable-static-boost
- --enable-shared
- --with-boost="${EPREFIX}/usr"
- --with-pic
-
- $(use_enable old-pcfparser)
- )
-
- if use mpi; then
- myconf+=( "--with-mpi=${EPREFIX}/usr" )
- else
- myconf+=( "--without-mpi" )
- fi
-# if use muster; then
-# myconf+=( "--with-muster=${EPREFIX}/usr" )
-# else
- myconf+=( "--without-muster" )
-# fi
-# if use treedbscan; then
-# myconf+=( "--enable-treedbscan" )
-# myconf+=( "--with-cgal=${EPREFIX}/usr" )
-# myconf+=( "--with-gmp=${EPREFIX}/usr" )
-# myconf+=( "--with-mpfr=${EPREFIX}/usr" )
-# myconf+=( "--with-synapse=${EPREFIX}/usr" )
-# else
- myconf+=( "--without-cgal" )
- myconf+=( "--without-gmp" )
- myconf+=( "--without-mpfr" )
- myconf+=( "--without-synapse" )
-# fi
-
- econf "${myconf[@]}" || die
-}
-
-src_compile() {
- export VARTEXFONTS="${T}/fonts"
- if use doc ; then
- pushd doc || die
- emake build-documentation
- popd
- fi
- default
-}
-
-src_install() {
- MAKEOPTS="-j1" DESTDIR="${D}" emake install
-
- cd doc || die
- dodoc -r *.pdf
-
- rm "${ED}/usr/share/doc/clusteringsuite_manual.pdf" || die
- mv "${ED}/usr/share/example" "${ED}/usr/share/doc/${PF}/examples" || die
- docompress -x "/usr/share/doc/${PF}/examples"
-
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-do-not-add-boost-thread-ldpath.patch b/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-do-not-add-boost-thread-ldpath.patch
new file mode 100644
index 0000000000..655cdcfbca
--- /dev/null
+++ b/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-do-not-add-boost-thread-ldpath.patch
@@ -0,0 +1,15 @@
+--- a/configure.ac.template
++++ b/configure.ac.template
+@@ -417,12 +417,10 @@
+
+ if test "x$BOOST_THREAD_LIBS" != "x"; then
+
+- CLUSTERING_CLEAN_LDFLAGS="${CLUSTERING_CLEAN_LDFLAGS} -L${BOOST_THREAD_LDPATH}"
+ CLUSTERING_LIBS="${CLUSTERING_LIBS} ${BOOST_THREAD_LIBS}"
+
+ AX_CHECK_IS_SYSTEM_LIBRARY_PATH([${BOOST_THREAD_LDPATH}],[],
+ [
+- CLUSTERING_LDFLAGS="${CLUSTERING_LDFLAGS} -L${BOOST_THREAD_LDPATH} -R${BOOST_THREAD_LDPATH}"
+ CLUSTERING_LD_LIBRARY_PATH="${CLUSTERING_LD_LIBRARY_PATH}:${BOOST_THREAD_LDPATH}"
+ ])
+ else
diff --git a/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-force-muster-discovery.patch b/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-force-muster-discovery.patch
new file mode 100644
index 0000000000..f9c533b2bd
--- /dev/null
+++ b/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-force-muster-discovery.patch
@@ -0,0 +1,37 @@
+--- a/config/ax_muster.m4
++++ b/config/ax_muster.m4
+@@ -6,21 +6,11 @@
+ [--with-muster=MUSTER_DIR],
+ [sets the given directory as location of muster includes and libs (needs Boost libraries)]
+ ),
+- [muster_dir="$withval"]
+- [muster_dir="/usr)"]
++ [muster_dir="$withval"],
++ [muster_dir="/usr"]
+ )
+
+- ac_muster_installed="yes"
+-
+- if test ! -f $muster_dir/include/partition.h; then
+- ac_muster_installed="no"
+- fi
+-
+- if test ! -f $muster_dir/lib/libmuster.so; then
+- ac_muster_installed="no"
+- fi
+-
+- if test "x${ac_muster_enabled}" = "xyes"; then
++ ac_muster_installed="yes"
+
+ MUSTER_CPPFLAGS="-I$muster_dir/include"
+ MUSTER_LDFLAGS="-L$muster_dir/lib -R$muster_dir/lib"
+@@ -36,9 +26,5 @@
+
+ # execute ACTION-IF-FOUND
+ ifelse([$1], , :, [$1])
+- else
+- # execute ACTION-IF-NOT-FOUND
+- ifelse([$2], , :, [$2])
+- fi
+
+ ])
diff --git a/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-unbundle-libANN.patch b/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-unbundle-libANN.patch
index fd6e155173..8df36e1563 100644
--- a/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-unbundle-libANN.patch
+++ b/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-unbundle-libANN.patch
@@ -1,25 +1,6 @@
---- a/configure
-+++ b/configure
-@@ -19970,7 +19970,7 @@
-
-
-
--ac_config_files="$ac_config_files Makefile include/Makefile common_utilities/Makefile pcfparser_svn3942/Makefile src/Makefile src/BasicClasses/Makefile src/libParaverTraceParser/Makefile src/libSharedComponents/Makefile src/libSharedComponents/kalign2/Makefile src/libANN/Makefile src/libClustering/gmeans/Makefile src/libClustering/Makefile src/libTraceClustering/Makefile src/DBSCANParametersApproximation/Makefile src/BurstClustering/Makefile src/ClusteringDataExtractor/Makefile src/ClustersDiff/Makefile src/ClustersSequenceScore/Makefile scripts/Makefile src/MusterDistributedClustering/Makefile src/libDistributedClustering/Makefile src/TreeDBSCAN/Makefile src/TreeDBSCAN/scripts/Makefile doc/Makefile"
-+ac_config_files="$ac_config_files Makefile include/Makefile common_utilities/Makefile pcfparser_svn3942/Makefile src/Makefile src/BasicClasses/Makefile src/libParaverTraceParser/Makefile src/libSharedComponents/Makefile src/libSharedComponents/kalign2/Makefile src/libClustering/gmeans/Makefile src/libClustering/Makefile src/libTraceClustering/Makefile src/DBSCANParametersApproximation/Makefile src/BurstClustering/Makefile src/ClusteringDataExtractor/Makefile src/ClustersDiff/Makefile src/ClustersSequenceScore/Makefile scripts/Makefile src/MusterDistributedClustering/Makefile src/libDistributedClustering/Makefile src/TreeDBSCAN/Makefile src/TreeDBSCAN/scripts/Makefile doc/Makefile"
-
-
- ac_config_links="$ac_config_links include/types.h:include/types.h common_utilities/Error.hpp:common_utilities/Error.hpp src/BasicClasses/Error.hpp:src/BasicClasses/Error.hpp common_utilities/EventEncoding.h:common_utilities/EventEncoding.h common_utilities/Dimemas_Generation.h:common_utilities/Dimemas_Generation.h common_utilities/ParaverColors.h:common_utilities/ParaverColors.h src/BasicClasses/Utilities.hpp:src/BasicClasses/Utilities.hpp src/BasicClasses/SystemMessages.hpp:src/BasicClasses/SystemMessages.hpp src/BasicClasses/Timer.hpp:src/BasicClasses/Timer.hpp src/BasicClasses/FileNameManipulator.hpp:src/BasicClasses/FileNameManipulator.hpp doc/clusteringsuite_manual.tex:doc/clusteringsuite_manual.tex doc/clusteringsuite_manual.pdf:doc/clusteringsuite_manual.pdf doc/clustering_manual_structure.txt:doc/clustering_manual_structure.txt doc/clusteringsuite_design.tex:doc/clusteringsuite_design.tex doc/clusteringsuite_bsctools.pdf:doc/clusteringsuite_bsctools.pdf doc/clusteringsuite_design.pdf:doc/clusteringsuite_design.pdf doc/figure_sources/uml_design/libclustering_uml.pdf:doc/figure_sources/uml_design/libclustering_uml.pdf doc/figure_sources/uml_design/libtraceclustering_uml.pdf:doc/figure_sources/uml_design/libtraceclustering_uml.pdf doc/figure_sources/uml_design/libClustering_uml.graffle:doc/figure_sources/uml_design/libClustering_uml.graffle doc/figure_sources/uml_design/libTraceClustering_uml.graffle:doc/figure_sources/uml_design/libTraceClustering_uml.graffle doc/figure_sources/plots_example/int_vs_fop_plot.pdf:doc/figure_sources/plots_example/int_vs_fop_plot.pdf doc/figure_sources/plots_example/inst_vs_ipc_plot.pdf:doc/figure_sources/plots_example/inst_vs_ipc_plot.pdf doc/figure_sources/plots_example/mainmem_vs_l2_plot.pdf:doc/figure_sources/plots_example/mainmem_vs_l2_plot.pdf doc/figure_sources/plots_example/int_vs_fop_plot.png:doc/figure_sources/plots_example/int_vs_fop_plot.png doc/figure_sources/plots_example/inst_vs_ipc_plot.png:doc/figure_sources/plots_example/inst_vs_ipc_plot.png doc/figure_sources/plots_example/stores_vs_loads_plot.pdf:doc/figure_sources/plots_example/stores_vs_loads_plot.pdf doc/figure_sources/plots_example/stores_vs_loads_plot.png:doc/figure_sources/plots_example/stores_vs_loads_plot.png doc/figure_sources/plots_example/mainmem_vs_l2_plot.png:doc/figure_sources/plots_example/mainmem_vs_l2_plot.png doc/figure_sources/stats_plot/GADGET-DEISA.MEDIUM.256.1HWCG.chop1.bursts.dat:doc/figure_sources/stats_plot/GADGET-DEISA.MEDIUM.256.1HWCG.chop1.bursts.dat doc/figure_sources/stats_plot/GADGET-DEISA.MEDIUM.256.1HWCG.chop1.bursts.gnuplot:doc/figure_sources/stats_plot/GADGET-DEISA.MEDIUM.256.1HWCG.chop1.bursts.gnuplot doc/figure_sources/stats_plot/stats_plot.pdf:doc/figure_sources/stats_plot/stats_plot.pdf doc/figure_sources/clustering_xml/xml_plot_definition.pdf:doc/figure_sources/clustering_xml/xml_plot_definition.pdf doc/figure_sources/clustering_xml/xml_structure.pdf:doc/figure_sources/clustering_xml/xml_structure.pdf doc/figure_sources/clustering_xml/xml_single_event_definition.pdf:doc/figure_sources/clustering_xml/xml_single_event_definition.pdf doc/figure_sources/clustering_xml/xml_mixed_events_definition.pdf:doc/figure_sources/clustering_xml/xml_mixed_events_definition.pdf doc/figure_sources/clustering_xml/xml_algorithm_definition.pdf:doc/figure_sources/clustering_xml/xml_algorithm_definition.pdf doc/figure_sources/clustering_xml/clustering_xml_definition.graffle:doc/figure_sources/clustering_xml/clustering_xml_definition.graffle doc/cluster_analysis_thesis_bibliography.bib:doc/cluster_analysis_thesis_bibliography.bib doc/extra_commands.tex:doc/extra_commands.tex doc/figures/uml_design/libclustering_uml.pdf:doc/figures/uml_design/libclustering_uml.pdf doc/figures/uml_design/libtraceclustering_uml.pdf:doc/figures/uml_design/libtraceclustering_uml.pdf doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.LD_vs_ST.gnuplot:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.LD_vs_ST.gnuplot doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.L2DATA_vs_MainMEMData.gnuplot:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.L2DATA_vs_MainMEMData.gnuplot doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.CLUSTERED.FULL_POINTS.Cluster3.csv:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.CLUSTERED.FULL_POINTS.Cluster3.csv doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.L2DATA_vs_MainMEMData.PNG.gnuplot:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.L2DATA_vs_MainMEMData.PNG.gnuplot doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.CLUSTERED.FULL_POINTS.Cluster1.csv:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.CLUSTERED.FULL_POINTS.Cluster1.csv doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.FPU_vs_FXU.PNG.gnuplot:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.FPU_vs_FXU.PNG.gnuplot doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.CLUSTERED.FULL_POINTS.Cluster4.csv:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.CLUSTERED.FULL_POINTS.Cluster4.csv doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.FPU_vs_FXU.gnuplot:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.FPU_vs_FXU.gnuplot doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.LD_vs_ST.PNG.gnuplot:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.LD_vs_ST.PNG.gnuplot doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.INST_vs_IPC.gnuplot:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.INST_vs_IPC.gnuplot doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.INST_vs_IPC.PNG.gnuplot:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.INST_vs_IPC.PNG.gnuplot doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.CLUSTERED.FULL_POINTS.Cluster2.csv:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.CLUSTERED.FULL_POINTS.Cluster2.csv doc/figures/plots_example/int_vs_fop_plot.pdf:doc/figures/plots_example/int_vs_fop_plot.pdf doc/figures/plots_example/inst_vs_ipc_plot.pdf:doc/figures/plots_example/inst_vs_ipc_plot.pdf doc/figures/plots_example/mainmem_vs_l2_plot.pdf:doc/figures/plots_example/mainmem_vs_l2_plot.pdf doc/figures/plots_example/int_vs_fop_plot.png:doc/figures/plots_example/int_vs_fop_plot.png doc/figures/plots_example/inst_vs_ipc_plot.png:doc/figures/plots_example/inst_vs_ipc_plot.png doc/figures/plots_example/stores_vs_loads_plot.pdf:doc/figures/plots_example/stores_vs_loads_plot.pdf doc/figures/plots_example/stores_vs_loads_plot.png:doc/figures/plots_example/stores_vs_loads_plot.png doc/figures/plots_example/mainmem_vs_l2_plot.png:doc/figures/plots_example/mainmem_vs_l2_plot.png doc/figures/stats_plot/stats_plot.pdf:doc/figures/stats_plot/stats_plot.pdf doc/figures/refinement_tree/refinement_tree.pdf:doc/figures/refinement_tree/refinement_tree.pdf doc/figures/clustering_xml/xml_plot_definition.pdf:doc/figures/clustering_xml/xml_plot_definition.pdf doc/figures/clustering_xml/xml_structure.pdf:doc/figures/clustering_xml/xml_structure.pdf doc/figures/clustering_xml/xml_single_event_definition.pdf:doc/figures/clustering_xml/xml_single_event_definition.pdf doc/figures/clustering_xml/xml_mixed_events_definition.pdf:doc/figures/clustering_xml/xml_mixed_events_definition.pdf doc/figures/clustering_xml/xml_algorithm_definition.pdf:doc/figures/clustering_xml/xml_algorithm_definition.pdf doc/figures/paraver_example/paraver_clusters_timeline.png:doc/figures/paraver_example/paraver_clusters_timeline.png doc/figures/paraver_example/paraver_clusters_profile.png:doc/figures/paraver_example/paraver_clusters_profile.png doc/figures/sequences_example/gromacs_step10_sequences.png:doc/figures/sequences_example/gromacs_step10_sequences.png doc/figures/sequences_example/sequences_clustalx.png:doc/figures/sequences_example/sequences_clustalx.png example/README:example/README example/su3.lat256_2it.16tasks.pcf:example/su3.lat256_2it.16tasks.pcf example/su3.lat256_2it.16tasks.row:example/su3.lat256_2it.16tasks.row example/cluster_explained.xml:example/cluster_explained.xml example/cluster.xml:example/cluster.xml example/su3.lat256_2it.16tasks.prv:example/su3.lat256_2it.16tasks.prv"
-@@ -21184,7 +21184,6 @@
- "src/libParaverTraceParser/Makefile") CONFIG_FILES="$CONFIG_FILES src/libParaverTraceParser/Makefile" ;;
- "src/libSharedComponents/Makefile") CONFIG_FILES="$CONFIG_FILES src/libSharedComponents/Makefile" ;;
- "src/libSharedComponents/kalign2/Makefile") CONFIG_FILES="$CONFIG_FILES src/libSharedComponents/kalign2/Makefile" ;;
-- "src/libANN/Makefile") CONFIG_FILES="$CONFIG_FILES src/libANN/Makefile" ;;
- "src/libClustering/gmeans/Makefile") CONFIG_FILES="$CONFIG_FILES src/libClustering/gmeans/Makefile" ;;
- "src/libClustering/Makefile") CONFIG_FILES="$CONFIG_FILES src/libClustering/Makefile" ;;
- "src/libTraceClustering/Makefile") CONFIG_FILES="$CONFIG_FILES src/libTraceClustering/Makefile" ;;
---- a/configure.ac
-+++ b/configure.ac
-@@ -552,7 +552,6 @@
+--- a/configure.ac.template
++++ b/configure.ac.template
+@@ -548,7 +548,6 @@
src/libParaverTraceParser/Makefile
src/libSharedComponents/Makefile
src/libSharedComponents/kalign2/Makefile
@@ -50,30 +31,6 @@
./gmeans/libInternalGMeans.la \
@CLUSTERING_LIBS@
---- a/src/libClustering/Makefile.in
-+++ b/src/libClustering/Makefile.in
-@@ -155,7 +155,6 @@
- LTLIBRARIES = $(lib_LTLIBRARIES)
- libClustering_la_DEPENDENCIES = \
- $(top_builddir)/src/BasicClasses/libBasicClasses.la \
-- $(top_builddir)/src/libANN/libANN.la \
- ./gmeans/libInternalGMeans.la
- am__libClustering_la_SOURCES_DIST = Classifier.hpp \
- ClusteringAlgorithm.hpp ClusteringAlgorithmsFactory.cpp \
-@@ -530,11 +529,10 @@
- NearestNeighbourClassifier.hpp Point.cpp Point.hpp \
- clustering_types.h Partition.hpp Partition.cpp $(am__append_2) \
- $(am__append_3) $(am__append_4)
--libClustering_la_CPPFLAGS = @CLUSTERING_CPPFLAGS@ -I$(top_srcdir)/src/libANN
--libClustering_la_LDFLAGS = @CLUSTERING_LDFLAGS@ @CLUSTERING_CPPFLAGS@
-+libClustering_la_CPPFLAGS = @CLUSTERING_CPPFLAGS@ -I/usr/include/ANN
-+libClustering_la_LDFLAGS = @CLUSTERING_LDFLAGS@ @CLUSTERING_CPPFLAGS@ -lann
- libClustering_la_LIBADD = \
- $(top_builddir)/src/BasicClasses/libBasicClasses.la \
-- $(top_builddir)/src/libANN/libANN.la \
- ./gmeans/libInternalGMeans.la \
- @CLUSTERING_LIBS@
-
--- a/src/libDistributedClustering/Makefile.am
+++ b/src/libDistributedClustering/Makefile.am
@@ -32,7 +32,7 @@
@@ -85,17 +42,6 @@
libDistributedClustering_la_LDFLAGS = @CLUSTERING_LDFLAGS@ @CLUSTERING_CPPFLAGS@
libDistributedClustering_la_LIBADD= \
---- a/src/libDistributedClustering/Makefile.in
-+++ b/src/libDistributedClustering/Makefile.in
-@@ -446,7 +446,7 @@
- -I$(top_srcdir)/src/libSharedComponents\
- -I$(top_srcdir)/pcfparser_svn3942\
- -I$(top_srcdir)/src/libParaverTraceParser\
-- -I$(top_srcdir)/src/libANN
-+ -I/usr/include/ANN
-
- libDistributedClustering_la_LDFLAGS = @CLUSTERING_LDFLAGS@ @CLUSTERING_CPPFLAGS@
- libDistributedClustering_la_LIBADD = \
--- a/src/libSharedComponents/Makefile.am
+++ b/src/libSharedComponents/Makefile.am
@@ -76,7 +76,7 @@
@@ -107,17 +53,6 @@
if MAKE_OLD_PCFPARSER
libSharedComponents_la_CPPFLAGS += -I${top_srcdir}/pcfparser_svn3942/old
else
---- a/src/libSharedComponents/Makefile.in
-+++ b/src/libSharedComponents/Makefile.in
-@@ -551,7 +551,7 @@
- libSharedComponents_la_CPPFLAGS = @CLUSTERING_CPPFLAGS@ \
- -I${top_srcdir}/src/libClustering \
- -I${top_srcdir}/src/libParaverTraceParser \
-- -I${top_srcdir}/src/libANN $(am__append_2) $(am__append_3)
-+ -I/usr/include/ANN $(am__append_2) $(am__append_3)
- libSharedComponents_la_LDFLAGS = @CLUSTERING_LDFLAGS@ @CLUSTERING_CPPFLAGS@
- libSharedComponents_la_LIBADD = \
- $(top_builddir)/pcfparser_svn3942/libparavertraceconfig.la \
--- a/src/libTraceClustering/Makefile.am
+++ b/src/libTraceClustering/Makefile.am
@@ -7,7 +7,7 @@
@@ -134,30 +69,10 @@
-I$(top_srcdir)/src/libSharedComponents\
-I$(top_srcdir)/pcfparser_svn3942\
- -I$(top_srcdir)/src/libANN\
-+ -I/usr/include/ANN \
++ -I/usr/include/ANN\
-I$(top_srcdir)/src/libParaverTraceParser
libTraceClustering_la_LDFLAGS = @CLUSTERING_CPPFLAGS@ @CLUSTERING_LDFLAGS@
---- a/src/libTraceClustering/Makefile.in
-+++ b/src/libTraceClustering/Makefile.in
-@@ -418,7 +418,7 @@
- AM_CPPFLAGS = \
- -I$(top_srcdir)/include \
- -I$(top_srcdir)/src/BasicClasses \
-- -I$(top_srcdir)/src/libANN \
-+ -I/usr/include/ANN \
- -I$(top_srcdir)/src/libSharedComponents \
- -I$(top_srcdir)/src/libParaverTraceParser \
- -I$(top_srcdir)/common_utilities \
-@@ -438,7 +438,7 @@
- -I$(top_srcdir)/src/libClustering\
- -I$(top_srcdir)/src/libSharedComponents\
- -I$(top_srcdir)/pcfparser_svn3942\
-- -I$(top_srcdir)/src/libANN\
-+ -I/usr/include/ANN \
- -I$(top_srcdir)/src/libParaverTraceParser
-
- libTraceClustering_la_LDFLAGS = @CLUSTERING_CPPFLAGS@ @CLUSTERING_LDFLAGS@
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,6 @@
@@ -168,26 +83,3 @@
libClustering \
libSharedComponents \
libTraceClustering \
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -151,7 +151,7 @@
- done | $(am__uniquify_input)`
- ETAGS = etags
- CTAGS = ctags
--DIST_SUBDIRS = BasicClasses libParaverTraceParser libANN libClustering \
-+DIST_SUBDIRS = BasicClasses libParaverTraceParser libClustering \
- libSharedComponents libTraceClustering ClusteringDataExtractor \
- DBSCANParametersApproximation BurstClustering ClustersDiff \
- ClustersSequenceScore MusterDistributedClustering \
-@@ -380,10 +380,9 @@
- CLUSTERING_DIR = $(SRC_DIR)/libClustering
- CLUSTERING_ALG_DIR = $(SRC_DIR)/libClusteringAlgorithms
- PARAVER_PARSER_DIR = $(SRC_DIR)/libParaverTraceParser
--ANN_DIR = $(SRC_DIR)/libANN
-
- # common_filesdir = @common_filesdir@
--SUBDIRS = BasicClasses libParaverTraceParser libANN libClustering \
-+SUBDIRS = BasicClasses libParaverTraceParser libClustering \
- libSharedComponents libTraceClustering ClusteringDataExtractor \
- DBSCANParametersApproximation BurstClustering ClustersDiff \
- ClustersSequenceScore $(am__append_1) $(am__append_2)
diff --git a/sys-cluster/clusteringsuite/metadata.xml b/sys-cluster/clusteringsuite/metadata.xml
index d0ad8930d5..90dc13e20b 100644
--- a/sys-cluster/clusteringsuite/metadata.xml
+++ b/sys-cluster/clusteringsuite/metadata.xml
@@ -8,7 +8,6 @@
diff --git a/sys-cluster/libbsctools/libbsctools-1.0.6.ebuild b/sys-cluster/libbsctools/libbsctools-1.0.6-r2.ebuild
similarity index 82%
rename from sys-cluster/libbsctools/libbsctools-1.0.6.ebuild
rename to sys-cluster/libbsctools/libbsctools-1.0.6-r2.ebuild
index 0e28bbeba4..f0b57b1264 100644
--- a/sys-cluster/libbsctools/libbsctools-1.0.6.ebuild
+++ b/sys-cluster/libbsctools/libbsctools-1.0.6-r2.ebuild
@@ -24,6 +24,8 @@ src_prepare() {
src_install() {
MAKEOPTS="-j1" emake DESTDIR="${D}" install
dodoc NEWS README AUTHORS
+ mv "${ED}/usr/share/example" "${ED}/usr/share/doc/${PF}/examples" || die
+ docompress -x "/usr/share/doc/${PF}/examples"
find "${D}" -name '*.la' -delete || die
find "${D}" -name '*.a' -delete || die
}
diff --git a/sys-cluster/synapse/Manifest b/sys-cluster/synapse/Manifest
new file mode 100644
index 0000000000..7de754aed2
--- /dev/null
+++ b/sys-cluster/synapse/Manifest
@@ -0,0 +1 @@
+DIST synapse-2.0.1.tar.gz 268657 BLAKE2B 19491c1b6c4c60318093d994594b1ebb541a4b1ca1fb9128a2361b06b1a58921a0bc41f8e43abcb62f379c97db6603c62cf1622c7caf6d3f5ee1b84e0f80963d SHA512 c08762f065275232f419cca181acc0e40a913724e1182def9a810ed9b45c1e9f2ddd8dddf0a2623576ad527585b2ecb60842d9fc8f5f0f680c2b391ba4ee1dea
diff --git a/sys-cluster/synapse/files/synapse-check-for-shared-mrnet.patch b/sys-cluster/synapse/files/synapse-check-for-shared-mrnet.patch
new file mode 100644
index 0000000000..c0413f60b5
--- /dev/null
+++ b/sys-cluster/synapse/files/synapse-check-for-shared-mrnet.patch
@@ -0,0 +1,11 @@
+--- a/config/macros.m4
++++ b/config/macros.m4
+@@ -327,7 +327,7 @@
+ dnl Check for libraries.
+ AC_MSG_CHECKING([for libmrnet and libxplat])
+
+- if test -f ${MRNET_LIBSDIR}/libmrnet.a -a -f ${MRNET_LIBSDIR}/libxplat.a ; then
++ if test -f ${MRNET_LIBSDIR}/libmrnet.so -a -f ${MRNET_LIBSDIR}/libxplat.so ; then
+ MRNET_LIBS="-lmrnet -lxplat -lpthread -ldl"
+ MRNET_LIGHT_LIBS="-lmrnet_lightweight -lxplat_lightweight -lpthread -ldl"
+ AC_SUBST(MRNET_LIBS)
diff --git a/sys-cluster/synapse/files/synapse-fix-example-installation.patch b/sys-cluster/synapse/files/synapse-fix-example-installation.patch
new file mode 100644
index 0000000000..f989b73945
--- /dev/null
+++ b/sys-cluster/synapse/files/synapse-fix-example-installation.patch
@@ -0,0 +1,22 @@
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -14,13 +14,9 @@
+ test_BE_LDFLAGS = -L${top_srcdir}/src -lsynapse_backend -L@MRNET_LIBSDIR@ @MRNET_LIBS@
+
+ install-data-hook:
+- mkdir -p ${prefix}/example
+- cp ${test_FE_SOURCES} ${test_BE_SOURCES} ${prefix}/example
+- cp Makefile-example ${prefix}/example/Makefile
+- cp run-example ${prefix}/example/run.sh
+- cp topology_1x4.txt ${prefix}/example
+- chmod u+x ${prefix}/example/run.sh
+- $(top_srcdir)/substitute $(SED) "@sub_SYNAPSE_HOME@" "${prefix}" ${prefix}/example/Makefile
+- $(top_srcdir)/substitute $(SED) "@sub_SYNAPSE_HOME@" "${prefix}" ${prefix}/example/run.sh
+-
+-
++ mkdir -p ${DESTDIR}/${prefix}/libexec/synapse/example
++ cp ${noinst_PROGRAMS} ${DESTDIR}/${prefix}/libexec/synapse/example
++ cp run-example ${DESTDIR}/${prefix}/libexec/synapse/example/run.sh
++ cp topology_1x4.txt ${DESTDIR}/${prefix}/libexec/synapse/example
++ chmod u+x ${DESTDIR}/${prefix}/libexec/synapse/example/run.sh
++ $(top_srcdir)/substitute $(SED) "@sub_SYNAPSE_HOME@" "${prefix}" ${DESTDIR}/${prefix}/libexec/synapse/example/run.sh
diff --git a/sys-cluster/synapse/files/synapse-respect-destdir.patch b/sys-cluster/synapse/files/synapse-respect-destdir.patch
new file mode 100644
index 0000000000..31496f62e3
--- /dev/null
+++ b/sys-cluster/synapse/files/synapse-respect-destdir.patch
@@ -0,0 +1,15 @@
+--- a/scripts/Makefile.am
++++ b/scripts/Makefile.am
+@@ -37,9 +37,9 @@
+ $(top_srcdir)/substitute $(SED) "@sub_MRNET_HOME@" "@MRNET_HOME@" $@
+
+ install-data-hook:
+- chmod u+x ${bindir}/$(SYNAPSE_CONFIG)
+- $(MKDIR_P) $(prefix)/etc
+- cp $(SOURCEME_SH) $(prefix)/etc
++ chmod u+x ${DESTDIR}${bindir}/$(SYNAPSE_CONFIG)
++ $(MKDIR_P) ${DESTDIR}/etc
++ cp $(SOURCEME_SH) ${DESTDIR}/etc
+
+ clean-local:
+ rm -f $(SYNAPSE_CONFIG) $(SOURCEME_SH) $(MRNRUN)
diff --git a/sys-cluster/synapse/metadata.xml b/sys-cluster/synapse/metadata.xml
new file mode 100644
index 0000000000..d67e3064c8
--- /dev/null
+++ b/sys-cluster/synapse/metadata.xml
@@ -0,0 +1,17 @@
+
+
+
+
+ lssndrbarbieri@gmail.com
+ Alessandro Barbieri
+
+
+
+ https://github.com/bsc-performance-tools/synapse/issues
+ bsc-performance-tools/synapse
+
+
diff --git a/sys-cluster/synapse/synapse-2.0.1.ebuild b/sys-cluster/synapse/synapse-2.0.1.ebuild
new file mode 100644
index 0000000000..df1e7566c6
--- /dev/null
+++ b/sys-cluster/synapse/synapse-2.0.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="synapse"
+HOMEPAGE="https://github.com/bsc-performance-tools/synapse"
+SRC_URI="https://github.com/bsc-performance-tools/synapse/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ dev-libs/boost:=
+ sys-cluster/mrnet
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-check-for-shared-mrnet.patch"
+ "${FILESDIR}/${PN}-respect-destdir.patch"
+ "${FILESDIR}/${PN}-fix-example-installation.patch"
+)
+
+src_prepare() {
+ sed -e "s|\${prefix}/doc|\${DESTDIR}\${prefix}/share/${PF}/doc|g" -i doc/Makefile.am || die
+ default
+ ./bootstrap || die
+}
+
+src_configure() {
+ local myconf=(
+ --with-mrnet="${EPREFIX}/usr"
+ )
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ MAKEOPTS="-j1" DESTDIR="${D}" emake install
+ find "${ED}" -name '*.a' -delete || die
+ find "${ED}" -name '*.a' -delete || die
+}
diff --git a/sys-power/gtherm/metadata.xml b/sys-power/gtherm/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/sys-power/gtherm/metadata.xml
+++ b/sys-power/gtherm/metadata.xml
@@ -1,8 +1,5 @@
-
- marco@scardovi.com
- Marco Scardovi
-
+
diff --git a/x11-misc/caffeine-ng/caffeine-ng-3.5.1.ebuild b/x11-misc/caffeine-ng/caffeine-ng-3.5.1.ebuild
index 694fc49626..f727649e52 100644
--- a/x11-misc/caffeine-ng/caffeine-ng-3.5.1.ebuild
+++ b/x11-misc/caffeine-ng/caffeine-ng-3.5.1.ebuild
@@ -3,48 +3,53 @@
EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1 gnome2-utils
-DESCRIPTION="Aplication able to temporarily inhibit the screensaver."
+DESCRIPTION="Aplication able to temporarily inhibit the screensaver"
HOMEPAGE="https://github.com/caffeine-ng/caffeine-ng"
-if [[ ${PV} == 9999 ]];then
+
+if [[ ${PV} == 9999 ]]; then
inherit git-r3
- EGIT_REPO_URI="${HOMEPAGE}.git"
+ EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
else
- SRC_URI="https://github.com/caffeine-ng/caffeine-ng/releases/download/v${PV}/${P}.tar.gz"
+ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
KEYWORDS="~amd64"
fi
LICENSE="GPL-3"
SLOT="0"
-IUSE=""
-DEPEND="
- dev-python/pygobject:3
- >=dev-python/pyxdg-0.25
- dev-python/dbus-python
- >=dev-python/docopt-0.6.2
- >=dev-python/setproctitle-1.1.10
- dev-python/setuptools
- >=dev-python/wheel-0.29.0
- dev-python/setuptools_scm
+RDEPEND="
+ >=dev-python/ewmh-0.1.4[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ >=dev-python/pyxdg-0.25[${PYTHON_USEDEP}]
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ >=dev-python/docopt-0.6.2[${PYTHON_USEDEP}]
+ dev-python/pulsectl[${PYTHON_USEDEP}]
+ >=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}]
dev-libs/libappindicator:3
- x11-libs/gtk+:3
"
-RDEPEND="${DEPEND}"
-pkg_preinst(){
+src_prepare() {
+ sed "/wheel/d" -i setup.py || die
+ sed "s/;TrayIcon;DesktopUtility//" -i share/applications/caffeine.desktop || die
+ gunzip share/man/man1/caffeine.1.gz || die
+
+ distutils-r1_src_prepare
+}
+
+pkg_preinst() {
gnome2_schemas_savelist
}
-pkg_postinst(){
+pkg_postinst() {
gnome2_gconf_install
gnome2_schemas_update
}
-pkg_postrm(){
+pkg_postrm() {
gnome2_gconf_uninstall
gnome2_schemas_update
}
diff --git a/x11-misc/caffeine-ng/caffeine-ng-9999.ebuild b/x11-misc/caffeine-ng/caffeine-ng-9999.ebuild
deleted file mode 100644
index f55d9d5dce..0000000000
--- a/x11-misc/caffeine-ng/caffeine-ng-9999.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="Aplication able to temporarily inhibit the screensaver."
-HOMEPAGE="https://github.com/caffeine-ng/caffeine-ng"
-if [[ ${PV} == 9999 ]];then
- inherit git-r3
- EGIT_REPO_URI="${HOMEPAGE}.git"
-else
- SRC_URI="https://github.com/caffeine-ng/caffeine-ng/releases/download/v${PV}/${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- dev-python/pygobject:3
- >=dev-python/pyxdg-0.25
- dev-python/dbus-python
- >=dev-python/docopt-0.6.2
- >=dev-python/setproctitle-1.1.10
- dev-python/setuptools
- >=dev-python/wheel-0.29.0
- dev-python/setuptools_scm
- dev-libs/libappindicator:3
- x11-libs/gtk+:3
- x11-libs/libnotify
-"
-RDEPEND="${DEPEND}"
-
-pkg_preinst(){
- gnome2_schemas_savelist
-}
-
-pkg_postinst(){
- gnome2_gconf_install
- gnome2_schemas_update
-}
-
-pkg_postrm(){
- gnome2_gconf_uninstall
- gnome2_schemas_update
-}
diff --git a/x11-misc/squeekboard/metadata.xml b/x11-misc/squeekboard/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/x11-misc/squeekboard/metadata.xml
+++ b/x11-misc/squeekboard/metadata.xml
@@ -1,8 +1,5 @@
-
- marco@scardovi.com
- Marco Scardovi
-
+
diff --git a/x11-plugins/purple-mm-sms/metadata.xml b/x11-plugins/purple-mm-sms/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/x11-plugins/purple-mm-sms/metadata.xml
+++ b/x11-plugins/purple-mm-sms/metadata.xml
@@ -1,8 +1,5 @@
-
- marco@scardovi.com
- Marco Scardovi
-
+
diff --git a/x11-terms/tabby-bin/metadata.xml b/x11-terms/tabby-bin/metadata.xml
index ca63cb8f9c..5860695c03 100644
--- a/x11-terms/tabby-bin/metadata.xml
+++ b/x11-terms/tabby-bin/metadata.xml
@@ -1,10 +1,7 @@
-
- marco@scardovi.com
- Marco Scardovi
-
+
Eugeny/terminus
scardracs/icons
diff --git a/x11-themes/sound-theme-librem5/metadata.xml b/x11-themes/sound-theme-librem5/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/x11-themes/sound-theme-librem5/metadata.xml
+++ b/x11-themes/sound-theme-librem5/metadata.xml
@@ -1,8 +1,5 @@
-
- marco@scardovi.com
- Marco Scardovi
-
+
diff --git a/x11-wm/phoc/metadata.xml b/x11-wm/phoc/metadata.xml
index 144c8091cf..b372191c79 100644
--- a/x11-wm/phoc/metadata.xml
+++ b/x11-wm/phoc/metadata.xml
@@ -1,8 +1,5 @@
-
- marco@scardovi.com
- Marco Scardovi
-
+