diff --git a/app-emulation/bottles/Manifest b/app-emulation/bottles/Manifest
new file mode 100644
index 00000000..bc833b7d
--- /dev/null
+++ b/app-emulation/bottles/Manifest
@@ -0,0 +1,4 @@
+DIST bottles-51.5.tar.gz 2168592 BLAKE2B 5aee4a6db1f066cfed10262e7af5ec8ec3416583d92095c69e5bc9c8f0c17f083c2eee44dedf79b2405f442e7433b58209cb1b73f47a95ed51aacb24115c54b1 SHA512 5d238d62053d2bdb6ba17cc0e2903b45c9c87f08b0d737264a4d1efa7e10ca9d77fc722333ae91ad4929a5b742a628692601dcc915d4553815d1361d1a0a110e
+EBUILD bottles-51.5.ebuild 3276 BLAKE2B bf7b7980a3f0703f37b6fc46a6294b1347c1ee21204be488b7b9486f1b22d7f7dee17a0f0aa68326f7b07ca111d9642b20f1cf3e658cd1ddde6b093b2a83ccaa SHA512 288c48cd366874d5a246e931d67b33a076f388ac7db94a0ce37ebfb8636c29b23fc4a78eee9bc6a58fc4ad1aac36f00c8989fedb64a73b7364bd03b44e4dfd39
+EBUILD bottles-9999.ebuild 3276 BLAKE2B bf7b7980a3f0703f37b6fc46a6294b1347c1ee21204be488b7b9486f1b22d7f7dee17a0f0aa68326f7b07ca111d9642b20f1cf3e658cd1ddde6b093b2a83ccaa SHA512 288c48cd366874d5a246e931d67b33a076f388ac7db94a0ce37ebfb8636c29b23fc4a78eee9bc6a58fc4ad1aac36f00c8989fedb64a73b7364bd03b44e4dfd39
+MISC metadata.xml 361 BLAKE2B 2e06ad1de23d0a780764bb124bec58dd093ba76d4d4e006355b1edf74b7c7f5f6e272fb6b48f3e787b6afc4037b0477d02b8892dd489370fa5296e3be6ba4d96 SHA512 cd61671bca61241c488f88996f2585c177759e762da1181b70816fc886b54d0d52b02af5421ed8f10f5ce0abc32d2b7de106efd48c39e466104483d379ecc637
diff --git a/app-emulation/bottles/bottles-51.5.ebuild b/app-emulation/bottles/bottles-51.5.ebuild
new file mode 100644
index 00000000..607ce25d
--- /dev/null
+++ b/app-emulation/bottles/bottles-51.5.ebuild
@@ -0,0 +1,120 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# todo patool, icoextract
+PYTHON_COMPAT=( python3_{9..11} )
+inherit gnome2-utils python-single-r1 meson xdg optfeature
+
+DESCRIPTION="Run Windows software and games on Linux"
+HOMEPAGE="https://usebottles.com/"
+
+if [[ "${PV}" == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/bottlesdevs/Bottles/"
+else
+ SRC_URI="https://github.com/bottlesdevs/Bottles/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/Bottles-${PV}"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# tests are quite pointless as they check static files and releases are tagged with them still failing
+RESTRICT="test"
+
+# Very annoying to figure out the deps
+# Script for getting python modules:
+# https://gitlab.com/Parona/my-scripts/-/blob/master/scripts/python_deps.sh
+# Runtime programs needed can be quickly found with:
+# grep -r "shutil.which"
+# But look at context to gauge if they are optional or not
+#
+# BDPEPEND dependencies can be thankfully gathered from the meson.build files
+# DEPEND are instrospection files which can be found as such
+# find . -name "*.blp" -exec grep -Eh "^using " {} + | sed 's/using \([A-Za-z]*\) \([0-9.]*\);/\1-\2.typelib/'
+# And in similar vein find runtime required introspection files, similar deal with getting typelib file as above
+# grep -r "gi.require_version
+
+# vkbasalt could be optional but vkbasalt-cli isnt
+# It could work without wine but(!) it still requires all the runtime dependencies for wine
+# so easier to depend on wine to get it for free
+
+DEPEND="
+ gui-libs/gtk:4[introspection]
+ gui-libs/libadwaita[introspection]
+"
+RDEPEND="
+ ${PYTHON_DEPS}
+ ${DEPEND}
+ app-arch/cabextract
+ app-arch/p7zip
+ gui-libs/gtksourceview[introspection]
+ media-gfx/imagemagick
+ >=sys-libs/glibc-2.32
+ virtual/wine
+ x11-apps/xdpyinfo
+ $(python_gen_cond_dep '
+ app-arch/patool[${PYTHON_USEDEP}]
+ dev-python/FVS[${PYTHON_USEDEP}]
+ dev-python/pygobject[${PYTHON_USEDEP}]
+ dev-python/icoextract[${PYTHON_USEDEP}]
+ dev-python/markdown[${PYTHON_USEDEP}]
+ dev-python/orjson[${PYTHON_USEDEP}]
+ dev-python/pathvalidate[${PYTHON_USEDEP}]
+ dev-python/pefile[${PYTHON_USEDEP}]
+ dev-python/pycurl[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/vkbasalt-cli[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ ')
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-util/blueprint-compiler
+ dev-libs/glib:2
+ sys-devel/gettext
+ test? (
+ dev-libs/appstream
+ dev-libs/glib
+ dev-util/desktop-file-utils
+ )
+"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_configure() {
+ if [[ "${PV}" == "9999" ]]; then
+ local emesonargs=(
+ -Ddevel=true
+ )
+ fi
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ python_optimize "${D}/usr/share/bottles/"
+ python_fix_shebang "${D}/usr/"
+}
+
+pkg_preinst() {
+ xdg_pkg_preinst
+ gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+ optfeature "gamemode support" games-util/gamemode
+ optfeature "gamescope support" games-util/gamescope
+ optfeature "vmtouch support" dev-utils/vmtouch
+ #optfeature "MangoHub support" games-util/mangohub
+ #optfeature "obs-vkcapture support" media-video/obs-vkcapture
+}
diff --git a/app-emulation/bottles/bottles-9999.ebuild b/app-emulation/bottles/bottles-9999.ebuild
new file mode 100644
index 00000000..607ce25d
--- /dev/null
+++ b/app-emulation/bottles/bottles-9999.ebuild
@@ -0,0 +1,120 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# todo patool, icoextract
+PYTHON_COMPAT=( python3_{9..11} )
+inherit gnome2-utils python-single-r1 meson xdg optfeature
+
+DESCRIPTION="Run Windows software and games on Linux"
+HOMEPAGE="https://usebottles.com/"
+
+if [[ "${PV}" == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/bottlesdevs/Bottles/"
+else
+ SRC_URI="https://github.com/bottlesdevs/Bottles/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/Bottles-${PV}"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# tests are quite pointless as they check static files and releases are tagged with them still failing
+RESTRICT="test"
+
+# Very annoying to figure out the deps
+# Script for getting python modules:
+# https://gitlab.com/Parona/my-scripts/-/blob/master/scripts/python_deps.sh
+# Runtime programs needed can be quickly found with:
+# grep -r "shutil.which"
+# But look at context to gauge if they are optional or not
+#
+# BDPEPEND dependencies can be thankfully gathered from the meson.build files
+# DEPEND are instrospection files which can be found as such
+# find . -name "*.blp" -exec grep -Eh "^using " {} + | sed 's/using \([A-Za-z]*\) \([0-9.]*\);/\1-\2.typelib/'
+# And in similar vein find runtime required introspection files, similar deal with getting typelib file as above
+# grep -r "gi.require_version
+
+# vkbasalt could be optional but vkbasalt-cli isnt
+# It could work without wine but(!) it still requires all the runtime dependencies for wine
+# so easier to depend on wine to get it for free
+
+DEPEND="
+ gui-libs/gtk:4[introspection]
+ gui-libs/libadwaita[introspection]
+"
+RDEPEND="
+ ${PYTHON_DEPS}
+ ${DEPEND}
+ app-arch/cabextract
+ app-arch/p7zip
+ gui-libs/gtksourceview[introspection]
+ media-gfx/imagemagick
+ >=sys-libs/glibc-2.32
+ virtual/wine
+ x11-apps/xdpyinfo
+ $(python_gen_cond_dep '
+ app-arch/patool[${PYTHON_USEDEP}]
+ dev-python/FVS[${PYTHON_USEDEP}]
+ dev-python/pygobject[${PYTHON_USEDEP}]
+ dev-python/icoextract[${PYTHON_USEDEP}]
+ dev-python/markdown[${PYTHON_USEDEP}]
+ dev-python/orjson[${PYTHON_USEDEP}]
+ dev-python/pathvalidate[${PYTHON_USEDEP}]
+ dev-python/pefile[${PYTHON_USEDEP}]
+ dev-python/pycurl[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/vkbasalt-cli[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ ')
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-util/blueprint-compiler
+ dev-libs/glib:2
+ sys-devel/gettext
+ test? (
+ dev-libs/appstream
+ dev-libs/glib
+ dev-util/desktop-file-utils
+ )
+"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_configure() {
+ if [[ "${PV}" == "9999" ]]; then
+ local emesonargs=(
+ -Ddevel=true
+ )
+ fi
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ python_optimize "${D}/usr/share/bottles/"
+ python_fix_shebang "${D}/usr/"
+}
+
+pkg_preinst() {
+ xdg_pkg_preinst
+ gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+ optfeature "gamemode support" games-util/gamemode
+ optfeature "gamescope support" games-util/gamescope
+ optfeature "vmtouch support" dev-utils/vmtouch
+ #optfeature "MangoHub support" games-util/mangohub
+ #optfeature "obs-vkcapture support" media-video/obs-vkcapture
+}
diff --git a/app-emulation/bottles/metadata.xml b/app-emulation/bottles/metadata.xml
new file mode 100644
index 00000000..2f01c3c8
--- /dev/null
+++ b/app-emulation/bottles/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ xgqt@protonmail.com
+ Maciej Barć
+
+
+ bottlesdevs/Bottles
+
+
diff --git a/app-emulation/fluxengine/Manifest b/app-emulation/fluxengine/Manifest
new file mode 100644
index 00000000..7fbd0d03
--- /dev/null
+++ b/app-emulation/fluxengine/Manifest
@@ -0,0 +1 @@
+EBUILD fluxengine-9999.ebuild 2005 BLAKE2B 9f39387bcf1ceb532ec02db8326393e64a86aff450169f4785691b9108e0fcad127d3fd99e1aca3fb14d9a282a05f96b4e91072fd6a969a110c6b310378604b5 SHA512 38e26183d1c5954d6459a863d0a7a98a43e7f1ab67ab3a442f9d348a3371d2abb4d359bfbebc08693f431c44b0639bb997f1ae7070b3fa83faae9101c1b7a1d2
diff --git a/app-emulation/fluxengine/fluxengine-9999.ebuild b/app-emulation/fluxengine/fluxengine-9999.ebuild
new file mode 100644
index 00000000..63adbb5e
--- /dev/null
+++ b/app-emulation/fluxengine/fluxengine-9999.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WX_GTK_VER="3.0-gtk3"
+
+inherit toolchain-funcs wxwidgets xdg udev desktop
+
+if [[ ${PV} = 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/davidgiven/fluxengine.git"
+else
+ #SRC_URI="http://debian.trikaliotis.net/opencbm/opencbm_${PV}-1.tar.gz"
+ #SRC_URI="http://www.trikaliotis.net/Download/opencbm-${PV}/opencbm-${PV}-source.tar.bz2"
+ SRC_URI="https://github.com/OpenCBM/OpenCBM/archive/v${PV//./_}.tar.gz -> opencbm-${PV}-source.tar.gz
+ https://github.com/OpenCBM/nibtools/archive/master.tar.gz -> nibtools-${PV}-source.tar.gz"
+ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+fi
+
+DESCRIPTION="The FluxEngine is a very cheap USB floppy disk interface capable of reading and writing exotic non-PC floppy disk formats"
+HOMEPAGE="https://github.com/davidgiven/fluxengine"
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc"
+DEPEND="dev-util/xxd
+ dev-lang/lua
+ dev-libs/protobuf
+ dev-libs/libfmt
+ dev-db/sqlite
+ sys-libs/zlib
+ sys-apps/systemd"
+
+S="${WORKDIR}"/fluxengine-${PV//./_}
+
+BUILD_TARGETS="all"
+
+#src_prepare() {
+# eapply_user
+#}
+
+src_compile() {
+ emake DESTDIR="${D}" CC="$(tc-getCC)" AR="$(tc-getAR)" CXX="$(tc-getCXX)" PREFIX="/usr"
+ #emake -j1 -f LINUX/Makefile CC="$(tc-getCC)" AR="$(tc-getAR)" LIBDIR="/usr/$(get_libdir)" all || die "make fail
+ #emake -j1 -f LINUX/Makefile CC="$(tc-getCC)" AR="$(tc-getAR)" LIBDIR="/usr/$(get_libdir)" opencbm || die "make fail"
+}
+
+src_install() {
+ #dodir lib/udev/rules.d
+ #dodir etc/opencbm.conf.d
+ #dodir usr/lib/opencbm
+ emake DESTDIR="${D}" PREFIX="/usr" install
+ #exeinto usr/lib/opencbm
+ #doexe opencbm/LINUX/plugin_helper_tools
+ #newexe debian/install_plugin.sh install_plugin
+ #insinto lib/udev/rules.d
+ #newins opencbm/sys/linux/45-opencbm-xa1541.rules 45-opencbm-xa1541.rules
+ #rm -rf "${D}"/var
+ newicon extras/icon.png ${PN}.png
+ make_desktop_entry ${PN}-gui "Flux Engine" ${PN}
+
+}
+
+pkg_postinst() {
+ udev_reload
+}
+
+pkg_postrm() {
+ udev_reload
+}
diff --git a/net-fs/mars-nwe/Manifest b/net-fs/mars-nwe/Manifest
index 15a74d15..9738d633 100644
--- a/net-fs/mars-nwe/Manifest
+++ b/net-fs/mars-nwe/Manifest
@@ -1,8 +1,7 @@
-AUX mars-nwe-syslog.patch 1929 BLAKE2B 12d00ad31fd87fb1d3d46068c42551566c7f4b5379c2930be468434b599748fdd47616095869b3dd61e3608b49e072c7bec3f6bd0c50be49bff0be4af41f6663 SHA512 ccbcd32116a310b363f08daac3ee46af9eacb5c0c4473c252ec9d8a5013cd26a70cfe813876ed1a9ec4a0ecb544bf423097476881559d75f48ea997350eaeab0
-AUX mars-nwe.initd 587 BLAKE2B c5d939ae6ffcc1dbe795ffd095e285aa14a28efd7738abe39e592a45e6d0a627bd490554c01c59fd9de0e9347517b9f012861751d64576b4107f79b1bb3c03b0 SHA512 a1df3ca9ec16f698c71dd12696610fc0a4f11560f03d3c1dcc557f264458fcedc74bb509b213b3659a4ae985c47782216c8923305ce3c2e54db53163f884867a
-AUX mars-nwe.service 197 BLAKE2B 28aa60c545fd4e00800df3f8b85736b2150039bab23da275f1145cb371eb68babfb3bb639607f81a8c23f3efa99929ed6d0d2a8f79b7a95ec9a2097505e9b287 SHA512 c76956fb78fa71b94f228e41406090163d4358342267e716aa90cb6d739f5267028673bef25340c7a1597bac80a7d793e8891a173880853c3c632e59402defa9
-AUX mars-nwe.tmpfilesd 36 BLAKE2B 2ed4cac90b4645cc583537a5fa26b6ff22738ba093d19ed92e6b0c6ca24113a3601ef3a8d1590ccd1a547c0d823ee75ff36dc2258798febf83aeb87521b2c93c SHA512 d2deb761f0b859a317798a46c512ef431bc71c55dc903980f1a10ad19e86f6e76cc7a37b2b38122e8c362c6fd182d247caa965599025383144c0a373f67f922b
-DIST mars_nwe-0.99.pl23.tar.bz2 369194 BLAKE2B 5fd2b54a4d9bf8cac13d60c1a3b0dbd54af00f506e1552a48dbc7772a52319fe688684b7dbb68a36d5e39b4363d13ec8924df357d0b9e27b42f74cb7fe94a544 SHA512 24cf78ea0091bc9414f27ac77cfa535fe611badc013f343766b88e12cc5afc2e1ae595d423ea4ec7bfb4255dd8a3f81247dcfab515044152861ea2f46380fd2d
-EBUILD mars-nwe-0.99_p23.ebuild 976 BLAKE2B 5495ccc25e9d46831cbdf0a6679bd579582e28368777877a03a062f8b502826701901f276a98bd6babf25839e414e836d210bf7abc968abd9f9bc652b081a4bf SHA512 a0bc4c435d52b3c40cecbd9621082a9f93a55b0cc27067759386908e54d2f5dbd98107fa2ce3c1d7ff94caed2bef458b91311f1569772a5413d877fbd136a4cd
+AUX mars-nwe.initd 572 BLAKE2B f86550c9cdf56eb3384873ea053a2f0906aabe5bbcfc12350e5d9aab1c8410e224cb434c22b6550ea4a6b4e0672d469c60184443f4edeb23b45cd6bd5c477691 SHA512 0228dbeb34e21cbcd74fc3ce2fefb17de2c93569e977890e8ab0c8b7df5bcc9621558b4da9a673ad96b5b889098343b082d5964e700ea80c765b351ff15fabf5
+AUX mars-nwe.service 193 BLAKE2B 3c92f905bd823f65d36ba0d71bc2796b036d6b588e514c4faa288baba47d347bf85db02f2b04f35b5454f08df9641ea1148fa72f926901fddaa89db21f861a2b SHA512 6d802c9d52e7f42e4d53e28d565f7b76d5358f8b48e5639fdafe59b56c5c274eeeef2d23d40a92fc99155e2250395642b5d9db098a0425493cb3b32456377c43
+AUX mars-nwe.tmpfilesd 32 BLAKE2B 17c464796d9167d4ed54fb33f49050473da5b6613e6d8e10663d44067d98bf6fed9ac68dcae4c2e49faa4e3581e2045e1e6b216de2fcfc15dce0d3d5cf143542 SHA512 6bb08d4c373ed950c159a5adcf33fe75ecfb2445aa1046d488f3c98e1378520be8ab633eed627f6e706b003238482e2c30063ddfacf253119e73893ff22402e3
+DIST mars_nwe-0.99.pl24.tar.bz2 387320 BLAKE2B 7e7fb4fa563f5fc08558f2610de3ca8798a5fed3437cda05f415e7a04f3f0b8cbd986c5cb5a63b693cf34f1fb33ccc4c23a6833e61a305278df05f3408bf1c00 SHA512 7461dfabd97dd63830260e537daeab0d859bcffbf302792b51b966da473cbb6037a9cc884a8604040ec6f098a5391619490bc1b7a9de825b7ea1eb81c60c16e0
+EBUILD mars-nwe-0.99_p24.ebuild 1088 BLAKE2B 6e93b600f3893f43f388834e5b55c9a2b7e2a7f8c7dbe4acfe41648511b36a21c3c7b0216a29e5d1f2336f335a7beef6d0a49d7c42162729c516271c9727cdc8 SHA512 9a17a4e3f3b93106d3c367ffa7fb11f27b7fa3f8f139aabbf58fcda10524d5705f603587f32d0686b969c193d41dda08b9edb4eb1b0b2f58a2a35085225e2391
MISC ChangeLog 1018 BLAKE2B 676fd6ef267c93d1c3c5c5fad0663b9fcb288b359f1d1b8c098a953d4c270b040ecd44cbcfd3b159aa60518650e0ca9c55416a8a3671a4fb8e952cf918113047 SHA512 a11d544772c9054211d5efbdac8822966b836091a32f626d6327fe0ca587ad3f2e3b0609a79040e4a2a1f66afb62daa360789d16520e9fd6fd1b08e03366b9f1
MISC metadata.xml 408 BLAKE2B 66a3e2838d5c5f95c7463733cd13b1230ef3ca005ec0c5dac797561be30f950da98dfa41eeb4d43cf97500c9a2e0d04c57b0b084d60107072a988dd7c4d16ded SHA512 9cac3e4a07c425e87274de776e03d243e462341168235cd3991ef4706aa1a902cf6591ae8e965b9c4ed370fc2ebef3ca805a9c761d05c4b994ae8667198b267c
diff --git a/net-fs/mars-nwe/files/mars-nwe-syslog.patch b/net-fs/mars-nwe/files/mars-nwe-syslog.patch
deleted file mode 100644
index 4c54b72c..00000000
--- a/net-fs/mars-nwe/files/mars-nwe-syslog.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- mars_nwe-0.99.pl23/src/tools.c.orig 2013-11-05 11:16:48.000000000 +0100
-+++ mars_nwe-0.99.pl23/src/tools.c 2022-11-03 12:39:31.800751433 +0100
-@@ -21,27 +21,6 @@
- #include
- #include
-
--#if 0
--#ifndef LINUX
-- extern int _sys_nerr;
-- extern char *_sys_errlist[];
--#else
--# ifndef __USE_GNU
--# define _sys_nerr sys_nerr
--# define _sys_errlist sys_errlist
--# endif
--#endif
--#else
--# ifndef __USE_GNU
--# ifdef FREEBSD
--# define _sys_nerr sys_nerr
--# define _sys_errlist sys_errlist
--# else
--extern int _sys_nerr;
--extern char *_sys_errlist[];
--# endif
--# endif
--#endif
-
- int nw_debug=0;
- uint32 debug_mask=0; /* special debug masks */
-@@ -182,8 +161,7 @@
- if (mode & 0x10) {
- int l=sprintf(pb, ", errno=%d", errnum);
- pb+=l;
-- if (errnum > 0 && errnum < _sys_nerr)
-- l=sprintf(pb, " (%s)", _sys_errlist[errnum]);
-+ l=sprintf(pb, " (%s)", strerror(errnum));
- }
- if (!(mode & 2)) {
- char identstr[200];
-@@ -208,9 +186,8 @@
- va_end(ap);
- }
- if (mode & 0x10) {
-- fprintf(logfile, ", errno=%d", errnum);
-- if (errnum > 0 && errnum < _sys_nerr)
-- fprintf(logfile, " (%s)", _sys_errlist[errnum]);
-+ fprintf(logfile, ", errno=%d", strerror(errnum));
-+ fprintf(logfile, " (%s)", strerror(errnum));
- }
- if (!(mode & 2))
- fprintf(logfile, "\n");
-@@ -236,11 +213,11 @@
- errnum = -1;
- mode -= 10;
- }
-- if (errnum >= 0 && errnum < _sys_nerr) errstr = _sys_errlist[errnum];
-- else if (errnum > -1)
-- sprintf(errbuf, "errno=%d", errnum);
-- else
-- errbuf[0] = '\0';
-+// if (errnum >= 0 && errnum < _sys_nerr) errstr = _sys_errlist[errnum];
-+// else if (errnum > -1)
-+ sprintf(errbuf, "errno=%d", strerror(errnum));
-+// else
-+// errbuf[0] = '\0';
-
- if (use_syslog) {
- int prio=(mode) ? LOG_CRIT : LOG_ERR;
diff --git a/net-fs/mars-nwe/files/mars-nwe.initd b/net-fs/mars-nwe/files/mars-nwe.initd
index 5ceedcba..9fc38fb0 100644
--- a/net-fs/mars-nwe/files/mars-nwe.initd
+++ b/net-fs/mars-nwe/files/mars-nwe.initd
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -8,18 +8,18 @@ depend() {
}
mkdir_marsnwedirs() {
- [ -d /var/run/mars_nwe ] || mkdir -p /var/run/mars_nwe
+ [ -d /run/mars_nwe ] || mkdir -p /run/mars_nwe
}
start() {
ebegin "Starting Martin Stovers NetWare-Emulator"
mkdir_marsnwedirs
- eval start-stop-daemon --start --quiet --exec /usr/sbin/nwserv --pidfile /var/run/mars_nwe/nwserv.pid
+ eval start-stop-daemon --start --quiet --exec /usr/sbin/nwserv --pidfile /run/mars_nwe/nwserv.pid
eend $?
}
stop() {
ebegin "Stopping Martin Stovers NetWare-Emulator"
- start-stop-daemon --stop --quiet --pidfile /var/run/mars_nwe/nwserv.pid
+ start-stop-daemon --stop --quiet --pidfile /run/mars_nwe/nwserv.pid
eend $?
}
diff --git a/net-fs/mars-nwe/files/mars-nwe.service b/net-fs/mars-nwe/files/mars-nwe.service
index c8cfef35..3d81f3fe 100644
--- a/net-fs/mars-nwe/files/mars-nwe.service
+++ b/net-fs/mars-nwe/files/mars-nwe.service
@@ -4,7 +4,7 @@ After=network.target
[Service]
Type=forking
-PIDFile=/var/run/mars_nwe/nwserv.pid
+PIDFile=/run/mars_nwe/nwserv.pid
ExecStart=/usr/sbin/nwserv
[Install]
diff --git a/net-fs/mars-nwe/files/mars-nwe.tmpfilesd b/net-fs/mars-nwe/files/mars-nwe.tmpfilesd
index 3c189a4b..abf52772 100644
--- a/net-fs/mars-nwe/files/mars-nwe.tmpfilesd
+++ b/net-fs/mars-nwe/files/mars-nwe.tmpfilesd
@@ -1 +1 @@
-d /var/run/mars_nwe 710 root root
+d /run/mars_nwe 710 root root
diff --git a/net-fs/mars-nwe/mars-nwe-0.99_p23.ebuild b/net-fs/mars-nwe/mars-nwe-0.99_p24.ebuild
similarity index 65%
rename from net-fs/mars-nwe/mars-nwe-0.99_p23.ebuild
rename to net-fs/mars-nwe/mars-nwe-0.99_p24.ebuild
index 6d4cebc4..a7de0dcb 100644
--- a/net-fs/mars-nwe/mars-nwe-0.99_p23.ebuild
+++ b/net-fs/mars-nwe/mars-nwe-0.99_p24.ebuild
@@ -6,11 +6,11 @@ EAPI=7
MY_PV=${PV/_p/.pl}
-inherit systemd cmake
+inherit systemd tmpfiles cmake
DESCRIPTION="MARtin Stovers NetWare-Emulator"
HOMEPAGE="http://www.compu-art.de/mars_nwe/"
-SRC_URI="http://ftp.disconnected-by-peer.at/ncpfs/mars_nwe-${MY_PV}.tar.bz2"
+SRC_URI="https://ftp.disconnected-by-peer.at/ncpfs/mars_nwe-${MY_PV}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
@@ -19,18 +19,20 @@ IUSE=""
RDEPEND="sys-libs/glibc
sys-libs/gdbm
+ virtual/libcrypt
|| ( net-misc/ipx-utils net-fs/ncpfs )"
DEPEND="${RDEPEND}"
S="${WORKDIR}/mars_nwe-${MY_PV}"
-PATCHES=(
- "${FILESDIR}"/mars-nwe-syslog.patch
-)
+#PATCHES=(
+# "${FILESDIR}"/mars-nwe-syslog.patch
+#)
src_configure() {
local mycmakeargs=(
- "-DCMAKE_INSTALL_SYSCONFDIR=/etc" )
+ "-DCMAKE_INSTALL_SYSCONFDIR=/etc"
+ "-DMARS_NWE_PID_DIR=/run/mars_nwe" )
cmake_src_configure
}
@@ -45,6 +47,9 @@ src_install() {
newinitd "${FILESDIR}"/mars-nwe.initd mars-nwe
systemd_dounit "${FILESDIR}"/mars-nwe.service
- systemd_newtmpfilesd "${FILESDIR}"/mars-nwe.tmpfilesd mars-nwe.conf
+ newtmpfiles "${FILESDIR}"/mars-nwe.tmpfilesd mars-nwe.conf
}
+pkg_postinst() {
+ tmpfiles_process mars-nwe.conf
+}
\ No newline at end of file
diff --git a/net-im/teams-for-linux/Manifest b/net-im/teams-for-linux/Manifest
index f00ff318..d5856d69 100644
--- a/net-im/teams-for-linux/Manifest
+++ b/net-im/teams-for-linux/Manifest
@@ -1,2 +1,2 @@
-DIST teams-for-linux_1.1.0_amd64.deb 71616524 BLAKE2B 018c6762d36dd59227b4c7b017b097433047855756ef89bee7a97590c8ac2bc7a9d127507b7e741d490b817f9927e41a900da70b3cc663548fe9c9abd5283f64 SHA512 7bddcc523209f02d02bb4358bc1ecdc0be14a8e21ad30adecaad0335ef17da31c221753c9d28d4bf1dc0f458cb1d867fe91162af9b421770b44508e136af876e
-EBUILD teams-for-linux-1.1.0.ebuild 3387 BLAKE2B 9b228a9415840d9af66c04ed2b5ab574750352a4046e7177c7b5f5e2e98a1cc844359bf9eb42340902b70b709c00e8b073c0e2e87deac8197de11915cd442066 SHA512 e31460ec0cf447d6044ebbe4e9e74af7d412f550d6598b406d3524c1f3158f57e91a3f936e41a3cb03a96e7f26c2a626215cb064671d32afb4abc638255c5128
+DIST teams-for-linux_1.1.8_amd64.deb 71405804 BLAKE2B b6d95bd2ed786381153433a3420c005cdb7234f829a7b1739174907e7a44ce1d1e11240202cc77a9b9b7a382476472e1f8cbf938eb22517f6af5a05383197b54 SHA512 f3ac45561e4a1ebd8b9487d1e0461d94181a2c31a74c125c44e9642331991e2aae0568406eabd7643490cc0c75034d3556250df3e160076404c20d6576cd82ff
+EBUILD teams-for-linux-1.1.8.ebuild 3387 BLAKE2B 9b228a9415840d9af66c04ed2b5ab574750352a4046e7177c7b5f5e2e98a1cc844359bf9eb42340902b70b709c00e8b073c0e2e87deac8197de11915cd442066 SHA512 e31460ec0cf447d6044ebbe4e9e74af7d412f550d6598b406d3524c1f3158f57e91a3f936e41a3cb03a96e7f26c2a626215cb064671d32afb4abc638255c5128
diff --git a/net-im/teams-for-linux/teams-for-linux-1.1.0.ebuild b/net-im/teams-for-linux/teams-for-linux-1.1.8.ebuild
similarity index 100%
rename from net-im/teams-for-linux/teams-for-linux-1.1.0.ebuild
rename to net-im/teams-for-linux/teams-for-linux-1.1.8.ebuild
diff --git a/net-misc/rasclient/Manifest b/net-misc/rasclient/Manifest
index 8e50e157..cc2a32c9 100644
--- a/net-misc/rasclient/Manifest
+++ b/net-misc/rasclient/Manifest
@@ -1,11 +1,14 @@
DIST RASClient-19.0.23304_x86_64.tar.bz2 28644903 BLAKE2B 41f77a59774548601deb181570ee679269d8d540cfaac9598cdd39126b256778e50d71393d4deac44720efb04898f6cd9d0e14c29c0f0e1e3c84e44f9a58dfff SHA512 164380b6ec4627d1be85e798b71c3e4b865163eef65384d6dad46c03ba849ea5faf80ab53f35fd40b8d598a04ea9c5d7ebbde48af7c9559ccb26889fb8d7abad
DIST RASClient-19.1.23468_x86_64.tar.bz2 28745160 BLAKE2B 4ecb72d35628c6bfb73253d2382b2979f1cb5f28ed9a1abca26f2a9d88f7d0e576f7becec90535827c042dccfc782b8d70042913cd029ac3fcfca521d79e2e2d SHA512 0d00bcf026e0e663b79043e08949ca64442e114d0f31a3c984dd4be91c1b908f906bab47edae124d83bf7a1c46961b840fcdba66490fa46259ee8c8f29504b10
DIST RASClient-19.1.23476_x86_64.tar.bz2 28748749 BLAKE2B cb8c5f55e1677447fe61976748058fd37f8c60eaef83dbf6d68831d9f629a0fa5eb9f82de1348f306dfbfa9e2955be463c0b23b03b1ab24a865d47d34d40cf57 SHA512 e771963f4064b62417614462e1d30dd900cfa85b0da8a0020c8360c60f9d5ca1b506796444b894173b71e67b9889a93915b2d9c3e28ce8e57ed1c82db0e5eafe
+DIST RASClient-19.2.23906_x86_64.tar.bz2 28839787 BLAKE2B c82a527ba9c07ad79c638523a6a67ff5e8acc2264ce25bfd1ef7f30ff6ab7be0c4f3f399f463835c61368a3fab007d1d210f000a490aac064ca089ae457d9208 SHA512 8113b864ad74e569feaed4b76039df9709b5641c253cdf4f3c47243d8f47a6aa762b44020396b5ace66e5aa1a96a482a78a2aab97ca4cfafea10e09a0c9e7911
DIST RASClient-sso-19.0.23304_x86_64.tar.bz2 9312 BLAKE2B 77c696b40d76e85eeb3c6efa5c39348109ddee090aa63512fcd716c2c5d7933b40af4833c350cb239ef58380bc7bd54a78bfe54d2b3699c019940cc150b19a54 SHA512 24b016b16c768937505978058feea797ed99298c275c6339e978c868c4c329963eda786e132848350b5ff88fba0d6c640aa0a40daff151d6c430aec12cebe1cf
DIST RASClient-sso-19.1.23468_x86_64.tar.bz2 9305 BLAKE2B 354bec4e6b18bf78e4038756f7722dc0279760ad71d1530fc92dea47be17ae88698f1553c2cf4a53e39fa674f83af552b8b2d3d7a7c371f24a45908716d1b684 SHA512 4178de5bb068f9c0fa1c6fcc40711f28f7a285b834fa9102282e037979b563b79d255ad1b3a02053abd98aed53b137669ea96e356ea8871be94119ed2167ff68
DIST RASClient-sso-19.1.23476_x86_64.tar.bz2 9311 BLAKE2B 710c6e7435d6aefd1c224e7a86ce1d92da3cf056378ea8a76f5c8a826763ee8e7cdcd397f9071eb8533cbe272b2e6cf63dffcf11dacda1b1d29ae723e4588fd2 SHA512 52c44d290de4c8650dc09b38c38e2f84a6d7d8e7d55c9415e5e1d8adbb6b9938e31c13b40952b70434539358a8ec73a9121881bd26860e6554719bfd5cc4f3e9
+DIST RASClient-sso-19.2.23906_x86_64.tar.bz2 9304 BLAKE2B c370711fde4a679bb87b8b244ea5f6052c8bc2b0c30ff50e1e1d42eec9d0bb0dea6eb8f2998cc27ace324b17ee1e66df4cb7eb5a280d7afc55dd8a31a31494e3 SHA512 96b2304ff5f3da9d0077d1c7b1e60f01d99d6d662128c8fb5dc46dd3b70fb156bbf30c932cdbf385ad8f25e1b09392b2a34736e023b3f3e7cc6ed23d2d700936
EBUILD rasclient-19.0.0.23304.ebuild 2093 BLAKE2B 57054fd2fd385169a707ba2df4ca20f8be1b71ca668ec1b4cb3a8cb478bba3157460218cfe354f473e9cbaf13290012e5b3c38ecdb44752557f2db5b88481c1e SHA512 d22aeb4ce7e88505faa5e314b2a7f317bcb8315b6aefcd48b43dd6df51093008b19960926d783ba131e60a6952be2705f75bca1a658c5fd69f0c8c7f0b318335
EBUILD rasclient-19.1.0.23468.ebuild 2093 BLAKE2B 57054fd2fd385169a707ba2df4ca20f8be1b71ca668ec1b4cb3a8cb478bba3157460218cfe354f473e9cbaf13290012e5b3c38ecdb44752557f2db5b88481c1e SHA512 d22aeb4ce7e88505faa5e314b2a7f317bcb8315b6aefcd48b43dd6df51093008b19960926d783ba131e60a6952be2705f75bca1a658c5fd69f0c8c7f0b318335
EBUILD rasclient-19.1.1.23476.ebuild 2093 BLAKE2B 57054fd2fd385169a707ba2df4ca20f8be1b71ca668ec1b4cb3a8cb478bba3157460218cfe354f473e9cbaf13290012e5b3c38ecdb44752557f2db5b88481c1e SHA512 d22aeb4ce7e88505faa5e314b2a7f317bcb8315b6aefcd48b43dd6df51093008b19960926d783ba131e60a6952be2705f75bca1a658c5fd69f0c8c7f0b318335
+EBUILD rasclient-19.2.0.23906.ebuild 2093 BLAKE2B 57054fd2fd385169a707ba2df4ca20f8be1b71ca668ec1b4cb3a8cb478bba3157460218cfe354f473e9cbaf13290012e5b3c38ecdb44752557f2db5b88481c1e SHA512 d22aeb4ce7e88505faa5e314b2a7f317bcb8315b6aefcd48b43dd6df51093008b19960926d783ba131e60a6952be2705f75bca1a658c5fd69f0c8c7f0b318335
MISC ChangeLog 385 BLAKE2B ebe7cc81e97a7c49bd6dc63e83c4701deb3fa3cc665ae2c0c231e7d4dc79ce3a490e325dd57f962fa74b097fa3fb076ebafd6b0a3fc57d985fe6e16fc4cfc7a5 SHA512 eefdb08d4f09532d35752696b1ac758520ae01f5dca8f44fc63dbd1c7cfb3d83f7f03a32db69c051517ac36b16b9298727fc95d85b188ea336760652fb92305f
MISC metadata.xml 408 BLAKE2B 66a3e2838d5c5f95c7463733cd13b1230ef3ca005ec0c5dac797561be30f950da98dfa41eeb4d43cf97500c9a2e0d04c57b0b084d60107072a988dd7c4d16ded SHA512 9cac3e4a07c425e87274de776e03d243e462341168235cd3991ef4706aa1a902cf6591ae8e965b9c4ed370fc2ebef3ca805a9c761d05c4b994ae8667198b267c
diff --git a/net-misc/remotedesktopmanager/Manifest b/net-misc/remotedesktopmanager/Manifest
index 957dcd7d..6a24e263 100644
--- a/net-misc/remotedesktopmanager/Manifest
+++ b/net-misc/remotedesktopmanager/Manifest
@@ -1,4 +1,4 @@
-DIST RemoteDesktopManager_2023.1.0.6_amd64.deb 176135684 BLAKE2B d48380fd843fd3419fb304389a2776b9b70886f86ee2dd5cf0c7095feae01a8406faa2ac9cec8b49e8c2094b6d935dadfac52c23f9082e12be1873043e32b940 SHA512 b1efa3be6729d3ee40cd6a606816cff6d973d2322a7874eb27fb3e7305322363691f69bc4cf202e7db0bba1ced93323ec59fef9a84e5542888292db4d8799ba2
-EBUILD remotedesktopmanager-2023.1.0.6.ebuild 1255 BLAKE2B c60bd29885c0d26c43315aa54fe00f721c86364ed3f8e061dd9a3fe040680c6b3f252262ea209cb2e32221e630e74bc910e4308a1eaaa6c82e17d0bb3d45024b SHA512 4ca7cdfdfcea791a890b182f1e1460e20b6cc5c76a5cf165b43df675d77722123aa03c9ff7b544665f7cb98478c307077a114cdab6ed3e8f09a754231fa2eb58
+DIST RemoteDesktopManager_2023.1.1.3_amd64.deb 185717760 BLAKE2B 74bf90af282eef954c910662abdd4d198de3a7929268399ed1557a2dbb301c7c8722501e448760ef9f3c0f7941c96bd1c1a81b46068d1bea6de2572859c90839 SHA512 b439d37a6526fbf40c37897df247a7c799f3c0b8decbd933b7ffa6b724af2752bb6ef6153f19d4eb199a0ff0f981114ef3060525956839ac0b8b1b4e35fea37a
+EBUILD remotedesktopmanager-2023.1.1.3.ebuild 1255 BLAKE2B c60bd29885c0d26c43315aa54fe00f721c86364ed3f8e061dd9a3fe040680c6b3f252262ea209cb2e32221e630e74bc910e4308a1eaaa6c82e17d0bb3d45024b SHA512 4ca7cdfdfcea791a890b182f1e1460e20b6cc5c76a5cf165b43df675d77722123aa03c9ff7b544665f7cb98478c307077a114cdab6ed3e8f09a754231fa2eb58
MISC ChangeLog 889 BLAKE2B 216bbbfe9b264ef06f5b56748af1ea7366fa49f2406604264b7d22ce8f464ffd7491a57912d7cf1be7d3dc030578960acca895236d6e06fd017f02a9138f0b7f SHA512 09aa97933a9709827b6e3c01ce8a3829cb3d494f7fdac570faa30da6fac440c752391d8dcaf7d03c5cd1163686e8921c1bf4ad75827e4b8df05bbcde03548488
MISC metadata.xml 408 BLAKE2B 66a3e2838d5c5f95c7463733cd13b1230ef3ca005ec0c5dac797561be30f950da98dfa41eeb4d43cf97500c9a2e0d04c57b0b084d60107072a988dd7c4d16ded SHA512 9cac3e4a07c425e87274de776e03d243e462341168235cd3991ef4706aa1a902cf6591ae8e965b9c4ed370fc2ebef3ca805a9c761d05c4b994ae8667198b267c
diff --git a/net-misc/remotedesktopmanager/remotedesktopmanager-2023.1.0.6.ebuild b/net-misc/remotedesktopmanager/remotedesktopmanager-2023.1.1.3.ebuild
similarity index 100%
rename from net-misc/remotedesktopmanager/remotedesktopmanager-2023.1.0.6.ebuild
rename to net-misc/remotedesktopmanager/remotedesktopmanager-2023.1.1.3.ebuild