gentoo resync : 27.10.2018

8 files changed, 95 insertions, 49 deletions

diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 81bdc585088c..b0bb25f7994d 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 9fb04f828710..b1a70cac3a09 100644
--- a/x11-themes/arc-theme/Manifest
+++ b/x11-themes/arc-theme/Manifest
@@ -1,3 +1,4 @@
-DIST arc-theme-20170302.tar.gz 1534152 BLAKE2B fe3afd99e43ee5bb8b5a96b76359f5487ca4b84e4c768a79e3553564fb814ff3f392648a8b4dac54ba42d67ffcaac8edf0cefbc749ff5ce89207085bb1fad80f SHA512 99408a7c4db2bd2d81453e308ae5d9bc9bfda4f11e57191936f985de2937debff76c4d1f37a97ac8f5ad3751401ee8ad02457e4558b9c4aedc2bfeba1736ef03
-EBUILD arc-theme-20170302.ebuild 1163 BLAKE2B 9a962ebe7c965dbc34c3fa517117ab942f07845bf2c2e755e37ed8ed35d432e4045185dc26b0972c1ca20d7fbca0dff6b17514f165285dc96e39d252c75af111 SHA512 f3393d6e41c84fb789b4d45280f66b6d6f5937a24733dff9764c5674ab9fd20da1ee8a1de9b0fa7eba075583c87f211ff12d0c07f8232eb052660402b23f4f61
-MISC metadata.xml 759 BLAKE2B 9df5e6680ca9c3bc16585f930b89201da56f2fe8bf28a2cc9b76cca98cb5e0d90d87390bd5613fe783d1640a603b4b0768952880a04035f3e2d88ddcd8d83c29 SHA512 fc72b105803483c4c0771b3983c3ab151ebd22ede3e2722d471df2ae383f178b0e0e4755d1f3d2df7ebea31d40e99d70a8d1e295a5bde6da837bb4779b0e265e
+DIST arc-theme-20181022-pngs.tar.xz 88512 BLAKE2B 2ed193249e12d8726c0fd0e40b2d64e9f61c625f646b180a0c2fb420efcebf120e4b84059940173c71905d679e8cee3f8dde544c251c36a59524172a0400f0e9 SHA512 d5392515ac53e9b3b40bf4a94b242a06ddedffbe540bf651e0a08ab29092d68a65b55d2b9fe7821d3fb89650b01e05491c2ea357b6bcf9f0c1e181dea42e527e
+DIST arc-theme-20181022.tar.xz 226736 BLAKE2B e60fcd6507a18386a27cfce27ebc55cf318556cf16ed89eea13cc8cbbd202ceda689d7cc2e8153f3834591713bd7b7db9e4358c50c3223480fbe86cbbc6ebe31 SHA512 0562a91740a08d799fb12749c8c3a1baccbfa0ed68b2fd4ced1965a929df395e83bf1ee336c5ed61e90701ac87e8d4f143622e0458f6eda26eeff43d7a811f1e
+EBUILD arc-theme-20181022.ebuild 1948 BLAKE2B f691485b7c32a94c2d0cd10c8b845ec797de75fce58b3c107d84ccae5b275826471eb77b51ddeaf152aeb8583a320277959e70accb6393692a73cf8e5122f76b SHA512 cbc5f26cea4e831ed7a0d1e156bfbe034f3f981adae9d3807178ac481500bc12fc2ef097edc7b1e68caaab899966644ba861be39f9c209e1ff632bd687f39a7c
+MISC metadata.xml 903 BLAKE2B 32d83b7fa5f836c4faa371b381b3d9487802ea7939c1bfec0d39e18f7853131aeac99b30e244a0f60291acc0d4fc1932d4350732184fc1374ea445f6fcb1424e SHA512 8238f6b4342d0ce1d9d8622bd92c77f123f92e2453e58a660e35c24340c1dc9dd1581f779b8b038c2f782216971a454a54cd6a833354960a1a12dff3e83f1376
diff --git a/x11-themes/arc-theme/arc-theme-20170302.ebuild b/x11-themes/arc-theme/arc-theme-20170302.ebuild
deleted file mode 100644
index da22f3d75f47..000000000000
--- a/x11-themes/arc-theme/arc-theme-20170302.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A flat theme with transparent elements for GTK+3, GTK+2 and GNOME Shell"
-HOMEPAGE="https://github.com/horst3180/arc-theme"
-SRC_URI="https://github.com/horst3180/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cinnamon gnome-shell +gtk2 +gtk3 mate xfce"
-
-# 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. https://github.com/horst3180/arc-theme/pull/436
-DEPEND="gtk3? ( >=x11-libs/gtk+-3.14:3
-	virtual/pkgconfig )"
-
-# 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() {
-	econf \
-		--disable-unity \
-		$(use_enable cinnamon) \
-		$(use_enable gtk2) \
-		$(use_enable gtk3) \
-		$(use_enable gnome-shell) \
-		$(use_enable mate metacity) \
-		$(use_enable xfce xfwm)
-}
diff --git a/x11-themes/arc-theme/arc-theme-20181022.ebuild b/x11-themes/arc-theme/arc-theme-20181022.ebuild
new file mode 100644
index 000000000000..7df4cdc5b08e
--- /dev/null
+++ b/x11-themes/arc-theme/arc-theme-20181022.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 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 ${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
+
+inherit autotools
+
+DESCRIPTION="A flat theme with transparent elements for GTK+3, GTK+2 and GNOME Shell"
+HOMEPAGE="https://github.com/NicoHood/arc-theme"
+SRC_URI="https://github.com/NicoHood/${PN}/releases/download/${PV}/${P}.tar.xz
+	pre-rendered? ( https://dev.gentoo.org/~chewi/distfiles/${P}-pngs.tar.xz )"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~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. https://github.com/horst3180/arc-theme/pull/436
+DEPEND="
+	cinnamon? (
+		${SASSC_DEPEND}
+	)
+	gnome-shell? (
+		${SASSC_DEPEND}
+	)
+	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-openbox \
+		--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)
+}
diff --git a/x11-themes/arc-theme/metadata.xml b/x11-themes/arc-theme/metadata.xml
index 33dd600d4218..ac2d19205792 100644
--- a/x11-themes/arc-theme/metadata.xml
+++ b/x11-themes/arc-theme/metadata.xml
@@ -14,6 +14,7 @@
 		<flag name="gtk3">Install GTK+3 theme</flag>
 		<flag name="mate">Install Metacity theme for <pkg>mate-base/mate</pkg></flag>
 		<flag name="gnome-shell">Install theme for <pkg>gnome-base/gnome-shell</pkg></flag>
