gentoo auto-resync : 07:07:2023 - 22:17:58

4 files changed, 25 insertions, 4 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 2450f896ba74..936574465b00 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 511f9ad4ca1b..2536f1440443 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,5 +1,6 @@
 AUX geeqie-2.0.1-allow_xxdi.patch 776 BLAKE2B 59f566ef44b581e06b7d066fc6874a552bc08ad4b180ed1a240839661d50a92b860738efd8994c3a5344746bb109cd6da7cac0b68c3b37f730ba842a9382883e SHA512 376ca5efc6ec2f5385c4c4f77e5257d105ecf2ef39d26576a2f50307b8babdb2ae55d8aa38a23709eb1aa7d5dfa62e0213b3a71aebe70c54c7d6a1afc5b7da8a
 AUX geeqie-2.0.1-doc_option.patch 4141 BLAKE2B 59ea49f13d8bd666a01c0905ae95845eb1ecc6acbe71b7ef8553902c0ffca172984ca7dabe39e840d0ca779e13418a8a8043cacc0e3992d691a363f547fa0d58 SHA512 4edb088606d5a4b6f1d83390b40c47c8d2e06a2da2a2ea21dd9049961c63253a9aaa32d0270ef3969b0a273f5f9d2114a740328d9d4d7bbf73b766ecd2aaa8a8
+AUX geeqie-2.1-lua_hpp.patch 344 BLAKE2B 8206ef3ec5faf9b94efe57413905dedef5046b0d90056864e33b2adb876ca4bb3867417a24e4f6956d14923b3ee119ee5e8379f314cffe8ade2c1102bcb3c1de SHA512 599f9b63fad24bd292a393ead338894c6330b82fc3e02e71e16f7a85b49fa0ed564677444b5d78d68b4ac91ad04e8a6c237e3119031e1307ab089ae37e6eb838
 DIST geeqie-1.7.3.tar.xz 1949696 BLAKE2B c261a09446472f2decb0f332f227453e14fbffbc64bff77c538062d7cf57fd91efd7d30a121b2760795eb9c097e993a1dcbe5ead79cb32c200092e27422ad8b9 SHA512 5647422876dcd41ec369cc926783661e15f33c2794e073df98827b8fc030baf3ebf03587e42eef35caaddc3b315b74ee0f8c3a156422f72522ffbbb7ec0fd8d9
 DIST geeqie-2.0.1-ChangeLog.tar.gz 626106 BLAKE2B b1e166e7537d6e2bf8a9fec259315af4d70194688b489eb44715eb51c690806dd6387e6aa884b737222a25114c36b2e1a2a70fd2bbec015e64d5f6274cac1ab9 SHA512 a986981f28bad254747fb674ee16691bbec64afb354eb158dc511e0f9b198bba8e3bd0fc2ae432322806959a5ea7434687cb462c8cbb0d1c9dc17b5431f72288
 DIST geeqie-2.0.1.tar.xz 1666600 BLAKE2B e90d9b5c0bfe9d4f84c65e4754ba3ddaee8ba44c6d493cf4b5c0e37d398a4e2f6234c60fc6e88e4022ff4f8fcaf10626037c3a80450921f88f5fd937fd386958 SHA512 cd2251c831c6d4d461d92eee84df08590752ad625e1f50d57e1fb5d0fc6ac16a225584a8217e14bf4f993ba247f7df3296498b27fcc4f5f4c7f25307699aadc5
@@ -7,6 +8,6 @@ DIST geeqie-2.1-docs.tar.xz 333756 BLAKE2B 2e569f4000befdaecebd6df9c94c59b8d9e05
 DIST geeqie-2.1.tar.xz 1800612 BLAKE2B 60190532eb8830e12acf06e39046dd04ccf28ac5d3679f2063e6f6e102add0d398dfc70a57a758d0c16483d5314ec88cb56b54829103ad938b29ac1500f86fdc SHA512 1812234d349536626433bbb7670cd45ef5ce328bf58f603af8eb4a01f7d3db2557d5a812714b12a9b49559aa1fe1c186ceddf2f632c2b303d64d36ad746a2d2f
 EBUILD geeqie-1.7.3-r1.ebuild 2360 BLAKE2B 7df2eb50e6ccc116893305927b308a28825f4a3fc931e1067f6c4d2d79e0a2b89206df35cdf808cf5ec55e052fa7d574b242fea3a926d0b3654bb4665e01ea26 SHA512 4a9c6f461480e8a758cc9d6614548ad0ff5410165b4b1b9c4c6fd1f0d42eb7f300468bc4a50a1b8a8285a6e23743677dc825c868bed9367052b6c1a7c2d75af7
 EBUILD geeqie-2.0.1-r4.ebuild 3223 BLAKE2B a7c6cec69992bece30e632b729262f667dd87be5c9d95492e7664fee04e2adb1395d021355da1acb9b73a95d8a0ac6892d3d3577a4444da6db9846ea48b28097 SHA512 5725d02c3ff3056dc89b4abdba32b3ee1dba45eaeac4c2c3b7bfb4635cb27d76303a4b49be8aa0b6e4996ae0aae0c90b09f296cf507cd0bf30fb59831f61e17e
