(Proxy commit) Version bump

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 i686

7 files changed, 81 insertions, 53 deletions

diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index 14ead571dd52..8420079262f0 100644
--- a/app-emulation/virtualbox-bin/ChangeLog
+++ b/app-emulation/virtualbox-bin/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for app-emulation/virtualbox-bin
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.35 2008/09/15 19:52:56 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.36 2008/10/27 17:15:21 jokey Exp $
+
+*virtualbox-bin-2.0.4 (27 Oct 2008)
+
+  27 Oct 2008; Markus Ullmann <jokey@gentoo.org>
+  +files/virtualbox-bin-1-wrapper, -files/virtualbox-bin-2.0.2-wrapper,
+  +files/virtualbox-bin-2-wrapper, files/virtualbox-bin.desktop,
+  -files/virtualbox-bin-wrapper, -virtualbox-bin-1.6.4.ebuild,
+  virtualbox-bin-1.6.6.ebuild, virtualbox-bin-2.0.2.ebuild,
+  +virtualbox-bin-2.0.4.ebuild:
+  (Proxy commit) Version bump
+
+  25 Oct 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  -virtualbox-bin-1.6.4.ebuild, virtualbox-bin-1.6.6.ebuild,
+  +files/virtualbox-bin-1-wrapper, virtualbox-bin-2.0.2.ebuild,
+  -files/virtualbox-bin-2.0.2-wrapper, +virtualbox-bin-2.0.4.ebuild,
+  +files/virtualbox-bin-2-wrapper, files/virtualbox-bin.desktop,
+  -files/virtualbox-bin-wrapper:
+  -m Version Bump; drop version 1.6.4
 
 *virtualbox-bin-2.0.2 (15 Sep 2008)
 
diff --git a/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper b/app-emulation/virtualbox-bin/files/virtualbox-bin-1-wrapper
index 3dbfce6a7b22..3dbfce6a7b22 100644
--- a/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper
+++ b/app-emulation/virtualbox-bin/files/virtualbox-bin-1-wrapper
diff --git a/app-emulation/virtualbox-bin/files/virtualbox-bin-2.0.2-wrapper b/app-emulation/virtualbox-bin/files/virtualbox-bin-2-wrapper
index 3888750d717a..3888750d717a 100755
--- a/app-emulation/virtualbox-bin/files/virtualbox-bin-2.0.2-wrapper
+++ b/app-emulation/virtualbox-bin/files/virtualbox-bin-2-wrapper
diff --git a/app-emulation/virtualbox-bin/files/virtualbox-bin.desktop b/app-emulation/virtualbox-bin/files/virtualbox-bin.desktop
index 5aa492552507..a9b7ee1ceeca 100644
--- a/app-emulation/virtualbox-bin/files/virtualbox-bin.desktop
+++ b/app-emulation/virtualbox-bin/files/virtualbox-bin.desktop
@@ -4,5 +4,5 @@ Type=Application
 Comment=Run several virtual systems on a single host computer
 Exec=VirtualBox
 TryExec=VirtualBox
-Icon=virtualbox
+Icon=virtualbox-bin
 Categories=System;Emulator;
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-1.6.6.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-1.6.6.ebuild
index 8133cd43cb38..6dc2eb51ca41 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-1.6.6.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-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-bin/virtualbox-bin-1.6.6.ebuild,v 1.2 2008/09/15 19:52:56 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-1.6.6.ebuild,v 1.3 2008/10/27 17:15:21 jokey Exp $
 
 EAPI=1
 