+		<flag name="pre-rendered">Avoid <pkg>media-gfx/inkscape</pkg> and <pkg>media-gfx/optipng</pkg> dependencies by using pre-rendered PNGs</flag>
 		<flag name="xfce">Install theme for <pkg>xfce-base/xfwm4</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/x11-themes/numix-icon-theme-circle/Manifest b/x11-themes/numix-icon-theme-circle/Manifest
index 18e60e758609..e2048a6f6c8a 100644
--- a/x11-themes/numix-icon-theme-circle/Manifest
+++ b/x11-themes/numix-icon-theme-circle/Manifest
@@ -2,6 +2,6 @@ DIST numix-icon-theme-circle-18.08.29.tar.gz 2095843 BLAKE2B b39bd5eaf3c9ec4156a
 DIST numix-icon-theme-circle-18.09.19.tar.gz 2196678 BLAKE2B a58ab5381f4ad1e441d188c1b7db0836b025d57c4075030c0e83a12de7917cd775be7bb8ae686afe302188232569c67d21772c119102a30d4bc717f301b3e44e SHA512 ace6c50ec9e9b08aac579ae92a44ba48494f2f22403e233c5ec00bb967c9bb6b70e785fbb061bfc9693db4de0ee90023af66c66e6984bd36d1e92be5f68afb02
 DIST numix-icon-theme-circle-18.10.03.tar.gz 2198504 BLAKE2B 632baceb5dd56cce372a79cb8a0e21cc5201d4bf32f939db10fd9dcfb5642f64ab38e180c622e832e23299580b3c4c4f23baccf6a771e09c1e7efeb4864af4e7 SHA512 0e494367cffd7e77dca282ceb7d368950eb6c2e64d8bc58ded95bfdf4b83265be5bd9c7ed8cb5377a5e8250109dbc87ba48c2fcab29e9c3e2626e93cd999eb54
 EBUILD numix-icon-theme-circle-18.08.29.ebuild 656 BLAKE2B 2b8c3adfbe332b3d7756d932436dd91bbd4bb3980e1c771a3a40e34d84089fbad6bc77302bf9ea0cb71dadc02e3e85ae13f95cc70dbd13bfc8a79109fbfe5491 SHA512 13e9ef15122930c5bef8f06a69e9536cae6a87872d0872438989dee3422882e8a3c2d769eacbe3a4de6327a6d9563308969d1ffa6a77871b45314215548aa8a6
