app-cdr/nero: Fix QA violations

Gentoo-bug: 593382
* EAPI=6
* Take over maintainership of package
* Fix .desktop files

Package-Manager: portage-2.3.2

3 files changed, 55 insertions, 23 deletions

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
new file mode 100644
index 000000000000..2145678db0f6
--- /dev/null
+++ b/app-cdr/nero/files/nero-4.0.0.0b-qa-desktop-files.patch
@@ -0,0 +1,23 @@
+Fix QA issues caused by outdated .desktop files:
+* QA Notice: This package installs one or more .desktop files that do not
+* pass validation.
+*
+*  /usr/share/applications/nerolinux.desktop: warning:
+*  key "Categories" in group "Desktop Entry" contains a deprecated value "Application"
+
+--- a/usr/share/applications/nerolinux.desktop
++++ b/usr/share/applications/nerolinux.desktop
+@@ -53,4 +53,4 @@
+ Icon=nerolinux
+ MimeType=application/x-cd-image;application/x-iso;application/x-cue;application/x-nero-disc-image;application/x-nero-linux-compilation
+ Terminal=false
+-Categories=Application;AudioVideo;DiscBurning;Recorder;
++Categories=AudioVideo;DiscBurning;Recorder;
+--- a/usr/share/applications/nerolinuxexpress.desktop
++++ b/usr/share/applications/nerolinuxexpress.desktop
+@@ -53,4 +53,4 @@
+ Icon=nerolinuxexpress
+ MimeType=application/x-cd-image;application/x-iso;application/x-cue;application/x-nero-disc-image;application/x-nero-linux-compilation
+ Terminal=false
+-Categories=Application;AudioVideo;DiscBurning;Recorder;
++Categories=AudioVideo;DiscBurning;Recorder;
diff --git a/app-cdr/nero/metadata.xml b/app-cdr/nero/metadata.xml
index 6f49eba8f496..70f78a5392df 100644
--- a/app-cdr/nero/metadata.xml
+++ b/app-cdr/nero/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>soap@gentoo.org</email>
+		<name>David Seifert</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-cdr/nero/nero-4.0.0.0b-r1.ebuild b/app-cdr/nero/nero-4.0.0.0b-r2.ebuild
index a87e4c1d4a4a..c8481b7df1f6 100644
--- a/app-cdr/nero/nero-4.0.0.0b-r1.ebuild
+++ b/app-cdr/nero/nero-4.0.0.0b-r2.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-inherit eutils fdo-mime rpm multilib gnome2-utils linux-info
+EAPI=6
+
+inherit eutils fdo-mime gnome2-utils linux-info rpm
 
 DESCRIPTION="Nero Burning ROM for Linux"
 HOMEPAGE="http://nerolinux.nero.com"
 SRC_URI="
 	x86? ( ${PN}linux-${PV}-x86.rpm )
-	amd64? ( ${PN}/${PN}linux-${PV}-x86_64.rpm )
-"
+	amd64? ( ${PN}/${PN}linux-${PV}-x86_64.rpm )"
 
 LICENSE="Nero-EULA-US"
 SLOT="0"
@@ -23,33 +23,34 @@ RDEPEND="
 	x11-libs/gtk+:2
 	x11-libs/libX11
 	x11-libs/libXinerama
-	x11-libs/pango[X]
-"
+	x11-libs/pango[X]"
 DEPEND=""
 
-QA_TEXTRELS="opt/${PN}/$(get_libdir)/${PN}/*
-	opt/${PN}/$(get_libdir)/libNeroAPI.so"
-QA_EXECSTACK="opt/${PN}/$(get_libdir)/nero/*"
-QA_PREBUILT="opt/${PN}/${PN}.*
-	opt/${PN}/${PN}
-	opt/${PN}/$(get_libdir)/.*so
-	opt/${PN}/$(get_libdir)/${PN}/*
-	opt/${PN}/$(get_libdir)/${PN}/plug-ins/*
-	usr/share/${PN}/helpers/splash/nerosplash"
-
 S="${WORKDIR}"
 
+PATCHES=( "${FILESDIR}"/${P}-qa-desktop-files.patch )
+
 pkg_nofetch() {
 	local nero_arch
 	use amd64 && nero_arch=64
 	use x86 && ner_arch=32
 
-	einfo "Please visit http://www.nero.com/enu/downloads/previous-versions/download-linux4-update.php"
+	einfo "Please visit https://www.nero.com/enu/downloads/previous-versions/download-linux4-update.php"
 	einfo " and use the 'RPM package ${nero_arch} bit' download then place ${A}"
 	einfo " into ${DISTDIR}"
 }
 
 pkg_setup() {
+	QA_TEXTRELS="opt/${PN}/$(get_libdir)/${PN}/*
+		opt/${PN}/$(get_libdir)/libNeroAPI.so"
+	QA_EXECSTACK="opt/${PN}/$(get_libdir)/nero/*"
+	QA_PREBUILT="opt/${PN}/${PN}.*
+		opt/${PN}/${PN}
+		opt/${PN}/$(get_libdir)/.*so
+		opt/${PN}/$(get_libdir)/${PN}/*
+		opt/${PN}/$(get_libdir)/${PN}/plug-ins/*
+		usr/share/${PN}/helpers/splash/nerosplash"
+
 	CONFIG_CHECK="~CHR_DEV_SG"
 	linux-info_pkg_setup
 }
@@ -72,15 +73,19 @@ src_install() {
 	doicon usr/share/pixmaps/nerolinux.xpm
 
 	doman usr/share/man/man1/*
-	use doc && dodoc usr/share/doc/nero/*.pdf
+
+	use doc && local DOCS+=( usr/share/doc/nero/*.pdf )
+	einstalldocs
 
 	make_wrapper nero ./nero /opt/nero /opt/${PN}/$(get_libdir)
 	make_wrapper nerocmd ./nerocmd /opt/nero /opt/nero/$(get_libdir)
 	make_wrapper neroexpress ./neroexpress /opt/nero /opt/nero/$(get_libdir)
 
-	# This is a ugly hack to fix burning in x86_64.
+	# This is a ugly hack to fix burning in x86_64
 	# http://club.cdfreaks.com/showthread.php?t=218041
-	use amd64 && cp usr/share/nero/Nero*.txt "${D}"/opt/nero/$(get_libdir)/nero
+	if use amd64; then
+		cp usr/share/nero/Nero*.txt "${ED%/}"/opt/nero/$(get_libdir)/nero || die
+	fi
 }
 
 pkg_preinst() {
@@ -91,7 +96,8 @@ pkg_postinst() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 	gnome2_icon_cache_update
-	nero --perform-post-installation
+
+	nero --perform-post-installation || die
 }
 
 pkg_postrm() {