[gentoo-commits] gentoo-x86 commit in app-emulation/virtualbox: virtualbox-9999.ebuild ChangeLog virtualbox-1.5.2.ebuild virtualbox-1.5.0-r1.ebuild

[Markus Ullmann (jokey)]

jokey       07/10/22 22:19:38

  Modified:             virtualbox-9999.ebuild ChangeLog
  Added:                virtualbox-1.5.2.ebuild
  Removed:              virtualbox-1.5.0-r1.ebuild
  Log:
  Version bump wrt bug #196424 thanks to Alessio for the ebuilds
  (Portage version: 2.1.3.15)

Revision  Changes    Path
1.21                 app-emulation/virtualbox/virtualbox-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/virtualbox-9999.ebuild?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/virtualbox-9999.ebuild?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/virtualbox-9999.ebuild?r1=1.20&r2=1.21

Index: virtualbox-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-9999.ebuild,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- virtualbox-9999.ebuild	7 Oct 2007 21:58:17 -0000	1.20
+++ virtualbox-9999.ebuild	22 Oct 2007 22:19:38 -0000	1.21
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-9999.ebuild,v 1.20 2007/10/07 21:58:17 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-9999.ebuild,v 1.21 2007/10/22 22:19:38 jokey Exp $
 
 inherit eutils flag-o-matic linux-mod qt3 subversion toolchain-funcs
 
@@ -11,7 +11,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="nowrapper sdk vboxbfe vditool"
+IUSE="sdk"
 
 RDEPEND="!app-emulation/virtualbox-bin
 	!app-emulation/virtualbox-additions
@@ -29,6 +29,9 @@
 	sys-devel/dev86
 	sys-power/iasl
 	>=media-libs/alsa-lib-1.0.13"
+RDEPEND="${RDEPEND}
+	sys-apps/usermode-utilities
+	net-misc/bridge-utils"
 
 BUILD_TARGETS="all"
 MODULE_NAMES="vboxdrv(misc:${S}/out/linux.${ARCH}/release/bin/src:${S}/out/linux.${ARCH}/release/bin/src)"
@@ -73,31 +76,16 @@
 	linux-mod_src_install
 
 	cd "${S}"/out/linux.${ARCH}/release/bin
-
 	insinto /opt/VirtualBox
 
-	make_wrapper vboxtunctl "./VBoxTunctl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-
 	if use sdk; then
 		doins -r sdk
-		make_wrapper xpidl "sdk/bin/xpidl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
 		fowners root:vboxusers /opt/VirtualBox/sdk/bin/xpidl
 		fperms 0750 /opt/VirtualBox/sdk/bin/xpidl
 	fi
-	if use vboxbfe; then
-		doins VBoxBFE
-		fowners root:vboxusers /opt/VirtualBox/VBoxBFE
-		fperms 0750 /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 additions VBoxBFE vditool vboxdrv.ko xpidl SUPInstall \
-	SUPUninstall VBox.sh VBox.png
+	SUPUninstall VBox.png
 
 	doins -r *
 	for each in VBox{Manage,SDL,SVC,XPCOMIPCD,Tunctl} VirtualBox ; do
@@ -105,26 +93,30 @@
 		fperms 0750 /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"
-		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
-	fi
+	exeinto /opt/VirtualBox
+	newexe "${FILESDIR}/${PN}-wrapper" "VBox.sh" || die
+	fowners root:vboxusers /opt/VirtualBox/VBox.sh
+	fperms 0750 /opt/VirtualBox/VBox.sh
+	newexe "${S}"/src/VBox/Installer/linux/VBoxAddIF.sh "VBoxAddIF.sh" || die
+	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/VBoxTunctl /usr/bin/VBoxTunctl
+	dosym /opt/VirtualBox/VBoxAddIF.sh /usr/bin/VBoxAddIF
+	dosym /opt/VirtualBox/VBoxAddIF.sh /usr/bin/VBoxDeleteIF
 
 	# udev rule for vboxdrv
 	dodir /etc/udev/rules.d
 	echo 'KERNEL=="vboxdrv", GROUP="vboxusers" MODE=660' >> "${D}/etc/udev/rules.d/60-virtualbox.rules"
 
+	# create virtualbox configurations files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-config" vbox.cfg
+	newins "${FILESDIR}/${PN}-interfaces" interfaces
+
 	# desktop entry
 	insinto /usr/share/pixmaps
 	newins "${S}"/src/VBox/Frontends/VirtualBox/images/ico32x01.png ${PN}.png
