Adding rdesktop bits, thanks to Dmitry A. Yanko #297424

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

4 files changed, 305 insertions, 3 deletions

diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index c205220e06c6..77dcfeca5f7b 100644
--- a/app-emulation/virtualbox-bin/ChangeLog
+++ b/app-emulation/virtualbox-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virtualbox-bin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.73 2010/02/14 00:01:13 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.74 2010/02/14 14:23:28 patrick Exp $
+
+*virtualbox-bin-3.1.4-r1 (14 Feb 2010)
+
+  14 Feb 2010; Patrick Lauer <patrick@gentoo.org>
+  +virtualbox-bin-3.1.4-r1.ebuild, metadata.xml:
+  Adding rdesktop bits, thanks to Dmitry A. Yanko #297424
 
 *virtualbox-bin-3.1.4 (13 Feb 2010)
 
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index 29bb7f88aae0..cb791b6f914a 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -21,6 +21,7 @@ DIST VirtualBoxSDK-3.1.4-57640.zip 8240349 RMD160 9e1b1f90e2af012ec02fbf1a8ec536
 EBUILD virtualbox-bin-3.0.12.ebuild 8176 RMD160 11707c382071d0ad9af451746c429ab33bef538a SHA1 8d2b7f519d2200ac888cbc2880d5dd85bad39f49 SHA256 62b9533faa1e14026fa6622900067720802e33ff4c2c7ead295183b75fa31a65
 EBUILD virtualbox-bin-3.1.0.ebuild 8215 RMD160 dc5e1b2d85325e4613a49396d26a45a126f81cc6 SHA1 92aa5952dbf6a68b56d43bf6aa75d9979b4e76a9 SHA256 2929ba7bdc9bf029fbd3fc4d5c9332deb57e128cebd691f4e3fa8ee5cd7d7963
 EBUILD virtualbox-bin-3.1.2.ebuild 8367 RMD160 b84cef8a3bec45f03a8551f09d2832873b45e4b5 SHA1 59f72c0b87d8fbc35a86e7f602d68342ffb291db SHA256 b7ba4db8b5e86ade668d21717fc4a582893a4d2f2aa3915c5643e1bc0680431b
+EBUILD virtualbox-bin-3.1.4-r1.ebuild 8624 RMD160 c6e6aadbb3c6adbf940d951067dbb32ba94e3917 SHA1 ec8d4a296e3e3a6c06d67fc8fb2a8975cf1921b9 SHA256 8ff921b1951e83bade0bdd383e640f844d929a84a80b9742c3f375d16f40359e
 EBUILD virtualbox-bin-3.1.4.ebuild 8367 RMD160 530c9fd8fa5a000e3fa8c836eb9826bd2bf3e8a9 SHA1 fe273c8f9ef3291ae6bd98c7a7bf391af1d42694 SHA256 a7e509e2d93a5b1fd1fc23fc0701414c06205796130cd70c4cd8d95bc0257985
-MISC ChangeLog 15206 RMD160 e6d5b3265cd547fadb3386b8c33b993142b47a94 SHA1 6937520acfdf380f6eaccf2389a4b16d2b839f87 SHA256 81b48bbd9466c3a28c951a2b670001efd1dc6f3e9dd1b5ba60f859bd84dc7939
-MISC metadata.xml 701 RMD160 3cb4241d482e85639248b86fdc757d75a5e05c8e SHA1 41098151947cb10f97f4a663ba71a5dbe3c9d0c0 SHA256 ad909e2ebb26115346e9673b9cc1a091a28735afd16ec33591b8e9a936a684f8
+MISC ChangeLog 15404 RMD160 72097631b908863295946b2f5615ed89555aa059 SHA1 5c5fa69438d482388650d581a8e0eade2e4abd98 SHA256 ecf8b464289f4c16a5b644929e4fe401c22f5d2854006c67cff208d71f1257f1
+MISC metadata.xml 776 RMD160 53115ae984c83c47fc86bc833eb7c9f7d8427cc3 SHA1 75fa6689975d96f294bc52f989e4838704c8c651 SHA256 fecaf0e98bd60995cb85c59300255fbe7732a4c7c6e5315ae554204d3c324d82
diff --git a/app-emulation/virtualbox-bin/metadata.xml b/app-emulation/virtualbox-bin/metadata.xml
index f2c823ae617a..fbb42a44d172 100644
--- a/app-emulation/virtualbox-bin/metadata.xml
+++ b/app-emulation/virtualbox-bin/metadata.xml
@@ -16,5 +16,6 @@
 	<flag name='headless'>Install without any graphic frontend</flag>
 	<flag name='sdk'>Enable building of SDK</flag>
 	<flag name='vboxwebsrv'>Install the VirtualBox webservice</flag>
