gentoo auto-resync : 21:09:2023 - 17:14:53

6 files changed, 283 insertions, 2 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index f221731ff344..efa764680ea6 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index c3451ec29060..74b279f665be 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,5 +1,6 @@
 AUX use-printf-in-Makefile.patch 1439 BLAKE2B 829b93431a8dddd957ef2deef60dfd3ff13fc2a0faab5c5327cea2f53ccc1bcc0e805166de93d2de8a52e8c344bdab64dae5671f238b49ecedebb657afca0823 SHA512 8207e9eb534fed58712b805df0e90bcf8406fe1c2907f91cd54500babcc49d0a72dc1d039d9fdb8077967058aaafb6c37336c1b0fcd041edfb3c4604c7cea4c2
 DIST eid-mw-5.1.11.tar.gz 15368318 BLAKE2B 34a49084bf5e1fb62b7975b14b8300c3400f0c1aeec8a9a01122097b0a3d8245974c7a9c5d9c6d91a419c796a56954b945ec838699fe9d7623f102523c4e0f67 SHA512 7f286a6ff14e62652ec36b68121639bcaa55cf50364da5d11aed4c9f13a2d7813d2b69c13a3335ece6ed0660ca67a8dd1724d3498d8bae03f144d268cefb731d
+EBUILD eid-mw-5.1.11-r1.ebuild 3043 BLAKE2B 98365a45529fdbed3e5c325d35d39abfe0141d91bd5f80cc8a0b9d238647bf10c112ed6bec3ca7e3cef2d98cb69a9bc106321c9fe10b02c65d21a214e756d1e7 SHA512 ce27418a393f60f57b3bd19118bf9f896ab82e479915405a1bd927bddbe26d2182686314099774a84130a16b18519764dd9943db0bc2f9b71515b3f001b116a3
 EBUILD eid-mw-5.1.11.ebuild 3038 BLAKE2B 462d0ced9d2d6344dd05cf481fde89f57a7063000d23b8aa768e9dc152715be3d986febbfcffc59d98a083458998ced76f8d06d8be904eccaa67740a81b10d69 SHA512 01b75fd439e83b93376f9e754d74d80a967d1c75bd7833309244a4b0a18f3e9e24428da1bac38499319591cccdb34780d0ba789da3dec669f6ac0e947238cc89
-EBUILD eid-mw-9999.ebuild 2678 BLAKE2B 1c2a16dba8883b54851238ff4cf274a0c7669edf1be6b58c68eebe2d00dd5c4314fe2d458df4655a0b7c3a385a1533b8e2135e42da8a9c316a9dfbe5fdb97e63 SHA512 225cfc0c504ed7bc1c775ba1f17edaa116c97f593e66cbc866eceefde63f66405915dc2f2e86e1aa1d250e65a78257e1c3945509f6c8d65ff4104da8ca900d7f
+EBUILD eid-mw-9999.ebuild 2683 BLAKE2B 4e81ded2f335881fcac6d623dc869a19eb547f5e93b86f6a1caf4c96108dca4515eb0733d91ad6e2e31cdb770f331258444d4eb78ff8e24bdf3f01c0f1bf03a6 SHA512 b81f00e540056c1c4f2f7345cacd4f9f6b4480a6c69ff993e4c83e94f3ae3c6bc63c5e3569a49b1f146b084f8bb9432b861ffe351f953ee258468b7271239d72
 MISC metadata.xml 1447 BLAKE2B bf97d239f8d44f8a3bd31e35868335a6286a8ded9d6904a919a5a69eb89a61173aca5eb988455df2ca201e0d687e932a84ff8ed7012a3f9ca3e1eda0627ae9ec SHA512 6c27500bb1dd72027a540745e3916c41af548c1cd277fad02f975dd6431a22a9083bc0a7cdd00d316e2c7a536be0ac484f9b47bebb53121b7647da8699321838
