Replace my Ice 3.6 ebuilds with ones from Gentoo but keeping the c++1x patches

6 files changed, 104 insertions, 46 deletions

diff --git a/dev-libs/Ice/files/Ice-3.6.3-csharp.patch b/dev-libs/Ice/files/Ice-3.6.3-csharp.patch
new file mode 100644
index 0000000..e9dce11
--- /dev/null
+++ b/dev-libs/Ice/files/Ice-3.6.3-csharp.patch
@@ -0,0 +1,50 @@
+--- ice-3.6.3/csharp/src/Makefile~	2015-06-23 17:30:20.000000000 +0200
++++ ice-3.6.3/csharp/src/Makefile	2015-06-27 20:07:04.217188211 +0200
+@@ -11,7 +11,7 @@
+ 
+ include $(top_srcdir)/config/Make.rules.cs
+ 
+-SUBDIRS		= Ice IceStorm Glacier2 IcePatch2 IceGrid IceBox IceDiscovery IceLocatorDiscovery
++SUBDIRS		= Ice IceStorm Glacier2 IcePatch2 IceGrid IceBox IceSSL IceDiscovery IceLocatorDiscovery
+ 
+ $(EVERYTHING)::
+ 	@for subdir in $(SUBDIRS); \
+--- /dev/null	2015-06-27 16:44:15.733558105 +0200
++++ ice-3.6.3/csharp/lib/pkgconfig/IceSSL.pc	2015-06-27 20:19:30.731894653 +0200
+@@ -0,0 +1,10 @@
++version = 3.6.3
++mono_root = /usr
++
++name = IceSSL
++
++Name: ${name}
++Description: IceSSL run-time support
++Version: ${version}
++Libs: -r:${mono_root}/lib/mono/${name}/${name}.dll
++Requires: Ice = ${version}
+--- /dev/null	2015-06-27 16:44:15.733558105 +0200
++++ ice-3.6.3/csharp/lib/pkgconfig/IceDiscovery.pc	2015-06-27 20:20:44.312515987 +0200
+@@ -0,0 +1,10 @@
++version = 3.6.3
++mono_root = /usr
++
++name = IceDiscovery
++
++Name: ${name}
++Description: IceDiscovery run-time support
++Version: ${version}
++Libs: -r:${mono_root}/lib/mono/${name}/${name}.dll
++Requires: Ice = ${version}
+--- /dev/null	2015-06-27 16:44:15.733558105 +0200
++++ ice-3.6.3/csharp/lib/pkgconfig/IceLocatorDiscovery.pc	2015-06-27 20:21:22.206185123 +0200
+@@ -0,0 +1,10 @@
++version = 3.6.3
++mono_root = /usr
++
++name = IceLocatorDiscovery
++
++Name: ${name}
++Description: IceLocatorDiscovery run-time support
++Version: ${version}
++Libs: -r:${mono_root}/lib/mono/${name}/${name}.dll
++Requires: Ice = ${version}
diff --git a/dev-libs/Ice/files/dont-append-c++11-to-libs-3.6.3.patch b/dev-libs/Ice/files/Ice-3.6.3-dont-append-c++11-to-libs.patch
index 6a469a4..c0133ea 100644
--- a/dev-libs/Ice/files/dont-append-c++11-to-libs-3.6.3.patch
+++ b/dev-libs/Ice/files/Ice-3.6.3-dont-append-c++11-to-libs.patch
@@ -1,7 +1,7 @@
 diff --git cpp/src/Ice/DynamicLibrary.cpp cpp/src/Ice/DynamicLibrary.cpp
 index d70e14b..721832b 100644
---- cpp/src/Ice/DynamicLibrary.cpp
-+++ cpp/src/Ice/DynamicLibrary.cpp
+--- ice-3.6.3/cpp/src/Ice/DynamicLibrary.cpp
++++ ice-3.6.3/cpp/src/Ice/DynamicLibrary.cpp
 @@ -16,7 +16,6 @@
  #endif
  
diff --git a/dev-libs/Ice/files/dont-separate-c++11-libs.patch b/dev-libs/Ice/files/Ice-3.6.3-dont-separate-c++11-libs.patch
index 4c02df0..2b30a21 100644
--- a/dev-libs/Ice/files/dont-separate-c++11-libs.patch
+++ b/dev-libs/Ice/files/Ice-3.6.3-dont-separate-c++11-libs.patch
@@ -1,5 +1,5 @@
---- config/Make.common.rules	2015-06-23 16:30:20.000000000 +0100
-+++ config/Make.common.rules	2015-07-04 17:45:58.061422073 +0100
+--- ice-3.6.3/config/Make.common.rules	2015-06-23 16:30:20.000000000 +0100
++++ ice-3.6.3/config/Make.common.rules	2015-07-04 17:45:58.061422073 +0100
 @@ -115,15 +115,6 @@
      lp32suffix     = /i386-linux-gnu
  endif
