From: Lars Wendler <polynomial-c@gentoo.org>
Date: Tue, 4 Oct 2011 18:02:03 +0000 (+0000)
Subject: Version bump (bug #385577). Removed old
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=7dd0c7f4a72b589e12b3871763195f518f6839fc;p=gentoo.git

Version bump (bug #385577). Removed old

Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64
---

diff --git a/app-emulation/virtualbox-additions/ChangeLog b/app-emulation/virtualbox-additions/ChangeLog
index 14e4e98c0a62..2d5d3ab02977 100644
--- a/app-emulation/virtualbox-additions/ChangeLog
+++ b/app-emulation/virtualbox-additions/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/virtualbox-additions
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/ChangeLog,v 1.34 2011/08/17 23:36:28 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/ChangeLog,v 1.35 2011/10/04 17:57:47 polynomial-c Exp $
+
+*virtualbox-additions-4.1.4 (04 Oct 2011)
+
+  04 Oct 2011; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-additions-4.1.0.ebuild, +virtualbox-additions-4.1.4.ebuild:
+  Version bump. Thanks to Christian Inci who reported this in bug #385577.
+  Removed old.
 
 *virtualbox-additions-4.1.2 (17 Aug 2011)
 
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.0.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-4.1.4.ebuild
similarity index 89%
rename from app-emulation/virtualbox-additions/virtualbox-additions-4.1.0.ebuild
rename to app-emulation/virtualbox-additions/virtualbox-additions-4.1.4.ebuild
index 9e97b41b67d6..3bcadddbb07a 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.0.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.1.0.ebuild,v 1.1 2011/07/19 22:26:01 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.1.4.ebuild,v 1.1 2011/10/04 17:57:47 polynomial-c Exp $
 
 EAPI=2
 
diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index 154c954c2088..6c0308259891 100644
--- a/app-emulation/virtualbox-bin/ChangeLog
+++ b/app-emulation/virtualbox-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/virtualbox-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.116 2011/08/17 23:35:56 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.117 2011/10/04 17:57:19 polynomial-c Exp $
+
+*virtualbox-bin-4.1.4 (04 Oct 2011)
+
+  04 Oct 2011; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-bin-4.1.0.ebuild, +virtualbox-bin-4.1.4.ebuild:
+  Version bump. Thanks to Christian Inci who reported this in bug #385577.
+  Removed old.
 
 *virtualbox-bin-4.1.2 (17 Aug 2011)
 
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.0.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild
similarity index 99%
rename from app-emulation/virtualbox-bin/virtualbox-bin-4.1.0.ebuild
rename to app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild
index 8493ed32724c..36e471730577 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.0.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.0.ebuild,v 1.1 2011/07/19 22:25:33 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild,v 1.1 2011/10/04 17:57:19 polynomial-c Exp $
 
 EAPI=2
 
 inherit eutils fdo-mime pax-utils
 
-MY_PV=${PV}-73009
+MY_PV=${PV}-74291
 SDK_PV=${MY_PV}
 EXTP_PV=${MY_PV}
 MY_P=VirtualBox-${MY_PV}-Linux
diff --git a/app-emulation/virtualbox-extpack-oracle/ChangeLog b/app-emulation/virtualbox-extpack-oracle/ChangeLog
index fbe4bc3eb868..251c33c282cf 100644
--- a/app-emulation/virtualbox-extpack-oracle/ChangeLog
+++ b/app-emulation/virtualbox-extpack-oracle/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/virtualbox-extpack-oracle
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/ChangeLog,v 1.12 2011/08/17 23:38:27 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/ChangeLog,v 1.13 2011/10/04 17:58:15 polynomial-c Exp $
+
+*virtualbox-extpack-oracle-4.1.4 (04 Oct 2011)
+
+  04 Oct 2011; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-extpack-oracle-4.1.0.ebuild,
+  +virtualbox-extpack-oracle-4.1.4.ebuild:
+  Version bump. Thanks to Christian Inci who reported this in bug #385577.
+  Removed old.
 
 *virtualbox-extpack-oracle-4.1.2 (17 Aug 2011)
 
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.0.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.4.ebuild
similarity index 86%
rename from app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.0.ebuild
rename to app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.4.ebuild
index d3c491ade978..79e9a11a676e 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.0.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.0.ebuild,v 1.1 2011/07/19 22:26:30 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.4.ebuild,v 1.1 2011/10/04 17:58:15 polynomial-c Exp $
 
 EAPI=2
 
 inherit eutils
 
-MY_BUILD="73009"
+MY_BUILD="74291"
 MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
 MY_P="${MY_PN}-${PV}-${MY_BUILD}"
 
diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index 369ca1710e7b..7a6f2b3b2a77 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.79 2011/09/01 08:19:29 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.80 2011/10/04 18:02:03 polynomial-c Exp $
+
+*virtualbox-guest-additions-4.1.4 (04 Oct 2011)
+
+  04 Oct 2011; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-guest-additions-4.1.0.ebuild,
+  +virtualbox-guest-additions-4.1.4.ebuild:
+  Version bump. Thanks to Christian Inci who reported this in bug #385577.
+  Removed old.
 
   01 Sep 2011; Lars Wendler <polynomial-c@gentoo.org>
   virtualbox-guest-additions-4.1.0.ebuild:
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.0.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.4.ebuild
similarity index 97%
rename from app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.0.ebuild
rename to app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.4.ebuild
index b3a781f71908..c23cebb7d872 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.0.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.0.ebuild,v 1.2 2011/09/01 08:19:29 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.4.ebuild,v 1.1 2011/10/04 18:02:03 polynomial-c Exp $
 
 EAPI=2
 
@@ -29,7 +29,7 @@ RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
 			 x11-libs/libSM
 			 x11-libs/libICE )"
 DEPEND="${RDEPEND}
-		=dev-util/kbuild-0.1.5*
+		>=dev-util/kbuild-0.1.999
 		>=dev-lang/yasm-0.6.2
 		sys-devel/bin86
 		sys-devel/dev86
diff --git a/app-emulation/virtualbox-modules/ChangeLog b/app-emulation/virtualbox-modules/ChangeLog
index e3fae77b69ab..e093fd67398c 100644
--- a/app-emulation/virtualbox-modules/ChangeLog
+++ b/app-emulation/virtualbox-modules/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/virtualbox-modules
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.89 2011/08/17 23:34:38 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.90 2011/10/04 17:56:11 polynomial-c Exp $
+
+*virtualbox-modules-4.1.4 (04 Oct 2011)
+
+  04 Oct 2011; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-modules-4.1.0-r1.ebuild,
+  -files/virtualbox-modules-4.1.0-vboxbug9305.patch,
+  virtualbox-modules-4.1.2.ebuild, +virtualbox-modules-4.1.4.ebuild:
+  Version bump. Thanks to Christian Inci who reported this in bug #385577.
+  Removed old.
 
 *virtualbox-modules-4.1.2 (17 Aug 2011)
 
diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.0-vboxbug9305.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.0-vboxbug9305.patch
deleted file mode 100644
index be0f5d91d752..000000000000
--- a/app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.0-vboxbug9305.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vboxdrv/r0drv/linux/mpnotification-r0drv-linux.c	(revision 73209)
-+++ vboxdrv/r0drv/linux/mpnotification-r0drv-linux.c	(revision 73210)
-@@ -77,7 +77,7 @@
-  * @param pvUser2           The notification event.
-  * @remarks This can be invoked in interrupt context.
-  */
--static void rtMpNotificationLinuxOnCurrentCpu(RTCPUID idCpu, void *pvUser1, void *pvUser2)
-+static DECLCALLBACK(void) rtMpNotificationLinuxOnCurrentCpu(RTCPUID idCpu, void *pvUser1, void *pvUser2)
- {
-     unsigned long ulNativeEvent = *(unsigned long *)pvUser2;
-     NOREF(pvUser1);
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.2.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.2.ebuild
index 1fae61094275..7c5b7f3c8595 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.2.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.2.ebuild,v 1.1 2011/08/17 23:34:38 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.2.ebuild,v 1.2 2011/10/04 17:56:11 polynomial-c Exp $
 
 # XXX: the tarball here is just the kernel modules split out of the binary
 #      package that comes from virtualbox-bin
@@ -28,8 +28,6 @@ BUILD_TARGET_ARCH="${ARCH}"
 MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
 
 pkg_setup() {
-	# check for kernel options to support PCI passthrough (since 2.6.31)
-	CONFIG_CHECK="~IOMMU_SUPPORT ~DMAR ~PCI_STUB"
 	linux-mod_pkg_setup
 
 	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.0-r1.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild
similarity index 92%
rename from app-emulation/virtualbox-modules/virtualbox-modules-4.1.0-r1.ebuild
rename to app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild
index 48e4b98944f2..124b5c76d241 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.0-r1.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.0-r1.ebuild,v 1.1 2011/08/07 11:18:29 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild,v 1.1 2011/10/04 17:56:11 polynomial-c Exp $
 
 # XXX: the tarball here is just the kernel modules split out of the binary
 #      package that comes from virtualbox-bin
@@ -29,13 +29,12 @@ MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vbo
 
 pkg_setup() {
 	linux-mod_pkg_setup
+
 	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
 	enewgroup vboxusers
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-vboxbug9305.patch
-
 	if kernel_is -ge 2 6 33 ; then
 		# evil patch for new kernels - header moved
 		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index a919149fb8f2..823d3add3762 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/virtualbox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.84 2011/09/01 08:06:53 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.85 2011/10/04 18:00:30 polynomial-c Exp $
+
+*virtualbox-4.1.4 (04 Oct 2011)
+
+  04 Oct 2011; Lars Wendler <polynomial-c@gentoo.org> -virtualbox-4.1.0.ebuild,
+  +virtualbox-4.1.4.ebuild, +files/virtualbox-4.1.4-asneeded.patch:
+  Version bump. Thanks to Christian Inci who reported this in bug #385577.
+  Removed old.
 
   01 Sep 2011; Lars Wendler <polynomial-c@gentoo.org> virtualbox-4.1.0.ebuild:
   Again fixed dependency on kbuild. Thanks to Karel De Vriendt for reporting
diff --git a/app-emulation/virtualbox/files/virtualbox-4.1.4-asneeded.patch b/app-emulation/virtualbox/files/virtualbox-4.1.4-asneeded.patch
new file mode 100644
index 000000000000..003dc5db6978
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-4.1.4-asneeded.patch
@@ -0,0 +1,26 @@
+--- VirtualBox-4.1.4_OSE/Config.kmk
++++ VirtualBox-4.1.4_OSE/Config.kmk
+@@ -4263,7 +4263,7 @@
+ TEMPLATE_VBOXBLDPROG_LDFLAGS.amd64       = -m64
+ TEMPLATE_VBOXBLDPROG_LDFLAGS.sparc64     = -m64
+  ifeq ($(KBUILD_HOST),linux)
+-TEMPLATE_VBOXBLDPROG_LIBS                = pthread m rt dl
++TEMPLATE_VBOXBLDPROG_LIBS                = pthread m rt dl crypt
+  else ifeq ($(KBUILD_HOST),os2)
+ TEMPLATE_VBOXBLDPROG_TOOL                = GXX3OMF
+ TEMPLATE_VBOXBLDPROG_LIBS                = socket iconv
+--- VirtualBox-4.1.4_OSE/src/libs/xpcom18a4/Makefile.kmk
++++ VirtualBox-4.1.4_OSE/src/libs/xpcom18a4/Makefile.kmk
+@@ -469,10 +469,10 @@
+  libIDL_config_cflags := $(shell $(VBOX_LIBIDL_CONFIG) --cflags)
+  libIDL_config_libs   := $(shell $(VBOX_LIBIDL_CONFIG) --libs)
+  xpidl_CFLAGS = \
+-	$(libIDL_config_cflags)
++	$(shell pkg-config --cflags libIDL-2.0)
+  ifeq ($(BUILD_PLATFORM),linux)
+  xpidl_LDFLAGS = \
+-	$(filter-out -l%,$(libIDL_config_libs))
++	$(filter-out -l%,$(shell pkg-config --libs-only-L libIDL-2.0))
+  else
+  xpidl_LDFLAGS = \
+ 	$(libIDL_config_libs)
diff --git a/app-emulation/virtualbox/virtualbox-4.1.0.ebuild b/app-emulation/virtualbox/virtualbox-4.1.4.ebuild
similarity index 98%
rename from app-emulation/virtualbox/virtualbox-4.1.0.ebuild
rename to app-emulation/virtualbox/virtualbox-4.1.4.ebuild
index fa1e5c6e5d41..e0767184908a 100644
--- a/app-emulation/virtualbox/virtualbox-4.1.0.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.0.ebuild,v 1.4 2011/09/01 08:06:53 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.4.ebuild,v 1.1 2011/10/04 18:00:30 polynomial-c Exp $
 
 EAPI=4
 
@@ -50,7 +50,7 @@ RDEPEND="!app-emulation/virtualbox-bin
 	vnc? ( >=net-libs/libvncserver-0.9.7 )
 	java? ( >=virtual/jre-1.5 )"
 DEPEND="${RDEPEND}
-	=dev-util/kbuild-0.1.5*
+	>=dev-util/kbuild-0.1.999
 	>=dev-lang/yasm-0.6.2
 	sys-devel/bin86
 	sys-devel/dev86
@@ -151,7 +151,7 @@ src_prepare() {
 		"${FILESDIR}/${PN}-4-mkisofs-check.patch"
 
 	# fix build with --as-needed (bug #249295 and bug #350907)
-	epatch "${FILESDIR}/${PN}-4-asneeded.patch"
+	epatch "${FILESDIR}/${PN}-4.1.4-asneeded.patch"
 
 	# Respect LDFLAGS
 	sed -e "s/_LDFLAGS\.${ARCH}*.*=/& ${LDFLAGS}/g" \
@@ -160,7 +160,8 @@ src_prepare() {
 	# We still want to use ${HOME}/.VirtualBox/Machines as machines dir.
 	epatch "${FILESDIR}/${PN}-4.0.2-restore_old_machines_dir.patch"
 
-	epatch "${FILESDIR}"/${P}-vboxpci-build.patch
+	# Don't build vboxpci.ko module (D'oh!)
+	epatch "${FILESDIR}"/${PN}-4.1.2-vboxpci-build.patch
 
 	# add correct java path
 	if use java ; then