gentoo resync : 17.02.2018

5 files changed, 16 insertions, 25 deletions

diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 9b3e8c39d0f0..ec55661bd90b 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,9 +1,9 @@
 AUX create_vbox_modules_tarball.sh 896 BLAKE2B 4153a8fa67cd8fe7187f3c4232691b1ded8e51315f41292f9fcc0adb294e9b235b0c2f1e91f6f728076ab85f687ea1ba2877dc44b511eaceb24e7d6e71a8bbd4 SHA512 c3154a13550817c581fa142e24081edfbdbc145315d34cc4569d12ad87a518fa0bf1443c053b50fdfdea6915bda1325ad973455ee85079294b83a49fd53f4771
-AUX virtualbox-modules-4.1.4-pax-const.patch 2335 BLAKE2B 9d23df0a04e70765b0eb1ec123e7b835a8e3c35d5c89c08239cc3dedcbcf7a34ce49324ab607490738639a1b5d7febef9083ee4b6c3344112695bc2ee079081b SHA512 8f5ffcd53f34e616b895013660e269e6031837411471abf69711df4fd5d745299dcb08d361eda0979dcfde7d9aafa0d24c99fcc9f3875fbf35771945f6b224a1
+AUX virtualbox-modules-4.1.4-pax-const.patch 1729 BLAKE2B 3cada201a2bfde671c073ad49ddd239f90fa2c5338e698b35226e2ac88b4773549a216daa1caeca432e151f892974950dac5defdf91a87916e037d56d5972f5b SHA512 efca9213ace1076e354e168fa3d92da683b2dc27e5306b60452da74cb7f5a024a92033dd07d3559bca70f972aec86be3f0ed186dd951161096df2bcd9e390abe
 AUX virtualbox-modules-5.1.30-udp.patch 1239 BLAKE2B d49d96894bae2fdedc2b8a825c849a99ad0cf36a92cc4d89881ce72a0b7ebd53174f39e298c119670654932b790113fe7fbc3a3bae552f2c597cad20a370141f SHA512 f22e6c8edc360e0f97b207ba9a046042ef1898c10c724d9519badef004858720040caef12bffa1ed0f07517ae2d0b831973a0e4ef8ffb239a26faf62706b0618
 AUX virtualbox.conf 38 BLAKE2B 853f2ba0ac1627100241e778fa6c35ff4fc86e8c9c753f8aa23cb053ffacf966c131c5630d1fafd481d7b057acc3e9d6f8f1a22766db5d1cf61fffa38de7c01b SHA512 b61936fff57426d31efa6928eadb572cafe40a65d3e31a0eecb53dc784ba9d0a9e0ad5e419df74418b977f89c17873240c38e2ada95949e5252d879110d6094a
 DIST vbox-kernel-module-src-5.1.32.tar.xz 626600 BLAKE2B eb3243d62d1a22f41f5ea2307b13a3f5ce17a19edcecb0340f94d34995e557b016195443a53edc9d68a313d064008e5af04c7fff28540ec513c6e9a5955e02e0 SHA512 10ead68e53ae6bd72e39b31d536fc36e0999fe506a6d7fd6a6f9e462d539213ad65deb56e2b926baa5cc4b16fb4071d89e105889e873fda0e4a1f20387a7cd39
 DIST vbox-kernel-module-src-5.2.6.tar.xz 635096 BLAKE2B 8c168b9e1d3de395ef663ca81edf63939cb7670f769995c20f9d4cb4f87194b22812707bfd62d52dd85e19de2562c27c182aad22f40928358cf07a0c5ac15d79 SHA512 c85f94e08357a11574af306b00e71c445b80ef6dea6c47d9cf1003c0d9f36d265ebadd2ae27b3dd96f41cc544e501d3eb0551559bebf25d35b9861a282f489bc
