Install desktop entry for neroexpress wrt #409035. Use linux-info.eclass instead of linux-mod.eclass for CONFIG_CHECK wrt #423457.

Package-Manager: portage-2.2.0_alpha111/cvs/Linux x86_64

3 files changed, 31 insertions, 23 deletions

diff --git a/app-cdr/nero/ChangeLog b/app-cdr/nero/ChangeLog
index 0cabce427fd9..61b7cf81a212 100644
--- a/app-cdr/nero/ChangeLog
+++ b/app-cdr/nero/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/nero
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/nero/ChangeLog,v 1.52 2011/12/02 20:30:00 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/nero/ChangeLog,v 1.53 2012/06/26 11:34:53 ssuominen Exp $
+
+  26 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> nero-4.0.0.0b.ebuild:
+  Install desktop entry for neroexpress wrt #409035. Use linux-info.eclass
+  instead of linux-mod.eclass for CONFIG_CHECK wrt #423457.
 
   02 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> nero-4.0.0.0b.ebuild:
   Remove usage of check_license (eutils.eclass) in favour of ACCEPT_LICENSE
diff --git a/app-cdr/nero/Manifest b/app-cdr/nero/Manifest
index f3c62a247a83..0120a8909b33 100644
--- a/app-cdr/nero/Manifest
+++ b/app-cdr/nero/Manifest
@@ -3,17 +3,17 @@ Hash: SHA1
 
 DIST nerolinux-4.0.0.0b-x86.rpm 17391650 RMD160 51b8ce13298d78fe58a5694cdc4ddc19deb2e364 SHA1 bee73ba3153ba8373f9a1bab271b971346081546 SHA256 03ec02c35f6f6dce4315d396b79b50031e507194475d2e6e24326f96dbfe9465
 DIST nerolinux-4.0.0.0b-x86_64.rpm 17559298 RMD160 ee8b17818e612b1a01a2874c6fd2ee1c161eb729 SHA1 7a62fbc3f54b14f6efdbbf3a844783c2aad70f2d SHA256 a68101eca1095cf523cd7cb39132f5c0b2ae98cc7fe0a8d89590285b59e78965
-EBUILD nero-4.0.0.0b.ebuild 2392 RMD160 c209f4e84d3c5f599b3f80f115f0e45cce907ac9 SHA1 bf7f582e28d1857200c8b824dbdc29577bc919a4 SHA256 69a461f16630271dd06c5e29ea91a3c761e77c19aa5ae83ccaadaba645655e98
-MISC ChangeLog 7463 RMD160 53347a8a318ff4c36c27225361bd5b7751df9e37 SHA1 8c17f7821a0f982256eb7efc134bd366e6792e5b SHA256 08aab0fb3592115b605b1e98754548690eb6a56cd508570f9739dbf74ba2254d
+EBUILD nero-4.0.0.0b.ebuild 2391 RMD160 f360c116b9048700cc495b62ffcebd72c9c3cecf SHA1 f5565c67ddc6373c00d69b2ffeb351d16baf05c2 SHA256 b950704d669004f3644b138fabe78dcb55d16af76498168f20d5165ad12bf378
+MISC ChangeLog 7675 RMD160 e8a833d6e1cd75867cb93bea976c2a80265bcb49 SHA1 9dd6e782db9677d508d59e76d1855499f05485df SHA256 b6a9ce1a59bcde863b04c6bc1d622af0f60839e309c906c26c6096027e274e5b
 MISC metadata.xml 167 RMD160 ab34a00275c75c4522a5fb146a9c6e7d9ca18d7f SHA1 02a137b11f7f59a2f650c1e85a830acd896d64a8 SHA256 e63e128685e2c6da2eacfda6e91e700c1eb6f62cc2172ab64eada2ae71431ef2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO2TVMAAoJEEdUh39IaPFNwGoH/i3lP28oL3bK1Lp9yj9zBTu5
