Merge portage versions

svn path=/trunk/; revision=510

6 files changed, 31 insertions, 11 deletions

diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index 583575b..39a921e 100644
--- a/app-emulation/virtualbox-guest-additions/ChangeLog
+++ b/app-emulation/virtualbox-guest-additions/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-emulation/virtualbox-guest-additions
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.5 2008/09/15 19:50:08 jokey Exp $
+
+*virtualbox-guest-additions-2.0.2 (15 Sep 2008)
+
+  15 Sep 2008; Markus Ullmann <jokey@gentoo.org>
+  files/virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch,
+  +files/virtualbox-guest-additions-2.0.2-localconfig,
+  virtualbox-guest-additions-1.6.4-r2.ebuild,
+  virtualbox-guest-additions-1.6.6.ebuild,
+  +virtualbox-guest-additions-2.0.2.ebuild:
+  (Proxy-Commit) Port from dev overlay
 
   13 Sep 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com>
   +virtualbox-guest-additions-2.0.2.ebuild,
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index d0273af..0577481 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,11 +1,21 @@
-AUX virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch 2042 RMD160 a3e09cff5de8ea11e892187dce899cab4c8742d8 SHA1 d0d9d0679736fa21270ccfff0fac93533afd9a2a SHA256 051bb5d7c4a2040a1fe1289f20dcc35e6b263041774cf93466e682659d493ca8
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch 2141 RMD160 406b0663e786721cee80736ec1119fe0406e0a1c SHA1 63229245e4c43dcfa526ef02f5fb8f8ba59030af SHA256 28a035ada49784d118cf61811f4d4b7e4957e2a3333cb3256d42bdd75e4f20e7
 AUX virtualbox-guest-additions-2.0.2-localconfig 845 RMD160 5cd3b73046f0dbe8eebef9041f224b6c2433b733 SHA1 1a31b795e4037e444b94afdaa586349f1ae34d9b SHA256 ac7c25fd5f93f4a9ab76a085c58c9c3eb5e93f9e58594a022799df7103040a43
 AUX virtualbox-guest-additions.initd 1463 RMD160 4daceefa3e10659381f4b714512548944c7f54fd SHA1 f5290150bbf99feac5c6d81c4f82f9191e5f1786 SHA256 933dbdc5e5363dfbdc2d51deed0726ab91f1ea89e330298266b9ffb03c38989a
 DIST VirtualBox-1.6.4-OSE.tar.bz2 35484117 RMD160 af94b774d9964757da125c4614e393396f7e892b SHA1 457ae85f2d10028ac7c56e4b35ee47028ec0208b SHA256 7e777e5f602d7b48bf5a8b1d580ee43dd6327b9037816fde484a13db8a86b422
 DIST VirtualBox-1.6.6-OSE.tar.bz2 35483853 RMD160 4b17428371089806cf6f5e52d1905936f7beb01d SHA1 7c323b35d77277c650cbce2821ab6778d1e3270e SHA256 acb3c20ef751ed408489d7b5c2d5d441226055a6e83bfeb9258ce2d55baba4da
 DIST VirtualBox-2.0.2-OSE.tar.bz2 37548591 RMD160 4156f2efe5245236f9890abcd0adb5ad5291f86f SHA1 cdc51cc4e5ff189cf9eff832179494009df1334a SHA256 0318c69eace3db0979f0aefd27aeb6c54d7c1aafcc6a156b076bc116a1d8805b
