Inherit linux-mod and add config check for CHR_DEV_SG wrt #242234, thanks to Pacho Ramos.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 40 insertions, 37 deletions

diff --git a/app-cdr/nero/ChangeLog b/app-cdr/nero/ChangeLog
index 86bd9466db4e..bf0aee0b6582 100644
--- a/app-cdr/nero/ChangeLog
+++ b/app-cdr/nero/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/nero
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/nero/ChangeLog,v 1.41 2009/04/26 20:11:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/nero/ChangeLog,v 1.42 2009/05/08 08:40:32 ssuominen Exp $
+
+  08 May 2009; Samuli Suominen <ssuominen@gentoo.org> nero-3.5.2.3.ebuild:
+  Inherit linux-mod and add config check for CHR_DEV_SG wrt #242234, thanks
+  to Pacho Ramos.
 
 *nero-3.5.2.3 (26 Apr 2009)
 
@@ -18,12 +22,12 @@
 
 *nero-3.5.1.0 (06 Jun 2008)
 
-  06 Jun 2008; Samuli Suominen <drac@gentoo.org> +nero-3.5.1.0.ebuild:
+  06 Jun 2008; Samuli Suominen <ssuominen@gentoo.org> +nero-3.5.1.0.ebuild:
   Version bump for bug 224471.
 
 *nero-3.5.0.1 (13 May 2008)
 
-  13 May 2008; Samuli Suominen <drac@gentoo.org> +nero-3.5.0.1.ebuild:
+  13 May 2008; Samuli Suominen <ssuominen@gentoo.org> +nero-3.5.0.1.ebuild:
   Version bump, closing bugs 214877 and 211026.
 
 *nero-3.1.1.0 (18 Feb 2008)
@@ -33,41 +37,41 @@
 
 *nero-3.0.2.1 (16 Dec 2007)
 
-  16 Dec 2007; Samuli Suominen <drac@gentoo.org> +nero-3.0.2.1.ebuild:
+  16 Dec 2007; Samuli Suominen <ssuominen@gentoo.org> +nero-3.0.2.1.ebuild:
   Version bump wrt #198429, requested by armin76.
 
-  12 Aug 2007; Samuli Suominen <drac@gentoo.org> nero-3.0.1.3.ebuild:
-  Re-add AMD64 hack to make burning work again.
+  12 Aug 2007; Samuli Suominen <ssuominen@gentoo.org> nero-3.0.1.3.ebuild:
+  Readd AMD64 hack to make burning work again.
 
 *nero-3.0.1.3 (11 Aug 2007)
 
-  11 Aug 2007; Samuli Suominen <drac@gentoo.org> +nero-3.0.1.3.ebuild:
+  11 Aug 2007; Samuli Suominen <ssuominen@gentoo.org> +nero-3.0.1.3.ebuild:
   Version bump.
 
-  06 Jul 2007; Samuli Suominen <drac@gentoo.org> metadata.xml:
+  06 Jul 2007; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
   Removed myself from metadata.xml due to lack of interest
 
   01 Jul 2007; Wolfram Schlich <wschlich@gentoo.org> metadata.xml:
   Removed myself from metadata.xml due to lack of interest
 
-  30 Jun 2007; Samuli Suominen <drac@gentoo.org> -files/nero.desktop,
+  30 Jun 2007; Samuli Suominen <ssuominen@gentoo.org> -files/nero.desktop,
   -nero-2.1.0.3.ebuild, nero-3.0.0.0.ebuild:
   Keyword for ~amd64 after testing from AMD64 Arch Testers Jonas
   Pedersen and Kenneth Prugh. Authorized by KingTaco.
 
-  30 Jun 2007; Samuli Suominen <drac@gentoo.org> nero-3.0.0.0.ebuild:
+  30 Jun 2007; Samuli Suominen <ssuominen@gentoo.org> nero-3.0.0.0.ebuild:
   Add more QA_ variables for x86_64.
 
