Diff ibus-1.5.28-r1 with a ibus-1.5.29_rc1

/usr/portage/app-i18n/ibus/ibus-1.5.29_rc1.ebuild 2023-10-09 14:52:28.760368332 +0300
1 1
# Copyright 1999-2023 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4
EAPI=7
4
EAPI=8
5 5

  
6
PYTHON_COMPAT=( python3_{9..11} )
6
PYTHON_COMPAT=( python3_{10..12} )
7 7

  
8
inherit autotools bash-completion-r1 gnome2-utils python-r1 toolchain-funcs vala virtualx xdg-utils
8
inherit autotools bash-completion-r1 gnome2-utils python-r1 toolchain-funcs vala virtualx
9 9

  
10
UPSTREAM_VER=0
11
GENTOO_VER=
12 10
DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
13 11
HOMEPAGE="https://github.com/ibus/ibus/wiki"
14 12

  
15
[[ -n ${UPSTREAM_VER} ]] && \
16
	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
13
MY_PV=$(ver_rs 3 '-')
14
GENTOO_VER=
17 15
[[ -n ${GENTOO_VER} ]] && \
18 16
	GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
19
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
20
	${UPSTREAM_PATCHSET_URI} ${GENTOO_PATCHSET_URI}"
17
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.gz
18
	${GENTOO_PATCHSET_URI}"
21 19

  
22 20
LICENSE="LGPL-2.1"
23 21
SLOT="0"
......
44 42
		x11-libs/libX11
45 43
		>=x11-libs/libXfixes-6.0.0
46 44
	)
45
	appindicator? ( dev-libs/libdbusmenu[gtk3?] )
47 46
	gtk2? ( x11-libs/gtk+:2 )
48 47
	gtk3? ( x11-libs/gtk+:3 )
49 48
	gtk4? ( gui-libs/gtk:4 )
......
82 81
	test? ( x11-apps/setxkbmap )
83 82
	unicode? ( app-i18n/unicode-data )"
84 83

  
84
S=${WORKDIR}/${PN}-${MY_PV}
85

  
85 86
src_prepare() {
86
	vala_src_prepare --ignore-use
87
	vala_setup --ignore-use
87 88
	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
88 89
		touch ui/gtk3/panelbinding.vala \
89 90
			ui/gtk3/panel.vala \
......
97 98
	if ! use appindicator; then
98 99
		touch ui/gtk3/panel.vala || die
99 100
	fi
100

  
101
	if [[ -n ${UPSTREAM_VER} ]]; then
102
		einfo "Try to apply Upstream specific patch set"
103
		eapply "${WORKDIR}"/patches-upstream/*.patch
104
	fi
105

  
106 101
	if [[ -n ${GENTOO_VER} ]]; then
107 102
		einfo "Try to apply Gentoo specific patch set"
108 103
		eapply "${WORKDIR}"/patches-gentoo/*.patch
......
189 184

  
190 185
src_test() {
191 186
	unset DBUS_SESSION_BUS_ADDRESS
192
	virtx emake -j1 check
187
	virtx dbus-run-session emake check
193 188
}
194 189

  
195 190
src_install() {
......
219 214

  
220 215
	insinto /etc/X11/xinit/xinput.d
221 216
	newins xinput-${PN} ${PN}.conf
222

  
223
	# Undo compression of man page
224
	find "${ED}"/usr/share/man -type f -name '*.gz' -exec gzip -d {} \; || die
225 217
}
226 218

  
227 219
pkg_postinst() {
Thank you!