gentoo resync : 20.03.2022

3 files changed, 80 insertions, 115 deletions

diff --git a/x11-themes/arc-theme/Manifest b/x11-themes/arc-theme/Manifest
index 3ec002d31345..df1b46d66c49 100644
--- a/x11-themes/arc-theme/Manifest
+++ b/x11-themes/arc-theme/Manifest
@@ -1,10 +1,9 @@
 AUX pre-rendered.ini 46 BLAKE2B 1ce5b9c6033e544572ddc22f3630fbdf0c7cfcc49bb503c20fbd667c7188640d6f4dbd368f125d22d1c863e7f58c30e2f66341a69ce35b93d0921ab019f26574 SHA512 336de96005c8a0386c2769cd82ad3e70251a7a8810e8685f9835451c1c116fffa56a0cda22989b8a60bef0bb3e067b26938a29b9a6c90f1b2f1ebb7a7448e56f
 DIST arc-theme-20210412-pngs.tar.xz 159340 BLAKE2B 40027335b8b44ae38bfadfa52e08858cf09646ed9c3e2fcddece8959d2f35845c4924002f36cea65cb27ecf61fdb3dffbf0d5c01024c34d16c31e21bf69b5a72 SHA512 85bdcd1fb81a5c33b479123bad178b1833a95ecf09310fa3b754c25f753ec10a7cada14983014b090c4a86d7a8497ac881fee9576737be29f4f772ccb59a8f1e
 DIST arc-theme-20210412.tar.xz 257248 BLAKE2B c525c3632670d8aa6b640baa8b3dddca6c5dd5f087734604c68d9140f810fc595f73db06f93b6193ba1c59a8cd85b87f5f6fda9777940adf36f3c436a8426810 SHA512 d3064546301e013a1e5a8db735346d74c73f37cbf808b7afeee6f88c820cea58ba6458fa63e1213377cdd33c8347167242e6f8f1eacf85ce212f3b2508c0bb80
-DIST arc-theme-20211018-pngs.tar.xz 160836 BLAKE2B 4c2882ce03724c7abd8d4db31da82355d28b792a16648e010eca033f77d3ad6da8f7026e2562249caa993f2e8549191b6ec8d4473fbcab084ae3d91c468956c5 SHA512 6ac7bf27ebc258d0e2c2102ed286ba196d6f9c8343e1885d77d8f29cda0f8c247926003bd8c40165e08b9b3987f8a2f82800d509b78dd598d2e7ff8bea964831
-DIST arc-theme-20211018.tar.xz 271084 BLAKE2B dc8808a5c7a0444d5ac11fa213b99b9633691ad920a07820752974f98febd8bc112a34568c38d354558e7876182278603ab66ebf8e50aa51f5eba431bd6b3433 SHA512 da46efc0e38efb7f1d0cd9a5d2c4e8f00f3b8d408ec50c54d89ef67fc3bb5ea253b5fb890b0cb8e82cafebd44a599d0de2369272ed88da73dd979052b130bd55
 DIST arc-theme-20220105.tar.xz 342432 BLAKE2B 37a4e196fbbe532e4f9036681770fb90843c8a4645b8218c471f2f5f68e7c0c07107a71698634a61553ba4f22f483a336b113ff6906fed48c0285a67321d0896 SHA512 dc2a1e1dad03fd187e8e571b752e52d73c7cbed24f3228f1782c4a4897b1085e2466f6f8373af32d650ad9835df3ad19a1206f3fa55d543115092aa46118e31f
+DIST arc-theme-20220223.tar.xz 343044 BLAKE2B 7bdd3689eae270a97d5405c2eaf523b9d81284c1860d39de5f46a7c32d75dd24f745a5264d76625c08c2185ad87e65a99e93d39be753dc0304a86daa863df3cd SHA512 33a0e73e9951fcfe74f80af5e1449df23a5564d11a26b930cbc17b0f74887aedf2634579da1e0484e22465422f62559c801dbcd35221fbb7b7fc783671103aa4
 EBUILD arc-theme-20210412.ebuild 2355 BLAKE2B ad3fef1485f56de1156d71c4c87b0266acc4536a0ddec4e409501513cb6f9cc1972e53c1549551adc1d88173600d685fefd48d79f363f72d68a3e5c9e7638e6b SHA512 9426f4794e66a1f320d71eff4627dbfd6ec4feeb199b1cce4d32b2d411dc00cbafe235040baa3a0fdd86a0bc3e69d38a4d0e15888284f5600d01ec6cda9e1c2f
