Version bump (bug #540128). Removed old

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

3 files changed, 21 insertions, 174 deletions

diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index 59fa3e8d4a0a..41ebb91d3dd0 100644
--- a/x11-drivers/xf86-video-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-video-virtualbox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-virtualbox
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.145 2014/12/22 13:12:45 polynomial-c Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.146 2015/03/04 07:11:16 polynomial-c Exp $
+
+*xf86-video-virtualbox-4.3.24 (04 Mar 2015)
+
+  04 Mar 2015; Lars Wendler <polynomial-c@gentoo.org>
+  -xf86-video-virtualbox-4.2.24.ebuild, -xf86-video-virtualbox-4.2.26.ebuild,
+  +xf86-video-virtualbox-4.3.24.ebuild:
+  Version bump (bug #540128). Removed old.
 
   22 Dec 2014; Lars Wendler <polynomial-c@gentoo.org>
   -xf86-video-virtualbox-4.3.16.ebuild, xf86-video-virtualbox-4.3.18.ebuild:
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.24.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.24.ebuild
deleted file mode 100644
index e6133ec6086f..000000000000
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.24.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.24.ebuild,v 1.3 2014/06/08 09:44:31 ago Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils linux-mod multilib python-single-r1 versionator toolchain-funcs
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-DESCRIPTION="VirtualBox video driver"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dri"
-
-RDEPEND=">=x11-base/xorg-server-1.7:=[-minimal]
-	x11-libs/libXcomposite"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20120806
-	${PYTHON_DEPS}
-	>=dev-lang/yasm-0.6.2
-	sys-power/iasl
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/resourceproto
-	x11-proto/scrnsaverproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	x11-libs/libXdmcp
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXfixes
-	x11-libs/libXext
-	dri? (  x11-proto/xf86driproto
-		>=x11-libs/libdrm-2.4.5 )"
-
-REQUIRED_USE=( "${PYTHON_REQUIRED_USE}" )
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxvideo(misc:${WORKDIR}/vboxvideo_drm:${WORKDIR}/vboxvideo_drm)"
-
-S="${WORKDIR}/${MY_P}"
-
-QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Prepare the vboxvideo_drm sources and Makefile in ${WORKDIR}
-	cp -a "${S}"/src/VBox/Additions/linux/drm "${WORKDIR}/vboxvideo_drm" \
-		|| die "cannot copy vboxvideo_drm directory"
-	cp "${FILESDIR}/${PN}-3-vboxvideo_drm.makefile" \
-		"${WORKDIR}/vboxvideo_drm/Makefile" \
-			|| die "cannot copy vboxvideo_drm Makefile"
-
-	# stupid new header references...
-	for vboxheader in {product,version}-generated.h ; do
-		ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
-			"${WORKDIR}/vboxvideo_drm/${vboxheader}"
-	done
-
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -rf kBuild/bin tools
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
-
-	# Ugly hack to build the opengl part of the video driver
-	epatch "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
-
-	# unset useless/problematic checks in configure
-	epatch "${FILESDIR}/${PN}-3.2.8-mesa-check.patch" \
-		"${FILESDIR}/${PN}-4-makeself-check.patch" \
-		"${FILESDIR}/${PN}-4-mkisofs-check.patch"
-
-	# Patch to link with lazy on hardened #394757
-	if gcc-specs-now ; then
-		epatch "${FILESDIR}/${PN}-link-lazy.patch"
-	fi
-}
-
-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"
-	source ./env.sh
-}
-
-src_compile() {
-	for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \
-		/src/VBox/{GuestHost/OpenGL,Additions/x11/x11stubs,Additions/common/crOpenGL} \
-		/src/VBox/Additions/x11/vboxvideo ; do
-			cd "${S}"${each}
-			MAKE="kmk" emake TOOL_YASM_AS=yasm \
-			VBOX_USE_SYSTEM_XORG_HEADERS=1 \
-			KBUILD_PATH="${S}/kBuild" \
-			KBUILD_VERBOSE=2
-	done
-
-	if use dri; then
-		# 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
-	fi
-}
-
-src_install() {
-	if use dri; then
-		linux-mod_src_install
-	fi
-
-	cd "${S}/out/linux.${ARCH}/release/bin/additions"
-	insinto /usr/$(get_libdir)/xorg/modules/drivers
-	newins vboxvideo_drv_system.so vboxvideo_drv.so
-
-	# Guest OpenGL driver
-	insinto /usr/$(get_libdir)
-	doins -r VBoxOGL*
-
-	if use dri ; then
-		dosym /usr/$(get_libdir)/VBoxOGL.so /usr/$(get_libdir)/dri/vboxvideo_dri.so
-	fi
-}
-
-pkg_postinst() {
-	elog "You need to edit the file /etc/X11/xorg.conf and set:"
-	elog ""
-	elog "  Driver  \"vboxvideo\""
-	elog ""
-	elog "in the Graphics device section (Section \"Device\")"
-	elog ""
-	if use dri; then
-		elog "To use the kernel drm video driver, please add:"
-		elog "\"vboxvideo\" to:"
-		if has_version sys-apps/openrc ; then
-			elog "/etc/conf.d/modules"
-		else
-			elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
-		fi
-		elog ""
-	fi
-}
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.26.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.24.ebuild
index 2f6a836944c6..b157e6dcec59 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.26.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.24.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.26.ebuild,v 1.1 2014/07/18 13:52:43 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.24.ebuild,v 1.1 2015/03/04 07:11:16 polynomial-c Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit eutils linux-mod multilib python-single-r1 versionator toolchain-funcs
 
 MY_PV="${PV/beta/BETA}"
