5 files changed, 19 insertions, 117 deletions
diff --git a/x11-misc/xosview/Manifest b/x11-misc/xosview/Manifest
index 4cb2050ba588..5197d620a901 100644
--- a/x11-misc/xosview/Manifest
+++ b/x11-misc/xosview/Manifest
@@ -1,3 +1 @@
-DIST xosview-1.20.tar.gz 146373 BLAKE2B 7d53b5f2f8ce463917a1cfa65eedb60c835c6d530a19ede6bba6bfe295a01582861ca3fb7513b9a8590d9fe5111779a38db8723a2e38c911f002bce88bfc95f6 SHA512 25cd6a8cdaaff9121f0e8de7a1799d4c2706c5eb1111f3b3f8427b16e45a333fb4c675a1dec2ef6b40773e83124ff27eacc82f2b9eb6c836855930cbbf08957a
-DIST xosview-1.22.tar.gz 146459 BLAKE2B 7f4920b5b5a765f574694ab64e1d34ad6dbc33893cb816bb73119b4f72b7d23900528cb0db9302b24d20d7b8ce1738ce2d00be572c9fd4b391724f277afb02d5 SHA512 9bf37f557d9c07a300f6f9c21e197d25d4c5a4bb6e67b40af9c44a3159ea5010d7ba5bf427a9cec9729fa423da132a1364d0ac7027e9bc9bcd33f490d9e8282a
 DIST xosview-1.23.tar.gz 146299 BLAKE2B ba336ac152ac6c44bd51c84c160d7c1b565fe23c17aa89db36be7325f4f1caa1ab84a1ad386041841a0aacb62208fb5d59f5dd7a9d2bf071c76dff2901eb2c60 SHA512 10a25f644ec3d896071990117c6d80e553a17baf64809f11bc778652dca1498f81c333ac0f21a809ef617d7e6cbe65afaa14d5bc96908958d8f997234e660ba1
diff --git a/x11-misc/xosview/files/xosview-1.23-musl.patch b/x11-misc/xosview/files/xosview-1.23-musl.patch
new file mode 100644
index 000000000000..a2879f0b957f
--- /dev/null
+++ b/x11-misc/xosview/files/xosview-1.23-musl.patch
@@ -0,0 +1,14 @@
+Musl does not have sys/perm.h. Luckily, sys/io.h has the required
+definitions both for musl and glibc.
+
+diff -ruN xosview-1.23.orig/linux/serialmeter.cc xosview-1.23/linux/serialmeter.cc
+--- xosview-1.23.orig/linux/serialmeter.cc	2020-07-11 14:10:34.000000000 +0200
++++ xosview-1.23/linux/serialmeter.cc	2023-05-05 22:13:19.863489393 +0200
+@@ -25,7 +25,6 @@
+  */
+ #if defined(__i386__) || defined(__ia64__) || defined(__amd64__)
+ #include <sys/io.h>
+-#include <sys/perm.h>
+ #define HAVE_IOPERM
+ #endif
+ 
diff --git a/x11-misc/xosview/xosview-1.20-r1.ebuild b/x11-misc/xosview/xosview-1.20-r1.ebuild
deleted file mode 100644
index 3ecc36b3b663..000000000000
--- a/x11-misc/xosview/xosview-1.20-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="X11 operating system viewer"
-HOMEPAGE="http://www.pogo.org.uk/~mark/xosview/"
-SRC_URI="http://www.pogo.org.uk/~mark/${PN}/releases/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="suid"
-
-COMMON_DEPS="x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXt"
-RDEPEND="${COMMON_DEPS}
-	media-fonts/font-misc-misc"
-DEPEND="${COMMON_DEPS}
-	x11-base/xorg-proto"
-
-DOCS=( CHANGES README.linux TODO )
-
-src_prepare() {
-	default
-
-	sed -i -e 's:lib/X11/app:share/X11/app:g' -i ${PN}.1 || die
-	sed -i -e "s:Git:${PV}:g" ${PN}.cc || die
-	tc-export CXX
-}
-
-src_compile() {
-	emake OPTFLAGS=''
-}
-
-src_install() {
-	emake PREFIX="${D%/}/usr" install
-	use suid && fperms 4755 /usr/bin/${PN}
-	insinto /usr/share/X11/app-defaults
-	newins Xdefaults XOsview
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	if ! use suid ; then
-		ewarn "If you want to use serial meters ${PN} needs to be executed as root."
-		ewarn "Please see ${EPREFIX}/usr/share/doc/${PF}/README.linux for details."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/x11-misc/xosview/xosview-1.22.ebuild b/x11-misc/xosview/xosview-1.22.ebuild
deleted file mode 100644
index e47a5770c69b..000000000000
--- a/x11-misc/xosview/xosview-1.22.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="X11 operating system viewer"
-HOMEPAGE="http://www.pogo.org.uk/~mark/xosview/"
-SRC_URI="http://www.pogo.org.uk/~mark/${PN}/releases/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="suid"
-
-COMMON_DEPS="x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXt"
-RDEPEND="${COMMON_DEPS}
-	media-fonts/font-misc-misc"
-DEPEND="${COMMON_DEPS}
-	x11-base/xorg-proto"
-
-DOCS=( CHANGES README.linux TODO )
-
-src_prepare() {
-	default
-
-	sed -i -e 's:lib/X11/app:share/X11/app:g' -i ${PN}.1 || die
-	sed -i -e "s:Git:${PV}:g" ${PN}.cc || die
-	tc-export CXX
-}
-
-src_compile() {
-	emake OPTFLAGS=''
-}
-
-src_install() {
-	emake PREFIX="${D}/usr" install
-	use suid && fperms 4755 /usr/bin/${PN}
-	insinto /usr/share/X11/app-defaults
-	newins Xdefaults XOsview
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	if ! use suid ; then
-		ewarn "If you want to use serial meters ${PN} needs to be executed as root."
-		ewarn "Please see ${EPREFIX}/usr/share/doc/${PF}/README.linux for details."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/x11-misc/xosview/xosview-1.23.ebuild b/x11-misc/xosview/xosview-1.23.ebuild
index e47a5770c69b..0de8636ff4a8 100644
--- a/x11-misc/xosview/xosview-1.23.ebuild
+++ b/x11-misc/xosview/xosview-1.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,6 +24,10 @@ DEPEND="${COMMON_DEPS}
 
 DOCS=( CHANGES README.linux TODO )
 
+PATCHES=(
+	"${FILESDIR}/${P}-musl.patch"
+)
+
 src_prepare() {
 	default