-EBUILD arc-theme-20211018.ebuild 2490 BLAKE2B 940d9c4e2c6edb0047078297f474975c29534e46acc2fe96a8e8ca1a0db7a0d5d2ee57e8bc3697fb71cbef36d5ca44fa5410e1e0bacb6a8e8f77a363ea614b4f SHA512 670f26e3670bf270f66bd59cd114174c7c187841bdf211c031b8e9255205e640f4662fc4e3a6c1dd39814d5c3d85e97a3c08ac4ebb3b458bf3ae6956e2baa63e
 EBUILD arc-theme-20220105.ebuild 2008 BLAKE2B 8d828c723d37db1ebee42d5259a1d0f5b62b0d951a53f8e798e1d01ba352a1943d8a62f8dc120c68fac814b69c9f4d691225d81374625db5f17e7a110e89f7c0 SHA512 5c4c7b44dfb38e8c5cf7b8c911d455b4e9787b8f129506efe63ceb3a10947b7bee2d732461330d16e5c26b943958d4f34a933acd9ea1a3d5cdf50216dc73a3d1
+EBUILD arc-theme-20220223.ebuild 1859 BLAKE2B f5f85c48a52bf20fa071c4e46c5aea8d5d6324eb748ebfcfab9e66e596d5ef16bd5b622417e95fb633ea4f5e76a3bd9568ca72cf939b3df4086062f68dde0467 SHA512 3842fc9ea54da8d36cfb12f2558b21bb52103db068e1fc8bdb2dc4d41a37ddc88a821af2982cd5345ceb86465528a903e0d624d331173f12349b2d54c26a4fae
 MISC metadata.xml 1204 BLAKE2B 36b467fa15f13b3238ba43cdb5a9a520828bc5361bc87aa435ab5fbb629d882dc7388c53f9d2c5de296ad21a3fb018eb6273f0dd58c35f476562007266558476 SHA512 6a0819d6ca77aa3d9a4e5800e1f7d53c0d586e7064b4c9b5f4c13a3aee6a3c5c7602adf562365dd12265c0779abdc1bde7a9b39345ebed5b219f2c78cc7168a2
