6 files changed, 20 insertions, 22 deletions
diff --git a/app-admin/flexlm/Manifest b/app-admin/flexlm/Manifest
index df85514a..46b48a46 100644
--- a/app-admin/flexlm/Manifest
+++ b/app-admin/flexlm/Manifest
@@ -1,5 +1,5 @@
-DIST flexusr.pdf 763798 SHA512 93e34e7940a678f6f97854393de8c07a15c0ee6b2efec5edc792f25b1910990309fa75a59e8f8dc957d9bc4af3b9758d4b7d316c5d5b5e8ce4e4893579b84a10
-DIST lmgrd-amd64.Z 327568 SHA512 382c581395acd39bb2d05a09073b4f70efa7699e3c05e486d4cf6ba22faef13ff37ba524acd4bda90e7f56bc06dcf7bbe5ed7c2363aef4fde9cc6f875bbb92aa
-DIST lmgrd-x86.Z 318617 SHA512 5030de6eb91dc16aaa3d22b8d14fe892b10b1a5573073c8daf498ab8998de5692acb8442f186cfc11e93b178aff8c0cdbcb4ba82b9cd197f96bad19eb7efb993
-DIST lmutil-amd64.Z 331103 SHA512 9ce2613bf7f8c28e5c6316a111ef310b2e79828f8c7299199bf336c531ca011f04b8cd9c294489547eeb29e25b3393df3175875ee01239ece8b268300ed51116
-DIST lmutil-x86.Z 324583 SHA512 6b213da65c59ecef15409144fa97c0a16bb96690acc09bd3919c0db8e922c7e63def915a59e18b017705bc5d91fb77227612ea1eabdb9dc5a038a4a264489acc
+DIST flexusr.pdf 763798 BLAKE2B bccae64e050709f6b3b129852c7167dcf42491786d8e77997ae547acf4ce956ba9ff62457bc593984bd99b8c321528f51e3aef8016427a3af367fc5fe156d9c8 SHA512 93e34e7940a678f6f97854393de8c07a15c0ee6b2efec5edc792f25b1910990309fa75a59e8f8dc957d9bc4af3b9758d4b7d316c5d5b5e8ce4e4893579b84a10
+DIST lmgrd-amd64.Z 327568 BLAKE2B c8fda9fd3281a545e0a8b7b8ec5a6591771a7dd28303d0a660192939c0da772b01fed9e50b4d1c01535825e46e554b39f62354ecd26be571d314bf1acb3dba67 SHA512 382c581395acd39bb2d05a09073b4f70efa7699e3c05e486d4cf6ba22faef13ff37ba524acd4bda90e7f56bc06dcf7bbe5ed7c2363aef4fde9cc6f875bbb92aa
+DIST lmgrd-x86.Z 318617 BLAKE2B 2102c542f702f679b8ae327d3ed5015f5c9d4242f5620ca9c421e06359c9658de5b85d3943630bf0fa7ba7f4611959bdcf6f81bff290b485d1bae5dcf007a485 SHA512 5030de6eb91dc16aaa3d22b8d14fe892b10b1a5573073c8daf498ab8998de5692acb8442f186cfc11e93b178aff8c0cdbcb4ba82b9cd197f96bad19eb7efb993
+DIST lmutil-amd64.Z 331103 BLAKE2B 968f89b549b52281d5723c15bb271d27d309441f73406940eeaca12cdaafaf7c42bbcbc148cfcd560736e05ed451f975005a669343ca0cd68b96f2dbc64b1862 SHA512 9ce2613bf7f8c28e5c6316a111ef310b2e79828f8c7299199bf336c531ca011f04b8cd9c294489547eeb29e25b3393df3175875ee01239ece8b268300ed51116
+DIST lmutil-x86.Z 324583 BLAKE2B ff851dba1f329e5ebfcf830a95b9b858803346880d936e72d0000f5eb8c420b822cbfb05d8bf71206fb1f7252cb9b2d21725d96a305b0c495675203097bc571c SHA512 6b213da65c59ecef15409144fa97c0a16bb96690acc09bd3919c0db8e922c7e63def915a59e18b017705bc5d91fb77227612ea1eabdb9dc5a038a4a264489acc
diff --git a/app-admin/flexlm/flexlm-9.5-r2.ebuild b/app-admin/flexlm/flexlm-9.5-r4.ebuild
index e14ddd58..2c30d753 100644
--- a/app-admin/flexlm/flexlm-9.5-r2.ebuild
+++ b/app-admin/flexlm/flexlm-9.5-r4.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2022 Gentoo Authors and Martin V\"ath
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 RESTRICT="fetch"
-inherit user
 
 DESCRIPTION="Macrovision FLEXlm license manager and utils"
 HOMEPAGE="http://www.macrovision.com/services/support/flexlm/lmgrd.shtml"
