Execute nero --perform-post-installation in pkg_postinst wrt #285803, thanks to churchmice <firefoxelectric at gmail.com>.

(Portage version: 2.2_rc41/cvs/Linux x86_64)

3 files changed, 7 insertions, 83 deletions

diff --git a/app-cdr/nero/ChangeLog b/app-cdr/nero/ChangeLog
index 8dac589e84e9..f7e3b46324fd 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.46 2009/09/18 21:39:26 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/nero/ChangeLog,v 1.47 2009/09/23 12:39:27 ssuominen Exp $
+
+  23 Sep 2009; Samuli Suominen <ssuominen@gentoo.org> nero-4.0.0.0.ebuild:
+  Execute nero --perform-post-installation in pkg_postinst wrt #285803,
+  thanks to churchmice <firefoxelectric at gmail.com>.
 
 *nero-4.0.0.0 (18 Sep 2009)
 
diff --git a/app-cdr/nero/nero-3.5.2.3.ebuild b/app-cdr/nero/nero-3.5.2.3.ebuild
deleted file mode 100644
index 65feca0d4159..000000000000
--- a/app-cdr/nero/nero-3.5.2.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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.5 2009/08/31 21:49:52 ikelos Exp $
-
-EAPI=2
-inherit eutils fdo-mime rpm multilib gnome2-utils linux-mod
-
-DESCRIPTION="Nero Burning ROM for Linux"
-HOMEPAGE="http://nerolinux.nero.com"
-SRC_URI="x86? ( mirror://${PN}/${PN}linux-${PV}-x86.rpm )
-	amd64? ( mirror://${PN}/${PN}linux-${PV}-x86_64.rpm )"
-
-LICENSE="Nero-EULA-US"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/pango[X]
-	>=x11-libs/gtk+-2:2"
-DEPEND=""
-
-PROPERTIES="interactive"
-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}
-
-pkg_setup() {
-	check_license
-}
-
-src_install() {
-	insinto /etc
-	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"
-
-	exeinto /opt/nero
-	doexe usr/bin/nero* || die "doexe failed"
-
-	insinto /usr/share
-	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
-	dodoc usr/share/doc/nero/NEWS
-	doman usr/share/man/man1/*
-	use doc && dodoc usr/share/doc/nero/*.pdf
-
-	make_wrapper nero ./nero /opt/nero /opt/${PN}/$(get_libdir)
-	make_wrapper nerocmd ./nerocmd /opt/nero /opt/nero/$(get_libdir)
-
-	# 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
-	gnome2_icon_cache_update
-
-	elog "Technical support for NeroLINUX is provided by CDFreaks"
-	elog "Linux forum at http://club.cdfreaks.com/forumdisplay.php?f=104"
-	elog
-	elog "You also need to setup your user to cdrom group."
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-cdr/nero/nero-4.0.0.0.ebuild b/app-cdr/nero/nero-4.0.0.0.ebuild
index 1f5b109d568a..5a47a10cb102 100644
--- a/app-cdr/nero/nero-4.0.0.0.ebuild
+++ b/app-cdr/nero/nero-4.0.0.0.ebuild
@@ -1,6 +1,6 @@
 # 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-4.0.0.0.ebuild,v 1.1 2009/09/18 21:39:26 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/nero/nero-4.0.0.0.ebuild,v 1.2 2009/09/23 12:39:27 ssuominen Exp $
 
 EAPI=2
 inherit eutils fdo-mime rpm multilib gnome2-utils linux-mod
@@ -67,6 +67,7 @@ pkg_postinst() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 	gnome2_icon_cache_update
+	nero --perform-post-installation
 
 	elog "Technical support for NeroLINUX is provided by CDFreaks"
 	elog "Linux forum at http://club.cdfreaks.com/forumdisplay.php?f=104"