-EBUILD virtualbox-guest-additions-1.6.4-r2.ebuild 3328 RMD160 f603c9620de96921b7aad3f191e70bbf957ae492 SHA1 67a0987fcb3933f36c8aa8bb6225f814253ab07d SHA256 f6940bab52cc39a55ae942346c51376c37f1d6b5a6ad1e6bbf85c2a74c2bf283
-EBUILD virtualbox-guest-additions-1.6.6.ebuild 3397 RMD160 72b6cd3a2fb43d8ba0a5aa2979505dafe6ffff2b SHA1 7f37f5f9a17f8e87169b89be45afa259dad781fc SHA256 e51aa1271e829a018b15d01b0b94e1a809c3cce95e4536837e1072047a0d6bd0
-EBUILD virtualbox-guest-additions-2.0.2.ebuild 3609 RMD160 a9b921e3860b801028b6b52b4162f53cd4119671 SHA1 5da351b0c25fd8deae8724bb6d9cd5d4348b6193 SHA256 a83df4fe6e725d8dd0823b1f9087f35420908a37b969f087f648b9719e1f6d60
-MISC ChangeLog 5298 RMD160 71480eff7419a21e191f73f903dd4ba4c9d85522 SHA1 711c262c8091923fea9008ae29301122b0ed8828 SHA256 aef38c436f7589b679ebc4bbf53594dc4356547803f8077f43b5bf2bad857638
+EBUILD virtualbox-guest-additions-1.6.4-r2.ebuild 3472 RMD160 7b32134cf5584fc8a3906784d1ff09322011b56b SHA1 e75d6e47c95623271708c8f4d4f87fa299145886 SHA256 b1721a33cf0ad020226efe956f58bd46721bb16b3a009bb113a344b76a7b35a2
+EBUILD virtualbox-guest-additions-1.6.6.ebuild 3538 RMD160 91fce610d0376e447f9e92c0123702f1ad0b32ae SHA1 b3add8bb09c82cc150592ded34d2885f346839ca SHA256 8bd6503e530f0b63cd041901f18b5e38fced553e690d867cf25e532765e1a8e5
+EBUILD virtualbox-guest-additions-2.0.2.ebuild 3750 RMD160 1e5eb752fd09dfb73f2d61aeefc0e6c04dabfeaa SHA1 055b4466d0a6de5adfeefd06bc1004cd3db888f2 SHA256 5d23f9218ad4437e6e27f1a3ca3ced1b4a45f335d0f2e3698a82e166edcc0a88
+MISC ChangeLog 5805 RMD160 fa3c67232c717d390a2e3edcf73d535fe9a32d67 SHA1 abcc91290e81c2ed64b5426e9bab33c38b5d4149 SHA256 7d337a447bdacfcea52fdfea9dbbeb744280ae27e37a74c3526866a2d1ff8799
 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjOvGYACgkQz974XjDVpblpQwCeOT46AvYqtFqLb2XU9tbITBR2
+yQEAoJ74qbGJ6+WeM6zi4Zt/OxZarayg
+=pbgh
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch
index e903acb..25d9288 100644
--- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch
+++ b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch
@@ -1,7 +1,7 @@
 --- src/apps/Makefile.kmk	1970-01-01 01:00:00.000000000 +0100
 +++ src/apps/Makefile.kmk	2008-08-02 16:06:11.358197514 +0200
 @@ -0,0 +1,28 @@
-+# $Id: Makefile.kmk 10190 2008-07-04 02:25:55Z vboxsync $
++# $Id: virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch,v 1.4 2008/09/15 19:50:09 jokey Exp $
 +## @file
 +# Sub-Makefile for the external apps.
 +#
@@ -32,7 +32,7 @@
 --- src/apps/tunctl/Makefile.kmk	1970-01-01 01:00:00.000000000 +0100
 +++ src/apps/tunctl/Makefile.kmk	2008-08-02 16:06:37.447936207 +0200
 @@ -0,0 +1,32 @@
-+# $Id: Makefile.kmk 31342 2008-05-28 08:44:35Z frank $
++# $Id: virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch,v 1.4 2008/09/15 19:50:09 jokey Exp $
 +## @file
 +# Sub-Makefile for VBoxTunctl
 +#
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.4-r2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.4-r2.ebuild
index 2c8a548..259a713 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.4-r2.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.4-r2.ebuild,v 1.2 2008/09/15 19:50:08 jokey Exp $
 
 inherit eutils linux-mod
 
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.6.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.6.ebuild
index 8290108..b8829e3 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.6.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.6.ebuild,v 1.2 2008/09/15 19:50:08 jokey Exp $
 
 inherit eutils linux-mod
 
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.0.2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.0.2.ebuild
index c8fb90d..e3a8e83 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.0.2.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.0.2.ebuild,v 1.1 2008/09/15 19:50:08 jokey Exp $
 
 inherit eutils linux-mod