Added kernel version check for pax patch. Cleaned up 4.1.4 ebuild a bit

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

diff --git a/app-emulation/virtualbox-modules/ChangeLog b/app-emulation/virtualbox-modules/ChangeLog
index ab4747cdd7e9ac10d79827c2d1a548803e680da8..71fa00e7d3695e58c9ed1b930c7b59abc17cc50c 100644 (file)
--- a/app-emulation/virtualbox-modules/ChangeLog
+++ b/app-emulation/virtualbox-modules/ChangeLog
@@ -1,6 +1,10 @@
 # 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.93 2011/11/04 23:01:43 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.94 2011/11/06 13:16:19 polynomial-c Exp $
+
+  06 Nov 2011; Lars Wendler <polynomial-c@gentoo.org>
+  virtualbox-modules-4.1.4.ebuild, virtualbox-modules-4.1.6.ebuild:
+  Added kernel version check for pax patch. Cleaned up 4.1.4 ebuild a bit.
 
 *virtualbox-modules-4.1.6 (04 Nov 2011)
 

diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index f7638e49bf47cc1a3ec3541d5d26a79bf2db1ff4..525b27717703a30953d1f169f1c910f6947c8060 100644 (file)
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -6,24 +6,24 @@ DIST vbox-kernel-module-src-4.0.12.tar.bz2 901005 RMD160 6bc21432d363ec7d92a3c7b
 DIST vbox-kernel-module-src-4.1.4.tar.bz2 505952 RMD160 c540fb563d6fdab747366c66d5e472ebffbd3639 SHA1 35a4274118d44bd8603fecfa93817ef129c8e57c SHA256 03577cd31e5ff322102e9bec1ed40f189c50d94032e2d62206b6541a0fda1fb8
 DIST vbox-kernel-module-src-4.1.6.tar.xz 454840 RMD160 f1166c7b2e95276a60beb4c6dbe022826bc21ff2 SHA1 7816f6773f00f28cb287eaf4eb8b31a9b3bbdd37 SHA256 557425714e5d9e1b737c963d5a4d1b67a6e60ec47c2ddf2449dbbfd786c41cdf
 EBUILD virtualbox-modules-4.0.12.ebuild 1570 RMD160 48502bec63dcabe8f9cae90651a0d08e1a2cd60e SHA1 42aa2e640f5e8772ae2ea0ccf6f7a427051572ea SHA256 56012f6439898de74457cfb429cd2f72c29c58daf67df9d833619a27d44a73de
-EBUILD virtualbox-modules-4.1.4.ebuild 1669 RMD160 0f69b60b8a0a5449eaf2707f78e7695a6bfc152c SHA1 9d5e592d78c864a24e54b72804be33276f3e00c3 SHA256 6013b077e0c0c7bd68bc96f97e623b34d3cc4be8352155fb22eb7b055784848c
-EBUILD virtualbox-modules-4.1.6.ebuild 1560 RMD160 2e283d8c9aeef5e5b59e292d08d38323de4c0fb1 SHA1 d74d2615f380be0377e2313f1e776b4a4f02a040 SHA256 3e7525c0da93c80c3f282a14841ad6ad78960c44833e36c036e62fdf41c9a627
-MISC ChangeLog 17209 RMD160 561a93790986fc6850bb30a6aad6f9d1b602c29c SHA1 dde280e67d3fb20d80dde3ab46fde1d6e9ec1b2a SHA256 7d0f0f1c542670cda9431faf9f0683a73f36c2a9075978a48e1c1269492e0d22
+EBUILD virtualbox-modules-4.1.4.ebuild 1596 RMD160 393d63add8172ca384ea48cb88d4ffe7718f4f0e SHA1 9e25216dd88fc20f9c6f6b7e6f0d41d5d41627ad SHA256 afdd14e1dd4134ca385c62e864be635b7ba853d67f803e4ac660ecb2ea817e5b
+EBUILD virtualbox-modules-4.1.6.ebuild 1596 RMD160 df8e44020ba8b559f9589ef7985f98eb9bde71f5 SHA1 f7165c67183ce89d7109c26037bc6383b196f9f2 SHA256 29924453b32c60617ef366f8906dbf0765e3b7098318588d5c6228c9db9b8e7e
+MISC ChangeLog 17407 RMD160 120144ea8493ee642c286c24166db369b3657577 SHA1 0f9bb2ae6d22c6ec811a2844ff0f319620f58744 SHA256 2649034ee57cbbf3eea7ae6b9a6866dc6dd7cc5080d5cf561b805dfda0c37f0d
 MISC metadata.xml 524 RMD160 605893cae913de8fca2a99e283854a7c195fa4e2 SHA1 a476b7fcd62a5d1a54ad1a018c4daac50bb27d0b SHA256 9ae0eab26084901b8d307d8923f5c130d310deceb09047aae884557a00f70bbb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOtG7dAAoJEPiazRVxLXTFSoUQAKWtwDoclhiA/Hspv7ZgYdJq