-  30 Jun 2007; Samuli Suominen <drac@gentoo.org> nero-2.1.0.3.ebuild:
+  30 Jun 2007; Samuli Suominen <ssuominen@gentoo.org> nero-2.1.0.3.ebuild:
   Removed stable x86 keyword from unfetchable nero-2.1.0.3 ebuild, authorized
   by armin76.
 
-  30 Jun 2007; Samuli Suominen <drac@gentoo.org> nero-3.0.0.0.ebuild:
+  30 Jun 2007; Samuli Suominen <ssuominen@gentoo.org> nero-3.0.0.0.ebuild:
   Stick some QA_ variables to keep installing quiet.
 
 *nero-3.0.0.0 (29 Jun 2007)
 
-  29 Jun 2007; Samuli Suominen <drac@gentoo.org> -nero-2.1.0.1.ebuild,
+  29 Jun 2007; Samuli Suominen <ssuominen@gentoo.org> -nero-2.1.0.1.ebuild,
   -nero-2.1.0.2.ebuild, +nero-3.0.0.0.ebuild:
   Version bump for bug 172717.
 
diff --git a/app-cdr/nero/Manifest b/app-cdr/nero/Manifest
index 7148fbd61f43..e57db63335a0 100644
--- a/app-cdr/nero/Manifest
+++ b/app-cdr/nero/Manifest
@@ -1,5 +1,5 @@
 DIST nerolinux-3.5.2.3-x86.rpm 17673285 RMD160 d8324e4bd922ae040f9bea7c17da066a259a6a0b SHA1 e0830ac37901c671bf320593a0dd070749d50972 SHA256 8f4202ec3bf8182071257565f4197c4d0060b0603dc8be4dcc8f364810e7e15e
 DIST nerolinux-3.5.2.3-x86_64.rpm 17860547 RMD160 b186a4a9de309025a143a8a04f21a8129c9bdbc9 SHA1 8cb8c5ead58f0b60005a23158244f7e04799e92b SHA256 fc5329f949554e7198a6fa9d07598d9e60b90c5a37b7533f41983d3c56da7028
-EBUILD nero-3.5.2.3.ebuild 2664 RMD160 456609a5c2dda649b623cd8f554a5027e24c3d54 SHA1 642b954721e789bee5d47455621213b6201a7bfc SHA256 ee0986046665fd07ff9744540d514baf18fa8a4f19aad6cbdd49922b0fabaf36
-MISC ChangeLog 5703 RMD160 24023d8a00efb94aaabc227f506e32cc7d42b69d SHA1 3b31d6a1bdfd5cfe4de491fbe50183456fed121f SHA256 8dce6b5c85dd0d2627313c3e8210cd06f3062aa0e5546c31277fc71553b57837
-MISC metadata.xml 166 RMD160 02ca0a5d9279c1b52c3887f5a1f52f3feb002af9 SHA1 b9fccc7c24aa717c30efef068fd544a692f264f6 SHA256 ce62d1e5b04e01d03a732ee6d33b3d500810de8e55af4a527c970e5b475735d8
+EBUILD nero-3.5.2.3.ebuild 2617 RMD160 00b09edeaa854e47d4a8d28cf3b24d6ac3934e42 SHA1 5e73e0fde015ebe00c043eb7ed152c5bcd2b0898 SHA256 acd14cffead35639dfe2f0ecfa5a6a1083c0f1f95d9b1a30cf238a75e71ec423
+MISC ChangeLog 5929 RMD160 5a33b25087cbc7c24944ae4cf956d37b474a524c SHA1 3386dbf606d70f630c33cf1e64f6655cde92fa79 SHA256 af29ddfc095c12828d17605f8edca1680003bd4830fb19dac6c7137c6f9f2014
+MISC metadata.xml 167 RMD160 ab34a00275c75c4522a5fb146a9c6e7d9ca18d7f SHA1 02a137b11f7f59a2f650c1e85a830acd896d64a8 SHA256 e63e128685e2c6da2eacfda6e91e700c1eb6f62cc2172ab64eada2ae71431ef2
diff --git a/app-cdr/nero/metadata.xml b/app-cdr/nero/metadata.xml
index 3ca6ae763b34..bb93fa2613e7 100644
--- a/app-cdr/nero/metadata.xml
+++ b/app-cdr/nero/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
+	<herd>media-optical</herd>
 </pkgmetadata>
