version bump (closes #116373), add modular X support (closes #115987), fix deps (closes #113716)

(Portage version: 2.1_pre3-r1)

4 files changed, 112 insertions, 3 deletions

diff --git a/app-cdr/nero/ChangeLog b/app-cdr/nero/ChangeLog
index b131991189c9..653d6d46b68c 100644
--- a/app-cdr/nero/ChangeLog
+++ b/app-cdr/nero/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/nero
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/nero/ChangeLog,v 1.13 2005/12/26 15:39:53 lu_zero Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/nero/ChangeLog,v 1.14 2006/01/24 00:02:38 wschlich Exp $
+
+*nero-2.0.0.4 (23 Jan 2006)
+
+  23 Jan 2006; Wolfram Schlich <wschlich@gentoo.org> +nero-2.0.0.4.ebuild:
+  version bump (closes #116373), add modular X support (closes #115987), fix
+  deps (closes #113716)
 
   26 Dec 2005; Luca Barbato <lu_zero@gentoo.org> nero-2.0.0.3b.ebuild,
   nero-2.0.0.3b-r2.ebuild:
diff --git a/app-cdr/nero/Manifest b/app-cdr/nero/Manifest
index 942a9e91d1dd..578f50d86c69 100644
--- a/app-cdr/nero/Manifest
+++ b/app-cdr/nero/Manifest
@@ -1,7 +1,9 @@
-MD5 f25eb914b2e22e25f78f0805f0020ed1 ChangeLog 1908
+MD5 bf03389202a58065d49478f3e4e6584f ChangeLog 2114
 MD5 34a50c5058fc8e1dd1e1e66c38becf9c files/digest-nero-2.0.0.3b 73
 MD5 34a50c5058fc8e1dd1e1e66c38becf9c files/digest-nero-2.0.0.3b-r2 73
+MD5 b1fd0f272d4849d90250d9c8ca47f493 files/digest-nero-2.0.0.4 72
 MD5 4b670ebe3da78fb9d0427f368b2f2c94 files/nero.desktop 224
 MD5 bdbeee7d658089108be65abbf6986d5d metadata.xml 409
 MD5 241e0c096a1d7b73797cadaefd1f38ba nero-2.0.0.3b-r2.ebuild 2699
 MD5 bbca5b3be3917830f2264a819cf25dd0 nero-2.0.0.3b.ebuild 2443
+MD5 c464bc1cff29d5792f88e810d81e0c3a nero-2.0.0.4.ebuild 2741
diff --git a/app-cdr/nero/files/digest-nero-2.0.0.4 b/app-cdr/nero/files/digest-nero-2.0.0.4
new file mode 100644
index 000000000000..a74689cd3da5
--- /dev/null
+++ b/app-cdr/nero/files/digest-nero-2.0.0.4
@@ -0,0 +1 @@
+MD5 ae772a0566a0406cd9dabe80ab8fe816 nerolinux-2.0.0.4-x86.rpm 10495263
diff --git a/app-cdr/nero/nero-2.0.0.4.ebuild b/app-cdr/nero/nero-2.0.0.4.ebuild
new file mode 100644
index 000000000000..21e3b224e039
--- /dev/null
+++ b/app-cdr/nero/nero-2.0.0.4.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/nero/nero-2.0.0.4.ebuild,v 1.1 2006/01/24 00:02:38 wschlich Exp $
+
+inherit eutils rpm multilib
+
+DESCRIPTION="Nero Burning ROM for Linux"
+HOMEPAGE="http://www.nero.com/en/NeroLINUX.html" # nerolinux.nero.com coming soon...
+NERO_RPM="nerolinux-${PV}-x86.rpm"
+SRC_URI="ftp://ftp2.us.nero.com/${NERO_RPM}
+	ftp://ftp6.de.nero.com/${NERO_RPM}
+	http://httpdl3.nero.com/${NERO_RPM}
+	http://httpdl6.nero.com/${NERO_RPM}"
+LICENSE="Nero"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mp3 ogg shorten sox vorbis"
+DEPEND=""
+RDEPEND="virtual/libc
+	|| ( x11-libs/libX11 virtual/x11 )
+	=x11-libs/gtk+-1.2*
+	amd64? ( >=app-emulation/emul-linux-x86-gtklibs-2.0 )
+	mp3? ( media-sound/mpg123 media-sound/lame media-sound/mp3info )
+	ogg? ( media-sound/oggtst )
+	shorten? ( media-sound/shorten media-sound/shntool )
+	sox? ( media-sound/sox )
+	vorbis? ( media-sound/vorbis-tools )"
+
+RESTRICT="nostrip nomirror"
+
+src_unpack() {
+	rpm_src_unpack
+}
+
+src_compile() { :; }
+
+src_install() {
+	cd ${WORKDIR}
+
+	dodir /usr/share/nero
+	insinto /usr/share/nero
+	doins ./usr/share/nero/{*.so,DosBootImage.ima,Nero.txt,CDROM.CFG}
+
+	dodir /usr/share/nero/desktop
+	insinto /usr/share/nero/desktop
+	doins ./usr/share/nero/desktop/NeroLINUX.template
+
+	dodir /usr/share/nero/docs
+	insinto /usr/share/nero/docs
+	doins ./usr/share/nero/docs/{Manual.pdf,EULA,NEWS}
+
+	dodir /usr/share/nero/pixmaps
+	insinto /usr/share/nero/pixmaps
+	doins ./usr/share/nero/pixmaps/nero.png
+
+	dodir /usr/share/nero/sounds
+	insinto /usr/share/nero/sounds
+	doins ./usr/share/nero/sounds/*.wav
+
+	libdir=$(get_libdir)
+	dodir /usr/${libdir}
+	insinto /usr/${libdir}
+	doins ./usr/lib/*.so
+
+	dobin ./usr/bin/nero
+
+	insinto /usr/share/applications
+	doins ${FILESDIR}/nero.desktop
+}
+
+pkg_setup() {
+	# This is a binary x86 package => ABI=x86
+	has_multilib_profile && ABI="x86"
+}
+
+# TODO
+# pkg_preinst() {
+# 	check_license
+# }
+
+pkg_postinst() {
+	einfo
+	einfo "Please make sure that no hdX=ide-scsi option is passed"
+	einfo "to your kernel command line."
+	einfo
+	einfo "For setting up your burning device correctly you also"
+	einfo "have to give your regular user(s) read/write access to"
+	einfo "the disc writer devices, for example by adding the user(s)"
+	einfo "to the system group 'cdrom', e.g. like this:"
+	einfo
+	einfo "\tgpasswd -a <username> cdrom"
+	einfo
+	einfo "NOTE: This is demo software, it will run for a trial"
+	einfo "period only until unlocked with a serial number."
+	einfo "See ${HOMEPAGE} for details."
+	einfo
+	einfo "Technical support for NeroLINUX is provided by CDFreaks"
+	einfo "Linux forum at http://club.cdfreaks.com/forumdisplay.php?f=104"
+	einfo
+}