gentoo resync : 14.05.2020

3 files changed, 23 insertions, 10 deletions

diff --git a/x11-themes/arc-theme/Manifest b/x11-themes/arc-theme/Manifest
index 8a194516a1bd..e9e8127583c7 100644
--- a/x11-themes/arc-theme/Manifest
+++ b/x11-themes/arc-theme/Manifest
@@ -1,7 +1,7 @@
 DIST arc-theme-20190330-pngs.tar.xz 87632 BLAKE2B a860abe61d98c1ba2c7e13d21cb24e74e110b4e075eb53fc0d34b5e84eeed345a9b32e948e673b445d15e74b4c27991408139861b2d80124c8d97e417ecb3fb3 SHA512 0421530b99ebbe286e111477a056e17e7aa23a63e8c7d63443c4ffcdcb053f191a05fd16e54d9fa4efa9d1c870ff500ffb0c519d6604d6d7294cc1da711de5ba
 DIST arc-theme-20190330.tar.xz 227936 BLAKE2B 35815019884c55ce2d22dbb2d78892c00b35839b017fb7f0c1e9e1f1bad1bf94703e0c15205045eed96add556381c28fdd702c7657226fd75492304abaafd41d SHA512 ac4f1bde028e027314004999502dcc914abf6070ffd4345021df486084de2c943e6c110776b3b6af55143962a40b368c060a11754ffaf30300b87cb923bc55b9
-DIST arc-theme-20190917-pngs.tar.xz 87664 BLAKE2B 8f4cd7cf4eaeef6e71113178776e35f81df1c7a86c5a4e1727ddac9e2c18f81ff51f0b8c2ca578c176fddb969fcbdef7135080c1a8851f56e1b1a33d8c2b86e6 SHA512 5ded6dd5f0c7067c8abefef8fae4620caf795f10b5fe46c30ab7b430379f3b3e2eb27ec85c752bb4a77288a640bcf6a5f4d60e19a97f96af1b31143014afde37
-DIST arc-theme-20190917.tar.xz 308592 BLAKE2B 0ca3b6bb9c501891243755984799c404645a524fd5e65e6ed5d509d3c3b0b54d60a2219030b86d6e8a19a12106da832ff4a4fcd35ff1f02766b57d104e9e642b SHA512 da3e98e696160542fc77678193ff4fdeecc1cab7b4c1ec57e1bd850486a80547e1d688c9784f5ef422f097449f1105c071a3ff917c25a6a315fe970bedf10c6f
+DIST arc-theme-20200502-pngs.tar.xz 88116 BLAKE2B 18dfee1f51a0e1e272f73523617600490584d9044539717d8a4712083d6cb87751449818b38d503bbc0a8ef016690d606a7f23ba253eda48aecfbadc0cb1b483 SHA512 c25df3088c6edcd88799200e33005b56bf048dff606a06678c8cc7af6d0d84eb9237fcc76b16057bbee538ffa01ae7e983ab94dd184b140ec45d12a8d06d3a1f
+DIST arc-theme-20200502.tar.gz 1090296 BLAKE2B 10feeecee89007b6ae1aab2e7ad95f2f3513660e2d4dafccf659b0829047b0cb551b4d8e6923d409ededba2ec5ff9f6c93f0b2c3959e3a68d5e51ccbb76861d5 SHA512 95ebf8e434af1b5976ebef7489b9b5c51c919cd161cb6dc86056559f7b34c56a8d5580b74a30bf32dc1a32636f1c7633ab20ad204f6102d92509cf1e21032fcd
 EBUILD arc-theme-20190330.ebuild 1947 BLAKE2B 6b57679c082fd8cfdd6f9838737b6a6687e5a7e335233636457cda58f387a4271e4329854d5cdd1d6015d7ac1b694b7ecb9e32e00a146949a9b52a6094511fb4 SHA512 1200c505dcc9a24ad2a1d7e74405e1190ff59a5584bc2674703fc86ab72ea993476f1b2d205189f04f397f168e94eac65ee2f1d14c182593410e36fefe9d1992