-Rz+4v+QjlqrN9RmgsFX1KiZvh9M2m4RCP6H/5wKr108VrKSAgXUCs8piRAiSAD1X
-zDjPHh65Rt8LoYcj9hQzufi1PMOwjI+YM73UhxzRJ0eMge3zCZ2xyXusKYFDweVu
-NBPzoGNyntUZCqh8MHK61eX7QpvRXlOP4+poYoh+wDrw4dNu7w4Us48XY/Wp2+t5
-Jv7FEzMYUKZtNMnotxIYtJO5Av1LDd/eay/9/zMNwyjeq/pIBqz0NOvh0puZhHdE
-rS6dbQsgtpAGsF/UApknsLqm3jlNqhtK3lMMCjwEFgBRUYSFCqzyDAfiEPnogxk=
-=JAMR
+iQEcBAEBAgAGBQJP6Z0rAAoJEEdUh39IaPFNAFwH/2n7JHmAy5QInIPt5z80q9g6
+W5JtykqXlnhDZ3xNEZPqayJHMq8waSfoUH56+/lkFHAXqT9yhPXDvRWAXNqB19LU
+jS88uykCtSIOq1fZu+eXWMDjfdYVVFVfe1k1sIJuCZgjmShmPvnsmBU0AsrNdHf3
+m/6oGhcBZPSTfeuwLMfNhjahddb2Qz5tSNWPMW0q+6jGIbtgDzC7qd0notOYLeD8
+vnC9qyI2D4+F8VohY+mcJ5tWktJlGEUtzJxbLPHh47OGd/nqeOC+Es1bfheFNds4
+wMk4wA6ZXbOTKCF0vwEBnqO+8OVfZkbeSC+mBEJufzdZ9hbqWWZnYKt5yMXsvWs=
+=hX/L
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/nero/nero-4.0.0.0b.ebuild b/app-cdr/nero/nero-4.0.0.0b.ebuild
index c7bf3c0615c2..e60b25f9a703 100644
--- a/app-cdr/nero/nero-4.0.0.0b.ebuild
+++ b/app-cdr/nero/nero-4.0.0.0b.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/nero/nero-4.0.0.0b.ebuild,v 1.2 2011/12/02 20:30:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/nero/nero-4.0.0.0b.ebuild,v 1.3 2012/06/26 11:34:53 ssuominen Exp $
 
 EAPI=4
-
-inherit eutils fdo-mime rpm multilib gnome2-utils linux-mod
+inherit eutils fdo-mime rpm multilib gnome2-utils linux-info
 
 DESCRIPTION="Nero Burning ROM for Linux"
 HOMEPAGE="http://nerolinux.nero.com"
@@ -16,14 +15,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-RDEPEND="x11-libs/libXinerama
+RESTRICT="strip mirror test"
+
+RDEPEND="x11-libs/gtk+:2
 	x11-libs/libX11
-	x11-libs/pango[X]
-	>=x11-libs/gtk+-2:2"
+	x11-libs/libXinerama
+	x11-libs/pango[X]"
 DEPEND=""
 
-RESTRICT="strip mirror test"
-CONFIG_CHECK="~CHR_DEV_SG"
 QA_TEXTRELS="opt/${PN}/$(get_libdir)/${PN}/*
 	opt/${PN}/$(get_libdir)/libNeroAPI.so"
 QA_EXECSTACK="opt/${PN}/$(get_libdir)/nero/*"
@@ -36,6 +35,11 @@ QA_PREBUILT="opt/${PN}/${PN}.*
 
 S=${WORKDIR}
 
+pkg_setup() {
+	CONFIG_CHECK="~CHR_DEV_SG"
+	linux-info_pkg_setup
+}
+
 src_install() {
 	insinto /etc
 	doins -r etc/nero
@@ -50,9 +54,9 @@ src_install() {
 	insinto /usr/share
 	doins -r usr/share/nero usr/share/locale usr/share/icons
 
-	domenu usr/share/applications/nerolinux.desktop
+	domenu usr/share/applications/*.desktop
 	doicon usr/share/pixmaps/nerolinux.xpm
-	dodoc usr/share/doc/nero/NEWS
+
 	doman usr/share/man/man1/*
 	use doc && dodoc usr/share/doc/nero/*.pdf