gentoo resync : 24.07.2021

5 files changed, 2 insertions, 307 deletions

diff --git a/x11-themes/arc-theme/Manifest b/x11-themes/arc-theme/Manifest
index 1292b307b6ca..cdfb04f69438 100644
--- a/x11-themes/arc-theme/Manifest
+++ b/x11-themes/arc-theme/Manifest
@@ -1,12 +1,5 @@
-AUX meson-inkscape.patch 3785 BLAKE2B a83796183a73e9741a6347444ce161c9da89c702fc150e165e27b4658b3c4e41a5bf9b9f1d43575b8407c3263d30979f9de5869d3ec4fa9e070a1ff03dc98e92 SHA512 64cf610ec4ac979623a9eecd17ee47e031375e442ed81c67d9acc8fbfc5e83c389cd510d2ee7f143a7a5ce836453e60f733db82306edfbacafaeb6e2c3c67e48
 AUX pre-rendered.ini 46 BLAKE2B 1ce5b9c6033e544572ddc22f3630fbdf0c7cfcc49bb503c20fbd667c7188640d6f4dbd368f125d22d1c863e7f58c30e2f66341a69ce35b93d0921ab019f26574 SHA512 336de96005c8a0386c2769cd82ad3e70251a7a8810e8685f9835451c1c116fffa56a0cda22989b8a60bef0bb3e067b26938a29b9a6c90f1b2f1ebb7a7448e56f
-DIST arc-theme-20201013-pngs.tar.xz 85204 BLAKE2B fb1ef7e0d9618238cf6057777d1494d6247b237d060c4c6772aa5a7ce740218f45f0ee6b2328bc486b8b29d2741c4c44dadcb8db5abf4e333ce519c7db961f9c SHA512 d7d28fe99ac7fce7360905eea0ed1a2cac77612dc7dde05240bbb2cf8e7cc0956f63c35426c1dae34d8adb20553758f595e442e955a202e9c73af5b61ca30a86
-DIST arc-theme-20201013.tar.xz 241636 BLAKE2B 6f825b290c0f2cf1e67d72d9dbca0f23c83e7fc2ea89bc7b69013fb38bb7959205caad1b357a5cb1c4196e4b4460f13223515124c2012aa363a17765e89f992d SHA512 c1c70c80935af2b1f3c7c9bf79ee72d5fba907fd03caadecf96d6fd796bf70d325bbb16dbe93f95d9a63eff748c7d90bcb0bf837e446e5c2770cfdccb131f45c
-DIST arc-theme-20210127-pngs.tar.xz 159392 BLAKE2B 2a355e85766f44c21a4a85cacd184cb28ddb4ba19e7dff7cae70114c12422ed5d46a3930d780a6e2dd458684a944f5cbd17a769a0d3e331f94007b9fc9943238 SHA512 b0de3065e81979f2aa6b7f31edc1aad6dd6998776da2a1ba3b1030f6d8c552c9f1702e0bca0585e625e868541b0444b7a0d75631dfbeef517bdb9925e19e6159
-DIST arc-theme-20210127.tar.xz 256364 BLAKE2B 4e85d2ca801977588273715a94b91e199e3f16d304090789748e22b55c1339386a84938da1b1c143004655d8573678a51ff3b27e9ac3a2027de93625b0f39ada SHA512 bb0554c96cf6c3c3891698d973e7d719931fc316ea6cd910f69d21440110690aeef0e734b5f940ad1c81bdff238477b6353de4ae074cd54fbed09c680377d594
 DIST arc-theme-20210412-pngs.tar.xz 159340 BLAKE2B 40027335b8b44ae38bfadfa52e08858cf09646ed9c3e2fcddece8959d2f35845c4924002f36cea65cb27ecf61fdb3dffbf0d5c01024c34d16c31e21bf69b5a72 SHA512 85bdcd1fb81a5c33b479123bad178b1833a95ecf09310fa3b754c25f753ec10a7cada14983014b090c4a86d7a8497ac881fee9576737be29f4f772ccb59a8f1e
 DIST arc-theme-20210412.tar.xz 257248 BLAKE2B c525c3632670d8aa6b640baa8b3dddca6c5dd5f087734604c68d9140f810fc595f73db06f93b6193ba1c59a8cd85b87f5f6fda9777940adf36f3c436a8426810 SHA512 d3064546301e013a1e5a8db735346d74c73f37cbf808b7afeee6f88c820cea58ba6458fa63e1213377cdd33c8347167242e6f8f1eacf85ce212f3b2508c0bb80