@@ -135,14 +127,7 @@
 
 pkg_postinst() {
 	linux-mod_pkg_postinst
-	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 "To launch VirtualBox just type: \"VirtualBox\""
 	elog "You must be in the vboxusers group to use VirtualBox."
 	elog ""
 	elog "The last user manual is available for download at:"



1.27                 app-emulation/virtualbox/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/ChangeLog?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/ChangeLog?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/ChangeLog?r1=1.26&r2=1.27

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ChangeLog	7 Oct 2007 21:58:17 -0000	1.26
+++ ChangeLog	22 Oct 2007 22:19:38 -0000	1.27
@@ -1,6 +1,18 @@
 # 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.26 2007/10/07 21:58:17 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.27 2007/10/22 22:19:38 jokey Exp $
+
+*virtualbox-1.5.2 (22 Oct 2007)
+
+  22 Oct 2007; Markus Ullmann <jokey@g.o>
+  -files/virtualbox-1.5.0-remove-alsa.patch,
+  -files/virtualbox-1.5.0-remove-splitted-stuff.patch,
+  +files/virtualbox-1.5.2-remove-alsa.patch,
+  +files/virtualbox-1.5.2-remove-splitted-stuff.patch,
+  +files/virtualbox-config, +files/virtualbox-interfaces,
+  files/virtualbox-wrapper, -virtualbox-1.5.0-r1.ebuild,
+  +virtualbox-1.5.2.ebuild, virtualbox-9999.ebuild:
+  Version bump wrt bug #196424 thanks to Alessio for the ebuilds
 
   07 Oct 2007; Markus Ullmann <jokey@g.o> virtualbox-9999.ebuild:
   add blockers for virtualbox-additions bug #194183, thanks to Alessio



1.1                  app-emulation/virtualbox/virtualbox-1.5.2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/virtualbox-1.5.2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/virtualbox-1.5.2.ebuild?rev=1.1&content-type=text/plain

Index: virtualbox-1.5.2.ebuild
===================================================================
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-1.5.2.ebuild,v 1.1 2007/10/22 22:19:38 jokey Exp $

inherit eutils flag-o-matic qt3 toolchain-funcs

MY_P=VirtualBox-${PV}_OSE
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 sdk"

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)
	sys-apps/hal"
DEPEND="${RDEPEND}
	sys-devel/bin86
	sys-devel/dev86
	sys-power/iasl
	alsa? ( >=media-libs/alsa-lib-1.0.13 )"
RDEPEND="${RDEPEND}
	additions? ( ~app-emulation/virtualbox-additions-${PV} )
	sys-apps/usermode-utilities
	net-misc/bridge-utils"

S=${WORKDIR}/${MY_P}

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}"

	# 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

	# create virtualbox configurations files
	insinto /etc/vbox
	newins "${FILESDIR}/${PN}-config" vbox.cfg
	newins "${FILESDIR}/${PN}-interfaces" interfaces

	insinto /opt/VirtualBox
	if use sdk; then
		doins -r sdk
		fowners root:vboxusers /opt/VirtualBox/sdk/bin/xpidl
		fperms 0750 /opt/VirtualBox/sdk/bin/xpidl
	fi

	rm -rf sdk tst* testcase xpidl SUPInstall SUPUninstall VBox.png VBoxBFE \
	vditool

	doins -r *
	for each in VBox{Manage,SDL,SVC,XPCOMIPCD,Tunctl} VirtualBox ; do
		fowners root:vboxusers /opt/VirtualBox/${each}
		fperms 0750 /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
	newexe "${S}"/src/VBox/Installer/linux/VBoxAddIF.sh "VBoxAddIF.sh" || die
	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/VBoxTunctl /usr/bin/VBoxTunctl
	dosym /opt/VirtualBox/VBoxAddIF.sh /usr/bin/VBoxAddIF
	dosym /opt/VirtualBox/VBoxAddIF.sh /usr/bin/VBoxDeleteIF

	# 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
	dosed -e "s/Version=/Version=${PV}/" /usr/share/applications/${PN}.desktop
}

pkg_postinst() {
	elog ""
	elog "To launch VirtualBox just type: \"VirtualBox\""
	elog "You must be in the vboxusers group to use VirtualBox,"
	elog ""
	elog "The last user manual is available for download at:"
	elog "http://www.virtualbox.org/download/UserManual.pdf"
	elog ""
}



-- 
gentoo-commits@g.o mailing list