--- nero-2.0.0.3b-r2.ebuild	2005-12-26 17:05:18.000000000 +0100
+++ nero-2.0.0.4.ebuild	2006-01-17 00:08:24.000000000 +0100
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.3b-r2.ebuild,v 1.2 2005/12/26 15:39:53 lu_zero Exp $
+# $Header: $
 
 inherit eutils rpm multilib
 
@@ -14,14 +14,15 @@
 LICENSE="Nero"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="mp3 vorbis shorten"
+IUSE="mp3 vorbis shorten sox"
 DEPEND=""
 RDEPEND="virtual/libc
-	virtual/x11
+	|| ( x11-libs/libX11 virtual/x11 )
 	=x11-libs/gtk+-1.2*
-	mp3? ( media-sound/mpg123 )
-	vorbis? ( media-sound/vorbis-tools )
-	shorten? ( media-sound/shorten )
+	mp3? ( media-sound/mpg123 media-sound/mp3info media-sound/lame )
+	vorbis? ( media-sound/vorbis-tools media-sound/oggtst )
+	shorten? ( media-sound/shorten media-sound/shntool media-sound/sox )
+	!shorten? ( sox? ( media-sound/sox ) )
 	amd64? ( >=app-emulation/emul-linux-x86-gtklibs-2.0 )"
 
 RESTRICT="nostrip nomirror"
@@ -82,11 +83,8 @@
 	einfo "to your kernel command line."
 	einfo "For setting up your burning device correctly you also"
 	einfo "have to set read/write access to the devices that are"
-	einfo "mapped to your disc drives, e.g.:"
-	einfo "\tchmod a+rw /dev/hd*"
-	einfo "\tchmod a+rw /dev/sg*"
-	ewarn "This may be a security hole in multiuser environments!"
-	einfo "A better approach is to add your user to the cdrom group, e.g.:"
+	einfo "mapped to your disc drives."
+	einfo "Add your user to the cdrom group, e.g.:"
 	einfo "\tgpasswd -a <USER> cdrom"
 	einfo
 	einfo "NOTE: This is demo software, it will run for a trial"