Bump to 2.1.4. Thanks to Alessio Cassibba.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

3 files changed, 185 insertions, 12 deletions

diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index 20df3d556287..7ad6be506f05 100644
--- a/app-emulation/virtualbox-bin/ChangeLog
+++ b/app-emulation/virtualbox-bin/ChangeLog
@@ -1,6 +1,15 @@
 # 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.40 2009/01/04 22:12:47 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.41 2009/03/03 19:23:27 patrick Exp $
+
+*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,
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index ee1720a99699..0ed2587bbbac 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX vboxwebsrv-confd 620 RMD160 7a4ecbd895da0d5851f1a3afda54b3e2bb4012e1 SHA1 651f7b2588a16317f59d692e087b347aadd20aab SHA256 5ea07fcb6e5253cd013bb0277603cba17ca45d96044740172987c0b452f4324a
 AUX vboxwebsrv-initd 750 RMD160 99420847222c53d114cc0aceff1135d5b8a248fb SHA1 5af0a03611d2547f2e2134ebfc3490d514ef9685 SHA256 aa02b27c05225c7f7f9db74e039489ee637c1207d6a7af7d72cc3a010642b622
 AUX virtualbox-bin-1-wrapper 3777 RMD160 a10ee6e556aad8dfcc274924d010eed97fb6952f SHA1 70f772874eddfe08b03d3b4b040cbc6a3262c20f SHA256 60730674076edb6a863f52babb6ba716a36b9f50a12d6509b62c112e649e450c
@@ -16,19 +13,16 @@ DIST VirtualBox-2.0.4-38406-Linux_amd64.run 35275361 RMD160 34d1d78d6f0c5801a21f
 DIST VirtualBox-2.0.4-38406-Linux_x86.run 36033117 RMD160 7bf77b427fde45b5cd3c2a7439436968209264bc SHA1 2223a4ae950d0165306a0a82adad24325f086331 SHA256 499fd2950ef807993b1cb06bad069c1680ac291717b7f16d74e4c15645a39a92
 DIST VirtualBox-2.0.6-39760-Linux_amd64.run 35603040 RMD160 5d98a20fd65f281443587c9b4f6251ca9866d1ff SHA1 3844e6217b747f6fa0cdb9085b01071c2fad223f SHA256 8f67aa3c8a3ec30c02a90f76651289cf7e4641c055b9c466a2f69262fedbd197
 DIST VirtualBox-2.0.6-39760-Linux_x86.run 36145756 RMD160 183b6454ef45f919b878748eba3f67d587e3fc75 SHA1 bb1e3eb876ff93b63598e0f43740006a0f5190e4 SHA256 b548efe9fc6a272768dad0d590e7b42c55bddcb809aae8dedaccf7a3f085cd1e
+DIST VirtualBox-2.1.4-43001-Linux_amd64.run 38900311 RMD160 c0422ab86a7489d176373960ab40a4aefd2ab08d SHA1 f6d12edbc408907af8115483ce50821119a34a34 SHA256 2c02abc3e17531689806588c17fe6e1b68134ff53c1f089784c4574d9dfc3b4b
+DIST VirtualBox-2.1.4-43001-Linux_x86.run 38951506 RMD160 63cbaa4d0cf05ac114c004fa20333db52d9d6a26 SHA1 5c9cf8ee45f8f7cd0eb503666c0294c4ffdfd46a SHA256 a241515a7f0252701eb700c7b9168aa4b5148c55a79475e0dd8edecc8531e753
 DIST VirtualBoxSDK-2.0.2-36488.zip 6773085 RMD160 98bcec31085f77268195efd7e9dced03f9942904 SHA1 e5b60af2f96f53d3869d759b3bdf1e2dd823d5a6 SHA256 fc93ca7c1ec2d4af1ad813098f51fa2578bb3f29e4d0f06903737aa126d1db9b
 DIST VirtualBoxSDK-2.0.4-38406.zip 6789877 RMD160 840f95602432e2b39037699c08ca18184014a7f9 SHA1 50a04badc35c7c6cf8df09d2fd6f784dfcded845 SHA256 2490cd7acb25fd73998fe4ca5e5eda6174ded35b0a1025fdbb0930eca42ebccf
 DIST VirtualBoxSDK-2.0.6-39760.zip 6800686 RMD160 fd02abbf392448383b76215383165dba7b3d0250 SHA1 4f38d9568e3bb62a02fe06d7d612ba71bbd18ab9 SHA256 3ca12b594980427ffdaf714e8a9c2845d58aec5b21a289e453eadff5ebf843f7