-0MarwGnmBJ1aWxv+vV97O2DUQ/WWmyHnVo2Vi96stvYb0BS4OUmHZqH+9g6axdzK
-gYiBJrRMu6e1L3+xXWp+v57HsWiOzF5Q4nrv2eqlVWVuVxFaPtIpYeDmi6oNlvJt
-Hvr42AYASbMD4Ow9nmFQ2G6vcf1RRu4SovyjpymVIUkCeV7Y9UeVEW0ZdZdvG+R3
-7OvxpiBWZrQpXpSHSHjTnk2c1Z7JMCwrcROvTblnpiUd2uk1tQcBhDrZdAfdN2na
-/qXG3pMhkz1mbdaHKtIkx6OF2XV2um0yYjkhRQKceafZtafRdjv4WDHK/C3vJbLN
-4kvt1pwzqCeuQM+TUAPQBxr63bYX2lxaTLcPoOBxozt8w0zJ0vMeZ7g0fwoIZ8XX
-zLaU1EoHCvHgYaoqebuEm77c3ESKlJiTd7GKkaqo7CPHzNtJFMPUORpbA4HY7xzE
-J3Cv2DJuamtSNDe4CIm/5ePJiLScSGysUPhu5PZzN4xJTtbmNRt/9xwB4mookXui
-e865gn6kqxFmRc/0kp4mX8aAmrsUrSq5vH/ahmDQrO1Ami+5opG6LjBPJltY/tCb
-eoUPT30aE5TY8qwom+BL3vkJ+vPVMCxQxN4mH+3UPCjavCAYHihgkIIutCKDTrBX
-/OsWLCkGZ0gNicDM9XOv
-=P493
+iQIcBAEBCgAGBQJOtoipAAoJEPiazRVxLXTFOl0P+wb5RmltXpRPkdCtFr6TML9J
+VU86Ofznp6ijyNzW0Pm5xMdaEmAnw+wj5cD4ahaK7WUDq29hTtqIqXnLML1WK8As
+sUJ+zz8emAR/Uiqe1EX6oXGZocX9qpOogrplOfrqDiWZe8CcvumZPsYuQfU0rnsn
+bCufINScJeFtlXjJY8z84RJhEqYIPw3iu+tKs1N8H1VlXqMIQ3DCaebBVbre73Nv
+viFwKYa/kOOfqEQz97eMA0yMJiWicVLCiv1RPTe8ad35cxiE/xfIAEk+JC7DYYwb
+tw+uPw+57aCtEGMEV0IoWZxWBHqALydER1QV4RY6PTIM6WaUaXubY0BzvY8+dM5U
+PSYhhgQGZJ8KMZPKq0OEP5Ju39Zkafzz6Qvly/A4kZwpGzjDURGigdbiNUDuSW+j
+apGYEwKsYulZ7fo9d5iyD80DYrFI52AVWJ5Z9JWqd8+mDqhgRK4tTKhs9A6rkWUZ
+GpZ5Oq7Ip/H6Q83t6VUMI36DfJoRGe7CtH74F75XUGV4+BQwnc2n4Qnq+dWd4Nic
+AhOyXh2Nhcn9P5b9OLmP69MvoJDJeF2Wps33IcwnqbEtlIf5wgmDItxc/Zpii0nF
+Q0Bjnar6RmvFwsrcGGL960YRIWEYQgjYTKnOfvSK7dGqJWKpMjJiy65MDx12xrUk
+P/+mWJxddo4mUt74ByYF
+=NePE
 -----END PGP SIGNATURE-----

diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild
index 596c3e1e380a9c618694c0b56dd2eddb18c2a98d..c22004db9908023eb2f3bd32feb224acb58c6134 100644 (file)
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.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.4.ebuild,v 1.3 2011/11/01 10:54:11 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild,v 1.4 2011/11/06 13:16:19 polynomial-c Exp $
 
 # XXX: the tarball here is just the kernel modules split out of the binary
 #      package that comes from virtualbox-bin
@@ -40,7 +40,9 @@ src_prepare() {
                grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
        fi
 
-       use pax_kernel && epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
+       if use pax_kernel && kernel_is -ge 3 0 0 ; then
+               epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
+       fi
 }
 
 src_install() {
@@ -53,9 +55,5 @@ pkg_postinst() {
        elog "be sure to load all the needed modules."
        elog ""
        elog "Please add \"vboxdrv\", \"vboxnetflt\" and \"vboxnetadp\" to:"
-       if has_version sys-apps/openrc; then
-               elog "/etc/conf.d/modules"
-       else
-               elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
-       fi
+       elog "/etc/conf.d/modules"
 }

diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.6.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.6.ebuild
index 6fce566fc347872028d49ea859a18a935d81af5e..e0bf972fd60a5a390b0861b31f73a37601298f84 100644 (file)
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.6.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.6.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.6.ebuild,v 1.1 2011/11/04 23:01:43 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.6.ebuild,v 1.2 2011/11/06 13:16:19 polynomial-c Exp $
 
 # XXX: the tarball here is just the kernel modules split out of the binary
 #      package that comes from virtualbox-bin
@@ -40,7 +40,9 @@ src_prepare() {
                grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
        fi
 
-       use pax_kernel && epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
+       if use pax_kernel && kernel_is -ge 3 0 0 ; then
+               epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
+       fi
 }
 
 src_install() {