-EBUILD arc-theme-20201013.ebuild 2290 BLAKE2B b857a0d484003c2a7501059ef894b222b4856e82ef1bab182480b1c9f5a12a003999ca61551bc535c581bf8fc1b214f64ffd611134ed65b475a90df05c54265e SHA512 e17c49db06eab011511bdd5db0105773fcec93dc44816ea2d5cb7bd2f3c7a7cf88c993d271d223d4eb3fc7e3664958b5676abc60b3472afa9ff4622439bb12e6
-EBUILD arc-theme-20210127.ebuild 2406 BLAKE2B e2840a54b0b27a40d4ef6494d737c86c4e479bd3eb15ec44759f78cf58073de4eff6983da4a45a40f9b990265c50ce9e52733b43c61df9acf2e12a204ee94ec8 SHA512 c7008d3816d84dbfa3f49f34ad74f0b379c15cf1edd6ba682f45dc685beba5000d93178d02bf07973ddcf2e681ace76a2530b35010547d26afeb03dbc79dc5bf
-EBUILD arc-theme-20210412.ebuild 2357 BLAKE2B 15748957c04f3fc5391195ce4bfbe1a85e0c48ca484a3e97b3d392d013648475af36f8a0c55df4605d030f9199890fe170cada93944f1822c92a41894d0a44ca SHA512 8caf9443cc0f1a8b52567777f877a161d7b86448de1a6d30940b5040f93c8ed9a51871f0f5d63f95f984a82db03c810480d5280e18a5d922ca7b3a15c5dbfe79
+EBUILD arc-theme-20210412.ebuild 2355 BLAKE2B ad3fef1485f56de1156d71c4c87b0266acc4536a0ddec4e409501513cb6f9cc1972e53c1549551adc1d88173600d685fefd48d79f363f72d68a3e5c9e7638e6b SHA512 9426f4794e66a1f320d71eff4627dbfd6ec4feeb199b1cce4d32b2d411dc00cbafe235040baa3a0fdd86a0bc3e69d38a4d0e15888284f5600d01ec6cda9e1c2f
 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
