gentoo auto-resync : 17:02:2023 - 08:06:58

6 files changed, 160 insertions, 2 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 1a9b24251cd7..83222bb3a51c 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index 2b2aa9fb59cb..716a0ca253f6 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,4 +1,6 @@
 AUX geany-plugins-1.38-libgit2-1.4.patch 4854 BLAKE2B 5605f5776186adaadbc0f861a1de217587a0cadcbd5f0844a0071246e5622ac830f759de4b1c7a5a3540d809c40822b619d0985561cb0f05c557c6d4d06a4a37 SHA512 9b35a656171a6183bbc8764622903d2e7767fafb548c3f2d3cb4e072a01c0bdbbfbeee20b65d42dc36f30bbfde28c5c2899e14f5ccdde1c8e96c877670889977
+AUX geany-plugins-1.38-webkit2gtk-4.1.patch 811 BLAKE2B 1c682cd813350cc61d53fe72609aac7ef212bb4710f0925bc55f5da6f9241c3709d7183d25478024ac8883633ff3605b5b4e5e5c90005a09eb653c701059909a SHA512 4b02c9a13e57ded452d52ff10c0f81ddc56bc193e0301c0805ef154792125fe9f9b6a5c35e81d9535407a67b12a268f5e1eb122b24580c6cf5ad92b0de2b1479
 DIST geany-plugins-1.38.tar.gz 4783970 BLAKE2B 386a05d7136183799059ef6d73b28a0d67d738939b0dc57649ac68f1049104568fe7c8453ebf2144277f60ee0834564b19bf4e756168864f1551962ba2411c14 SHA512 82d04331e23c5d81765b11e081a960a7a17172184cabe94efd2ddb37ac94668349b036e6083f77c867ac650fa7b251ba3970ae26b562b4568d6e313652763339
+EBUILD geany-plugins-1.38-r410.ebuild 3213 BLAKE2B b3732acca0cd047f095dec52a28b571b74633cc469a5112f80a4ddaf49f7bd32d3b55c69efbfd8c46632cbda1c765de65c70e42568b92d00ed5559dcc19c3385 SHA512 467d9167d5419e96898854db84efacd36ce3a71595f81dc1d417f8d707851617c65fcb47fb12b714eddc8ec61e01deff835f826b0edce01c24b4b96027a3b6e9
 EBUILD geany-plugins-1.38-r5.ebuild 3175 BLAKE2B fe5ff1db7c4186578dc23a45153df0baa490f6448727ebd11fc841ccdea3009253a698997332633bf739cd7289fa1bef00c190d842b752336a655eab986cb7c5 SHA512 c0e1e867c78d8be62ab26fb9d6287f8d393ce98b01038f7212c8c468e98cb4524b607bf2c386cbc6a285af7d8309362029dcddb61bf88c4d667ef550e46a5abd
 MISC metadata.xml 1201 BLAKE2B 4ee72164edb11f331607e02bc93f143214ca497d7ef461e6bb621d1dae99d128bc2243ec712707d63a935969bdacc6309ce4edb5d4f30eda08b2827c8674aa79 SHA512 5180861ae35b043f48125ac03dc6f28864f83186c84b6a3b0111da3b264537553ddb296e960dd2bbb8b7626b8bb842e4ff76931837210d39ab885213608ef51a
