Merge pull request 'Фикс предыдущего MR, часть 1' (#7) from ktrace/calculate-overlay:develop into develop

Reviewed-on: calculate/calculate-overlay#7

x11-themes/calculate-icon-theme/calculate-icon-theme-15-r7.ebuild

@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=7
+EAPI=8
 
-inherit gnome2
+inherit xdg-utils
 
 DESCRIPTION="Icons theme for Calculate Linux"
 HOMEPAGE="http://www.calculate-linux.org/packages/x11-themes/calculate-icon-theme"
@@ -16,8 +16,6 @@ IUSE="+qt5"
 
 SRC_URI="https://mirror.calculate-linux.org/themes/icon/icon-calculate-15-r4.tar.bz2"
 
-REQUIRED_USE=""
-
 RDEPEND="|| (
 		x11-themes/adwaita-icon-theme
 		kde-plasma/breeze
@@ -35,13 +33,13 @@ src_install() {
 }
 
 pkg_preinst() {
-	gnome2_icon_savelist
+	xdg_icon_savelist
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }

x11-themes/calculate-icon-theme/calculate-icon-theme-15-r8.ebuild

@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=7
+EAPI=8
 
-inherit gnome2
+inherit xdg-utils
 
 DESCRIPTION="Icons theme for Calculate Linux"
 HOMEPAGE="http://www.calculate-linux.org/packages/x11-themes/calculate-icon-theme"
@@ -16,8 +16,6 @@ IUSE="+qt5"
 
 SRC_URI="https://mirror.calculate-linux.org/themes/icon/icon-calculate-15-r6.tar.bz2"
 
-REQUIRED_USE=""
-
 RDEPEND="|| (
 		x11-themes/adwaita-icon-theme
 		kde-plasma/breeze
@@ -35,13 +33,13 @@ src_install() {
 }
 
 pkg_preinst() {
-	gnome2_icon_savelist
+	xdg_icon_savelist
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }

x11-themes/calculate-icon-theme/calculate-icon-theme-15-r9.ebuild

@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=7
+EAPI=8
 
-inherit gnome2
+inherit xdg-utils
 
 DESCRIPTION="Icons theme for Calculate Linux"
 HOMEPAGE="http://www.calculate-linux.org/packages/x11-themes/calculate-icon-theme"
@@ -16,8 +16,6 @@ IUSE="+qt5"
 
 SRC_URI="https://mirror.calculate-linux.org/themes/icon/icon-calculate-15-r6.tar.bz2"
 
-REQUIRED_USE=""
-
 RDEPEND="|| (
 		x11-themes/adwaita-icon-theme
 		kde-plasma/breeze
@@ -36,13 +34,13 @@ src_install() {
 }
 
 pkg_preinst() {
-	gnome2_icon_savelist
+	xdg_icon_savelist
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }

x11-themes/calculate-icon-theme/calculate-icon-theme-19.ebuild

@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=7
+EAPI=8
 
-inherit gnome2
+inherit xdg-utils
 
 DESCRIPTION="Icons theme for Calculate Linux"
 HOMEPAGE="http://www.calculate-linux.org/packages/x11-themes/calculate-icon-theme"
@@ -16,8 +16,6 @@ IUSE="+qt5"
 
 SRC_URI="https://mirror.calculate-linux.org/themes/icon/icon-calculate-19.tar.bz2"
 
-REQUIRED_USE=""
-
 RDEPEND="|| (
 		x11-themes/adwaita-icon-theme
 		kde-plasma/breeze
@@ -36,13 +34,13 @@ src_install() {
 }
 
 pkg_preinst() {
-	gnome2_icon_savelist
+	xdg_icon_savelist
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }

x11-themes/elementary-icon-theme/elementary-icon-theme-2.7.1-r4.ebuild

@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=7
+EAPI=8
 
-inherit gnome2
+inherit xdg-utils
 
 DESCRIPTION="Elementary icon theme is designed to be smooth, sexy, clear, and efficient"
 HOMEPAGE="https://launchpad.net/elementaryicons"
@@ -16,9 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-DEPEND=""
-RDEPEND="${DEPEND}
-		x11-themes/hicolor-icon-theme"
+RDEPEND="x11-themes/hicolor-icon-theme"
 
 S="${WORKDIR}"
 
@@ -28,13 +26,13 @@ src_install() {
 }
 
 pkg_preinst() {
-	gnome2_icon_savelist
+	xdg_icon_savelist
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }

x11-themes/elementary-icon-theme/elementary-icon-theme-2.7.1-r5.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit gnome2
+inherit xdg-utils
 
 DESCRIPTION="Elementary icon theme is designed to be smooth, sexy, clear, and efficient"
 HOMEPAGE="https://launchpad.net/elementaryicons"
@@ -15,9 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-DEPEND=""
-RDEPEND="${DEPEND}
-		x11-themes/hicolor-icon-theme"
+RDEPEND="x11-themes/hicolor-icon-theme"
 
 S="${WORKDIR}"
 
@@ -27,13 +25,13 @@ src_install() {
 }
 
 pkg_preinst() {
-	gnome2_icon_savelist
+	xdg_icon_savelist
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }

x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.13.1.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit gnome2-utils
+inherit xdg-utils
 
 MY_PN="${PN/-icon-theme/}"
 
@@ -13,7 +13,6 @@ SRC_URI="https://github.com/shimmerproject/${MY_PN}/archive/v${PV}.tar.gz -> ${P
 LICENSE="public-domain GPL-1 GPL-2 GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND=""
 DEPEND="media-gfx/optipng"
@@ -35,6 +34,6 @@ src_install() {
 	done
 }
 
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
+pkg_preinst() { xdg_icon_savelist; }
+pkg_postinst() { xdg_icon_cache_update; }
+pkg_postrm() { xdg_icon_cache_update; }