Have patches apply with -p1, for use with eapply in EAPI 6.

21 files changed, 48 insertions, 48 deletions

diff --git a/src/patchsets/mico/2.3.13/001_all_nolibcheck.patch b/src/patchsets/mico/2.3.13/001_all_nolibcheck.patch
index 084bf08091..61261043fb 100644
--- a/src/patchsets/mico/2.3.13/001_all_nolibcheck.patch
+++ b/src/patchsets/mico/2.3.13/001_all_nolibcheck.patch
@@ -1,7 +1,7 @@
 don't check for libbsd and libelf, they aren't needed anywhere.
 
---- configure.in.orig	2009-02-02 14:34:14.000000000 +0100
-+++ configure.in	2009-02-02 14:37:45.000000000 +0100
+--- mico/configure.in
++++ mico/configure.in
 @@ -1237,9 +1237,7 @@
  
  
diff --git a/src/patchsets/mico/2.3.13/003_all_pthread.patch b/src/patchsets/mico/2.3.13/003_all_pthread.patch
index 876e9de167..c235327443 100644
--- a/src/patchsets/mico/2.3.13/003_all_pthread.patch
+++ b/src/patchsets/mico/2.3.13/003_all_pthread.patch
@@ -2,8 +2,8 @@ When using gcc, use '-pthread' (or '-pthreads' on solaris)
 compiler flag to do all pthread specific things.
 
 http://sourceforge.net/mailarchive/forum.php?thread_name=4DDFA157.4040609%40gentoo.org&forum_name=mico-devel
---- configure.in.orig	2009-04-02 17:25:45 +0200
-+++ configure.in	2009-04-02 17:32:00 +0200
+--- mico/configure.in
++++ mico/configure.in
 @@ -524,7 +524,19 @@
        )
        AC_CHECK_HEADERS(semaphore.h)
diff --git a/src/patchsets/mico/2.3.13/004_all_aix.patch b/src/patchsets/mico/2.3.13/004_all_aix.patch
index feac0f71a2..fee2219063 100644
--- a/src/patchsets/mico/2.3.13/004_all_aix.patch
+++ b/src/patchsets/mico/2.3.13/004_all_aix.patch
@@ -1,6 +1,6 @@
 Do not add '-lstdc++' explicitly, this is c++ compiler's job.
---- admin/mico-shld.aix.in.orig	2009-04-02 17:33:03 +0200
-+++ admin/mico-shld.aix.in	2009-04-02 17:33:22 +0200
+--- mico/admin/mico-shld.aix.in
++++ mico/admin/mico-shld.aix.in
 @@ -87,7 +87,7 @@
  
  
diff --git a/src/patchsets/mico/2.3.13/005_all_hpux.patch b/src/patchsets/mico/2.3.13/005_all_hpux.patch
index be288f6f5d..3aff831811 100644
--- a/src/patchsets/mico/2.3.13/005_all_hpux.patch
+++ b/src/patchsets/mico/2.3.13/005_all_hpux.patch
@@ -1,7 +1,7 @@
 http://www.mico.org/pipermail/mico-devel/2009-April/010285.html
 
---- configure.in.orig	2009-04-02 12:53:03 +0200
-+++ configure.in	2009-04-02 15:34:10 +0200
+--- mico/configure.in
++++ mico/configure.in
 @@ -732,7 +732,9 @@
      # -mmillicode-long-calls
      CONF_LDFLAGS=-Wl,+s
diff --git a/src/patchsets/mico/2.3.13/006_all_as-needed.patch b/src/patchsets/mico/2.3.13/006_all_as-needed.patch
index 95b83751ca..f99889f3bf 100644
--- a/src/patchsets/mico/2.3.13/006_all_as-needed.patch
+++ b/src/patchsets/mico/2.3.13/006_all_as-needed.patch
@@ -1,7 +1,7 @@
 Link libmico.so against configured libraries,
 to get -Wl,--as-needed working. #280678.
