[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/, app-emulation/virtualbox-modules/files/

[Lars Wendler]

commit:     fd3837fde30ac9f5f6c186ab82334f04a7db0cea
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 16 13:10:29 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Feb 16 13:12:12 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd3837fd

app-emulation/virtualbox-modules: Replaced epatch with eapply.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../files/virtualbox-modules-4.1.4-pax-const.patch   | 20 ++++++++------------
 .../virtualbox-modules-5.1.32.ebuild                 |  4 ++--
 .../virtualbox-modules-5.2.6.ebuild                  |  2 +-
 3 files changed, 11 insertions(+), 15 deletions(-)

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
index 4e4cde06c78..f9878848ae1 100644
--- 
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
@@ -1,6 +1,5 @@
-diff -urp vboxdrv.orig/SUPDrvIDC.h vboxdrv/SUPDrvIDC.h
---- vboxdrv.orig/SUPDrvIDC.h   2011-09-06 15:53:27.852567531 +0200
-+++ vboxdrv/SUPDrvIDC.h        2011-09-06 15:54:05.420565524 +0200
+--- vboxdrv/SUPDrvIDC.h
++++ vboxdrv/SUPDrvIDC.h
 @@ -160,7 +160,7 @@ typedef struct SUPDRVIDCREQGETSYM
          {
              /** The symbol address. */
@@ -10,9 +9,8 @@ diff -urp vboxdrv.orig/SUPDrvIDC.h vboxdrv/SUPDrvIDC.h
      } u;
  } SUPDRVIDCREQGETSYM;
  /** Pointer to a SUPDRV IDC get symbol request. */
-diff -urp vboxnetflt.orig/include/VBox/intnet.h 
vboxnetflt/include/VBox/intnet.h
---- vboxnetflt.orig/include/VBox/intnet.h      2011-09-06 15:53:27.852567531 
+0200
-+++ vboxnetflt/include/VBox/intnet.h   2011-09-06 15:54:05.424565524 +0200
+--- vboxnetflt/include/VBox/intnet.h
++++ vboxnetflt/include/VBox/intnet.h
 @@ -783,7 +783,7 @@ typedef struct INTNETTRUNKFACTORY
      DECLR0CALLBACKMEMBER(int, pfnCreateAndConnect,(struct INTNETTRUNKFACTORY 
*pIfFactory, const char *pszName,
                                                     PINTNETTRUNKSWPORT 
pSwitchPort, uint32_t fFlags,
@@ -22,9 +20,8 @@ diff -urp vboxnetflt.orig/include/VBox/intnet.h 
vboxnetflt/include/VBox/intnet.h
  /** Pointer to the trunk factory. */
  typedef INTNETTRUNKFACTORY *PINTNETTRUNKFACTORY;
  
-diff -urp vboxnetflt.orig/linux/VBoxNetFlt-linux.c 
vboxnetflt/linux/VBoxNetFlt-linux.c
---- vboxnetflt.orig/linux/VBoxNetFlt-linux.c   2011-07-19 12:15:22.000000000 
+0200
-+++ vboxnetflt/linux/VBoxNetFlt-linux.c        2011-09-06 15:56:00.516559379 
+0200
+--- vboxnetflt/linux/VBoxNetFlt-linux.c
++++ vboxnetflt/linux/VBoxNetFlt-linux.c
 @@ -840,7 +840,7 @@ typedef struct ethtool_ops OVR_OPSTYPE;
  
  # else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) */
@@ -34,9 +31,8 @@ diff -urp vboxnetflt.orig/linux/VBoxNetFlt-linux.c 
vboxnetflt/linux/VBoxNetFlt-l
  # define OVR_OPS  netdev_ops
  # define OVR_XMIT pOrgOps->ndo_start_xmit
  
-diff -urp vboxpci.orig/include/VBox/rawpci.h vboxpci/include/VBox/rawpci.h
---- vboxpci.orig/include/VBox/rawpci.h 2011-04-18 17:01:12.000000000 +0200
-+++ vboxpci/include/VBox/rawpci.h      2011-09-06 15:57:17.340555277 +0200
+--- vboxpci/include/VBox/rawpci.h
++++ vboxpci/include/VBox/rawpci.h
 @@ -545,7 +545,7 @@ typedef struct RAWPCIFACTORY
      DECLR0CALLBACKMEMBER(void, pfnDeinitVm,(PRAWPCIFACTORY       pFactory,
                                              PVM                  pVM,

diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.32.ebuild 
b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.32.ebuild
index 065ee901081..c0d163e68ee 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.32.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.32.ebuild
@@ -44,11 +44,11 @@ src_prepare() {
        fi
 
        if use pax_kernel && kernel_is -ge 3 0 0 ; then
-               epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
+               eapply "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
        fi
 
        if kernel_is -ge 4 14 0 ; then
-               epatch "${FILESDIR}"/${PN}-5.1.30-udp.patch
+               eapply "${FILESDIR}"/${PN}-5.1.30-udp.patch
        fi
 
        default

diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.6.ebuild 
b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.6.ebuild
index 212a1449e0e..9ff1abb8099 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.6.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.6.ebuild
@@ -39,7 +39,7 @@ pkg_setup() {
 
 src_prepare() {
        if use pax_kernel && kernel_is -ge 3 0 0 ; then
-               epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
+               eapply "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
        fi
 
        default