gentoo auto-resync : 02:02:2025 - 22:43:16

6 files changed, 294 insertions, 54 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 884fc3f6a964..a363c1568dbd 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 31c1a9076bac..cd3060537935 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,7 +1,8 @@
 DIST ibus-1.5.29-rc2.tar.gz 3991416 BLAKE2B c185c0cf8af79a80ee04f414e13c4b58bd2f18891851d2f018713848b3bc0fe0516c8c0cf8f64204040f10b6b4a5304c8be6305449d7290b5d08412246d3af40 SHA512 47dd39c9615783b6c157a25e8a2506dc2e1f440d56aa649ee8cb95a390cb4efab9c95e72ac84b5d042c25e350599b4d352ddc66f1385af6660d4a7a296e44ca7
 DIST ibus-1.5.30.tar.gz 4124084 BLAKE2B 47dbcfec309bda14273463bff875e283148c7aba872d8e9f7673dd18e703f7b2a0eab5d538bd29a36525ab667b57488f4dc046bc955c1cd34edaec5b538e2bdd SHA512 cbed37bf62e8d8593c838f8ef7fe0b22bf8f4a661b887fc7be2f2768dda912075abdf3070c22b9699def90e7002aaaf7394f5fc590e12ef6ebb2bb5161cc29a0
 DIST ibus-1.5.31.tar.gz 4108303 BLAKE2B 2fa895369f5326339b50da34777e2f34124000cff40a4bc871bb0c1cdac4a22cc327240b8338bc6c4fc85267a83ccc0bd5963abcf4763a373b1227bdb5753b76 SHA512 adfad740002662262981ddfcc3f6eb1e898433d3bd90b07535ceef367d496d3da3e0836e59133d0063caf2d3d55d0deb6cf18ae2807fdd1ce4afab84a7725ca5
-EBUILD ibus-1.5.29.ebuild 5855 BLAKE2B 04b8db8acd96827d40027c042cd9ec5f6a5bcbedc6b1b2fd4ca7e9b72e4cbc56353df7a594dda57aca74f77d43742b172cf4489b4edb0d7dad83796f60fccf0c SHA512 bc8372224eb495498c1dc2b6be5903d5ffd00ad0153cfed36f24b21dd6f0997cf77a340c0f88cd39c7037354a3a774853502b1df44d68b9163de8ecc42a897df
-EBUILD ibus-1.5.30.ebuild 5752 BLAKE2B 9ef8d0168a9b34936b715391da6c4dbc1e9d0a8d9c2d63181a59e29f56b18b9de2910f18a3f51199c5b5aaaaf583ceaf9cc2509a47a0a37741adbe32e2de8ed9 SHA512 2d0841ae658bf79398d5eb16fc13c163703c79b9526fa88a76da908b748eb7cdbb982fd2c002f6bf4d1b124c1b8285b891bf9854e866024e866e7635e21fb1ab
-EBUILD ibus-1.5.31.ebuild 5806 BLAKE2B a434534652469fb59e0ec273550bc1d6d2213ae27c71106dddb47e8f0d72a97bdf1138a91ab3e05946c85d44c45ad4121978fc7b47890f9f225543a6e7c0431d SHA512 fec656604ef807d8e352336e1f7767946c3d4af3c430214db3d4a2c52c41d6b4b3ac2176ff07558bf40c69ade2c281c4ea147a102d972c7a707e82d6a49ab1db
+EBUILD ibus-1.5.29-r1.ebuild 6205 BLAKE2B 5cf303ffbc774a1a37a11997b7da10505faa97fe0e04df6fc6ae2ad8563c67a256189abd7379709f6513ae8effccba267a0dcf7805c9b0493d25a9b436cbece9 SHA512 bcae7e7f686aa4d54aa7ef7db47dd11f4647f7703b658d3aef9dd25aba3d9a4b8407d2222009a35b46ec13b4c65f9ec244ff3b72c7e6200418c58cbaa1d4e0dd
+EBUILD ibus-1.5.29.ebuild 6071 BLAKE2B b8075e38e43ee77ad292c401bd5b88ab1e9515b0172e5cc9a3aedac9f746309ee5f59187bc58311d4ce989aef59a7d76e98df6a5bdbc8fa5158ea7711fee2dc2 SHA512 249d8ee8b4972a592e471f4b719bc09b61001855b31871e5b5205b3aa250087acb43a86f753db0f6e6920ede53b46bf12ed8b574a5c55aecbb2a438ee6b5f909
+EBUILD ibus-1.5.30-r1.ebuild 6095 BLAKE2B 6310b03a329c86ad4d64c6a415499d3c554469c082b737650b8b9c70d3f0f7cd39c672e8be7b4f84f90b91c14bcb982c3a6c0a2fa3f2b428e36545b86a511b9f SHA512 bd2e533abb778341959509f4e9bb10a2720ed37eed5ad8b5f475766dbe93746832e15552d60c7349ca0c9a47d4017e0f4b55ab8ee287e55d7e07ae90c72ee098
+EBUILD ibus-1.5.31-r1.ebuild 6136 BLAKE2B d2e83f242bc0f27ef1355615a9af331ef8bf15e69b4732ad306b01e57554e56eee8d3feab95b828e63ff10bfb9d5652520c94569da7db0fc9aae86e9173e539d SHA512 2578c4a30528d38c485ef987bed4de4597bc2d0964bdc8bbd2469c6c5b49dd1d88e54cff17191c991956b3a8fe177fee94b7c130516bfbf8f6155fac79f13714
 MISC metadata.xml 989 BLAKE2B 9103c61af6f3766fa483864877a674455d0a47a2e7fc1e7ef0f62d835e1f57d6c71816737c64938babd5f29a7228d67f64c1d7aaaae0e9b10cc793ed373a698c SHA512 1552ed06ec527f6c9868b2b006b1d5d7bdc7101d34d4c4438eba6de74f398744a2720e31f73dc203f034631aa900db0a2ad8d429a67e577b69005cda1440f1ef