@@ -22,6 +21,9 @@ LICENSE="all-rights-reserved GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
+IDEPEND="acct-group/flexlm
+	acct-user/flexlm"
+RDEPEND="${IDEPEND}"
 
 QA_PREBUILT="
 	opt/flexlm/bin/lmgrd
@@ -66,9 +68,6 @@ src_install () {
 }
 
 pkg_postinst() {
-	enewgroup flexlm
-	enewuser flexlm -1 /bin/bash /opt/flexlm flexlm
-
 	# See bug 383787
 	chown flexlm /var/log/flexlm || eerror "'chown flexlm /var/log/flexlm' failed!"
 
diff --git a/app-admin/flexlm/metadata.xml b/app-admin/flexlm/metadata.xml
index 0b92062f..7c900b19 100644
--- a/app-admin/flexlm/metadata.xml
+++ b/app-admin/flexlm/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <longdescription>Macrovision FLEXlm license manager and utils</longdescription>
 </pkgmetadata>
diff --git a/app-admin/sudox/Manifest b/app-admin/sudox/Manifest
index 47dae640..4dba1ca3 100644
--- a/app-admin/sudox/Manifest
+++ b/app-admin/sudox/Manifest
@@ -1 +1 @@
-DIST sudox-10.0.tar.gz 15397 SHA512 3981fcbf08d85be38eae1171c64735791979ebb000910a4b5c74ef22cf2427dc0a5eb9be332ca6d86c669e0d3796985cecfbc3e183a7b67fa1642b25fb2fe054
+DIST sudox-11.0.tar.gz 15764 BLAKE2B 81664c9b231f1144dfc2a16ae3a2b18b9c7579a0c2c4241e0542572034a3d8b4771e9e7d1f9e1a1d191c07b3a3cd32526d1929b79701539459a6e44e0e7d35ba SHA512 f98581937e49de48940b18882ddd36c0e5d8b5163c4e3fa3e9fdb95d863bde258469bc3976c3450497db15d85ac5243b44eb3620439bcfde9e137523aa7fb067
diff --git a/app-admin/sudox/metadata.xml b/app-admin/sudox/metadata.xml
index 04177d16..b78b2f9d 100644
--- a/app-admin/sudox/metadata.xml
+++ b/app-admin/sudox/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>martin@mvath.de</email>
diff --git a/app-admin/sudox/sudox-10.0.ebuild b/app-admin/sudox/sudox-11.0.ebuild
index 3451d4da..300a9d49 100644
--- a/app-admin/sudox/sudox-10.0.ebuild
+++ b/app-admin/sudox/sudox-11.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2011-2021 Martin V\"ath
+# Copyright 2011-2023 Martin V\"ath
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 RESTRICT="mirror"
 
 DESCRIPTION="wrapper for sudo which can pass X authority data and deal with screen and tmux"
@@ -10,15 +10,15 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-RDEPEND="app-admin/sudo
-	>=app-shells/push-2.0-r2"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+IUSE="split-usr"
+RDEPEND=">=app-admin/sudo-1.9.14
+	app-shells/push:0/1"
 DEPEND=""
 
 src_prepare() {
 	use prefix || sed -i \
-		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}"'/bin/sh"' \
+		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}$(usex split-usr '' /usr)"'/bin/sh"' \
 		-- bin/* || die
 	default
 }