-MY_PV="${PV/rc/RC}"
+MY_PV="${MY_PV/rc/RC}"
 MY_P=VirtualBox-${MY_PV}
 DESCRIPTION="VirtualBox video driver"
 HOMEPAGE="http://www.virtualbox.org/"
@@ -22,7 +22,7 @@ IUSE="dri"
 RDEPEND=">=x11-base/xorg-server-1.7:=[-minimal]
 	x11-libs/libXcomposite"
 DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20120806
+	>=dev-util/kbuild-0.1.9998_pre20131130
 	${PYTHON_DEPS}
 	>=dev-lang/yasm-0.6.2
 	sys-power/iasl
@@ -77,7 +77,7 @@ src_prepare() {
 	rm -rf kBuild/bin tools
 
 	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
+	cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk || die
 
 	# Ugly hack to build the opengl part of the video driver
 	epatch "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
@@ -89,7 +89,7 @@ src_prepare() {
 
 	# Patch to link with lazy on hardened #394757
 	if gcc-specs-now ; then
-		epatch "${FILESDIR}/${PN}-link-lazy.patch"
+		epatch "${FILESDIR}/${PN}-4.3.6-link-lazy.patch"
 	fi
 }
 
@@ -109,14 +109,15 @@ src_compile() {
 	for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \
 		/src/VBox/{GuestHost/OpenGL,Additions/x11/x11stubs,Additions/common/crOpenGL} \
 		/src/VBox/Additions/x11/vboxvideo ; do
-			cd "${S}"${each}
-			MAKE="kmk" emake TOOL_YASM_AS=yasm \
+			cd "${S}"${each} || die
+			MAKE="kmk" \
+			emake TOOL_YASM_AS=yasm \
 			VBOX_USE_SYSTEM_XORG_HEADERS=1 \
 			KBUILD_PATH="${S}/kBuild" \
 			KBUILD_VERBOSE=2
 	done
 
-	if use dri; then
+	if use dri ; then
 		# 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)
@@ -138,7 +139,8 @@ src_install() {
 	doins -r VBoxOGL*
 
 	if use dri ; then
-		dosym /usr/$(get_libdir)/VBoxOGL.so /usr/$(get_libdir)/dri/vboxvideo_dri.so
+		dosym /usr/$(get_libdir)/VBoxOGL.so \
+			/usr/$(get_libdir)/dri/vboxvideo_dri.so
 	fi
 }