@@ -88,7 +88,7 @@ src_unpack() {
 src_install() {
 	if ! use headless ; then
 		newicon VBox.png virtualbox.png
-		newmenu "${FILESDIR}"/${PN}.desktop virtualbox.desktop
+		newmenu "${FILESDIR}"/${PN}.desktop ${PN}.desktop
 	fi
 
 	# create virtualbox configurations files
@@ -146,7 +146,7 @@ src_install() {
 	fi
 
 	exeinto /opt/VirtualBox
-	newexe "${FILESDIR}/${PN}-wrapper" "VBox.sh" || die
+	newexe "${FILESDIR}/${PN}-1-wrapper" "VBox.sh" || die
 	fowners root:vboxusers /opt/VirtualBox/VBox.sh
 	fperms 0750 /opt/VirtualBox/VBox.sh
 	fowners root:vboxusers /opt/VirtualBox/VBoxAddIF.sh
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-2.0.2.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-2.0.2.ebuild
index daad6305eec4..d5ac03bca360 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-2.0.2.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-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-bin/virtualbox-bin-2.0.2.ebuild,v 1.1 2008/09/15 19:52:56 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-2.0.2.ebuild,v 1.2 2008/10/27 17:15:21 jokey Exp $
 
 EAPI=1
 
@@ -101,7 +101,7 @@ src_install() {
 
 	if ! use headless ; then
 		newicon VBox.png virtualbox.png
-		newmenu "${FILESDIR}"/${PN}.desktop virtualbox.desktop
+		newmenu "${FILESDIR}"/${PN}.desktop ${PN}.desktop
 	fi
 
 	insinto /opt/VirtualBox
@@ -167,7 +167,7 @@ src_install() {
 	fi
 
 	exeinto /opt/VirtualBox
-	newexe "${FILESDIR}/${P}-wrapper" "VBox.sh" || die
+	newexe "${FILESDIR}/${PN}-2-wrapper" "VBox.sh" || die
 	fowners root:vboxusers /opt/VirtualBox/VBox.sh
 	fperms 0750 /opt/VirtualBox/VBox.sh
 	fowners root:vboxusers /opt/VirtualBox/VBoxAddIF.sh
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-1.6.4.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-2.0.4.ebuild
index 8960797d942c..21820e008a45 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-1.6.4.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-2.0.4.ebuild
@@ -1,28 +1,29 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-1.6.4.ebuild,v 1.6 2008/09/15 19:52:56 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-2.0.4.ebuild,v 1.1 2008/10/27 17:15:21 jokey Exp $
 
 EAPI=1
 
-inherit eutils fdo-mime qt3 pax-utils
+inherit eutils fdo-mime pax-utils
 
-MY_P=VirtualBox-${PV}-Linux
+MY_PV=${PV}-38406
+MY_P=VirtualBox-${MY_PV}-Linux
 
 DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
 HOMEPAGE="http://www.virtualbox.org/"
 SRC_URI="amd64? ( ${MY_P}_amd64.run )
-	x86? ( ${MY_P}_x86.run )"
+	x86? ( ${MY_P}_x86.run )
+	sdk? ( VirtualBoxSDK-${MY_PV}.zip )"
 
 LICENSE="PUEL"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+additions headless sdk vboxwebsrv"
 
 RDEPEND="!app-emulation/virtualbox-ose
 	!app-emulation/virtualbox-ose-additions
 	~app-emulation/virtualbox-modules-${PV}
 	!headless? (
-		x11-libs/qt:3
 		x11-libs/libXcursor
 		media-libs/libsdl
 		x11-libs/libXrender
@@ -37,7 +38,8 @@ RDEPEND="!app-emulation/virtualbox-ose
 		x11-libs/libXft
 		media-libs/freetype
 		media-libs/fontconfig
-		x11-libs/libXext )
+		x11-libs/libXext
+		dev-libs/glib )
 	x11-libs/libXt
 	dev-libs/libxml2
 	x11-libs/libXau
@@ -47,8 +49,7 @@ RDEPEND="!app-emulation/virtualbox-ose
 	x11-libs/libXdmcp
 	sys-apps/usermode-utilities
 	net-misc/bridge-utils
-	x86? ( =virtual/libstdc++-3.3 )
-	sdk? ( dev-libs/libIDL )"
+	x86? ( =virtual/libstdc++-3.3 )"
 
 S=${WORKDIR}
 
@@ -57,15 +58,18 @@ RESTRICT="fetch"
 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 "Please download:"
 	elog ""
 	if use amd64 ; then
 		elog "http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_amd64.run"
 	else
 		elog "http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_x86.run"
 	fi
+	if use sdk; then
+		elog "http://download.virtualbox.org/virtualbox/${PV}/VirtualBoxSDK-${MY_PV}.zip"
+	fi
 	elog ""
-	elog "and then put it in ${DISTDIR}"
+	elog "and then put file(s) in ${DISTDIR}"
 }
 
 pkg_setup() {
@@ -81,33 +85,37 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack_makeself
+	unpack_makeself ${MY_P}_${ARCH}.run
 	unpack ./VirtualBox.tar.bz2
-}
 
-src_install() {
-	if ! use headless ; then
-		newicon VBox.png virtualbox.png
-		newmenu "${FILESDIR}"/${PN}.desktop virtualbox.desktop
+	if use sdk; then
+		unpack VirtualBoxSDK-${MY_PV}.zip
 	fi
+}
 
+src_install() {
 	# create virtualbox configurations files
 	insinto /etc/vbox
 	newins "${FILESDIR}/${PN}-config" vbox.cfg
 	newins "${FILESDIR}/${PN}-interfaces" interfaces
 
+	if ! use headless ; then
+		newicon VBox.png virtualbox.png
+		newmenu "${FILESDIR}"/${PN}.desktop ${PN}.desktop
+	fi
+
 	insinto /opt/VirtualBox
+
 	doins UserManual.pdf
 
+	if use sdk ; then
+		doins -r sdk
+	fi
+
 	if use additions; then
 		doins -r additions
 	fi
-	if use sdk; then
-		doins -r sdk
-		fowners root:vboxusers /opt/VirtualBox/sdk/bin/xpidl
-		fperms 0750 /opt/VirtualBox/sdk/bin/xpidl
-		pax-mark -m "${D}"/opt/VirtualBox/sdk/bin/xpidl
-	fi
+
 	if use vboxwebsrv; then
 		doins vboxwebsrv
 		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
@@ -117,9 +125,9 @@ src_install() {
 		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
 	fi
 
-	rm -rf src sdk tst* rdesktop-vrdp.tar.gz deffiles install* routines.sh \
-		runlevel.sh vboxdrv.sh VBox.sh VBox.png kchmviewer additions VirtualBox.desktop \
-		VirtualBox.tar.bz2 vboxnet.sh LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv webtest
+	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
+		vboxdrv.sh VBox.sh VBox.png vboxnet.sh kchmviewer additions VirtualBox.desktop \
+		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv webtest
 
 	if use headless ; then
 		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so VirtualBoxAPI.chm \
@@ -128,33 +136,40 @@ src_install() {
 
 	doins -r * || die
 
+	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
+	dosym /opt/VirtualBox/VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
+	dosym /opt/VirtualBox/VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
+	dosym /opt/VirtualBox/VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
+	dosym /opt/VirtualBox/VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
+	dosym /opt/VirtualBox/VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
+
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl}; do
+		fowners root:vboxusers /opt/VirtualBox/${each}
+		fperms 0750 /opt/VirtualBox/${each}
+		pax-mark -m "${D}"/opt/VirtualBox/${each}
+	done
+
 	if ! use headless ; then
-		for each in VBox{Manage,SDL,SVC,XPCOMIPCD,Tunctl,Headless} VirtualBox; do
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		for each in VBox{SDL,Headless} VirtualBox; do
 			fowners root:vboxusers /opt/VirtualBox/${each}
-			fperms 0750 /opt/VirtualBox/${each}
+			fperms 4511 /opt/VirtualBox/${each}
 			pax-mark -m "${D}"/opt/VirtualBox/${each}
 		done
 
 		dosym /opt/VirtualBox/VBox.sh /usr/bin/VirtualBox
 		dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxSDL
 	else
-		for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,Headless} ; do
-			fowners root:vboxusers /opt/VirtualBox/${each}
-			fperms 0750 /opt/VirtualBox/${each}
-			pax-mark -m "${D}"/opt/VirtualBox/${each}
-		done
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
+		fperms 4511 /opt/VirtualBox/VBoxHeadless
+		pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
 	fi
 
 	exeinto /opt/VirtualBox
-	newexe "${FILESDIR}/${PN}-wrapper" "VBox.sh" || die
+	newexe "${FILESDIR}/${PN}-2-wrapper" "VBox.sh" || die
 	fowners root:vboxusers /opt/VirtualBox/VBox.sh
 	fperms 0750 /opt/VirtualBox/VBox.sh
-
-	# Disable logging by default, broken in this release (bug #233683)
-	sed -i \
-			-e "/vbox.cfg\"$/a export VBOX_LOG_DEST=\"nofile\"" \
-			"${D}"/opt/VirtualBox/VBox.sh || die "VBox.sh sed failed"
-
 	fowners root:vboxusers /opt/VirtualBox/VBoxAddIF.sh
 	fperms 0750 /opt/VirtualBox/VBoxAddIF.sh
 
@@ -179,11 +194,6 @@ pkg_postinst() {
 	fi
 	elog "You must be in the vboxusers group to use VirtualBox."
 	elog ""
-	elog "Warning:"
-	elog "Due to a bug which can cause a large amount of logging"
-	elog "data to be written to your home directory, logging is"
-	elog "disabled by default in this release, see bug #233683"
-	elog ""
 }
 
 pkg_postrm() {