Keyword for ~amd64 after heavy testing from AMD64 Arch Testers Jonas Pedersen and Kenneth Prugh. Authorized by KingTaco.

(Portage version: 2.1.3_rc5)

5 files changed, 12 insertions, 120 deletions

diff --git a/app-cdr/nero/ChangeLog b/app-cdr/nero/ChangeLog
index b572333d64db..c1f6e1fb0cbd 100644
--- a/app-cdr/nero/ChangeLog
+++ b/app-cdr/nero/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/nero
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/nero/ChangeLog,v 1.28 2007/06/30 17:42:04 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/nero/ChangeLog,v 1.29 2007/06/30 20:17:43 drac Exp $
+
+  30 Jun 2007; Samuli Suominen <drac@gentoo.org> -files/nero.desktop,
+  -nero-2.1.0.3.ebuild, nero-3.0.0.0.ebuild:
+  Keyword for ~amd64 after heavy testing from AMD64 Arch Testers Jonas
+  Pedersen and Kenneth Prugh. Authorized by KingTaco.
 
   30 Jun 2007; Samuli Suominen <drac@gentoo.org> nero-3.0.0.0.ebuild:
   Add more QA_ variables for x86_64.
diff --git a/app-cdr/nero/files/digest-nero-2.1.0.3 b/app-cdr/nero/files/digest-nero-2.1.0.3
deleted file mode 100644
index abf5568f0751..000000000000
--- a/app-cdr/nero/files/digest-nero-2.1.0.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d41d8cd98f00b204e9800998ecf8427e nerolinux-2.1.0.3-x86.rpm 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 nerolinux-2.1.0.3-x86.rpm 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 nerolinux-2.1.0.3-x86.rpm 0
diff --git a/app-cdr/nero/files/nero.desktop b/app-cdr/nero/files/nero.desktop
deleted file mode 100644
index 1af5bee0afc4..000000000000
--- a/app-cdr/nero/files/nero.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=NeroLINUX
-Comment=Linux OS Solution for CD/DVD Burning
-Exec=nero
-Icon=/usr/share/nero/pixmaps/nero.png
-Type=Application
-Terminal=false
-Encoding=UTF-8
-Categories=Application;AudioVideo;DiscBurning;System
diff --git a/app-cdr/nero/nero-2.1.0.3.ebuild b/app-cdr/nero/nero-2.1.0.3.ebuild
deleted file mode 100644
index 6f84b0e40b8c..000000000000
--- a/app-cdr/nero/nero-2.1.0.3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/nero/nero-2.1.0.3.ebuild,v 1.5 2007/06/30 11:47:41 drac Exp $
-
-inherit eutils rpm multilib
-
-DESCRIPTION="Nero Burning ROM for Linux"
-HOMEPAGE="http://nerolinux.nero.com/"
-NERO_RPM="nerolinux-${PV}-x86.rpm"
-SRC_URI="http://httpdl3.de.nero.com/${NERO_RPM}
-	http://httpdl4.de.nero.com/${NERO_RPM}
-	http://httpdl5.de.nero.com/${NERO_RPM}
-	http://httpdl6.de.nero.com/${NERO_RPM}
-	ftp://ftp3.de.nero.com/${NERO_RPM}
-	ftp://ftp4.de.nero.com/${NERO_RPM}
-	ftp://ftp5.de.nero.com/${NERO_RPM}
-	ftp://ftp6.de.nero.com/${NERO_RPM}"
-LICENSE="Nero"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mp3 ogg shorten sox vorbis"
-DEPEND=""
-RDEPEND="sys-libs/glibc
-	|| ( 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() {
-	elog
-	elog "Please make sure that no hdX=ide-scsi option is passed"
-	elog "to your kernel command line."
-	elog
-	elog "For setting up your burning device correctly you also"
-	elog "have to give your regular user(s) read/write access to"
-	elog "the disc writer devices, for example by adding the user(s)"
-	elog "to the system group 'cdrom', e.g. like this:"
-	elog
-	elog "\tgpasswd -a <username> cdrom"
-	elog
-	elog "NOTE: This is demo software, it will run for a trial"
-	elog "period only until unlocked with a serial number."
-	elog "See ${HOMEPAGE} for details."
-	elog
-	elog "Technical support for NeroLINUX is provided by CDFreaks"
-	elog "Linux forum at http://club.cdfreaks.com/forumdisplay.php?f=104"
-	elog
-}
diff --git a/app-cdr/nero/nero-3.0.0.0.ebuild b/app-cdr/nero/nero-3.0.0.0.ebuild
index da6f1a524ed2..fae119b9f0a6 100644
--- a/app-cdr/nero/nero-3.0.0.0.ebuild
+++ b/app-cdr/nero/nero-3.0.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/nero/nero-3.0.0.0.ebuild,v 1.9 2007/06/30 17:42:04 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/nero/nero-3.0.0.0.ebuild,v 1.10 2007/06/30 20:17:43 drac Exp $
 
 inherit eutils fdo-mime rpm multilib
 
@@ -11,8 +11,7 @@ SRC_URI="x86? ( mirror://${PN}/${PN}linux-${PV}-x86.rpm )
 
 LICENSE="Nero"
 SLOT="0"
-# Should be all ready for ~amd64 but needs to be tested.
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 RDEPEND="x11-libs/libX11
@@ -54,6 +53,10 @@ src_install() {
 	use doc && dodoc usr/share/doc/${PN}/*.pdf
 
 	make_wrapper ${PN} ./${PN} /opt/${PN} /opt/${PN}/$(get_libdir) || die "make_wrapper failed."
+
+	# This is a ugly hack to fix burning in x86_64 which can be removed in future releases.
+	# http://club.cdfreaks.com/showthread.php?t=218041
+	use amd64 && cp usr/share/${PN}/Nero*.txt "${D}"/opt/${PN}/$(get_libdir)/${PN}
 }
 
 pkg_postinst() {