Port from dev overlay

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo i686)

6 files changed, 196 insertions, 158 deletions

diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index 0630e0200eaf..5bca375bf024 100644
--- a/app-emulation/virtualbox-bin/ChangeLog
+++ b/app-emulation/virtualbox-bin/ChangeLog
@@ -1,6 +1,22 @@
 # 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.33 2008/08/27 18:27:57 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.34 2008/09/06 07:16:40 jokey Exp $
+
+*virtualbox-bin-1.6.6 (06 Sep 2008)
+
+  06 Sep 2008; Markus Ullmann <jokey@gentoo.org>
+  files/virtualbox-bin-wrapper, metadata.xml, -virtualbox-bin-1.5.6.ebuild,
+  virtualbox-bin-1.6.4.ebuild, +virtualbox-bin-1.6.6.ebuild:
+  Port from dev overlay
+
+  03 Sep 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  -virtualbox-bin-1.5.6.ebuild, virtualbox-bin-1.6.4.ebuild,
+  +virtualbox-bin-1.6.6.ebuild, files/virtualbox-bin-wrapper,
+  metadata.xml:
+  Version bump; remove USE flag chm in metadata.xml; disable logging via
+  wrapper in 1.6.4 only; fix SRC_URI and set RESTRICT to primaryuri (PUEL
+  downloads available again on virtualbox.org); readd check_license for PUEL;
+  drop old 1.5.x version
 
   27 Aug 2008; Markus Ullmann <jokey@gentoo.org>
   virtualbox-bin-1.6.4.ebuild:
diff --git a/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper b/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper
index 38f1838d3eb0..3dbfce6a7b22 100644
--- a/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper
+++ b/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper
@@ -83,7 +83,6 @@ EOF
 fi
 
 export LD_LIBRARY_PATH="$INSTALL_DIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-export VBOX_LOG_DEST="nofile"
 
 SERVER_PID=`ps -U \`whoami\` | grep VBoxSVC | awk '{ print $1 }'`
 if [ -z "$SERVER_PID" ]; then
diff --git a/app-emulation/virtualbox-bin/metadata.xml b/app-emulation/virtualbox-bin/metadata.xml
index b73cb2e38845..4023b039d6f6 100644
--- a/app-emulation/virtualbox-bin/metadata.xml
+++ b/app-emulation/virtualbox-bin/metadata.xml
@@ -12,7 +12,6 @@
 </maintainer>
 <use>
 	<flag name='additions'>Install Guest System Tools ISO</flag>
-	<flag name='chm'>Install help files and add chm reader dependency</flag>
 	<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>
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-1.5.6.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-1.5.6.ebuild
deleted file mode 100644
index f2b20c3075b6..000000000000
--- a/app-emulation/virtualbox-bin/virtualbox-bin-1.5.6.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# 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.5.6.ebuild,v 1.5 2008/08/27 12:25:33 jokey Exp $
-
-EAPI=1
-
-inherit eutils fdo-mime qt3 pax-utils
-
-MY_P=VirtualBox_${PV}-1_Linux_${ARCH}.run
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="amd64? ( http://www.virtualbox.org/download/${PV}/VirtualBox_${PV}-1_Linux_amd64.run )
-	x86? ( http://www.virtualbox.org/download/${PV}/VirtualBox_${PV}-1_Linux_x86.run )"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="additions chm sdk"
-
-RDEPEND="!app-emulation/virtualbox-ose
-	!app-emulation/virtualbox-ose-additions
-	=app-emulation/virtualbox-modules-1.5.7
-	virtual/xft
-	x11-libs/libXi
-	x11-libs/libX11
-	x11-libs/libXft
-	x11-libs/libXtst
-	x11-libs/libXext
-	x11-libs/libXt
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXrender
-	x11-libs/libXrandr
-	x11-libs/libXau
-	x11-libs/libXcursor
-	x11-libs/libXdmcp
-	x11-libs/libXfixes
-	dev-libs/libxml2
-	media-libs/libsdl
-	media-libs/libmng
-	media-libs/jpeg
-	media-libs/libpng
-	media-libs/freetype
-	media-libs/fontconfig
-	x11-libs/qt:3
-	sys-apps/usermode-utilities
-	net-misc/bridge-utils
-	x86? ( =virtual/libstdc++-3.3 )
-	sdk? ( dev-libs/libIDL )
-	chm? ( app-text/kchmviewer )"
-
-S=${WORKDIR}
-
-RESTRICT="primaryuri"
-
-pkg_setup() {
-	# The VBoxSDL frontend needs media-libs/libsdl compiled
-	# with USE flag X enabled (bug #177335)
-	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
-
-	check_license
-}
-
-src_unpack() {
-	unpack_makeself ${MY_P}
-	unpack ./VirtualBox.tar.bz2
-}
-
-src_install() {
-
-	# desktop entry
-	newicon VBox.png virtualbox.png
-	newmenu "${FILESDIR}"/${PN}.desktop virtualbox.desktop
-
-	# create virtualbox configurations files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-config" vbox.cfg
-	newins "${FILESDIR}/${PN}-interfaces" interfaces
-
-	insinto /opt/VirtualBox
-	doins UserManual.pdf
-
-	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 chm; then
-		doins *.chm
-		dosym /usr/bin/kchmviewer /opt/VirtualBox/kchmviewer
-	fi
-
-	rm -rf src sdk tst* rdesktop-vrdp.tar.gz deffiles install.sh routines.sh \
-	runlevel.sh vboxdrv.sh VBox.sh VBox.png kchmviewer additions VirtualBox.desktop \
-	VirtualBox.tar.bz2 vboxnet.sh LICENSE VirtualBox.chm VirtualBoxAPI.chm \
-	VBoxSysInfo.sh
-
-	doins -r *
-	for each in VBox{Manage,SDL,SVC,XPCOMIPCD,VRDP,Tunctl} VirtualBox ; do
-		fowners root:vboxusers /opt/VirtualBox/${each}
-		fperms 0750 /opt/VirtualBox/${each}
-		pax-mark -m "${D}"/opt/VirtualBox/${each}
-	done
-
-	exeinto /opt/VirtualBox
-	newexe "${FILESDIR}/${PN}-wrapper" "VBox.sh" || die
-	fowners root:vboxusers /opt/VirtualBox/VBox.sh
-	fperms 0750 /opt/VirtualBox/VBox.sh
-	fowners root:vboxusers /opt/VirtualBox/VBoxAddIF.sh
-	fperms 0750 /opt/VirtualBox/VBoxAddIF.sh
-
-	dosym /opt/VirtualBox/VBox.sh /usr/bin/VirtualBox
-	dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxManage
-	dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxSDL
-	dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxVRDP
-	dosym /opt/VirtualBox/VBoxTunctl /usr/bin/VBoxTunctl
-	dosym /opt/VirtualBox/VBoxAddIF.sh /usr/bin/VBoxAddIF
-	dosym /opt/VirtualBox/VBoxAddIF.sh /usr/bin/VBoxDeleteIF
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	elog ""
-	elog "To launch VirtualBox just type: \"VirtualBox\""
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-1.6.4.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-1.6.4.ebuild
index 4a8d84fa7dad..9012b0c2281d 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-1.6.4.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-1.6.4.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.4.ebuild,v 1.4 2008/08/27 18:27:57 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-1.6.4.ebuild,v 1.5 2008/09/06 07:16:40 jokey Exp $
 
 EAPI=1
 
@@ -10,8 +10,8 @@ MY_P=VirtualBox-${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 )"
+SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_amd64.run )
+	x86? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_x86.run )"
 
 LICENSE="PUEL"
 SLOT="0"
