Version bump; drop old VBoxAddIF,VBoxDeleteIF scripts; drop old /etc/vbox/interfaces file

svn path=/trunk/; revision=562

3 files changed, 216 insertions, 2 deletions

diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index b4ebf09..5d6834e 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.38 2008/11/29 20:50:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.39 2008/12/18 12:26:04 flameeyes Exp $
+
+  19 Dec 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  +virtualbox-bin-2.1.0.ebuild:
+  Version bump; drop old VBoxAddIF,VBoxDeleteIF scripts; drop old
+  /etc/vbox/interfaces file
+
+  18 Dec 2008; Diego E. Pettenò <flameeyes@gentoo.org>
+  files/vboxwebsrv-initd:
+  Commit initd fixes from Alessio.
 
   25 Nov 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com>
   -virtualbox-bin-2.0.2.ebuild, metadata.xml:
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index 7ef01aa..02402f4 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -11,10 +11,14 @@ 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.0-41146-Linux_amd64.run 41214539 RMD160 adc1a6453408a98550413817191dab7588e3f33f SHA1 1a38d186c3294c310e8f2f50b35e95442e72c9c9 SHA256 7699a0cef911f4f5ec337925cc097313e6941a439e7bb50a6d980d984e137856
+DIST VirtualBox-2.1.0-41146-Linux_x86.run 41050695 RMD160 9d940d09ccec7e3406918710d981c29b355d9a75 SHA1 855cf362a95fcb122b565f0445a77cce2376fb59 SHA256 08ef5c57a65f9687c07dc849f1365854fc7fa6428a9c3663163846537f2ace06
 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.0-41146.zip 6985738 RMD160 b85bc277ef76f1fc71d40d8bb9f3bfaf903115d9 SHA1 0f8d9feadfab16fd0d5c7f823c21f77a1e12b30b SHA256 a27c5d18a663c6f941cff2925b7f2fd9755b2c4f1cc39c62717ae952caf5a09c
 EBUILD virtualbox-bin-1.6.6.ebuild 5061 RMD160 4507085004593a1af3b29e16d9e9d91bfd81b661 SHA1 474a50ea79e00167ecee9015c1075b68e1f850e1 SHA256 27072ece903f6587da616b84614e31b3dac7f177893d06dbd35f42a0338ff4e8
 EBUILD virtualbox-bin-2.0.4.ebuild 5783 RMD160 0955810198e8ea31382df7bc91395bed2c9b5c94 SHA1 ff85d6715bca2d7d1aecfe2005e9b637f2897e21 SHA256 429899420f612eda12e6bcb35f88ea798d7169406a7472acece2b68ba010d950
 EBUILD virtualbox-bin-2.0.6.ebuild 5784 RMD160 4120c5ead33fa876d8f7aa4a4b3cc2a906efc910 SHA1 5052e5a23c5702cd316b3faafb101af5c006b044 SHA256 01150d961107b61372ebf3d889aed627a8522a61c2e2209cf488da1c56752edc
-MISC ChangeLog 9202 RMD160 8f3eccdb12bc608b9c2167484791688813f31c23 SHA1 c99d510390151f1218725134e60f3151b7b41253 SHA256 b5e5eae1c3d98fca1b0432e59cbf05b857f594260260a4c734b70777fac47bd3
+EBUILD virtualbox-bin-2.1.0.ebuild 5570 RMD160 d41472a434888424756935b62ca5cc47a6c4d9ef SHA1 477682a53fd7e3a3248e20c714b84346cff953c7 SHA256 3d81e2cd3b801343401e6fffff9d2cff02ab8b3b2256b5ce258411ab66dee649
+MISC ChangeLog 9510 RMD160 db61baf9f1c4686715d60cd4d6733ff8008aca1f SHA1 fdf6698dc13a97c4d3fa2f96a36782c8b373d6cb SHA256 03a390a644e792db8a265758dbe3200a6333f3947e00b1fb0c3fb3a378c8172b
 MISC metadata.xml 692 RMD160 bd100896b73d952e89bdeda736d25b152c3a73f3 SHA1 f4fb4965fed9ff2468a27a56fe73f0ec23b6a9a0 SHA256 ba708f6a2506cb9762fbabb0f4096bb41fe330e85e219949fe6fa84488a2090b
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-2.1.0.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-2.1.0.ebuild
new file mode 100644
index 0000000..8fc4710
--- /dev/null
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-2.1.0.ebuild
@@ -0,0 +1,201 @@
+# 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.4.ebuild,v 1.1 2008/10/27 17:15:21 jokey Exp $
+
+EAPI=1
+
+inherit eutils fdo-mime pax-utils
+
+MY_PV=${PV}-41146
+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 )
+	sdk? ( VirtualBoxSDK-${MY_PV}.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
+		x11-libs/libXrender
+		x11-libs/libXfixes
+		media-libs/libmng
+		media-libs/jpeg
+		media-libs/libpng
+		x11-libs/libXi
+		x11-libs/libXrandr
+		x11-libs/libXinerama
+		virtual/xft
+		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? ( =virtual/libstdc++-3.3 )"
+
+S=${WORKDIR}
+
+RESTRICT="fetch"
+
+pkg_nofetch() {
+	# Fetch restriction added due licensing and problems downloading with
+	# wget, see http://www.virtualbox.org/ticket/2148
+	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 file(s) in ${DISTDIR}"
+}
+
+pkg_setup() {
+	# The VBoxSDL frontend needs media-libs/libsdl compiled
+	# with USE flag X enabled (bug #177335)
+	if ! use headless ; then
+		if ! built_with_use media-libs/libsdl X ; then
+			eerror "media-libs/libsdl was compiled without the \"X\" USE flag enabled."
+			eerror "Please re-emerge media-libs/libsdl with USE=\"X\"."
+			die "media-libs/libsdl should be compiled with the \"X\" USE flag."
+		fi
+	fi
+}
+
+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
+	fi
+
+	if use additions; then
+		doins -r additions
+	fi
+
+	if use vboxwebsrv; then
+		doins vboxwebsrv
+		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
+		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
+
+	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 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
+		# 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}-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
+}