Added a patch necessary for scim-m17n. Marked 1.0.2 stable on x86.

6 files changed, 89 insertions, 3 deletions

diff --git a/dev-libs/m17n-lib/ChangeLog b/dev-libs/m17n-lib/ChangeLog
index 9db59e461c7b..53d346a3e67a 100644
--- a/dev-libs/m17n-lib/ChangeLog
+++ b/dev-libs/m17n-lib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/m17n-lib
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/ChangeLog,v 1.1 2004/05/16 12:53:39 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/ChangeLog,v 1.2 2004/06/14 17:07:58 usata Exp $
+
+*m17n-lib-1.0.2-r1 (15 Jun 2004)
+
+  15 Jun 2004; Mamoru KOMACHI <usata@gentoo.org>
+  +files/m17n-lib-1.0.2-typedef.diff, +m17n-lib-1.0.2-r1.ebuild,
+  m17n-lib-1.0.2.ebuild:
+  Added a patch necessary for scim-m17n. Marked 1.0.2 stable on x86.
 
 *m17n-lib-1.0.2 (16 May 2004)
 
diff --git a/dev-libs/m17n-lib/Manifest b/dev-libs/m17n-lib/Manifest
index 0b44c3267909..de5141393ec7 100644
--- a/dev-libs/m17n-lib/Manifest
+++ b/dev-libs/m17n-lib/Manifest
@@ -1,4 +1,7 @@
 MD5 8214bf7a32a3b03368b982006db69215 m17n-lib-1.0.2.ebuild 736
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 71d96a96b374c0749878e72b1b5dca50 ChangeLog 337
+MD5 6658449b01d89530ce4cab51343df038 m17n-lib-1.0.2-r1.ebuild 822
 MD5 d94ea7c3bd6f07ebe0b9350ce349e089 files/digest-m17n-lib-1.0.2 66
+MD5 052c2a0f1075d82e7b16593cd43a26db files/m17n-lib-1.0.2-typedef.diff 950
+MD5 d94ea7c3bd6f07ebe0b9350ce349e089 files/digest-m17n-lib-1.0.2-r1 66
diff --git a/dev-libs/m17n-lib/files/digest-m17n-lib-1.0.2-r1 b/dev-libs/m17n-lib/files/digest-m17n-lib-1.0.2-r1
new file mode 100644
index 000000000000..c43ff7bfb2d9
--- /dev/null
+++ b/dev-libs/m17n-lib/files/digest-m17n-lib-1.0.2-r1
@@ -0,0 +1 @@
+MD5 6e2d5088d666fca4ed06357000385932 m17n-lib-1.0.2.tar.gz 478985
diff --git a/dev-libs/m17n-lib/files/m17n-lib-1.0.2-typedef.diff b/dev-libs/m17n-lib/files/m17n-lib-1.0.2-typedef.diff
new file mode 100644
index 000000000000..ee2576ed9b7c
--- /dev/null
+++ b/dev-libs/m17n-lib/files/m17n-lib-1.0.2-typedef.diff
@@ -0,0 +1,33 @@
+diff -ur m17n-lib-1.0.2/src/m17n-core.h m17n-lib-1.0.2.new/src/m17n-core.h
+--- m17n-lib-1.0.2/src/m17n-core.h	2004-03-29 11:58:53.000000000 +0800
++++ m17n-lib-1.0.2.new/src/m17n-core.h	2004-06-14 12:38:07.809982344 +0800
+@@ -103,7 +103,7 @@
+ 
+     #MSymbol はシンボルオブジェクトの型へのポインタである。 */
+ 
+-typedef struct MSymbol *MSymbol;
++typedef struct MSymbol_ *MSymbol;
+ 
+ /*=*/
+ 
+diff -ur m17n-lib-1.0.2/src/symbol.h m17n-lib-1.0.2.new/src/symbol.h
+--- m17n-lib-1.0.2/src/symbol.h	2004-03-09 13:26:14.000000000 +0800
++++ m17n-lib-1.0.2.new/src/symbol.h	2004-06-14 12:37:58.491398984 +0800
+@@ -25,7 +25,7 @@
+ 
+ #include "plist.h"
+ 
+-struct MSymbol
++struct MSymbol_
+ {
+   /** 1 iff a value of property (including text-property) whose key is
+       the symbol is a managed object.  */
+@@ -40,7 +40,7 @@
+   /* Plist of the symbol.  */
+   MPlist plist;
+ 
+-  MSymbol next;
++  struct MSymbol_ * next;
+ };
+ 
+ #define MSYMBOL_NAME(sym) ((sym)->name)
diff --git a/dev-libs/m17n-lib/m17n-lib-1.0.2-r1.ebuild b/dev-libs/m17n-lib/m17n-lib-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..e577f718bac6
--- /dev/null
+++ b/dev-libs/m17n-lib/m17n-lib-1.0.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/m17n-lib-1.0.2-r1.ebuild,v 1.1 2004/06/14 17:07:58 usata Exp $
+
+inherit eutils flag-o-matic libtool
+
+DESCRIPTION="Multilingual Library for Unix/Linux"
+HOMEPAGE="http://www.m17n.org/m17n-lib/"
+SRC_URI="http://www.m17n.org/m17n-lib/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND="dev-libs/libxml2
+	dev-libs/fribidi
+	>=media-libs/freetype-2.1
+	dev-libs/libotf
+	dev-db/m17n-db"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-typedef.diff
+}
+
+src_compile() {
+
+	elibtoolize
+	econf || die
+	emake || die
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+}
diff --git a/dev-libs/m17n-lib/m17n-lib-1.0.2.ebuild b/dev-libs/m17n-lib/m17n-lib-1.0.2.ebuild
index 21bdf8613628..5a4c541244fc 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.0.2.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/m17n-lib-1.0.2.ebuild,v 1.1 2004/05/16 12:53:39 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/m17n-lib-1.0.2.ebuild,v 1.2 2004/06/14 17:07:58 usata Exp $
 
 inherit flag-o-matic libtool
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.m17n.org/m17n-lib/download/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND="dev-libs/libxml2