Port fixes from jokey's overlay; thanks to x-drum: add blocker for virtualbox-9999; force src_unpack to skip; fix header

Package-Manager: portage-2.1.2.9

4 files changed, 28 insertions, 17 deletions

diff --git a/app-emulation/virtualbox-additions/ChangeLog b/app-emulation/virtualbox-additions/ChangeLog
index 2c818e7b81a8..500bdbaaa168 100644
--- a/app-emulation/virtualbox-additions/ChangeLog
+++ b/app-emulation/virtualbox-additions/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/virtualbox-additions
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/ChangeLog,v 1.7 2007/06/22 14:50:04 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/ChangeLog,v 1.8 2007/06/23 19:36:12 masterdriverz Exp $
+
+  23 Jun 2007; Charlie Shepherd <masterdriverz@gentoo.org>
+  virtualbox-additions-1.3.8.ebuild, virtualbox-additions-1.4.0.ebuild:
+  Port fixes from jokey's overlay; thanks to x-drum: add blocker for
+  virtualbox-9999; force src_unpack to skip; fix header
 
   22 Jun 2007; Charlie Shepherd <masterdriverz@gentoo.org>
   virtualbox-additions-1.4.0.ebuild:
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index f29c3729eb7a..c0e1b354f23a 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,17 +1,17 @@
 DIST VBoxGuestAdditions_1.3.8.iso 2334720 RMD160 af2d181cede44e9a12f38bd3ea93f76283467d4a SHA1 57690885de5c297e33d8b61dcc1443c395e7bbbe SHA256 be0a5f3bc5c35813b2964224ca83e493ac9d34fd266b198d2322257783121fa4
 DIST VBoxGuestAdditions_1.4.0.iso 2689024 RMD160 db2d18950561f9c81b32f9f98109867e9e52e68a SHA1 603a0c660a49d3ecbfa35deb24309753b6658295 SHA256 d37f1866a72b03ff957559de33aafc63f74d3939ad66f867117ebfebf720a6cd