+	<flag name='rdesktop-vrdp'>Install the rdesktop client integration</flag>
 </use>
 </pkgmetadata>
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-3.1.4-r1.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-3.1.4-r1.ebuild
new file mode 100644
index 000000000000..1bbdf63a6516
--- /dev/null
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-3.1.4-r1.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-3.1.4-r1.ebuild,v 1.1 2010/02/14 14:23:28 patrick Exp $
+
+EAPI=2
+
+inherit eutils fdo-mime pax-utils
+
+MY_PV=${PV}-57640
+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 python sdk vboxwebsrv rdesktop-vrdp"
+RESTRICT="mirror"
+PROPERTIES="interactive"
+
+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/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/libXmu
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXdmcp
+	python? ( dev-lang/python )"
+
+S=${WORKDIR}
+
+QA_TEXTRELS_amd64="opt/VirtualBox/VBoxVMM.so"
+QA_TEXTRELS_x86="opt/VirtualBox/VBoxGuestPropSvc.so
+	opt/VirtualBox/VBoxSDL.so
+	opt/VirtualBox/VBoxPython2_4.so
+	opt/VirtualBox/VBoxPython2_6.so
+	opt/VirtualBox/VBoxDbg.so
+	opt/VirtualBox/VBoxSharedFolders.so
+	opt/VirtualBox/VBoxDD2.so
+	opt/VirtualBox/VBoxOGLrenderspu.so
+	opt/VirtualBox/VBoxPython.so
+	opt/VirtualBox/VBoxPython2_3.so
+	opt/VirtualBox/VBoxDD.so
+	opt/VirtualBox/VBoxVRDP.so
+	opt/VirtualBox/VBoxDDU.so
+	opt/VirtualBox/VBoxREM64.so
+	opt/VirtualBox/VBoxSharedClipboard.so
+	opt/VirtualBox/VBoxHeadless.so
+	opt/VirtualBox/VBoxRT.so
+	opt/VirtualBox/VRDPAuth.so
+	opt/VirtualBox/VBoxREM.so
+	opt/VirtualBox/VBoxSettings.so
+	opt/VirtualBox/VBoxKeyboard.so
+	opt/VirtualBox/VBoxSharedCrOpenGL.so
+	opt/VirtualBox/VBoxVMM.so
+	opt/VirtualBox/VirtualBox.so
+	opt/VirtualBox/VBoxOGLhosterrorspu.so
+	opt/VirtualBox/components/VBoxC.so
+	opt/VirtualBox/components/VBoxSVCM.so
+	opt/VirtualBox/VBoxREM32.so
+	opt/VirtualBox/VBoxPython2_5.so
+	opt/VirtualBox/VBoxXPCOMC.so
+	opt/VirtualBox/VBoxOGLhostcrutil.so
+	opt/VirtualBox/VBoxNetDHCP.so"
+QA_PRESTRIPPED="opt/VirtualBox/VBoxDD.so
+	opt/VirtualBox/VBoxDD2.so
+	opt/VirtualBox/VBoxDDU.so
+	opt/VirtualBox/VBoxDbg.so
+	opt/VirtualBox/VBoxGuestPropSvc.so
+	opt/VirtualBox/VBoxHeadless
+	opt/VirtualBox/VBoxHeadless.so
+	opt/VirtualBox/VBoxKeyboard.so
+	opt/VirtualBox/VBoxManage
+	opt/VirtualBox/VBoxNetAdpCtl
+	opt/VirtualBox/VBoxNetDHCP
+	opt/VirtualBox/VBoxNetDHCP.so
+	opt/VirtualBox/VBoxOGLhostcrutil.so
+	opt/VirtualBox/VBoxOGLhosterrorspu.so
+	opt/VirtualBox/VBoxOGLrenderspu.so
+	opt/VirtualBox/VBoxPython.so
+	opt/VirtualBox/VBoxPython2_3.so
+	opt/VirtualBox/VBoxPython2_4.so
+	opt/VirtualBox/VBoxPython2_5.so
+	opt/VirtualBox/VBoxPython2_6.so
+	opt/VirtualBox/VBoxREM.so
+	opt/VirtualBox/VBoxREM32.so
+	opt/VirtualBox/VBoxREM64.so
+	opt/VirtualBox/VBoxRT.so
+	opt/VirtualBox/VBoxSDL
+	opt/VirtualBox/VBoxSDL.so
+	opt/VirtualBox/VBoxSVC
+	opt/VirtualBox/VBoxSettings.so
+	opt/VirtualBox/VBoxSharedClipboard.so
+	opt/VirtualBox/VBoxSharedCrOpenGL.so
+	opt/VirtualBox/VBoxSharedFolders.so
+	opt/VirtualBox/VBoxTestOGL
+	opt/VirtualBox/VBoxTunctl
+	opt/VirtualBox/VBoxVMM.so
+	opt/VirtualBox/VBoxVRDP.so
+	opt/VirtualBox/VBoxXPCOM.so
+	opt/VirtualBox/VBoxXPCOMC.so
+	opt/VirtualBox/VBoxXPCOMIPCD
+	opt/VirtualBox/VRDPAuth.so
+	opt/VirtualBox/VirtualBox
+	opt/VirtualBox/VirtualBox.so
+	opt/VirtualBox/accessible/libqtaccessiblewidgets.so
+	opt/VirtualBox/components/VBoxC.so
+	opt/VirtualBox/components/VBoxSVCM.so
+	opt/VirtualBox/components/VBoxXPCOMIPCC.so
+	opt/VirtualBox/kchmviewer
+	opt/VirtualBox/libQtCoreVBox.so.4
+	opt/VirtualBox/libQtGuiVBox.so.4
+	opt/VirtualBox/libQtNetworkVBox.so.4
+	opt/VirtualBox/libQtOpenGLVBox.so.4
+	opt/VirtualBox/vboxwebsrv"
+
+pkg_setup() {
+	# We cannot mirror VirtualBox PUEL licensed files see:
+	# http://www.virtualbox.org/wiki/Licensing_FAQ
+	check_license
+}
+
+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 rdesktop-vrdp; then
+		doins rdesktop-vrdp || die
+		doins -r rdesktop-vrdp-keymaps || die
+		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
+	fi
+
+	if ! use headless && use chm; then
+		doins kchmviewer VirtualBox.chm || die
+		fowners root:vboxusers /opt/VirtualBox/kchmviewer
+		fperms 0750 /opt/VirtualBox/kchmviewer
+	fi
+
+	if use python; then
+		if has_version "=dev-lang/python-2.4*"; then
+			doins VBoxPython2_4.so || die
+		fi
+
+		if has_version "=dev-lang/python-2.5*"; then
+			doins VBoxPython2_5.so || die
+		fi
+
+		if has_version "=dev-lang/python-2.6*"; then
+			doins VBoxPython2_6.so || die
+		fi
+	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 uninstall.sh vboxshell.py vboxdrv-pardus.py \
+		VBoxPython2_*.so
+
+	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,NetAdpCtl,NetDHCP,TestOGL}; do
+		fowners root:vboxusers /opt/VirtualBox/${each}
+		fperms 0750 /opt/VirtualBox/${each}
+		pax-mark -m "${D}"/opt/VirtualBox/${each}
+	done
+	# VBoxNetAdpCtl binary needs to be suid root in any case..
+	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
+
+	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
+
+	if use rdesktop-vrdp; then
+		dosym /opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
+	fi
+
+	exeinto /opt/VirtualBox
+	newexe "${FILESDIR}/${PN}-3-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
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+}
+
+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 ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}