Version bump, thanks to Alessio

Package-Manager: portage-2.1.2.9

10 files changed, 307 insertions, 9 deletions

diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index 638fbf7da695..9f4081815d24 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.9 2007/05/13 08:57:56 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.10 2007/06/06 14:41:28 jokey Exp $
+
+*virtualbox-bin-1.4.0 (06 Jun 2007)
+
+  06 Jun 2007; Markus Ullmann <jokey@gentoo.org>
+  +virtualbox-bin-1.4.0.ebuild:
+  Version bump, thanks to Alessio
 
   13 May 2007; Markus Ullmann <jokey@gentoo.org>
   virtualbox-bin-1.3.8-r1.ebuild:
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
new file mode 100644
index 000000000000..fd9fc687a4c6
--- /dev/null
+++ b/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.4.0
@@ -0,0 +1,3 @@
+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.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-1.4.0.ebuild
new file mode 100644
index 000000000000..c612a715a686
--- /dev/null
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-1.4.0.ebuild
@@ -0,0 +1,132 @@
+# 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}/${MY_P} )
+	x86? ( http://www.virtualbox.org/download/${PV}/${MY_P} )"
+
+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)
+	=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
+
+	insinto /opt/VirtualBox
+	doins UserManual.pdf
+	if use additions; then
+		doins -r additions
+	fi
+	if use sdk; then
+		doins -r sdk
+		fperms 0755 /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 LICENSE
+
+	doins -r *
+	for each in VBox{Manage,SDL,SVC,XPCOMIPCD,VRDP} VirtualBox ; do
+		fperms 0755 /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"
+		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-modules/ChangeLog b/app-emulation/virtualbox-modules/ChangeLog
index af68f805ad20..ebe091085b22 100644
--- a/app-emulation/virtualbox-modules/ChangeLog
+++ b/app-emulation/virtualbox-modules/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virtualbox-modules
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.3 2007/04/21 11:18:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.4 2007/06/06 14:38:10 jokey Exp $
+
+*virtualbox-modules-1.4.0 (06 Jun 2007)
+
+  06 Jun 2007; Markus Ullmann <jokey@gentoo.org>
+  -virtualbox-modules-1.3.6-r1.ebuild, +virtualbox-modules-1.4.0.ebuild:
+  Version bump, thanks to Alessio
 
   21 Apr 2007; Raúl Porcel <armin76@gentoo.org>
   virtualbox-modules-1.3.8.ebuild:
diff --git a/app-emulation/virtualbox-modules/files/digest-virtualbox-modules-1.3.6-r1 b/app-emulation/virtualbox-modules/files/digest-virtualbox-modules-1.3.6-r1
deleted file mode 100644
index 41511804c7f5..000000000000
--- a/app-emulation/virtualbox-modules/files/digest-virtualbox-modules-1.3.6-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bdc996130643759c096d7731b1a7c43a vbox-kernel-module-src-1.3.6.tar.bz2 117772
-RMD160 b9b62eefd1a261f6c6368e7c5ab181924f174072 vbox-kernel-module-src-1.3.6.tar.bz2 117772
-SHA256 f1427f8caff720da82bd14bd5b66d07d507e83095f284e3d1cc45de0b7af7a43 vbox-kernel-module-src-1.3.6.tar.bz2 117772
diff --git a/app-emulation/virtualbox-modules/files/digest-virtualbox-modules-1.4.0 b/app-emulation/virtualbox-modules/files/digest-virtualbox-modules-1.4.0
new file mode 100644
index 000000000000..ba457febed70
--- /dev/null
+++ b/app-emulation/virtualbox-modules/files/digest-virtualbox-modules-1.4.0
@@ -0,0 +1,3 @@
+MD5 58f8f09f61c039d94e0db14742b209e5 vbox-kernel-module-src-1.4.0.tar.gz 157225
+RMD160 d980d12efb1d34bbf9f683852bf29e7919f514a7 vbox-kernel-module-src-1.4.0.tar.gz 157225
+SHA256 e6d9111aa1e94d1f5a0a2e4bd0ee5ffc064c80c5f700026b18e2f193337fb135 vbox-kernel-module-src-1.4.0.tar.gz 157225
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-1.3.6-r1.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-1.4.0.ebuild
index 1fc2c4b3cb6e..b4112d61e349 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-1.3.6-r1.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-1.4.0.ebuild
@@ -7,18 +7,18 @@ inherit eutils linux-mod
 MY_P=vbox-kernel-module-src-${PV}
 DESCRIPTION="Modules for Virtualbox OSE"
 HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://www.virtualbox.org/download/${PV}/${MY_P}.tar.bz2"
+SRC_URI="http://www.virtualbox.org/download/${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="!<app-emulation/virtualbox-bin-1.3.6
 	!<app-emulation/virtualbox-1.3.6
 	!=app-emulation/virtualbox-9999"
 
