Version bump

svn path=/trunk/; revision=645

3 files changed, 215 insertions, 19 deletions

diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index 510afae..4190973 100644
--- a/app-emulation/virtualbox-bin/ChangeLog
+++ b/app-emulation/virtualbox-bin/ChangeLog
@@ -1,22 +1,40 @@
 # ChangeLog for app-emulation/virtualbox-bin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.39 2008/12/18 12:26:04 flameeyes Exp $
-
-  20 Feb 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
-  files/virtualbox-bin-2-wrapper, virtualbox-bin-2.1.2.ebuild,
-  virtualbox-bin-2.1.4.ebuild, +virtualbox-bin-2.1.4.ebuild:
-  Version bump; fix duplicated EOF in virtualbox-bin-2-wrapper
-  thanks to Torbjörn Svensson bug #259629; fix permissions on
-  some binaries bug #260326
-
-  23 Jan 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
-  -virtualbox-bin-2.0.4.ebuild, -virtualbox-bin-2.0.6.ebuild,
-  virtualbox-bin-1.6.6.ebuild, +virtualbox-bin-2.1.2.ebuild:
-  Version bump; drop old VBoxAddIF,VBoxDeleteIF scripts; drop old
-  /etc/vbox/interfaces file; prettify pkg_nofetch, use
-  x11-libs/libXft instead of virtual/xft (old virtual now masked);
-  use sys-libs/libstdc++-v3 in place of virtual/libstdc++ bug #252154;
-  drop old releases; switch to EAPI=2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.46 2009/03/21 10:42:14 patrick Exp $
+
+  08 Apr 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  +virtualbox-bin-2.2.0.ebuild:
+  Version bump
+
+  21 Mar 2009; Patrick Lauer <patrick@gentoo.org> files/vboxwebsrv-initd:
+  Fixing init script path for vboxwebsrv, closes #263117
+
+  05 Mar 2009; Mike Frysinger <vapier@gentoo.org>
+  virtualbox-bin-2.1.4.ebuild:
+  Binary symlinks go in /opt/bin, not /usr/bin.
+
+  05 Mar 2009; Mike Frysinger <vapier@gentoo.org>
+  virtualbox-bin-2.1.4.ebuild:
+  Disable stripping, mark textrel, and fix by Jesús Pérez for USE=sdk
+  unpack #261151 by Chuck Wegrzyn.
+
+  05 Mar 2009; Mike Frysinger <vapier@gentoo.org>
+  -virtualbox-bin-2.0.2.ebuild, -virtualbox-bin-2.0.4.ebuild,
+  -virtualbox-bin-2.0.6.ebuild:
+  Drop versions with security issues #260331.
+
+  03 Mar 2009; Patrick Lauer <patrick@gentoo.org>
+  virtualbox-bin-2.1.4.ebuild:
+  Typo fix. Sorry for the breakage ...
+
+*virtualbox-bin-2.1.4 (03 Mar 2009)
+
+  03 Mar 2009; Patrick Lauer <patrick@gentoo.org>
+  +virtualbox-bin-2.1.4.ebuild:
+  Bump to 2.1.4. Multiple fixes (fix duplicated EOF in
+  virtualbox-bin-2-wrapper thanks to Torbjorn Svensson bug #259629; fix
+  permissions on some binaries bug #260326). Thanks to Alessio Cassibba
+  (X-Drum) <swapon@gmail.com> and the jokey overlay
 
   04 Jan 2009; Ulrich Mueller <ulm@gentoo.org> virtualbox-bin-1.6.6.ebuild,
   virtualbox-bin-2.0.2.ebuild, virtualbox-bin-2.0.4.ebuild,
@@ -224,7 +242,7 @@
   virtualbox-bin-1.3.8-r1.ebuild:
   Fix for sdl useflag bug #177335
 
-  21 Apr 2007; Raùl Porcel <armin76@gentoo.org>
+  21 Apr 2007; Raúl Porcel <armin76@gentoo.org>
   virtualbox-bin-1.3.8-r1.ebuild:
   x86 stable
 
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index a1f08e3..2f11f6c 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -7,6 +7,10 @@ AUX virtualbox-bin-interfaces 218 RMD160 4639b9848cf44ac59cd12585a3c56ef53d72a6d
 AUX virtualbox-bin.desktop 202 RMD160 ca4dc96cac241a8bf255e01ce6acfea7b98c47ab SHA1 b566c0e4efbfcc0fb4a7887390d211ab282586b5 SHA256 6c5101e7091b51764c0130a8a878ce059c7725fdae6b5c42a7d5cbb31fd96a3e
 DIST VirtualBox-1.6.6-Linux_amd64.run 21983828 RMD160 7b4c8e05f4b96709c17236b6821a6ae90c106074 SHA1 57913b144145da693e90caa5e6eb5b823741a85a SHA256 fa6e580e9df27a8cedd7baf038df71387e357089b582d3aeae08bfab4c31ca7c
 DIST VirtualBox-1.6.6-Linux_x86.run 21338681 RMD160 46cd1d6b0926ab1aa6865b0d2b5de2c0bdc120e1 SHA1 56faaf895435c292822a3516d605f4d95592ad25 SHA256 978c0c444111ce0141d31a5f3fc4d3e3dd8916cbd30a15cba871b4ecc2d69ef8
+DIST VirtualBox-2.2.0-45846-Linux_amd64.run 45371980 RMD160 b797aef6ec0d64bf4dcf48162b42000a8f4ea9d8 SHA1 297db0969f11f932a57881158cb12939ac5672b1 SHA256 b12e43dd3fbff6601f0f68f9a7116ae7e212cc8a8f72a921e1704f3141a0b61d
+DIST VirtualBox-2.2.0-45846-Linux_x86.run 45187655 RMD160 ef77017c1148ce8ebfedf90c9454089e2a8cc7d8 SHA1 c758b836f0b9ce91bbdb161368f12c0defb465f7 SHA256 0ca7e275824c3fc086e39e183d470d7b76b03b24e52e5d9b56bc47221feb70d9
+DIST VirtualBoxSDK-2.2.0-45846.zip 7827152 RMD160 f944b4638ae52311d943d24e605377c26894181e SHA1 5241b69794f29f18a00a038f90cbf94e5351907d SHA256 2b6043fe7eef118747e8f54fb5a967c0ac03bc2951df8c23d75726febef4c934
 EBUILD virtualbox-bin-1.6.6.ebuild 5044 RMD160 eeb62d6747c06f442bde27c1a673139932572f4e SHA1 424b894f337b055bf7cec213ceef3dd017f7ad39 SHA256 d5fa7f41ccc75da87f479395750fd582c2e1d55b8c0de11e762e478349f868b6
-MISC ChangeLog 10375 RMD160 554b3d35771009628b506fc876644dd38e95b34a SHA1 7e0a70fa154f8e636b7270d43adea82096e6b9c1 SHA256 0e0efbeaffaa0d194794cf09fc3aaa0f48aa1c70217f87363d33f4f72518484c
+EBUILD virtualbox-bin-2.2.0.ebuild 4882 RMD160 e269f83b7292b2926b2b770804ffd636e7738c09 SHA1 65644693330340f45af5d373ff192ca355c7910b SHA256 4b01cca8fd5a2040cad195937691d9c8761bd17fcfdf787b5f05b28d89ecedd1
+MISC ChangeLog 10795 RMD160 a05682c2f75938249b565e675d0dc9455f94e185 SHA1 90a7e35997854f362f122623474f008477281d32 SHA256 57bb180ddfd5deaa0139b719ae94343f329de145077c7876268a81f2df6cd57c
 MISC metadata.xml 692 RMD160 bd100896b73d952e89bdeda736d25b152c3a73f3 SHA1 f4fb4965fed9ff2468a27a56fe73f0ec23b6a9a0 SHA256 ba708f6a2506cb9762fbabb0f4096bb41fe330e85e219949fe6fa84488a2090b
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-2.2.0.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-2.2.0.ebuild
new file mode 100644
index 0000000..842b645
--- /dev/null
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-2.2.0.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2009 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.1.4.ebuild,v 1.4 2009/03/05 08:34:45 vapier Exp $
+
+EAPI=2
+
+inherit eutils fdo-mime pax-utils
+
+MY_PV=${PV}-45846
+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? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_amd64.run )
+	x86? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_x86.run )
+	sdk? ( http://download.virtualbox.org/virtualbox/${PV}/VirtualBoxSDK-${MY_PV}.zip )"
+
+LICENSE="PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+additions +chm headless sdk vboxwebsrv"
+RESTRICT="strip"
+
+RDEPEND="!!app-emulation/virtualbox-ose
+	!app-emulation/virtualbox-ose-additions
+	~app-emulation/virtualbox-modules-${PV}
+	!headless? (
+		x11-libs/libXcursor
+		media-libs/libsdl[X]
+		x11-libs/libXrender
+		x11-libs/libXfixes
+		media-libs/libmng
+		media-libs/jpeg
+		media-libs/libpng
+		x11-libs/libXi
+		x11-libs/libXrandr
+		x11-libs/libXinerama
+		x11-libs/libXft
+		media-libs/freetype
+		media-libs/fontconfig
+		x11-libs/libXext
+		dev-libs/glib
+		chm? ( dev-libs/expat )
+	)
+	x11-libs/libXt
+	dev-libs/libxml2
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXdmcp
+	sys-apps/usermode-utilities
+	net-misc/bridge-utils
+	x86? ( sys-libs/libstdc++-v3 )"
+
+S=${WORKDIR}
+
+QA_TEXTRELS_amd64="opt/VirtualBox/VBoxVMM.so"
+
+src_unpack() {
+	unpack_makeself ${MY_P}_${ARCH}.run
+	unpack ./VirtualBox.tar.bz2
+
+	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
+
+	if ! use headless ; then
+		newicon VBox.png ${PN}.png
+		newmenu "${FILESDIR}"/${PN}.desktop ${PN}.desktop
+	fi
+
+	insinto /opt/VirtualBox
+	dodir /opt/bin
+
+	doins UserManual.pdf
+
+	if use sdk ; then
+		doins -r sdk || die
+	fi
+
+	if use additions; then
+		doins -r additions || die
+	fi
+
+	if use vboxwebsrv; then
+		doins vboxwebsrv || die
+		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
+		fperms 0750 /opt/VirtualBox/vboxwebsrv
+		dosym /opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	if ! use headless && use chm; then
+		doins kchmviewer VirtualBox.chm || die
+		fowners root:vboxusers /opt/VirtualBox/kchmviewer
+		fperms 0750 /opt/VirtualBox/kchmviewer
+	fi
+
+	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
+		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
+		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
+		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
+		90-vbox-usb.fdi
+
+	if use headless ; then
+		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
+	fi
+
+	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
+
+	local each
+	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
+		# 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 4510 /opt/VirtualBox/${each}
+			pax-mark -m "${D}"/opt/VirtualBox/${each}
+		done
+
+		dosym /opt/VirtualBox/VBox.sh /opt/bin/VirtualBox
+		dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxSDL
+	else
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
+		fperms 4510 /opt/VirtualBox/VBoxHeadless
+		pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
+	fi
+
+	exeinto /opt/VirtualBox
+	newexe "${FILESDIR}/${PN}-2-wrapper" "VBox.sh" || die
+	fowners root:vboxusers /opt/VirtualBox/VBox.sh
+	fperms 0750 /opt/VirtualBox/VBox.sh
+
+	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxManage
+	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxVRDP
+	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxHeadless
+	dosym /opt/VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	elog ""
+	if ! use headless ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\""
+		elog ""
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}