-EBUILD arc-theme-20190917.ebuild 2072 BLAKE2B 6e5517f6211f1dce32cfff79af5fa5413fa993a7bfcd7c247949a081919c520c9517ceeb1621fd69113b48438644ebd4a1d0a55708d77dbc284db02bea98ebe4 SHA512 6cd500f2296a83d99fc011097b87640ee1a844b33b76b34a00ca4939573458d71dba14211ea79662af38196bd4f4a8fc1e16b154db1c7513820602a96b975473
-MISC metadata.xml 904 BLAKE2B 98f5e710287c3dd33fef6ce5b2489fc9bd007d98493e58a9ad61b3dcb68eeadf8bdbfe51fa56e3219d7c1a725517ea77496affe525d110ad9e18353738db9cc7 SHA512 a258fb23cfa69a8a6d774d8b5cdfc38b9513d5201a1b8b06034a7347a693562f2727f2a58d3f1147c6f203a6b15b26a08fae9ff3e4f87c5b011036ded5884853
+EBUILD arc-theme-20200502.ebuild 2342 BLAKE2B 9973fe7208e9c72b5dd7e54c3e09d5f54938951628d8685eb4ea5a2edde74976e5b05db4882827605a016b625391856630ba9897d1a365a90d6f1e7d92f1c7fb SHA512 f24a94332eddcfbedca4ede21ca3d6efef6e2f553907c7d85ce1b2bb9fb062726fe8aa12bf594c709786556a2f3c1c7d574bb13f8640cad6d085110d57fa9416
+MISC metadata.xml 898 BLAKE2B dc323fe2b56b97d7cd5654cda904e96cc5d9c46e7afea98b6ae0a36b560098f58a9a9a66bdba461f260bc7b01bc5f9c3397527ad38d3fee9142a1fad51882d6c SHA512 6d608de81b85bf534dba5818fd5683fca97b178ab16bb43916f4d61f9284922d84fab69f37770cb709fd1048a37dd53580cb494f3d36d6b5e19a57aa7d14ec0f
diff --git a/x11-themes/arc-theme/arc-theme-20190917.ebuild b/x11-themes/arc-theme/arc-theme-20200502.ebuild
index 214bc1849753..b4b199aa370f 100644
--- a/x11-themes/arc-theme/arc-theme-20190917.ebuild
+++ b/x11-themes/arc-theme/arc-theme-20200502.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+COMMIT="958b9b554cde5a8be7280bdf4a908ebe833cbd81"
+
 # USE="-* gtk2 gtk3 xfce" ebuild ${P}.ebuild clean compile
 # cd ~portage/x11-themes/${P}/work
-# make -j -C ${P}/common/gtk-3.0/3.18
-# find ${P}/common/{gtk-2.0,gtk-3.0/3.*,xfwm4} -name "*.png" ! -path "*/menubar-toolbar/*" | xargs tar Jcvf /usr/portage/distfiles/${P}-pngs.tar.xz
+# 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/arc-design/arc-theme"
-SRC_URI="https://github.com/arc-design/${PN}/releases/download/${PV}/${P}.tar.xz
+HOMEPAGE="https://github.com/jnsh/arc-theme"
+SRC_URI="https://github.com/jnsh/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
 	pre-rendered? ( https://dev.gentoo.org/~chewi/distfiles/${P}-pngs.tar.xz )"
 LICENSE="GPL-3"
 SLOT="0"
@@ -65,6 +67,8 @@ RDEPEND="
 	)
 "
 
+S="${WORKDIR}/${PN}-${COMMIT}"
+
 src_prepare() {
 	default
 	eautoreconf
@@ -85,3 +89,12 @@ src_configure() {
 		$(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/metadata.xml b/x11-themes/arc-theme/metadata.xml
index cec57cceb9c0..7b1d8564373b 100644
--- a/x11-themes/arc-theme/metadata.xml
+++ b/x11-themes/arc-theme/metadata.xml
@@ -6,7 +6,7 @@
 		<name>James Le Cuirot</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">arc-design/arc-theme</remote-id>
+		<remote-id type="github">jnsh/arc-theme</remote-id>
 	</upstream>
 	<use>
 		<flag name="cinnamon">Install theme for <pkg>gnome-extra/cinnamon</pkg></flag>