--- nero-2.0.0.3b.ebuild	2005-09-22 23:35:18.000000000 +0200
+++ nero-2.0.0.3b-r1.ebuild	2005-10-30 09:02:03.000000000 +0100
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-cdr/nero/nero-2.0.0.3b.ebuild,v 1.2 2005/09/22 21:17:50 wschlich Exp $
 
-inherit eutils rpm
+inherit eutils rpm multilib
 
 DESCRIPTION="Nero Burning ROM for Linux"
 HOMEPAGE="http://www.nero.com/en/NeroLINUX.html" # nerolinux.nero.com coming soon...
@@ -13,62 +13,40 @@
 	http://httpdl6.nero.com/${NERO_RPM}"
 LICENSE="Nero"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mp3 oggvorbis shorten"
+KEYWORDS="~amd64"
+IUSE="mp3 vorbis shorten"
 DEPEND=""
 RDEPEND="virtual/libc
 	virtual/x11
 	=x11-libs/gtk+-1.2*
 	mp3? ( media-sound/mpg123 )
-	oggvorbis? ( media-sound/vorbis-tools )
+	vorbis? ( media-sound/vorbis-tools )
 	shorten? ( media-sound/shorten )
 	amd64? ( >=app-emulation/emul-linux-x86-gtklibs-2.0 )"
 
 RESTRICT="nostrip nomirror"
 
-src_unpack() {
-	rpm_src_unpack
+pkg_setup() {
+	# This is a binary x86 package => ABI=x86
+	# Please keep this in future versions
+	has_multilib_profile && ABI="x86"
 }
 
-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
+	insinto /usr/share
+	doins -r ./usr/share/nero/
+
+	insinto /usr/share/applications
+	doins ${FILESDIR}/nero.desktop
 
-	dodir /usr/lib
-	insinto /usr/lib
+	insinto /usr/$(get_libdir)
 	doins ./usr/lib/*.so
 
 	dobin ./usr/bin/nero
-
-	insinto /usr/share/applications
-	doins ${FILESDIR}/nero.desktop
 }
 
-# pkg_preinst() {
-# 	check_license
-# }
-
 pkg_postinst() {
 	einfo
 	einfo "Please make sure that no hdX=ide-scsi option is passed"
@@ -78,6 +56,8 @@
 	einfo "mapped to your disc drives, e.g.:"
 	einfo "\tchmod a+rw /dev/hd*"
 	einfo "\tchmod a+rw /dev/sg*"
+	einfo "or add your user to the cdrom group, e.g.:"
+	einfo "\tgpasswd -a <USER> cdrom"
 	ewarn "This may be a security hole in multiuser environments!"
 	einfo
 	einfo "NOTE: This is demo software, it will run for a trial"