From 696d39d51ef0834d5ec660bbddfaa2ba39f10117 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Fri, 8 May 2009 08:40:32 +0000 Subject: Inherit linux-mod and add config check for CHR_DEV_SG wrt #242234, thanks to Pacho Ramos. (Portage version: 2.1.6.13/cvs/Linux x86_64) --- app-cdr/nero/ChangeLog | 30 +++++++++++++++++------------- app-cdr/nero/metadata.xml | 2 +- app-cdr/nero/nero-3.5.2.3.ebuild | 39 +++++++++++++++++++-------------------- 3 files changed, 37 insertions(+), 34 deletions(-) (limited to 'app-cdr/nero') 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 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 +nero-3.5.1.0.ebuild: + 06 Jun 2008; Samuli Suominen +nero-3.5.1.0.ebuild: Version bump for bug 224471. *nero-3.5.0.1 (13 May 2008) - 13 May 2008; Samuli Suominen +nero-3.5.0.1.ebuild: + 13 May 2008; Samuli Suominen +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 +nero-3.0.2.1.ebuild: + 16 Dec 2007; Samuli Suominen +nero-3.0.2.1.ebuild: Version bump wrt #198429, requested by armin76. - 12 Aug 2007; Samuli Suominen nero-3.0.1.3.ebuild: - Re-add AMD64 hack to make burning work again. + 12 Aug 2007; Samuli Suominen 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 +nero-3.0.1.3.ebuild: + 11 Aug 2007; Samuli Suominen +nero-3.0.1.3.ebuild: Version bump. - 06 Jul 2007; Samuli Suominen metadata.xml: + 06 Jul 2007; Samuli Suominen metadata.xml: Removed myself from metadata.xml due to lack of interest 01 Jul 2007; Wolfram Schlich metadata.xml: Removed myself from metadata.xml due to lack of interest - 30 Jun 2007; Samuli Suominen -files/nero.desktop, + 30 Jun 2007; Samuli Suominen -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 nero-3.0.0.0.ebuild: + 30 Jun 2007; Samuli Suominen nero-3.0.0.0.ebuild: Add more QA_ variables for x86_64. - 30 Jun 2007; Samuli Suominen nero-2.1.0.3.ebuild: + 30 Jun 2007; Samuli Suominen 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 nero-3.0.0.0.ebuild: + 30 Jun 2007; Samuli Suominen 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 -nero-2.1.0.1.ebuild, + 29 Jun 2007; Samuli Suominen -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/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 @@ -media-optical + media-optical 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 -- cgit v1.2.3-65-gdbad