gentoo resync : 27.10.2018

4 files changed, 90 insertions, 44 deletions

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>