-S=${WORKDIR}/src
+S=${WORKDIR}/vboxdrv
 
 BUILD_TARGETS="all"
 BUILD_TARGET_ARCH="${ARCH}"
diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index 490dbbcb03c5..1cba7ec68aeb 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/virtualbox
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.17 2007/06/03 07:35:24 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.18 2007/06/06 14:39:45 jokey Exp $
+
+*virtualbox-1.4.0 (06 Jun 2007)
+
+  06 Jun 2007; Markus Ullmann <jokey@gentoo.org> +virtualbox-1.4.0.ebuild:
+  Version bump, thanks to Alessio
 
   03 Jun 2007; Markus Ullmann <jokey@gentoo.org> virtualbox-9999.ebuild:
   Fix hal use dep bug #180565
diff --git a/app-emulation/virtualbox/files/digest-virtualbox-1.4.0 b/app-emulation/virtualbox/files/digest-virtualbox-1.4.0
new file mode 100644
index 000000000000..dbee8ac1a533
--- /dev/null
+++ b/app-emulation/virtualbox/files/digest-virtualbox-1.4.0
@@ -0,0 +1,3 @@
+MD5 8e89d32a67a3a39271f44039d0583a16 VirtualBox-OSE-1.4.0.tar.bz2 21720127
+RMD160 60a445f8ee68b834f19d8004c329e0aed426a15b VirtualBox-OSE-1.4.0.tar.bz2 21720127
+SHA256 32307799f1d03fd9e87b23588279a627ac3856fbea3d4c44f50a2b9c4194a434 VirtualBox-OSE-1.4.0.tar.bz2 21720127
diff --git a/app-emulation/virtualbox/virtualbox-1.4.0.ebuild b/app-emulation/virtualbox/virtualbox-1.4.0.ebuild
new file mode 100644
index 000000000000..1a9764caa404
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-1.4.0.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header $
+
+inherit eutils flag-o-matic qt3 toolchain-funcs
+
+MY_P=VirtualBox-OSE-${PV}
+DESCRIPTION="Softwarefamily of powerful x86 virtualization"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://www.virtualbox.org/download/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE="additions alsa hal nowrapper sdk vboxbfe"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	dev-libs/xalan-c
+	dev-libs/xerces-c
+	media-libs/libsdl
+	x11-libs/libXcursor
+	$(qt_min_version 3.3.5)
+	hal? ( sys-apps/hal )"
+DEPEND="${RDEPEND}
+	sys-devel/bin86
+	sys-devel/dev86
+	sys-power/iasl
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	=virtual/libstdc++-3.3"
+RDEPEND="${RDEPEND}
+	additions? ( ~app-emulation/virtualbox-additions-${PV} )"
+
+S=${WORKDIR}/VirtualBox-OSE-${PV}
+
+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
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	local myconf
+	if ! use hal; then
+		myconf="${myconf} --without-hal"
+	fi
+
+	# Don't build vboxdrv and additions: splitted into separate ebuilds
+	epatch "${FILESDIR}/${P}-remove-splitted-stuff.patch"
+	# Don't build the Alsa audio driver and remove Alsa checks in configure
+	# when Alsa is not selected (bug #167739)
+	use alsa || epatch "${FILESDIR}/${P}-remove-alsa.patch"
+}
+
+src_compile() {
+	cd "${S}"
+	./configure || die "configure failed"
+	source ./env.sh
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	# and strip all flags
+	strip-flags
+
+	MAKE="kmk" emake TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
+		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
+		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
+		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
+		all || die "kmk failed"
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/release/bin
+
+	insinto /opt/VirtualBox
+	if use sdk; then
+		doins -r sdk
+		make_wrapper xpidl "sdk/bin/xpidl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+		fperms 0755 /opt/VirtualBox/sdk/bin/xpidl
+	fi
+	if use vboxbfe; then
+		doins VBoxBFE
+		fperms 0755 /opt/VirtualBox/VBoxBFE
+
+		if use nowrapper ; then
+			make_wrapper vboxbfe "./VBoxBFE" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+		else
+			dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxbfe
+		fi
+	fi
+
+	rm -rf sdk src tst* testcase VBoxBFE vditool xpidl SUPInstall SUPUninstall
+
+	doins -r *
+	for each in VBox{Manage,SDL,SVC,XPCOMIPCD} VirtualBox ; do
+		fperms 0755 /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"
+	else
+		exeinto /opt/VirtualBox
+		newexe "${FILESDIR}/${PN}-wrapper" "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
+	fi
+
+	# desktop entry
+	insinto /usr/share/pixmaps
+	newins "${S}"/src/VBox/Frontends/VirtualBox/images/ico32x01.png ${PN}.png
+	insinto /usr/share/applications
+	doins "${FILESDIR}"/${PN}.desktop
+}
+
+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 ""
+	elog "The last user manual is available for download at:"
+	elog "http://www.virtualbox.org/download/UserManual.pdf"
+	elog ""
+}