gentoo resync : 04.01.2022

4 files changed, 22 insertions, 10 deletions

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index bd80d226d40c..044b3d54e1bf 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -6,7 +6,12 @@ AUX darktable-3.6.1_openexr.patch 1806 BLAKE2B 3f05c8fbb4dd5a76e98ef3d9a9432fb2c
 DIST darktable-3.6.1.tar.xz 4685928 BLAKE2B 8ff6224e21b44f9e881adb8f020a2ea5ff5abb2c38da1aeaed312f89e548918c6d3bba210dbb4fb6901fbf0872c6e14c2e12c5b5b27932914a00428a709e8965 SHA512 d53eb8472531c62ceebe97769c6e53f7c9ed6efb404905295f00b5bf547fd0f0c395b8b926ccafc78d6cf9fed0745da655a77eeb84d92fce5d6a7a576f277416
 DIST darktable-3.8.0.tar.xz 5415532 BLAKE2B a2295d9145806720c702d30a334f4d1c483fc651dfda8a39617daed4a71a436bfaa5b6b379f5ec0ee4bbec5f6f5eabbcb589b63644b5698100dd1672710d1531 SHA512 ce95983cbe3ca899103b4f5ee560fdbeeb441dccd453ac4d858b14a25050229e1e780595c66bfb491c88db35c128054f649b365d701ef4b19cf252bd847ffa59
 DIST darktable-usermanual-3.6.pdf 34290182 BLAKE2B 407223f6dfc25e53e2de31a05b0468a3d50ec5ccf836fa4cca61b16d43e91827c0276027ea73dd543750f240889b7325538eb474e19df86eeff4d380bf0b8829 SHA512 62c2723e5fc0434703f21bc4f5efdb997db1c0cfb800a9df217d6682325949ce18ab458a179bd20a888b73a7bd384bbbb2ea8888cba26278510abaab1e0cc335
