Add patch for Mac OS X >= 10.5, thanks JTRiley in bug #360855

Package-Manager: portage-2.2.01.18155-prefix/cvs/Darwin powerpc

4 files changed, 43 insertions, 4 deletions

diff --git a/sys-apps/baselayout-prefix/ChangeLog b/sys-apps/baselayout-prefix/ChangeLog
index ffd592448d70..df1ccc01db1d 100644
--- a/sys-apps/baselayout-prefix/ChangeLog
+++ b/sys-apps/baselayout-prefix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/baselayout-prefix
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog,v 1.3 2011/03/28 14:05:51 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog,v 1.4 2011/03/28 15:09:22 grobian Exp $
+
+  28 Mar 2011; Fabian Groffen <grobian@gentoo.org>
+  baselayout-prefix-1.12.5-r9.ebuild,
+  +files/baselayout-1.12.5-darwin-kvm.patch:
+  Add patch for Mac OS X >= 10.5, thanks JTRiley in bug #360855
 
   28 Mar 2011; Michael Haubenwallner <haubi@gentoo.org>
   baselayout-prefix-1.12.5-r9.ebuild, +files/baselayout-1.12.5-aix.patch,
diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest
index 008ded8853ca..4feabe333f73 100644
--- a/sys-apps/baselayout-prefix/Manifest
+++ b/sys-apps/baselayout-prefix/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX baselayout-1.12.5-aix.patch 2454 RMD160 36bbfffe2c004a92b2a9820cf0ae9eaf4ff7dbcb SHA1 b73c19e404b09b4cd7c5cd9ddf9551f7cfffc0e2 SHA256 362fe8a6d27a549b67caf954f8d097e01f1b5d1541d4c40f1befc2a33d6d7ef6
+AUX baselayout-1.12.5-darwin-kvm.patch 431 RMD160 66200390deb12673cb11370b3d8bbf20551eba5e SHA1 679c7d152c3858800bf0e319134bce615d47e6be SHA256 2a6513beeffdb62af9cca8eafd3fa4ca3b2ab892fbe771a79ce0593be64f849f
 AUX baselayout-1.12.5-prefix-chaining-bash.patch 862 RMD160 f514ef370a4858f63c23cfbef9bdbb59c074e50d SHA1 70b02ea0148dd43df2012de2413aef505051b87c SHA256 0fe5200752a3c6437e17f833b307e8dbebaa6c3786adf9814f060445f702550b
 AUX baselayout-1.12.5-prefix-chaining-eprefix.patch 991 RMD160 74c0326b2800a9b6c9670550fab3ddfbf42bb9d0 SHA1 0593cc4963b9611159e0a791f8743702ab875883 SHA256 1d6b1f66f2bbf5417d36808ab8bce951a9ecdbcf4992ffb3fcd32af8a6e7b048
 AUX baselayout-1.12.5-prefix-chaining-pkgconfig.patch 568 RMD160 ec1dc56f66f3cceb7afe1695f2e887299f430d97 SHA1 51fa2775a998a1519253213cb62d5db980d18cc4 SHA256 6c7cdea50afc178693b954bf295dfe1de7fa06108f662f5aa0d539c69ba1f28f
@@ -12,6 +16,13 @@ AUX baselayout-1.12.5-prefix-src.patch 3629 RMD160 cda870fae2abf559770d0ac7e5d00
 AUX baselayout-1.12.5-prefix.patch 14807 RMD160 5be4ca65ee754d1c95bb00c488ddd5a77240e9fe SHA1 24d4677f7ade70a712ef73fde33db5b82da39f45 SHA256 a79a3d2f35e03e75c858ef81ccada82b3de4b5bb96168386a1f652bac198ad6c
 AUX baselayout-1.12.5-termios_h.patch 893 RMD160 398140de16da1b2fb874ef00f1caaa6c828372f4 SHA1 b3debc214fe8edbf734611990901018e32ea289b SHA256 60b4251ebce7488b415686178a0eae207adf18240f80523dbc0b4bc70a53ae99
 DIST baselayout-1.12.5.tar.bz2 220693 RMD160 85f03fe3b0ff0521ec4226a1b6788575052923b7 SHA1 39ef351ceec1238cbf27d7b9671f244ccf5cca33 SHA256 4ab5512f35c547549b0406221ed92c71a5a86a11044f1d9f0d87f7ec44d39817
