(Proxy-Commit) Port from dev overlay

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686)

4 files changed, 50 insertions, 17 deletions

diff --git a/app-emulation/virtualbox-ose-additions/ChangeLog b/app-emulation/virtualbox-ose-additions/ChangeLog
index 9745afa2d870..418633e23c66 100644
--- a/app-emulation/virtualbox-ose-additions/ChangeLog
+++ b/app-emulation/virtualbox-ose-additions/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for app-emulation/virtualbox-ose-additions
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose-additions/ChangeLog,v 1.5 2008/09/08 05:13:05 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose-additions/ChangeLog,v 1.6 2008/09/15 19:53:46 jokey Exp $
+
+*virtualbox-ose-additions-2.0.2 (15 Sep 2008)
+
+  15 Sep 2008; Markus Ullmann <jokey@gentoo.org>
+  -virtualbox-ose-additions-1.6.2.ebuild,
+  virtualbox-ose-additions-1.6.4.ebuild,
+  virtualbox-ose-additions-1.6.6.ebuild,
+  +virtualbox-ose-additions-2.0.2.ebuild:
+  (Proxy-Commit) Port from dev overlay
+
+  13 Sep 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  -virtualbox-ose-additions-1.6.2.ebuild,
+  +virtualbox-ose-additions-2.0.2.ebuild:
+  Version bump; install files in /usr/share/virtualbox-ose rather than in
+  /opt/VirtualBox
 
 *virtualbox-ose-additions-1.6.6 (06 Sep 2008)
 
diff --git a/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-1.6.4.ebuild b/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-1.6.4.ebuild
index e2346015b21d..5b89dcc08eb9 100644
--- a/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-1.6.4.ebuild
+++ b/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-1.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-1.6.4.ebuild,v 1.3 2008/09/06 19:20:28 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-1.6.4.ebuild,v 1.4 2008/09/15 19:53:46 jokey Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ MY_P=${MY_PN}_${PV}
 
 DESCRIPTION="Guest additions for VirtualBox"
 HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"
+SRC_URI="${MY_P}.iso"
 
 LICENSE="PUEL"
 SLOT="0"
@@ -19,10 +19,16 @@ IUSE=""
 RDEPEND="!app-emulation/virtualbox-bin
 	!=app-emulation/virtualbox-ose-9999"
 
-RESTRICT="primaryuri"
+RESTRICT="fetch"
 
-pkg_setup() {
-	check_license
+pkg_nofetch() {
+	# Fetch restriction added due licensing and problems downloading with
+	# wget, see http://www.virtualbox.org/ticket/2148
+	elog "Please download the package from:"
+	elog ""
+	elog "http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"
+	elog ""
+	elog "and then put it in ${DISTDIR}"
 }
 
 src_unpack() {
diff --git a/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-1.6.6.ebuild b/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-1.6.6.ebuild
index 25658fa994b7..ab84b73ff9fd 100644
--- a/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-1.6.6.ebuild
+++ b/app-emulation/virtualbox-ose-additions/virtualbox-ose-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: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-1.6.6.ebuild,v 1.1 2008/09/06 19:20:28 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-1.6.6.ebuild,v 1.2 2008/09/15 19:53:46 jokey Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ MY_P=${MY_PN}_${PV}
 
 DESCRIPTION="Guest additions for VirtualBox"
 HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"
+SRC_URI="${MY_P}.iso"
 
 LICENSE="PUEL"
 SLOT="0"
@@ -19,10 +19,16 @@ IUSE=""
 RDEPEND="!app-emulation/virtualbox-bin
 	!=app-emulation/virtualbox-ose-9999"
 
-RESTRICT="primaryuri"
+RESTRICT="fetch"
 
-pkg_setup() {
-	check_license
+pkg_nofetch() {
+	# Fetch restriction added due licensing and problems downloading with
+	# wget, see http://www.virtualbox.org/ticket/2148
+	elog "Please download the package from:"
+	elog ""
+	elog "http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"
+	elog ""
+	elog "and then put it in ${DISTDIR}"
 }
 
 src_unpack() {
diff --git a/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-1.6.2.ebuild b/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-2.0.2.ebuild
index 9b89a4d493ce..4387ab7c3e5b 100644
--- a/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-1.6.2.ebuild
+++ b/app-emulation/virtualbox-ose-additions/virtualbox-ose-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: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-1.6.2.ebuild,v 1.2 2008/09/06 19:20:28 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-2.0.2.ebuild,v 1.1 2008/09/15 19:53:46 jokey Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ MY_P=${MY_PN}_${PV}
 
 DESCRIPTION="Guest additions for VirtualBox"
 HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"
+SRC_URI="${MY_P}.iso"
 
 LICENSE="PUEL"
 SLOT="0"
@@ -19,10 +19,16 @@ IUSE=""
 RDEPEND="!app-emulation/virtualbox-bin
 	!=app-emulation/virtualbox-ose-9999"
 
-RESTRICT="primaryuri"
+RESTRICT="fetch"
 
-pkg_setup() {
-	check_license
+pkg_nofetch() {
+	# Fetch restriction added due licensing and problems downloading with
+	# wget, see http://www.virtualbox.org/ticket/2148
+	elog "Please download the package from:"
+	elog ""
+	elog "http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"
+	elog ""
+	elog "and then put it in ${DISTDIR}"
 }
 
 src_unpack() {
@@ -30,6 +36,6 @@ src_unpack() {
 }
 
 src_install() {
-	insinto /opt/VirtualBox/additions
+	insinto /usr/share/${PN/-additions}
 	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
 }