1 |
commit: 8030a7cc077e81477d0a28130c9f87989868865d |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 29 11:26:40 2016 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 29 11:30:26 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8030a7cc |
7 |
|
8 |
app-cdr/nero: Fix QA violations |
9 |
|
10 |
Gentoo-bug: 593382 |
11 |
* EAPI=6 |
12 |
* Take over maintainership of package |
13 |
* Fix .desktop files |
14 |
|
15 |
Package-Manager: portage-2.3.2 |
16 |
|
17 |
.../files/nero-4.0.0.0b-qa-desktop-files.patch | 23 ++++++++++ |
18 |
app-cdr/nero/metadata.xml | 5 ++- |
19 |
...-4.0.0.0b-r1.ebuild => nero-4.0.0.0b-r2.ebuild} | 50 ++++++++++++---------- |
20 |
3 files changed, 55 insertions(+), 23 deletions(-) |
21 |
|
22 |
diff --git a/app-cdr/nero/files/nero-4.0.0.0b-qa-desktop-files.patch b/app-cdr/nero/files/nero-4.0.0.0b-qa-desktop-files.patch |
23 |
new file mode 100644 |
24 |
index 00000000..2145678 |
25 |
--- /dev/null |
26 |
+++ b/app-cdr/nero/files/nero-4.0.0.0b-qa-desktop-files.patch |
27 |
@@ -0,0 +1,23 @@ |
28 |
+Fix QA issues caused by outdated .desktop files: |
29 |
+* QA Notice: This package installs one or more .desktop files that do not |
30 |
+* pass validation. |
31 |
+* |
32 |
+* /usr/share/applications/nerolinux.desktop: warning: |
33 |
+* key "Categories" in group "Desktop Entry" contains a deprecated value "Application" |
34 |
+ |
35 |
+--- a/usr/share/applications/nerolinux.desktop |
36 |
++++ b/usr/share/applications/nerolinux.desktop |
37 |
+@@ -53,4 +53,4 @@ |
38 |
+ Icon=nerolinux |
39 |
+ MimeType=application/x-cd-image;application/x-iso;application/x-cue;application/x-nero-disc-image;application/x-nero-linux-compilation |
40 |
+ Terminal=false |
41 |
+-Categories=Application;AudioVideo;DiscBurning;Recorder; |
42 |
++Categories=AudioVideo;DiscBurning;Recorder; |
43 |
+--- a/usr/share/applications/nerolinuxexpress.desktop |
44 |
++++ b/usr/share/applications/nerolinuxexpress.desktop |
45 |
+@@ -53,4 +53,4 @@ |
46 |
+ Icon=nerolinuxexpress |
47 |
+ MimeType=application/x-cd-image;application/x-iso;application/x-cue;application/x-nero-disc-image;application/x-nero-linux-compilation |
48 |
+ Terminal=false |
49 |
+-Categories=Application;AudioVideo;DiscBurning;Recorder; |
50 |
++Categories=AudioVideo;DiscBurning;Recorder; |
51 |
|
52 |
diff --git a/app-cdr/nero/metadata.xml b/app-cdr/nero/metadata.xml |
53 |
index 6f49eba..70f78a5 100644 |
54 |
--- a/app-cdr/nero/metadata.xml |
55 |
+++ b/app-cdr/nero/metadata.xml |
56 |
@@ -1,5 +1,8 @@ |
57 |
<?xml version="1.0" encoding="UTF-8"?> |
58 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
59 |
<pkgmetadata> |
60 |
-<!-- maintainer-needed --> |
61 |
+ <maintainer type="person"> |
62 |
+ <email>soap@g.o</email> |
63 |
+ <name>David Seifert</name> |
64 |
+ </maintainer> |
65 |
</pkgmetadata> |
66 |
|
67 |
diff --git a/app-cdr/nero/nero-4.0.0.0b-r1.ebuild b/app-cdr/nero/nero-4.0.0.0b-r2.ebuild |
68 |
similarity index 62% |
69 |
rename from app-cdr/nero/nero-4.0.0.0b-r1.ebuild |
70 |
rename to app-cdr/nero/nero-4.0.0.0b-r2.ebuild |
71 |
index a87e4c1..c8481b7 100644 |
72 |
--- a/app-cdr/nero/nero-4.0.0.0b-r1.ebuild |
73 |
+++ b/app-cdr/nero/nero-4.0.0.0b-r2.ebuild |
74 |
@@ -1,16 +1,16 @@ |
75 |
-# Copyright 1999-2012 Gentoo Foundation |
76 |
+# Copyright 1999-2016 Gentoo Foundation |
77 |
# Distributed under the terms of the GNU General Public License v2 |
78 |
# $Id$ |
79 |
|
80 |
-EAPI=5 |
81 |
-inherit eutils fdo-mime rpm multilib gnome2-utils linux-info |
82 |
+EAPI=6 |
83 |
+ |
84 |
+inherit eutils fdo-mime gnome2-utils linux-info rpm |
85 |
|
86 |
DESCRIPTION="Nero Burning ROM for Linux" |
87 |
HOMEPAGE="http://nerolinux.nero.com" |
88 |
SRC_URI=" |
89 |
x86? ( ${PN}linux-${PV}-x86.rpm ) |
90 |
- amd64? ( ${PN}/${PN}linux-${PV}-x86_64.rpm ) |
91 |
-" |
92 |
+ amd64? ( ${PN}/${PN}linux-${PV}-x86_64.rpm )" |
93 |
|
94 |
LICENSE="Nero-EULA-US" |
95 |
SLOT="0" |
96 |
@@ -23,33 +23,34 @@ RDEPEND=" |
97 |
x11-libs/gtk+:2 |
98 |
x11-libs/libX11 |
99 |
x11-libs/libXinerama |
100 |
- x11-libs/pango[X] |
101 |
-" |
102 |
+ x11-libs/pango[X]" |
103 |
DEPEND="" |
104 |
|
105 |
-QA_TEXTRELS="opt/${PN}/$(get_libdir)/${PN}/* |
106 |
- opt/${PN}/$(get_libdir)/libNeroAPI.so" |
107 |
-QA_EXECSTACK="opt/${PN}/$(get_libdir)/nero/*" |
108 |
-QA_PREBUILT="opt/${PN}/${PN}.* |
109 |
- opt/${PN}/${PN} |
110 |
- opt/${PN}/$(get_libdir)/.*so |
111 |
- opt/${PN}/$(get_libdir)/${PN}/* |
112 |
- opt/${PN}/$(get_libdir)/${PN}/plug-ins/* |
113 |
- usr/share/${PN}/helpers/splash/nerosplash" |
114 |
- |
115 |
S="${WORKDIR}" |
116 |
|
117 |
+PATCHES=( "${FILESDIR}"/${P}-qa-desktop-files.patch ) |
118 |
+ |
119 |
pkg_nofetch() { |
120 |
local nero_arch |
121 |
use amd64 && nero_arch=64 |
122 |
use x86 && ner_arch=32 |
123 |
|
124 |
- einfo "Please visit http://www.nero.com/enu/downloads/previous-versions/download-linux4-update.php" |
125 |
+ einfo "Please visit https://www.nero.com/enu/downloads/previous-versions/download-linux4-update.php" |
126 |
einfo " and use the 'RPM package ${nero_arch} bit' download then place ${A}" |
127 |
einfo " into ${DISTDIR}" |
128 |
} |
129 |
|
130 |
pkg_setup() { |
131 |
+ QA_TEXTRELS="opt/${PN}/$(get_libdir)/${PN}/* |
132 |
+ opt/${PN}/$(get_libdir)/libNeroAPI.so" |
133 |
+ QA_EXECSTACK="opt/${PN}/$(get_libdir)/nero/*" |
134 |
+ QA_PREBUILT="opt/${PN}/${PN}.* |
135 |
+ opt/${PN}/${PN} |
136 |
+ opt/${PN}/$(get_libdir)/.*so |
137 |
+ opt/${PN}/$(get_libdir)/${PN}/* |
138 |
+ opt/${PN}/$(get_libdir)/${PN}/plug-ins/* |
139 |
+ usr/share/${PN}/helpers/splash/nerosplash" |
140 |
+ |
141 |
CONFIG_CHECK="~CHR_DEV_SG" |
142 |
linux-info_pkg_setup |
143 |
} |
144 |
@@ -72,15 +73,19 @@ src_install() { |
145 |
doicon usr/share/pixmaps/nerolinux.xpm |
146 |
|
147 |
doman usr/share/man/man1/* |
148 |
- use doc && dodoc usr/share/doc/nero/*.pdf |
149 |
+ |
150 |
+ use doc && local DOCS+=( usr/share/doc/nero/*.pdf ) |
151 |
+ einstalldocs |
152 |
|
153 |
make_wrapper nero ./nero /opt/nero /opt/${PN}/$(get_libdir) |
154 |
make_wrapper nerocmd ./nerocmd /opt/nero /opt/nero/$(get_libdir) |
155 |
make_wrapper neroexpress ./neroexpress /opt/nero /opt/nero/$(get_libdir) |
156 |
|
157 |
- # This is a ugly hack to fix burning in x86_64. |
158 |
+ # This is a ugly hack to fix burning in x86_64 |
159 |
# http://club.cdfreaks.com/showthread.php?t=218041 |
160 |
- use amd64 && cp usr/share/nero/Nero*.txt "${D}"/opt/nero/$(get_libdir)/nero |
161 |
+ if use amd64; then |
162 |
+ cp usr/share/nero/Nero*.txt "${ED%/}"/opt/nero/$(get_libdir)/nero || die |
163 |
+ fi |
164 |
} |
165 |
|
166 |
pkg_preinst() { |
167 |
@@ -91,7 +96,8 @@ pkg_postinst() { |
168 |
fdo-mime_desktop_database_update |
169 |
fdo-mime_mime_database_update |
170 |
gnome2_icon_cache_update |
171 |
- nero --perform-post-installation |
172 |
+ |
173 |
+ nero --perform-post-installation || die |
174 |
} |
175 |
|
176 |
pkg_postrm() { |