-EBUILD numix-icon-theme-circle-18.09.19.ebuild 658 BLAKE2B bdf504c4bed139c463f9f53bf909566572fdcbd839df81d3f3a2865b5261b82de6b3f4d43d4d30b842f1f0f656d37fd1473e72940435ac29f03c0367ccbb7aa9 SHA512 03dc8c0bfe49741f67202254481b9a6527f254485bd103d5a96fd526496bc2f7d38fdf8f8a5de70f152817b3061a8302597939f7b082b8c7f758ed3128598914
-EBUILD numix-icon-theme-circle-18.10.03.ebuild 655 BLAKE2B a61d0b3b4873188d9543ef6a3b796f9774375f71545cd0efdf5112f0cf54d5db45095e6c433b285af49eef3844aeebb595cf1cfdcf9b9c709198ece1de9d52c2 SHA512 71590593d27b1a537137006f687f0b869688fad7b8c9439cd4bcc9073f67f50a66c47649478345ccd4452fc76f2ffc5628d83282b1f2483ed9181d1bd915d893
+EBUILD numix-icon-theme-circle-18.09.19.ebuild 653 BLAKE2B 26975b6f26f195b4f01a6e725368f777b62868e4ea86a07358086c0ecd8032c03d7592268aefd53b6eb047413df2406ada1edea2f70a2644ae0f172f57065fdb SHA512 fccb29eb884f727777a4a640ea01fc2831dfea7e767dc631547f24b48bce7dce27aaafc31f9f2cd2d3c06f74b4371843aec8ec4b39f24e197fb10409980b91da
+EBUILD numix-icon-theme-circle-18.10.03.ebuild 653 BLAKE2B 26975b6f26f195b4f01a6e725368f777b62868e4ea86a07358086c0ecd8032c03d7592268aefd53b6eb047413df2406ada1edea2f70a2644ae0f172f57065fdb SHA512 fccb29eb884f727777a4a640ea01fc2831dfea7e767dc631547f24b48bce7dce27aaafc31f9f2cd2d3c06f74b4371843aec8ec4b39f24e197fb10409980b91da
 MISC metadata.xml 341 BLAKE2B e5184c4dd30e2cb0aa7d87a8aab5cc9886b6f3ef0351bbaedefa7565231dc7933c4c37958bc5f4ede9286ae795edf16896576274882156b998b70bfd4b34d293 SHA512 a013dcf5530f09aac85d3098dc08eee4746f0a25439cdecf2824209177cf9a05759602bb5b3f5d7118ccf9e8c8e234fc7fc99d089c9f4749945b4c6b438374e9
diff --git a/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-18.09.19.ebuild b/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-18.09.19.ebuild
index 52eb0e5b258b..01036f41e0f8 100644
--- a/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-18.09.19.ebuild
+++ b/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-18.09.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/numixproject/numix-icon-theme-circle/archive/${PV}.t
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="x11-themes/numix-icon-theme"
 RDEPEND="${DEPEND}"
diff --git a/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-18.10.03.ebuild b/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-18.10.03.ebuild
index d2b6a630f0ba..01036f41e0f8 100644
--- a/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-18.10.03.ebuild
+++ b/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-18.10.03.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/numixproject/numix-icon-theme-circle/archive/${PV}.t
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="x11-themes/numix-icon-theme"
 RDEPEND="${DEPEND}"