| 1 |
commit: fd3837fde30ac9f5f6c186ab82334f04a7db0cea |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 16 13:10:29 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 16 13:12:12 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd3837fd |
| 7 |
|
| 8 |
app-emulation/virtualbox-modules: Replaced epatch with eapply. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 11 |
|
| 12 |
.../files/virtualbox-modules-4.1.4-pax-const.patch | 20 ++++++++------------ |
| 13 |
.../virtualbox-modules-5.1.32.ebuild | 4 ++-- |
| 14 |
.../virtualbox-modules-5.2.6.ebuild | 2 +- |
| 15 |
3 files changed, 11 insertions(+), 15 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.4-pax-const.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.4-pax-const.patch |
| 18 |
index 4e4cde06c78..f9878848ae1 100644 |
| 19 |
--- a/app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.4-pax-const.patch |
| 20 |
+++ b/app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.4-pax-const.patch |
| 21 |
@@ -1,6 +1,5 @@ |
| 22 |
-diff -urp vboxdrv.orig/SUPDrvIDC.h vboxdrv/SUPDrvIDC.h |
| 23 |
---- vboxdrv.orig/SUPDrvIDC.h 2011-09-06 15:53:27.852567531 +0200 |
| 24 |
-+++ vboxdrv/SUPDrvIDC.h 2011-09-06 15:54:05.420565524 +0200 |
| 25 |
+--- vboxdrv/SUPDrvIDC.h |
| 26 |
++++ vboxdrv/SUPDrvIDC.h |
| 27 |
@@ -160,7 +160,7 @@ typedef struct SUPDRVIDCREQGETSYM |
| 28 |
{ |
| 29 |
/** The symbol address. */ |
| 30 |
@@ -10,9 +9,8 @@ diff -urp vboxdrv.orig/SUPDrvIDC.h vboxdrv/SUPDrvIDC.h |
| 31 |
} u; |
| 32 |
} SUPDRVIDCREQGETSYM; |
| 33 |
/** Pointer to a SUPDRV IDC get symbol request. */ |
| 34 |
-diff -urp vboxnetflt.orig/include/VBox/intnet.h vboxnetflt/include/VBox/intnet.h |
| 35 |
---- vboxnetflt.orig/include/VBox/intnet.h 2011-09-06 15:53:27.852567531 +0200 |
| 36 |
-+++ vboxnetflt/include/VBox/intnet.h 2011-09-06 15:54:05.424565524 +0200 |
| 37 |
+--- vboxnetflt/include/VBox/intnet.h |
| 38 |
++++ vboxnetflt/include/VBox/intnet.h |
| 39 |
@@ -783,7 +783,7 @@ typedef struct INTNETTRUNKFACTORY |
| 40 |
DECLR0CALLBACKMEMBER(int, pfnCreateAndConnect,(struct INTNETTRUNKFACTORY *pIfFactory, const char *pszName, |
| 41 |
PINTNETTRUNKSWPORT pSwitchPort, uint32_t fFlags, |
| 42 |
@@ -22,9 +20,8 @@ diff -urp vboxnetflt.orig/include/VBox/intnet.h vboxnetflt/include/VBox/intnet.h |
| 43 |
/** Pointer to the trunk factory. */ |
| 44 |
typedef INTNETTRUNKFACTORY *PINTNETTRUNKFACTORY; |
| 45 |
|
| 46 |
-diff -urp vboxnetflt.orig/linux/VBoxNetFlt-linux.c vboxnetflt/linux/VBoxNetFlt-linux.c |
| 47 |
---- vboxnetflt.orig/linux/VBoxNetFlt-linux.c 2011-07-19 12:15:22.000000000 +0200 |
| 48 |
-+++ vboxnetflt/linux/VBoxNetFlt-linux.c 2011-09-06 15:56:00.516559379 +0200 |
| 49 |
+--- vboxnetflt/linux/VBoxNetFlt-linux.c |
| 50 |
++++ vboxnetflt/linux/VBoxNetFlt-linux.c |
| 51 |
@@ -840,7 +840,7 @@ typedef struct ethtool_ops OVR_OPSTYPE; |
| 52 |
|
| 53 |
# else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) */ |
| 54 |
@@ -34,9 +31,8 @@ diff -urp vboxnetflt.orig/linux/VBoxNetFlt-linux.c vboxnetflt/linux/VBoxNetFlt-l |
| 55 |
# define OVR_OPS netdev_ops |
| 56 |
# define OVR_XMIT pOrgOps->ndo_start_xmit |
| 57 |
|
| 58 |
-diff -urp vboxpci.orig/include/VBox/rawpci.h vboxpci/include/VBox/rawpci.h |
| 59 |
---- vboxpci.orig/include/VBox/rawpci.h 2011-04-18 17:01:12.000000000 +0200 |
| 60 |
-+++ vboxpci/include/VBox/rawpci.h 2011-09-06 15:57:17.340555277 +0200 |
| 61 |
+--- vboxpci/include/VBox/rawpci.h |
| 62 |
++++ vboxpci/include/VBox/rawpci.h |
| 63 |
@@ -545,7 +545,7 @@ typedef struct RAWPCIFACTORY |
| 64 |
DECLR0CALLBACKMEMBER(void, pfnDeinitVm,(PRAWPCIFACTORY pFactory, |
| 65 |
PVM pVM, |
| 66 |
|
| 67 |
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.32.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.32.ebuild |
| 68 |
index 065ee901081..c0d163e68ee 100644 |
| 69 |
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.32.ebuild |
| 70 |
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.32.ebuild |
| 71 |
@@ -44,11 +44,11 @@ src_prepare() { |
| 72 |
fi |
| 73 |
|
| 74 |
if use pax_kernel && kernel_is -ge 3 0 0 ; then |
| 75 |
- epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch |
| 76 |
+ eapply "${FILESDIR}"/${PN}-4.1.4-pax-const.patch |
| 77 |
fi |
| 78 |
|
| 79 |
if kernel_is -ge 4 14 0 ; then |
| 80 |
- epatch "${FILESDIR}"/${PN}-5.1.30-udp.patch |
| 81 |
+ eapply "${FILESDIR}"/${PN}-5.1.30-udp.patch |
| 82 |
fi |
| 83 |
|
| 84 |
default |
| 85 |
|
| 86 |
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.6.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.6.ebuild |
| 87 |
index 212a1449e0e..9ff1abb8099 100644 |
| 88 |
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.6.ebuild |
| 89 |
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.6.ebuild |
| 90 |
@@ -39,7 +39,7 @@ pkg_setup() { |
| 91 |
|
| 92 |
src_prepare() { |
| 93 |
if use pax_kernel && kernel_is -ge 3 0 0 ; then |
| 94 |
- epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch |
| 95 |
+ eapply "${FILESDIR}"/${PN}-4.1.4-pax-const.patch |
| 96 |
fi |
| 97 |
|
| 98 |
default |
Archives