Incorportage amd64 fixes from bug #163930 thanks to raphael@neo-tix.com

Package-Manager: portage-2.1.2-r8

4 files changed, 28 insertions, 24 deletions

diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index 53f41911dfc5..f497811485fc 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/virtualbox
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.3 2007/02/12 17:28:00 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.4 2007/02/12 18:55:09 jokey Exp $
+
+  12 Feb 2007; Markus Ullmann <jokey@gentoo.org> virtualbox-1.3.4.ebuild,
+  virtualbox-9999.ebuild:
+  Incorportage amd64 fixes from bug #163930 thanks to raphael@neo-tix.com
 
 *virtualbox-1.3.4 (12 Feb 2007)
 
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 1d9961429d83..309a869e1172 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -2,18 +2,18 @@
 Hash: SHA1
 
 DIST VirtualBox-OSE-1.3.4.tar.bz2 17491150 RMD160 32bd5f5e9bbf19bf59ffa93ccf6013496b40e318 SHA1 080330ef237ab89c0c00c32aa195c9341c434cf5 SHA256 c7d756645c96d202b8e88924f2b4da414c6d02775d3224739b21cdda064bbeee
-EBUILD virtualbox-1.3.4.ebuild 1548 RMD160 d106ce27fb933faa4f9043086152605b54df68b3 SHA1 9f56edc57bc99dbbb08a029fbf4278fd064d34df SHA256 30490936d50cfe0c4ee01dbfbafc885e3eaff9332b974527b0cef8b5eb5200e9
-MD5 41fdfae5bcf4bcdce152a694b29a2543 virtualbox-1.3.4.ebuild 1548
-RMD160 d106ce27fb933faa4f9043086152605b54df68b3 virtualbox-1.3.4.ebuild 1548
-SHA256 30490936d50cfe0c4ee01dbfbafc885e3eaff9332b974527b0cef8b5eb5200e9 virtualbox-1.3.4.ebuild 1548
-EBUILD virtualbox-9999.ebuild 1504 RMD160 86356f5b331d2cdf8588ebcd09b545df99d62559 SHA1 293269cb96f096485c9fc3c1aae1e906adda7e55 SHA256 4d27cebada74633bcf47ccf0293158d23c72782ebfecba6540f3935735670b4e
-MD5 5fea8171fac6753ffc83b9f5135ddd41 virtualbox-9999.ebuild 1504
-RMD160 86356f5b331d2cdf8588ebcd09b545df99d62559 virtualbox-9999.ebuild 1504
-SHA256 4d27cebada74633bcf47ccf0293158d23c72782ebfecba6540f3935735670b4e virtualbox-9999.ebuild 1504
-MISC ChangeLog 657 RMD160 6d47f67d7a0b74646c7b721e5b06f062c7957f56 SHA1 9228bf8321c23de6a0b214da8a927200b13f9b09 SHA256 d91babebfd90c9e0e32c92fb5df75047748b715e269d4e9cb42c7a29e95196aa
-MD5 9db5a75810265a56250e44207bf92ed6 ChangeLog 657
-RMD160 6d47f67d7a0b74646c7b721e5b06f062c7957f56 ChangeLog 657
-SHA256 d91babebfd90c9e0e32c92fb5df75047748b715e269d4e9cb42c7a29e95196aa ChangeLog 657
+EBUILD virtualbox-1.3.4.ebuild 1567 RMD160 a37addc9ea1c101e8de75d646123d0c630bda738 SHA1 2f284a87431253f12e72e6f78ca507c3f8fa4899 SHA256 cd31c5d029ac5b07173767a19fc2077390331890aa4852684a1a56bffef0bba2
+MD5 482e1d83271db6aa5df163fa6bb4c2b5 virtualbox-1.3.4.ebuild 1567
+RMD160 a37addc9ea1c101e8de75d646123d0c630bda738 virtualbox-1.3.4.ebuild 1567
+SHA256 cd31c5d029ac5b07173767a19fc2077390331890aa4852684a1a56bffef0bba2 virtualbox-1.3.4.ebuild 1567
+EBUILD virtualbox-9999.ebuild 1519 RMD160 2d7afa5c6bc15265379da4123a1d4b094f230bb9 SHA1 9e269d02ff822d358830435395c95b123cbc91f4 SHA256 c5ecd6879393b195be728df05d2a1f6adb380b2407f962968161dbf5b78abe1c
+MD5 38ac2687c36adfd380365dd0d62048f6 virtualbox-9999.ebuild 1519
+RMD160 2d7afa5c6bc15265379da4123a1d4b094f230bb9 virtualbox-9999.ebuild 1519
+SHA256 c5ecd6879393b195be728df05d2a1f6adb380b2407f962968161dbf5b78abe1c virtualbox-9999.ebuild 1519
+MISC ChangeLog 832 RMD160 4fc2cba7b621a3863bae0b8ef79c391126717e54 SHA1 e7ea8462fef0705ebbab128e5d8d4a53e486065f SHA256 0675cba4ee1a7577197442f150308ee502201b116d96c84b9075e4800cf46d26
+MD5 95f23af825f663b2daa7def2fa3d5196 ChangeLog 832
+RMD160 4fc2cba7b621a3863bae0b8ef79c391126717e54 ChangeLog 832
+SHA256 0675cba4ee1a7577197442f150308ee502201b116d96c84b9075e4800cf46d26 ChangeLog 832
 MISC metadata.xml 251 RMD160 f98b79c78c9a648314ee514bc8521a31a8018b3d SHA1 f58b9ae8d4a67e568288a4cf7d0037f228ba3fc4 SHA256 2ecb6b4fcce7435885895d82f44bd288b8ab797c7d6476eaac494d44a56f8886
 MD5 2bd4d3e52be613c49601598c97abb372 metadata.xml 251
 RMD160 f98b79c78c9a648314ee514bc8521a31a8018b3d metadata.xml 251
