Version bumped.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

6 files changed, 30 insertions, 125 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/Manifest b/dev-libs/m17n-lib/Manifest
index bedc79279e9e..5c16fe04810a 100644
--- a/dev-libs/m17n-lib/Manifest
+++ b/dev-libs/m17n-lib/Manifest
@@ -1,16 +1,12 @@
-AUX m17n-lib-1.0.2-typedef.diff 950 RMD160 7d48b49d519314fa36f737197464ab887465a392 SHA1 9882cb10ed5c9edd5e18ee32cdf0f30903fde86b SHA256 53bbd9a0d2e32c32a380f04803d1fc780c6b71649a4a5b43f6707cb3986b546b
-AUX m17n-lib-1.1.0-fpic.patch 748 RMD160 50d371fd616129d785e1045657a2ad4c3418ba8f SHA1 2d63a720a3b6013438cd9ae933dcdfc1a83ecc13 SHA256 9c58b6c52b37f87478184c68d67b463690388ae2bafa423856959edc881fe2cc
-DIST m17n-lib-1.2.0.tar.gz 675191 RMD160 9be3688d269610c7da68b0bcd37b22dc90e8f5c6 SHA1 d646bffb1f64a4fad4e848fc48f76e5a13772bac SHA256 f07b1436abb4398e99e8644fd3fa195c69f8764273196dc54b94c3a46a4856c9
 DIST m17n-lib-1.3.3.tar.gz 737391 RMD160 0d6d77a939ea25ee7fade0ab94a4d63823088dfa SHA1 8e0e8e0031df8cbee3bcab274c133e0483ca2ae7 SHA256 6001c3c100a651a49e2d1e1d711a822b3104bb12fa892a5bec0781caac6b85c6
 DIST m17n-lib-1.3.4.tar.gz 965402 RMD160 4736fa5cc4fb0eaa79cbd505e2d7b13e1938ea39 SHA1 7b264cbe5f4b7b8a6b90f2e12edf447d13cfeff4 SHA256 fc6ffc8615db261a6d57951d445b41a72fa33bc5f19bbce1009d639e4a769e5f
-DIST m17n-lib-1.5.1.tar.gz 990729 RMD160 f058d5a91959adee3cd07d0e2ec1a86df1530523 SHA1 9b475bbe606e27611104f5b68b17ca43f7427492 SHA256 e06ba9e2b39553c50c903667e164b4cc2e3a44dea5a20b75c8b5799141f435f5
 DIST m17n-lib-1.5.2.tar.gz 997592 RMD160 5cffe568e05db836753eab9c42c63a023ed9f6f8 SHA1 90fc951155b4dcc2b3331b78b7d516515b896014 SHA256 389cc05194e9a1f9e58b186c3fcd60d7fee2a6f627c3ea8f9c944d69983721f1
 DIST m17n-lib-1.5.3.tar.gz 998339 RMD160 40c01ca60ae9a7976edcbcfffff4c608cc402689 SHA1 80d5f10329bf7c3caf85359e568da1efa41b81b8 SHA256 8ad62dbb9643f2f3c1d85cc61a12371c364c10f0e498920491e8b54f96fe6627
-EBUILD m17n-lib-1.2.0.ebuild 1178 RMD160 43f1d310ae9c90be41fb2e8c8ad3b9b41138d886 SHA1 1a7e9e4c39a20ea2af0b0e4e3aba765e8dc09215 SHA256 3ebc1efe4d81e35b55f4dbaba4eda8ba4d902a60a741a425ec61c1453e4a7ef0
+DIST m17n-lib-1.5.4.tar.gz 962454 RMD160 122c566e308df48191ebb37399110f5253623292 SHA1 d4f5bb38a0dabdaecbb6bd9e52606f57894ce1af SHA256 4cc9bf22c4a53255bccacbe90c71e54cb6aa78e394144e5ffce3aa1640ce51e7
 EBUILD m17n-lib-1.3.3.ebuild 1122 RMD160 239067e126c434b08785767628fd05ce85edc51b SHA1 407c18e4efb811fde1d6f7d909bfcf95fa14e7b9 SHA256 cad6948599e0d8ff5881aef6421f3fa470519054d6b47c22a22fd14e8bc6e408
 EBUILD m17n-lib-1.3.4.ebuild 1163 RMD160 257861ef2f7d3d25cafb239ba5dfcf9c531737af SHA1 0a92ab975090b1ee590587571b4e4d7a8a689076 SHA256 e5945275d62a642409b8a70775e6b494b9abf0561bb2b6d6d85395d0d139f591
-EBUILD m17n-lib-1.5.1.ebuild 1185 RMD160 66977d18e408775fe2d3db5b50ab229178cfb6a1 SHA1 fb22c8f9054b5a573a11f9c6931d462ad1b9d6eb SHA256 ff16dd5932862620cb233266de4df053fe0ce2f4a935ed0e96b3d9bfde1599c0
 EBUILD m17n-lib-1.5.2.ebuild 1360 RMD160 3c3c9ea662907c35feed490d0a5eb7004a1b32ac SHA1 0bee42a07e664b628eed5b84261ba06cefd14fb5 SHA256 797546e2839bbfe470c05e29b1e9116ae9185a0ccf57a7ecd1c082d6f239f65f
 EBUILD m17n-lib-1.5.3.ebuild 1161 RMD160 4e48efca5dc72ee5cc6320ed356515b05c682a8d SHA1 6496653a87f7c35f4627733cba9f54eb569e0696 SHA256 70531889bde42bdeabcdf837cdbe0ea500b8c1978d6166a43ab73c865c5d63ff
-MISC ChangeLog 5135 RMD160 4ddbeb88022ae28d4d9db39584788cdadf07ba84 SHA1 b41fc8b65996950a0593a917cd5b225edadb3a17 SHA256 d299a74eadfc8fc1d185e89ea31a5ab648da6843c84e5997a583a2c4c62fd58d
+EBUILD m17n-lib-1.5.4.ebuild 1160 RMD160 5744128ee1722bad265564eac1383b5527c40f55 SHA1 9abe4021148524b1fedea6d35b6372bc92bfb84c SHA256 8e6628f7f649d49110ad5ddd12dc8a2f2d557f0a8a6bc3290f98fbda73885c19
+MISC ChangeLog 5401 RMD160 ae71de8095e14f529e6b68631733335dcda5ed06 SHA1 f8792b877960728a598ff7a77a44c2b6e3da1d57 SHA256 f2be79c44e232f7c1eff0fa31c5f21924cbd09c0c7c0bb5606223c24f8ebdcd2
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
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
 }