---- orb/Makefile.orig	2011-05-26 09:28:52.629834934 +0200
-+++ orb/Makefile	2011-05-26 09:28:59.519791273 +0200
+--- mico/orb/Makefile
++++ mico/orb/Makefile
 @@ -30,7 +30,7 @@
  endif
  endif
diff --git a/src/patchsets/mico/2.3.13/007_all_qt4-nothread.patch b/src/patchsets/mico/2.3.13/007_all_qt4-nothread.patch
index d3dd57cbc1..8449f79b87 100644
--- a/src/patchsets/mico/2.3.13/007_all_qt4-nothread.patch
+++ b/src/patchsets/mico/2.3.13/007_all_qt4-nothread.patch
@@ -1,6 +1,6 @@
 qt4 doesn't provide different libraries for threading.
---- configure.in.orig	2010-01-12 16:40:06.935594142 +0100
-+++ configure.in	2010-01-12 16:40:37.742311509 +0100
+--- mico/configure.in
++++ mico/configure.in
 @@ -1124,7 +1124,7 @@
      AC_MSG_WARN(cannot find moc. QT parts disabled.)
      HAVE_QT=no
diff --git a/src/patchsets/mico/2.3.13/008_all_drop-pgsql-header-check.patch b/src/patchsets/mico/2.3.13/008_all_drop-pgsql-header-check.patch
index 08b820f871..e5abf931b4 100644
--- a/src/patchsets/mico/2.3.13/008_all_drop-pgsql-header-check.patch
+++ b/src/patchsets/mico/2.3.13/008_all_drop-pgsql-header-check.patch
@@ -1,8 +1,8 @@
 http://bugs.gentoo.org/show_bug.cgi?id=306255
 
 Result of 'checking for pgsql/libpq-fe.h' is not used anywhere, just drop it.
---- configure.in.orig	2010-02-24 10:27:45.043267799 +0100
-+++ configure.in	2010-02-24 10:28:09.016074329 +0100
+--- mico/configure.in
++++ mico/configure.in
 @@ -1324,7 +1324,7 @@
  AC_CHECK_HEADERS(netinet/tcp.h stdlib.h sys/time.h sunmath.h sys/stat.h)
  AC_CHECK_HEADERS(poll.h)
diff --git a/src/patchsets/mico/2.3.13/009_all_check-const-overload.patch b/src/patchsets/mico/2.3.13/009_all_check-const-overload.patch
index 003b0185e6..625d50d65f 100644
--- a/src/patchsets/mico/2.3.13/009_all_check-const-overload.patch
+++ b/src/patchsets/mico/2.3.13/009_all_check-const-overload.patch
@@ -3,8 +3,8 @@ resulting in build errors (suggesting -fpermissive) with gcc-4.6:
 http://bugs.gentoo.org/show_bug.cgi?id=365117
 
 http://sourceforge.net/mailarchive/forum.php?thread_name=4DDFA16F.6040109%40gentoo.org&forum_name=mico-devel
---- aclocal.m4.orig	2011-05-25 14:20:01.626683873 +0200
-+++ aclocal.m4	2011-05-25 14:20:43.930773070 +0200
+--- mico/aclocal.m4
++++ mico/aclocal.m4
 @@ -353,11 +353,12 @@
  
    void bar (const int &, int &, const int *, int *, int *&);
diff --git a/src/patchsets/mico/2.3.13/010_all_preserve-cflags.patch b/src/patchsets/mico/2.3.13/010_all_preserve-cflags.patch
index 5faa255fca..fd5741a71f 100644
--- a/src/patchsets/mico/2.3.13/010_all_preserve-cflags.patch
+++ b/src/patchsets/mico/2.3.13/010_all_preserve-cflags.patch
@@ -1,8 +1,8 @@
 Do not tweak CFLAGS/CXXFLAGS for -g/-O2 if not explicitly requested
 by configure arguments --*able-debug/--*able-optimize.
 
