Port changes from jokey's overlay; thanks to x-drum: minor changes to desktop entry; libstdc++-3.3 is only needed for x86 binaries, adjusted perms for executables, removed unneeded files; fixed SRC_URI (bug 181161)

(Portage version: 2.1.2.9)

6 files changed, 162 insertions, 3 deletions

diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index 9f4081815d24..625b640fb702 100644
--- a/app-emulation/virtualbox-bin/ChangeLog
+++ b/app-emulation/virtualbox-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/virtualbox-bin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.10 2007/06/06 14:41:28 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.11 2007/06/22 14:55:53 masterdriverz Exp $
+
+*virtualbox-bin-1.4.0-r1 (22 Jun 2007)
+
+  22 Jun 2007; Charlie Shepherd <masterdriverz@gentoo.org>
+  virtualbox-bin-1.4.0.ebuild, +virtualbox-bin-1.4.0-r1.ebuild:
+  Port changes from jokey's overlay; thanks to x-drum: minor changes to
+  desktop entry; libstdc++-3.3 is only needed for x86 binaries, adjusted perms
+  for executables, removed unneeded files; fixed SRC_URI (bug 181161)
 
 *virtualbox-bin-1.4.0 (06 Jun 2007)
 
diff --git a/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.3.8-r1 b/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.3.8-r1
index 1059c039624d..a7022235d0d5 100644
--- a/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.3.8-r1
+++ b/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.3.8-r1
@@ -1,5 +1,6 @@
 MD5 a6b8a863ad3270f7765b47d9f33ee46e VirtualBox_1.3.8_Linux_x86.run 12236712
 RMD160 a23292bba9a4742d49715095f04b3b1b6ccd299a VirtualBox_1.3.8_Linux_x86.run 12236712
 SHA256 407b2c12450631a19739de5a66eceaeeb93239ee55709b1d2b026030812d7431 VirtualBox_1.3.8_Linux_x86.run 12236712
+MD5 1396c7f206f7c6a69f183a0b32c07671 vditool 20884
 RMD160 3315e99113be34913790cb2d04956e29494d8551 vditool 20884
 SHA256 7612930d3a21e7b5b25ed0f6464dca3691e5d958f17df864e9f57f85c9ad966d vditool 20884
diff --git a/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.4.0 b/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.4.0
index fd9fc687a4c6..957ad7b6602e 100644
--- a/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.4.0
+++ b/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.4.0
@@ -1,3 +1,6 @@
+MD5 17003e95329ea1ee4c8b7c0ff0e2bc04 VirtualBox_1.4.0_Linux_amd64.run 11766998
+RMD160 973378f363f251065044d5e6244fff84eef0ae69 VirtualBox_1.4.0_Linux_amd64.run 11766998
+SHA256 5fa13a82fe1cb333668e6dfa84005e78e9ac08a0bb4b68d8e053bde630345ff7 VirtualBox_1.4.0_Linux_amd64.run 11766998
 MD5 d796ef14caa3e3b3be10c959a14f1634 VirtualBox_1.4.0_Linux_x86.run 13631688
 RMD160 2738fe9a74edac51c884ff0dba4c6d8704488dd5 VirtualBox_1.4.0_Linux_x86.run 13631688
 SHA256 b9e9d18e2f070fdbb769292f90171cf9e91e53f800e22683a106ad185edb774c VirtualBox_1.4.0_Linux_x86.run 13631688