diff --git a/dev-util/geany-plugins/files/geany-plugins-1.38-webkit2gtk-4.1.patch b/dev-util/geany-plugins/files/geany-plugins-1.38-webkit2gtk-4.1.patch
new file mode 100644
index 000000000000..ad543af6587f
--- /dev/null
+++ b/dev-util/geany-plugins/files/geany-plugins-1.38-webkit2gtk-4.1.patch
@@ -0,0 +1,20 @@
+diff --git a/build/markdown.m4 b/build/markdown.m4
+index 6c1f53a6..39bea2a6 100644
+--- a/build/markdown.m4
++++ b/build/markdown.m4
+@@ -49,13 +49,13 @@ AC_DEFUN([GP_CHECK_MARKDOWN],
+     GTK_VERSION=2.16
+     WEBKIT_VERSION=1.1.13
+ 
+-    GP_CHECK_GTK3([webkit_package=webkit2gtk-4.0],
++    GP_CHECK_GTK3([webkit_package=webkit2gtk-4.1],
+                   [webkit_package=webkit-1.0])
+     GP_CHECK_PLUGIN_DEPS([markdown], [MARKDOWN],
+                          [$GP_GTK_PACKAGE >= ${GTK_VERSION}
+                           $webkit_package >= ${WEBKIT_VERSION}
+                           gthread-2.0])
+-    AM_CONDITIONAL([MARKDOWN_WEBKIT2], [test "$webkit_package" = webkit2gtk-4.0])
++    AM_CONDITIONAL([MARKDOWN_WEBKIT2], [test "$webkit_package" = webkit2gtk-4.1])
+ 
+     GP_COMMIT_PLUGIN_STATUS([Markdown])
+ 
diff --git a/dev-util/geany-plugins/geany-plugins-1.38-r410.ebuild b/dev-util/geany-plugins/geany-plugins-1.38-r410.ebuild
new file mode 100644
index 000000000000..42b73c6e698e
--- /dev/null
+++ b/dev-util/geany-plugins/geany-plugins-1.38-r410.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 )
+LUA_REQ_USE="deprecated"
+
+inherit autotools flag-o-matic lua-single
+
+DESCRIPTION="A collection of different plugins for Geany"
+HOMEPAGE="https://plugins.geany.org"
+SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope workbench"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+DEPEND="
+	dev-libs/glib:2
+	>=dev-util/geany-1.37[-gtk2(-)]
+	x11-libs/gtk+:3
+	ctags? ( dev-util/ctags )
+	debugger? ( x11-libs/vte:2.91 )
+	enchant? ( app-text/enchant:= )
+	git? ( dev-libs/libgit2:= )
+	gpg? ( app-crypt/gpgme:= )
+	gtkspell? ( app-text/gtkspell:3= )
+	lua? ( ${LUA_DEPS} )
+	markdown? (
+		app-text/discount:=
+		net-libs/webkit-gtk:4.1
+		)
+	pretty-printer? ( dev-libs/libxml2:2 )
+	scope? ( x11-libs/vte:2.91 )
+	workbench? ( dev-libs/libgit2:= )
+"
+RDEPEND="${DEPEND}
+	scope? ( sys-devel/gdb )
+"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-libgit2-1.4.patch"
+	"${FILESDIR}/${P}-webkit2gtk-4.1.patch"
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+	# deprecated (in 5.1) luaL_openlib API (#878529)
+	use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1
+
+	local myeconfargs=(
+		--disable-cppcheck
+		--disable-extra-c-warnings
+		$(use_enable nls)
+		--enable-utilslib
+		# Plugins
+		--enable-addons
+		--enable-autoclose
+		--enable-automark
+		--enable-codenav
+		--enable-commander
+		--enable-defineformat
+		--enable-geanydoc
+		--enable-geanyextrasel
+		--enable-geanyinsertnum
+		--enable-geanymacro
+		--enable-geanyminiscript
+		--enable-geanynumberedbookmarks
+		--enable-geanyprj
+		--enable-geanyvc $(use_enable gtkspell)
+		--enable-keyrecord
+		--enable-latex
+		--enable-lineoperations
+		--enable-lipsum
+		--enable-overview
+		--enable-pairtaghighlighter
+		--enable-pohelper
+		--enable-projectorganizer
+		--enable-sendmail
+		--enable-shiftcolumn
+		--enable-tableconvert
+		--enable-treebrowser
+		--enable-vimode
+		--enable-xmlsnippets
+		$(use_enable debugger)
+		$(use_enable ctags geanyctags)
+		$(use_enable lua geanylua)
+		$(use_enable gpg geanypg)
+		$(use_enable git gitchangebar)
+		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
+		$(use_enable pretty-printer)
+		$(use_enable scope)
+		$(use_enable enchant spellcheck)
+		$(use_enable workbench)
+		# GeanyGenDoc requires ctpl which isn’t yet in portage
+		--disable-geanygendoc
+		# Require libsoup-2.4 which conflicts with webkit2gtk-4.1
+		--disable-geniuspaste
+		--disable-updatechecker
+		# Require obsolete and vulnerable webkit-gtk versions
+		--disable-devhelp
+		--disable-webhelper
+		# GTK 2 only
+		--disable-geanypy
+		--disable-multiterm
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+
+	# make installs all translations if LINGUAS is empty
+	if [[ -z "${LINGUAS-x}" ]]; then
+		rm -r "${ED}/usr/share/locale/" || die
+	fi
+}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index d80aa93f0bbc..1e6a4685bf13 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -4,6 +4,6 @@ DIST meson-0.64.1.tar.gz 2089752 BLAKE2B e444df936738ddbbc8af1cc203417ee8f6063bf
 DIST meson-1.0.0.tar.gz 2099642 BLAKE2B 0be89aeaf103b19c21a6eaf9cba43608436986ba045198b9dbe73778e925b8340c92f24ec12f480a8527e9d10da422122f17ff4469bd1076c3e85903c0ed9610 SHA512 9b1195cfe856c1aa51bc79f6eb4d0f94925bb02d0a9fbd68a6a6ced6e5c252b09b22d9aac812640687e49b8d64a313ce48d0a69a3bf83ea8ffb8c9dab559fc23
 EBUILD meson-0.63.3.ebuild 2978 BLAKE2B ebdf54198bd010928a402e68e427d1333b816bfd2a80862f94496a03f74c6030258d4295c563fac26496203f4f07d7fe747d28dfa841e7e21def6178bab85abc SHA512 728eee4770cd69040758ddf44bc6f06adcb31ef5155583d6c264e8aa21c3185f0c2c9870e8dae7fa384950f440f48db03e8e0e1367d2bdb391776340184621e7
 EBUILD meson-0.64.1.ebuild 3016 BLAKE2B 7e9a8e434623058032f5c9d2f9e0b7d3abad73acc5343f3b38270da333cab2fba8c99781fbe09a1e0875b0479b3d15c220c59d8bc2af290fb0c44e731aefa56c SHA512 6ff6d348c159a862c30b9e4c576ca11a9bc065a94323868fa69cbafc3c28ae64c30fdbd28e966950a8fd87c01be994364e47bfc8bd08f07bd71a92fe8495f79b
-EBUILD meson-1.0.0.ebuild 3024 BLAKE2B ec625a379d921d795834b542ea0b1fb6d80d9c2b959f62385a77e389b5e8615269ac58fa0b02e05056a41f17cf67e658123021a2791cd0487318b9530e9d2bbb SHA512 b7196b000747b08003a900ec8865e415f6567b870a3fed01d306f16b06e3376c8848333c5cda64f547076e908fb117b724cbeb40887731bbe2db7b64c5d9c0e8
+EBUILD meson-1.0.0.ebuild 3017 BLAKE2B cd5a96d9793d83033fc0c643d9f64b514c241601fa2d1d5b07fefde8e9e4ea291b3594ca4a67d9d45fe5405f9f2537712d6dba30ffead916d8b403aabd29aeb2 SHA512 af014014c9396ef498be932e6b0dbe4e9221816f9e80bfaf8f7ddd4bac3fa3eeac0eed738ab7c281a47085c1f68c3bef1951fc6f3e1faf57c45080e1e8671f59
 EBUILD meson-9999.ebuild 3024 BLAKE2B ec625a379d921d795834b542ea0b1fb6d80d9c2b959f62385a77e389b5e8615269ac58fa0b02e05056a41f17cf67e658123021a2791cd0487318b9530e9d2bbb SHA512 b7196b000747b08003a900ec8865e415f6567b870a3fed01d306f16b06e3376c8848333c5cda64f547076e908fb117b724cbeb40887731bbe2db7b64c5d9c0e8
 MISC metadata.xml 480 BLAKE2B 5d3a0af4d84e497dcc2ccd5eb680e898beda896d5c37dc71fcaad2fe63f436f758d356990a5bca06baee9d265389b6e7084daec90d13c004f5523df4d0badbff SHA512 748f91fc17a18302ad0892d458e8e59650ab23dd3db5e83da85cfbca03d7932633c37b16f039faa12d87f6e4ec75a7a7fe4cc22f17328e61d57d99b073b6df3f
diff --git a/dev-util/meson/meson-1.0.0.ebuild b/dev-util/meson/meson-1.0.0.ebuild
index 8140364c2c1b..f14de1f9d52d 100644
--- a/dev-util/meson/meson-1.0.0.ebuild
+++ b/dev-util/meson/meson-1.0.0.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	fi
 fi