---- configure.in.orig	2011-05-25 16:22:01.402618836 +0200
-+++ configure.in	2011-05-25 16:27:35.022640710 +0200
+--- mico/configure.in
++++ mico/configure.in
 @@ -112,12 +112,12 @@
   use_repo=$enableval, use_repo=no)
  
diff --git a/src/patchsets/mico/2.3.13/011_all_gtk-check-stdlib.patch b/src/patchsets/mico/2.3.13/011_all_gtk-check-stdlib.patch
index ac05f929a1..bdb071a2e6 100644
--- a/src/patchsets/mico/2.3.13/011_all_gtk-check-stdlib.patch
+++ b/src/patchsets/mico/2.3.13/011_all_gtk-check-stdlib.patch
@@ -3,8 +3,8 @@ like system() and exit(), breaking gtk version check.
 Also fix signed-unsigned-comparison warning.
 
 http://sourceforge.net/mailarchive/forum.php?thread_name=4DDFA182.40903%40gentoo.org&forum_name=mico-devel
---- aclocal.m4.orig	2011-05-25 16:55:15.609086191 +0200
-+++ aclocal.m4	2011-05-25 16:55:22.999136294 +0200
+--- mico/aclocal.m4
++++ mico/aclocal.m4
 @@ -765,6 +765,7 @@
        AC_TRY_RUN([
  #include <gtk/gtk.h>
diff --git a/src/patchsets/mico/2.3.13/012_all_early-header-check.patch b/src/patchsets/mico/2.3.13/012_all_early-header-check.patch
index ede17628a6..1e814fa57b 100644
--- a/src/patchsets/mico/2.3.13/012_all_early-header-check.patch
+++ b/src/patchsets/mico/2.3.13/012_all_early-header-check.patch
@@ -2,8 +2,8 @@ The first header-check resolves AC_REQUIRE(AC_PROG_EGREP). If that is not
 run due to some condition, EGREP is unset for subsequent checks.
 This breaks the checks for function prototypes.
 
---- configure.in.orig	2011-05-26 07:49:07.047082532 +0200
-+++ configure.in	2011-05-26 07:52:48.130834617 +0200
+--- mico/configure.in
++++ mico/configure.in
 @@ -411,6 +411,8 @@
  AC_SUBST(EXTRA_CXXFLAGS)
  ac_compile="$ac_compile "'$EXTRA_CXXFLAGS'
diff --git a/src/patchsets/mico/2.3.13/014_all_idl-noresolve.patch b/src/patchsets/mico/2.3.13/014_all_idl-noresolve.patch
index cec14624ce..d0aced94f7 100644
--- a/src/patchsets/mico/2.3.13/014_all_idl-noresolve.patch
+++ b/src/patchsets/mico/2.3.13/014_all_idl-noresolve.patch
@@ -1,5 +1,5 @@
---- idl/main.cc.orig	2011-11-25 23:50:09.767034055 +0100
-+++ idl/main.cc	2011-11-25 23:52:43.149752575 +0100
+--- mico/idl/main.cc
++++ mico/idl/main.cc
 @@ -82,6 +82,13 @@
    DB db;
  
@@ -14,8 +14,8 @@
    CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
  
  #ifdef _WIN32
---- orb/address.cc.orig	2011-11-25 23:39:06.523042175 +0100
-+++ orb/address.cc	2011-11-25 23:52:43.149752575 +0100
+--- mico/orb/address.cc
++++ mico/orb/address.cc
 @@ -635,8 +635,12 @@
  {
      if (hname.length() == 0) {
diff --git a/src/patchsets/mico/9999/001_all_nolibcheck.patch b/src/patchsets/mico/9999/001_all_nolibcheck.patch
index 5da45737ad..0cd5400adb 100644
--- a/src/patchsets/mico/9999/001_all_nolibcheck.patch
+++ b/src/patchsets/mico/9999/001_all_nolibcheck.patch
@@ -2,8 +2,8 @@ don't check for libbsd and libelf, they aren't needed anywhere
 and may break copying binaries from one linux to another, when
 they did exist on the build-machine but not on the target.
 
---- configure.in.orig	2009-02-02 14:34:14.000000000 +0100
-+++ configure.in	2009-02-02 14:37:45.000000000 +0100
+--- mico/configure.in
++++ mico/configure.in
 @@ -1237,9 +1237,7 @@
  
  
diff --git a/src/patchsets/mico/9999/004_all_aix.patch b/src/patchsets/mico/9999/004_all_aix.patch
index feac0f71a2..fee2219063 100644
--- a/src/patchsets/mico/9999/004_all_aix.patch
+++ b/src/patchsets/mico/9999/004_all_aix.patch
@@ -1,6 +1,6 @@
 Do not add '-lstdc++' explicitly, this is c++ compiler's job.
---- admin/mico-shld.aix.in.orig	2009-04-02 17:33:03 +0200
-+++ admin/mico-shld.aix.in	2009-04-02 17:33:22 +0200
+--- mico/admin/mico-shld.aix.in
++++ mico/admin/mico-shld.aix.in
 @@ -87,7 +87,7 @@
  
  
diff --git a/src/patchsets/mico/9999/006_all_as-needed.patch b/src/patchsets/mico/9999/006_all_as-needed.patch
index 95b83751ca..f99889f3bf 100644
--- a/src/patchsets/mico/9999/006_all_as-needed.patch
+++ b/src/patchsets/mico/9999/006_all_as-needed.patch
@@ -1,7 +1,7 @@
 Link libmico.so against configured libraries,
 to get -Wl,--as-needed working. #280678.
---- orb/Makefile.orig	2011-05-26 09:28:52.629834934 +0200
-+++ orb/Makefile	2011-05-26 09:28:59.519791273 +0200
+--- mico/orb/Makefile
++++ mico/orb/Makefile
 @@ -30,7 +30,7 @@
  endif
  endif
diff --git a/src/patchsets/mico/9999/007_all_qt4-nothread.patch b/src/patchsets/mico/9999/007_all_qt4-nothread.patch
index d3dd57cbc1..8449f79b87 100644
--- a/src/patchsets/mico/9999/007_all_qt4-nothread.patch
+++ b/src/patchsets/mico/9999/007_all_qt4-nothread.patch
@@ -1,6 +1,6 @@
 qt4 doesn't provide different libraries for threading.
---- configure.in.orig	2010-01-12 16:40:06.935594142 +0100
-+++ configure.in	2010-01-12 16:40:37.742311509 +0100
+--- mico/configure.in
++++ mico/configure.in
 @@ -1124,7 +1124,7 @@
      AC_MSG_WARN(cannot find moc. QT parts disabled.)
      HAVE_QT=no
diff --git a/src/patchsets/mico/9999/008_all_drop-pgsql-header-check.patch b/src/patchsets/mico/9999/008_all_drop-pgsql-header-check.patch
index 08b820f871..e5abf931b4 100644
--- a/src/patchsets/mico/9999/008_all_drop-pgsql-header-check.patch
+++ b/src/patchsets/mico/9999/008_all_drop-pgsql-header-check.patch
@@ -1,8 +1,8 @@
 http://bugs.gentoo.org/show_bug.cgi?id=306255
 
 Result of 'checking for pgsql/libpq-fe.h' is not used anywhere, just drop it.
---- configure.in.orig	2010-02-24 10:27:45.043267799 +0100
-+++ configure.in	2010-02-24 10:28:09.016074329 +0100
+--- mico/configure.in
++++ mico/configure.in
 @@ -1324,7 +1324,7 @@
  AC_CHECK_HEADERS(netinet/tcp.h stdlib.h sys/time.h sunmath.h sys/stat.h)
  AC_CHECK_HEADERS(poll.h)
diff --git a/src/patchsets/mico/9999/010_all_preserve-cflags.patch b/src/patchsets/mico/9999/010_all_preserve-cflags.patch
index 5faa255fca..fd5741a71f 100644
--- a/src/patchsets/mico/9999/010_all_preserve-cflags.patch
+++ b/src/patchsets/mico/9999/010_all_preserve-cflags.patch
@@ -1,8 +1,8 @@
 Do not tweak CFLAGS/CXXFLAGS for -g/-O2 if not explicitly requested
 by configure arguments --*able-debug/--*able-optimize.
 
---- configure.in.orig	2011-05-25 16:22:01.402618836 +0200
-+++ configure.in	2011-05-25 16:27:35.022640710 +0200
+--- mico/configure.in
++++ mico/configure.in
 @@ -112,12 +112,12 @@
   use_repo=$enableval, use_repo=no)
  
diff --git a/src/patchsets/mico/9999/012_all_early-header-check.patch b/src/patchsets/mico/9999/012_all_early-header-check.patch
index ede17628a6..1e814fa57b 100644
--- a/src/patchsets/mico/9999/012_all_early-header-check.patch
+++ b/src/patchsets/mico/9999/012_all_early-header-check.patch
@@ -2,8 +2,8 @@ The first header-check resolves AC_REQUIRE(AC_PROG_EGREP). If that is not
 run due to some condition, EGREP is unset for subsequent checks.
 This breaks the checks for function prototypes.
 
---- configure.in.orig	2011-05-26 07:49:07.047082532 +0200
-+++ configure.in	2011-05-26 07:52:48.130834617 +0200
+--- mico/configure.in
++++ mico/configure.in
 @@ -411,6 +411,8 @@
  AC_SUBST(EXTRA_CXXFLAGS)
  ac_compile="$ac_compile "'$EXTRA_CXXFLAGS'
diff --git a/src/patchsets/mico/9999/013_all_gtk-versions.patch b/src/patchsets/mico/9999/013_all_gtk-versions.patch
index f1af685c96..e795800d4d 100644
--- a/src/patchsets/mico/9999/013_all_gtk-versions.patch
+++ b/src/patchsets/mico/9999/013_all_gtk-versions.patch
@@ -1,5 +1,5 @@
---- configure.in.orig	2011-06-06 14:26:10.529680983 +0200
-+++ configure.in	2011-06-06 15:14:01.246026167 +0200
+--- mico/configure.in
++++ mico/configure.in
 @@ -152,8 +152,8 @@
   QTDIR=$withval, QTDIR="")
  
@@ -46,8 +46,8 @@
  
  AC_SUBST(HAVE_TCL)
  AC_SUBST(TCL_LIBS)
---- aclocal.m4.orig	2011-06-06 14:25:41.073169479 +0200
-+++ aclocal.m4	2011-06-06 14:33:38.022926510 +0200
+--- mico/aclocal.m4
++++ mico/aclocal.m4
 @@ -878,3 +878,422 @@
    AC_SUBST(GTK_LIBS)
    rm -f conf.gtktest
diff --git a/src/patchsets/mico/9999/014_all_idl-noresolve.patch b/src/patchsets/mico/9999/014_all_idl-noresolve.patch
index cec14624ce..2cec54ed75 100644
--- a/src/patchsets/mico/9999/014_all_idl-noresolve.patch
+++ b/src/patchsets/mico/9999/014_all_idl-noresolve.patch
@@ -1,5 +1,5 @@
---- idl/main.cc.orig	2011-11-25 23:50:09.767034055 +0100
-+++ idl/main.cc	2011-11-25 23:52:43.149752575 +0100
+--- mico/idl/main.cc
++++ mico/idl/main.cc	2011-11-25 23:52:43.149752575 +0100
 @@ -82,6 +82,13 @@
    DB db;
  
@@ -14,8 +14,8 @@
    CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
  
  #ifdef _WIN32
---- orb/address.cc.orig	2011-11-25 23:39:06.523042175 +0100
-+++ orb/address.cc	2011-11-25 23:52:43.149752575 +0100
+--- mico/orb/address.cc
++++ mico/orb/address.cc
 @@ -635,8 +635,12 @@
  {
      if (hname.length() == 0) {