gentoo resync : 18.12.2020

5 files changed, 76 insertions, 2 deletions

diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 4bfadcb3a4fe..7f4018b47da3 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/arc-theme/Manifest b/x11-themes/arc-theme/Manifest
index f646dc2150fe..2a7fb1fe86b0 100644
--- a/x11-themes/arc-theme/Manifest
+++ b/x11-themes/arc-theme/Manifest
@@ -1,4 +1,4 @@
 DIST arc-theme-20201013-pngs.tar.xz 85204 BLAKE2B fb1ef7e0d9618238cf6057777d1494d6247b237d060c4c6772aa5a7ce740218f45f0ee6b2328bc486b8b29d2741c4c44dadcb8db5abf4e333ce519c7db961f9c SHA512 d7d28fe99ac7fce7360905eea0ed1a2cac77612dc7dde05240bbb2cf8e7cc0956f63c35426c1dae34d8adb20553758f595e442e955a202e9c73af5b61ca30a86
 DIST arc-theme-20201013.tar.xz 241636 BLAKE2B 6f825b290c0f2cf1e67d72d9dbca0f23c83e7fc2ea89bc7b69013fb38bb7959205caad1b357a5cb1c4196e4b4460f13223515124c2012aa363a17765e89f992d SHA512 c1c70c80935af2b1f3c7c9bf79ee72d5fba907fd03caadecf96d6fd796bf70d325bbb16dbe93f95d9a63eff748c7d90bcb0bf837e446e5c2770cfdccb131f45c
-EBUILD arc-theme-20201013.ebuild 2283 BLAKE2B 8575710240d8a66dca89e47fda8ca4dfa126cead32649403687f13ef0f2138760776318bb1c0c49fc714b5a2cd7d76c902b8c72105548baa078501d633cb364f SHA512 3b7414ea6f047527862599b33243080eec69991799617878f254ac4f601f49cede064d5b7b078ec28466064c12309b31ffabde0702a62d6aa5e5195a13ce0f65
+EBUILD arc-theme-20201013.ebuild 2290 BLAKE2B b857a0d484003c2a7501059ef894b222b4856e82ef1bab182480b1c9f5a12a003999ca61551bc535c581bf8fc1b214f64ffd611134ed65b475a90df05c54265e SHA512 e17c49db06eab011511bdd5db0105773fcec93dc44816ea2d5cb7bd2f3c7a7cf88c993d271d223d4eb3fc7e3664958b5676abc60b3472afa9ff4622439bb12e6
 MISC metadata.xml 898 BLAKE2B dc323fe2b56b97d7cd5654cda904e96cc5d9c46e7afea98b6ae0a36b560098f58a9a9a66bdba461f260bc7b01bc5f9c3397527ad38d3fee9142a1fad51882d6c SHA512 6d608de81b85bf534dba5818fd5683fca97b178ab16bb43916f4d61f9284922d84fab69f37770cb709fd1048a37dd53580cb494f3d36d6b5e19a57aa7d14ec0f
