gentoo resync : 22.12.2021

3 files changed, 11 insertions, 19 deletions

diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 21918b61b796..95a18de46dc5 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1,7 +1,7 @@
-DIST scite-4.4.4.tgz 2775628 BLAKE2B a7607b53bf529c56f6525d44b052a08c914d8aa1d90d475dcf46927ac5ce83c06d68b70e8d8e8969c77c367240ba1e7ac10d599c77002575e84b9baf6445d03b SHA512 1e8529286206d542e0c07353b73ab38aa9ee2e2256ed8e15328965e00a33eb026f79bd7d330253e8743cf5503fadb32c64162973ad21da16993f11e124842ec0
 DIST scite-5.1.1.tgz 3374717 BLAKE2B b7a45a86008eb592adacc8fde90cb637cc7cac821f339bb65920aaf912ee10d52badde3ed2e71118a7ce4690a0536b298c5fe5f673b886902ad4634b3a1ffaa6 SHA512 4d6c9b3ca4caed4fcb70a6b1c86a2ace13b023241f16d6faa01b3f692bcbfa14e0ce186bb08776ee0cf62768b2b77c4ffcae610ddbb6b04dcb7584fd8b3f27bb
 DIST scite-5.1.3.tgz 3427245 BLAKE2B ca765b61cb1fa96934c1e28d76a97cd7086a6c692ae33bb57591dfbc8637ffc94c4a3f20f9c6b55d11da8a76664f1d521f7e393bf6f31db55cbe02e0bf5052ba SHA512 ef86a18f739062598d3c7bf19bcd2f38ca012e890b9b4685c1f1b809e928762ab60d24c33a1f45ca33133ce5007e3a22a76e80222b121c9a4089d3c57aa0bc4c
-EBUILD scite-4.4.4-r10.ebuild 2975 BLAKE2B d11639ddcede16d0bb062f824f483e7148799cb4a690a457102d5d85714eb4a271f200da5b76f76315c08de078873c5f5e9695245aca01747c41944d68a11f87 SHA512 8436c3c2129dc22ef640534214691a4ba56242ea784141f81f04f53a0f93ca7603a4f551fc9f08c074091eb15b6ad38fc201224d7eb7c6226cf78926eadb6d03
+DIST scite-5.1.6.tgz 3436413 BLAKE2B 3bf578d750c844cebc187662d658556ba58934929872b74012b299e10f6057352d184542e37433e3e031fa566b28e91d51a5d00687c6a4df35301d8ceb75a795 SHA512 3983034e5a14d696a455375eb4ca922c458c9f74fd1d2e6c7b1735914a733978b65119b9370167227e50d20d4c6f636b96bb4d1d8eb8fe8ae1d7f7ca1c143e20
 EBUILD scite-5.1.1.ebuild 2897 BLAKE2B c86eaf29cdd5defec9555ac0a4314e3583c6445e4157b8d092d26971e97e67507dacf9b4fe64f951fe3adfcddb86bd28e4b913bce70bb2a707c0739564f76fd8 SHA512 8c0a33dac9495614ee71fe08c66f082499dfea67b820d2cf08ce49f6693f92d63c3ff967b22057eca1dd6f6b87f979bb08ac6f16080103b29625ab152ad03de1
-EBUILD scite-5.1.3.ebuild 2907 BLAKE2B d60dbdfb24e151cbc1cdba51b3325eaf0f98e87d4686ca2ea53ca57313fe6711661254e8f65d7af6ec30b7d78235d08bc6f45d95d485e90244b16ef19638aee9 SHA512 7ad48179a71ba935064dc4b359c79e83bfbe271195be67aec680b82198b26df11be91491430cc56222b3992e2dcf5da0e6ecba2f7c59c64a18dd4e53e37bf704
+EBUILD scite-5.1.3.ebuild 2904 BLAKE2B fb2515644723a09e2045de3af4b1977b775c9eea63b66e583ed242e17742718bcbf627dda94127adb45c180a75495f55b3a957e8a2a954eec9ec4455c35df6b5 SHA512 c86bab69053b8d414f698b0ce7de42535c8d95c62700262e440460dbbd51700b85302443655b33d9cd33f0688ad3f5b8b2fee1a59459922a318ce7c7cc35553b
+EBUILD scite-5.1.6.ebuild 2907 BLAKE2B 716f27367b71ec292cbb74a3ed832ea5a8544d4e9af4ba1d6632a7fd76ab236551b4520daa831032bec9f0f3d736ef77058e0d629cab130a0267e250292516c9 SHA512 2fbc30e3a70d1e1cc0edf7ace8b1b252ba0be27c330985464eb11bc84bf25e9ebe8799daf76086e3e7e934310684783948f1993ec22339c2b4802817b1e0a102
 MISC metadata.xml 477 BLAKE2B 6b4ee233530c91bd81cb7aaec6533f9d4f917765d372e8e84bed225da07b0db5e94f00d34644d9496a3d7321c8a16dc6e65b993263901ab8e58b65664f50458c SHA512 b7329399a31e6e514cebc509b048943a4cce7fca1affc7ac9f401420e885d51a7af6f60d61bc5405326c54a2d1207583f066e3b77ab4b08d00333b6ec43cdc0d
diff --git a/app-editors/scite/scite-5.1.3.ebuild b/app-editors/scite/scite-5.1.3.ebuild
index 54999f9fff31..3defc2beced6 100644
--- a/app-editors/scite/scite-5.1.3.ebuild
+++ b/app-editors/scite/scite-5.1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.scintilla.org/${PN}${PV//./}.tgz -> ${P}.tgz"
 
 LICENSE="HPND lua? ( MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~riscv x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="lua"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
diff --git a/app-editors/scite/scite-4.4.4-r10.ebuild b/app-editors/scite/scite-5.1.6.ebuild
index 1f2fd9e64c95..f04689f90329 100644
--- a/app-editors/scite/scite-4.4.4-r10.ebuild
+++ b/app-editors/scite/scite-5.1.6.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-LUA_COMPAT=( lua5-1 )
+LUA_COMPAT=( lua5-4 )
 
-inherit lua-single toolchain-funcs xdg-utils
+inherit lua-single toolchain-funcs xdg
 
 DESCRIPTION="A very powerful, highly configurable, small editor with syntax coloring"
 HOMEPAGE="https://www.scintilla.org/SciTE.html"
@@ -13,15 +13,16 @@ SRC_URI="https://www.scintilla.org/${PN}${PV//./}.tgz -> ${P}.tgz"
 
 LICENSE="HPND lua? ( MIT )"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="lua"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
 RDEPEND="
+	dev-libs/atk
 	dev-libs/glib:2
 	x11-libs/cairo
-	x11-libs/gdk-pixbuf
+	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
 	x11-libs/pango
 	lua? ( ${LUA_DEPS} )"
@@ -101,6 +102,7 @@ src_compile() {
 	tc-is-clang && emake_pars+=("CLANG=1")
 	use !lua    && emake_pars+=("NO_LUA=1")
 
+	emake -C "${WORKDIR}/lexilla/src" "${emake_pars[@]}"
 	emake -C "${WORKDIR}/scintilla/gtk" "${emake_pars[@]}"
 	emake "${emake_pars[@]}"
 }
@@ -111,13 +113,3 @@ src_install() {
 	default
 	dosym SciTE /usr/bin/scite
 }
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}