-EBUILD geeqie-2.1.ebuild 3108 BLAKE2B 11d77386cc58a97c5903605c934661724048b7401dd9fdf74963b38b1612279585588f6438565e23aec4a94e48ebd88afecd8ffe131fe778f8eec0a40ecab24c SHA512 fe876aa92d4d66bd73c1acb6a4c23f262a9165f1b3b545d8246746100c4d74f237888df55d0f60e5f77027012bf61df2f4ad2e95cc87aff62e9f7ec2b22384ee
+EBUILD geeqie-2.1.ebuild 3068 BLAKE2B bc41e8d13926deb8354500c9ee64a3e4c9008a34fb9ce9938478ff816adc939041026cf930e13613f0f9131ccfc0a191f3cd92ad5b674da022fdd7ded4142ad9 SHA512 e2f6d050d913f1bee25ddea7042e31503ebc7a2c0da813e31c9f58e10af8abc7eeee9d4cdc4557d252ffbfdec974f1e3e92f175834d6991f9c5da66c6a62b1c8
 EBUILD geeqie-9999.ebuild 3149 BLAKE2B 0c2f3e3b42223096a96297ef0fc17c3eef27db82d85c5f4624025c5bf3b3e3df6647b56ee514ee18fe765370c3444332f0ae174d129466743d59ce55b234b442 SHA512 fb84879ef022ee8df2cbd3491751f6a210725534fca83f6f120b3972fe9a0932b9f6a2d4e920b3f5bb7782bbab39b8865960f00b295910815b2878eed68bf1e0
 MISC metadata.xml 964 BLAKE2B 68899bc0e99e06b4121753cbe15beea5a5edecff0673b1265dd09e43f06fcf76f9769949d2d08470711eafa4fc65a07a926a66465cab47aa0aa0393cab7969d4 SHA512 83ede5f6bb9ad78cddf27cb98f2985d18e46112118a823f728f29f76a1804f62bdc4252faea39adfd3a64d8959e0a9be75c7349eee5e0be4e306a8ef21597e0b
diff --git a/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch b/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch
new file mode 100644
index 000000000000..a0c816b5fb3c
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch
@@ -0,0 +1,19 @@
+---
+ src/lua.cc | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/lua.cc b/src/lua.cc
+index 84aa549a..458b658a 100644
+--- a/src/lua.cc
++++ b/src/lua.cc
+@@ -24,9 +24,7 @@
+ 
+ #define _XOPEN_SOURCE
+ 
+-#include <lua.h>
+-#include <lauxlib.h>
+-#include <lualib.h>
++#include <lua.hpp>
+ 
+ #include <stdio.h>
+ #include <glib.h>
diff --git a/media-gfx/geeqie/geeqie-2.1.ebuild b/media-gfx/geeqie/geeqie-2.1.ebuild
index 9553979fc1d4..62d485ca97b3 100644
--- a/media-gfx/geeqie/geeqie-2.1.ebuild
+++ b/media-gfx/geeqie/geeqie-2.1.ebuild
@@ -45,6 +45,10 @@ BDEPEND="
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-lua_hpp.patch
+)
+
 pkg_setup() {
 	# Do not require setting LUA_SINGLE_TARGET if lua is not used
 	use lua && lua-single_pkg_setup
@@ -55,9 +59,6 @@ src_prepare() {
 
 	# Disable doc build - not useful most of the time per upstream
 	sed -e "/subdir('doc')/d" -i meson.build || die
-
-	# Lua version
-	sed -e "s/lua5.[0-9]/${LUA_SINGLE_TARGET/-/.}/" -i meson.build || die
 }
 
 src_configure() {