diff --git a/app-cdr/nero/nero-3.5.2.3.ebuild b/app-cdr/nero/nero-3.5.2.3.ebuild
index bd2fee619606..91147376c0fc 100644
--- a/app-cdr/nero/nero-3.5.2.3.ebuild
+++ b/app-cdr/nero/nero-3.5.2.3.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/nero/nero-3.5.2.3.ebuild,v 1.1 2009/04/26 20:11:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/nero/nero-3.5.2.3.ebuild,v 1.2 2009/05/08 08:40:32 ssuominen Exp $
 
-EAPI="2"
-
-inherit eutils fdo-mime rpm multilib gnome2-utils
+EAPI=2
+inherit eutils fdo-mime rpm multilib gnome2-utils linux-mod
 
 DESCRIPTION="Nero Burning ROM for Linux"
 HOMEPAGE="http://nerolinux.nero.com"
@@ -14,39 +13,36 @@ SRC_URI="x86? ( mirror://${PN}/${PN}linux-${PV}-x86.rpm )
 LICENSE="Nero"
 SLOT="0"
 # This package can never enter stable, it can't be mirrored and upstream
-# can remove the distfiles from their mirror anytime. -drac
+# can remove the distfiles from their mirror anytime.
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/pango[X]
-	>=x11-libs/gtk+-2"
+	>=x11-libs/gtk+-2:2"
 DEPEND=""
 
 RESTRICT="strip mirror test"
-
+CONFIG_CHECK="CHR_DEV_SG"
 QA_TEXTRELS="opt/nero/$(get_libdir)/nero/*"
 QA_EXECSTACK="opt/nero/$(get_libdir)/nero/*"
-
 S=${WORKDIR}
 
-src_compile() {
-	echo "Nothing to compile."
-}
+src_compile() { :; }
 
 src_install() {
 	insinto /etc
-	doins -r etc/nero || die "doins failed."
+	doins -r etc/nero || die "doins failed"
 
 	insinto /opt/nero
-	doins -r usr/$(get_libdir) || die "doins failed."
-	dosym /opt/nero/$(get_libdir)/nero /usr/$(get_libdir)/nero || die "dosym failed."
+	doins -r usr/$(get_libdir) || die "doins failed"
+	dosym /opt/nero/$(get_libdir)/nero /usr/$(get_libdir)/nero || die "dosym failed"
 
 	exeinto /opt/nero
-	doexe usr/bin/nero* || die "doexe failed."
+	doexe usr/bin/nero* || die "doexe failed"
 
 	insinto /usr/share
-	doins -r usr/share/nero usr/share/locale usr/share/icons || die "doins failed."
+	doins -r usr/share/nero usr/share/locale usr/share/icons || die "doins failed"
 
 	domenu usr/share/applications/nerolinux.desktop
 	doicon usr/share/pixmaps/nerolinux.xpm
@@ -55,17 +51,20 @@ src_install() {
 	use doc && dodoc usr/share/doc/nero/*.pdf
 
 	make_wrapper nero ./nero /opt/nero /opt/${PN}/$(get_libdir) \
-		|| die "make_wrapper for nero failed."
+		|| die "make_wrapper for nero failed"
 
 	make_wrapper nerocmd ./nerocmd /opt/nero /opt/nero/$(get_libdir) \
-		|| die "make_wrapper for nerocmd failed."
+		|| die "make_wrapper for nerocmd failed"
 
-	# This is a ugly hack to fix burning in x86_64 which can be removed in future releases.
-	# Update: Is this still needed for 3.5.0.1?
+	# 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
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update