Adding metadata

7 files changed, 109 insertions, 74 deletions

diff --git a/sys-auth/microsoft-identity-broker/Manifest b/sys-auth/microsoft-identity-broker/Manifest
index 65f29d529dd9..07bc5e9fcfdf 100644
--- a/sys-auth/microsoft-identity-broker/Manifest
+++ b/sys-auth/microsoft-identity-broker/Manifest
@@ -1 +1 @@
-DIST microsoft-identity-broker_2.0.1_amd64.deb 84422394 BLAKE2B de56e5b973ee573af12532720afd95ec12354488847b4df4a0307e039aca6e67214ce54b044b81ed0753c35dfaa525a6b63e2e51617b57c348d562f149cda7fa SHA512 fecf9ea1fc13471b83479f3f2fac1b54e23918248b3a447917486e83ee85af2627dde599c605d530caaba91e81b3dfce38ba93d1cd9bb47063f523a20398ff23
+DIST microsoft-identity-broker_2.5.2-noble_amd64.deb 3355002 BLAKE2B c351620879c99d596825ce7a9eaa2be6cf4c29721a13be59257ba57c47ffb27ff03534e45a65a7ce9fc2d6c61f020aefe9bbe10c6366a57e5168dcb47057910b SHA512 7eb08cb4d41ac63c19beb23c7ac7d61a2da45d46847bbfca36bac12e29faee0d3f92e8f649398281e3a48fd523de33a057aa169cd9d7df3fcafb6cb9dd367b96
diff --git a/sys-auth/microsoft-identity-broker/files/lsb-release-ubuntu-22.04 b/sys-auth/microsoft-identity-broker/files/lsb-release-ubuntu-22.04
deleted file mode 100644
index 58947887cf3e..000000000000
--- a/sys-auth/microsoft-identity-broker/files/lsb-release-ubuntu-22.04
+++ /dev/null
@@ -1,4 +0,0 @@
-DISTRIB_ID=Ubuntu
-DISTRIB_RELEASE=22.04
-DISTRIB_CODENAME=jammy
-DISTRIB_DESCRIPTION="Ubuntu 22.04.4 LTS"
diff --git a/sys-auth/microsoft-identity-broker/files/lsb-release-ubuntu-24.04 b/sys-auth/microsoft-identity-broker/files/lsb-release-ubuntu-24.04
new file mode 100644
index 000000000000..9a4f96d29959
--- /dev/null
+++ b/sys-auth/microsoft-identity-broker/files/lsb-release-ubuntu-24.04
@@ -0,0 +1,4 @@
+DISTRIB_ID=Ubuntu
+DISTRIB_RELEASE=24.04
+DISTRIB_CODENAME=noble
+DISTRIB_DESCRIPTION="Ubuntu 24.04.2 LTS"
diff --git a/sys-auth/microsoft-identity-broker/files/os-release-ubuntu-22.04 b/sys-auth/microsoft-identity-broker/files/os-release-ubuntu-24.04
index 290cf851f61a..5697add4442d 100644
--- a/sys-auth/microsoft-identity-broker/files/os-release-ubuntu-22.04
+++ b/sys-auth/microsoft-identity-broker/files/os-release-ubuntu-24.04
@@ -1,12 +1,13 @@
+PRETTY_NAME="Ubuntu 24.04.2 LTS"
 NAME="Ubuntu"
-VERSION="22.04.4 LTS (Jammy Jellyfish)"
-ID=ubuntu  
+VERSION_ID="24.04"
+VERSION="24.04.2 LTS (Noble Numbat)"
+VERSION_CODENAME=noble
+ID=ubuntu
 ID_LIKE=debian
-PRETTY_NAME="Ubuntu 22.04.4 LTS"
-VERSION_ID="22.04"
 HOME_URL="https://www.ubuntu.com/"
 SUPPORT_URL="https://help.ubuntu.com/"
 BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/"
 PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy"
-VERSION_CODENAME=jammy
-UBUNTU_CODENAME=jammy
+UBUNTU_CODENAME=noble
+LOGO=ubuntu-logo
diff --git a/sys-auth/microsoft-identity-broker/files/wrapper b/sys-auth/microsoft-identity-broker/files/wrapper
index f419769bebba..888ffa23edfe 100644
--- a/sys-auth/microsoft-identity-broker/files/wrapper
+++ b/sys-auth/microsoft-identity-broker/files/wrapper
@@ -3,7 +3,7 @@
 exec bwrap \
     --bind / / \
     --dev-bind /dev /dev \
-    --ro-bind /etc/microsoft-identity-broker/lsb-release /etc/lsb-release \
-    --ro-bind /etc/microsoft-identity-broker/os-release /etc/os-release \
+    --ro-bind /etc/microsoft/identity-broker/etc/lsb-release /etc/lsb-release \
+    --ro-bind /etc/microsoft/identity-broker/etc/os-release /etc/os-release \
     -- \