diff --git a/app-i18n/ibus/ibus-1.5.29-r1.ebuild b/app-i18n/ibus/ibus-1.5.29-r1.ebuild
new file mode 100644
index 000000000000..7c1ad0e700ad
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.29-r1.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit autotools bash-completion-r1 flag-o-matic gnome2-utils python-r1 toolchain-funcs vala virtualx
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+
+MY_PV=$(ver_rs 3 '-')
+MY_PV_DERP="${MY_PV}-rc2" # Upstream retagged rc2 as the final release
+GENTOO_VER=
+[[ -n ${GENTOO_VER} ]] && \
+	GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV_DERP}.tar.gz
+	${GENTOO_PATCHSET_URI}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	appindicator? ( gtk3 )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		introspection
+	)
+	test? ( gtk3 )
+	vala? ( gtk3 introspection )
+	X? ( gtk3 )
+"
+REQUIRED_USE+=" gtk3? ( wayland? ( introspection ) )" # bug 915359
+DEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.65.0:2
+	gnome-base/dconf
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		>=x11-libs/libXfixes-6.0.0
+	)
+	appindicator? ( dev-libs/libdbusmenu[gtk3?] )
+	gtk2? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3[X,wayland?] )
+	gtk4? ( gui-libs/gtk:4[X,wayland?] )
+	gui? (
+		x11-libs/libX11
+		x11-libs/libXi
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	libnotify? ( x11-libs/libnotify )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)"
+RDEPEND="${DEPEND}
+	python? (
+		gui? (
+			x11-libs/gtk+:3[introspection]
+		)
+	)"
+BDEPEND="
+	$(vala_depend)
+	dev-libs/glib:2
+	dev-util/glib-utils
+	virtual/pkgconfig
+	x11-misc/xkeyboard-config
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )
+	test? ( x11-apps/setxkbmap )
+	unicode? ( app-i18n/unicode-data )"
+
+S=${WORKDIR}/${PN}-${MY_PV_DERP}
+
+src_prepare() {
+	vala_setup --ignore-use
+	# Under various circumstances, vala transpiles will need to be redone due to
+	# encoding false assumptions about enabled features at the time the distfile
+	# was produced. Vala's conditional compilation encodes the configure options
+	# from the maintainer's machine when creating distfiles.
+	#
+	# See:
+	# - https://github.com/ibus/ibus/issues/2609
+	# - https://gitlab.gnome.org/GNOME/vala/-/issues/1580
+	#
+	# Force all vala files to be regenerated no matter what.
+	find . -name '*.vala' -exec touch {} + || die
+
+	if [[ -n ${GENTOO_VER} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		eapply "${WORKDIR}"/patches-gentoo/*.patch
+	fi
+
+	# for multiple Python implementations
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am || die
+	# fix for parallel install
+	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am || die
+	# require user interaction
+	sed -i "/^TESTS_C += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am || die
+
+	sed -i "/^bash_completion/d" tools/Makefile.am || die
+
+	default
+	eautoreconf
+	xdg_environment_reset
+}
+
+src_configure() {
+	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local python_conf=()
+	if use python; then
+		python_setup
+		python_conf+=(
+			$(use_enable gui setup)
+			--with-python=${EPYTHON}
+		)
+	else
+		python_conf+=( --disable-setup )
+	fi
+
+	# defang automagic dependencies
+	use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
+
+	if tc-is-cross-compiler && { use emoji || use unicode; }; then
+		mkdir -p "${S}-build"
+		pushd "${S}-build" >/dev/null 2>&1 || die
+		ECONF_SOURCE=${S} econf_build --enable-static \
+			--disable-{dconf,gtk{2,3},python-library,shared,xim} \
+			ISOCODES_{CFLAG,LIB}S=-DSKIP \
+			$(use_enable emoji emoji-dict) \
+			$(use_enable unicode unicode-dict) \
+			$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data")
+		popd >/dev/null 2>&1 || die
+	fi
+
+	local myconf=(
+		$(use_enable X xim)
+		$(use_enable appindicator)
+		$(use_enable emoji emoji-dict)
+		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji)
+		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations)
+		$(use_enable gtk2)
+		$(use_enable gtk3)
+		$(use_enable gtk4)
+		$(use_enable gui ui)
+		$(use_enable introspection)
+		$(use_enable libnotify)
+		$(use_enable nls)
+		$(use_enable systemd systemd-services)
+		$(use_enable test tests)
+		$(use_enable unicode unicode-dict)
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data")
+		$(use_enable vala)
+		$(use_enable wayland)
+		"${python_conf[@]}"
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if tc-is-cross-compiler && { use emoji || use unicode; }; then
+		emake -C "${S}-build/src" \
+			$(usex emoji emoji-parser '') \
+			$(usex unicode unicode-parser '')
+		emake -C src \
+			$(usex emoji emoji-parser '') \
+			$(usex unicode unicode-parser '')
+		cp \
+			$(usex emoji "${S}-build/src/emoji-parser" '') \
+			$(usex unicode "${S}-build/src/unicode-parser" '') \
+			src || die
+	fi
+	emake
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	virtx dbus-run-session emake check
+}
+
+src_install() {
+	default
+	# Remove la files
+	find "${ED}" -name '*.la' -delete || die
+
+	# Remove stray python files generated by the build system
+	find "${ED}" -name '*.pyc' -exec rm -f {} \; || die
+	find "${ED}" -name '*.pyo' -exec rm -f {} \; || die
+
+	if use python; then
+		python_install() {
+			emake -C bindings/pygobject \
+				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
+				DESTDIR="${D}" \
+				install
+
+			python_optimize
+		}
+		python_foreach_impl python_install
+	fi
+
+	keepdir /usr/share/ibus/engine
+
+	newbashcomp tools/${PN}.bash ${PN}
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
+}
+
+pkg_postinst() {
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	xdg_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus/ibus-1.5.29.ebuild b/app-i18n/ibus/ibus-1.5.29.ebuild
index 374178b852a3..dcc89a5ba88d 100644
--- a/app-i18n/ibus/ibus-1.5.29.ebuild
+++ b/app-i18n/ibus/ibus-1.5.29.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -30,7 +30,7 @@ REQUIRED_USE="
 		introspection
 	)
 	test? ( gtk3 )
-	vala? ( introspection )
+	vala? ( gtk3 introspection )
 	X? ( gtk3 )
 "
 REQUIRED_USE+=" gtk3? ( wayland? ( introspection ) )" # bug 915359
@@ -87,19 +87,18 @@ S=${WORKDIR}/${PN}-${MY_PV_DERP}
 
 src_prepare() {
 	vala_setup --ignore-use
-	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
-		touch ui/gtk3/panelbinding.vala \
-			ui/gtk3/panel.vala \
-			ui/gtk3/emojierapp.vala || die
-	fi
-	if ! use emoji; then
-		touch \
-			tools/main.vala \
-			ui/gtk3/panel.vala || die
-	fi
-	if ! use appindicator; then
-		touch ui/gtk3/panel.vala || die
-	fi
+	# Under various circumstances, vala transpiles will need to be redone due to
+	# encoding false assumptions about enabled features at the time the distfile
+	# was produced. Vala's conditional compilation encodes the configure options
+	# from the maintainer's machine when creating distfiles.
+	#
+	# See:
+	# - https://github.com/ibus/ibus/issues/2609
+	# - https://gitlab.gnome.org/GNOME/vala/-/issues/1580
+	#
+	# Force all vala files to be regenerated no matter what.
+	find . -name '*.vala' -exec touch {} + || die
+
 	if [[ -n ${GENTOO_VER} ]]; then
 		einfo "Try to apply Gentoo specific patch set"
 		eapply "${WORKDIR}"/patches-gentoo/*.patch
diff --git a/app-i18n/ibus/ibus-1.5.30.ebuild b/app-i18n/ibus/ibus-1.5.30-r1.ebuild
index 374a7381c099..78886f0e2bcd 100644
--- a/app-i18n/ibus/ibus-1.5.30.ebuild
+++ b/app-i18n/ibus/ibus-1.5.30-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit autotools bash-completion-r1 gnome2-utils python-r1 toolchain-funcs vala virtualx
+inherit autotools bash-completion-r1 flag-o-matic gnome2-utils python-r1 toolchain-funcs vala virtualx
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"
@@ -29,7 +29,7 @@ REQUIRED_USE="
 		introspection
 	)
 	test? ( gtk3 )
-	vala? ( introspection )
+	vala? ( gtk3 introspection )
 	X? ( gtk3 )
 "
 REQUIRED_USE+=" gtk3? ( wayland? ( introspection ) )" # bug 915359
@@ -45,8 +45,8 @@ DEPEND="
 	)
 	appindicator? ( dev-libs/libdbusmenu[gtk3?] )
 	gtk2? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	gtk4? ( gui-libs/gtk:4 )
+	gtk3? ( x11-libs/gtk+:3[X,wayland?] )
+	gtk4? ( gui-libs/gtk:4[X,wayland?] )
 	gui? (
 		x11-libs/libX11
 		x11-libs/libXi
@@ -84,19 +84,18 @@ BDEPEND="
 
 src_prepare() {
 	vala_setup --ignore-use
-	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
-		touch ui/gtk3/panelbinding.vala \
-			ui/gtk3/panel.vala \
-			ui/gtk3/emojierapp.vala || die
-	fi
-	if ! use emoji; then
-		touch \
-			tools/main.vala \
-			ui/gtk3/panel.vala || die
-	fi
-	if ! use appindicator; then
-		touch ui/gtk3/panel.vala || die
-	fi
+	# Under various circumstances, vala transpiles will need to be redone due to
+	# encoding false assumptions about enabled features at the time the distfile
+	# was produced. Vala's conditional compilation encodes the configure options
+	# from the maintainer's machine when creating distfiles.
+	#
+	# See:
+	# - https://github.com/ibus/ibus/issues/2609
+	# - https://gitlab.gnome.org/GNOME/vala/-/issues/1580
+	#
+	# Force all vala files to be regenerated no matter what.
+	find . -name '*.vala' -exec touch {} + || die
+
 	if [[ -n ${GENTOO_VER} ]]; then
 		einfo "Try to apply Gentoo specific patch set"
 		eapply "${WORKDIR}"/patches-gentoo/*.patch
@@ -129,6 +128,9 @@ src_configure() {
 		python_conf+=( --disable-setup )
 	fi
 
+	# defang automagic dependencies
+	use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
+
 	if tc-is-cross-compiler && { use emoji || use unicode; }; then
 		mkdir -p "${S}-build"
 		pushd "${S}-build" >/dev/null 2>&1 || die
diff --git a/app-i18n/ibus/ibus-1.5.31.ebuild b/app-i18n/ibus/ibus-1.5.31-r1.ebuild
index 0b57f53f19ea..9f41a2a7d624 100644
--- a/app-i18n/ibus/ibus-1.5.31.ebuild
+++ b/app-i18n/ibus/ibus-1.5.31-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit autotools bash-completion-r1 gnome2-utils flag-o-matic python-r1 toolchain-funcs vala virtualx
+inherit autotools bash-completion-r1 flag-o-matic gnome2-utils python-r1 toolchain-funcs vala virtualx
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"
@@ -29,7 +29,7 @@ REQUIRED_USE="
 		introspection
 	)
 	test? ( gtk3 )
-	vala? ( introspection )
+	vala? ( gtk3 introspection )
 	X? ( gtk3 )
 "
 REQUIRED_USE+=" gtk3? ( wayland? ( introspection ) )" # bug 915359
@@ -45,8 +45,8 @@ DEPEND="
 	)
 	appindicator? ( dev-libs/libdbusmenu[gtk3?] )
 	gtk2? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	gtk4? ( gui-libs/gtk:4 )
+	gtk3? ( x11-libs/gtk+:3[X,wayland?] )
+	gtk4? ( gui-libs/gtk:4[X,wayland?] )
 	gui? (
 		x11-libs/libX11
 		x11-libs/libXi
@@ -84,19 +84,18 @@ BDEPEND="
 
 src_prepare() {
 	vala_setup --ignore-use
-	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
-		touch ui/gtk3/panelbinding.vala \
-			ui/gtk3/panel.vala \
-			ui/gtk3/emojierapp.vala || die
-	fi
-	if ! use emoji; then
-		touch \
-			tools/main.vala \
-			ui/gtk3/panel.vala || die
-	fi
-	if ! use appindicator; then
-		touch ui/gtk3/panel.vala || die
-	fi
+	# Under various circumstances, vala transpiles will need to be redone due to
+	# encoding false assumptions about enabled features at the time the distfile
+	# was produced. Vala's conditional compilation encodes the configure options
+	# from the maintainer's machine when creating distfiles.
+	#
+	# See:
+	# - https://github.com/ibus/ibus/issues/2609
+	# - https://gitlab.gnome.org/GNOME/vala/-/issues/1580
+	#
+	# Force all vala files to be regenerated no matter what.
+	find . -name '*.vala' -exec touch {} + || die
+
 	if [[ -n ${GENTOO_VER} ]]; then
 		einfo "Try to apply Gentoo specific patch set"
 		eapply "${WORKDIR}"/patches-gentoo/*.patch
@@ -132,6 +131,9 @@ src_configure() {
 		python_conf+=( --disable-setup )
 	fi
 
+	# defang automagic dependencies
+	use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
+
 	if tc-is-cross-compiler && { use emoji || use unicode; }; then
 		mkdir -p "${S}-build"
 		pushd "${S}-build" >/dev/null 2>&1 || die