diff options
author | 2009-11-03 01:51:44 +0000 | |
---|---|---|
committer | 2009-11-03 01:51:44 +0000 | |
commit | d0a3d1735ef94d0553a50f60bf8a67a229448837 (patch) | |
tree | ed63f11024dccdcd4d9dc186e648ef0c031416cd | |
parent | Version bump; update VBox.sh wrapper (diff) | |
download | jokey-d0a3d1735ef94d0553a50f60bf8a67a229448837.tar.gz jokey-d0a3d1735ef94d0553a50f60bf8a67a229448837.tar.bz2 jokey-d0a3d1735ef94d0553a50f60bf8a67a229448837.zip |
Version bump; add python USE flag; dont ship unneeded VBoxPython2_*.so files bug #285749; drop unneeded old deps from RDEP bug #286163; update VBox.sh wrapper
svn path=/trunk/; revision=741
-rw-r--r-- | app-emulation/virtualbox-bin/ChangeLog | 21 | ||||
-rw-r--r-- | app-emulation/virtualbox-bin/Manifest | 12 | ||||
-rwxr-xr-x | app-emulation/virtualbox-bin/files/virtualbox-bin-3-wrapper (renamed from app-emulation/virtualbox-bin/files/virtualbox-bin-2-wrapper) | 17 | ||||
-rw-r--r-- | app-emulation/virtualbox-bin/virtualbox-bin-3.0.10.ebuild (renamed from app-emulation/virtualbox-bin/virtualbox-bin-3.0.8.ebuild) | 27 |
4 files changed, 52 insertions, 25 deletions
diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog index cc5cb7e..1920a31 100644 --- a/app-emulation/virtualbox-bin/ChangeLog +++ b/app-emulation/virtualbox-bin/ChangeLog @@ -1,10 +1,23 @@ # ChangeLog for app-emulation/virtualbox-bin # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.59 2009/09/21 23:31:42 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.61 2009/10/19 01:40:34 fauli Exp $ - 06 Oct 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com> - -virtualbox-bin-3.0.6-r1.ebuild, +virtualbox-bin-3.0.8.ebuild: - Version bump + 03 Nov 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com> + -files/virtualbox-bin-2-wrapper, -virtualbox-bin-3.0.8.ebuild, + +virtualbox-bin-3.0.10.ebuild, +files/virtualbox-bin-3-wrapper: + Version bump; add python USE flag; dont ship unneeded VBoxPython2_*.so files + bug #285749; drop unneeded old deps from RDEP bug #286163; + update VBox.sh wrapper + + 19 Oct 2009; Christian Faulhammer <fauli@gentoo.org> + virtualbox-bin-3.0.8.ebuild: + stable x86, bug 288836 + +*virtualbox-bin-3.0.8 (06 Oct 2009) + + 06 Oct 2009; Patrick Lauer <patrick@gentoo.org> + +virtualbox-bin-3.0.8.ebuild: + Bump to 3.0.8, big thanks to X-Drum for testing 21 Sep 2009; Christian Faulhammer <fauli@gentoo.org> virtualbox-bin-3.0.6-r1.ebuild: diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest index a7d5206..ce6eace 100644 --- a/app-emulation/virtualbox-bin/Manifest +++ b/app-emulation/virtualbox-bin/Manifest @@ -1,12 +1,12 @@ AUX vboxwebsrv-confd 620 RMD160 7a4ecbd895da0d5851f1a3afda54b3e2bb4012e1 SHA1 651f7b2588a16317f59d692e087b347aadd20aab SHA256 5ea07fcb6e5253cd013bb0277603cba17ca45d96044740172987c0b452f4324a AUX vboxwebsrv-initd 750 RMD160 99420847222c53d114cc0aceff1135d5b8a248fb SHA1 5af0a03611d2547f2e2134ebfc3490d514ef9685 SHA256 aa02b27c05225c7f7f9db74e039489ee637c1207d6a7af7d72cc3a010642b622 -AUX virtualbox-bin-2-wrapper 2810 RMD160 a2565fe337b036251573d87c163f0c947877c35f SHA1 f0b669aae335d9f534c27c8b11ad000d906084e0 SHA256 20f2472844346e066571f0ea9b4f4ebbf9fa58feb1eabfcde3ae77b8ca201c9f +AUX virtualbox-bin-3-wrapper 2928 RMD160 99ce30d35ec3cea75e7e55097d49354d87d955be SHA1 63a4caecd9cbf326e9f189268ff1eb6c39e172b5 SHA256 cbbd44e20becbcbcb34a9d17d0968b8e48f7e190f14214728187d7098c812e06 AUX virtualbox-bin-config 28 RMD160 c03986f0a6ecc77c2d15382d965952bb209ae534 SHA1 43b5fd213ae08bb390ec1962ee2776d4f7fe45fd SHA256 5326f7abdd1a7c8a8a44fd4ab269977ec115286059fc8a4c2fde6805c381236f AUX virtualbox-bin-interfaces 218 RMD160 4639b9848cf44ac59cd12585a3c56ef53d72a6d9 SHA1 3268e5759286bdff1c5242598266e6c2a5b17e5d SHA256 50ddbfedce3afd41aad45163eb799fce0956d815948ad9da842f09163aaafd52 AUX virtualbox-bin.desktop 202 RMD160 ca4dc96cac241a8bf255e01ce6acfea7b98c47ab SHA1 b566c0e4efbfcc0fb4a7887390d211ab282586b5 SHA256 6c5101e7091b51764c0130a8a878ce059c7725fdae6b5c42a7d5cbb31fd96a3e -DIST VirtualBox-3.0.8-53138-Linux_amd64.run 50380241 RMD160 81971cb31b9b518fb9a3f879cbcd3879b90a6f96 SHA1 2febf71cad4f946666c12d1a5da09e69f08a05e4 SHA256 73f7f88b0c5fc6d7f167be4a804fa06cda1c0c60497df01344dafb7a51cf0163 -DIST VirtualBox-3.0.8-53138-Linux_x86.run 50308556 RMD160 299433a302e3afbddeb3a9139d849bb7c7afd888 SHA1 4777dab3e30c852e284e716e164df1bfe1ca104d SHA256 5fcc7f56ebc8df050312ae8223af6ab00b037a6b2ef9eb55b3246e58ca572a68 -DIST VirtualBoxSDK-3.0.8-53138.zip 8193431 RMD160 7d4dc26d77232d0a03b60efe2500ef85d879e681 SHA1 1c7478ce96670735491e799aaf7e9002538d4cd9 SHA256 b52c92eaf559b791dcbc2847ae20c92cd748e5ab6ee9169352dbba898cccdadf -EBUILD virtualbox-bin-3.0.8.ebuild 7909 RMD160 d910f5532d80ca5d9a95089fa398807f95556a41 SHA1 9d6b974b4de5ffc22256ad92bd2bbc35a5652422 SHA256 780d959e6e1c9bb97ebab917f9771cd064f1c7bc968f37b42814f7362166b546 -MISC ChangeLog 13404 RMD160 eb42799442414c4f4ac84c5c186b925558c5581f SHA1 14fc9c4399657f57f7ae76fbe14a97186651e6a3 SHA256 8d714b20dafe86c4e56ff20fe1e884d245cae4374abe0a59bc498cf160d75c57 +DIST VirtualBox-3.0.10-54097-Linux_amd64.run 50677201 RMD160 0759c8b2e0c2377737d28f00ab801c53347d0e62 SHA1 22f911a6cda572b23e45ed8abcb4d5f179a85f63 SHA256 095290cae55b071a9867560873b1c310b7c8aa61da736365f448e079e5e151a3 +DIST VirtualBox-3.0.10-54097-Linux_x86.run 50503117 RMD160 f3a8c317722ef6d16fb375d51d499f9d89ef81c5 SHA1 3c4fcf86fae9199c2428e7aeceb930fceba8f551 SHA256 6f78a44b310af3b64c79411e59d80cd4099e4d371e547906cf7c80b19c7c3b73 +DIST VirtualBoxSDK-3.0.10-54097.zip 8195321 RMD160 ef07c4f38f8ca3995ef95c4838e116dc2ea737ed SHA1 df0dbd536dcd4ed1b1d536f1190705d9929c8788 SHA256 d782ad067bc13fe3816e4d4d91cd2efa74120e73a1f392dbcc7a548fd47eea1b +EBUILD virtualbox-bin-3.0.10.ebuild 8178 RMD160 630a62706451cc2108457e6c02d7c3353d9d641a SHA1 172783721657a3c5f61958eae973f86ff97d0e39 SHA256 e0438ebf5bf666d27aa0b833290c8af353987c6a33f072ce50773057c8d1a187 +MISC ChangeLog 13902 RMD160 d002f8084004ef031e106327e4074637c1040559 SHA1 aba287a190f52198acedaa2e3f100c889aa73a16 SHA256 638fd5fb03fb6baf85e2d3630a168d38863f08d177626780a071836c0a1f2610 MISC metadata.xml 692 RMD160 bd100896b73d952e89bdeda736d25b152c3a73f3 SHA1 f4fb4965fed9ff2468a27a56fe73f0ec23b6a9a0 SHA256 ba708f6a2506cb9762fbabb0f4096bb41fe330e85e219949fe6fa84488a2090b diff --git a/app-emulation/virtualbox-bin/files/virtualbox-bin-2-wrapper b/app-emulation/virtualbox-bin/files/virtualbox-bin-3-wrapper index 3f93b2c..0cf0597 100755 --- a/app-emulation/virtualbox-bin/files/virtualbox-bin-2-wrapper +++ b/app-emulation/virtualbox-bin/files/virtualbox-bin-3-wrapper @@ -1,6 +1,6 @@ #!/bin/sh # -# Sun VirtualBox +# Sun VirtualBox # # Copyright (C) 2006-2009 Sun Microsystems, Inc. # @@ -34,25 +34,26 @@ if [ "$1" = "shutdown" ]; then SHUTDOWN="true" elif ! lsmod|grep -q vboxdrv; then cat << EOF -WARNING: The vboxdrv kernel module is not loaded. - Please load the kernel module by: +WARNING: The VirtualBox kernel modules are not loaded. + Please load all the needed kernel modules by: - sudo modprobe vboxdrv + for m in vbox{drv,netadp,netflt}; do modprobe $m; done You will not be able to start VMs until this problem is fixed. EOF elif [ ! -c /dev/vboxdrv ]; then cat << EOF WARNING: The character device /dev/vboxdrv does not exist. - Please try to reload the kernel module by: + Please try to reload all the needed kernel modules by: - sudo rmmod vboxdrv; sleep 2; sudo modprobe vboxdrv + for m in vbox{netflt,netadp,drv}; do rmmod $m; done + for m in vbox{drv,netadp,netflt}; do modprobe $m; done and if that is not successful, try to re-install the package by: - sudo emerge -1 app-emulation/virtualbox-modules + emerge -1av app-emulation/virtualbox-modules - You will not be able to start VMs until this problem is fixed. + You will not be able to start VMs until this problem is fixed. EOF fi diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-3.0.8.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-3.0.10.ebuild index ae2246e..2dcb232 100644 --- a/app-emulation/virtualbox-bin/virtualbox-bin-3.0.8.ebuild +++ b/app-emulation/virtualbox-bin/virtualbox-bin-3.0.10.ebuild @@ -6,7 +6,7 @@ EAPI=2 inherit eutils fdo-mime pax-utils -MY_PV=${PV}-53138 +MY_PV=${PV}-54097 MY_P=VirtualBox-${MY_PV}-Linux DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use" @@ -18,7 +18,7 @@ SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_amd64. LICENSE="PUEL" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="+additions +chm headless sdk vboxwebsrv" +IUSE="+additions +chm headless python sdk vboxwebsrv" RESTRICT="mirror" PROPERTIES="interactive" @@ -30,8 +30,6 @@ RDEPEND="!!app-emulation/virtualbox-ose media-libs/libsdl[X] x11-libs/libXrender x11-libs/libXfixes - media-libs/libmng - media-libs/jpeg media-libs/libpng x11-libs/libXi x11-libs/libXrandr @@ -50,7 +48,7 @@ RDEPEND="!!app-emulation/virtualbox-ose x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp - x86? ( ~virtual/libstdc++-3.3 )" + python? ( dev-lang/python )" S=${WORKDIR} @@ -191,11 +189,26 @@ src_install() { fperms 0750 /opt/VirtualBox/kchmviewer fi + if use python; then + if has_version "=dev-lang/python-2.4*"; then + doins VBoxPython2_4.so || die + fi + + if has_version "=dev-lang/python-2.5*"; then + doins VBoxPython2_5.so || die + fi + + if has_version "=dev-lang/python-2.6*"; then + doins VBoxPython2_6.so || die + fi + 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 uninstall.sh vboxshell.py vboxdrv-pardus.py + 90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \ + VBoxPython2_*.so if use headless ; then rm -rf VBoxSDL VirtualBox VBoxKeyboard.so @@ -237,7 +250,7 @@ src_install() { fi exeinto /opt/VirtualBox - newexe "${FILESDIR}/${PN}-2-wrapper" "VBox.sh" || die + newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh" || die fowners root:vboxusers /opt/VirtualBox/VBox.sh fperms 0750 /opt/VirtualBox/VBox.sh |