diff --git a/app-crypt/eid-mw/eid-mw-5.1.11-r1.ebuild b/app-crypt/eid-mw/eid-mw-5.1.11-r1.ebuild
new file mode 100644
index 000000000000..4316ad5bec68
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-5.1.11-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop gnome2-utils
+
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
+HOMEPAGE="https://eid.belgium.be"
+SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+dialogs +gtk p11-kit"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.2.9
+	gtk? (
+		x11-libs/gdk-pixbuf[jpeg]
+		x11-libs/gtk+:3
+		dev-libs/libxml2
+		net-misc/curl[ssl]
+		net-libs/libproxy
+		>=app-crypt/pinentry-1.1.0-r4[gtk]
+	)
+	p11-kit? ( app-crypt/p11-kit )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="dialogs? ( gtk )"
+
+src_prepare() {
+	default
+
+	# Buggy internal versioning when autoreconf a tarball release.
+	# Weird numbering is required otherwise we get a seg fault in
+	# about-eid-mw program.
+	echo "${PV}-v${PV}" > .version
+
+	# See bug #862306
+	sed -i \
+		-e 's:PACKAGE_VERSION:MAINVERSION:' \
+		cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
+
+	# xpi module : we don't want it anymore
+	sed -i -e '/SUBDIRS/ s:plugins_tools/xpi ::' Makefile.am || die
+	sed -i -e '/plugins_tools\/xpi/ d' configure.ac || die
+
+	# hardcoded lsb_info
+	sed -i \
+		-e "s:get_lsb_info('i'):strdup(_(\"Gentoo\")):" \
+		-e "s:get_lsb_info('r'):strdup(_(\"n/a\")):" \
+		-e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
+		plugins_tools/aboutmw/gtk/about-main.c || die
+
+	# Fix libdir for manifestdir
+	sed -i \
+		-e "/pkcs11_manifestdir/ s:prefix)/lib:libdir):" \
+		-e "/managed_storage_manifestdir/ s:prefix)/lib:libdir):" \
+		cardcomm/pkcs11/src/Makefile.am || die
+
+	# See bug #732994
+	sed -i \
+		-e '/LDFLAGS="/ s:$CPPFLAGS:$LDFLAGS:' \
+		configure.ac || die
+
+	# See bug #751472
+	eapply "${FILESDIR}/use-printf-in-Makefile.patch"
+
+	# See bug #811270 (remove uml build)
+	sed -i \
+		-e 's:cardlayer/uml::' \
+		cardcomm/pkcs11/src/Makefile.am || die
+	sed -i \
+		-e 's:uml::' \
+		plugins_tools/eid-viewer/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable dialogs) \
+		$(use_enable p11-kit p11kit) \
+		$(use_with gtk gtkvers 'detect') \
+		--with-gnu-ld \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+	if use gtk; then
+		domenu plugins_tools/eid-viewer/eid-viewer.desktop
+		doicon plugins_tools/eid-viewer/gtk/eid-viewer.png
+	fi
+}
+
+pkg_postinst() {
+	if use gtk; then
+		gnome2_schemas_update
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+
+		local peimpl=$(eselect --brief --colour=no pinentry show)
+		case "${peimpl}" in
+		*gnome*|*qt*) ;;
+		*)	ewarn "The pinentry front-end currently selected is not supported by eid-mw."
+			ewarn "You may be prompted for your pin code in an inaccessible shell!!"
+			ewarn "Please select pinentry-gnome3 as default pinentry provider:"
+			ewarn " # eselect pinentry set pinentry-gnome3"
+		;;
+		esac
+	fi
+}
+
+pkg_postrm() {
+	if use gtk; then
+		gnome2_schemas_update
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
index b94eb12ffc53..567bbb9a1cd9 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -79,7 +79,7 @@ src_configure() {
 
 src_install() {
 	default
-	rm -r "${ED}"/usr/$(get_libdir)/*.la || die
+	find "${ED}" -type f -name '*.la' -delete || die
 	if use gtk; then
 		domenu plugins_tools/eid-viewer/eid-viewer.desktop
 		doicon plugins_tools/eid-viewer/gtk/eid-viewer.png
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index c93e9b74f96f..761de7b35369 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,5 +1,7 @@
 DIST libsecret-0.20.5.tar.xz 187340 BLAKE2B cde5094eaaf54f251c19afb015c39cc88435dafe6ee682ca8f9d1917dd5b3dc8cc1609cdbf2a3a42d2592c2a149bec5fe28b2f4ec179b92c0d0f07d2f14c1792 SHA512 61ca248aafd265e1f31d56c9084c68d880ebf03660ace3d4a6c6622ab306b56e921ac24647b6a60633bfa99c8a0407d4ae1aa6148511f289bf5ce2025b72692a
 DIST libsecret-0.21.0.tar.xz 190320 BLAKE2B 0775f1b80eea303793aa9c1e940e0cb47ada4cee10ebae947a7e17d5a749736a3219a7edf937693b32df5505c2dd96bffc523b4cfcb41c6a7f12cea0b43449b3 SHA512 666a67f3f06274ab57e1b6e3e855033ce244ab45b9b237851fc06f33ef7922179b5bcbe96a5dc50d1136cbb8d74c2d0af0af4d0ae9de918b4a63b36abb1f2b97
+DIST libsecret-0.21.1.tar.xz 190796 BLAKE2B 862c2aac0c519d2607c1c5b057d1e0d00d3d5bce06744ab8c6e074393ede2f154af9ab3ee988820c936c8c22dba205ee7bd570287aaa47e64fde21ae3a7dfc2b SHA512 e201b2292280c355d08f8bd2d90d6d785d7b618c82e731eb9c051599a24d8f6a0cc3e271b1876d738f4a15aab24c2b6607b6d15d4335a990e74bb0371fe941ae
 EBUILD libsecret-0.20.5-r3.ebuild 3715 BLAKE2B 1cbe434ad110a2c29946911bee0198eff501ef726ef910c6e60a12d08a05c9c2097d6ad1f843fe6d4cc03ebd5f477fe893133fb88eb98d9674573b53356c5a26 SHA512 730a7f7aa89427a06d238565b721d67bbcc1ba3b5cc1386b401cb96ed30b6a0ff0f305dd07c30a018fa80e4ab2340820daf3570f38a9f49bc7fcaa930d0ad258
 EBUILD libsecret-0.21.0.ebuild 3741 BLAKE2B 48f6c42f1ab03d2ad4ac961f217d37f0aa21b202fe9a7062323bbfdd76f0f5bc45df6ee9e4af9f4b915f31741b21e74eb20783d650e42f4e1767686f0c939b5e SHA512 900fed4f31c8f1652e8c88262f87cf499111921a0fd657dd4bdc8733e78473ae063fb304f0bc7262d38bf36d8d498f15551d4ec5726ea9552a303ef35ec72a8b
+EBUILD libsecret-0.21.1.ebuild 3741 BLAKE2B 48f6c42f1ab03d2ad4ac961f217d37f0aa21b202fe9a7062323bbfdd76f0f5bc45df6ee9e4af9f4b915f31741b21e74eb20783d650e42f4e1767686f0c939b5e SHA512 900fed4f31c8f1652e8c88262f87cf499111921a0fd657dd4bdc8733e78473ae063fb304f0bc7262d38bf36d8d498f15551d4ec5726ea9552a303ef35ec72a8b
 MISC metadata.xml 468 BLAKE2B 21e70edb5acfc8b52a7d10f0c9e9452b04d8124b3d52bb7f816019cc2cf6f50275c7cb19c8853aec0c5fb2a6c93d56dfed3f4e5b8c41e9b2c08c2eff5efc5206 SHA512 7cc80dd7bbef252a09524ad511e12e621fdceca3482411f605e4c8aabb66e473c10e6a2b446df866644a4749b58dd3bb6f83cf118ff9949e17ca4a427a3ce3de
diff --git a/app-crypt/libsecret/libsecret-0.21.1.ebuild b/app-crypt/libsecret/libsecret-0.21.1.ebuild
new file mode 100644
index 000000000000..2bd69b9e0890
--- /dev/null
+++ b/app-crypt/libsecret/libsecret-0.21.1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 gnome2 meson-multilib python-any-r1 vala virtualx
+
+DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
+
+LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
+SLOT="0"
+
+IUSE="+crypt gtk-doc +introspection test test-rust tpm +vala"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	vala? ( introspection )
+	gtk-doc? ( crypt )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
+	crypt? ( >=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}] )
+	tpm? ( >=app-crypt/tpm2-tss-3.0.3:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}"
+PDEPEND="virtual/secret-service"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		>=dev-util/gi-docgen-2021.7
+	)
+	test? (
+		$(python_gen_any_dep '
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )')
+		test-rust? ( introspection? ( >=dev-libs/gjs-1.32 ) )
+		tpm? (
+			app-crypt/swtpm
+			app-crypt/tpm2-abrmd
+			>=app-crypt/tpm2-tss-3.2.0:=
+		)
+	)
+	vala? ( $(vala_depend) )
+"
+
+dbus_run() {
+	(
+		# start isolated dbus session bus
+		dbus_data=$(dbus-launch --sh-syntax) || exit
+		eval "${dbus_data}"
+
+		$@
+		ret=${?}
+
+		kill "${DBUS_SESSION_BUS_PID}"
+		exit "${ret}"
+	) || die
+}
+
+tpm2_run_with_emulator() {
+	export XDG_CONFIG_HOME=${T}/.config/swtpm
+	"${BROOT}"/usr/share/swtpm/swtpm-create-user-config-files --overwrite || die
+
+	mkdir -p ${XDG_CONFIG_HOME}/mytpm1 || die
+	swtpm_setup_args=(
+		--tpm2
+		--tpmstate ${XDG_CONFIG_HOME}/mytpm1
+		--createek
+		--allow-signing
+		--decryption
+		--create-ek-cert
+		--create-platform-cert
+		--lock-nvram
+		--overwrite
+		--display
+	)
+	swtpm_setup "${swtpm_setup_args[@]}" || die
+
+	swtpm_socket_args=(
+		--tpm2
+		--tpmstate dir=${XDG_CONFIG_HOME}/mytpm1
+		--flags startup-clear
+		--ctrl type=unixio,path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket.ctrl
+		--server type=unixio,path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket
+		--pid file=${XDG_CONFIG_HOME}/mytpm1/swtpm.pid
+		--daemon
+	)
+	swtpm socket "${swtpm_socket_args[@]}" || die
+
+	tpm2_abrmd_args=(
+		--logger=stdout
+		--tcti=swtpm:path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket
+		--session
+		--flush-all
+	)
+	tpm2-abrmd "${tpm2_abrmd_args[@]}" &
+	export TCTI=tabrmd:bus_type=session
+
+	$@ || die
+
+	# When swtpm dies, tmp2-abrmd will exit
+	kill $(< ${XDG_CONFIG_HOME}/mytpm1/swtpm.pid) || die
+}
+
+python_check_deps() {
+	if use introspection; then
+		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	python_has_version "dev-python/mock[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_setup
+	default
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_native_true manpage)
+		$(meson_use crypt gcrypt)
+		$(meson_native_use_bool vala vapi)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_native_use_bool introspection)
+		-Dbashcompdir="$(get_bashcompdir)"
+		$(meson_native_enabled bash_completion)
+		$(meson_native_use_bool tpm tpm2)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	if use tpm; then
+		dbus_run tpm2_run_with_emulator virtx meson test -C "${BUILD_DIR}"
+	else
+		virtx dbus-run-session meson test -C "${BUILD_DIR}"
+	fi
+}