-EBUILD virtualbox-modules-5.1.32.ebuild 1739 BLAKE2B 075e707c8710c1c74e7bb279df95f26088f0a2ff47a4b4b3cec48d8f95c18ac078d4181f1feaf4d5a3e4bdd47c17e4b96854ab93705ff5febfee0f061d3e023b SHA512 9ddf65c8b8997dd7fd153e743aff01acd01d1f8c1778758be42eef94cc588c6dbf2f976884ed55414cbcae6644b6e875632e4f9fb4a06b51b91eff6a29ec97f5
-EBUILD virtualbox-modules-5.2.6.ebuild 1499 BLAKE2B 1ebe9aca2a473ff23c839c92091e572be6a8b1d140585cb717610b3403f539ba2b9bc6495298c337341271fe812b7792294e492350388c62aaa9ef21e5512d02 SHA512 5b5aaa85b3e7d6be210a299c79a79f012f733f6df2ecdb08d581ad9078fb7517d5165407146fc957ef4221ca0348db61780becb842d6fd108287d1387c5692cb
-MISC metadata.xml 438 BLAKE2B f6e24affc5a809324d1a844c69318a291111961503a7b0205b2338240b41a8a63d497cd8171994f3a72b4ca29ae4d9ce5c1145e2b16ea9c223fbb12b77f282f0 SHA512 85b1c97f5f2a0e765ae1571386bee4e2b21e3854e1f512701ce4e685cffacdd2442b1557c9af02d0317b292fc2a5471b3e2ec6e44018bdefc4b2282cc988d0c4
+EBUILD virtualbox-modules-5.1.32.ebuild 1584 BLAKE2B 93323411543b48a599a7ac5c8c25e8a546eb0e1eac15f3067207a1f73b6b401ac33fb1791f13322e0a091edde698e52af6001d87f2b6dacbde7b459aec7865a9 SHA512 634a73a9f6fba9986f9b4be79524ea3d2c78bdfa585eb50e46faa1fddf6afceea0a04a20648624ff8aea0b31c5fa7e14dfa5d45742de1a061a463c165842108d
+EBUILD virtualbox-modules-5.2.6.ebuild 1344 BLAKE2B 7d98d4bbb578ca44dec9eff1ff27aeac0d3a403b2f25e09c55397caabc9c92f947099b60ebc333b4fa19993ede0324a3cbdf821752c88e4e9c3226f24c9cfc4e SHA512 8e33b5a833dcaf80f59208ef7ee750dc02686f88c1f5267ccc5437613b6ceea92d7beffdb9ab4801a5144f48fc7345fb90b956df3faa64f73cc296e0646a78b9
+MISC metadata.xml 502 BLAKE2B 043fc7e11b803453d5c193562322ade34ce17f5966c5ba6f557c605174bab43a47fe374684b7f3b10a87d92429c70006abc2759169124c0b29ad28ad4c181b46 SHA512 399c87acfd980b7dc29b42d7eeeead868bc8e9efc085f23aa97507d9da6f4af272e747172c4d5d6c1dfe15dc125193a72a5d6ca47ec82615345e239ff26246e4
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 4e4cde06c784..f9878848ae13 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/metadata.xml b/app-emulation/virtualbox-modules/metadata.xml
index 3603554891f5..851d70de80c5 100644
--- a/app-emulation/virtualbox-modules/metadata.xml
+++ b/app-emulation/virtualbox-modules/metadata.xml
@@ -7,6 +7,7 @@
   </maintainer>
   <maintainer type="person">
     <email>masterzorag@gmail.com</email>
+    <description>Proxy maintainer. CC him on bugs</description>
   </maintainer>
   <use>
     <flag name="pax_kernel">Apply patch needed for pax enabled kernels</flag>
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 065ee9010815..38a865402ff3 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
@@ -62,7 +62,4 @@ src_install() {
 
 pkg_postinst() {
 	linux-mod_pkg_postinst
-	elog "If you are using sys-apps/openrc, please add \"vboxdrv\", \"vboxnetflt\","
-	elog "\"vboxnetadp\" and \"vboxpci\" to:"
-	elog "  /etc/conf.d/modules"
 }
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 212a1449e0e5..8bbaca49a8f9 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
@@ -53,7 +53,4 @@ src_install() {
 
 pkg_postinst() {
 	linux-mod_pkg_postinst
-	elog "If you are using sys-apps/openrc, please add \"vboxdrv\", \"vboxnetflt\","
-	elog "\"vboxnetadp\" and \"vboxpci\" to:"
-	elog "  /etc/conf.d/modules"
 }