From 793f331c18bb777eed43f403c5839b0c70148a4d Mon Sep 17 00:00:00 2001 From: x-drum Date: Sun, 27 Dec 2009 17:30:43 +0000 Subject: Version bump svn path=/trunk/; revision=771 --- app-emulation/virtualbox-guest-additions/ChangeLog | 5 - app-emulation/virtualbox-guest-additions/Manifest | 6 +- .../virtualbox-guest-additions-3.1.0.ebuild | 152 --------------------- .../virtualbox-guest-additions-3.1.2.ebuild | 152 +++++++++++++++++++++ 4 files changed, 155 insertions(+), 160 deletions(-) delete mode 100644 app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.0.ebuild create mode 100644 app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.2.ebuild diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog index 541b213..9c1ed3d 100644 --- a/app-emulation/virtualbox-guest-additions/ChangeLog +++ b/app-emulation/virtualbox-guest-additions/ChangeLog @@ -2,11 +2,6 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.30 2009/12/02 20:37:14 patrick Exp $ - 14 Dec 2009; Alessio Cassibba (X-Drum) - virtualbox-guest-additions-3.1.0.ebuild: - fix vboxadd-client script installation; fix mount.vboxsf - installation bug #296851 - *virtualbox-guest-additions-3.1.0 (02 Dec 2009) 02 Dec 2009; Patrick Lauer diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest index a0715ac..310abb0 100644 --- a/app-emulation/virtualbox-guest-additions/Manifest +++ b/app-emulation/virtualbox-guest-additions/Manifest @@ -1,6 +1,6 @@ AUX virtualbox-guest-additions-3-localconfig 877 RMD160 7a09c0e50c1294c289cfd0665dc29986e55f2f7c SHA1 186a04d197c4f1a22376f767b4804cb05a8c811a SHA256 0115ff252376fa9c1244f79f183041a8e1b078f64d8bea2126d344e8b21a7b84 AUX virtualbox-guest-additions-3.initd 1484 RMD160 aeca98255287c1e4000887d288fef9fa1f9ff2e9 SHA1 2ea17f3442c2a6049fbbe50a93af6ae436114ed7 SHA256 1e6df134835645478f8f46bb3cde5543ba8570d46bb6e2355f799bd6cc45b2ac -DIST VirtualBox-3.1.0-OSE.tar.bz2 55491869 RMD160 7e3600ca1320af601d01d24f0a4e78ef04c89aac SHA1 fb7c97d692fc8e9973578ef44a848a5988694606 SHA256 da8affc44342d3988c96ad2d98c248b99f481ecd001af1557aeb31cd15e10639 -EBUILD virtualbox-guest-additions-3.1.0.ebuild 4232 RMD160 3a68e153bcdcd8a932b380a3e81e71bdce8ba1cf SHA1 2725a318673e7df7f1cee24db1061affa104eb88 SHA256 8054dc6990ae60c75197dbdf97c014e9c8f0349a3da04b11aed43efc6e6978cc -MISC ChangeLog 12179 RMD160 8bbd085c33bace140b2e2d146971d51401f4b23e SHA1 a8e507e7023a5e8fe34c7e895e1ae5e5a25c611d SHA256 6317c111d1cafe22f56a50db3cea0f76ecfd939e2e4869663afb95563f72b63e +DIST VirtualBox-3.1.2-OSE.tar.bz2 55553394 RMD160 be66ad7198f04c71471eeffd5b95ff9d5078eab7 SHA1 ac85e5d098684080ce0571406d741f3db03064b8 SHA256 293f582e37eda29efdb53c6468481b446e1964592f5728656b74664f4d32f2b1 +EBUILD virtualbox-guest-additions-3.1.2.ebuild 4232 RMD160 3a68e153bcdcd8a932b380a3e81e71bdce8ba1cf SHA1 2725a318673e7df7f1cee24db1061affa104eb88 SHA256 8054dc6990ae60c75197dbdf97c014e9c8f0349a3da04b11aed43efc6e6978cc +MISC ChangeLog 11988 RMD160 c87c6ecafe7a7519c7ba45b39defb26de7cb1b32 SHA1 c6d29a9804a6f329fa5aa6ebef4ce0edf904934a SHA256 58d7bc2a5b68e93a31161b9d3d3c1b3abe5e2edd372b4e0ab92d559fe184e827 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9 diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.0.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.0.ebuild deleted file mode 100644 index 676901a..0000000 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.0.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.0.2.ebuild,v 1.1 2009/07/16 21:42:07 patrick Exp $ - -inherit eutils linux-mod - -MY_P=VirtualBox-${PV}-OSE -DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests" -HOMEPAGE="http://www.virtualbox.org/" -SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="X" - -RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV} - ~x11-drivers/xf86-input-virtualbox-${PV} - x11-apps/xrandr - x11-apps/xrefresh - x11-libs/libXmu - x11-libs/libX11 - x11-libs/libXt - x11-libs/libXext - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libSM - x11-libs/libICE - amd64? ( app-emulation/emul-linux-x86-xlibs ) )" -DEPEND="${RDEPEND} - >=dev-util/kbuild-0.1.5-r1 - >=dev-lang/yasm-0.6.2 - sys-devel/bin86 - sys-devel/dev86 - sys-power/iasl - X? ( x11-proto/renderproto )" - -BUILD_TARGETS="all" -BUILD_TARGET_ARCH="${ARCH}" -MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest) - vboxvfs(misc:${WORKDIR}/vboxvfs:${WORKDIR}/vboxvfs)" - -S=${WORKDIR}/${MY_P/-OSE/_OSE} - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}" - enewgroup vboxguest - enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest -} - -src_unpack() { - unpack ${A} - - # Create and unpack a tarball with the sources of the Linux guest - # kernel modules, to include all the needed files - "${MY_P/-OSE/_OSE}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz" - unpack ./vbox-kmod.tar.gz - - # Remove shipped binaries (kBuild,yasm), see bug #232775 - cd "${S}" - rm -rf kBuild/bin tools - - # Disable things unused or splitted into separate ebuilds - cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk -} - -src_compile() { - linux-mod_src_compile - - # build the user-space tools, warnings are harmless - ./configure --nofatal \ - --disable-xpcom \ - --disable-sdl-ttf \ - --disable-pulse \ - --disable-alsa \ - --build-headless || die "configure failed" - source ./env.sh - - for each in /src/VBox/{Runtime,Additions/common} \ - /src/VBox/Additions/linux/{sharedfolders,daemon} ; do - cd "${S}"${each} - MAKE="kmk" emake TOOL_YASM_AS=yasm \ - KBUILD_PATH="${S}/kBuild" \ - || die "kmk VBoxControl failed" - done - - if use X; then - cd "${S}"/src/VBox/Additions/x11/VBoxClient - MAKE="kmk" emake TOOL_YASM_AS=yasm \ - KBUILD_PATH="${S}/kBuild" \ - || die "kmk VBoxClient failed" - fi -} - -src_install() { - linux-mod_src_install - - cd "${S}"/out/linux.${ARCH}/release/bin/additions - - insinto /sbin - newins mount.vboxsf mount.vboxsf - fperms 4755 /sbin/mount.vboxsf - - newinitd "${FILESDIR}"/${PN}-3.initd ${PN} - - insinto /usr/sbin/ - newins VBoxService vboxguest-service - fperms 0755 /usr/sbin/vboxguest-service - - insinto /usr/bin - doins VBoxControl - fperms 0755 /usr/bin/VBoxControl - - # VBoxClient user service and xrandr wrapper - if use X; then - doins VBoxClient - fperms 0755 /usr/bin/VBoxClient - - cd "${S}"/src/VBox/Additions/x11/Installer - newins VBoxRandR.sh VBoxRandR - fperms 0755 /usr/bin/VBoxRandR - - newins 98vboxadd-xclient VBoxClient-all - fperms 0755 /usr/bin/VBoxClient-all - fi - - # udev rule for vboxdrv - dodir /etc/udev/rules.d - echo 'KERNEL=="vboxguest", NAME="vboxguest", OWNER="vboxguest", MODE="0660"' \ - >> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules" - echo 'KERNEL=="vboxuser", NAME="vboxuser", OWNER="vboxguest", MODE="0660"' \ - >> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules" -} - -pkg_postinst() { - linux-mod_pkg_postinst - if ! useq X ; then - elog "use flag X is off, enable it to install the" - elog "X Window System input and video drivers" - fi - elog "Please add:" - elog "/etc/init.d/${PN}" - elog "to the default runlevel in order to load all" - elog "needed modules and services." - elog "" - elog "Warning:" - elog "this ebuild is only needed if you are running gentoo" - elog "inside a VirtualBox Virtual Machine, you don't need" - elog "it to run VirtualBox itself." - elog "" -} diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.2.ebuild new file mode 100644 index 0000000..676901a --- /dev/null +++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.2.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.0.2.ebuild,v 1.1 2009/07/16 21:42:07 patrick Exp $ + +inherit eutils linux-mod + +MY_P=VirtualBox-${PV}-OSE +DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests" +HOMEPAGE="http://www.virtualbox.org/" +SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="X" + +RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV} + ~x11-drivers/xf86-input-virtualbox-${PV} + x11-apps/xrandr + x11-apps/xrefresh + x11-libs/libXmu + x11-libs/libX11 + x11-libs/libXt + x11-libs/libXext + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libSM + x11-libs/libICE + amd64? ( app-emulation/emul-linux-x86-xlibs ) )" +DEPEND="${RDEPEND} + >=dev-util/kbuild-0.1.5-r1 + >=dev-lang/yasm-0.6.2 + sys-devel/bin86 + sys-devel/dev86 + sys-power/iasl + X? ( x11-proto/renderproto )" + +BUILD_TARGETS="all" +BUILD_TARGET_ARCH="${ARCH}" +MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest) + vboxvfs(misc:${WORKDIR}/vboxvfs:${WORKDIR}/vboxvfs)" + +S=${WORKDIR}/${MY_P/-OSE/_OSE} + +pkg_setup() { + linux-mod_pkg_setup + BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}" + enewgroup vboxguest + enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest +} + +src_unpack() { + unpack ${A} + + # Create and unpack a tarball with the sources of the Linux guest + # kernel modules, to include all the needed files + "${MY_P/-OSE/_OSE}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz" + unpack ./vbox-kmod.tar.gz + + # Remove shipped binaries (kBuild,yasm), see bug #232775 + cd "${S}" + rm -rf kBuild/bin tools + + # Disable things unused or splitted into separate ebuilds + cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk +} + +src_compile() { + linux-mod_src_compile + + # build the user-space tools, warnings are harmless + ./configure --nofatal \ + --disable-xpcom \ + --disable-sdl-ttf \ + --disable-pulse \ + --disable-alsa \ + --build-headless || die "configure failed" + source ./env.sh + + for each in /src/VBox/{Runtime,Additions/common} \ + /src/VBox/Additions/linux/{sharedfolders,daemon} ; do + cd "${S}"${each} + MAKE="kmk" emake TOOL_YASM_AS=yasm \ + KBUILD_PATH="${S}/kBuild" \ + || die "kmk VBoxControl failed" + done + + if use X; then + cd "${S}"/src/VBox/Additions/x11/VBoxClient + MAKE="kmk" emake TOOL_YASM_AS=yasm \ + KBUILD_PATH="${S}/kBuild" \ + || die "kmk VBoxClient failed" + fi +} + +src_install() { + linux-mod_src_install + + cd "${S}"/out/linux.${ARCH}/release/bin/additions + + insinto /sbin + newins mount.vboxsf mount.vboxsf + fperms 4755 /sbin/mount.vboxsf + + newinitd "${FILESDIR}"/${PN}-3.initd ${PN} + + insinto /usr/sbin/ + newins VBoxService vboxguest-service + fperms 0755 /usr/sbin/vboxguest-service + + insinto /usr/bin + doins VBoxControl + fperms 0755 /usr/bin/VBoxControl + + # VBoxClient user service and xrandr wrapper + if use X; then + doins VBoxClient + fperms 0755 /usr/bin/VBoxClient + + cd "${S}"/src/VBox/Additions/x11/Installer + newins VBoxRandR.sh VBoxRandR + fperms 0755 /usr/bin/VBoxRandR + + newins 98vboxadd-xclient VBoxClient-all + fperms 0755 /usr/bin/VBoxClient-all + fi + + # udev rule for vboxdrv + dodir /etc/udev/rules.d + echo 'KERNEL=="vboxguest", NAME="vboxguest", OWNER="vboxguest", MODE="0660"' \ + >> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules" + echo 'KERNEL=="vboxuser", NAME="vboxuser", OWNER="vboxguest", MODE="0660"' \ + >> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules" +} + +pkg_postinst() { + linux-mod_pkg_postinst + if ! useq X ; then + elog "use flag X is off, enable it to install the" + elog "X Window System input and video drivers" + fi + elog "Please add:" + elog "/etc/init.d/${PN}" + elog "to the default runlevel in order to load all" + elog "needed modules and services." + elog "" + elog "Warning:" + elog "this ebuild is only needed if you are running gentoo" + elog "inside a VirtualBox Virtual Machine, you don't need" + elog "it to run VirtualBox itself." + elog "" +} -- cgit v1.2.3-65-gdbad