1 |
commit: d17f018aebccd9299ba9bfc9c45ee98604249808 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 24 11:53:19 2019 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 24 11:53:19 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d17f018a |
7 |
|
8 |
x11-themes/human-icon-theme: Port to EAPI 7 |
9 |
|
10 |
Package-Manager: Portage-2.3.82, Repoman-2.3.20 |
11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
12 |
|
13 |
.../human-icon-theme-0.36-fix-buildsystem.patch | 22 +++++++++++++ |
14 |
.../human-icon-theme/human-icon-theme-0.36.ebuild | 36 +++++++++++----------- |
15 |
2 files changed, 40 insertions(+), 18 deletions(-) |
16 |
|
17 |
diff --git a/x11-themes/human-icon-theme/files/human-icon-theme-0.36-fix-buildsystem.patch b/x11-themes/human-icon-theme/files/human-icon-theme-0.36-fix-buildsystem.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..44999e7ae58 |
20 |
--- /dev/null |
21 |
+++ b/x11-themes/human-icon-theme/files/human-icon-theme-0.36-fix-buildsystem.patch |
22 |
@@ -0,0 +1,22 @@ |
23 |
+--- a/Makefile |
24 |
++++ b/Makefile |
25 |
+@@ -19,7 +19,7 @@ |
26 |
+ |
27 |
+ # run icon-naming-utils |
28 |
+ for d in $$DESTDIR/usr/share/icons/Human/*; do \ |
29 |
+- (cd $$d; for c in *; do /usr/lib/icon-naming-utils/icon-name-mapping -c $$c; done); \ |
30 |
++ (cd $$d; for c in *; do /usr/libexec/icon-name-mapping -c $$c; done); \ |
31 |
+ done |
32 |
+ |
33 |
+ # install mo files |
34 |
+--- a/svg2png.sh.in |
35 |
++++ b/svg2png.sh.in |
36 |
+@@ -8,7 +8,7 @@ |
37 |
+ fi |
38 |
+ |
39 |
+ ICONNAME=`echo ${3} | sed -e "s/.svg//"` |
40 |
+-if test `basename $SVGCONVERT` = "rsvg"; then |
41 |
++if test `basename $SVGCONVERT` = "rsvg-convert"; then |
42 |
+ OPTIONS="-w ${1} -h ${1}" |
43 |
+ else |
44 |
+ OPTIONS="${1} ${1}" |
45 |
|
46 |
diff --git a/x11-themes/human-icon-theme/human-icon-theme-0.36.ebuild b/x11-themes/human-icon-theme/human-icon-theme-0.36.ebuild |
47 |
index b8dec8cb643..cde168627e6 100644 |
48 |
--- a/x11-themes/human-icon-theme/human-icon-theme-0.36.ebuild |
49 |
+++ b/x11-themes/human-icon-theme/human-icon-theme-0.36.ebuild |
50 |
@@ -1,34 +1,38 @@ |
51 |
-# Copyright 1999-2016 Gentoo Foundation |
52 |
+# Copyright 1999-2019 Gentoo Authors |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
|
55 |
-EAPI=4 |
56 |
-inherit gnome2-utils |
57 |
+EAPI=7 |
58 |
+ |
59 |
+inherit xdg |
60 |
|
61 |
DESCRIPTION="A nice and well polished icon theme" |
62 |
HOMEPAGE="http://packages.ubuntu.com/lucid/human-icon-theme" |
63 |
-SRC_URI="mirror://ubuntu/pool/universe/h/${PN}/${PN}_${PV}.tar.gz |
64 |
+SRC_URI=" |
65 |
+ mirror://ubuntu/pool/universe/h/${PN}/${PN}_${PV}.tar.gz |
66 |
https://www.gentoo.org/images/gentoo-logo.svg" |
67 |
|
68 |
LICENSE="CC-BY-SA-2.5" |
69 |
SLOT="0" |
70 |
KEYWORDS="~amd64 ~x86" |
71 |
-IUSE="" |
72 |
- |
73 |
RESTRICT="binchecks strip" |
74 |
|
75 |
-RDEPEND="|| ( x11-themes/tangerine-icon-theme x11-themes/adwaita-icon-theme )" |
76 |
-DEPEND=">=gnome-base/librsvg-2.34 |
77 |
- >=x11-misc/icon-naming-utils-0.8.90 |
78 |
+RDEPEND=" |
79 |
+ || ( |
80 |
+ x11-themes/adwaita-icon-theme |
81 |
+ x11-themes/tangerine-icon-theme |
82 |
+ )" |
83 |
+BDEPEND=" |
84 |
dev-util/intltool |
85 |
- sys-devel/gettext" |
86 |
+ gnome-base/librsvg |
87 |
+ sys-devel/gettext |
88 |
+ x11-misc/icon-naming-utils" |
89 |
|
90 |
-S=${WORKDIR}/${PN} |
91 |
+S="${WORKDIR}/${PN}" |
92 |
|
93 |
-DOCS="AUTHORS" |
94 |
+PATCHES=( "${FILESDIR}"/${PN}-0.36-fix-buildsystem.patch ) |
95 |
|
96 |
src_prepare() { |
97 |
- sed -i -e 's:lib/icon-naming-utils/icon:libexec/icon:' Makefile || die |
98 |
- sed -i -e '/SVGCONVERT/s:rsvg:&-convert:' svg2png.sh.in || die #414971 |
99 |
+ xdg_src_prepare |
100 |
|
101 |
cp "${DISTDIR}"/gentoo-logo.svg scalable/places/start-here.svg || die |
102 |
|
103 |
@@ -42,7 +46,3 @@ src_prepare() { |
104 |
src_compile() { |
105 |
emake index.theme |
106 |
} |
107 |
- |
108 |
-pkg_preinst() { gnome2_icon_savelist; } |
109 |
-pkg_postinst() { gnome2_icon_cache_update; } |
110 |
-pkg_postrm() { gnome2_icon_cache_update; } |