summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2013-06-24 10:58:49 +0000
committerLars Wendler <polynomial-c@gentoo.org>2013-06-24 10:58:49 +0000
commit2862631037818f531dce379d42cbba5230b49e1b (patch)
treea4036efb82e90d4e1b2b4e664ad93f951eabe8bf /app-emulation/virtualbox-guest-additions
parentVersion bump. Removed old (diff)
downloadgentoo-2-2862631037818f531dce379d42cbba5230b49e1b.tar.gz
gentoo-2-2862631037818f531dce379d42cbba5230b49e1b.tar.bz2
gentoo-2-2862631037818f531dce379d42cbba5230b49e1b.zip
Version bump. Removed old
(Portage version: 2.2.0_alpha184/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'app-emulation/virtualbox-guest-additions')
-rw-r--r--app-emulation/virtualbox-guest-additions/ChangeLog10
-rw-r--r--app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.24.ebuild199
-rw-r--r--app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.14.ebuild (renamed from app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.10.ebuild)14
3 files changed, 16 insertions, 207 deletions
diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index b4d3f5dbf628..0434ff4e5040 100644
--- a/app-emulation/virtualbox-guest-additions/ChangeLog
+++ b/app-emulation/virtualbox-guest-additions/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for app-emulation/virtualbox-guest-additions
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.124 2013/06/18 12:19:35 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.125 2013/06/24 10:58:49 polynomial-c Exp $
+
+*virtualbox-guest-additions-4.2.14 (24 Jun 2013)
+
+ 24 Jun 2013; Lars Wendler <polynomial-c@gentoo.org>
+ -virtualbox-guest-additions-4.1.24.ebuild,
+ -virtualbox-guest-additions-4.2.10.ebuild,
+ +virtualbox-guest-additions-4.2.14.ebuild:
+ Version bump. Removed old.
18 Jun 2013; Lars Wendler <polynomial-c@gentoo.org>
virtualbox-guest-additions-4.1.24.ebuild,
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.24.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.24.ebuild
deleted file mode 100644
index 3394b9a092ab..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.24.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2013 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-4.1.24.ebuild,v 1.4 2013/06/18 12:19:35 polynomial-c Exp $
-
-EAPI=2
-
-inherit eutils linux-mod user
-
-MY_P=VirtualBox-${PV}
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo 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-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 )
- !!x11-drivers/xf86-input-virtualbox"
-DEPEND="${RDEPEND}
- >=dev-util/kbuild-0.1.999
- >=dev-lang/yasm-0.6.2
- sys-devel/bin86
- sys-devel/dev86
- sys-libs/pam
- sys-power/iasl
- X? ( x11-proto/renderproto )
- !X? ( x11-proto/xproto )"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
- vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- linux-mod_pkg_setup
- BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
- enewgroup vboxguest
- enewuser vboxguest -1 /bin/sh /dev/null 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
- "${S}"/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
-}
-
-src_prepare() {
- # PaX fixes (see bug #298988)
- pushd "${WORKDIR}" &>/dev/null || die
- epatch "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
- popd &>/dev/null || die
-
- # Disable things unused or splitted into separate ebuilds
- cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
-
- # stupid new header references...
- for vboxheader in {product,revision}-generated.h ; do
- for mdir in vbox{guest,sf} ; do
- ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
- "${WORKDIR}/${mdir}/${vboxheader}"
- done
- done
-}
-
-src_configure() {
- # build the user-space tools, warnings are harmless
- ./configure --nofatal \
- --disable-xpcom \
- --disable-sdl-ttf \
- --disable-pulse \
- --disable-alsa \
- --build-headless || die "configure failed"
-}
-
-src_compile() {
- 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
-
- # Now creating the kernel modules. We must do this _after_
- # we compiled the user-space tools as we need two of the
- # automatically generated header files. (>=3.2.0)
- linux-mod_src_compile
-}
-
-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}-7.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 98vboxadd-xclient VBoxClient-all
- fperms 0755 /usr/bin/VBoxClient-all
- fi
-
- # udev rule for vboxdrv
- dodir /lib/udev/rules.d
- echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
- >> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
- || die
- echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
- >> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
- || die
-
- # VBoxClient autostart file
- insinto /etc/xdg/autostart
- doins "${FILESDIR}"/vboxclient.desktop
-
- # sample xorg.conf
- insinto /usr/share/doc/${PF}
- doins "${FILESDIR}"/xorg.conf.vbox
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
- if ! use X ; then
- elog "use flag X is off, enable it to install the"
- elog "X Window System video driver."
- fi
- elog ""
- elog "Please add users to the \"vboxguest\" group so they can"
- elog "benefit from seamless mode, auto-resize and clipboard."
- elog ""
- elog "Please add:"
- elog "/etc/init.d/${PN}"
- elog "to the default runlevel in order to start"
- elog "needed services."
- elog "To use the VirtualBox X driver, use the following"
- elog "file as your /etc/X11/xorg.conf:"
- elog " /usr/share/doc/${PF}/xorg.conf.vbox"
- elog ""
- elog "Also make sure you use the Mesa library for OpenGL:"
- elog " eselect opengl set xorg-x11"
- elog ""
- elog "An autostart .desktop file has been installed to start"
- elog "VBoxClient in desktop sessions."
- elog ""
- elog "You can mount shared folders with:"
- elog " mount -t vboxsf <shared_folder_name> <mount_point>"
- 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-4.2.10.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.14.ebuild
index 507c9093f3f0..d4060a130eec 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.10.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.14.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2013 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-4.2.10.ebuild,v 1.2 2013/06/18 12:19:35 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.14.ebuild,v 1.1 2013/06/24 10:58:49 polynomial-c Exp $
-EAPI=2
+EAPI=5
-inherit eutils linux-mod user
+inherit eutils linux-mod systemd user
MY_PV="${PV/beta/BETA}"
MY_PV="${PV/rc/RC}"
@@ -102,15 +102,13 @@ src_compile() {
/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"
+ KBUILD_PATH="${S}/kBuild"
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"
+ KBUILD_PATH="${S}/kBuild"
fi
# Now creating the kernel modules. We must do this _after_
@@ -164,6 +162,8 @@ src_install() {
# sample xorg.conf
insinto /usr/share/doc/${PF}
doins "${FILESDIR}"/xorg.conf.vbox
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
}
pkg_postinst() {