[gentoo-commits] repo/gentoo:master commit in: x11-themes/tangerine-icon-theme/files/, x11-themes/tangerine-icon-theme/

[David Seifert]

commit:     b6c8f92eaee6c4efeb410e069b23b8bafeb62e2e
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 24 11:53:25 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Dec 24 11:53:25 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6c8f92e

x11-themes/tangerine-icon-theme: Port to EAPI 7

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../files/tangerine-icon-theme-0.27-libexec.patch  | 11 +++++++
 .../tangerine-icon-theme-0.27.ebuild               | 36 ++++++++++++----------
 2 files changed, 30 insertions(+), 17 deletions(-)

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 00000000000..4ca0b88c8c1
--- /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 457528857ff..365c0df5978 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; }