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

Package-Manager: portage-2.2_rc41/cvs/Linux x86_64

4 files changed, 9 insertions, 88 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/Manifest b/app-cdr/nero/Manifest
index 9c957b144471..bf16c43c1ec0 100644
--- a/app-cdr/nero/Manifest
+++ b/app-cdr/nero/Manifest
@@ -1,11 +1,8 @@
-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
 DIST nerolinux-3.5.3.1-x86.rpm 17673697 RMD160 fbacf46ef63f4d10e31f4211bf55a3aa0915a282 SHA1 70bd14792e5c4f8bf9edc3bf519bcccf87433e00 SHA256 fd4067306ea330361de4e5ee899dadbdd6d77301d112effcb1c18ab79960bfce
 DIST nerolinux-3.5.3.1-x86_64.rpm 17860056 RMD160 a023de323e90da40aa34d0dd2dca352928ca08e6 SHA1 4e84c3b9dc7b0cb223a2c239d4adfa1f52737b15 SHA256 9243c66b94663511aa5db8e6baaf762bf959aa6de664bc72cf80d309c45eaa6f
 DIST nerolinux-4.0.0.0-x86.rpm 17392245 RMD160 8600b72fcf0d44c5709eceec361b30ef6b01bb13 SHA1 e9d3e8736e61b5423a535d2884f8764dec6af4f9 SHA256 efaf61d4cd4599a2703ac1c037e44dea63e1668692c270057e6309962447493a
 DIST nerolinux-4.0.0.0-x86_64.rpm 17559653 RMD160 745bd037fffff058f4404e2af537cec627647438 SHA1 92c36c7060e375ffcaee2f15ab94a4efd38a3c35 SHA256 7444d67b1d9bef7b4d75bbb8daa9f1dcf84fa6777bef6ee1c87ad78e38b09507
-EBUILD nero-3.5.2.3.ebuild 2184 RMD160 0bf4510eb0dc88d6a4e3aa1325dc50227fd6358d SHA1 b65deb0f1b1091fd9cde2cb3894e1ff2ef3941b4 SHA256 f2a92d6f81baf833d6e44ea52cb190d2efa4be5e47d430ed1409c0e1a780d822
 EBUILD nero-3.5.3.1.ebuild 2184 RMD160 dc61abaf162e97073a77be5362253dc9bbab9330 SHA1 c0f31a1b8c4c9248e56bc1c7874742afaedf4a11 SHA256 efc714e2db90cc486b369f88b1aebeacb1f53706e0b100c307f6a08eb291a71b
-EBUILD nero-4.0.0.0.ebuild 2185 RMD160 81cdf4be92e1a81eb89868238f2ab35d5bd4f55d SHA1 f0e07fcb2a53224be287ebe975f2209c5622ffca SHA256 e907921daf6a9a9198f24f674b27c11e941e1b6eff3d54b8486b52975477847b
-MISC ChangeLog 6449 RMD160 b391785197cd71c8ffcff48fdbcf10424e0d8a59 SHA1 fa7cd63791627f731a7aa01984dd88aa5399bb9f SHA256 0c107dba51f7d4fee7abdda09cc6974dc7cee18f58fffd66d60ea9b851f016cd
+EBUILD nero-4.0.0.0.ebuild 2221 RMD160 aa1ff0819e0ab98c0220f8ba31ab57294c1a6611 SHA1 a066b838723a87472085668dd1551492f5c963bd SHA256 0ba6598e57a0d4957d5c243e32ae82c151f4f2f83c10dd8e6a0c39c4a53d2c8e
+MISC ChangeLog 6654 RMD160 8e6e3c9c2adb83274fe30a18049de83ffd90fb29 SHA1 b8b5035a49652e23ae3ffec9437a9531f4c4f0e6 SHA256 cc1b14ae595b3f0a9f0306398cfdc44f9e7584fe8758eb65acdd2dc906a0964a
 MISC metadata.xml 167 RMD160 ab34a00275c75c4522a5fb146a9c6e7d9ca18d7f SHA1 02a137b11f7f59a2f650c1e85a830acd896d64a8 SHA256 e63e128685e2c6da2eacfda6e91e700c1eb6f62cc2172ab64eada2ae71431ef2
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"