diff --git a/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.4.0-r1 b/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.4.0-r1
new file mode 100644
index 000000000000..957ad7b6602e
--- /dev/null
+++ b/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.4.0-r1
@@ -0,0 +1,6 @@
+MD5 17003e95329ea1ee4c8b7c0ff0e2bc04 VirtualBox_1.4.0_Linux_amd64.run 11766998
+RMD160 973378f363f251065044d5e6244fff84eef0ae69 VirtualBox_1.4.0_Linux_amd64.run 11766998
+SHA256 5fa13a82fe1cb333668e6dfa84005e78e9ac08a0bb4b68d8e053bde630345ff7 VirtualBox_1.4.0_Linux_amd64.run 11766998
+MD5 d796ef14caa3e3b3be10c959a14f1634 VirtualBox_1.4.0_Linux_x86.run 13631688
+RMD160 2738fe9a74edac51c884ff0dba4c6d8704488dd5 VirtualBox_1.4.0_Linux_x86.run 13631688
+SHA256 b9e9d18e2f070fdbb769292f90171cf9e91e53f800e22683a106ad185edb774c VirtualBox_1.4.0_Linux_x86.run 13631688
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-1.4.0-r1.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..7a1b1282d792
--- /dev/null
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-1.4.0-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header $
+
+inherit eutils qt3 pax-utils
+
+MY_P=VirtualBox_${PV}_Linux_${ARCH}.run
+
+DESCRIPTION="Softwarefamily of powerful x86 virtualization"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="amd64? ( http://www.virtualbox.org/download/${PV}/VirtualBox_${PV}_Linux_amd64.run )
+	x86? ( http://www.virtualbox.org/download/${PV}/VirtualBox_${PV}_Linux_x86.run )"
+
+LICENSE="PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="additions nowrapper sdk"
+
+RDEPEND="!app-emulation/virtualbox
+	~app-emulation/virtualbox-modules-${PV}
+	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
+	$(qt_min_version 3.3.5)
+	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 ! 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() {
+	cd "${S}"
+
+	# desktop entry
+	insinto /usr/share/pixmaps
+	newins VBox.png virtualbox.png
+	insinto /usr/share/applications
+	newins VirtualBox.desktop virtualbox.desktop
+	dosed -e "10d" /usr/share/applications/virtualbox.desktop
+	dosed -e "5d" /usr/share/applications/virtualbox.desktop
+	dosed -e "s/VirtualBox/virtualbox/" /usr/share/applications/virtualbox.desktop
+	dosed -e "s/VBox.png/virtualbox.png/" /usr/share/applications/virtualbox.desktop
+	dosed -e "s/innotek virtualbox/Innotek VirtualBox/" /usr/share/applications/virtualbox.desktop
+	dosed -e "s/X-MandrivaLinux-System;//" /usr/share/applications/virtualbox.desktop
+
+	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
+		make_wrapper xpidl "sdk/bin/xpidl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	fi
+
+	rm -rf src sdk tst* UserManual.pdf rdesktop-vrdp.tar.gz deffiles install.sh \
+	routines.sh runlevel.sh vboxdrv.sh VBox.sh VBox.png kchmviewer additions \
+	VirtualBox.desktop VirtualBox.chm VirtualBox.tar.bz2 vditool VBoxAddIF.sh \
+	vboxnet.sh LICENSE
+
+	doins -r *
+	for each in VBox{Manage,SDL,SVC,XPCOMIPCD,VRDP} VirtualBox ; do
+		fowners root:vboxusers /opt/VirtualBox/${each}
+		fperms 0750 /opt/VirtualBox/${each}
+		pax-mark -m "${D}"/opt/VirtualBox/${each}
+	done
+
+	if use nowrapper ; then
+		make_wrapper vboxsvc "./VBoxSVC" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+		make_wrapper virtualbox "./VirtualBox" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+		make_wrapper vboxmanage "./VBoxManage" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+		make_wrapper vboxsdl "./VBoxSDL" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+		make_wrapper vboxvrdp "./VBoxVRDP" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	else
+		exeinto /opt/VirtualBox
+		newexe "${FILESDIR}/${PN}-wrapper" "wrapper.sh"
+		fowners root:vboxusers /opt/VirtualBox/wrapper.sh
+		fperms 0750 /opt/VirtualBox/wrapper.sh
+
+		dosym /opt/VirtualBox/wrapper.sh /usr/bin/virtualbox
+		dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxmanage
+		dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxsdl
+		dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxvrdp
+	fi
+}
+
+pkg_postinst() {
+	elog ""
+	if use nowrapper; then
+		elog "In order to launch VirtualBox you need to start the"
+		elog "VirtualBox XPCom Server first, with:"
+		elog "vboxsvc --daemonize && virtualbox"
+	else
+		elog "To launch VirtualBox just type: \"virtualbox\""
+	fi
+	elog ""
+	elog "You must be in the vboxusers group to use VirtualBox,"
+	elog "\"vditool\" is now deprecated, use \"VBoxManage\" instead."
+	elog ""
+}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-1.4.0.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-1.4.0.ebuild
index c612a715a686..93b54dfc2210 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-1.4.0.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-1.4.0.ebuild
@@ -8,8 +8,8 @@ MY_P=VirtualBox_${PV}_Linux_${ARCH}.run
 
 DESCRIPTION="Softwarefamily of powerful x86 virtualization"
 HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="amd64? ( http://www.virtualbox.org/download/${PV}/${MY_P} )
-	x86? ( http://www.virtualbox.org/download/${PV}/${MY_P} )"
+SRC_URI="amd64? ( http://www.virtualbox.org/download/${PV}/VirtualBox_${PV}_Linux_amd64.run )
+	x86? ( http://www.virtualbox.org/download/${PV}/VirtualBox_${PV}_Linux_x86.run )"
 
 LICENSE="PUEL"
 SLOT="0"