Diff geany-plugins-1.38-r5 with a geany-plugins-1.38-r410

/usr/portage/dev-util/geany-plugins/geany-plugins-1.38-r410.ebuild 2023-10-09 14:52:30.964368387 +0300
6 6
LUA_COMPAT=( lua5-1 )
7 7
LUA_REQ_USE="deprecated"
8 8

  
9
inherit flag-o-matic lua-single
9
inherit autotools flag-o-matic lua-single
10 10

  
11 11
DESCRIPTION="A collection of different plugins for Geany"
12 12
HOMEPAGE="https://plugins.geany.org"
......
16 16
SLOT="0"
17 17
KEYWORDS="amd64 arm ppc ppc64 ~riscv ~sparc x86"
18 18

  
19
IUSE="ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench"
19
IUSE="ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope workbench"
20 20
REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
21 21

  
22 22
DEPEND="
......
32 32
	lua? ( ${LUA_DEPS} )
33 33
	markdown? (
34 34
		app-text/discount:=
35
		net-libs/webkit-gtk:4
35
		net-libs/webkit-gtk:4.1
36 36
		)
37 37
	pretty-printer? ( dev-libs/libxml2:2 )
38 38
	scope? ( x11-libs/vte:2.91 )
39
	soup? ( net-libs/libsoup:2.4 )
40 39
	workbench? ( dev-libs/libgit2:= )
41 40
"
42 41
RDEPEND="${DEPEND}
......
46 45
	nls? ( sys-devel/gettext )
47 46
"
48 47

  
49
PATCHES=( "${FILESDIR}/${P}-libgit2-1.4.patch" )
48
PATCHES=(
49
	"${FILESDIR}/${P}-libgit2-1.4.patch"
50
	"${FILESDIR}/${P}-webkit2gtk-4.1.patch"
51
)
50 52

  
51 53
pkg_setup() {
52 54
	use lua && lua-single_pkg_setup
53 55
}
54 56

  
57
src_prepare() {
58
	default
59
	eautoreconf
60
}
61

  
55 62
src_configure() {
56 63
	# -DLUA_COMPAT_OPENLIB=1 is required to enable the
57 64
	# deprecated (in 5.1) luaL_openlib API (#878529)
......
95 102
		$(use_enable ctags geanyctags)
96 103
		$(use_enable lua geanylua)
97 104
		$(use_enable gpg geanypg)
98
		$(use_enable soup geniuspaste)
99 105
		$(use_enable git gitchangebar)
100 106
		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
101 107
		$(use_enable pretty-printer)
102 108
		$(use_enable scope)
103 109
		$(use_enable enchant spellcheck)
104
		# Having updatechecker… when you’re using a package manager?
105
		$(use_enable soup updatechecker)
106 110
		$(use_enable workbench)
107 111
		# GeanyGenDoc requires ctpl which isn’t yet in portage
108 112
		--disable-geanygendoc
113
		# Require libsoup-2.4 which conflicts with webkit2gtk-4.1
114
		--disable-geniuspaste
115
		--disable-updatechecker
109 116
		# Require obsolete and vulnerable webkit-gtk versions
110 117
		--disable-devhelp
111 118
		--disable-webhelper
Thank you!