Version bumped.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

5 files changed, 27 insertions, 118 deletions

diff --git a/dev-libs/m17n-lib/ChangeLog b/dev-libs/m17n-lib/ChangeLog
index b4a1bc895fca..23299b27ffbf 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/ChangeLog,v 1.44 2009/04/05 18:51:41 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/ChangeLog,v 1.45 2009/05/27 16:55:40 matsuu Exp $
+
+*m17n-lib-1.5.4 (27 May 2009)
+
+  27 May 2009; MATSUU Takuto <matsuu@gentoo.org>
+  -files/m17n-lib-1.0.2-typedef.diff, -files/m17n-lib-1.1.0-fpic.patch,
+  -m17n-lib-1.2.0.ebuild, -m17n-lib-1.5.1.ebuild, +m17n-lib-1.5.4.ebuild:
+  Version bumped. Removed old versions.
 
   05 Apr 2009; Ra炭l Porcel <armin76@gentoo.org> m17n-lib-1.5.3.ebuild:
   Add ~sh
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
deleted file mode 100644
index ee2576ed9b7c..000000000000
--- a/dev-libs/m17n-lib/files/m17n-lib-1.0.2-typedef.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-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/files/m17n-lib-1.1.0-fpic.patch b/dev-libs/m17n-lib/files/m17n-lib-1.1.0-fpic.patch
deleted file mode 100644
index 533943243772..000000000000
--- a/dev-libs/m17n-lib/files/m17n-lib-1.1.0-fpic.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/Makefile.in.orig	2004-08-16 03:07:41.000000000 +0100
-+++ src/Makefile.in	2004-09-01 11:48:46.746514784 +0100
-@@ -130,10 +130,10 @@
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CFLAGS) $(CFLAGS)
-+	$(AM_CFLAGS) $(CFLAGS) -fPIC
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -fPIC -o $@
- SOURCES = $(libm17n_X_la_SOURCES) $(libm17n_core_la_SOURCES) \
- 	$(libm17n_gd_la_SOURCES) $(libm17n_gui_la_SOURCES) \
- 	$(libm17n_la_SOURCES) $(linkcore_SOURCES) $(linkgui_SOURCES) \
diff --git a/dev-libs/m17n-lib/m17n-lib-1.2.0.ebuild b/dev-libs/m17n-lib/m17n-lib-1.2.0.ebuild
deleted file mode 100644
index 47ef9398430f..000000000000
--- a/dev-libs/m17n-lib/m17n-lib-1.2.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/m17n-lib-1.2.0.ebuild,v 1.9 2007/07/22 08:25:23 graaff Exp $
-
-inherit eutils
-
-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 alpha ppc amd64 ppc64 sparc hppa"
-IUSE=""
-
-DEPEND="x11-libs/libXaw
-	x11-libs/libICE
-	x11-libs/libXrender
-	x11-libs/libXft
-	dev-libs/libxml2
-	dev-libs/fribidi
-	>=media-libs/freetype-2.1
-	media-libs/fontconfig
-	media-libs/gd
-	>=dev-libs/libotf-0.9.2
-	>=dev-db/m17n-db-${PV}"
-
-pkg_setup() {
-	if ! built_with_use media-libs/gd png ; then
-		eerror "m17n-lib requires GD to be built with png support. Please add"
-		eerror "'png' to your USE flags, and re-emerge media-libs/gd."
-		die "Missing USE flag."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/m17n-lib-1.1.0-fpic.patch
-}
-
-src_compile() {
-	econf || die
-	emake -j1 || 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.5.1.ebuild b/dev-libs/m17n-lib/m17n-lib-1.5.4.ebuild
index 898ce6691fbe..9ae01fb89349 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.5.1.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.5.4.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/m17n-lib-1.5.1.ebuild,v 1.2 2008/02/20 19:42:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/m17n-lib-1.5.4.ebuild,v 1.1 2009/05/27 16:55:40 matsuu Exp $
 
+EAPI=2
 inherit flag-o-matic
 
 DESCRIPTION="Multilingual Library for Unix/Linux"
@@ -10,10 +11,11 @@ SRC_URI="http://www.m17n.org/m17n-lib-download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+#IUSE="anthy gd ispell"
 IUSE="gd"
 
-DEPEND="x11-libs/libXaw
+RDEPEND="x11-libs/libXaw
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libXrender
@@ -22,26 +24,27 @@ DEPEND="x11-libs/libXaw
 	dev-libs/fribidi
 	>=media-libs/freetype-2.1
 	media-libs/fontconfig
-	gd? ( media-libs/gd )
-	>=dev-libs/libotf-0.9.2
+	gd? ( media-libs/gd[png] )
+	>=dev-libs/libotf-0.9.4
 	>=dev-db/m17n-db-${PV}"
+# linguas_th? ( || ( app-i18n/libthai app-i18n/wordcut ) )
+# anthy? ( app-i18n/anthy )
+# ispell? ( app-text/ispell )
 
-pkg_setup() {
-	if use gd && ! built_with_use media-libs/gd png ; then
-		eerror "m17n-lib requires GD to be built with png support. Please add"
-		eerror "'png' to your USE flags, and re-emerge media-libs/gd."
-		die "Missing USE flag."
-	fi
-}
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
-src_compile() {
+src_configure() {
 	append-flags -fPIC
 	econf $(use_with gd) || die
+}
+
+src_compile() {
 	emake -j1 || die
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
 
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }