Adjust blockers for renaming

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo i686)

8 files changed, 14 insertions, 189 deletions

diff --git a/app-emulation/virtualbox-modules/ChangeLog b/app-emulation/virtualbox-modules/ChangeLog
index 6a7a9d9d6739..8762b72e2107 100644
--- a/app-emulation/virtualbox-modules/ChangeLog
+++ b/app-emulation/virtualbox-modules/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/virtualbox-modules
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.20 2008/08/10 14:31:29 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.21 2008/08/27 12:32:54 jokey Exp $
+
+  27 Aug 2008; Markus Ullmann <jokey@gentoo.org>
+  -files/virtualbox-modules_2.6.24.patch,
+  -virtualbox-modules-1.5.2-r1.ebuild, -virtualbox-modules-1.5.4.ebuild,
+  -virtualbox-modules-1.5.6.ebuild, virtualbox-modules-1.5.7.ebuild,
+  virtualbox-modules-1.6.2.ebuild, virtualbox-modules-1.6.4.ebuild:
+  Adjust blockers for renaming
 
 *virtualbox-modules-1.6.4 (10 Aug 2008)
 
diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules_2.6.24.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules_2.6.24.patch
deleted file mode 100644
index 599a1d4b7d7b..000000000000
--- a/app-emulation/virtualbox-modules/files/virtualbox-modules_2.6.24.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Index: include/iprt/types.h
-===================================================================
---- include/iprt/types.h	(revision 5703)
-+++ include/iprt/types.h	(revision 5704)
-@@ -58,8 +58,9 @@
-     /*
-      * Kludge for the linux kernel:
-      *   1. sys/types.h doesn't mix with the kernel.
--     *   2. Starting with 2.6.19 linux/types.h typedefs bool and linux/stddef.h
-+     *   2. Starting with 2.6.19, linux/types.h typedefs bool and linux/stddef.h
-      *      declares false and true as enum values.
-+     *   3. Starting with 2.6.24, linux/types.h typedefs uintptr_t.
-      * We work around these issues here and nowhere else.
-      */
- #  include <stddef.h>
-@@ -69,8 +70,10 @@
- #  define bool linux_bool
- #  define true linux_true
- #  define false linux_false
-+#  define uintptr_t linux_uintptr_t
- #  include <linux/types.h>
- #  include <linux/stddef.h>
-+#  undef uintptr_t
- #  undef false
- #  undef true
- #  undef bool
-Index: include/iprt/types.h
-===================================================================
---- include/iprt/types.h	(revision 5764)
-+++ include/iprt/types.h	(revision 5765)
-@@ -71,6 +71,7 @@
- #  define true linux_true
- #  define false linux_false
- #  define uintptr_t linux_uintptr_t
-+#  include <linux/autoconf.h>
- #  include <linux/types.h>
- #  include <linux/stddef.h>
- #  undef uintptr_t
-Index: Config.kmk
-===================================================================
---- Config.kmk	(revision 5764)
-+++ Config.kmk	(revision 5765)
-@@ -1263,7 +1263,7 @@
-    kernelpath := $(VBOX_LINUX_SRC)
-   endif
-   ifeq ($(BUILD_TARGET_ARCH),x86)
--    VBOX_LINUX_INCS                += $(kernelpath)/include/asm-i386/mach-default
-+    VBOX_LINUX_INCS                += $(kernelpath)/include/asm/mach-default
-   endif
-  endif
- endif
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-1.5.2-r1.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-1.5.2-r1.ebuild
deleted file mode 100644
index d58c47420420..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-1.5.2-r1.ebuild,v 1.2 2007/12/06 19:14:10 jokey Exp $
-
-inherit eutils linux-mod linux-info
-
-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.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S=${WORKDIR}/vboxdrv
-
-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}"
-	enewgroup vboxusers
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	if kernel_is 2 6 24 ; then
-		epatch "${FILESDIR}"/${PN}_2.6.24.patch
-	fi
-}
-
-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_postinst() {
-	linux-mod_pkg_postinst
-}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-1.5.4.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-1.5.4.ebuild
deleted file mode 100644
index 5cd98fac0c11..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-1.5.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-1.5.4.ebuild,v 1.3 2008/03/06 16:17:34 angelos Exp $
-
-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.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S=${WORKDIR}/vboxdrv
-
-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}"
-	enewgroup vboxusers
-}
-
-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_postinst() {
-	linux-mod_pkg_postinst
-}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-1.5.6.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-1.5.6.ebuild
deleted file mode 100644
index 872ac6159214..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-1.5.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-1.5.6.ebuild,v 1.1 2008/02/25 21:59:19 flameeyes Exp $
-
-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.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S=${WORKDIR}/vboxdrv
-
-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}"
-	enewgroup vboxusers
-}
-
-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_postinst() {
-	linux-mod_pkg_postinst
-}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-1.5.7.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-1.5.7.ebuild
index 7359ac44344b..6dda8e552bd0 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-1.5.7.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-1.5.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-1.5.7.ebuild,v 1.1 2008/04/21 20:26:19 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-1.5.7.ebuild,v 1.2 2008/08/27 12:32:54 jokey Exp $
 
 inherit eutils linux-mod
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="!=app-emulation/virtualbox-9999"
+RDEPEND="!=app-emulation/virtualbox-ose-9999"
 
 S=${WORKDIR}/vboxdrv
 
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-1.6.2.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-1.6.2.ebuild
index 019646b65c6c..cf45faab0909 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-1.6.2.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-1.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-1.6.2.ebuild,v 1.1 2008/06/13 22:38:33 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-1.6.2.ebuild,v 1.2 2008/08/27 12:32:54 jokey Exp $
 
 inherit eutils linux-mod
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="!=app-emulation/virtualbox-9999"
+RDEPEND="!=app-emulation/virtualbox-ose-9999"
 
 S=${WORKDIR}/vboxdrv
 
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-1.6.4.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-1.6.4.ebuild
index 9239597d66f5..576761b47d8c 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-1.6.4.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-1.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-1.6.4.ebuild,v 1.1 2008/08/10 14:31:29 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-1.6.4.ebuild,v 1.2 2008/08/27 12:32:54 jokey Exp $
 
 inherit eutils linux-mod
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="!=app-emulation/virtualbox-9999"
+RDEPEND="!=app-emulation/virtualbox-ose-9999"
 
 S=${WORKDIR}/vboxdrv