-EBUILD darktable-3.6.1-r2.ebuild 4399 BLAKE2B 644124ce8549752a377e4f758a6e78a89e238cebe2deb07f1f214e7b2228d9f827f1bb24fc3a12aac6ce1ad8ae404d5cc183a1780d998cdb9998bde9deaaf53f SHA512 b8e3604d7c6fc288ef00d68e797144e20b9aabfc63202c3ba5aabfbdf891cc03342a60a71b2a2c05c43bc8ccf468b983345eb8524d24660e857012b93c78ff97
-EBUILD darktable-3.6.1-r3.ebuild 4848 BLAKE2B 45bc6ec76b9032b9da84ceec43705e83c98f4b5b48eedb3a6aee8c9575f6ed467a73a57b4d15bf9218240211978d54809bfbc7369d1c16ee86d7b3cfa1e2961a SHA512 f3b5bdded1c1a33c23cb1e46ef77898b348d80dd402ddee25464a0be89177b539fe5dabe0f083e27432518b7883b6479cd468b447c321ac5e4ba408a2162e6ce
-EBUILD darktable-3.8.0.ebuild 4407 BLAKE2B 289a6b9813d2af04aedb11df7479149dcef67c4825a271bf6e1a678abf237eb3df0c1f6c38ea178d22fd39b46c1602dd84636e475704ced058e4010f0dad6755 SHA512 cfa020c2687edf82350bd1e507ac6f2652869506d4303cc949760a87fad4a0dc52633f9aaed08cfab199a77ab1501b6115ed44606947c3323cd8d21e879f4994
+DIST darktable-usermanual-3.8.de.pdf 32795040 BLAKE2B f8669e1982be19bc739add60d125a5818894a7a4a6414ba15aae5e5df41ec6729c99f907e3008c42acbd6f60bc4a5d33e20d7180621d135f9fd342e6190ae6a5 SHA512 ff77afcc9a20fec36891d4487d167e40d30a1deef6418dc6bb73c94d8171b42e5edc5420457c96e08ab8581175e691f8adf91ef5259367edba55f1441d4a86d3
+DIST darktable-usermanual-3.8.en.pdf 33484632 BLAKE2B 90a4e1021917f5fad7a5a9a58e2fec95af14119ca4b48325f3e5b55e96b89f9d82b8aaa676268a255fa97cf834a109b410004a549d16742a1b33db880c46fb67 SHA512 b21683f200daca3d0ed7c3364d0c6703d976fd800d1d2ffe51df1c6cfcf2188de681cdddbf92962629a3866e18014377a58ea0e54a9fa727b663972b7f1de79a
+DIST darktable-usermanual-3.8.fr.pdf 33479509 BLAKE2B 988824b60277ea0264fec61a1157a1de048cd512a172bc86276a043c06da3a684e971cef04c31122a78b3e7305157331e6cb86cfce7a4dc4dd9dc8697eddf743 SHA512 1383bb54face948bbbad895be2470c1b13ece71c325edf40402b3416a5d9653d2e1f8c4dbfa30edd10f02c1df8b8243c9e86948c5da8d2033e28ee3c6e04bbcc
+DIST darktable-usermanual-3.8.pt_br.pdf 33648057 BLAKE2B afb6d3c1ea6b709e535e10ae2a491fb6a87c84dcfe17823a518931bda0cd8595cda72905cffc01698e60c3df991451a5cccbfcdea82966a506b2d29d61298f09 SHA512 8734a9e6c57ba37f32966873b85584c50968c1c895fa4e9d953e129bb5834f254ca46e20741d5664429ef7d6379e5a35e59f8ecb517ca88ff536b49a8216b603
+DIST darktable-usermanual-3.8.uk.pdf 33663424 BLAKE2B abeb7a04b58e7ef508b415fe11073396c78964e91fbd3face8481cd6b09cf88525b1b6bdd2988bd57d25112cd59c8c05e209931f94004349cf5b8a7a3ca59e39 SHA512 e1a81771006f5d6b7e4088455b6b444ea87b27a788cc196c2bc0b0b5d0afde241ea9e2bdbd3ffe79871f39d756d710d8e16c082a21b1194efb71f78e8724af9a
+EBUILD darktable-3.6.1-r2.ebuild 4402 BLAKE2B cd7e0a3147afb25cf1382bd009daaf5dd3c3c79da8db38e7d4471e454806c66af2594d9f1d1601524156d319c514578f790221a6ce470acd0183a642f78350a6 SHA512 16c91c5684a8184a8d0826204bba9d010f9f83b03e5f0592572236c53584dd679e14d7f6a4303434070670d401aaefc60cae7e134dd9e2d70fa50120170b1ff3
+EBUILD darktable-3.6.1-r3.ebuild 4851 BLAKE2B de2ab5411fc69f7d9cc97bebe15c9645a521daec063d03f4eeac366c8cb102053d2dee56b39c13cfd6e28b34def5f5d08034b918d387e5b9d55bc1c0b42cd5cc SHA512 e20509c07903607e9f4029b9419fedbfea3c7312faebd9ee25f7d38dd7000fc30c86ac1ab691798d914322d80e2a685a98c17b17a8b4ebb7f1ca4616933425f1
+EBUILD darktable-3.8.0-r1.ebuild 5005 BLAKE2B 957688c7fe0fb3ab9d1daafeb526aa0d580e0938767136c8ed3e7493197ccfca494b9775c679441c6c7309dbd16f954edc2ba7b99705b6baba25458b2714d844 SHA512 2cde68ff349c0e07d6c0cbe66e463f720163b4b5c48a6066db91c1c80f6444ceceffa03e33726ad9c0d0c4a5efb4604d70d8d1a25fa5a6a2422660ad0749aa94
 MISC metadata.xml 1152 BLAKE2B c43582dd3a0607de751a816c9856738d73b504422d6b21745a8f7948e2238a6be5c178bb224d787eb712aef222a592c6a712239a4a8dada4c66a453e158fc5de SHA512 8a20f53798359fec9eb45c1d2fdbe6cca623b2308f8391ece25c4100161a2056b52c44f3eba91d6d3c083f49843bac8e355982998d2c4217efdc976eb0d1a14c