-EBUILD virtualbox-additions-1.3.8.ebuild 575 RMD160 3723b783c80aaa993797bfe6c68c2a853cce795e SHA1 69590d0a9591f34264ab9867b17328f7bdfd80c4 SHA256 390bac71b3c908e0ce3ebf5d2cedb6ffd5e90ab7b1a0bf26938919f86270dd3f
-MD5 db4084a344898ddfc60562fa3e554b8d virtualbox-additions-1.3.8.ebuild 575
-RMD160 3723b783c80aaa993797bfe6c68c2a853cce795e virtualbox-additions-1.3.8.ebuild 575
-SHA256 390bac71b3c908e0ce3ebf5d2cedb6ffd5e90ab7b1a0bf26938919f86270dd3f virtualbox-additions-1.3.8.ebuild 575
-EBUILD virtualbox-additions-1.4.0.ebuild 603 RMD160 fec3b0ea6c8cb23debaacebb63fe1f41c0ceaa23 SHA1 752586e7b39f348c4625bf1a60a55383db743136 SHA256 735dabfae8c87b1ce2114a8d6ca6c18b5bcae87a604a07d9d3251c01baed2e73
-MD5 ef5060cbbda7c24dfb67d346107cd7c3 virtualbox-additions-1.4.0.ebuild 603
-RMD160 fec3b0ea6c8cb23debaacebb63fe1f41c0ceaa23 virtualbox-additions-1.4.0.ebuild 603
-SHA256 735dabfae8c87b1ce2114a8d6ca6c18b5bcae87a604a07d9d3251c01baed2e73 virtualbox-additions-1.4.0.ebuild 603
-MISC ChangeLog 1504 RMD160 5ff905077505a12b5d50e907495155242ea8ffb0 SHA1 9b5cdbeecb9a7cb137664af8a8a52565b222b20e SHA256 c81fd811f3bbb71f5ca655413f472e8e8d5f9f473e0b67f46cd4819feb0eeb59
-MD5 0c47cf7aa652239cbe189ab1749c085d ChangeLog 1504
-RMD160 5ff905077505a12b5d50e907495155242ea8ffb0 ChangeLog 1504
-SHA256 c81fd811f3bbb71f5ca655413f472e8e8d5f9f473e0b67f46cd4819feb0eeb59 ChangeLog 1504
+EBUILD virtualbox-additions-1.3.8.ebuild 774 RMD160 a44b1d63a9c9009616f997f23be854030bf62719 SHA1 fa94056c2b9b76c11b2f0f179551f43c780e128e SHA256 f878fbc3e13cdbd8d2224a051cc885b50981b2ed9028d4ce9d1b896f7914dba0
+MD5 945b1ccef3bc0bf24183a1afec207e22 virtualbox-additions-1.3.8.ebuild 774
+RMD160 a44b1d63a9c9009616f997f23be854030bf62719 virtualbox-additions-1.3.8.ebuild 774
+SHA256 f878fbc3e13cdbd8d2224a051cc885b50981b2ed9028d4ce9d1b896f7914dba0 virtualbox-additions-1.3.8.ebuild 774
+EBUILD virtualbox-additions-1.4.0.ebuild 774 RMD160 ba0df4787f0b33a6f2c43ea68266bfbc1126b7f3 SHA1 08531d4b4c27a6a27b55f1913db209219badbb1e SHA256 90645ca7dea3d2822aec2fd074883839c1f69185f0094087e6fa9760f9a8e5be
+MD5 a450fcb1272e6ebb7f74d09b7ac5bb7c virtualbox-additions-1.4.0.ebuild 774
+RMD160 ba0df4787f0b33a6f2c43ea68266bfbc1126b7f3 virtualbox-additions-1.4.0.ebuild 774
+SHA256 90645ca7dea3d2822aec2fd074883839c1f69185f0094087e6fa9760f9a8e5be virtualbox-additions-1.4.0.ebuild 774
+MISC ChangeLog 1761 RMD160 5f7703120fb96d542afa0e1bed457888a4afa9b4 SHA1 cbe6a88c0b5e92b4d0bb5862d073f2ca7fd54d5c SHA256 14f703d6392e1f241bf3c4f122c0dc7ffca13358e763a5c2815a8215a33806c8
+MD5 4535b74b58f1972176fbb75dc4b46a20 ChangeLog 1761
+RMD160 5f7703120fb96d542afa0e1bed457888a4afa9b4 ChangeLog 1761
+SHA256 14f703d6392e1f241bf3c4f122c0dc7ffca13358e763a5c2815a8215a33806c8 ChangeLog 1761
 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
 MD5 688de6c9943189afc4fa3ab510813dbd metadata.xml 344
 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e metadata.xml 344
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-1.3.8.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-1.3.8.ebuild
index 0860f5e5b77e..e9b17875a253 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-1.3.8.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-1.3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-1.3.8.ebuild,v 1.3 2007/06/23 19:36:12 masterdriverz Exp $
 
 inherit eutils
 
@@ -16,7 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE=""
 
-RDEPEND="!app-emulation/virtualbox-bin"
+RDEPEND="!app-emulation/virtualbox-bin
+	!=app-emulation/virtualbox-9999"
 
 RESTRICT="primaryuri"
 
@@ -24,6 +25,10 @@ pkg_setup() {
 	check_license
 }
 
+src_unpack() {
+	return 0
+}
+
 src_install() {
 	insinto /opt/VirtualBox/additions
 	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-1.4.0.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-1.4.0.ebuild
index ab1ca6e05375..5dced7752d0e 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-1.4.0.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-1.4.0.ebuild,v 1.3 2007/06/23 19:36:12 masterdriverz Exp $
 
 inherit eutils
 
@@ -16,7 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE=""
 
-RDEPEND="!app-emulation/virtualbox-bin"
+RDEPEND="!app-emulation/virtualbox-bin
+	!=app-emulation/virtualbox-9999"
 
 RESTRICT="primaryuri"