-    /usr/share/microsoft-identity-broker/bin/"${0##*/}" "${@}"
+    /opt/microsoft/identity-broker/libexec/"${0##*/}" "${@}"
diff --git a/sys-auth/microsoft-identity-broker/microsoft-identity-broker-2.0.1_p2-r2.ebuild b/sys-auth/microsoft-identity-broker/microsoft-identity-broker-2.0.1_p2-r2.ebuild
deleted file mode 100644
index f313a85c1be2..000000000000
--- a/sys-auth/microsoft-identity-broker/microsoft-identity-broker-2.0.1_p2-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-pkg-2 prefix systemd unpacker
-
-FAKE_OS="ubuntu-22.04"
-DESCRIPTION="Microsoft Authentication Broker to access a corporate environment"
-HOMEPAGE="https://learn.microsoft.com/mem/intune/"
-SRC_URI="https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/${PN:0:1}/${PN}/${PN}_${PV%_p*}_amd64.deb"
-S="${WORKDIR}"
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	acct-user/microsoft-identity-broker
-	acct-group/microsoft-identity-broker
-	sys-apps/bubblewrap
-	sys-apps/dbus
-	virtual/jre:11
-"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_configure() {
-	sed -i -r "s:^Exec(Start)?=.*/([^/]+):Exec\1=${EPREFIX}/usr/bin/\2:" \
-		usr/lib/systemd/*/*.service usr/share/dbus-1/*/*.service || die
-}
-
-src_install() {
-	newbin $(prefixify_ro "${FILESDIR}"/wrapper) microsoft-identity-broker
-	dosym microsoft-identity-broker /usr/bin/microsoft-identity-device-broker
-
-	java-pkg_dojar opt/microsoft/identity-broker/lib/*.jar
-
-	java-pkg_dolauncher microsoft-identity-broker \
-		--main com.microsoft.identity.broker.service.IdentityBrokerService \
-		--java_args '${MICROSOFT_IDENTITY_BROKER_OPTS}' \
-		-into /usr/share/${PN}
-
-	java-pkg_dolauncher microsoft-identity-device-broker \
-		--main com.microsoft.identity.broker.service.DeviceBrokerService \
-		--java_args '${MICROSOFT_IDENTITY_DEVICE_BROKER_OPTS}' \
-		-into /usr/share/${PN}
-
-	insinto /etc/microsoft-identity-broker
-	newins "${FILESDIR}/lsb-release-${FAKE_OS}" lsb-release
-	newins "${FILESDIR}/os-release-${FAKE_OS}" os-release
-
-	insinto /usr/share
-	doins -r usr/share/dbus-1
-
-	systemd_dounit usr/lib/systemd/system/*
-	systemd_douserunit usr/lib/systemd/user/*
-}
diff --git a/sys-auth/microsoft-identity-broker/microsoft-identity-broker-2.5.2.ebuild b/sys-auth/microsoft-identity-broker/microsoft-identity-broker-2.5.2.ebuild
new file mode 100644
index 000000000000..13371a7e2535
--- /dev/null
+++ b/sys-auth/microsoft-identity-broker/microsoft-identity-broker-2.5.2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop prefix systemd unpacker xdg
+
+FAKE_OS="ubuntu-24.04"
+DESCRIPTION="Microsoft Authentication Broker to access a corporate environment"
+HOMEPAGE="https://learn.microsoft.com/intune/"
+SRC_URI="https://packages.microsoft.com/ubuntu/24.04/prod/pool/main/${PN:0:1}/${PN}/${PN}_${PV%_p*}-noble_amd64.deb"
+S="${WORKDIR}"
+LICENSE="microsoft-proprietary Apache-2.0 BSD-2 MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	app-accessibility/at-spi2-core:2
+	app-crypt/libsecret
+	app-crypt/p11-kit
+	dev-libs/glib:2
+	dev-libs/openssl:0/3
+	net-libs/libsoup:3.0
+	net-libs/webkit-gtk:4.1/0
+	net-misc/curl
+	sys-apps/bubblewrap
+	sys-apps/dbus
+	sys-apps/util-linux
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/pango
+	virtual/zlib
+"
+
+QA_PREBUILT="*"
+DIR="/opt/microsoft/identity-broker"
+DB="microsoft-identity-device-broker"
+
+pkg_setup() {
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ver_test ${pv} -lt 2.0.3; then
+			ewarn "You are upgrading to an entirely new implementation. It is highly recommended"
+			ewarn "to unregister this system before upgrading. After upgrading, run"
+			ewarn "\`dsreg --cleanup\` and \`sudo dsreg --cleanup\` before registering again."
+			break
+		fi
+	done
+}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_install() {
+	dobin usr/bin/dsreg
+	doman usr/share/man/man1/dsreg.1
+
+	exeinto "${DIR}"/bin
+	newexe $(prefixify_ro "${FILESDIR}"/wrapper) ${PN}
+	dosym ${PN} "${DIR}"/bin/${DB}
+
+	exeinto "${DIR}"/libexec
+	doexe "${DIR#/}"/bin/{${PN},${DB}}
+
+	insinto /usr/share
+	doins -r usr/share/dbus-1
+
+	systemd_dounit usr/lib/systemd/system/${DB}.service
+
+	# DOS line endings? Yes, Chewi lol'd too. ;)
+	tr -d "\r" < usr/share/applications/${PN}.desktop | newmenu - ${PN}.desktop
+	doicon -s 256 usr/share/icons/hicolor/256x256/apps/${PN}.png
+
+	dodoc usr/share/doc/${PN}/CHANGELOG.md
+
+	keepdir /etc/microsoft/identity-broker/{certs,private}
+	fperms 0700 /etc/microsoft/identity-broker/{certs,private}
+
+	insinto /etc/microsoft/identity-broker/etc
+	newins "${FILESDIR}/lsb-release-${FAKE_OS}" lsb-release
+	newins "${FILESDIR}/os-release-${FAKE_OS}" os-release
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "This version is designed for GNOME Keyring. To use it with KWallet, run:"
+	elog "  busctl --user call org.freedesktop.secrets /org/freedesktop/secrets org.freedesktop.Secret.Service SetAlias so login /org/freedesktop/secrets/collection/kdewallet"
+	elog "To undo this change, run:"
+	elog "  busctl --user call org.freedesktop.secrets /org/freedesktop/secrets org.freedesktop.Secret.Service SetAlias so login /"
+}