diff --git a/media-gfx/darktable/darktable-3.6.1-r2.ebuild b/media-gfx/darktable/darktable-3.6.1-r2.ebuild
index 68737e363aca..ff087a4c98dc 100644
--- a/media-gfx/darktable/darktable-3.6.1-r2.ebuild
+++ b/media-gfx/darktable/darktable-3.6.1-r2.ebuild
@@ -23,7 +23,7 @@ else
 	MY_P="${P/_/.}"
 
 	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-		doc? ( https://docs.darktable.org/usermanual/${DOC_PV}/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
+		doc? ( https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
 
 	KEYWORDS="amd64 arm64 -x86"
 	LANGS=" af de eo es fr he hu it nl pt-BR ru sl uk"
diff --git a/media-gfx/darktable/darktable-3.6.1-r3.ebuild b/media-gfx/darktable/darktable-3.6.1-r3.ebuild
index 746a8b4aaf9b..12c0099cc5d1 100644
--- a/media-gfx/darktable/darktable-3.6.1-r3.ebuild
+++ b/media-gfx/darktable/darktable-3.6.1-r3.ebuild
@@ -23,7 +23,7 @@ else
 	MY_P="${P/_/.}"
 
 	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-		doc? ( https://docs.darktable.org/usermanual/${DOC_PV}/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
+		doc? ( https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
 
 	KEYWORDS="~amd64 ~arm64 -x86"
 	LANGS=" af de eo es fr he hu it nl pt-BR ru sl uk"
diff --git a/media-gfx/darktable/darktable-3.8.0.ebuild b/media-gfx/darktable/darktable-3.8.0-r1.ebuild
index 40c02a22666f..b2adbe18b7ed 100644
--- a/media-gfx/darktable/darktable-3.8.0.ebuild
+++ b/media-gfx/darktable/darktable-3.8.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-LUA_COMPAT=( lua5-3 )
+LUA_COMPAT=( lua5-4 )
 
 inherit cmake flag-o-matic lua-single toolchain-funcs xdg
 
@@ -18,18 +18,24 @@ if [[ ${PV} == *9999 ]]; then
 
 	LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW"
 else
-	DOC_PV="3.6"
+	DOC_PV=$(ver_cut 1-2)
 	MY_PV="${PV/_/}"
 	MY_P="${P/_/.}"
 
 	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-		doc? ( https://docs.darktable.org/usermanual/${DOC_PV}/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
+		doc? (
+			https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.en.pdf
+			l10n_de? ( https://docs.darktable.org/usermanual/${DOC_PV}/de/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.de.pdf )
+			l10n_fr? ( https://docs.darktable.org/usermanual/${DOC_PV}/fr/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.fr.pdf )
+			l10n_pt-BR? ( https://docs.darktable.org/usermanual/${DOC_PV}/pt_br/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.pt_br.pdf )
+			l10n_uk? ( https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.uk.pdf )
+		)"
 
 	KEYWORDS="~amd64 ~arm64 -x86"
 	LANGS=" de eo es fi fr he hu it ja pl pt-BR sl uk zh-CN"
 fi
 
-IUSE="avif colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
+IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
 	lto lua nls opencl openmp openexr test tools webp
 	${LANGS// / l10n_}"
 
@@ -102,6 +108,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	use cpu_flags_x86_avx && append-flags -mavx
 	use cpu_flags_x86_sse3 && append-flags -msse3
 
 	sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
@@ -143,7 +150,7 @@ src_configure() {
 src_install() {
 	cmake_src_install
 	# This USE flag is masked for -9999
-	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
+	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.*.pdf
 
 	if use nls; then
 		for lang in ${LANGS} ; do