libebml: restore patch that is still needed.

* Was removed when upgrading to 1.3.1, and the lib itself still builds,
but then all apps using it will fail to compile.

dev-libs/libebml/libebml-1.3.1.recipe

@@ -3,7 +3,7 @@ DESCRIPTION="libebml is a C++ library to parse EBML content (read/write)."
 HOMEPAGE="http://www.matroska.org/"
 SRC_URI="http://dl.matroska.org/downloads/libebml/libebml-1.3.1.tar.bz2"
 CHECKSUM_SHA256="195894b31aaca55657c9bc157d744f23b0c25597606b97cfa5a9039c4b684295"
-REVISION="1"
+REVISION="2"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2005-2013 CoreCodec, Inc."
 
@@ -19,11 +19,11 @@ REQUIRES="
 	haiku${secondaryArchSuffix}
 	lib:libstdc++${secondaryArchSuffix}
 	"
-if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
-	PATCHES="
-		libebml-$portVersion.patchset
-	"
-else
+
+PATCHES="
+	libebml-$portVersion.patchset
+"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	REQUIRES+="
 		lib:libgcc_s${secondaryArchSuffix}
 	"

dev-libs/libebml/patches/libebml-1.3.1.patchset

@@ -1,4 +1,4 @@
-From dfad87a8cda696eba7c4a96ab898705978a0cec0 Mon Sep 17 00:00:00 2001
+From 3de81b57cac7cc32ff09a6ac36019aef7f4ef3ba Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Sun, 4 Jan 2015 21:37:55 +0000
 Subject: gcc2 fix
@@ -18,5 +18,40 @@ index 9b10ee8..3e11510 100644
  AM_CPPFLAGS += -DDEBUG
  AM_CXXFLAGS += -g
 -- 
-1.8.3.4
+2.2.2
+
+
+From 93f6ed27f8c796cf087efda2c0ec0a25eab0acbd Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@gmail.com>
+Date: Sat, 25 Apr 2015 16:58:40 +0200
+Subject: Restore patch for type definitions.
+
+* This was removed when updating from 1.0.0. The lib builds without it,
+but then all clients will fail to compile. Please do not remove this
+patch again.
+
+diff --git a/ebml/c/libebml_t.h b/ebml/c/libebml_t.h
+index 71fe115..8e73ff9 100644
+--- a/ebml/c/libebml_t.h
++++ b/ebml/c/libebml_t.h
+@@ -72,7 +72,7 @@ extern "C" {
+     typedef uint16_t uint16;
+     typedef uint8_t uint8;
+ # endif // __GNUC__
+-#elif defined(__BEOS__)
++#elif defined(__BEOS__) || defined(__HAIKU__)
+ #include <SupportDefs.h>
+ #elif defined(DJGPP)        /* SL : DJGPP doesn't support POSIX types ???? */
+     typedef signed long long int64;
+@@ -98,7 +98,7 @@ extern "C" {
+     typedef uint32_t uint32;
+     typedef uint16_t uint16;
+     typedef uint8_t uint8;
+-#elif defined(__BEOS__)
++#elif defined(__BEOS__) || defined(__HAIKU__)
+ # include <support/SupportDefs.h>
+ #else // anything else (Linux, BSD, ...)
+ # include <inttypes.h>
+-- 
+2.2.2