diff --git a/x11-themes/arc-theme/arc-theme-20201013.ebuild b/x11-themes/arc-theme/arc-theme-20201013.ebuild
index 937b51afb4e2..640c44b0ebe7 100644
--- a/x11-themes/arc-theme/arc-theme-20201013.ebuild
+++ b/x11-themes/arc-theme/arc-theme-20201013.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/jnsh/${PN}/releases/download/${PV}/arc-theme-${PV}.t
 	pre-rendered? ( https://dev.gentoo.org/~chewi/distfiles/${P}-pngs.tar.xz )"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="cinnamon gnome-shell +gtk2 +gtk3 mate +pre-rendered xfce"
 
 SASSC_DEPEND="
diff --git a/x11-themes/gtk-engines/Manifest b/x11-themes/gtk-engines/Manifest
index ff46294d85ec..45a118e5cbc4 100644
--- a/x11-themes/gtk-engines/Manifest
+++ b/x11-themes/gtk-engines/Manifest
@@ -5,5 +5,6 @@ AUX gtk-engines-2.20.2-java-look.patch 602 BLAKE2B bd9625acae0c7ce7f81089c716b2d
 AUX gtk-engines-2.20.2-tooltips.patch 1116 BLAKE2B ad050dbff4bba6c7172a449eec7b001d3f9cffc0c79043356ad1fda851d94aac8c1322caa1aedde9cb8931e6f73ac8e1f411e17c9e363a420f7612c8a6ad3ecf SHA512 0e89d704f883f0dce086f83b4dc27decc3e022f1ad7ec46e9a0ca9d5ab2e3a997826c8ca3d1340e3e51ed3e4433c7e30eac833b02f76409f66a08b178cdd3b30
 AUX gtk-engines-2.20.2-window-dragging.patch 466 BLAKE2B 851f633db234986b9855dffae2cdda3b812f48e9e221f14b601c1f65764fac0d88f5dd70cc96a50949725da52e64fb60ba59ab491856279b468dc255201cdebb SHA512 4f3f20c007a1b3fc001485fdd0c84450f8bbf3c2e95decd058b552adfeecc75a84ae2be7da3984c058df940bcb87ce6cd149d24a5e86486befd085d339c65a77
 DIST gtk-engines-2.20.2.tar.bz2 688171 BLAKE2B 1eb80f1bfa7f58cdcde6d461bcd6a41d7fe8b7ca20e11f1f59b350b3b5ce8c196c5f35330ec027d0ff1d9de19f28d412e0e3c6460487ac7ea61284fc1858a90c SHA512 049ae20d47a28b60fe5b0484e3c11bc6cd62d6167478f1d83df3066d618827ca9204767ab1b7a9ca02f542c3fc7929efc1bb85f65d66aaf5d5b15718b6de19e9
+EBUILD gtk-engines-2.20.2-r100.ebuild 1707 BLAKE2B 28b7e80b99eac648a76bd06d5a66be8584a020d910839a9bab89da5420d927b54f326a55172d4fb6cf9309bd36cddcd9d25360f367b03a0abcd97e6b3d078af7 SHA512 ce67eb04c4381235d2cec6a59e8c9e3d7a1768806d8ee5c4880a5e4fb0b422117fe5329ad7c9271cdbf12ce0ce677cb3c58d0f34a8faf211cd6d503c7f5b69e8
 EBUILD gtk-engines-2.20.2-r2.ebuild 1383 BLAKE2B ec1441c73870bf753c88cf555e238a1c00f56cc2ab071197eb13b8dbf8c048dc7434e9ffd8032c102695f55799d17b127c66b4c54c9f3fc522971234dd88b7d4 SHA512 4bb2d643f6be737ad0e91b5a1301aaa331e25acad5783d50d7abd7a063833cea074e23c9e6f5568eac0b1b26d0b78f294d4a1c8ed12f678a20b351ef8227b9b1
 MISC metadata.xml 667 BLAKE2B 4f110a2598845c8930ca8567655e34e87c9517cd68b41957d1450367b7e0ed783848bd7ce1213b407229fd7eea3b4a36760ddc7b921424821ae55fcb664e2788 SHA512 62bb1508fe80e89238a57dffb44b7e8951f5d5b8c50ddd412fdf84778e77a2e13c16bb6ff1045802fbd71a1dea038695b76febd024cb50b96258bfd67b32ad47
diff --git a/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild b/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild
new file mode 100644
index 000000000000..597dc742bc9a
--- /dev/null
+++ b/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools gnome2 lua-single multilib-minimal
+
+DESCRIPTION="GTK+2 standard engines and themes"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="accessibility lua"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+# Lua dependency uses lua_gen_impl_dep() because LUA_REQ_USE doesn't seem
+# to play nicely with MULTILIB_USEDEP.
+RDEPEND="
+	>=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
+	lua? ( $(lua_gen_impl_dep "${MULTILIB_USEDEP}") )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/intltool-0.31
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-glib.h.patch
+	"${FILESDIR}"/${P}-java-look.patch
+	"${FILESDIR}"/${P}-auto-mnemonics.patch
+	"${FILESDIR}"/${P}-change-bullet.patch
+	"${FILESDIR}"/${P}-tooltips.patch
+	"${FILESDIR}"/${P}-window-dragging.patch
+)
+
+src_prepare() {
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local confopts=(
+		--enable-animation
+	)
+	# TODO: fix system-lua detection so that it works for non-native ABIs,
+	# native builds rely on the pkgconfig wrapper set up by lua-single.eclass
+	# but that wrapper is not multilib-compatible.
+	if multilib_is_native_abi; then
+		confopts+=(
+			$(use_enable lua)
+			$(use_with lua system-lua)
+		)
+	else
+		confopts+=(
+			--disable-lua
+		)
+	fi
+	ECONF_SOURCE=${S} gnome2_src_configure "${confopts[@]}"
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}