@@ -27,7 +27,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFF0KNpz974XjDVpbkRApvtAKDXQMmOybe7yxCUGDcEZBQDGx19sgCgqhN/
-m5+A97F5L/dztaYSvXfHt3c=
-=jqxz
+iD8DBQFF0LfZz974XjDVpbkRAjjcAKDW95B6A5KqKZxT5A/JexIz4LZcZACgrgfM
+lBhC6QyamIaa4TC5uykOGzU=
+=unt8
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox/virtualbox-1.3.4.ebuild b/app-emulation/virtualbox/virtualbox-1.3.4.ebuild
index 77c9e9e45836..435f576c2b41 100644
--- a/app-emulation/virtualbox/virtualbox-1.3.4.ebuild
+++ b/app-emulation/virtualbox/virtualbox-1.3.4.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-emulation/virtualbox/virtualbox-1.3.4.ebuild,v 1.1 2007/02/12 17:28:00 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-1.3.4.ebuild,v 1.2 2007/02/12 18:55:09 jokey Exp $
 
 inherit eutils linux-mod qt3
 
@@ -11,7 +11,7 @@ SRC_URI="http://virtualbox.org/download/${PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-libs/libIDL
@@ -30,7 +30,7 @@ S=${WORKDIR}/${MY_P}
 
 BUILD_TARGETS="all"
 BUILD_PARAMS="KERN_DIR=${KERNEL_DIR}"
-MODULE_NAMES="vboxdrv(misc:${S}/out/linux.x86/release/bin/src:${S}/out/linux.x86/release/bin/src)"
+MODULE_NAMES="vboxdrv(misc:${S}/out/linux.${ARCH}/release/bin/src:${S}/out/linux.${ARCH}/release/bin/src)"
 
 src_compile() {
 	cd "${S}"
@@ -42,7 +42,7 @@ src_compile() {
 
 src_install() {
 	linux-mod_src_install
-	cd "${S}"/out/linux.x86/release/bin
+	cd "${S}"/out/linux.${ARCH}/release/bin
 	rm -rf sdk src tst* testcase additions/src
 	rm vboxdrv.ko SUPInstall SUPUninstall
 	insinto /opt/VirtualBox
diff --git a/app-emulation/virtualbox/virtualbox-9999.ebuild b/app-emulation/virtualbox/virtualbox-9999.ebuild
index 2e6bef0162b8..d899ab9bcea7 100644
--- a/app-emulation/virtualbox/virtualbox-9999.ebuild
+++ b/app-emulation/virtualbox/virtualbox-9999.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-emulation/virtualbox/virtualbox-9999.ebuild,v 1.3 2007/02/03 09:08:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-9999.ebuild,v 1.4 2007/02/12 18:55:09 jokey Exp $
 
 inherit eutils linux-mod qt3 subversion
 
@@ -10,7 +10,7 @@ ESVN_REPO_URI="http://virtualbox.org/svn/vbox/trunk"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-libs/libIDL
@@ -27,7 +27,7 @@ DEPEND="${REPEND}
 
 BUILD_TARGETS="all"
 BUILD_PARAMS="KERN_DIR=${KERNEL_DIR}"
-MODULE_NAMES="vboxdrv(misc:${S}/out/linux.x86/release/bin/src:${S}/out/linux.x86/release/bin/src)"
+MODULE_NAMES="vboxdrv(misc:${S}/out/linux.${ARCH}/release/bin/src:${S}/out/linux.${ARCH}/release/bin/src)"
 
 src_compile() {
 	cd "${S}"
@@ -39,7 +39,7 @@ src_compile() {
 
 src_install() {
 	linux-mod_src_install
-	cd "${S}"/out/linux.x86/release/bin
+	cd "${S}"/out/linux.${ARCH}/release/bin
 	rm -rf sdk src tst* testcase additions/src
 	rm vboxdrv.ko SUPInstall SUPUninstall
 	insinto /opt/VirtualBox