recreate to work with older GNU patch (#361109)

Package-Manager: portage-2.2.01.18125-prefix/cvs/AIX 00C0078A4C00

3 files changed, 18 insertions, 21 deletions

diff --git a/sys-apps/baselayout-prefix/ChangeLog b/sys-apps/baselayout-prefix/ChangeLog
index 817a55bdde06..6babe3061204 100644
--- a/sys-apps/baselayout-prefix/ChangeLog
+++ b/sys-apps/baselayout-prefix/ChangeLog
@@ -1,6 +1,10 @@
 # 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.5 2011/03/28 15:38:17 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog,v 1.6 2011/03/29 15:34:22 haubi Exp $
+
+  29 Mar 2011; Michael Haubenwallner <haubi@gentoo.org>
+  files/baselayout-1.12.5-aix.patch:
+  recreate to work with older GNU patch (#361109)
 
   28 Mar 2011; Fabian Groffen <grobian@gentoo.org>
   baselayout-prefix-1.12.5-r9.ebuild, +files/baselayout-1.12.5-solaris.patch:
diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest
index e2a9e1a5e23e..b8752c42b3a7 100644
--- a/sys-apps/baselayout-prefix/Manifest
+++ b/sys-apps/baselayout-prefix/Manifest
@@ -1,7 +1,4 @@
------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-aix.patch 2462 RMD160 63ef5b25f51ac773ae77fb4afc01b53221c144ae SHA1 01c299e2761247675192fe04619b11ebe02ddff3 SHA256 78e193dd8d68e2fc7ca32bca1059a20943231197bff3db07b8ef3ea3659d5f6b
 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
@@ -18,12 +15,5 @@ AUX baselayout-1.12.5-solaris.patch 2638 RMD160 de2a3df0a2999977265f3590ef3a2443
 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 6029 RMD160 e00bd97286a3cdf9d0284ca8e577c85cfff7b1f6 SHA1 e492afb1690fd3e64ccdab34fb552dc8158ab0ec SHA256 40b6def0dc1459b9008009f7fd1f6768c98008383bc1cc856698f5fecec220f7
-MISC ChangeLog 5644 RMD160 d4216e2c5d48ad08c75f01f2aaabdbc1e920d5c3 SHA1 9cf95a3983b65296cc5afe04847c8f03442a838a SHA256 9dc1153236ee24af82439bf69939ba86648dacfdbc60eacd252fdee60f6a287f
+MISC ChangeLog 5786 RMD160 405d6f56a9991ac6624c67f06f14b07c7f870024 SHA1 30b44349adb02b75483d8c88f090cb79b4fb74d3 SHA256 ad8128a97975d98c175bb44c229b351a8101ba049e279616e0af62be32ca3a2b
 MISC metadata.xml 318 RMD160 d64b41bf7b5d0a12823b249c08ded6bbd5a7cbf5 SHA1 3598e969bff5d6802f19a3ed63017ec66383e58f SHA256 752beeb1c1ed6af782e2a2d9576720a8903af33d6b724426dbee987bc88fe6f7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (Darwin)
-
-iEYEARECAAYFAk2QqxEACgkQX3X2B8XHTon0OACeMBi9do5S+XdCuHyLIDmGX+xu
-vxMAoIP3LUdO8OtjwWLKja11M3Sunkq3
-=euqV
------END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-aix.patch b/sys-apps/baselayout-prefix/files/baselayout-1.12.5-aix.patch
index 87ad46b95e39..ebc162345a52 100644
--- a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-aix.patch
+++ b/sys-apps/baselayout-prefix/files/baselayout-1.12.5-aix.patch
@@ -1,14 +1,17 @@
 W00T, AIX does have /proc filesystem - even with slightly different layout.
 
---- src/start-stop-daemon.c.orig	2011-03-28 13:55:36 +0200
-+++ src/start-stop-daemon.c	2011-03-28 14:50:47 +0200
-@@ -56,3 +56,5 @@
+--- src/start-stop-daemon.c
++++ src/start-stop-daemon.c
+@@ -56,6 +56,8 @@
+ #  define OSNetBSD
+ #elif defined(__APPLE__)
+ #  define OSDarwin
 +#elif defined(_AIX)
 +#  define OSaix
  #else
  #  error Unknown architecture - cannot build start-stop-daemon
  #endif
-@@ -82,6 +104,10 @@
+@@ -85,6 +87,10 @@
  #include <sys/pstat.h>
  #endif
  
@@ -19,7 +22,7 @@ W00T, AIX does have /proc filesystem - even with slightly different layout.
  #include <errno.h>
  #include <stdio.h>
  #include <stdlib.h>
-@@ -171,7 +201,7 @@
+@@ -178,7 +184,7 @@
  static void do_pidfile(const char *name);
  static void do_stop(int signal_nr, int quietmode,
  		    int *n_killed, int *n_notkilled, int retry_nr);
@@ -28,7 +31,7 @@ W00T, AIX does have /proc filesystem - even with slightly different layout.
  static int pid_is_exec(pid_t pid, const struct stat *esb);
  #endif
  
-@@ -748,7 +778,7 @@
+@@ -755,7 +761,7 @@
  static void
  check(pid_t pid)
  {
@@ -37,7 +40,7 @@ W00T, AIX does have /proc filesystem - even with slightly different layout.
  	if (execname && !pid_is_exec(pid, &exec_stat))
  		return;
  #elif defined(OSHURD) || defined(OSFreeBSD) || defined(OSNetBSD) || defined(OSDarwin)
-@@ -784,7 +814,7 @@
+@@ -791,7 +797,7 @@
  /* WTA: this  needs to be an autoconf check for /proc/pid existance.
   */
  
@@ -46,7 +49,7 @@ W00T, AIX does have /proc filesystem - even with slightly different layout.
  static void
  do_procinit(void)
  {
-@@ -1052,6 +1082,58 @@
+@@ -1059,6 +1065,58 @@
  }
  #endif /* OShpux */