gentoo resync : 15.01.2020

3 files changed, 32 insertions, 18 deletions

diff --git a/x11-themes/tangerine-icon-theme/Manifest b/x11-themes/tangerine-icon-theme/Manifest
index 9e138e515e6e..9b2b0b565ec1 100644
--- a/x11-themes/tangerine-icon-theme/Manifest
+++ b/x11-themes/tangerine-icon-theme/Manifest
@@ -1,4 +1,5 @@
+AUX tangerine-icon-theme-0.27-libexec.patch 331 BLAKE2B b5e62d4c113488cb0c79ef211428b7f7dc63b64eb066bb5f81d1139bbb7ca4bfbae793c88a92ee119c0afcdab7cd25b344c719b22441dab6dabffbced7bddd94 SHA512 49b716bd3271e29126f28276aaffff2b41f85384518a2f961ea6eb5ed7b3beefb37ec2627b586b518624c3bf29d65a4351dcd0f4f65ec089cbc570e7c5188bf3
 DIST gentoo-logo.svg 13764 BLAKE2B 8b6339945e24f8017d75030b6cbbd767be0955fa5b7783e33e223e631b48f442e57428caad2f2554a157bc2a2f63da159bc8f443c3d2eb87c16cd2e3262221a4 SHA512 c89df6fad432dfbbed921c4828ff22b9ea5b8930f403ad23e867a11d98764488dddc453b6f26503f9f6dc25b8c5a387b7cc91c17a6b5cee15c4aadafe76409c1
 DIST tangerine-icon-theme_0.27.tar.gz 1163543 BLAKE2B 6c6ad3e257654f341a66b9e7dd5d4bd5e60a061d6fcea092a302e1aa7ae0c0a6c123537a7f6c8609f2c44c2c0b6480169e63e31f577ec8c9360840256145d1f4 SHA512 e9efc3a7b215e07089d9c326c5f46bdcc6f53161c1340def5244affc5c5dbe462d532ceeae2b02d3d2a698d600700371e7016bd76efb5d40bbaa73ec447616ef
-EBUILD tangerine-icon-theme-0.27.ebuild 1276 BLAKE2B 9a8d55a3286a7851b8146f74c331e326378bf1adc52ec5c25a45f4f92945ec6b0d35778dd5a7377ad07926f5a02af44ffd738720f5ffeacc9324b7889969b719 SHA512 c7f1aa702cd6ae537934ef92505f5c3ecc6231ac8d0c39f35124177e7be75017165b875a5bbdfd6ac858fa38288597a84189f180b45bf7232321112395eddba1
+EBUILD tangerine-icon-theme-0.27.ebuild 1103 BLAKE2B 4da09211c927a8f019ab1a0f5ed05ba88795191f98102683c918cce0b9234b70c4e563da6aa2e8f56506af7e9184e5af97ef5965f65f77ad1e644ef5cde850db SHA512 6d4d1fdd141c5d1e2e8dcd5395b64c311a937244e42a2bc3f86d0743bb697542ea7e10ed5e37d0958fe28343d6293a06f129da88ebccbac80bbca85a16203999
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-themes/tangerine-icon-theme/files/tangerine-icon-theme-0.27-libexec.patch b/x11-themes/tangerine-icon-theme/files/tangerine-icon-theme-0.27-libexec.patch
new file mode 100644
index 000000000000..4ca0b88c8c13
--- /dev/null
+++ b/x11-themes/tangerine-icon-theme/files/tangerine-icon-theme-0.27-libexec.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -19,7 +19,7 @@
+ 
+ 	# run icon-naming-utils
+ 	for d in $$DESTDIR/usr/share/icons/Tangerine/*; do \
+-	    (cd $$d; for c in *; do /usr/lib/icon-naming-utils/icon-name-mapping -c $$c; done); \
++	    (cd $$d; for c in *; do /usr/libexec/icon-name-mapping -c $$c; done); \
+ 	done
+ 
+ 	# install mo files
diff --git a/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild b/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild
index 457528857ffc..365c0df59781 100644
--- a/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild
+++ b/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild
@@ -1,37 +1,43 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit gnome2-utils
+EAPI=7
+
+inherit xdg
 
 DESCRIPTION="a derivative of the standard Tango theme, using a more orange approach"
 HOMEPAGE="http://packages.ubuntu.com/gutsy/x11/tangerine-icon-theme"
-SRC_URI="mirror://ubuntu/pool/universe/t/${PN}/${PN}_${PV}.tar.gz
+SRC_URI="
+	mirror://ubuntu/pool/universe/t/${PN}/${PN}_${PV}.tar.gz
 	https://www.gentoo.org/images/gentoo-logo.svg"
 
 LICENSE="CC-BY-SA-2.5 LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="minimal"
-
 RESTRICT="binchecks strip"
 
-RDEPEND="!minimal? ( || ( x11-themes/adwaita-icon-theme kde-frameworks/oxygen-icons ) )"
-DEPEND="dev-util/intltool
-	>=gnome-base/librsvg-2.34
+RDEPEND="
+	!minimal? (
+		|| (
+			x11-themes/adwaita-icon-theme
+			kde-frameworks/oxygen-icons
+		)
+	)"
+BDEPEND="
+	dev-util/intltool
+	gnome-base/librsvg
 	sys-devel/gettext
-	>=x11-misc/icon-naming-utils-0.8.90"
+	x11-misc/icon-naming-utils"
 
-DOCS="AUTHORS README"
+PATCHES=( "${FILESDIR}"/${PN}-0.27-libexec.patch )
 
 src_unpack() {
 	unpack ${PN}_${PV}.tar.gz
 }
 
 src_prepare() {
-	sed -i \
-		-e 's:lib/icon-naming-utils/icon:libexec/icon:' \
-		Makefile || die
+	xdg_src_prepare
 
 	cp "${DISTDIR}"/gentoo-logo.svg scalable/places/start-here.svg || die
 
@@ -45,7 +51,3 @@ src_prepare() {
 src_compile() {
 	emake index.theme
 }
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }