Version bump and minor bugfixes

(Portage version: 2.1.2.2)

7 files changed, 119 insertions, 73 deletions

diff --git a/app-emulation/virtualbox-modules/ChangeLog b/app-emulation/virtualbox-modules/ChangeLog
index a0bb34547130..b2f8efabbd5b 100644
--- a/app-emulation/virtualbox-modules/ChangeLog
+++ b/app-emulation/virtualbox-modules/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/virtualbox-modules
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.1 2007/02/28 18:34:32 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.2 2007/03/16 22:02:35 jokey Exp $
+
+*virtualbox-modules-1.3.8 (16 Mar 2007)
+*virtualbox-modules-1.3.6-r1 (16 Mar 2007)
+
+  16 Mar 2007; Markus Ullmann <jokey@gentoo.org>
+  -virtualbox-modules-1.3.6.ebuild, +virtualbox-modules-1.3.6-r1.ebuild,
+  +virtualbox-modules-1.3.8.ebuild:
+  Version bump and minor bugfixes
 
 *virtualbox-modules-1.3.6 (28 Feb 2007)
 
diff --git a/app-emulation/virtualbox-modules/files/digest-virtualbox-modules-1.3.6 b/app-emulation/virtualbox-modules/files/digest-virtualbox-modules-1.3.6
deleted file mode 100644
index ec272bc5bd57..000000000000
--- a/app-emulation/virtualbox-modules/files/digest-virtualbox-modules-1.3.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 70c24ccee8b5778efd8d22f9996fbec9 VirtualBox-OSE-1.3.6.tar.bz2 17458095
-RMD160 f082f6397ceec0d0d543b155821592e6032affc3 VirtualBox-OSE-1.3.6.tar.bz2 17458095
-SHA256 e249c6f4792291e56e026cf9d807d355809283538cfa296b4e72f9ec1c71cdae VirtualBox-OSE-1.3.6.tar.bz2 17458095
diff --git a/app-emulation/virtualbox-modules/files/digest-virtualbox-modules-1.3.6-r1 b/app-emulation/virtualbox-modules/files/digest-virtualbox-modules-1.3.6-r1
new file mode 100644
index 000000000000..41511804c7f5
--- /dev/null
+++ b/app-emulation/virtualbox-modules/files/digest-virtualbox-modules-1.3.6-r1
@@ -0,0 +1,3 @@
+MD5 bdc996130643759c096d7731b1a7c43a vbox-kernel-module-src-1.3.6.tar.bz2 117772
+RMD160 b9b62eefd1a261f6c6368e7c5ab181924f174072 vbox-kernel-module-src-1.3.6.tar.bz2 117772
+SHA256 f1427f8caff720da82bd14bd5b66d07d507e83095f284e3d1cc45de0b7af7a43 vbox-kernel-module-src-1.3.6.tar.bz2 117772
diff --git a/app-emulation/virtualbox-modules/files/digest-virtualbox-modules-1.3.8 b/app-emulation/virtualbox-modules/files/digest-virtualbox-modules-1.3.8
new file mode 100644
index 000000000000..68a7b29065bb
--- /dev/null
+++ b/app-emulation/virtualbox-modules/files/digest-virtualbox-modules-1.3.8
@@ -0,0 +1,3 @@
+MD5 8e0c05299f777e0180000557af69de2f vbox-kernel-module-src-1.3.8.tar.bz2 117765
+RMD160 54b875840c9851f23823dbffb6d84334615932e8 vbox-kernel-module-src-1.3.8.tar.bz2 117765
+SHA256 1f86a10099272221b996ee73b098f8176bd44a9d487175a023511fb23711a8f8 vbox-kernel-module-src-1.3.8.tar.bz2 117765
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-1.3.6-r1.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-1.3.6-r1.ebuild
new file mode 100644
index 000000000000..1fc2c4b3cb6e
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-1.3.6-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header $
+
+inherit eutils linux-mod
+
+MY_P=vbox-kernel-module-src-${PV}
+DESCRIPTION="Modules for Virtualbox OSE"
+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=""
+
+RDEPEND="!<app-emulation/virtualbox-bin-1.3.6
+	!<app-emulation/virtualbox-1.3.6
+	!=app-emulation/virtualbox-9999"
+
+S=${WORKDIR}/src
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxdrv(misc:${S})"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	# udev rule for vboxdrv
+	dodir /etc/udev/rules.d
+	echo 'KERNEL=="vboxdrv", GROUP="vboxusers" MODE=660' >> "${D}/etc/udev/rules.d/60-virtualbox.rules"
+}
+
+pkg_preinst() {
+	enewgroup vboxusers
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	if use amd64; then
+		elog ""
+		elog "To avoid the nmi_watchdog bug and load the vboxdrv module"
+		elog "you may need to update your bootloader configuration and pass the option:"
+		elog "nmi_watchdog=0"
+	fi
+}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-1.3.6.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-1.3.6.ebuild
deleted file mode 100644
index 085b0fdf45d3..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-1.3.6.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header $
-
-inherit eutils linux-mod
-
-MY_P=VirtualBox-OSE-${PV}
-DESCRIPTION="Modules for Virtualbox OSE"
-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=""
-
-RDEPEND="!<app-emulation/virtualbox-bin-1.3.6
-	!<app-emulation/virtualbox-1.3.6
-	!=app-emulation/virtualbox-9999"
-
-S=${WORKDIR}/${MY_P}
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxdrv(misc:${S}/src/VBox/HostDrivers/Support:${S}/src/VBox/HostDrivers/Support"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
-}
-
-src_unpack() {
-	unpack "${A}"
-
-	# Collect all the needed files for the kernel module
-	cp -R "${S}"/src/VBox/Runtime/alloc "${S}"/src/VBox/HostDrivers/Support/
-	mv "${S}"/src/VBox/HostDrivers/Support/alloc/heapsimple.cpp "${S}"/src/VBox/HostDrivers/Support/alloc/heapsimple.c
-	mkdir -p "${S}"/src/VBox/HostDrivers/Support/include/
-	cp -R "${S}"/include/iprt "${S}"/src/VBox/HostDrivers/Support/include/
-	cp -R "${S}"/include/VBox "${S}"/src/VBox/HostDrivers/Support/include/
-	cp -R "${S}"/src/VBox/Runtime/include/internal "${S}"/src/VBox/HostDrivers/Support/include/
-	cp -R "${S}"/src/VBox/Runtime/r0drv "${S}"/src/VBox/HostDrivers/Support/
-	mv "${S}"/src/VBox/HostDrivers/Support/r0drv/alloc-r0drv.cpp "${S}"/src/VBox/HostDrivers/Support/r0drv/alloc-r0drv.c
-	mv "${S}"/src/VBox/HostDrivers/Support/r0drv/initterm-r0drv.cpp "${S}"/src/VBox/HostDrivers/Support/r0drv/initterm-r0drv.c
-
-	# Use the proper Makefile
-	mv "${S}"/src/VBox/HostDrivers/Support/linux/Makefile "${S}"/src/VBox/HostDrivers/Support/
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# udev rule for vboxdrv
-	dodir /etc/udev/rules.d
-	echo 'KERNEL=="vboxdrv", GROUP="vboxusers" MODE=660' >> "${D}/etc/udev/rules.d/60-virtualbox.rules"
-}
-
-pkg_preinst() {
-	enewgroup vboxusers
-}
-
-pkg_postinst() {
-	if use amd64; then
-		elog ""
-		elog "To avoid the nmi_watchdog bug and load the vboxdrv module"
-		elog "you may need to update your bootloader configuration and pass the option:"
-		elog "nmi_watchdog=0"
-	fi
-}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-1.3.8.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-1.3.8.ebuild
new file mode 100644
index 000000000000..47ae9c4941f6
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-1.3.8.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header $
+
+inherit eutils linux-mod
+
+MY_P=vbox-kernel-module-src-${PV}
+DESCRIPTION="Modules for Virtualbox OSE"
+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=""
+
+RDEPEND="!<app-emulation/virtualbox-bin-1.3.6
+	!<app-emulation/virtualbox-1.3.6
+	!=app-emulation/virtualbox-9999"
+
+S=${WORKDIR}/vboxdrv-${PV}
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxdrv(misc:${S})"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	# udev rule for vboxdrv
+	dodir /etc/udev/rules.d
+	echo 'KERNEL=="vboxdrv", GROUP="vboxusers" MODE=660' >> "${D}/etc/udev/rules.d/60-virtualbox.rules"
+}
+
+pkg_preinst() {
+	enewgroup vboxusers
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	if use amd64; then
+		elog ""
+		elog "To avoid the nmi_watchdog bug and load the vboxdrv module"
+		elog "you may need to update your bootloader configuration and pass the option:"
+		elog "nmi_watchdog=0"
+	fi
+}