1 |
commit: 0d50b34fe6474b1b987b8df839cd9f97fde858d0 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 24 11:53:22 2019 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 24 11:53:22 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d50b34f |
7 |
|
8 |
x11-themes/nuvox: 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 |
.../nuvox/files/nuvox-07.1-fix-buildset.patch | 23 ++++++++++++++++++++++ |
14 |
x11-themes/nuvox/nuvox-07.1-r1.ebuild | 21 ++++++++------------ |
15 |
2 files changed, 31 insertions(+), 13 deletions(-) |
16 |
|
17 |
diff --git a/x11-themes/nuvox/files/nuvox-07.1-fix-buildset.patch b/x11-themes/nuvox/files/nuvox-07.1-fix-buildset.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..fba871878c7 |
20 |
--- /dev/null |
21 |
+++ b/x11-themes/nuvox/files/nuvox-07.1-fix-buildset.patch |
22 |
@@ -0,0 +1,23 @@ |
23 |
+--- a/buildset |
24 |
++++ b/buildset |
25 |
+@@ -157,7 +157,6 @@ |
26 |
+ |
27 |
+ |
28 |
+ # Move/Remove the created directories so the user can rebuild if needed. |
29 |
+-rm -fr 32x32/apps 32x32/devices 32x32/mimetypes 32x32/filesystems |
30 |
+ for size in $SIZES |
31 |
+ do |
32 |
+ if [ "$size" != "32x32" ]; then # Already did the 32x32 size above |
33 |
+@@ -169,12 +168,10 @@ |
34 |
+ echo -ne "Tarring and compressing.\n" |
35 |
+ if test -f $COMPRESSOR |
36 |
+ then |
37 |
+- tar cf $PACKAGENAME.tar $PACKAGENAME && $COMPRESSOR $PACKAGENAME.tar |
38 |
+ echo -ne "\nThe $PACKAGENAME icon set has been built. Use kcontrol to install the icon set.\n" |
39 |
+ echo && ls -sh $PACKAGENAME.tar* && echo |
40 |
+ fi |
41 |
+ echo -ne "Removing all temporary directories...\n" |
42 |
+-rm -fr $PACKAGENAME |
43 |
+ |
44 |
+ echo -ne "\nAll done. ;)\n" |
45 |
+ |
46 |
|
47 |
diff --git a/x11-themes/nuvox/nuvox-07.1-r1.ebuild b/x11-themes/nuvox/nuvox-07.1-r1.ebuild |
48 |
index 328020ee4d5..7770506ddd9 100644 |
49 |
--- a/x11-themes/nuvox/nuvox-07.1-r1.ebuild |
50 |
+++ b/x11-themes/nuvox/nuvox-07.1-r1.ebuild |
51 |
@@ -1,7 +1,7 @@ |
52 |
-# Copyright 1999-2017 Gentoo Foundation |
53 |
+# Copyright 1999-2019 Gentoo Authors |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
|
56 |
-EAPI=4 |
57 |
+EAPI=7 |
58 |
|
59 |
MY_P=nuvoX_${PV} |
60 |
|
61 |
@@ -12,18 +12,13 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz" |
62 |
LICENSE="GPL-2" |
63 |
SLOT="0" |
64 |
KEYWORDS="amd64 x86" |
65 |
-IUSE="" |
66 |
- |
67 |
-RDEPEND="" |
68 |
-DEPEND="virtual/imagemagick-tools[png]" |
69 |
- |
70 |
RESTRICT="strip binchecks" |
71 |
|
72 |
-S=${WORKDIR}/${MY_P} |
73 |
+BDEPEND="virtual/imagemagick-tools[png]" |
74 |
|
75 |
-src_prepare() { |
76 |
- sed -i -e '/rm -fr/d' -e '/tar cf/d' buildset || die |
77 |
-} |
78 |
+S="${WORKDIR}/${MY_P}" |
79 |
+ |
80 |
+PATCHES=( "${FILESDIR}"/${PN}-07.1-fix-buildset.patch ) |
81 |
|
82 |
src_compile() { |
83 |
./buildset || die |
84 |
@@ -31,8 +26,8 @@ src_compile() { |
85 |
|
86 |
src_install() { |
87 |
dodoc nuvoX_0.7/readme.txt |
88 |
- rm nuvoX_0.7/{readme,license}.txt |
89 |
+ rm nuvoX_0.7/{readme,license}.txt || die |
90 |
|
91 |
insinto /usr/share/icons/${PN} |
92 |
- doins -r nuvoX_0.7/* |
93 |
+ doins -r nuvoX_0.7/. |
94 |
} |