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

Package-Manager: portage-2.1.3_rc5

6 files changed, 20 insertions, 140 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/Manifest b/app-cdr/nero/Manifest
index 4db7243c912c..c0b0dfd11d7e 100644
--- a/app-cdr/nero/Manifest
+++ b/app-cdr/nero/Manifest
@@ -1,29 +1,17 @@
-AUX nero.desktop 224 RMD160 6ed5b458ac0095748d477dc94dd8d2c1a68d4916 SHA1 9133ce37816b08ee650c7b27fe5b03bebb8b2502 SHA256 85a40b44a5650b6fa89e30880cdb60d9fe30c23f8c073af4f19474e7b501a082
-MD5 4b670ebe3da78fb9d0427f368b2f2c94 files/nero.desktop 224
-RMD160 6ed5b458ac0095748d477dc94dd8d2c1a68d4916 files/nero.desktop 224
-SHA256 85a40b44a5650b6fa89e30880cdb60d9fe30c23f8c073af4f19474e7b501a082 files/nero.desktop 224
-DIST nerolinux-2.1.0.3-x86.rpm 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
 DIST nerolinux-3.0.0.0-x86.rpm 14930747 RMD160 9981a327b6ead239e27abec1f4abcba5d4592b42 SHA1 a2bfa0f56533e4c7bba620b19449ed594df40da7 SHA256 13d409e9f8c81c433a633754373cc2b15ba3582c0f60792f08c63e0354d83f2d
 DIST nerolinux-3.0.0.0-x86_64.rpm 15218657 RMD160 8c7d1eac2074e5932a709446ed4ccbdfcfa726aa SHA1 8cff9f55825ee3bfb8ed6e0cd580d25a78477cb2 SHA256 e724813c5bd653c55af4b9d2d716688aa0bf75b4ffd6e0674dc82c808fc3a609
-EBUILD nero-2.1.0.3.ebuild 2829 RMD160 5736d87a5dbce0cc4ded9e90748c654bde3c8d90 SHA1 89f8f65bf8aacfe06103c0c5ef80660e4f9b146d SHA256 bd387b12f56e914312b257e14124a174b7d93ba5f8d3162de485dd06776d13bd
-MD5 ea21f531125beb180fd2f64c4190afcc nero-2.1.0.3.ebuild 2829
-RMD160 5736d87a5dbce0cc4ded9e90748c654bde3c8d90 nero-2.1.0.3.ebuild 2829
-SHA256 bd387b12f56e914312b257e14124a174b7d93ba5f8d3162de485dd06776d13bd nero-2.1.0.3.ebuild 2829
-EBUILD nero-3.0.0.0.ebuild 2208 RMD160 1f46cc39ea12dedd1e97d2d0bdbf5a62d908ded1 SHA1 556a687da2473874ef65fa687c8abb33b18fe3c9 SHA256 512518d2f4eec8cdf4aee3aa2a8dadaa694f69c13264f0e3eed7d805016ec31c
-MD5 1db2cf33a0ac80c51e4869f33ee5b2e3 nero-3.0.0.0.ebuild 2208
-RMD160 1f46cc39ea12dedd1e97d2d0bdbf5a62d908ded1 nero-3.0.0.0.ebuild 2208
-SHA256 512518d2f4eec8cdf4aee3aa2a8dadaa694f69c13264f0e3eed7d805016ec31c nero-3.0.0.0.ebuild 2208
-MISC ChangeLog 4018 RMD160 21a8c5e49534b7638c2780445c9f7d0424e0081d SHA1 2b1963be32425897ebbfe5dd12b79d20890c1132 SHA256 cb9ef76645d07798c5677653c587390d6d09b77db526cad08de4f4f2b545b262
-MD5 d4d025b428506a6bfd17bf0e7067c2e8 ChangeLog 4018
-RMD160 21a8c5e49534b7638c2780445c9f7d0424e0081d ChangeLog 4018
-SHA256 cb9ef76645d07798c5677653c587390d6d09b77db526cad08de4f4f2b545b262 ChangeLog 4018
+EBUILD nero-3.0.0.0.ebuild 2381 RMD160 48f153155228923b2a07c4d30f0f2c9671031a6f SHA1 fefc14146b53eb0a86fa80434c6e54edde03b4de SHA256 97862f1314b83985785815d5ad01c92bad32b151b2c11a5496c5ef8645e55bcc
+MD5 ab4e206f07e3c73ae30f8910fa065178 nero-3.0.0.0.ebuild 2381
+RMD160 48f153155228923b2a07c4d30f0f2c9671031a6f nero-3.0.0.0.ebuild 2381
+SHA256 97862f1314b83985785815d5ad01c92bad32b151b2c11a5496c5ef8645e55bcc nero-3.0.0.0.ebuild 2381
+MISC ChangeLog 4259 RMD160 22188a4d6455532fdd5dcac73ba17a2567f8039e SHA1 7e675862ec377b0666c8bbb49874c1e291f7e1d6 SHA256 e34cf8fc9cc9af225ccf8250608c7edbd85f463e0e52bb303832a82539969c25
+MD5 192edd3c74026f0c2d5d40499edde85b ChangeLog 4259
+RMD160 22188a4d6455532fdd5dcac73ba17a2567f8039e ChangeLog 4259
+SHA256 e34cf8fc9cc9af225ccf8250608c7edbd85f463e0e52bb303832a82539969c25 ChangeLog 4259
 MISC metadata.xml 547 RMD160 a7bc53356804b1d6d71d0b5c6a0383e0417f27e4 SHA1 d6213d4ac6ef3dd996c488d9a4ab3fd61dc4eee9 SHA256 2e033880922ecd48d6f59d0794e8208e8a311ea68fc6badf468c6e67ef6a1d26
 MD5 752a079177c3e80c7fb258908d0871a2 metadata.xml 547
 RMD160 a7bc53356804b1d6d71d0b5c6a0383e0417f27e4 metadata.xml 547
 SHA256 2e033880922ecd48d6f59d0794e8208e8a311ea68fc6badf468c6e67ef6a1d26 metadata.xml 547
-MD5 3f686a2365ddbabd272e02da78afd9f0 files/digest-nero-2.1.0.3 241
-RMD160 ce8c4fa893ead3f9a88306789ec38b8444f1d7ae files/digest-nero-2.1.0.3 241
-SHA256 95dcd9fb112df58af8e219920f5de6b3fd0ec0de0b849a440f41ccb92bb9c24d files/digest-nero-2.1.0.3 241
 MD5 2464a21a3d12dca4cd2a507cc9d4cea5 files/digest-nero-3.0.0.0 533
 RMD160 e92081a538af0746d51cd0a9c370a6a79d63abd0 files/digest-nero-3.0.0.0 533
 SHA256 cffbd2991bba75d56bb99f63f87a48c984e4fc4a555685eb392e10b85b3d6ce9 files/digest-nero-3.0.0.0 533
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() {