+DIST VirtualBoxSDK-2.1.4-42893.zip 7027346 RMD160 fb04aa01fb8f0bdc291bd3495c7e37c9e23a67b5 SHA1 63c7290e4efe1e5310f73f5b6872f10bdcb288a3 SHA256 10c7dd59b5e86e09b2b56d0872514fbe601d1d82e7e1fa847b8aa95657a1c64a
 EBUILD virtualbox-bin-1.6.6.ebuild 5049 RMD160 76f02cf431c0cdc0cda526970bb15c3c44215e49 SHA1 dd83a9499ce96a6b51ec6c0b9890309913707221 SHA256 4bdf3df0d327cca71e531399642b63ba754dbda6d2638937f2e83fc4cd4dbad7
 EBUILD virtualbox-bin-2.0.2.ebuild 5772 RMD160 b6ff806b965395c33aa51d8df4eca7e8b3024dea SHA1 209a216198221ba18e9b11b916c10b494ec50576 SHA256 c491de66c356e52acf550727ca928f1064daa21494eb436203d3fc7606e786b9
 EBUILD virtualbox-bin-2.0.4.ebuild 5799 RMD160 757d3f95ce0bdfbe777e6376248c9bf97333dec3 SHA1 afb073865fa8748078ec12716de9cf303e3f1026 SHA256 dd71ea27c3f6dede52f7563b2416d93c7850a569958e74926fbe7fff9228e998
 EBUILD virtualbox-bin-2.0.6.ebuild 5786 RMD160 90e503b8f4ea2cd0d2b11e757fee176ac355b9bd SHA1 287426a189b2e7ad5e66479959fc33ac4aa57732 SHA256 c96e2c45300efeb06a90006880c3e8f0a0912ef3ae435c5dc355450b2106a613
-MISC ChangeLog 9549 RMD160 9b64cda14d41427587d3f0367d1744e3495c7fd4 SHA1 8f18f6eea8496e676bbbf7b2e2b8e1298ca26e0f SHA256 86b1290a76a156e2ec8db9f95058463d30baf7ba85a9a5411406c00c8d83739e
+EBUILD virtualbox-bin-2.1.4.ebuild 4807 RMD160 b50fd422ee656522fb712ddf81e26cacaf366532 SHA1 ba70254e0d4f163152f64b43d2a9ba722a7090f2 SHA256 c7d327297205c67de75556b2e3b71fdd09e3845597a363d4438fbe04b5164e74
+MISC ChangeLog 9924 RMD160 b989c5508574f7223c3f6494d465abeb28c145aa SHA1 066c5c2ba25d464264f08b6f3842586f9d395c5c SHA256 92ce10544713bd1ba2c04191438cb10a95dcc8582fa9e62d97e4f3bd5c970a62
 MISC metadata.xml 692 RMD160 bd100896b73d952e89bdeda736d25b152c3a73f3 SHA1 f4fb4965fed9ff2468a27a56fe73f0ec23b6a9a0 SHA256 ba708f6a2506cb9762fbabb0f4096bb41fe330e85e219949fe6fa84488a2090b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEARECAAYFAklhNJUACgkQOeoy/oIi7uyYbACgrmxbyRJyak7HYFprJl4B50Nn
-CB4AoN27XPvGK/rNSLnYGItFVduKkulH
-=O+Ln
------END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-2.1.4.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-2.1.4.ebuild
new file mode 100644
index 000000000000..d4dcc808cc7e
--- /dev/null
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-2.1.4.ebuild
@@ -0,0 +1,170 @@
+# 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.1 2009/03/03 19:23:27 patrick Exp $
+
+EAPI=2
+
+inherit eutils fdo-mime pax-utils
+
+MY_PV=${PV}-43001
+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-${PV}-42893.zip )"
+
+LICENSE="PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+additions +chm headless sdk vboxwebsrv"
+
+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}
+
+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
+
+	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 /usr/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 /usr/bin/VirtualBox
+		dosym /opt/VirtualBox/VBox.sh /usr/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 /usr/bin/VBoxManage
+	dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxVRDP
+	dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxHeadless
+	dosym /opt/VirtualBox/VBoxTunctl /usr/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
+}