@@ -52,18 +52,7 @@ RDEPEND="!app-emulation/virtualbox-ose
 
 S=${WORKDIR}
 
-RESTRICT="fetch"
-
-pkg_nofetch() {
-	elog "Please download the package from the site:"
-	elog "https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_SMI-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef=innotek-1.6-G-F@CDS-CDS_SMI"
-	if use amd64 ; then
-		elog "select \"Linux (AMD64)\" and download \"${MY_P}_amd64.run\""
-	else
-		elog "select \"Linux i386\" and download \"${MY_P}_x86.run\""
-	fi
-	elog "then put this file in ${DISTDIR}"
-}
+RESTRICT="primaryuri"
 
 pkg_setup() {
 	# The VBoxSDL frontend needs media-libs/libsdl compiled
@@ -75,6 +64,8 @@ pkg_setup() {
 			die "media-libs/libsdl should be compiled with the \"X\" USE flag."
 		fi
 	fi
+
+	check_license
 }
 
 src_unpack() {
@@ -145,6 +136,12 @@ src_install() {
 	newexe "${FILESDIR}/${PN}-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
 
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-1.6.6.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-1.6.6.ebuild
new file mode 100644
index 000000000000..0ac0d51cf6a0
--- /dev/null
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-1.6.6.ebuild
@@ -0,0 +1,167 @@
+# 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.1 2008/09/06 07:16:40 jokey Exp $
+
+EAPI=1
+
+inherit eutils fdo-mime qt3 pax-utils
+
+MY_P=VirtualBox-${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 )"
+
+LICENSE="PUEL"
+SLOT="0"
+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
+		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 )
+	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 )
+	sdk? ( dev-libs/libIDL )"
+
+S=${WORKDIR}
+
+RESTRICT="primaryuri"
+
+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
+
+	check_license
+}
+
+src_unpack() {
+	unpack_makeself
+	unpack ./VirtualBox.tar.bz2
+}
+
+src_install() {
+	if ! use headless ; then
+		newicon VBox.png virtualbox.png
+		newmenu "${FILESDIR}"/${PN}.desktop virtualbox.desktop
+	fi
+
+	# create virtualbox configurations files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-config" vbox.cfg
+	newins "${FILESDIR}/${PN}-interfaces" interfaces
+
+	insinto /opt/VirtualBox
+	doins UserManual.pdf
+
+	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
+		fperms 0750 /opt/VirtualBox/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		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
+
+	if use headless ; then
+		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so VirtualBoxAPI.chm \
+			VirtualBox.chm
+	fi
+
+	doins -r * || die
+
+	if ! use headless ; then
+		for each in VBox{Manage,SDL,SVC,XPCOMIPCD,Tunctl,Headless} VirtualBox; do
+			fowners root:vboxusers /opt/VirtualBox/${each}
+			fperms 0750 /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
+	fi
+
+	exeinto /opt/VirtualBox
+	newexe "${FILESDIR}/${PN}-wrapper" "VBox.sh" || die
+	fowners root:vboxusers /opt/VirtualBox/VBox.sh
+	fperms 0750 /opt/VirtualBox/VBox.sh
+	fowners root:vboxusers /opt/VirtualBox/VBoxAddIF.sh
+	fperms 0750 /opt/VirtualBox/VBoxAddIF.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
+	dosym /opt/VirtualBox/VBoxAddIF.sh /usr/bin/VBoxAddIF
+	dosym /opt/VirtualBox/VBoxAddIF.sh /usr/bin/VBoxDeleteIF
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	elog ""
+	if ! use headless ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\""
+		elog ""
+		elog "In order to use the online help, create a link"
+		elog "to your favourite chm viewer, for example:"
+		elog "ln -s /usr/bin/kchmviewer /opt/VirtualBox/kchmviewer"
+		elog ""
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}