deleted file mode 100644
index 640c44b0ebe7..000000000000
--- a/x11-themes/arc-theme/arc-theme-20201013.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# USE="-* gtk2 gtk3 xfce" ebuild ${P}.ebuild clean compile
-# cd ~portage/x11-themes/${P}/work
-# make -j -C */common/gtk-3.0/3.18
-# find */common/{gtk-2.0,gtk-3.0/3.*,xfwm4} -name "*.png" ! -path "*/menubar-toolbar/*" | xargs tar Jcvf /usr/portage/distfiles/${P}-pngs.tar.xz --owner=root --group=root
-
-inherit autotools
-
-DESCRIPTION="A flat theme with transparent elements for GTK+3, GTK+2 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 mate +pre-rendered xfce"
-
-SASSC_DEPEND="
-	dev-lang/sassc
-"
-
-SVG_DEPEND="
-	!pre-rendered? (
-		media-gfx/inkscape
-		media-gfx/optipng
-	)
-"
-
-# Supports various GTK+3 versions and uses pkg-config to determine which
-# set of files to install. Updates will break it but only this fix will
-# help. See https://github.com/horst3180/arc-theme/pull/436. The same
-# applies to GNOME Shell and Cinnamon but I don't know whether those are
-# fixable.
-BDEPEND="
-	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.18:3
-	)
-	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_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use pre-rendered &&
-		export INKSCAPE="${BROOT}"/bin/false OPTIPNG="${BROOT}"/bin/false
-
-	econf \
-		--disable-plank \
-		--disable-unity \
-		$(use_enable cinnamon) \
-		$(use_enable gtk2) \
-		$(use_enable gtk3) \
-		$(use_enable gnome-shell) \
-		$(use_enable mate metacity) \
-		$(use_enable xfce xfwm)
-}
-
-src_compile() {
-	# fontconfig issue?
-	# https://bugs.gentoo.org/666418#c28
-	use pre-rendered ||
-		addpredict "${BROOT}"/usr/share/inkscape/fonts/.uuid.TMP-XXXXXX
-
-	default
-}
diff --git a/x11-themes/arc-theme/arc-theme-20210127.ebuild b/x11-themes/arc-theme/arc-theme-20210127.ebuild
deleted file mode 100644
index e7a1d5c3bff4..000000000000
--- a/x11-themes/arc-theme/arc-theme-20210127.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# USE="-* gtk2 gtk3 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+3, GTK+2 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 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
-	)
-	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
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/meson-inkscape.patch
-)
-
-src_configure() {
-	local themes=$(
-		printf "%s," \
-		$(usev cinnamon) \
-		$(usev gnome-shell) \
-		$(usev gtk2) \
-		$(usev gtk3) \
-		$(usex mate metacity "") \
-		$(usex xfce xfwm "")
-	)
-
-	local emesonargs=(
-		-Dthemes="${themes%,}"
-		-Dgtk3_version=3.24
-	)
-
-	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-20210412.ebuild b/x11-themes/arc-theme/arc-theme-20210412.ebuild
index 8d4aefb69e32..606c5e1ed687 100644
--- a/x11-themes/arc-theme/arc-theme-20210412.ebuild
+++ b/x11-themes/arc-theme/arc-theme-20210412.ebuild
@@ -15,7 +15,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 ~arm64 ~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/arc-theme/files/meson-inkscape.patch b/x11-themes/arc-theme/files/meson-inkscape.patch
deleted file mode 100644
index dfec810aa53d..000000000000
--- a/x11-themes/arc-theme/files/meson-inkscape.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 6c2e91fb79177f64eae875e1091d35ad94a74f5a Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Thu, 28 Jan 2021 23:14:22 +0000
-Subject: [PATCH] build: Fix building with Inkscape 1.0
-
-This wasn't matching the >1.0.0 version check.
----
- common/gtk-2.0/dark/meson.build  | 2 +-
- common/gtk-2.0/light/meson.build | 2 +-
- common/gtk-3.0/meson.build       | 4 ++--
- common/xfwm4/dark/meson.build    | 2 +-
- common/xfwm4/light/meson.build   | 2 +-
- 5 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/common/gtk-2.0/dark/meson.build b/common/gtk-2.0/dark/meson.build
-index 869beda9..c13608a8 100644
---- a/common/gtk-2.0/dark/meson.build
-+++ b/common/gtk-2.0/dark/meson.build
-@@ -8,7 +8,7 @@ foreach asset : gtk2_asset_names
-     command : [
-       inkscape,
-       '--export-id-only',
--      inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-+      inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-       '--export-id=' + asset,
-       '--export-dpi=96',
-       '@INPUT@'
-diff --git a/common/gtk-2.0/light/meson.build b/common/gtk-2.0/light/meson.build
-index 3df389a0..4dd32c63 100644
---- a/common/gtk-2.0/light/meson.build
-+++ b/common/gtk-2.0/light/meson.build
-@@ -8,7 +8,7 @@ foreach asset : gtk2_asset_names
-     command : [
-       inkscape,
-       '--export-id-only',
--      inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-+      inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-       '--export-id=' + asset,
-       '--export-dpi=96',
-       '@INPUT@'
-diff --git a/common/gtk-3.0/meson.build b/common/gtk-3.0/meson.build
-index fcb2e074..085bb739 100644
---- a/common/gtk-3.0/meson.build
-+++ b/common/gtk-3.0/meson.build
-@@ -50,7 +50,7 @@ foreach asset : gtk3_asset_names
-     command : [
-       inkscape,
-       '--export-id-only',
--      inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-+      inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-       '--export-id=' + asset,
-       '--export-dpi=96',
-       '@INPUT@'
-@@ -65,7 +65,7 @@ foreach asset : gtk3_asset_names
-     command : [
-       inkscape,
-       '--export-id-only',
--      inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-+      inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-       '--export-id=' + asset,
-       '--export-dpi=192',
-       '@INPUT@'
-diff --git a/common/xfwm4/dark/meson.build b/common/xfwm4/dark/meson.build
-index a2820df2..9bb7d46b 100644
---- a/common/xfwm4/dark/meson.build
-+++ b/common/xfwm4/dark/meson.build
-@@ -8,7 +8,7 @@ foreach asset : xfwm_asset_names
-     command : [
-       inkscape,
-       '--export-id-only',
--      inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-+      inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-       '--export-id=' + asset,
-       '--export-dpi=96',
-       '@INPUT@'
-diff --git a/common/xfwm4/light/meson.build b/common/xfwm4/light/meson.build
-index c65b891b..6ee79fc4 100644
---- a/common/xfwm4/light/meson.build
-+++ b/common/xfwm4/light/meson.build
-@@ -8,7 +8,7 @@ foreach asset : xfwm_asset_names
-     command : [
-       inkscape,
-       '--export-id-only',
--      inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-+      inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-       '--export-id=' + asset,
-       '--export-dpi=96',
-       '@INPUT@'
--- 
-2.26.2
-