-EBUILD baselayout-prefix-1.12.5-r9.ebuild 5926 RMD160 5d4adb5b30f7de35fa31d9aaf6470b04ff87ea3b SHA1 4b81479cb59b5d738d6b7677613e72d1050464b6 SHA256 fdfbac3b270db4091a444d466be21047a615a4ce284a0f9bca11836732ef2c78
-MISC ChangeLog 5260 RMD160 fc417bfcbd0b76565acbe55fa8272c88aa83c995 SHA1 0d861c9433a1622b820ae923792fd77fc4d759ce SHA256 c502b6ff55a1fafb667782adae56684cead0df00df5873223591d8212a64c24c
+EBUILD baselayout-prefix-1.12.5-r9.ebuild 5979 RMD160 76bffed85d726a45e714f67a7880ee5da59fae9f SHA1 f84fe524934cd07dda1d99de152e7faa77277b7f SHA256 4640288825cfdffdd27dec04d4ee72759e8a8452de06b7b8f6a700b052e93ce1
+MISC ChangeLog 5459 RMD160 388bb705bf805066ab4906a4a334c21de7bfe7aa SHA1 2e5e090028dc874ed1f13e1a958a08336777cc42 SHA256 92ca8bf4c0cfcc69418723721639f66ce66774086eddb829107a7a8d0d168665
 MISC metadata.xml 318 RMD160 d64b41bf7b5d0a12823b249c08ded6bbd5a7cbf5 SHA1 3598e969bff5d6802f19a3ed63017ec66383e58f SHA256 752beeb1c1ed6af782e2a2d9576720a8903af33d6b724426dbee987bc88fe6f7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (Darwin)
+
+iEYEARECAAYFAk2QpEoACgkQX3X2B8XHTommggCfUk4isIIHBZS6ZTUtAyaiujVt
+U58An3Z4Qs9CwZ+gc5PggiQnDyx4HYZY
+=7jqy
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r9.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r9.ebuild
index acadfec50034..2b3d4ba856ef 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r9.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r9.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/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r9.ebuild,v 1.4 2011/03/28 14:05:51 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r9.ebuild,v 1.5 2011/03/28 15:09:22 grobian Exp $
 
 EAPI=3
 
@@ -49,6 +49,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${P/-prefix/}-termios_h.patch # required by aix.patch
 	epatch "${FILESDIR}"/${P/-prefix/}-aix.patch
+	epatch "${FILESDIR}"/${P/-prefix/}-darwin-kvm.patch
 
 	# The consoletype application in this form will only work on Linux
 	[[ ${CHOST} == *-linux-* ]] || epatch "${FILESDIR}"/${P/-prefix/}-prefix-no-consoletype.patch
diff --git a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-darwin-kvm.patch b/sys-apps/baselayout-prefix/files/baselayout-1.12.5-darwin-kvm.patch
new file mode 100644
index 000000000000..08668edff73e
--- /dev/null
+++ b/sys-apps/baselayout-prefix/files/baselayout-1.12.5-darwin-kvm.patch
@@ -0,0 +1,22 @@
+http://bugs.gentoo.org/show_bug.cgi?id=360855
+
+by JTRiley 
+
+--- baselayout-1.12.5/src/start-stop-daemon.c
++++ baselayout-1.12.5/src/start-stop-daemon.c
+@@ -73,10 +73,14 @@
+ #include <sys/types.h>
+ 
+ #include <err.h>
+-#include <kvm.h>
+ #include <limits.h>
+ #endif
+ 
++#if defined(OSOpenBSD) || defined(OSFreeBSD) || defined(OSNetBSD)
++#include <kvm.h>
++#endif
++
++
+ #if defined(OShpux)
+ #include <sys/param.h>
+ #include <sys/pstat.h>