diff --git a/dev-libs/Ice/files/Ice-3.6.3-no-arch-opts.patch b/dev-libs/Ice/files/Ice-3.6.3-no-arch-opts.patch
new file mode 100644
index 0000000..149a31e
--- /dev/null
+++ b/dev-libs/Ice/files/Ice-3.6.3-no-arch-opts.patch
@@ -0,0 +1,50 @@
+--- ice-3.6.3/cpp/config/Make.rules.Linux~	2015-06-27 16:56:56.000000000 +0200
++++ ice-3.6.3/cpp/config/Make.rules.Linux	2015-06-27 17:23:45.810591931 +0200
+@@ -79,19 +79,6 @@
+         CXXARCHFLAGS	+= -mtune=v8 -pipe -Wno-deprecated -DICE_USE_MUTEX_SHARED
+     endif
+ 
+-    #
+-    # Only use multilib -m32/-m64 options for amd64 arch, x32 arch can also run
+-    # in amd64 macines but doesn't use multilib, in this case MACHINE_TYPE will
+-    # be x86_64 and HOST_ARCH x32.
+-    #
+-    ifeq ($(HOST_ARCH),amd64)
+-        ifeq ($(LP64),yes)
+-            CXXARCHFLAGS	+= -m64
+-        else
+-            CXXARCHFLAGS	+= -m32
+-        endif
+-    endif
+-
+     CXXFLAGS		+= $(CXXARCHFLAGS) -fvisibility=hidden -Wall -Werror -pthread
+ 
+     # If MAXWARN is set then enable extra warnings
+--- ice-3.6.3/config/Make.common.rules~	2015-06-23 17:30:20.000000000 +0200
++++ ice-3.6.3/config/Make.common.rules	2015-06-28 01:53:57.149666595 +0200
+@@ -101,25 +101,7 @@
+       ifeq ($(LP64),)
+           LP64      	= yes
+       endif
+-
+-      #
+-      # x86 binaries build on x86_64 machine use 32 binsuffix
+-      #
+-      ifneq ($(STATICLIBS),yes)
+-          ifneq ($(LP64),yes)
+-              binsuffix	= 32
+-          endif
+-      endif
+    endif
+-
+-   #
+-   # x86 builds uses 32 binsuffix
+-   #
+-   ifneq ($(STATICLIBS),yes)
+-	ifeq ($(findstring $(MACHINE_TYPE),i386 i486 i586 i686),$(MACHINE_TYPE))
+-	    binsuffix     = 32
+-	endif
+-    endif
+ endif
+ 
+ ifeq ($(CPP11),yes)
diff --git a/dev-libs/Ice/files/dont-append-32-to-bins.patch b/dev-libs/Ice/files/dont-append-32-to-bins.patch
deleted file mode 100644
index 88744ed..0000000
--- a/dev-libs/Ice/files/dont-append-32-to-bins.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/config/Make.common.rules b/config/Make.common.rules
-index d21f1cd..66bbda9 100644
---- a/config/Make.common.rules
-+++ b/config/Make.common.rules
-@@ -111,15 +111,6 @@ ifeq ($(UNAME),Linux)
-           endif
-       endif
-    endif
--
--   #
--   # x86 builds uses 32 binsuffix
--   #
--   ifneq ($(STATICLIBS),yes)
--	ifeq ($(findstring $(MACHINE_TYPE),i386 i486 i586 i686),$(MACHINE_TYPE))
--	    binsuffix     = 32
--	endif
--    endif
- endif
- 
- ifeq ($(CPP11),yes)
diff --git a/dev-libs/Ice/files/dont-append-c++11-to-libs.patch b/dev-libs/Ice/files/dont-append-c++11-to-libs.patch
deleted file mode 100644
index 41b3a01..0000000
--- a/dev-libs/Ice/files/dont-append-c++11-to-libs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- cpp/src/Ice/DynamicLibrary.cpp
-+++ cpp/src/Ice/DynamicLibrary.cpp
-@@ -89,9 +89,6 @@
-     if(comma == string::npos)
-     {
-         libName = libSpec;
--#  if defined(ICE_CPP11) && defined(__GLIBCXX__)
--        libName += "++11";
--#  endif
-         if(useIceVersion)
-         {
-             int majorVersion = (ICE_INT_VERSION / 10000);
-@@ -119,9 +116,6 @@
-             return 0;
-         }
-         libName = libSpec.substr(0, comma);
--#  if defined(ICE_CPP11) && defined(__GLIBCXX__)
--        libName += "++11";
--#  endif
-         version = libSpec.substr(comma + 1);
-     }
-