diff --git a/x11-themes/arc-theme/arc-theme-20211018.ebuild b/x11-themes/arc-theme/arc-theme-20211018.ebuild
deleted file mode 100644
index 1913f6de05eb..000000000000
--- a/x11-themes/arc-theme/arc-theme-20211018.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# USE="-* gtk2 gtk3 gtk4 xfce" ebuild ${P}.ebuild clean compile
-# cd $(portageq envvar PORTAGE_TMPDIR)/portage/x11-themes/${P}/work
-# find ${P}-build/ -name "*.png" | xargs tar Jcvf /usr/portage/distfiles/${P}-pngs.tar.xz --owner=root --group=root
-
-inherit meson toolchain-funcs
-
-DESCRIPTION="A flat theme with transparent elements for GTK 2/3/4 and GNOME Shell"
-HOMEPAGE="https://github.com/jnsh/arc-theme"
-SRC_URI="https://github.com/jnsh/${PN}/releases/download/${PV}/arc-theme-${PV}.tar.xz
-	pre-rendered? ( https://dev.gentoo.org/~chewi/distfiles/${P}-pngs.tar.xz )"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="cinnamon gnome-shell +gtk2 +gtk3 +gtk4 mate +pre-rendered xfce"
-
-SASSC_DEPEND="
-	dev-lang/sassc
-"
-
-SVG_DEPEND="
-	!pre-rendered? (
-		media-gfx/inkscape
-		media-gfx/optipng
-	)
-"
-
-# Supports various GTK+3, GNOME Shell, and Cinnamon versions and uses
-# pkg-config to determine which set of files to build. Updates will
-# therefore break existing installs but there's no way around this. At
-# least GTK+3 is unlikely to see a release beyond 3.24.
-BDEPEND="
-	>=dev-util/meson-0.56.0
-	cinnamon? (
-		${SASSC_DEPEND}
-		gnome-extra/cinnamon
-	)
-	gnome-shell? (
-		${SASSC_DEPEND}
-		>=gnome-base/gnome-shell-3.18
-	)
-	gtk2? (
-		${SVG_DEPEND}
-	)
-	gtk3? (
-		${SASSC_DEPEND}
-		${SVG_DEPEND}
-		virtual/pkgconfig
-		=x11-libs/gtk+-3.24*:3
-	)
-	gtk4? (
-		${SASSC_DEPEND}
-		${SVG_DEPEND}
-	)
-	xfce? (
-		${SVG_DEPEND}
-	)
-"
-
-# gnome-themes-standard is only needed by GTK+2 for the Adwaita
-# engine. This engine is built into GTK+3.
-RDEPEND="
-	gtk2? (
-		x11-themes/gnome-themes-standard
-		x11-themes/gtk-engines-murrine
-	)
-"
-
-src_configure() {
-	local themes=$(
-		printf "%s," \
-		$(usev cinnamon) \
-		$(usev gnome-shell) \
-		$(usev gtk2) \
-		$(usev gtk3) \
-		$(usev gtk4) \
-		$(usex mate metacity "") \
-		$(usex xfce xfwm "")
-	)
-
-	local emesonargs=(
-		-Dthemes="${themes%,}"
-		-Dgtk3_version=3.24
-		-Dgtk4_version=4.2 # 4.0 dropped in Gentoo, works with 4.4.
-	)
-
-	if use pre-rendered; then
-		emesonargs+=(
-			$(if tc-is-cross-compiler; then
-				  echo --cross-file
-			  else
-				  echo --native-file
-			  fi)
-			"${FILESDIR}"/pre-rendered.ini
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_compile() {
-	# fontconfig issue?
-	# https://bugs.gentoo.org/666418#c28
-	use pre-rendered ||
-		addpredict "${BROOT}"/usr/share/inkscape/fonts/.uuid.TMP-XXXXXX
-
-	meson_src_compile
-}
diff --git a/x11-themes/arc-theme/arc-theme-20220223.ebuild b/x11-themes/arc-theme/arc-theme-20220223.ebuild
new file mode 100644
index 000000000000..dddb29af6aa3
--- /dev/null
+++ b/x11-themes/arc-theme/arc-theme-20220223.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit meson python-any-r1
+
+DESCRIPTION="A flat theme with transparent elements for GTK 2/3/4 and GNOME Shell"
+HOMEPAGE="https://github.com/jnsh/arc-theme"
+SRC_URI="https://github.com/jnsh/${PN}/releases/download/${PV}/arc-theme-${PV}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="cinnamon gnome-shell +gtk2 +gtk3 +gtk4 mate +transparency xfce"
+
+GLIB_DEPEND="dev-libs/glib"
+SASSC_DEPEND="dev-lang/sassc"
+
+# Supports various GTK, GNOME Shell, and Cinnamon versions and uses
+# --version option for gnome-shell and cinnamon to determine which set of files to build.
+# Updates will therefore break existing installs but there's no way around this.
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/meson-0.56.0
+	cinnamon? (
+		${SASSC_DEPEND}
+		gnome-extra/cinnamon
+	)
+	gnome-shell? (
+		${GLIB_DEPEND}
+		${SASSC_DEPEND}
+		>=gnome-base/gnome-shell-3.28
+	)
+	gtk3? (
+		${GLIB_DEPEND}
+		${SASSC_DEPEND}
+	)
+	gtk4? (
+		${GLIB_DEPEND}
+		${SASSC_DEPEND}
+	)
+"
+
+# gnome-themes-standard is only needed by GTK+2 for the Adwaita
+# engine. This engine is built into GTK+3.
+RDEPEND="
+	gtk2? (
+		x11-themes/gnome-themes-standard
+		x11-themes/gtk-engines-murrine
+	)
+"
+
+src_configure() {
+	# Cinnamon still uses metacity themes for its window manager.
+	# so we enable metacity theme too if USE=cinnamon
+	# but only enable metacity if USE=mate
+	local themes=$(
+		printf "%s," \
+		$(usev cinnamon "cinnamon metacity") \
+		$(usev gnome-shell) \
+		$(usev gtk2) \
+		$(usev gtk3) \
+		$(usev gtk4) \
+		$(! use cinnamon && usev mate metacity) \
+		$(usev xfce xfwm)
+	)
+
+	local emesonargs=(
+		-Dthemes="${themes%,}"
+		$(meson_use gnome-shell gnome_shell_gresource)
+		$(meson_use transparency)
+	)
+
+	meson_src_configure
+}