Diff gcr-3.41.1-r2 with a gcr-4.1.0

/usr/portage/app-crypt/gcr/gcr-4.1.0.ebuild 2023-10-09 14:52:28.232368318 +0300
10 10
HOMEPAGE="https://gitlab.gnome.org/GNOME/gcr"
11 11

  
12 12
LICENSE="GPL-2+ LGPL-2+"
13
SLOT="0/1" # subslot = suffix of libgcr-base-3 and co
13
SLOT="4/gcr-4.4-gck-2.2" # subslot = soname and soversion of libgcr and libgck
14 14

  
15 15
IUSE="gtk gtk-doc +introspection systemd test +vala"
16 16
REQUIRED_USE="
......
22 22
KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
23 23

  
24 24
DEPEND="
25
	>=dev-libs/glib-2.44.0:2
25
	>=dev-libs/glib-2.68.0:2
26 26
	>=dev-libs/libgcrypt-1.2.2:0=
27 27
	>=app-crypt/p11-kit-0.19.0
28 28
	>=app-crypt/libsecret-0.20
29 29
	systemd? ( sys-apps/systemd:= )
30
	gtk? ( >=x11-libs/gtk+-3.22:3[introspection?] )
30
	gtk? ( gui-libs/gtk:4[introspection?] )
31 31
	>=sys-apps/dbus-1
32 32
	introspection? ( >=dev-libs/gobject-introspection-1.58:= )
33
	!<app-crypt/gcr-3.41.1-r1
33 34
"
34 35
RDEPEND="${DEPEND}"
35 36
PDEPEND="app-crypt/gnupg"
......
45 46
	vala? ( $(vala_depend) )
46 47
"
47 48

  
48
PATCHES=(
49
	"${FILESDIR}"/3.38.0-optional-vapi.patch
50
	"${FILESDIR}"/3.41.1-implicit-func-decl.patch
51
)
52

  
53 49
pkg_setup() {
54 50
	python-any-r1_pkg_setup
55 51
}
......
63 59
src_configure() {
64 60
	local emesonargs=(
65 61
		$(meson_use introspection)
66
		$(meson_use gtk)
62
		$(meson_use gtk gtk4)
67 63
		$(meson_use gtk-doc gtk_doc)
68 64
		-Dgpg_path="${EPREFIX}"/usr/bin/gpg
69 65
		-Dssh_agent=true
......
80 76
src_install() {
81 77
	meson_src_install
82 78

  
83
	# These files are installed by gcr:4
84
	local conflicts=(
85
		"${ED}"/usr/libexec/gcr-ssh-agent
86
	)
87
	use systemd && conflicts+=(
88
		"${ED}"/usr/lib/systemd/user/gcr-ssh-agent.{service,socket}
89
	)
90
	einfo "${conflicts[@]}"
91
	rm "${conflicts[@]}" || die
92

  
93 79
	if use gtk-doc; then
94 80
		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
95
		mv "${ED}"/usr/share/doc/{gck-1,gcr-3,gcr-ui-3} "${ED}"/usr/share/gtk-doc/html/ || die
81
		mv "${ED}"/usr/share/doc/{gck-2,gcr-4} "${ED}"/usr/share/gtk-doc/html/ || die
96 82
	fi
97 83
}
98 84

  
Thank you!